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

bonivart at users.sourceforge.net bonivart at users.sourceforge.net
Wed Jun 29 23:27:38 CEST 2011 

Revision: 14944
          http://gar.svn.sourceforge.net/gar/?rev=14944&view=rev
Author:   bonivart
Date:     2011-06-29 21:27:38 +0000 (Wed, 29 Jun 2011)

Log Message:
-----------
pkgutil/trunk: arch all, modern gar/checkpkg, Solaris 9

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/COPYING

Modified: csw/mgar/pkg/pkgutil/trunk/Makefile
===================================================================
--- csw/mgar/pkg/pkgutil/trunk/Makefile	2011-06-29 15:51:35 UTC (rev 14943)
+++ csw/mgar/pkg/pkgutil/trunk/Makefile	2011-06-29 21:27:38 UTC (rev 14944)
@@ -1,9 +1,5 @@
-# Do not update gar, new gar doesn't work on sol8! If removed, recreate with:
-# svn co -r 9999 https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 gar
-
 NAME = pkgutil
 VERSION = 2.4
-GARVERSION = $(VERSION)
 CATEGORIES = utils
 
 DESCRIPTION = Installs Solaris packages easily
@@ -17,11 +13,16 @@
 # Disable inclusion of CSWcommon by default.
 COMMON_PKG_DEPENDS = 
 
-#MASTER_SITES = $(SF_MIRRORS)
-MASTER_SITES = http://sourceforge.net/projects/pkgutil/files/pkgutil/2.4/
+MASTER_SITES = $(SF_MIRRORS)
+#MASTER_SITES = http://sourceforge.net/projects/pkgutil/files/pkgutil/2.4/
 DISTFILES  = $(NAME)-$(VERSION).zip
 
-DISTFILES += $(call admfiles,CSWpkgutil,prototype preremove postinstall)
+#DISTFILES += $(call admfiles,CSWpkgutil,prototype preremove postinstall)
+#DISTFILES += CSWpkgutil.prototype
+DISTFILES += CSWpkgutil.postinstall
+DISTFILES += CSWpkgutil.preremove
+DISTFILES += COPYING
+
 #DISTFILES += $(call admfiles,CSWpkgutil,preremove postinstall)
 #ifeq ($(shell uname -p), sparc)
 #  DISTFILES += CSWpkgutilsparc.prototype
@@ -33,26 +34,36 @@
 DISTFILES += opencsw.py
 DISTFILES += cswcatalog
 
-PACKAGING_PLATFORMS = solaris8-sparc solaris8-i386
+PACKAGES               = CSWpkgutil
+CATALOGNAME_CSWpkgutil = pkgutil
+SPKG_DESC_CSWpkgutil   = $(DESCRIPTION)
+ARCHALL_CSWpkgutil     = 1
 
