[csw-devel] SF.net SVN: gar:[15612] csw/mgar/pkg/pkg-get/trunk

[bdwalton at users.sourceforge.net]

Revision: 15612
          http://gar.svn.sourceforge.net/gar/?rev=15612&view=rev
Author:   bdwalton
Date:     2011-09-11 02:37:23 +0000 (Sun, 11 Sep 2011)
Log Message:
-----------
pkg-get/trunk: drop alternatives support since alternatives is buggy and cannot handle a single package delivering multiple alternatives for the same name

Modified Paths:
--------------
    csw/mgar/pkg/pkg-get/trunk/Makefile
    csw/mgar/pkg/pkg-get/trunk/files/pkg-get

Modified: csw/mgar/pkg/pkg-get/trunk/Makefile
===================================================================
--- csw/mgar/pkg/pkg-get/trunk/Makefile	2011-09-11 02:28:42 UTC (rev 15611)
+++ csw/mgar/pkg/pkg-get/trunk/Makefile	2011-09-11 02:37:23 UTC (rev 15612)
@@ -26,10 +26,6 @@
 CHECKPKG_OVERRIDES_CSWpkgget += surplus-dependency|CSWpkgutil
 CHECKPKG_OVERRIDES_CSWpkgget += catalogname-does-not-match-pkgname|pkgname=CSWpkgget|catalogname=pkg_get_stub|expected-catalogname=pkgget
 
-ALTERNATIVES_CSWpkgget = transition deprecation
-ALTERNATIVE_transition = /opt/csw/bin/pkg-get pkgget /opt/csw/bin/pkg-get.transition 10
-ALTERNATIVE_deprecation = /opt/csw/bin/pkg-get pkgget /opt/csw/bin/pkg-get.deprecated 5
-
 # going to extra effort to find wget, add /usr/local/bin to the path
 CHECKPKG_OVERRIDES_CSWpkgget += file-with-bad-content|/usr/local|root/opt/csw/bin/pkg-get.deprecated
 
@@ -40,7 +36,7 @@
 	  mkdir -p $(DESTDIR)$(docdir)/pkg_get_stub; \
 	  mkdir -p $(DESTDIR)$(sharedstatedir); \
 	  mkdir -p $(DESTDIR)$(sysconfdir); \
-		ginstall -m 0755 $(FILEDIR)/pkg-get $(DESTDIR)$(bindir)/pkg-get.transition; \
+		ginstall -m 0755 $(FILEDIR)/pkg-get $(DESTDIR)$(bindir)/; \
 		rsync -a --exclude=.svn $(FILEDIR)/bin/ $(DESTDIR)$(bindir)/;\
 		rsync -a --exclude=.svn $(FILEDIR)/share/ $(DESTDIR)$(sharedstatedir)/; \
 		rsync -a --exclude=.svn $(FILEDIR)/etc/ $(DESTDIR)$(sysconfdir)/; \

Modified: csw/mgar/pkg/pkg-get/trunk/files/pkg-get
===================================================================
--- csw/mgar/pkg/pkg-get/trunk/files/pkg-get	2011-09-11 02:28:42 UTC (rev 15611)
+++ csw/mgar/pkg/pkg-get/trunk/files/pkg-get	2011-09-11 02:37:23 UTC (rev 15612)
@@ -10,11 +10,9 @@
 echo "Please use pkgutil(1) instead.  The CSWpkgutil package should"
 echo "have been installed at the same time as this CSWpkgget update."
 echo
-echo "If you _really_ want to run pkg-get still, you may re-enable it"
-echo "by running:"
-echo "/opt/csw/bin/alternatives --set pkgget /opt/csw/bin/pkg-get.deprecated"
+echo "If you _really_ want to run pkg-get still, you'll find it at:"
+echo "/opt/csw/bin/pkg-get.deprecated"
 echo
-echo
 echo "We apologize for any inconveniences this causes you."
 echo
 echo

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