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

bonivart at users.sourceforge.net bonivart at users.sourceforge.net
Thu Nov 5 16:31:41 CET 2009


Revision: 7125
          http://gar.svn.sourceforge.net/gar/?rev=7125&view=rev
Author:   bonivart
Date:     2009-11-05 15:31:40 +0000 (Thu, 05 Nov 2009)

Log Message:
-----------
pkgutil: update to 1.9 beta 1

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

Added Paths:
-----------
    csw/mgar/pkg/pkgutil/trunk/files/i.cswpkgutil
    csw/mgar/pkg/pkgutil/trunk/files/r.cswpkgutil

Modified: csw/mgar/pkg/pkgutil/trunk/Makefile
===================================================================
--- csw/mgar/pkg/pkgutil/trunk/Makefile	2009-11-05 15:27:02 UTC (rev 7124)
+++ csw/mgar/pkg/pkgutil/trunk/Makefile	2009-11-05 15:31:40 UTC (rev 7125)
@@ -1,5 +1,5 @@
 GARNAME = pkgutil
-GARVERSION = 1.8
+GARVERSION = 1.9b1
 CATEGORIES = utils
 
 DESCRIPTION = Installs Solaris packages easily
@@ -12,8 +12,9 @@
 
 MASTER_SITES = $(SF_MIRRORS)
 DISTFILES  = $(GARNAME)-$(GARVERSION).zip
-DISTFILES += $(call admfiles,CSWpkgutil,prototype postinstall preremove)
-#DISTFILES += $(call admfiles,CSWpkgutil,postinstall preremove)
+DISTFILES += $(call admfiles,CSWpkgutil,prototype)
+DISTFILES += i.cswpkgutil
+DISTFILES += r.cswpkgutil
 
 PACKAGES = CSWpkgutil CSWpkgutilplus
 
@@ -40,35 +41,29 @@
 
 WORKSRC = $(WORKDIR)
 SPKG_SOURCEURL = http://pkgutil.wikidot.com/
-#SPKG_CLASSES = none cswpkgutil
+SPKG_CLASSES_CSWpkgutil = none cswpkgutil
 
 install-custom:
 	@echo " ==> Installing $(GARNAME) (custom)"
 	@rm -rf $(DESTDIR)
 	@ginstall -m 755 -d $(DESTDIR)/etc/opt/csw/pkg-hooks/preargproc.d
-	@cp $(WORKSRC)/$(GARNAME).conf $(DESTDIR)/etc/opt/csw/$(GARNAME).conf.CSW
-	@cp $(WORKSRC)/pkgutillog $(DESTDIR)/etc/opt/csw/pkg-hooks/preargproc.d/01-CSW$(GARNAME)plus-log
+	@ginstall $(WORKSRC)/$(GARNAME).conf $(DESTDIR)/etc/opt/csw/$(GARNAME).conf.CSW
+	@ginstall -m 755 $(WORKSRC)/pkgutillog $(DESTDIR)/etc/opt/csw/pkg-hooks/preargproc.d/01-CSW$(GARNAME)plus-log
 	@ginstall -m 755 -d $(DESTDIR)$(bindir)
-	@cp $(WORKSRC)/$(GARNAME) $(DESTDIR)$(bindir)
-	@cp $(WORKSRC)/bldcat $(DESTDIR)$(bindir)
-	@cp $(WORKSRC)/chkcat $(DESTDIR)$(bindir)
+	@ginstall $(WORKSRC)/$(GARNAME) $(WORKSRC)/bldcat $(WORKSRC)/chkcat $(DESTDIR)$(bindir)
 	@ginstall -m 755 -d $(DESTDIR)$(sysconfdir)
-	@cp $(WORKSRC)/$(GARNAME).conf $(DESTDIR)$(sysconfdir)/$(GARNAME).conf.CSW
+	@ginstall $(WORKSRC)/$(GARNAME).conf $(DESTDIR)$(sysconfdir)/$(GARNAME).conf.CSW
 	@ginstall -m 755 -d $(DESTDIR)/opt/csw/libexec/$(GARNAME)
-	@cp $(WORKSRC)/wget-`uname -p` $(DESTDIR)/opt/csw/libexec/$(GARNAME)/wget
+	@ginstall $(WORKSRC)/wget-`uname -p` $(DESTDIR)/opt/csw/libexec/$(GARNAME)/wget
 	@ginstall -m 755 -d $(DESTDIR)$(docdir)/$(GARNAME)
-	@cp $(WORKSRC)/readme $(DESTDIR)$(docdir)/$(GARNAME)/
-	@cp $(WORKSRC)/license $(DESTDIR)$(docdir)/$(GARNAME)/
+	@ginstall $(WORKSRC)/readme $(WORKSRC)/license $(DESTDIR)$(docdir)/$(GARNAME)/
 	@ginstall -m 755 -d $(DESTDIR)$(docdir)/$(GARNAME)plus
-	@cp $(WORKSRC)/license $(DESTDIR)$(docdir)/$(GARNAME)plus/
-	@cp $(WORKSRC)/readme.pkgutilplus $(DESTDIR)$(docdir)/$(GARNAME)plus/readme
+	@ginstall $(WORKSRC)/license $(DESTDIR)$(docdir)/$(GARNAME)plus/
+	@ginstall $(WORKSRC)/readme.pkgutilplus $(DESTDIR)$(docdir)/$(GARNAME)plus/readme
 	@ginstall -m 755 -d $(DESTDIR)$(mandir)/man1
 	@pod2man --section=1 $(WORKSRC)/$(GARNAME) > $(DESTDIR)$(mandir)/man1/pkgutil.1
 	@pod2man --section=1 $(WORKSRC)/bldcat > $(DESTDIR)$(mandir)/man1/bldcat.1
 	@pod2man --section=1 $(WORKSRC)/chkcat > $(DESTDIR)$(mandir)/man1/chkcat.1
 	@ginstall -m 755 -d $(DESTDIR)/var/opt/csw/$(GARNAME)/packages