-CHECKPKG_OVERRIDES_CSWpkgutilplus += unidentified-dependency|CSWpmstringapprox
-CHECKPKG_OVERRIDES_CSWpkgutilplus += surplus-dependency|CSWpmstringapprox
+PACKAGES                  += CSWpkgutilplus
+CATALOGNAME_CSWpkgutilplus = pkgutilplus
+SPKG_DESC_CSWpkgutilplus   = Extends pkgutil functionality
+ARCHALL_CSWpkgutilplus     = 1
+
+# Explicitly depend on CSWcommon here since it's not the default
+RUNTIME_DEP_PKGS_CSWpkgutilplus   = CSWcommon CSWperl CSWgnupg CSWpkgutil
+RUNTIME_DEP_PKGS_CSWpkgutilplus  += CSWcswpkgloghooks CSWpython CSWpmstringapprox
+#RUNTIME_DEP_PKGS_CSWpkgutilplus += CSWpmwwwcurl
+
+CHECKPKG_OVERRIDES_CSWpkgutil += file-with-bad-content|/usr/local|root/opt/csw/bin/pkgutil
+CHECKPKG_OVERRIDES_CSWpkgutil += discouraged-path-in-pkgmap|/opt/csw/var/pkgutil
+CHECKPKG_OVERRIDES_CSWpkgutil += discouraged-path-in-pkgmap|/opt/csw/var/pkgutil/admin.CSW
+CHECKPKG_OVERRIDES_CSWpkgutil += archall-with-arch-paths|/opt/csw/libexec/pkgutil/wget-i386
+CHECKPKG_OVERRIDES_CSWpkgutil += archall-with-binaries|opt/csw/libexec/pkgutil/wget-i386
+CHECKPKG_OVERRIDES_CSWpkgutil += archall-with-binaries|opt/csw/libexec/pkgutil/wget-sparc
+CHECKPKG_OVERRIDES_CSWpkgutil += binary-wrong-architecture|file=opt/csw/libexec/pkgutil/wget-i386|pkginfo-says=all|actual-binary=i386
+CHECKPKG_OVERRIDES_CSWpkgutil += binary-wrong-architecture|file=opt/csw/libexec/pkgutil/wget-sparc|pkginfo-says=all|actual-binary=sparc
 CHECKPKG_OVERRIDES_CSWpkgutilplus += surplus-dependency|CSWperl
 CHECKPKG_OVERRIDES_CSWpkgutilplus += surplus-dependency|CSWcswpkgloghooks
 CHECKPKG_OVERRIDES_CSWpkgutilplus += surplus-dependency|CSWgnupg
+CHECKPKG_OVERRIDES_CSWpkgutilplus += surplus-dependency|CSWpmstringapprox
 CHECKPKG_OVERRIDES_CSWpkgutilplus += surplus-dependency|CSWpkgutil
-CHECKPKG_OVERRIDES_CSWpkgutil += disallowed-path
+CHECKPKG_OVERRIDES_CSWpkgutilplus += file-with-bad-content|/export/home|root/opt/csw/bin/cswcatalog
 
-PACKAGES = CSWpkgutil CSWpkgutilplus
-
-SPKG_DESC_CSWpkgutil = $(DESCRIPTION)
-SPKG_DESC_CSWpkgutilplus = Extends pkgutil functionality
-
-# Explicitly depend on CSWcommon here since it's not the default
-RUNTIME_DEP_PKGS_CSWpkgutilplus  = CSWcommon CSWperl CSWgnupg CSWpkgutil
-RUNTIME_DEP_PKGS_CSWpkgutilplus += CSWcswpkgloghooks CSWpython CSWpmstringapprox
-#RUNTIME_DEP_PKGS_CSWpkgutilplus += CSWpmwwwcurl
-
 PKGFILES_CSWpkgutilplus  = .*bldcat.*
 PKGFILES_CSWpkgutilplus += .*chkcat.*
 PKGFILES_CSWpkgutilplus += .*pkgutilplus.*
@@ -60,8 +71,6 @@
 PKGFILES_CSWpkgutilplus += .*opencsw.py
 PKGFILES_CSWpkgutilplus += .*cswcatalog
 
-ARCHALL_CSWpkgutilplus = 1
-
 CONFIGURE_SCRIPTS =
 BUILD_SCRIPTS =
 TEST_SCRIPTS =
@@ -70,7 +79,7 @@
 include gar/category.mk
 
 WORKSRC = $(WORKDIR)
-SPKG_SOURCEURL = http://pkgutil.wikidot.com/
+SPKG_SOURCEURL = http://pkgutil.net/
 
 install-custom:
 	@echo " ==> Installing $(NAME) (custom)"
@@ -84,8 +93,8 @@
 	@ginstall -m 755 -d $(DESTDIR)/opt/csw/etc
 	@ginstall -m 644 $(WORKSRC)/$(NAME).conf $(DESTDIR)/opt/csw/etc/$(NAME).conf.CSW
 	@ginstall -m 755 -d $(DESTDIR)/opt/csw/libexec/$(NAME)
