[csw-devel] SF.net SVN: gar:[2374] csw/trunk/utils/pkgutil

[bonivart at users.sourceforge.net]

Revision: 2374
          http://gar.svn.sourceforge.net/gar/?rev=2374&view=rev
Author:   bonivart
Date:     2008-11-28 09:01:26 +0000 (Fri, 28 Nov 2008)

Log Message:
-----------
pkgutil: fixed compare bug

Modified Paths:
--------------
    csw/trunk/utils/pkgutil/Makefile
    csw/trunk/utils/pkgutil/checksums
    csw/trunk/utils/pkgutil/files/CSWpkgutil.gspec
    csw/trunk/utils/pkgutil/files/CSWpkgutil.prototype

Modified: csw/trunk/utils/pkgutil/Makefile
===================================================================
--- csw/trunk/utils/pkgutil/Makefile	2008-11-27 22:48:30 UTC (rev 2373)
+++ csw/trunk/utils/pkgutil/Makefile	2008-11-28 09:01:26 UTC (rev 2374)
@@ -1,5 +1,5 @@
 GARNAME = pkgutil
-GARVERSION = 1.2
+GARVERSION = 1.2.1
 CATEGORIES = utils
 
 DESCRIPTION = install Solaris packages the easy way
@@ -10,16 +10,9 @@
 	package automatically.
 endef
 
-MASTER_SITES = http://mirror.csw.baltic-online.de/testing/pkgutil/
-DISTFILES  = $(GARNAME)
-DISTFILES += $(GARNAME).conf
-DISTFILES += admin
-DISTFILES += bldcat
-DISTFILES += chkcat
-DISTFILES += readme
-DISTFILES += wget-i386
-DISTFILES += wget-sparc
-DISTFILES += $(call admfiles,CSWpkgutil,preremove postinstall prototype)
+MASTER_SITES = http://www.bonivart.com/pkgutil/
+DISTFILES  = $(GARNAME)-$(GARVERSION).zip
+DISTFILES += $(call admfiles,CSWpkgutil,prototype postinstall preremove)
 
 CONFIGURE_SCRIPTS =
 BUILD_SCRIPTS =
@@ -30,28 +23,29 @@
 
 WORKSRC = $(WORKDIR)
 SPKG_SOURCEURL = http://wiki.opencsw.org/pkgutil/
+SPKG_CLASSES = none cswpkgutil
 
 install-custom:
 	@echo " ==> Installing $(GARNAME) (custom)"
 	@rm -rf $(DESTDIR)
 	@ginstall -d $(DESTDIR)/etc/opt/csw
-	@ginstall -d $(DESTDIR)/opt/csw
 	@ginstall -d $(DESTDIR)/opt/csw/bin
+	@ginstall -d $(DESTDIR)/opt/csw/etc
 	@ginstall -d $(DESTDIR)/opt/csw/libexec/pkgutil
-	@ginstall -d $(DESTDIR)/opt/csw/share
-	@ginstall -d $(DESTDIR)/opt/csw/share/doc
 	@ginstall -d $(DESTDIR)/opt/csw/share/doc/pkgutil
-	@ginstall -d $(DESTDIR)$(mandir)
 	@ginstall -d $(DESTDIR)$(mandir)/man1
-	@ginstall -d $(DESTDIR)/var/opt/csw/pkgutil
+	@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/copyright
+	@cp -r $(FILEDIR)/CSWpkgutil.copyright $(DESTDIR)/opt/csw/share/doc/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
 	@$(MAKECOOKIE)

Modified: csw/trunk/utils/pkgutil/checksums
===================================================================
--- csw/trunk/utils/pkgutil/checksums	2008-11-27 22:48:30 UTC (rev 2373)
+++ csw/trunk/utils/pkgutil/checksums	2008-11-28 09:01:26 UTC (rev 2374)
@@ -1,12 +1,5 @@
-ee419d0acc7cb0bb6be0b1f861aa5a17  download/pkgutil
-2ea4a4c341f0b4b7a080ae57c130ffbf  download/pkgutil.conf
-5ab40013298d3dfdf67aae728c0ddb8a  download/admin
-f970598b765f791f18adcb60ced9a0f2  download/bldcat
-cbedfa4a3ab5484fda4c450d3d9a4007  download/chkcat
-ca48f243fd4a13375e4693f624fd36d2  download/readme
-b9076776ad4f99a5d84cf081f9a202df  download/wget-i386
-e0234bcebb3c01fc0a93b4866fd162d1  download/wget-sparc
-08b5df7798ad7903e2f278e0cfcc25e3  download/CSWpkgutil.gspec
-5b83368c47fc309a69a1a5020d55385b  download/CSWpkgutil.preremove
+0a6b4b39688a67617ffa39eb4ec2e8d0  download/pkgutil-1.2.1.zip
+805cd30ad9f21cb1167d166fa99b5891  download/CSWpkgutil.gspec
+0633b5672d89536454f92b8e8c40eabf  download/CSWpkgutil.prototype
 bea1e5ef39a8389b9feaa18938993205  download/CSWpkgutil.postinstall
-c0d83d0a12db6bbe50a1b52471d9c80a  download/CSWpkgutil.prototype
+5b83368c47fc309a69a1a5020d55385b  download/CSWpkgutil.preremove

Modified: csw/trunk/utils/pkgutil/files/CSWpkgutil.gspec
===================================================================
--- csw/trunk/utils/pkgutil/files/CSWpkgutil.gspec	2008-11-27 22:48:30 UTC (rev 2373)
+++ csw/trunk/utils/pkgutil/files/CSWpkgutil.gspec	2008-11-28 09:01:26 UTC (rev 2374)
@@ -6,5 +6,5 @@
 %prototype	url file://%{FILEDIR}/CSWpkgutil.prototype
 %copyright
 
-Please see /opt/csw/share/doc/pkgutil/copyright for license information.
+Please see /opt/csw/share/doc/pkgutil/LICENSE for license information.
 

Modified: csw/trunk/utils/pkgutil/files/CSWpkgutil.prototype
===================================================================
--- csw/trunk/utils/pkgutil/files/CSWpkgutil.prototype	2008-11-27 22:48:30 UTC (rev 2373)
+++ csw/trunk/utils/pkgutil/files/CSWpkgutil.prototype	2008-11-28 09:01:26 UTC (rev 2374)
@@ -15,7 +15,7 @@
 d none /opt/csw/share 0755 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/copyright 644 root bin
+f none /opt/csw/share/doc/pkgutil/LICENSE 644 root bin
 f none /opt/csw/share/doc/pkgutil/readme 644 root bin
 d none /opt/csw/share/man 0755 root bin
 d none /opt/csw/share/man/man1 0755 root bin


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