-	@cp $(WORKSRC)/admin $(DESTDIR)/var/opt/csw/$(GARNAME)/admin.CSW
-#	@ginstall -m 755 -d $(DESTDIR)/usr/sadm/install/scripts
-#	@cp $(FILEDIR)/CSWpkgutil.i.cswpkgutil $(DESTDIR)/usr/sadm/install/scripts/i.cswpkgutil
-#	@cp $(FILEDIR)/CSWpkgutil.r.cswpkgutil $(DESTDIR)/usr/sadm/install/scripts/r.cswpkgutil
+	@ginstall $(WORKSRC)/admin $(DESTDIR)/var/opt/csw/$(GARNAME)/admin.CSW
 	@$(MAKECOOKIE)

Modified: csw/mgar/pkg/pkgutil/trunk/checksums
===================================================================
--- csw/mgar/pkg/pkgutil/trunk/checksums	2009-11-05 15:27:02 UTC (rev 7124)
+++ csw/mgar/pkg/pkgutil/trunk/checksums	2009-11-05 15:31:40 UTC (rev 7125)
@@ -1,5 +1,5 @@
 a16c6f81bc537d6172fd65d8da1aeecc  CSWpkgutil.gspec
-e1407c24d47306dbc4cea22dcb291f1d  CSWpkgutil.postinstall
-2fb6c94a2d212f08b71d462082a2d31a  CSWpkgutil.preremove
-951b11e347d6f3f49cc8617ecab4ad62  CSWpkgutil.prototype
-f65b4c116cb03bc95c148a8488472515  pkgutil-1.8.zip
+a9bd66f3cfaef5ec3df946363e80085f  CSWpkgutil.prototype
+443c6cb0435cefc046629a3e68e7fe61  i.cswpkgutil
+15dcb525af077847f98ea51d1c6f4162  pkgutil-1.9b1.zip
+c8a3a8c4ed123f229dbd60cd4722fd03  r.cswpkgutil

Modified: csw/mgar/pkg/pkgutil/trunk/files/CSWpkgutil.prototype
===================================================================
--- csw/mgar/pkg/pkgutil/trunk/files/CSWpkgutil.prototype	2009-11-05 15:27:02 UTC (rev 7124)
+++ csw/mgar/pkg/pkgutil/trunk/files/CSWpkgutil.prototype	2009-11-05 15:31:40 UTC (rev 7125)
@@ -1,14 +1,14 @@
 i pkginfo=CSWpkgutil.pkginfo
 i copyright=CSWpkgutil.copyright
-i postinstall=CSWpkgutil.postinstall
-i preremove=CSWpkgutil.preremove
+i i.cswpkgutil
+i r.cswpkgutil
 d none /etc/opt/csw 0755 root bin
-f none /etc/opt/csw/pkgutil.conf.CSW 644 root bin
+f cswpkgutil /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
 d none /opt/csw/etc 0755 root bin
-f none /opt/csw/etc/pkgutil.conf.CSW 644 root bin
+f cswpkgutil /opt/csw/etc/pkgutil.conf.CSW 644 root bin
 d none /opt/csw/libexec 0755 root bin
 d none /opt/csw/libexec/pkgutil 0755 root bin
 f none /opt/csw/libexec/pkgutil/wget 755 root bin
@@ -22,5 +22,5 @@
 f none /opt/csw/share/man/man1/pkgutil.1 644 root bin
 d none /var/opt/csw 0755 root bin
 d none /var/opt/csw/pkgutil 0755 root bin
-f none /var/opt/csw/pkgutil/admin.CSW 644 root bin
+f cswpkgutil /var/opt/csw/pkgutil/admin.CSW 644 root bin
 d none /var/opt/csw/pkgutil/packages 0755 root bin

Added: csw/mgar/pkg/pkgutil/trunk/files/i.cswpkgutil
===================================================================
--- csw/mgar/pkg/pkgutil/trunk/files/i.cswpkgutil	                        (rev 0)
+++ csw/mgar/pkg/pkgutil/trunk/files/i.cswpkgutil	2009-11-05 15:31:40 UTC (rev 7125)
@@ -0,0 +1,12 @@
+#!/bin/sh
+
+while read src dest
+do
+  cp $src $dest
+  conf=`echo $dest | sed 's/.CSW$//'`
+  if [-f "$conf"]; then
+    echo "$conf already exists, will not copy $dest to it."
+  else
+    cp $dest $conf
+  fi
+done

Added: csw/mgar/pkg/pkgutil/trunk/files/r.cswpkgutil
===================================================================
--- csw/mgar/pkg/pkgutil/trunk/files/r.cswpkgutil	                        (rev 0)
+++ csw/mgar/pkg/pkgutil/trunk/files/r.cswpkgutil	2009-11-05 15:31:40 UTC (rev 7125)
@@ -0,0 +1,12 @@
+#!/bin/sh
+
+while read dest
+do
+  conf=`echo $dest | sed 's/.CSW$//'`
+  if [ "`cmp "$conf" "$dest" > /dev/null`" ]; then
+    rm $conf
+  else
+    echo "$conf modified, will not remove it."
+  fi
+  rm $dest
+done


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