[csw-devel] SF.net SVN: gar:[17069] csw/mgar/pkg/ruby18/trunk/Makefile

[bdwalton at users.sourceforge.net]

Revision: 17069
          http://gar.svn.sourceforge.net/gar/?rev=17069&view=rev
Author:   bdwalton
Date:     2012-02-16 02:39:44 +0000 (Thu, 16 Feb 2012)
Log Message:
-----------
ruby18/trunk: update checkpkg overrides as many are no longer required

Modified Paths:
--------------
    csw/mgar/pkg/ruby18/trunk/Makefile

Modified: csw/mgar/pkg/ruby18/trunk/Makefile
===================================================================
--- csw/mgar/pkg/ruby18/trunk/Makefile	2012-02-16 01:45:19 UTC (rev 17068)
+++ csw/mgar/pkg/ruby18/trunk/Makefile	2012-02-16 02:39:44 UTC (rev 17069)
@@ -149,37 +149,19 @@
 SOS12_LD_FLAGS =
 endif
 
-# Transitional overrides.  Once the packages with 18 in the names are
-# released, these can be removed...oh and checkpkg will need a tweak too
-CHECKPKG_OVERRIDES_CSWruby18-doc += missing-dependency|CSWruby
-CHECKPKG_OVERRIDES_CSWruby18-doc += surplus-dependency|CSWruby18
-CHECKPKG_OVERRIDES_CSWruby18-dev += missing-dependency|CSWruby
+CHECKPKG_OVERRIDES_CSWruby18 += surplus-dependency|CSWalternatives
 CHECKPKG_OVERRIDES_CSWruby18-dev += surplus-dependency|CSWcoreutils
-CHECKPKG_OVERRIDES_CSWruby18-dev += surplus-dependency|CSWruby18
-CHECKPKG_OVERRIDES_CSWruby18-tk += missing-dependency|CSWruby
-CHECKPKG_OVERRIDES_CSWruby18-tk += surplus-dependency|CSWruby18
-CHECKPKG_OVERRIDES_CSWruby18 += missing-dependency|CSWruby
-CHECKPKG_OVERRIDES_CSWrubydev += archall-devel-package
-# End of transitional overrides.
-
 CHECKPKG_OVERRIDES_CSWruby18-doc += missing-dependency|CSWperl
 CHECKPKG_OVERRIDES_CSWruby18-doc += missing-dependency|CSWpython
-
-CHECKPKG_OVERRIDES_CSWruby18-gcc4 += surplus-dependency|CSWalternatives
 CHECKPKG_OVERRIDES_CSWruby18-gcc4 += surplus-dependency|CSWgcc4core
+CHECKPKG_OVERRIDES_CSWrubydev += archall-devel-package
 
-CHECKPKG_OVERRIDES_CSWruby18 += surplus-dependency|CSWalternatives
-
 # usr/local overrides
 CHECKPKG_OVERRIDES_CSWruby18 += file-with-bad-content|/usr/local|root/opt/csw/lib/ruby/1.8/fileutils.rb
 CHECKPKG_OVERRIDES_CSWruby18 += file-with-bad-content|/usr/local|root/opt/csw/share/man/man1/ruby18.1
 CHECKPKG_OVERRIDES_CSWruby18 += file-with-bad-content|/usr/local|root/opt/csw/bin/ri18
 CHECKPKG_OVERRIDES_CSWruby18-doc += file-with-bad-content
 
-CHECKPKG_OVERRIDES_CSWruby18-tk += file-with-bad-content|/usr/share|root/opt/csw/lib/ruby/1.8/tk/dialog.rb
-CHECKPKG_OVERRIDES_CSWruby18-tk += file-with-bad-content|/usr/local|root/opt/csw/lib/ruby/1.8/tkextlib/itcl/setup.rb
-CHECKPKG_OVERRIDES_CSWruby18-tk += file-with-bad-content|/usr/local|root/opt/csw/lib/ruby/1.8/tkextlib/itk/setup.rb
-
 include gar/category.mk
 
 SPKG_VERSION := $(SPKG_VERSION)$(PATCHLEVEL)

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.