-#	@ginstall -m 755 $(WORKSRC)/wget-`uname -p` $(DESTDIR)/opt/csw/libexec/$(NAME)/
-	@ginstall -m 755 $(WORKSRC)/wget-`uname -p` $(DESTDIR)/opt/csw/libexec/$(NAME)/wget
+	@ginstall -m 755 $(WORKSRC)/wget-* $(DESTDIR)/opt/csw/libexec/$(NAME)/
+#	@ginstall -m 755 $(WORKSRC)/wget-`uname -p` $(DESTDIR)/opt/csw/libexec/$(NAME)/wget
 	@ginstall -m 755 $(FILEDIR)/build_sun_catalog.py $(FILEDIR)/opencsw.py $(DESTDIR)/opt/csw/libexec/$(NAME)
 	@ln -s ../libexec/pkgutil/build_sun_catalog.py $(DESTDIR)$(bindir)/build_sun_catalog
 	@ginstall -m 755 -d $(DESTDIR)$(docdir)/$(NAME)

Modified: csw/mgar/pkg/pkgutil/trunk/checksums
===================================================================
--- csw/mgar/pkg/pkgutil/trunk/checksums	2011-06-29 15:51:35 UTC (rev 14943)
+++ csw/mgar/pkg/pkgutil/trunk/checksums	2011-06-29 21:27:38 UTC (rev 14944)
@@ -1,8 +1 @@
-a16c6f81bc537d6172fd65d8da1aeecc  CSWpkgutil.gspec
-27c7b032074b150935681e921b7b5774  CSWpkgutil.postinstall
-9f8c677877f3c86c41dc3955c9c36ea0  CSWpkgutil.preremove
-ce3d565aaf32be17716a9869087dec5c  CSWpkgutil.prototype
-b5fffa0be100ddbb7262ce3a0a4e3bb7  build_sun_catalog.py
-7ad27336f90e73da3254a61d91025ee5  cswcatalog
-3a6b789b3d5e05f41d2363dd26a92acf  opencsw.py
 e87b64770282e68713692dce6e0808c3  pkgutil-2.4.zip

Added: csw/mgar/pkg/pkgutil/trunk/files/COPYING
===================================================================
--- csw/mgar/pkg/pkgutil/trunk/files/COPYING	                        (rev 0)
+++ csw/mgar/pkg/pkgutil/trunk/files/COPYING	2011-06-29 21:27:38 UTC (rev 14944)
@@ -0,0 +1,3 @@
+
+Please see /opt/csw/share/doc/pkgutil/license for license information.
+

Modified: csw/mgar/pkg/pkgutil/trunk/files/CSWpkgutil.prototype
===================================================================
--- csw/mgar/pkg/pkgutil/trunk/files/CSWpkgutil.prototype	2011-06-29 15:51:35 UTC (rev 14943)
+++ csw/mgar/pkg/pkgutil/trunk/files/CSWpkgutil.prototype	2011-06-29 21:27:38 UTC (rev 14944)
@@ -1,5 +1,6 @@
 i pkginfo=CSWpkgutil.pkginfo
 i copyright=CSWpkgutil.copyright
+i checkpkg_override=CSWpkgutil.checkpkg_override
 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
@@ -11,9 +12,6 @@
 d none /opt/csw/libexec/pkgutil 0755 root bin
 f none /opt/csw/libexec/pkgutil/wget 755 root bin
 d none /opt/csw/share 0755 root bin
-d none /opt/csw/share/checkpkg 0755 root bin
-d none /opt/csw/share/checkpkg/overrides 0755 root bin
-f none /opt/csw/share/checkpkg/overrides/pkgutil 0644 root bin
 d none /opt/csw/share/doc 0755 root bin
 d none /opt/csw/share/doc/pkgutil 0755 root bin
 f none /opt/csw/share/doc/pkgutil/license 444 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