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

bonivart at users.sourceforge.net bonivart at users.sourceforge.net
Fri Mar 13 15:58:00 CET 2009


Revision: 3743
          http://gar.svn.sourceforge.net/gar/?rev=3743&view=rev
Author:   bonivart
Date:     2009-03-13 14:58:00 +0000 (Fri, 13 Mar 2009)

Log Message:
-----------
pkgutil: update to 1.5b2

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

Modified: csw/mgar/pkg/pkgutil/trunk/Makefile
===================================================================
--- csw/mgar/pkg/pkgutil/trunk/Makefile	2009-03-13 14:06:49 UTC (rev 3742)
+++ csw/mgar/pkg/pkgutil/trunk/Makefile	2009-03-13 14:58:00 UTC (rev 3743)
@@ -1,5 +1,5 @@
 GARNAME = pkgutil
-GARVERSION = 1.4
+GARVERSION = 1.5b2
 CATEGORIES = utils
 
 DESCRIPTION = Installs Solaris packages easily
@@ -10,7 +10,8 @@
 	package automatically.
 endef
 
-MASTER_SITES = http://www.bonivart.com/pkgutil/
+#MASTER_SITES = http://www.bonivart.com/pkgutil/
+MASTER_SITES = $(SF_MIRRORS)
 DISTFILES  = $(GARNAME)-$(GARVERSION).zip
 DISTFILES += $(call admfiles,CSWpkgutil,prototype postinstall preremove)
 
@@ -38,13 +39,13 @@
 	@ginstall -d $(DESTDIR)$(mandir)/man1
 #	@ginstall -d $(DESTDIR)/usr/sadm/install/scripts
 	@ginstall -d $(DESTDIR)/var/opt/csw/$(GARNAME)/packages
-#	@cp -r $(WORKSRC)/$(GARNAME).conf $(DESTDIR)/etc/opt/csw/$(GARNAME).conf.CSW
+	@ginstall -d $(DESTDIR)/etc/opt/csw
 	@cp -r $(WORKSRC)/$(GARNAME).conf $(DESTDIR)$(sysconfdir)/$(GARNAME).conf.CSW
+	@cp -r $(WORKSRC)/$(GARNAME).conf $(DESTDIR)/etc/opt/csw/$(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)/$(GARNAME)/
-#	@cp -r $(FILEDIR)/CSWpkgutil.copyright $(DESTDIR)$(docdir)/$(GARNAME)/LICENSE
 	@cp -r $(WORKSRC)/LICENSE $(DESTDIR)$(docdir)/$(GARNAME)/
 #	@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

Modified: csw/mgar/pkg/pkgutil/trunk/checksums
===================================================================
--- csw/mgar/pkg/pkgutil/trunk/checksums	2009-03-13 14:06:49 UTC (rev 3742)
+++ csw/mgar/pkg/pkgutil/trunk/checksums	2009-03-13 14:58:00 UTC (rev 3743)
@@ -1,5 +1,5 @@
-e747b0e510c2d4a662228f7e150a9a76  download/pkgutil-1.4.zip
+1b273bbe099ff9fff53effeda50d3af7  download/pkgutil-1.5b2.zip
 805cd30ad9f21cb1167d166fa99b5891  download/CSWpkgutil.gspec
-2f561d7f40289fac9bd02d2504b73693  download/CSWpkgutil.prototype
-b9a3a99ece73247e0dbcbb8ea448fcba  download/CSWpkgutil.postinstall
-6905ca210b32f0789c8640c32de44911  download/CSWpkgutil.preremove
+54bd1af1cd6ca5ac7e63586ffc16842d  download/CSWpkgutil.prototype
+e1407c24d47306dbc4cea22dcb291f1d  download/CSWpkgutil.postinstall
+2fb6c94a2d212f08b71d462082a2d31a  download/CSWpkgutil.preremove

Modified: csw/mgar/pkg/pkgutil/trunk/files/CSWpkgutil.postinstall
===================================================================
--- csw/mgar/pkg/pkgutil/trunk/files/CSWpkgutil.postinstall	2009-03-13 14:06:49 UTC (rev 3742)
+++ csw/mgar/pkg/pkgutil/trunk/files/CSWpkgutil.postinstall	2009-03-13 14:58:00 UTC (rev 3743)
@@ -1,16 +1,23 @@
 #!/bin/sh
 
