[csw-devel] SF.net SVN: gar:[2631] csw/mgar/pkg/pkgutil/trunk

[bonivart at users.sourceforge.net]

Revision: 2631
          http://gar.svn.sourceforge.net/gar/?rev=2631&view=rev
Author:   bonivart
Date:     2008-12-17 15:33:03 +0000 (Wed, 17 Dec 2008)

Log Message:
-----------
pkgutil: update to 1.3.1 due to minor bug in pre/post

Modified Paths:
--------------
    csw/mgar/pkg/pkgutil/trunk/Makefile
    csw/mgar/pkg/pkgutil/trunk/files/CSWpkgutil.postinstall
    csw/mgar/pkg/pkgutil/trunk/files/CSWpkgutil.preremove

Modified: csw/mgar/pkg/pkgutil/trunk/Makefile
===================================================================
--- csw/mgar/pkg/pkgutil/trunk/Makefile	2008-12-17 03:48:48 UTC (rev 2630)
+++ csw/mgar/pkg/pkgutil/trunk/Makefile	2008-12-17 15:33:03 UTC (rev 2631)
@@ -1,5 +1,5 @@
 GARNAME = pkgutil
-GARVERSION = 1.3
+GARVERSION = 1.3.1
 CATEGORIES = utils
 
 DESCRIPTION = Installs Solaris packages easily
@@ -31,25 +31,24 @@
 install-custom:
 	@echo " ==> Installing $(GARNAME) (custom)"
 	@rm -rf $(DESTDIR)
-#	@ginstall -d $(DESTDIR)/etc/opt/csw
-	@ginstall -d $(DESTDIR)/opt/csw/bin
-	@ginstall -d $(DESTDIR)/opt/csw/etc
+	@ginstall -d $(DESTDIR)$(bindir)
+	@ginstall -d $(DESTDIR)$/sysconfdir)
 	@ginstall -d $(DESTDIR)/opt/csw/libexec/pkgutil
-	@ginstall -d $(DESTDIR)/opt/csw/share/doc/pkgutil
+	@ginstall -d $(DESTDIR)$(docdir)/pkgutil
 	@ginstall -d $(DESTDIR)$(mandir)/man1
 #	@ginstall -d $(DESTDIR)/usr/sadm/install/scripts
 	@ginstall -d $(DESTDIR)/var/opt/csw/pkgutil/packages
-	@pod2man --section=1 $(WORKSRC)/$(GARNAME) > $(DESTDIR)$(mandir)/man1/pkgutil.1
 #	@cp -r $(WORKSRC)/$(GARNAME).conf $(DESTDIR)/etc/opt/csw/$(GARNAME).conf.CSW
-	@cp -r $(WORKSRC)/$(GARNAME).conf $(DESTDIR)/opt/csw/etc/$(GARNAME).conf.CSW
-	@cp -r $(WORKSRC)/$(GARNAME) $(DESTDIR)/opt/csw/bin/
-	@cp -r $(WORKSRC)/bldcat $(DESTDIR)/opt/csw/bin/
-	@cp -r $(WORKSRC)/chkcat $(DESTDIR)/opt/csw/bin/
-	@cp -r $(WORKSRC)/readme $(DESTDIR)/opt/csw/share/doc/pkgutil/
-#	@cp -r $(FILEDIR)/CSWpkgutil.copyright $(DESTDIR)/opt/csw/share/doc/pkgutil/LICENSE
+	@cp -r $(WORKSRC)/$(GARNAME).conf $(DESTDIR)$(sysconfdir)/$(GARNAME).conf.CSW
+	@cp -r $(WORKSRC)/$(GARNAME) $(DESTDIR)$(bindir)
+	@cp -r $(WORKSRC)/bldcat $(DESTDIR)$(bindir)
+	@cp -r $(WORKSRC)/chkcat $(DESTDIR)$(bindir)
+	@cp -r $(WORKSRC)/readme $(DESTDIR)$(docdir)/pkgutil/
+#	@cp -r $(FILEDIR)/CSWpkgutil.copyright $(DESTDIR)$(docdir)/pkgutil/LICENSE
 	@cp -r $(WORKSRC)/copyright $(DESTDIR)$(docdir)/pkgutil/LICENSE
 #	@cp -r $(FILEDIR)/CSWpkgutil.i.cswpkgutil $(DESTDIR)/usr/sadm/install/scripts/i.cswpkgutil
 #	@cp -r $(FILEDIR)/CSWpkgutil.r.cswpkgutil $(DESTDIR)/usr/sadm/install/scripts/r.cswpkgutil
 	@cp -r $(WORKSRC)/admin $(DESTDIR)/var/opt/csw/pkgutil/admin.CSW
 	@cp -r $(WORKSRC)/wget-`uname -p` $(DESTDIR)/opt/csw/libexec/pkgutil/wget
+	@pod2man --section=1 $(WORKSRC)/$(GARNAME) > $(DESTDIR)$(mandir)/man1/pkgutil.1
 	@$(MAKECOOKIE)

Modified: csw/mgar/pkg/pkgutil/trunk/files/CSWpkgutil.postinstall
===================================================================
--- csw/mgar/pkg/pkgutil/trunk/files/CSWpkgutil.postinstall	2008-12-17 03:48:48 UTC (rev 2630)
+++ csw/mgar/pkg/pkgutil/trunk/files/CSWpkgutil.postinstall	2008-12-17 15:33:03 UTC (rev 2631)
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-ETC=$PKG_INSTALL_ROOT/etc/opt/csw
+ETC=$PKG_INSTALL_ROOT/opt/csw/etc
 VAR=$PKG_INSTALL_ROOT/var/opt/csw/pkgutil
 
 echo

Modified: csw/mgar/pkg/pkgutil/trunk/files/CSWpkgutil.preremove
===================================================================
--- csw/mgar/pkg/pkgutil/trunk/files/CSWpkgutil.preremove	2008-12-17 03:48:48 UTC (rev 2630)
+++ csw/mgar/pkg/pkgutil/trunk/files/CSWpkgutil.preremove	2008-12-17 15:33:03 UTC (rev 2631)
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-ETC=$PKG_INSTALL_ROOT/etc/opt/csw
+ETC=$PKG_INSTALL_ROOT/opt/csw/etc
 VAR=$PKG_INSTALL_ROOT/var/opt/csw/pkgutil
 
 echo


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