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

[bonivart at users.sourceforge.net]

Revision: 13109
          http://gar.svn.sourceforge.net/gar/?rev=13109&view=rev
Author:   bonivart
Date:     2011-01-29 19:52:34 +0000 (Sat, 29 Jan 2011)

Log Message:
-----------
pkgutil: 2.3 beta 1

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.prototype

Modified: csw/mgar/pkg/pkgutil/trunk/Makefile
===================================================================
--- csw/mgar/pkg/pkgutil/trunk/Makefile	2011-01-29 18:27:02 UTC (rev 13108)
+++ csw/mgar/pkg/pkgutil/trunk/Makefile	2011-01-29 19:52:34 UTC (rev 13109)
@@ -2,7 +2,7 @@
 # svn co -r 9999 https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 gar
 
 NAME = pkgutil
-VERSION = 2.2
+VERSION = 2.3b1
 CATEGORIES = utils
 
 DESCRIPTION = Installs Solaris packages easily
@@ -37,14 +37,7 @@
 CHECKPKG_OVERRIDES_CSWpkgutilplus += surplus-dependency|CSWcswpkgloghooks
 CHECKPKG_OVERRIDES_CSWpkgutilplus += surplus-dependency|CSWgnupg
 CHECKPKG_OVERRIDES_CSWpkgutilplus += surplus-dependency|CSWpkgutil
-CHECKPKG_OVERRIDES_CSWpkgutil += disallowed-path|etc/opt/csw
-CHECKPKG_OVERRIDES_CSWpkgutil += disallowed-path|opt/csw
-CHECKPKG_OVERRIDES_CSWpkgutil += disallowed-path|opt/csw/bin
-CHECKPKG_OVERRIDES_CSWpkgutil += disallowed-path|opt/csw/etc
-CHECKPKG_OVERRIDES_CSWpkgutil += disallowed-path|opt/csw/share
-CHECKPKG_OVERRIDES_CSWpkgutil += disallowed-path|opt/csw/share/doc
-CHECKPKG_OVERRIDES_CSWpkgutil += disallowed-path|opt/csw/share/man
-CHECKPKG_OVERRIDES_CSWpkgutil += disallowed-path|var/opt/csw
+CHECKPKG_OVERRIDES_CSWpkgutil += disallowed-path
 
 PACKAGES = CSWpkgutil CSWpkgutilplus
 
@@ -103,7 +96,8 @@
 	@pod2man --section=1 $(WORKSRC)/bldcat > $(DESTDIR)$(mandir)/man1/bldcat.1
 	@pod2man --section=1 $(WORKSRC)/chkcat > $(DESTDIR)$(mandir)/man1/chkcat.1
 	@chmod 444 $(DESTDIR)$(mandir)/man1/*
+	@ginstall -m 755 -d $(DESTDIR)/opt/csw/var/$(NAME)
+	@ginstall -m 644 $(WORKSRC)/admin $(DESTDIR)/opt/csw/var/$(NAME)/admin.CSW
 	@ginstall -m 755 -d $(DESTDIR)/var/opt/csw/$(NAME)/packages
 	@ginstall -m 755 -d $(DESTDIR)/var/opt/csw/$(NAME)/pkgask
-	@ginstall -m 644 $(WORKSRC)/admin $(DESTDIR)/var/opt/csw/$(NAME)/admin.CSW
 	@$(MAKECOOKIE)

Modified: csw/mgar/pkg/pkgutil/trunk/checksums
===================================================================
--- csw/mgar/pkg/pkgutil/trunk/checksums	2011-01-29 18:27:02 UTC (rev 13108)
+++ csw/mgar/pkg/pkgutil/trunk/checksums	2011-01-29 19:52:34 UTC (rev 13109)
@@ -1,8 +1,8 @@
 a16c6f81bc537d6172fd65d8da1aeecc  CSWpkgutil.gspec
-f5a00bd5eedf3b967fafbf29dc389e4c  CSWpkgutil.postinstall
+2ce2761890775e7f658ed8233fda0148  CSWpkgutil.postinstall
 832c616f6ca7a3030d21bb61d9c62e42  CSWpkgutil.preremove
-26988316ad4be5685fae47efa9dcc39c  CSWpkgutil.prototype
+ce3d565aaf32be17716a9869087dec5c  CSWpkgutil.prototype
 b5fffa0be100ddbb7262ce3a0a4e3bb7  build_sun_catalog.py
 7ad27336f90e73da3254a61d91025ee5  cswcatalog
 3a6b789b3d5e05f41d2363dd26a92acf  opencsw.py
-5245c83cc44947736ecbfb9d22e1c640  pkgutil-2.2.zip
+aa6964f9b17e91088662dc1ea3b66e6d  pkgutil-2.3b1.zip

Modified: csw/mgar/pkg/pkgutil/trunk/files/CSWpkgutil.postinstall
===================================================================
--- csw/mgar/pkg/pkgutil/trunk/files/CSWpkgutil.postinstall	2011-01-29 18:27:02 UTC (rev 13108)
+++ csw/mgar/pkg/pkgutil/trunk/files/CSWpkgutil.postinstall	2011-01-29 19:52:34 UTC (rev 13109)
@@ -2,7 +2,8 @@
 
 ETC1=$PKG_INSTALL_ROOT/opt/csw/etc
 ETC2=$PKG_INSTALL_ROOT/etc/opt/csw
-VAR=$PKG_INSTALL_ROOT/var/opt/csw/pkgutil
+VAR1=$PKG_INSTALL_ROOT/opt/csw/var/pkgutil
+VAR2=$PKG_INSTALL_ROOT/var/opt/csw/pkgutil
 
 echo
 
@@ -20,9 +21,9 @@
   echo "/etc/opt/csw/pkgutil.conf already exists, will not copy pkgutil.conf.CSW to it."
 fi
 
-if [ ! -f "$VAR/admin" ]; then
+if [ ! -f "$VAR2/admin" ]; then
   echo "Copying sample admin to /var/opt/csw/pkgutil."
-  cp -p $VAR/admin.CSW $VAR/admin
+  cp -p $VAR1/admin.CSW $VAR2/admin
 else
   echo "/var/opt/csw/pkutil/admin already exists, will not copy admin.CSW to it."
 fi

Modified: csw/mgar/pkg/pkgutil/trunk/files/CSWpkgutil.prototype
===================================================================
--- csw/mgar/pkg/pkgutil/trunk/files/CSWpkgutil.prototype	2011-01-29 18:27:02 UTC (rev 13108)
+++ csw/mgar/pkg/pkgutil/trunk/files/CSWpkgutil.prototype	2011-01-29 19:52:34 UTC (rev 13109)
@@ -21,8 +21,10 @@
 d none /opt/csw/share/man 0755 root bin
 d none /opt/csw/share/man/man1 0755 root bin
 f none /opt/csw/share/man/man1/pkgutil.1 444 root bin
+d none /opt/csw/var 0755 root bin
+d none /opt/csw/var/pkgutil 0755 root bin
+f none /opt/csw/var/pkgutil/admin.CSW 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
 d none /var/opt/csw/pkgutil/packages 0755 root bin
 d none /var/opt/csw/pkgutil/pkgask 0755 root bin


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