-ETC=$PKG_INSTALL_ROOT/opt/csw/etc
+ETC1=$PKG_INSTALL_ROOT/opt/csw/etc
+ETC2=$PKG_INSTALL_ROOT/etc/opt/csw
 VAR=$PKG_INSTALL_ROOT/var/opt/csw/pkgutil
 
 echo
 
-if [ ! -f "$ETC/pkgutil.conf" ]; then
-  cp -p $ETC/pkgutil.conf.CSW $ETC/pkgutil.conf 
+if [ ! -f "$ETC1/pkgutil.conf" ]; then
+  cp -p $ETC1/pkgutil.conf.CSW $ETC1/pkgutil.conf 
 else
   echo "pkgutil.conf already exists, will not copy pkgutil.conf.CSW to it."
 fi
 
+if [ ! -f "$ETC2/pkgutil.conf" ]; then
+  cp -p $ETC2/pkgutil.conf.CSW $ETC2/pkgutil.conf 
+else
+  echo "pkgutil.conf already exists, will not copy pkgutil.conf.CSW to it."
+fi
+
 if [ ! -f "$VAR/admin" ]; then
   cp -p $VAR/admin.CSW $VAR/admin
 else

Modified: csw/mgar/pkg/pkgutil/trunk/files/CSWpkgutil.preremove
===================================================================
--- csw/mgar/pkg/pkgutil/trunk/files/CSWpkgutil.preremove	2009-03-13 14:06:49 UTC (rev 3742)
+++ csw/mgar/pkg/pkgutil/trunk/files/CSWpkgutil.preremove	2009-03-13 14:58:00 UTC (rev 3743)
@@ -1,16 +1,23 @@
 #!/bin/sh
 
-ETC=$PKG_INSTALL_ROOT/opt/csw/etc
+ETC1=$PKG_INSTALL_ROOT/opt/csw/etc
+ETC2=$PKG_INSTALL_ROOT/etc/opt/csw
 VAR=$PKG_INSTALL_ROOT/var/opt/csw/pkgutil
 
 echo
 
-if [ "`cmp "$ETC/pkgutil.conf" "$ETC/pkgutil.conf.CSW"`" ]; then
+if [ "`cmp "$ETC1/pkgutil.conf" "$ETC1/pkgutil.conf.CSW"`" ]; then
   echo "pkgutil.conf modified, will not remove it."
 else
-  /bin/rm $ETC/pkgutil.conf
+  /bin/rm $ETC1/pkgutil.conf
 fi
 
+if [ "`cmp "$ETC2/pkgutil.conf" "$ETC2/pkgutil.conf.CSW"`" ]; then
+  echo "pkgutil.conf modified, will not remove it."
+else
+  /bin/rm $ETC2/pkgutil.conf
+fi
+
 if [ "`cmp "$VAR/admin" "$VAR/admin.CSW"`" ]; then
   echo "admin modified, will not remove it."
 else

Modified: csw/mgar/pkg/pkgutil/trunk/files/CSWpkgutil.prototype
===================================================================
--- csw/mgar/pkg/pkgutil/trunk/files/CSWpkgutil.prototype	2009-03-13 14:06:49 UTC (rev 3742)
+++ csw/mgar/pkg/pkgutil/trunk/files/CSWpkgutil.prototype	2009-03-13 14:58:00 UTC (rev 3743)
@@ -2,6 +2,8 @@
 i copyright=CSWpkgutil.copyright
 i postinstall=CSWpkgutil.postinstall
 i preremove=CSWpkgutil.preremove
+d none /etc/opt/csw 0755 root bin
+f none /etc/opt/csw/pkgutil.conf.CSW 644 root bin
 d none /opt/csw 0755 root bin
 d none /opt/csw/bin 0755 root bin
 f none /opt/csw/bin/pkgutil 755 root bin


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



More information about the devel mailing list