From rthurner at users.sourceforge.net Fri Jan 1 11:36:42 2010 From: rthurner at users.sourceforge.net (rthurner at users.sourceforge.net) Date: Fri, 01 Jan 2010 10:36:42 +0000 Subject: [csw-devel] SF.net SVN: gar:[7805] csw/mgar/pkg/cmake/trunk Message-ID: Revision: 7805 http://gar.svn.sourceforge.net/gar/?rev=7805&view=rev Author: rthurner Date: 2010-01-01 10:36:36 +0000 (Fri, 01 Jan 2010) Log Message: ----------- cmake - upgrade to cmake-2.8.0 Modified Paths: -------------- csw/mgar/pkg/cmake/trunk/Makefile csw/mgar/pkg/cmake/trunk/checksums Modified: csw/mgar/pkg/cmake/trunk/Makefile =================================================================== --- csw/mgar/pkg/cmake/trunk/Makefile 2009-12-31 16:49:02 UTC (rev 7804) +++ csw/mgar/pkg/cmake/trunk/Makefile 2010-01-01 10:36:36 UTC (rev 7805) @@ -1,5 +1,5 @@ GARNAME = cmake -GARVERSION = 2.6.3 +GARVERSION = 2.8.0 CATEGORIES = devel DESCRIPTION = Cross-platform make @@ -13,8 +13,8 @@ endef RELVER = $(shell echo $(GARVERSION) |gsed 's/\(^[0-9].*\)\.[0-9]*/\1/') -SPKG_SOURCEURL = http://www.cmake.org/ -MASTER_SITES = http://www.cmake.org/files/v$(RELVER)/ +SPKG_SOURCEURL = http://cmake.org/ +MASTER_SITES = http://cmake.org/files/v$(RELVER)/ DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz PACKAGES = CSWcmake Modified: csw/mgar/pkg/cmake/trunk/checksums =================================================================== --- csw/mgar/pkg/cmake/trunk/checksums 2009-12-31 16:49:02 UTC (rev 7804) +++ csw/mgar/pkg/cmake/trunk/checksums 2010-01-01 10:36:36 UTC (rev 7805) @@ -1 +1 @@ -5ba47a94ce276f326abca1fd72a7e7c6 download/cmake-2.6.3.tar.gz +3b3679b8a6afaedc38a8c15dd7ff4fcf cmake-2.8.0.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Fri Jan 1 12:04:45 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 01 Jan 2010 11:04:45 +0000 Subject: [csw-devel] SF.net SVN: gar:[7806] csw/mgar/pkg/readline/tags/readline-6.0, REV=2009.03. 31/ Message-ID: Revision: 7806 http://gar.svn.sourceforge.net/gar/?rev=7806&view=rev Author: dmichelsen Date: 2010-01-01 11:04:45 +0000 (Fri, 01 Jan 2010) Log Message: ----------- readline: Tag readline-6.0,REV=2009.03.31 Added Paths: ----------- csw/mgar/pkg/readline/tags/readline-6.0,REV=2009.03.31/ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Fri Jan 1 12:08:41 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 01 Jan 2010 11:08:41 +0000 Subject: [csw-devel] SF.net SVN: gar:[7807] csw/mgar/pkg/readline/trunk Message-ID: Revision: 7807 http://gar.svn.sourceforge.net/gar/?rev=7807&view=rev Author: dmichelsen Date: 2010-01-01 11:08:41 +0000 (Fri, 01 Jan 2010) Log Message: ----------- readline: Update to 6.1 Modified Paths: -------------- csw/mgar/pkg/readline/trunk/Makefile csw/mgar/pkg/readline/trunk/checksums Modified: csw/mgar/pkg/readline/trunk/Makefile =================================================================== --- csw/mgar/pkg/readline/trunk/Makefile 2010-01-01 11:04:45 UTC (rev 7806) +++ csw/mgar/pkg/readline/trunk/Makefile 2010-01-01 11:08:41 UTC (rev 7807) @@ -1,9 +1,9 @@ GARNAME = readline -GARVERSION = 6.0 +GARVERSION = 6.1 CATEGORIES = lib EXTRA_MODULATORS = GARVERSION -MODULATIONS_GARVERSION = 4.3 5.2 6.0 +MODULATIONS_GARVERSION = 4.3 5.2 6.1 DESCRIPTION = GNU readline define BLURB @@ -18,10 +18,10 @@ MASTER_SITES = $(GNU_MIRROR) DISTFILES = $(foreach V,$(MODULATIONS_GARVERSION),$(GARNAME)-$(V).tar.gz) -PATCHFILES_isa-sparcv8-garversion-6.0 = patch-history.3.diff -PATCHFILES_isa-sparcv9-garversion-6.0 = patch-history.3.diff -PATCHFILES_isa-i386-garversion-6.0 = patch-history.3.diff -PATCHFILES_isa-amd64-garversion-6.0 = patch-history.3.diff +PATCHFILES_isa-sparcv8-garversion-6.1 = patch-history.3.diff +PATCHFILES_isa-sparcv9-garversion-6.1 = patch-history.3.diff +PATCHFILES_isa-i386-garversion-6.1 = patch-history.3.diff +PATCHFILES_isa-amd64-garversion-6.1 = patch-history.3.diff REQUIRED_PKGS = CSWncurses @@ -37,34 +37,20 @@ TEST_TARGET = check -MERGE_SCRIPTS_isa-i386-garversion-4.3 = copy-only -MERGE_DIRS_isa-i386-garversion-4.3 = $(libdir) -MERGE_SCRIPTS_isa-amd64-garversion-4.3 = copy-relocated-only -MERGE_DIRS_isa-amd64-garversion-4.3 = $(libdir) +MERGE_SCRIPTS_isa-default-garversion-4.3 = copy-only +MERGE_DIRS_isa-default-garversion-4.3 = $(libdir) +MERGE_SCRIPTS_isa-default64-garversion-4.3 = copy-relocated-only +MERGE_DIRS_isa-default64-garversion-4.3 = $(libdir) -MERGE_SCRIPTS_isa-i386-garversion-5.2 = copy-only -MERGE_DIRS_isa-i386-garversion-5.2 = $(libdir) -MERGE_SCRIPTS_isa-amd64-garversion-5.2 = copy-relocated-only -MERGE_DIRS_isa-amd64-garversion-5.2 = $(libdir) +MERGE_SCRIPTS_default-i386-garversion-5.2 = copy-only +MERGE_DIRS_isa-default-garversion-5.2 = $(libdir) +MERGE_SCRIPTS_isa-default64-garversion-5.2 = copy-relocated-only +MERGE_DIRS_isa-default64-garversion-5.2 = $(libdir) -MERGE_SCRIPTS_isa-i386-garversion-6.0 = copy-all -MERGE_SCRIPTS_isa-amd64-garversion-6.0 = copy-relocated-only -MERGE_DIRS_isa-amd64-garversion-6.0 = $(bindir) $(sbindir) $(libexecdir) $(libdir) +MERGE_SCRIPTS_isa-default-garversion-6.1 = copy-all +MERGE_SCRIPTS_isa-default64-garversion-6.1 = copy-relocated-only +MERGE_DIRS_isa-default64-garversion-6.1 = $(bindir) $(sbindir) $(libexecdir) $(libdir) -MERGE_SCRIPTS_isa-sparcv8-garversion-4.3 = copy-only -MERGE_DIRS_isa-sparcv8-garversion-4.3 = $(libdir) -MERGE_SCRIPTS_isa-sparcv9-garversion-4.3 = copy-relocated-only -MERGE_DIRS_isa-sparcv9-garversion-4.3 = $(libdir) - -MERGE_SCRIPTS_isa-sparcv8-garversion-5.2 = copy-only -MERGE_DIRS_isa-sparcv8-garversion-5.2 = $(libdir) -MERGE_SCRIPTS_isa-sparcv9-garversion-5.2 = copy-relocated-only -MERGE_DIRS_isa-sparcv9-garversion-5.2 = $(libdir) - -MERGE_SCRIPTS_isa-sparcv8-garversion-6.0 = copy-all -MERGE_SCRIPTS_isa-sparcv9-garversion-6.0 = copy-relocated-only -MERGE_DIRS_isa-sparcv9-garversion-6.0 = $(bindir) $(sbindir) $(libexecdir) $(libdir) - SPKG_SOURCEURL = http://tiswww.case.edu/php/chet/readline/rltop.html include gar/category.mk Modified: csw/mgar/pkg/readline/trunk/checksums =================================================================== --- csw/mgar/pkg/readline/trunk/checksums 2010-01-01 11:04:45 UTC (rev 7806) +++ csw/mgar/pkg/readline/trunk/checksums 2010-01-01 11:08:41 UTC (rev 7807) @@ -1,4 +1,4 @@ -f86f7cb717ab321fe15f1bbcb058c11e download/readline-4.3.tar.gz -e39331f32ad14009b9ff49cc10c5e751 download/readline-5.2.tar.gz -b7f65a48add447693be6e86f04a63019 download/readline-6.0.tar.gz -8db909e6af79c3f5c266fad1972b4e41 download/patch-history.3.diff +8db909e6af79c3f5c266fad1972b4e41 patch-history.3.diff +f86f7cb717ab321fe15f1bbcb058c11e readline-4.3.tar.gz +e39331f32ad14009b9ff49cc10c5e751 readline-5.2.tar.gz +fc2f7e714fe792db1ce6ddc4c9fb4ef3 readline-6.1.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Fri Jan 1 14:42:49 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 01 Jan 2010 13:42:49 +0000 Subject: [csw-devel] SF.net SVN: gar:[7808] csw/mgar/pkg/readline/trunk/Makefile Message-ID: Revision: 7808 http://gar.svn.sourceforge.net/gar/?rev=7808&view=rev Author: dmichelsen Date: 2010-01-01 13:42:49 +0000 (Fri, 01 Jan 2010) Log Message: ----------- readline: Fix typo Modified Paths: -------------- csw/mgar/pkg/readline/trunk/Makefile Modified: csw/mgar/pkg/readline/trunk/Makefile =================================================================== --- csw/mgar/pkg/readline/trunk/Makefile 2010-01-01 11:08:41 UTC (rev 7807) +++ csw/mgar/pkg/readline/trunk/Makefile 2010-01-01 13:42:49 UTC (rev 7808) @@ -42,7 +42,7 @@ MERGE_SCRIPTS_isa-default64-garversion-4.3 = copy-relocated-only MERGE_DIRS_isa-default64-garversion-4.3 = $(libdir) -MERGE_SCRIPTS_default-i386-garversion-5.2 = copy-only +MERGE_SCRIPTS_isa-deafult-garversion-5.2 = copy-only MERGE_DIRS_isa-default-garversion-5.2 = $(libdir) MERGE_SCRIPTS_isa-default64-garversion-5.2 = copy-relocated-only MERGE_DIRS_isa-default64-garversion-5.2 = $(libdir) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Fri Jan 1 14:49:30 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 01 Jan 2010 13:49:30 +0000 Subject: [csw-devel] SF.net SVN: gar:[7809] csw/mgar/pkg/readline/trunk/Makefile Message-ID: Revision: 7809 http://gar.svn.sourceforge.net/gar/?rev=7809&view=rev Author: dmichelsen Date: 2010-01-01 13:49:30 +0000 (Fri, 01 Jan 2010) Log Message: ----------- readline: Fix typo ...again :-( Modified Paths: -------------- csw/mgar/pkg/readline/trunk/Makefile Modified: csw/mgar/pkg/readline/trunk/Makefile =================================================================== --- csw/mgar/pkg/readline/trunk/Makefile 2010-01-01 13:42:49 UTC (rev 7808) +++ csw/mgar/pkg/readline/trunk/Makefile 2010-01-01 13:49:30 UTC (rev 7809) @@ -42,7 +42,7 @@ MERGE_SCRIPTS_isa-default64-garversion-4.3 = copy-relocated-only MERGE_DIRS_isa-default64-garversion-4.3 = $(libdir) -MERGE_SCRIPTS_isa-deafult-garversion-5.2 = copy-only +MERGE_SCRIPTS_isa-default-garversion-5.2 = copy-only MERGE_DIRS_isa-default-garversion-5.2 = $(libdir) MERGE_SCRIPTS_isa-default64-garversion-5.2 = copy-relocated-only MERGE_DIRS_isa-default64-garversion-5.2 = $(libdir) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Fri Jan 1 14:54:45 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 01 Jan 2010 13:54:45 +0000 Subject: [csw-devel] SF.net SVN: gar:[7810] csw/mgar/pkg/libgcrypt/trunk/Makefile Message-ID: Revision: 7810 http://gar.svn.sourceforge.net/gar/?rev=7810&view=rev Author: dmichelsen Date: 2010-01-01 13:54:45 +0000 (Fri, 01 Jan 2010) Log Message: ----------- libgcrypt: Fix typo in catalog name Modified Paths: -------------- csw/mgar/pkg/libgcrypt/trunk/Makefile Modified: csw/mgar/pkg/libgcrypt/trunk/Makefile =================================================================== --- csw/mgar/pkg/libgcrypt/trunk/Makefile 2010-01-01 13:49:30 UTC (rev 7809) +++ csw/mgar/pkg/libgcrypt/trunk/Makefile 2010-01-01 13:54:45 UTC (rev 7810) @@ -11,7 +11,7 @@ DISTFILES = $(GARNAME)-$(GARVERSION).tar.bz2 PACKAGES = CSWgcrypt -CATALOGNAME = llibgcrypt +CATALOGNAME = libgcrypt SPKG_SOURCEURL = http://www.gnupg.org/related_software/libraries.en.html#lib-libgcrypt This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From rthurner at users.sourceforge.net Fri Jan 1 15:03:34 2010 From: rthurner at users.sourceforge.net (rthurner at users.sourceforge.net) Date: Fri, 01 Jan 2010 14:03:34 +0000 Subject: [csw-devel] SF.net SVN: gar:[7811] csw/mgar/pkg Message-ID: Revision: 7811 http://gar.svn.sourceforge.net/gar/?rev=7811&view=rev Author: rthurner Date: 2010-01-01 14:03:34 +0000 (Fri, 01 Jan 2010) Log Message: ----------- kde4libs - first try of kdelibs, kde4 Added Paths: ----------- csw/mgar/pkg/kde4libs/ csw/mgar/pkg/kde4libs/branches/ csw/mgar/pkg/kde4libs/tags/ csw/mgar/pkg/kde4libs/trunk/ csw/mgar/pkg/kde4libs/trunk/Makefile csw/mgar/pkg/kde4libs/trunk/checksums csw/mgar/pkg/kde4libs/trunk/files/ Property changes on: csw/mgar/pkg/kde4libs/trunk ___________________________________________________________________ Added: svn:ignore + cookies download work Added: svn:externals + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 Added: csw/mgar/pkg/kde4libs/trunk/Makefile =================================================================== --- csw/mgar/pkg/kde4libs/trunk/Makefile (rev 0) +++ csw/mgar/pkg/kde4libs/trunk/Makefile 2010-01-01 14:03:34 UTC (rev 7811) @@ -0,0 +1,10 @@ +GARNAME = kde4libs +DISTNAME = kdelibs +CATEGORIES = kde4 + +DESCRIPTION = Brief description +define BLURB + Long description +endef + +include gar/category.mk Added: csw/mgar/pkg/kde4libs/trunk/checksums =================================================================== --- csw/mgar/pkg/kde4libs/trunk/checksums (rev 0) +++ csw/mgar/pkg/kde4libs/trunk/checksums 2010-01-01 14:03:34 UTC (rev 7811) @@ -0,0 +1 @@ +bc781838ad8cafa479e99139f7f403f3 kdelibs-4.3.4.tar.bz2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From rthurner at users.sourceforge.net Fri Jan 1 15:04:23 2010 From: rthurner at users.sourceforge.net (rthurner at users.sourceforge.net) Date: Fri, 01 Jan 2010 14:04:23 +0000 Subject: [csw-devel] SF.net SVN: gar:[7812] csw/mgar/gar/v2/categories Message-ID: Revision: 7812 http://gar.svn.sourceforge.net/gar/?rev=7812&view=rev Author: rthurner Date: 2010-01-01 14:04:23 +0000 (Fri, 01 Jan 2010) Log Message: ----------- kde4 - add new category for kde4 builds Added Paths: ----------- csw/mgar/gar/v2/categories/kde4/ csw/mgar/gar/v2/categories/kde4/category.mk Removed Paths: ------------- csw/mgar/gar/v2/categories/kde4/category.mk Deleted: csw/mgar/gar/v2/categories/kde4/category.mk =================================================================== --- csw/mgar/gar/v2/categories/kde/category.mk 2009-12-20 15:40:36 UTC (rev 7684) +++ csw/mgar/gar/v2/categories/kde4/category.mk 2010-01-01 14:04:23 UTC (rev 7812) @@ -1,16 +0,0 @@ - -# KDE -KDE_ROOT = http://download.kde.org -KDE_VERSION = 3.5.2 -KDE_DIST = stable -KDE_MIRROR = $(KDE_ROOT)/$(KDE_DIST)/$(KDE_VERSION)/src/ - -MASTER_SITES ?= $(KDE_MIRROR) -GARVERSION ?= $(KDE_VERSION) -PKGDIST ?= $(GARNAME)-$(GARVERSION).tar.bz2 -DISTFILES += $(PKGDIST) - -# Compiler -GARCOMPILER = GNU - -include gar/gar.mk Copied: csw/mgar/gar/v2/categories/kde4/category.mk (from rev 7739, csw/mgar/gar/v2/categories/kde/category.mk) =================================================================== --- csw/mgar/gar/v2/categories/kde4/category.mk (rev 0) +++ csw/mgar/gar/v2/categories/kde4/category.mk 2010-01-01 14:04:23 UTC (rev 7812) @@ -0,0 +1,16 @@ + +# KDE +KDE_ROOT = http://download.kde.org +KDE_VERSION = 4.3.4 +KDE_DIST = stable +KDE_MIRROR = $(KDE_ROOT)/$(KDE_DIST)/$(KDE_VERSION)/src/ + +MASTER_SITES ?= $(KDE_MIRROR) +GARVERSION ?= $(KDE_VERSION) +PKGDIST ?= $(DISTNAME)-$(GARVERSION).tar.bz2 +DISTFILES += $(PKGDIST) + +# Compiler +GARCOMPILER = GNU + +include gar/gar.mk This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From rthurner at users.sourceforge.net Fri Jan 1 18:07:39 2010 From: rthurner at users.sourceforge.net (rthurner at users.sourceforge.net) Date: Fri, 01 Jan 2010 17:07:39 +0000 Subject: [csw-devel] SF.net SVN: gar:[7813] csw/mgar/pkg/apr/trunk/Makefile Message-ID: Revision: 7813 http://gar.svn.sourceforge.net/gar/?rev=7813&view=rev Author: rthurner Date: 2010-01-01 17:07:39 +0000 (Fri, 01 Jan 2010) Log Message: ----------- apr - remove layout Modified Paths: -------------- csw/mgar/pkg/apr/trunk/Makefile Modified: csw/mgar/pkg/apr/trunk/Makefile =================================================================== --- csw/mgar/pkg/apr/trunk/Makefile 2010-01-01 14:04:23 UTC (rev 7812) +++ csw/mgar/pkg/apr/trunk/Makefile 2010-01-01 17:07:39 UTC (rev 7813) @@ -17,35 +17,10 @@ BUILD64 = 1 -CONFIGURE_ARGS = --prefix=$(prefix) -CONFIGURE_ARGS += --enable-layout=csw +CONFIGURE_ARGS = $(DIRPATHS) CONFIGURE_ARGS += --enable-threads CONFIGURE_ARGS += --enable-other-child TEST_TARGET = check include gar/category.mk - -post-extract-modulated: - ginstall -d $(WORKSRC) - (echo "# csw layout";\ - echo "";\ - echo " prefix: $(prefix)";\ - echo " exec_prefix: $(exec_prefix)";\ - echo " bindir: $(bindir)";\ - echo " sbindir: $(sbindir)";\ - echo " libdir: $(libdir)";\ - echo " libexecdir: $(libdir)/apr/modules";\ - echo " mandir: $(mandir)";\ - echo " datadir: $(datadir)/apr";\ - echo " includedir: $(includedir)/apr-$${APR_MAJOR_VERSION}";\ - echo " localstatedir: /var/run";\ - echo " runtimedir: /var/run";\ - echo " infodir: $(infodir)";\ - echo " libsuffix: -$${APR_MAJOR_VERSION}";\ - echo "") >$(WORKSRC)/config.layout - @$(MAKECOOKIE) - -post-install-modulated: - gln -s apr-1-config $(DESTDIR)$(bindir)/apr-config - @$(MAKECOOKIE) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Fri Jan 1 23:12:54 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 01 Jan 2010 22:12:54 +0000 Subject: [csw-devel] SF.net SVN: gar:[7814] csw/mgar/pkg/ncftp/trunk Message-ID: Revision: 7814 http://gar.svn.sourceforge.net/gar/?rev=7814&view=rev Author: dmichelsen Date: 2010-01-01 22:12:41 +0000 (Fri, 01 Jan 2010) Log Message: ----------- ncftp: Update to 3.2.3 Modified Paths: -------------- csw/mgar/pkg/ncftp/trunk/Makefile csw/mgar/pkg/ncftp/trunk/checksums Removed Paths: ------------- csw/mgar/pkg/ncftp/trunk/files/CSWncftp.depend csw/mgar/pkg/ncftp/trunk/files/CSWncftp.gspec csw/mgar/pkg/ncftp/trunk/files/Makefile.in.diff Property Changed: ---------------- csw/mgar/pkg/ncftp/trunk/ Property changes on: csw/mgar/pkg/ncftp/trunk ___________________________________________________________________ Modified: svn:externals - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v1 + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 Modified: csw/mgar/pkg/ncftp/trunk/Makefile =================================================================== --- csw/mgar/pkg/ncftp/trunk/Makefile 2010-01-01 17:07:39 UTC (rev 7813) +++ csw/mgar/pkg/ncftp/trunk/Makefile 2010-01-01 22:12:41 UTC (rev 7814) @@ -1,5 +1,5 @@ GARNAME = ncftp -GARVERSION = 3.2.0 +GARVERSION = 3.2.3 CATEGORIES = net DESCRIPTION = File Transfer Protocol (FTP) client applications. @@ -10,18 +10,19 @@ endef MASTER_SITES = ftp://ftp.ncftp.com/ncftp/ -DISTFILES = $(GARNAME)-$(GARVERSION)-src.tar.bz2 -DISTFILES += $(call admfiles,CSWncftp,depend) +DISTFILES = $(DISTNAME)-src.tar.bz2 # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*)-src.tar.bz2 -WORKSRC = $(WORKDIR)/$(GARNAME)-$(GARVERSION) +REQUIRED_PKGS = CSWgtar -CONFIGURE_ARGS = $(DIRPATHS) --without-ncurses +LICENSE = doc/LICENSE.txt -PATCHFILES = Makefile.in.diff +SPKG_SOURCEURL = http://www.ncftp.com/ +CONFIGURE_ARGS = $(DIRPATHS) + # No test target in the makefile TEST_SCRIPTS = Modified: csw/mgar/pkg/ncftp/trunk/checksums =================================================================== --- csw/mgar/pkg/ncftp/trunk/checksums 2010-01-01 17:07:39 UTC (rev 7813) +++ csw/mgar/pkg/ncftp/trunk/checksums 2010-01-01 22:12:41 UTC (rev 7814) @@ -1,4 +1 @@ -384b7f01d725c89ccd30692628b3ac1b download/ncftp-3.2.0-src.tar.bz2 -22825be4246e37b86d4b5ad58f63974a download/CSWncftp.gspec -f52b45c3c795753b4ce943dc304b49d5 download/CSWncftp.depend -a0d80d971e7d8f337915e5a90041c4b9 download/Makefile.in.diff +fac4aa169e1734e8d9617afd4a9b51e5 ncftp-3.2.3-src.tar.bz2 Deleted: csw/mgar/pkg/ncftp/trunk/files/CSWncftp.depend =================================================================== --- csw/mgar/pkg/ncftp/trunk/files/CSWncftp.depend 2010-01-01 17:07:39 UTC (rev 7813) +++ csw/mgar/pkg/ncftp/trunk/files/CSWncftp.depend 2010-01-01 22:12:41 UTC (rev 7814) @@ -1 +0,0 @@ -P CSWgtar - gtar - GNU tape archiver Deleted: csw/mgar/pkg/ncftp/trunk/files/CSWncftp.gspec =================================================================== --- csw/mgar/pkg/ncftp/trunk/files/CSWncftp.gspec 2010-01-01 17:07:39 UTC (rev 7813) +++ csw/mgar/pkg/ncftp/trunk/files/CSWncftp.gspec 2010-01-01 22:12:41 UTC (rev 7814) @@ -1,4 +0,0 @@ -%var bitname ncftp -%var pkgname CSWncftp -%include url file://%{PKGLIB}/csw_dyndepend.gspec -%copyright url file://%{WORKSRC}/doc/LICENSE.txt Deleted: csw/mgar/pkg/ncftp/trunk/files/Makefile.in.diff =================================================================== --- csw/mgar/pkg/ncftp/trunk/files/Makefile.in.diff 2010-01-01 17:07:39 UTC (rev 7813) +++ csw/mgar/pkg/ncftp/trunk/files/Makefile.in.diff 2010-01-01 22:12:41 UTC (rev 7814) @@ -1,12 +0,0 @@ -diff --speed-large-files --minimal -Nru ncftp-3.2.0.orig/Makefile.in ncftp-3.2.0/Makefile.in ---- ncftp-3.2.0.orig/Makefile.in 2006-08-05 17:42:30.000000000 -0400 -+++ ncftp-3.2.0/Makefile.in 2006-09-17 09:23:21.647033000 -0400 -@@ -44,7 +44,7 @@ - @( cd ./sh_util ; $(MAKE) "CC=$(CC)" "CFLAGS=$(CFLAGS)" ) - @( cd ./vis ; $(MAKE) "CC=$(CC)" "CFLAGS=$(CFLAGS)" ) - - at test -z "$(DESTDIR)" || mkdir -p "$DESTDIR" 2>/dev/null -- -mkdir "$(DESTDIR)$(prefix)" "$(DESTDIR)$(BINDIR)" "$(DESTDIR)$(SYSCONFDIR)" "$(DESTDIR)$(mandir)" "$(DESTDIR)$(mandir)/man1" 2>/dev/null -+ -mkdir -p "$(DESTDIR)$(prefix)" "$(DESTDIR)$(BINDIR)" "$(DESTDIR)$(SYSCONFDIR)" "$(DESTDIR)$(mandir)" "$(DESTDIR)$(mandir)/man1" 2>/dev/null - - at echo '..... Installing the programs .....' - $(INSTALL_PROGRAM) bin/ncftp at EXEEXT@ "$(DESTDIR)$(BINDIR)/ncftp at EXEEXT@" - $(INSTALL_PROGRAM) bin/ncftpget at EXEEXT@ "$(DESTDIR)$(BINDIR)/ncftpget at EXEEXT@" This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Fri Jan 1 23:59:56 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 01 Jan 2010 22:59:56 +0000 Subject: [csw-devel] SF.net SVN: gar:[7815] csw/mgar/pkg Message-ID: Revision: 7815 http://gar.svn.sourceforge.net/gar/?rev=7815&view=rev Author: dmichelsen Date: 2010-01-01 22:59:56 +0000 (Fri, 01 Jan 2010) Log Message: ----------- fam: Initial commit , does not build yet Added Paths: ----------- csw/mgar/pkg/fam/ csw/mgar/pkg/fam/branches/ csw/mgar/pkg/fam/tags/ csw/mgar/pkg/fam/trunk/ csw/mgar/pkg/fam/trunk/Makefile csw/mgar/pkg/fam/trunk/checksums csw/mgar/pkg/fam/trunk/files/ Property changes on: csw/mgar/pkg/fam/trunk ___________________________________________________________________ Added: svn:ignore + cookies download work Added: svn:externals + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 Added: csw/mgar/pkg/fam/trunk/Makefile =================================================================== --- csw/mgar/pkg/fam/trunk/Makefile (rev 0) +++ csw/mgar/pkg/fam/trunk/Makefile 2010-01-01 22:59:56 UTC (rev 7815) @@ -0,0 +1,27 @@ +GARNAME = fam +GARVERSION = 2.7.0 +CATEGORIES = server + +DESCRIPTION = File Alteration Monitor, daemon and interface library +define BLURB + GUI tools should not mislead the user; they should display the current + state of the system, even when changes to the system originate from outside + of the tools themselves. FAM helps make GUI tools more usable by notifying + them when the files they're interested in are created, modified, executed, + and removed. +endef + +MASTER_SITES = ftp://oss.sgi.com/projects/fam/download/stable/ +DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz + +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + +SPKG_SOURCEURL = http://oss.sgi.com/projects/fam/ + +CONFIGURE_ARGS = $(DIRPATHS) + +CSWfam_etcrpc = "sgi_fam 391002" +CSWfam_inetdconf = "sgi_fam/1-2 stream rpc/tcp wait root $(bindir)/fam fam" + +include gar/category.mk Added: csw/mgar/pkg/fam/trunk/checksums =================================================================== --- csw/mgar/pkg/fam/trunk/checksums (rev 0) +++ csw/mgar/pkg/fam/trunk/checksums 2010-01-01 22:59:56 UTC (rev 7815) @@ -0,0 +1 @@ +1bf3ae6c0c58d3201afc97c6a4834e39 fam-2.7.0.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Sat Jan 2 00:28:32 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 01 Jan 2010 23:28:32 +0000 Subject: [csw-devel] SF.net SVN: gar:[7816] csw/mgar/pkg/squid/tags/squid-squid-2.7, REV=2009.06. 18_STABLE6/ Message-ID: Revision: 7816 http://gar.svn.sourceforge.net/gar/?rev=7816&view=rev Author: dmichelsen Date: 2010-01-01 23:28:32 +0000 (Fri, 01 Jan 2010) Log Message: ----------- squid: Tag squid-2.7,REV=2009.06.18_STABLE6 Added Paths: ----------- csw/mgar/pkg/squid/tags/squid-squid-2.7,REV=2009.06.18_STABLE6/ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From rthurner at users.sourceforge.net Sat Jan 2 09:39:27 2010 From: rthurner at users.sourceforge.net (rthurner at users.sourceforge.net) Date: Sat, 02 Jan 2010 08:39:27 +0000 Subject: [csw-devel] SF.net SVN: gar:[7817] csw/mgar/pkg/mercurial/trunk Message-ID: Revision: 7817 http://gar.svn.sourceforge.net/gar/?rev=7817&view=rev Author: rthurner Date: 2010-01-02 08:39:27 +0000 (Sat, 02 Jan 2010) Log Message: ----------- mercurial-1.4.2 upgrade Modified Paths: -------------- csw/mgar/pkg/mercurial/trunk/Makefile csw/mgar/pkg/mercurial/trunk/checksums Modified: csw/mgar/pkg/mercurial/trunk/Makefile =================================================================== --- csw/mgar/pkg/mercurial/trunk/Makefile 2010-01-01 23:28:32 UTC (rev 7816) +++ csw/mgar/pkg/mercurial/trunk/Makefile 2010-01-02 08:39:27 UTC (rev 7817) @@ -1,5 +1,5 @@ GARNAME = mercurial -GARVERSION = 1.4.1 +GARVERSION = 1.4.2 CATEGORIES = devel DESCRIPTION = Fast, lightweight Source Control Management system Modified: csw/mgar/pkg/mercurial/trunk/checksums =================================================================== --- csw/mgar/pkg/mercurial/trunk/checksums 2010-01-01 23:28:32 UTC (rev 7816) +++ csw/mgar/pkg/mercurial/trunk/checksums 2010-01-02 08:39:27 UTC (rev 7817) @@ -1,3 +1,3 @@ db884ecb306bcbf49b671f880d29c431 CSWmercurial.changelog.CSW d280026d7687f061371e87ff306c97c2 CSWmercurial.gspec -eacffecad59ec145e61a1edf332b3f1f mercurial-1.4.1.tar.gz +cf23b0887f0437c8601d5b89ae4663a6 mercurial-1.4.2.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From rthurner at users.sourceforge.net Sat Jan 2 09:43:33 2010 From: rthurner at users.sourceforge.net (rthurner at users.sourceforge.net) Date: Sat, 02 Jan 2010 08:43:33 +0000 Subject: [csw-devel] SF.net SVN: gar:[7818] csw/mgar/pkg/mercurial/trunk Message-ID: Revision: 7818 http://gar.svn.sourceforge.net/gar/?rev=7818&view=rev Author: rthurner Date: 2010-01-02 08:43:33 +0000 (Sat, 02 Jan 2010) Log Message: ----------- mercurial - remove double depends, changelog file and outdated gspec Modified Paths: -------------- csw/mgar/pkg/mercurial/trunk/Makefile Removed Paths: ------------- csw/mgar/pkg/mercurial/trunk/files/CSWmercurial.changelog.CSW csw/mgar/pkg/mercurial/trunk/files/CSWmercurial.gspec Modified: csw/mgar/pkg/mercurial/trunk/Makefile =================================================================== --- csw/mgar/pkg/mercurial/trunk/Makefile 2010-01-02 08:39:27 UTC (rev 7817) +++ csw/mgar/pkg/mercurial/trunk/Makefile 2010-01-02 08:43:33 UTC (rev 7818) @@ -12,7 +12,7 @@ SPKG_DESC_CSWmercurial = Mercurial -REQUIRED_PKGS_CSWmercurial = CSWpython CSWpython-rt +REQUIRED_PKGS_CSWmercurial = CSWpython # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz Deleted: csw/mgar/pkg/mercurial/trunk/files/CSWmercurial.changelog.CSW =================================================================== --- csw/mgar/pkg/mercurial/trunk/files/CSWmercurial.changelog.CSW 2010-01-02 08:39:27 UTC (rev 7817) +++ csw/mgar/pkg/mercurial/trunk/files/CSWmercurial.changelog.CSW 2010-01-02 08:43:33 UTC (rev 7818) @@ -1,6 +0,0 @@ -mercurial (1.0,REV=2008.03.26) unstable - - * Updated to latest mercurial - * Fixing bug #2813: CGI scripts doesn't use #!/opt/csw/bin/python - - -- Trygve Laugstol Wed Mar 26 15:47:58 CET 2008 Deleted: csw/mgar/pkg/mercurial/trunk/files/CSWmercurial.gspec =================================================================== --- csw/mgar/pkg/mercurial/trunk/files/CSWmercurial.gspec 2010-01-02 08:39:27 UTC (rev 7817) +++ csw/mgar/pkg/mercurial/trunk/files/CSWmercurial.gspec 2010-01-02 08:43:33 UTC (rev 7818) @@ -1,7 +0,0 @@ -%var bitname mercurial -%var pkgname CSWmercurial -%include url file://%{PKGLIB}/csw_dyndepend.gspec -%copyright - -Please see /opt/csw/share/doc/mercurial/LICENSE for license information - This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From rthurner at users.sourceforge.net Sat Jan 2 09:45:29 2010 From: rthurner at users.sourceforge.net (rthurner at users.sourceforge.net) Date: Sat, 02 Jan 2010 08:45:29 +0000 Subject: [csw-devel] SF.net SVN: gar:[7819] csw/mgar/pkg/mercurial/trunk/Makefile Message-ID: Revision: 7819 http://gar.svn.sourceforge.net/gar/?rev=7819&view=rev Author: rthurner Date: 2010-01-02 08:45:28 +0000 (Sat, 02 Jan 2010) Log Message: ----------- mercurial - remove changelog Modified Paths: -------------- csw/mgar/pkg/mercurial/trunk/Makefile Modified: csw/mgar/pkg/mercurial/trunk/Makefile =================================================================== --- csw/mgar/pkg/mercurial/trunk/Makefile 2010-01-02 08:43:33 UTC (rev 7818) +++ csw/mgar/pkg/mercurial/trunk/Makefile 2010-01-02 08:45:28 UTC (rev 7819) @@ -8,7 +8,6 @@ MASTER_SITES = http://selenic.com/mercurial/release/ DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz -DISTFILES += $(call admfiles,CSWmercurial,changelog.CSW) SPKG_DESC_CSWmercurial = Mercurial This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From rthurner at users.sourceforge.net Sat Jan 2 09:46:38 2010 From: rthurner at users.sourceforge.net (rthurner at users.sourceforge.net) Date: Sat, 02 Jan 2010 08:46:38 +0000 Subject: [csw-devel] SF.net SVN: gar:[7820] csw/mgar/pkg/mercurial/trunk/checksums Message-ID: Revision: 7820 http://gar.svn.sourceforge.net/gar/?rev=7820&view=rev Author: rthurner Date: 2010-01-02 08:46:38 +0000 (Sat, 02 Jan 2010) Log Message: ----------- mercurial - update checksums, consider removed files Modified Paths: -------------- csw/mgar/pkg/mercurial/trunk/checksums Modified: csw/mgar/pkg/mercurial/trunk/checksums =================================================================== --- csw/mgar/pkg/mercurial/trunk/checksums 2010-01-02 08:45:28 UTC (rev 7819) +++ csw/mgar/pkg/mercurial/trunk/checksums 2010-01-02 08:46:38 UTC (rev 7820) @@ -1,3 +1 @@ -db884ecb306bcbf49b671f880d29c431 CSWmercurial.changelog.CSW -d280026d7687f061371e87ff306c97c2 CSWmercurial.gspec cf23b0887f0437c8601d5b89ae4663a6 mercurial-1.4.2.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Sat Jan 2 10:49:53 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sat, 02 Jan 2010 09:49:53 +0000 Subject: [csw-devel] SF.net SVN: gar:[7821] csw/mgar/gar/v2-checkpkg/bin/checkpkg.d/checkpkg.py Message-ID: Revision: 7821 http://gar.svn.sourceforge.net/gar/?rev=7821&view=rev Author: wahwah Date: 2010-01-02 09:49:52 +0000 (Sat, 02 Jan 2010) Log Message: ----------- mGAR v2-checkpkg: Implemented cache age checking, this was the last missing major feature. Modified Paths: -------------- csw/mgar/gar/v2-checkpkg/bin/checkpkg.d/checkpkg.py Modified: csw/mgar/gar/v2-checkpkg/bin/checkpkg.d/checkpkg.py =================================================================== --- csw/mgar/gar/v2-checkpkg/bin/checkpkg.d/checkpkg.py 2010-01-02 08:46:38 UTC (rev 7820) +++ csw/mgar/gar/v2-checkpkg/bin/checkpkg.d/checkpkg.py 2010-01-02 09:49:52 UTC (rev 7821) @@ -3,20 +3,22 @@ # This is the checkpkg library, common for all checkpkg tests written in # Python. +import itertools +import logging import optparse import os import os.path -import logging -import subprocess import re +import socket import sqlite3 -import socket +import subprocess SYSTEM_PKGMAP = "/var/sadm/install/contents" WS_RE = re.compile(r"\s+") NEEDED_SONAMES = "needed sonames" RUNPATH = "runpath" SONAME = "soname" +CONFIG_MTIME = "mtime" DO_NOT_REPORT_SURPLUS = set([u"CSWcommon", u"CSWcswclassutils", u"CSWisaexec"]) DO_NOT_REPORT_MISSING = set([u"SUNWlibC", u"SUNWcsl", u"SUNWlibms", u"*SUNWcslr", u"*SUNWlibC", u"*SUNWlibms"]) @@ -25,7 +27,6 @@ # Solaris 8 on i386. It's okay if it's missing. ALLOWED_ORPHAN_SONAMES = set([u"libm.so.2"]) - class Error(Exception): pass @@ -131,9 +132,14 @@ self.fqdn = socket.getfqdn() self.db_path = os.path.join(self.checkpkg_dir, self.SQLITE3_DBNAME_TMPL % self.fqdn) + self.file_mtime = None + self.cache_mtime = None if os.path.exists(self.db_path): logging.debug("Connecting to the %s database.", self.db_path) self.conn = sqlite3.connect(self.db_path) + if not self.IsDatabaseUpToDate(): + self.PurgeDatabase() + self.PopulateDatabase() else: print "Building a cache of /var/sadm/install/contents." print "The cache will be kept in %s." % self.db_path @@ -150,31 +156,62 @@ line TEXT ); """) + self.debug("Creating the config table.") + c.execute(""" + CREATE TABLE config ( + key VARCHAR(255) PRIMARY KEY, + float_value FLOAT, + str_value VARCHAR(255) + ); + """) + self.PopulateDatabase() - # Original bit of code from checkpkg: - # - # egrep -v 'SUNWbcp|SUNWowbcp|SUNWucb' /var/sadm/install/contents | - # fgrep -f $EXTRACTDIR/liblist >$EXTRACTDIR/shortcatalog + def PopulateDatabase(self): + """Imports data into the database. - system_pkgmap_fd = open(SYSTEM_PKGMAP, "r") + Original bit of code from checkpkg: + + egrep -v 'SUNWbcp|SUNWowbcp|SUNWucb' /var/sadm/install/contents | + fgrep -f $EXTRACTDIR/liblist >$EXTRACTDIR/shortcatalog + """ - stop_re = re.compile("(%s)" % "|".join(self.STOP_PKGS)) + system_pkgmap_fd = open(SYSTEM_PKGMAP, "r") + stop_re = re.compile("(%s)" % "|".join(self.STOP_PKGS)) + # Creating a data structure: + # soname - {: , : , ...} + logging.debug("Building sqlite3 cache db of the %s file", + SYSTEM_PKGMAP) + c = self.conn.cursor() + count = itertools.count() + for line in system_pkgmap_fd: + i = count.next() + if not i % 1000: + print "\r%s" % i, + if stop_re.search(line): + continue + fields = re.split(WS_RE, line) + pkgmap_entry_path = fields[0].split("=")[0] + pkgmap_entry_dir, pkgmap_entry_base_name = os.path.split(pkgmap_entry_path) + sql = "INSERT INTO systempkgmap (basename, path, line) VALUES (?, ?, ?);" + c.execute(sql, (pkgmap_entry_base_name, pkgmap_entry_dir, line.strip())) + print + print "Creating the main database index." + sql = "CREATE INDEX basename_idx ON systempkgmap(basename);" + c.execute(sql) + self.SetDatabaseMtime() + self.conn.commit() - # Creating a data structure: - # soname - {: , : , ...} - logging.debug("Building sqlite3 cache db of the %s file", - SYSTEM_PKGMAP) - for line in system_pkgmap_fd: - if stop_re.search(line): - continue - fields = re.split(WS_RE, line) - pkgmap_entry_path = fields[0].split("=")[0] - pkgmap_entry_dir, pkgmap_entry_base_name = os.path.split(pkgmap_entry_path) - sql = "INSERT INTO systempkgmap (basename, path, line) VALUES (?, ?, ?);" - c.execute(sql, (pkgmap_entry_base_name, pkgmap_entry_dir, line.strip())) - print "Creating a database index." - sql = "CREATE INDEX basename_idx ON systempkgmap(basename);" - self.conn.execute(sql) + def SetDatabaseMtime(self): + c = self.conn.cursor() + sql = "DELETE FROM config WHERE key = ?;" + c.execute(sql, [CONFIG_MTIME]) + mtime = self.GetFileMtime() + logging.debug("Inserting the mtime (%s) into the database.", mtime) + sql = """ + INSERT INTO config (key, float_value) + VALUES (?, ?); + """ + c.execute(sql, [CONFIG_MTIME, mtime]) def GetPkgmapLineByBasename(self, filename): if filename in self.cache: @@ -190,6 +227,46 @@ self.cache[filename] = lines return lines + def GetDatabaseMtime(self): + if not self.cache_mtime: + sql = """ + SELECT float_value FROM config + WHERE key = ?; + """ + c = self.conn.cursor() + c.execute(sql, [CONFIG_MTIME]) + row = c.fetchone() + if not row: + # raise ConfigurationError("Could not find the mtime setting") + self.cache_mtime = 1 + else: + self.cache_mtime = row[0] + return self.cache_mtime + + def GetFileMtime(self): + if not self.file_mtime: + stat_data = os.stat(SYSTEM_PKGMAP) + self.file_mtime = stat_data.st_mtime + return self.file_mtime + + def IsDatabaseUpToDate(self): + f_mtime = self.GetFileMtime() + d_mtime = self.GetDatabaseMtime() + logging.debug("f_mtime", f_mtime, "d_time", d_mtime) + return self.GetFileMtime() <= self.GetDatabaseMtime() + + def PurgeDatabase(self): + c = self.conn.cursor() + sql = "DELETE FROM config;" + c.execute(sql) + sql = "DELETE FROM systempkgmap;" + c.execute(sql) + sql = "DROP INDEX basename_idx;" + try: + c.execute(sql) + except sqlite3.OperationalError, e: + logging.warn(e) + def SharedObjectDependencies(pkgname, binaries_by_pkgname, needed_sonames_by_binary, @@ -334,7 +411,7 @@ symlinked_list.append(runpath.replace("/64", "/amd64")) symlinked_list.append(runpath.replace("/64", "/sparcv9")) else: - symlinked_list.append(runpath) + symlinked_list.append(runpath) return symlinked_list This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Sat Jan 2 11:29:31 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sat, 02 Jan 2010 10:29:31 +0000 Subject: [csw-devel] SF.net SVN: gar:[7822] csw/mgar/gar/v2-checkpkg/bin/checkpkg.d/checkpkg.py Message-ID: Revision: 7822 http://gar.svn.sourceforge.net/gar/?rev=7822&view=rev Author: wahwah Date: 2010-01-02 10:29:31 +0000 (Sat, 02 Jan 2010) Log Message: ----------- mGAR v2-checkpkg: Fixing a small bug Modified Paths: -------------- csw/mgar/gar/v2-checkpkg/bin/checkpkg.d/checkpkg.py Modified: csw/mgar/gar/v2-checkpkg/bin/checkpkg.d/checkpkg.py =================================================================== --- csw/mgar/gar/v2-checkpkg/bin/checkpkg.d/checkpkg.py 2010-01-02 09:49:52 UTC (rev 7821) +++ csw/mgar/gar/v2-checkpkg/bin/checkpkg.d/checkpkg.py 2010-01-02 10:29:31 UTC (rev 7822) @@ -156,7 +156,7 @@ line TEXT ); """) - self.debug("Creating the config table.") + logging.debug("Creating the config table.") c.execute(""" CREATE TABLE config ( key VARCHAR(255) PRIMARY KEY, This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Sat Jan 2 11:30:28 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sat, 02 Jan 2010 10:30:28 +0000 Subject: [csw-devel] SF.net SVN: gar:[7823] csw/mgar/gar/v2-checkpkg/bin/checkpkg Message-ID: Revision: 7823 http://gar.svn.sourceforge.net/gar/?rev=7823&view=rev Author: wahwah Date: 2010-01-02 10:30:28 +0000 (Sat, 02 Jan 2010) Log Message: ----------- mGAR v2-checkpkg: Adding colors to test result reporting. Modified Paths: -------------- csw/mgar/gar/v2-checkpkg/bin/checkpkg Modified: csw/mgar/gar/v2-checkpkg/bin/checkpkg =================================================================== --- csw/mgar/gar/v2-checkpkg/bin/checkpkg 2010-01-02 10:29:31 UTC (rev 7822) +++ csw/mgar/gar/v2-checkpkg/bin/checkpkg 2010-01-02 10:30:28 UTC (rev 7823) @@ -552,12 +552,13 @@ plugin_base_name=`basename ${plugin}` plugin_log="${EXTRACTDIR}/${plugin_base_name}.log" log_files="${log_files} ${plugin_log}" + printf "TEST: ${plugin} running..." ${plugin} $extra_options -e "${EXTRACTDIR}" ${pkgnames} > "${plugin_log}" 2>&1 if [[ "$?" -ne 0 ]]; then - print "TEST: ${plugin} [FAIL]" + printf "\rTEST: ${plugin} \\033[1;31;40m[OK]\\033[00m \\n" test_suite_ok=0 else - print "TEST: ${plugin} [OK]" + printf "\rTEST: ${plugin} \\033[0;32;40m[OK]\\033[00m \\n" fi else debugmsg "'${plugin}' is not executable" This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Sat Jan 2 11:44:33 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Sat, 02 Jan 2010 10:44:33 +0000 Subject: [csw-devel] SF.net SVN: gar:[7824] csw/mgar/pkg Message-ID: Revision: 7824 http://gar.svn.sourceforge.net/gar/?rev=7824&view=rev Author: dmichelsen Date: 2010-01-02 10:44:32 +0000 (Sat, 02 Jan 2010) Log Message: ----------- yasm: Initial commit Added Paths: ----------- csw/mgar/pkg/yasm/ csw/mgar/pkg/yasm/branches/ csw/mgar/pkg/yasm/tags/ csw/mgar/pkg/yasm/trunk/ csw/mgar/pkg/yasm/trunk/Makefile csw/mgar/pkg/yasm/trunk/checksums csw/mgar/pkg/yasm/trunk/files/ csw/mgar/pkg/yasm/trunk/files/0001-Force-bash-on-testsuite.patch csw/mgar/pkg/yasm/trunk/files/0002-Additional-force-to-bash.patch Property changes on: csw/mgar/pkg/yasm/trunk ___________________________________________________________________ Added: svn:ignore + cookies download work Added: svn:externals + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 Added: csw/mgar/pkg/yasm/trunk/Makefile =================================================================== --- csw/mgar/pkg/yasm/trunk/Makefile (rev 0) +++ csw/mgar/pkg/yasm/trunk/Makefile 2010-01-02 10:44:32 UTC (rev 7824) @@ -0,0 +1,33 @@ +GARNAME = yasm +GARVERSION = 0.8.0 +CATEGORIES = devel + +DESCRIPTION = A complete rewrite of the NASM assembler +define BLURB + Yasm is a complete rewrite of the NASM assembler under the "new" BSD License + (some portions are under other licenses, see COPYING for details). Yasm currently + supports the x86 and AMD64 instruction sets, accepts NASM and GAS assembler syntaxes, + outputs binary, ELF32, ELF64, 32 and 64-bit Mach-O, RDOFF2, COFF, Win32, and Win64 + object formats, and generates source debugging information in STABS, DWARF 2, and + CodeView 8 formats. Yasm can be easily integrated into Visual Studio 2005 (see + VisualStudio2005) for assembly of NASM or GAS syntax code into Win32 or Win64 object files. +endef + +MASTER_SITES = http://www.tortall.net/projects/yasm/releases/ +DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz + +# Patch testsuite until this has been fixed: +# +PATCHFILES = 0001-Force-bash-on-testsuite.patch +PATCHFILES += 0002-Additional-force-to-bash.patch + +REQUIRED_PKGS = CSWggettextrt + +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + +CONFIGURE_ARGS = $(DIRPATHS) + +TEST_TARGET = check + +include gar/category.mk Added: csw/mgar/pkg/yasm/trunk/checksums =================================================================== --- csw/mgar/pkg/yasm/trunk/checksums (rev 0) +++ csw/mgar/pkg/yasm/trunk/checksums 2010-01-02 10:44:32 UTC (rev 7824) @@ -0,0 +1,3 @@ +1638b5fd7d97e30a437b2cab16d26f95 0001-Force-bash-on-testsuite.patch +8c9a186524ffca15f69be7c984290712 0002-Additional-force-to-bash.patch +84a72204c9b452a00b39b1b00495163f yasm-0.8.0.tar.gz Added: csw/mgar/pkg/yasm/trunk/files/0001-Force-bash-on-testsuite.patch =================================================================== --- csw/mgar/pkg/yasm/trunk/files/0001-Force-bash-on-testsuite.patch (rev 0) +++ csw/mgar/pkg/yasm/trunk/files/0001-Force-bash-on-testsuite.patch 2010-01-02 10:44:32 UTC (rev 7824) @@ -0,0 +1,22 @@ +From 674f59ac775a2860d10b159c6a768987bf42e675 Mon Sep 17 00:00:00 2001 +From: Dagobert Michelsen +Date: Sat, 2 Jan 2010 11:14:49 +0100 +Subject: [PATCH 1/2] Force bash on testsuite + +--- + out_test.sh | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/out_test.sh b/out_test.sh +index 610140d..67dc5d5 100755 +--- a/out_test.sh ++++ b/out_test.sh +@@ -1,4 +1,4 @@ +-#! /bin/sh ++#!/opt/csw/bin/bash + # $Id: out_test.sh 1825 2007-04-22 03:32:46Z peter $ + + YASM_TEST_SUITE=1 +-- +1.6.6 + Added: csw/mgar/pkg/yasm/trunk/files/0002-Additional-force-to-bash.patch =================================================================== --- csw/mgar/pkg/yasm/trunk/files/0002-Additional-force-to-bash.patch (rev 0) +++ csw/mgar/pkg/yasm/trunk/files/0002-Additional-force-to-bash.patch 2010-01-02 10:44:32 UTC (rev 7824) @@ -0,0 +1,22 @@ +From 595b93bd837b5349154d2796da90d53567de5adb Mon Sep 17 00:00:00 2001 +From: Dagobert Michelsen +Date: Sat, 2 Jan 2010 11:21:42 +0100 +Subject: [PATCH 2/2] Additional force to bash + +--- + .../objfmts/bin/tests/multisect/bin_multi_test.sh | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/modules/objfmts/bin/tests/multisect/bin_multi_test.sh b/modules/objfmts/bin/tests/multisect/bin_multi_test.sh +index acd0c34..4984530 100755 +--- a/modules/objfmts/bin/tests/multisect/bin_multi_test.sh ++++ b/modules/objfmts/bin/tests/multisect/bin_multi_test.sh +@@ -1,4 +1,4 @@ +-#! /bin/sh ++#! /bin/bash + # $Id: bin_multi_test.sh 2010 2007-11-14 08:33:32Z peter $ + + YASM_TEST_SUITE=1 +-- +1.6.6 + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Sat Jan 2 12:01:08 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sat, 02 Jan 2010 11:01:08 +0000 Subject: [csw-devel] SF.net SVN: gar:[7825] csw/mgar/gar/v2-checkpkg/bin/checkpkg Message-ID: Revision: 7825 http://gar.svn.sourceforge.net/gar/?rev=7825&view=rev Author: wahwah Date: 2010-01-02 11:01:08 +0000 (Sat, 02 Jan 2010) Log Message: ----------- mGAR v2-checkpkg: Output 'FAIL' when a test fails Modified Paths: -------------- csw/mgar/gar/v2-checkpkg/bin/checkpkg Modified: csw/mgar/gar/v2-checkpkg/bin/checkpkg =================================================================== --- csw/mgar/gar/v2-checkpkg/bin/checkpkg 2010-01-02 10:44:32 UTC (rev 7824) +++ csw/mgar/gar/v2-checkpkg/bin/checkpkg 2010-01-02 11:01:08 UTC (rev 7825) @@ -555,7 +555,7 @@ printf "TEST: ${plugin} running..." ${plugin} $extra_options -e "${EXTRACTDIR}" ${pkgnames} > "${plugin_log}" 2>&1 if [[ "$?" -ne 0 ]]; then - printf "\rTEST: ${plugin} \\033[1;31;40m[OK]\\033[00m \\n" + printf "\rTEST: ${plugin} \\033[1;31;40m[FAIL]\\033[00m \\n" test_suite_ok=0 else printf "\rTEST: ${plugin} \\033[0;32;40m[OK]\\033[00m \\n" This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Sat Jan 2 12:01:42 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sat, 02 Jan 2010 11:01:42 +0000 Subject: [csw-devel] SF.net SVN: gar:[7826] csw/mgar/gar/v2-checkpkg/bin/checkpkg.d/ checkpkg-obsolete-deps.py Message-ID: Revision: 7826 http://gar.svn.sourceforge.net/gar/?rev=7826&view=rev Author: wahwah Date: 2010-01-02 11:01:42 +0000 (Sat, 02 Jan 2010) Log Message: ----------- A test for obsolete packages: checkpkg-obsolete-deps.py Added Paths: ----------- csw/mgar/gar/v2-checkpkg/bin/checkpkg.d/checkpkg-obsolete-deps.py Added: csw/mgar/gar/v2-checkpkg/bin/checkpkg.d/checkpkg-obsolete-deps.py =================================================================== --- csw/mgar/gar/v2-checkpkg/bin/checkpkg.d/checkpkg-obsolete-deps.py (rev 0) +++ csw/mgar/gar/v2-checkpkg/bin/checkpkg.d/checkpkg-obsolete-deps.py 2010-01-02 11:01:42 UTC (rev 7826) @@ -0,0 +1,43 @@ +#!/opt/csw/bin/python2.6 +# $Id$ + +import checkpkg +import logging +import os.path +import sys + +OBSOLETE_DEPS = { + # "CSWfoo": { + # "reason": "Due to...", + # "url": "http://www.opencsw.org/bugtrack/view.php?id=..." + # }, + "CSWpython-rt": { + "reason": "CSWpython-rt is deprecated.", + "url": "http://www.opencsw.org/bugtrack/view.php?id=4031" + }, +} + +def main(): + options, args = checkpkg.GetOptions() + ok = True + for pkgname in args: + pkgpath = os.path.join(options.extractdir, pkgname) + checker = checkpkg.CheckpkgBase(options.extractdir, pkgname) + deps = set(checker.GetDependencies()) + obsolete_pkg_deps = deps.intersection(set(OBSOLETE_DEPS)) + if obsolete_pkg_deps: + ok = False + for pkg in obsolete_pkg_deps: + print ("ERROR: Package %s should not depend on %s." + % (checker.pkgname, pkg)) + if "reason" in OBSOLETE_DEPS[pkg]: + print "Reason:", OBSOLETE_DEPS[pkg]["reason"] + if "url" in OBSOLETE_DEPS[pkg]: + print "URL:", OBSOLETE_DEPS[pkg]["url"] + if ok: + sys.exit(0) + else: + sys.exit(1) + +if __name__ == '__main__': + main() Property changes on: csw/mgar/gar/v2-checkpkg/bin/checkpkg.d/checkpkg-obsolete-deps.py ___________________________________________________________________ Added: svn:executable + * Added: svn:keywords + Id This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Sat Jan 2 12:14:03 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sat, 02 Jan 2010 11:14:03 +0000 Subject: [csw-devel] SF.net SVN: gar:[7827] csw/mgar/gar/v2-checkpkg/bin/checkpkg.d/ checkpkg-obsolete-deps.py Message-ID: Revision: 7827 http://gar.svn.sourceforge.net/gar/?rev=7827&view=rev Author: wahwah Date: 2010-01-02 11:14:03 +0000 (Sat, 02 Jan 2010) Log Message: ----------- mGAR v2-checkpkg: A hint is better than a reason Modified Paths: -------------- csw/mgar/gar/v2-checkpkg/bin/checkpkg.d/checkpkg-obsolete-deps.py Modified: csw/mgar/gar/v2-checkpkg/bin/checkpkg.d/checkpkg-obsolete-deps.py =================================================================== --- csw/mgar/gar/v2-checkpkg/bin/checkpkg.d/checkpkg-obsolete-deps.py 2010-01-02 11:01:42 UTC (rev 7826) +++ csw/mgar/gar/v2-checkpkg/bin/checkpkg.d/checkpkg-obsolete-deps.py 2010-01-02 11:14:03 UTC (rev 7827) @@ -8,11 +8,11 @@ OBSOLETE_DEPS = { # "CSWfoo": { - # "reason": "Due to...", + # "hint": "Do this...", # "url": "http://www.opencsw.org/bugtrack/view.php?id=..." # }, "CSWpython-rt": { - "reason": "CSWpython-rt is deprecated.", + "hint": "CSWpython-rt is deprecated, use CSWpython instead.", "url": "http://www.opencsw.org/bugtrack/view.php?id=4031" }, } @@ -30,8 +30,8 @@ for pkg in obsolete_pkg_deps: print ("ERROR: Package %s should not depend on %s." % (checker.pkgname, pkg)) - if "reason" in OBSOLETE_DEPS[pkg]: - print "Reason:", OBSOLETE_DEPS[pkg]["reason"] + if "hint" in OBSOLETE_DEPS[pkg]: + print "Hint:", OBSOLETE_DEPS[pkg]["hint"] if "url" in OBSOLETE_DEPS[pkg]: print "URL:", OBSOLETE_DEPS[pkg]["url"] if ok: This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Sat Jan 2 12:34:18 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sat, 02 Jan 2010 11:34:18 +0000 Subject: [csw-devel] SF.net SVN: gar:[7828] csw/mgar/gar/v2-checkpkg/bin/mkpackage Message-ID: Revision: 7828 http://gar.svn.sourceforge.net/gar/?rev=7828&view=rev Author: wahwah Date: 2010-01-02 11:34:18 +0000 (Sat, 02 Jan 2010) Log Message: ----------- mGAR v2-checkpkg: Reverting from pigz to gzip as the default. Modified Paths: -------------- csw/mgar/gar/v2-checkpkg/bin/mkpackage Modified: csw/mgar/gar/v2-checkpkg/bin/mkpackage =================================================================== --- csw/mgar/gar/v2-checkpkg/bin/mkpackage 2010-01-02 11:14:03 UTC (rev 7827) +++ csw/mgar/gar/v2-checkpkg/bin/mkpackage 2010-01-02 11:34:18 UTC (rev 7828) @@ -908,7 +908,7 @@ my $compress = $config{usebzip} ? 'bzip2 -9 -f %s' - : 'pigz -9 -f %s'; + : 'gzip -9 -f %s'; vexec( sprintf( $compress, $tmppkg ), "Failed to compress $tmppkg" ); $tmppkg .= $config{usebzip} ? ".bz2" : ".gz"; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From chninkel at users.sourceforge.net Sat Jan 2 14:15:07 2010 From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net) Date: Sat, 02 Jan 2010 13:15:07 +0000 Subject: [csw-devel] SF.net SVN: gar:[7829] csw/mgar/pkg/bash/trunk Message-ID: Revision: 7829 http://gar.svn.sourceforge.net/gar/?rev=7829&view=rev Author: chninkel Date: 2010-01-02 13:15:07 +0000 (Sat, 02 Jan 2010) Log Message: ----------- bash: updated to 4.1 Modified Paths: -------------- csw/mgar/pkg/bash/trunk/Makefile csw/mgar/pkg/bash/trunk/checksums csw/mgar/pkg/bash/trunk/files/changelog.CSW Modified: csw/mgar/pkg/bash/trunk/Makefile =================================================================== --- csw/mgar/pkg/bash/trunk/Makefile 2010-01-02 11:34:18 UTC (rev 7828) +++ csw/mgar/pkg/bash/trunk/Makefile 2010-01-02 13:15:07 UTC (rev 7829) @@ -13,7 +13,7 @@ ###### Package information ####### GARNAME = bash -GARVERSION = 4.0.35 +GARVERSION = 4.1.0 CATEGORIES = devel DESCRIPTION = A sh-compatible command language interpreter Modified: csw/mgar/pkg/bash/trunk/checksums =================================================================== --- csw/mgar/pkg/bash/trunk/checksums 2010-01-02 11:34:18 UTC (rev 7828) +++ csw/mgar/pkg/bash/trunk/checksums 2010-01-02 13:15:07 UTC (rev 7829) @@ -1,40 +1,5 @@ f93b41b44ce6b023df65b72f00386ac5 CSWbash.prototype -a90a1b5a6db4838483f05438e05e8eb9 bash-4.0.tar.gz -bc7f4762443939bd7dccb42370f0d932 bash40-001 -c2a4a4786a83ed4ec366c6a8924369a2 bash40-002 -22e8a824eddba21a8fce10d7984c2aba bash40-003 -ed7cbced8c7c964323265522369a37a2 bash40-004 -8ed86b7d31423d71ecf3148251d63512 bash40-005 -5f447338cb98ff156cabf1fd9879d5f3 bash40-006 -96e946cb66a4ca186cba1da44f1ee163 bash40-007 -d3eb7b6f00d525e032478c33f51d46a8 bash40-008 -340601c997ce569532417a7ae92248b8 bash40-009 -0bd5ab96d514ffb1afbb8c7984b15146 bash40-010 -32cb20f339a20e1e9fb37a5d18f18fca bash40-011 -33fd9e93d30a17988c19554ef26d56e0 bash40-012 -a266b42df5e9ed7e8818a8b00d50e00b bash40-013 -86cac78f191a32cd1404f11264eb9b2a bash40-014 -bb41963d030bc61a20e8185367b337c5 bash40-015 -f75455048a086528971252fd979b8755 bash40-016 -34b2cd57271a452f4a26b39d77ff908f bash40-017 -99318eed8dcc05e10a14ae27043f175d bash40-018 -af3b9aaeadc71a5007bec2b98c751cde bash40-019 -eb7c7ddeb7e8451eb59228dca3329696 bash40-020 -585d701b978ceb63967dc020db3a2234 bash40-021 -7a70f2608f90f6ac0c2051e5f1c6c414 bash40-022 -7a23aa41630dd4fe8d30108a200e2d96 bash40-023 -82ba5fc9eb780eb57d8b7628a17b7d74 bash40-024 -b26f9007ac4eef5c378f1abcb8959025 bash40-025 -83bc844c82d0a30740e8d91a8238bfa9 bash40-026 -a41c187f05ecab07389c18acc91214c6 bash40-027 -fcc367e6471267d2e397257e703b817d bash40-028 -4d4da1c0be8dfee8e2a6a7703901130f bash40-029 -55cbdc8e5173d7d59bf1113c3ff590dc bash40-030 -389635281133416de9d13295251cabc7 bash40-031 -d646cb4aed8e0f0d1d47eea2ed5f3690 bash40-032 -d3e77d2a0a051478aca8c30d13ded834 bash40-033 -05a54807fd388e71bac8912ad530ac6d bash40-034 -fc3d8fdb83ccc407ab7f6d1b7ac6a221 bash40-035 -fd14570004ad0895c04ca969609712ed changelog.CSW +9800d8724815fd84994d9be65ab5e7b8 bash-4.1.tar.gz +8b104a3cddca41849186af53c8602eef changelog.CSW 60956e6be20f69dafbb06fcc83bab88e shells 29607316cff22f7427322d8f190cbadf use_system_bashrc_and_logout.patch Modified: csw/mgar/pkg/bash/trunk/files/changelog.CSW =================================================================== --- csw/mgar/pkg/bash/trunk/files/changelog.CSW 2010-01-02 11:34:18 UTC (rev 7828) +++ csw/mgar/pkg/bash/trunk/files/changelog.CSW 2010-01-02 13:15:07 UTC (rev 7829) @@ -1,3 +1,9 @@ +bash (4.1,REV=2010.01.02) unstable + + * New upstream release. + + -- Yann Rouillard Sat, 02 Jan 2010 14:12:18 +0100 + bash (4.0.35,REV=2009.12.23) unstable * Fixed Source url info (bug #4087). This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Sat Jan 2 17:37:07 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Sat, 02 Jan 2010 16:37:07 +0000 Subject: [csw-devel] SF.net SVN: gar:[7830] csw/mgar/pkg Message-ID: Revision: 7830 http://gar.svn.sourceforge.net/gar/?rev=7830&view=rev Author: dmichelsen Date: 2010-01-02 16:37:07 +0000 (Sat, 02 Jan 2010) Log Message: ----------- libfaad2: Initial commit Modified Paths: -------------- csw/mgar/pkg/libfaad2/trunk/Makefile csw/mgar/pkg/libfaad2/trunk/checksums Added Paths: ----------- csw/mgar/pkg/libfaad2/ csw/mgar/pkg/libfaad2/trunk/files/0001-Remove-iquote-from-CFLAGS-unknown-to-SS.patch Removed Paths: ------------- csw/mgar/pkg/libfaad2/trunk/files/Makefile.am.diff csw/mgar/pkg/libfaad2/trunk/files/Makefile.in.18.diff csw/mgar/pkg/libfaad2/trunk/files/Makefile.in.20.diff csw/mgar/pkg/libfaad2/trunk/files/Makefile.in.common.mp4v2.diff csw/mgar/pkg/libfaad2/trunk/files/Makefile.in.diff csw/mgar/pkg/libfaad2/trunk/files/Makefile.in.frontend.diff csw/mgar/pkg/libfaad2/trunk/files/aacquant.c.diff csw/mgar/pkg/libfaad2/trunk/files/aacquant.h.diff csw/mgar/pkg/libfaad2/trunk/files/config.h.in.diff csw/mgar/pkg/libfaad2/trunk/files/configure.diff csw/mgar/pkg/libfaad2/trunk/files/configure.in.diff csw/mgar/pkg/libfaad2/trunk/files/faac.h.diff csw/mgar/pkg/libfaad2/trunk/files/faaccfg.h.diff csw/mgar/pkg/libfaad2/trunk/files/frame.h.diff csw/mgar/pkg/libfaad2/trunk/files/input.c.diff csw/mgar/pkg/libfaad2/trunk/files/ltp.c.diff csw/mgar/pkg/libfaad2/trunk/files/mp4property.h.diff csw/mgar/pkg/libfaad2/trunk/files/mp4util.h.diff csw/mgar/pkg/libfaad2/trunk/files/mpeg4ip.h.diff csw/mgar/pkg/libfaad2/trunk/files/psych.h.diff Modified: csw/mgar/pkg/libfaad2/trunk/Makefile =================================================================== --- csw/mgar/pkg/libfaac/trunk/Makefile 2009-12-28 14:18:44 UTC (rev 7782) +++ csw/mgar/pkg/libfaad2/trunk/Makefile 2010-01-02 16:37:07 UTC (rev 7830) @@ -1,33 +1,26 @@ -GARNAME = libfaac -GARVERSION = 1.28 +GARNAME = faad2 +GARVERSION = 2.7 CATEGORIES = lib -DESCRIPTION = AAC encoder library and tool +DESCRIPTION = Freeware Advanced Audio (AAC) Decoder including SBR decoding define BLURB - FAAC is an open source MPEG-4 and MPEG-2 AAC encoder + FAAD2 is an open source MPEG-4 and MPEG-2 AAC decoder, it is licensed + under the GPLv2 license. endef SF_PROJ = faac MASTER_SITES = $(SF_MIRRORS) -DISTFILES = $(SF_PROJ)-$(GARVERSION).tar.bz2 -DISTNAME = $(SF_PROJ)-$(GARVERSION) +DISTFILES = $(DISTNAME).tar.bz2 +PATCHFILES = 0001-Remove-iquote-from-CFLAGS-unknown-to-SS.patch -PACKAGES = CSWfaac -CATALOGNAME = $(GARNAME) +PACKAGES = CSWfaad2 +CATALOGNAME = faad2 SPKG_SOURCEURL = http://www.audiocoding.com/ # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(SF_PROJ)-(\d+(?:\.\d+)*).tar.bz2 -#PATCHFILES += Makefile.am.diff Makefile.in.diff Makefile.in.frontend.diff -PATCHFILES += Makefile.in.frontend.diff Makefile.in.common.mp4v2.diff -PATCHFILES += aacquant.c.diff aacquant.h.diff config.h.in.diff -#PATCHFILES += configure.in.diff faac.h.diff faaccfg.h.diff frame.h.diff -PATCHFILES += configure.diff faac.h.diff faaccfg.h.diff frame.h.diff -PATCHFILES += input.c.diff ltp.c.diff mp4property.h.diff mp4util.h.diff -PATCHFILES += mpeg4ip.h.diff psych.h.diff - BUILD64 = 1 NO_ISAEXEC = 1 CONFIGURE_ARGS = $(DIRPATHS) Modified: csw/mgar/pkg/libfaad2/trunk/checksums =================================================================== --- csw/mgar/pkg/libfaac/trunk/checksums 2009-12-28 14:18:44 UTC (rev 7782) +++ csw/mgar/pkg/libfaad2/trunk/checksums 2010-01-02 16:37:07 UTC (rev 7830) @@ -1,16 +1 @@ -3d7c0f7936dcc1c4833d693860720adf Makefile.in.common.mp4v2.diff -eb7e2cee261c71ac4a8d718b5498777e Makefile.in.frontend.diff -19f2eebe3df5300ab4a1a16e43593663 aacquant.c.diff -2af64ce38f023774fb0c8f691b98c564 aacquant.h.diff -ea8508703521e663e637382231d4c13b config.h.in.diff -027ebf052052128c67f0749e610f4acb configure.diff -c5dde68840cefe46532089c9392d1df0 faac-1.28.tar.bz2 -56f2c5e28e1177e3b6956aaf83a10e13 faac.h.diff -268d60a6a1304fa1758a962a20731c1c faaccfg.h.diff -29fe6485d9ebe7fd0892c18ed450bac5 frame.h.diff -a4e382e8b7123a144c1cf1c10a7e1725 input.c.diff -bf65a158a69527826c5e9fff74d10e83 ltp.c.diff -dee39c5250880eb427a11269ececa205 mp4property.h.diff -e97db55385453a0482ab2673056d4022 mp4util.h.diff -ff5300984a0b097a08d66cb39d8a3ef0 mpeg4ip.h.diff -46b44023ce14bce4f0ed981ee5514c5c psych.h.diff +4c332fa23febc0e4648064685a3d4332 faad2-2.7.tar.bz2 Added: csw/mgar/pkg/libfaad2/trunk/files/0001-Remove-iquote-from-CFLAGS-unknown-to-SS.patch =================================================================== --- csw/mgar/pkg/libfaad2/trunk/files/0001-Remove-iquote-from-CFLAGS-unknown-to-SS.patch (rev 0) +++ csw/mgar/pkg/libfaad2/trunk/files/0001-Remove-iquote-from-CFLAGS-unknown-to-SS.patch 2010-01-02 16:37:07 UTC (rev 7830) @@ -0,0 +1,52 @@ +From 3b8b6907983da468e53403b8e7e44b0c92955429 Mon Sep 17 00:00:00 2001 +From: Dagobert Michelsen +Date: Sat, 2 Jan 2010 17:20:29 +0100 +Subject: [PATCH] Remove iquote from CFLAGS unknown to SS + +--- + libfaad/Makefile | 2 +- + libfaad/Makefile.am | 2 +- + libfaad/Makefile.in | 2 +- + 3 files changed, 3 insertions(+), 3 deletions(-) + +diff --git a/libfaad/Makefile b/libfaad/Makefile +index 71c9ec1..13edca2 100644 +--- a/libfaad/Makefile ++++ b/libfaad/Makefile +@@ -195,7 +195,7 @@ sharedstatedir = /opt/csw/share + sysconfdir = /opt/csw/etc + target_alias = + lib_LTLIBRARIES = libfaad.la +-AM_CFLAGS = -iquote $(top_srcdir)/include ++AM_CFLAGS = $(top_srcdir)/include + include_HEADERS = $(top_srcdir)/include/faad.h \ + $(top_srcdir)/include/neaacdec.h + +diff --git a/libfaad/Makefile.am b/libfaad/Makefile.am +index e5ad36d..d355989 100644 +--- a/libfaad/Makefile.am ++++ b/libfaad/Makefile.am +@@ -1,6 +1,6 @@ + lib_LTLIBRARIES = libfaad.la + +-AM_CFLAGS = -iquote $(top_srcdir)/include ++AM_CFLAGS = $(top_srcdir)/include + include_HEADERS = $(top_srcdir)/include/faad.h \ + $(top_srcdir)/include/neaacdec.h + +diff --git a/libfaad/Makefile.in b/libfaad/Makefile.in +index 1b16428..71d0d4c 100644 +--- a/libfaad/Makefile.in ++++ b/libfaad/Makefile.in +@@ -195,7 +195,7 @@ sharedstatedir = @sharedstatedir@ + sysconfdir = @sysconfdir@ + target_alias = @target_alias@ + lib_LTLIBRARIES = libfaad.la +-AM_CFLAGS = -iquote $(top_srcdir)/include ++AM_CFLAGS = $(top_srcdir)/include + include_HEADERS = $(top_srcdir)/include/faad.h \ + $(top_srcdir)/include/neaacdec.h + +-- +1.6.6 + Deleted: csw/mgar/pkg/libfaad2/trunk/files/Makefile.am.diff =================================================================== --- csw/mgar/pkg/libfaac/trunk/files/Makefile.am.diff 2009-12-28 14:18:44 UTC (rev 7782) +++ csw/mgar/pkg/libfaad2/trunk/files/Makefile.am.diff 2010-01-02 16:37:07 UTC (rev 7830) @@ -1,12 +0,0 @@ -diff --speed-large-files --minimal -ru ../build-global/faac-1.28/frontend/Makefile.am faac-1.28/frontend/Makefile.am ---- ../build-global/faac-1.28/frontend/Makefile.am 2008-12-16 01:56:00.000000000 +0100 -+++ faac-1.28/frontend/Makefile.am 2009-03-20 05:38:13.063991192 +0100 -@@ -5,7 +5,7 @@ - - if WITH_MP4V2 - INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/common/mp4v2 --LDADD = $(top_builddir)/libfaac/libfaac.la $(top_srcdir)/common/mp4v2/libmp4v2.a -lm -lstdc++ -+LDADD = $(top_builddir)/libfaac/libfaac.la $(top_srcdir)/common/mp4v2/libmp4v2.a -lm -lCrun -lCstd - else - INCLUDES = -I$(top_srcdir)/include - LDADD = $(top_builddir)/libfaac/libfaac.la -lm Deleted: csw/mgar/pkg/libfaad2/trunk/files/Makefile.in.18.diff =================================================================== --- csw/mgar/pkg/libfaac/trunk/files/Makefile.in.18.diff 2009-12-28 14:18:44 UTC (rev 7782) +++ csw/mgar/pkg/libfaad2/trunk/files/Makefile.in.18.diff 2010-01-02 16:37:07 UTC (rev 7830) @@ -1,398 +0,0 @@ -diff --speed-large-files --minimal -ru ../build-global/faac-1.28/common/mp4v2/mp4property.h faac-1.28/common/mp4v2/mp4property.h ---- ../build-global/faac-1.28/common/mp4v2/mp4property.h 2009-01-25 02:14:34.000000000 +0100 -+++ faac-1.28/common/mp4v2/mp4property.h 2009-03-20 06:08:45.678172744 +0100 -@@ -38,7 +38,7 @@ - StringProperty, - BytesProperty, - TableProperty, -- DescriptorProperty, -+ DescriptorProperty - }; - - class MP4Property { -diff --speed-large-files --minimal -ru ../build-global/faac-1.28/common/mp4v2/mp4util.h faac-1.28/common/mp4v2/mp4util.h ---- ../build-global/faac-1.28/common/mp4v2/mp4util.h 2009-01-25 02:14:34.000000000 +0100 -+++ faac-1.28/common/mp4v2/mp4util.h 2009-03-20 00:14:32.128482807 +0100 -@@ -83,7 +83,7 @@ - } - - static inline void MP4Printf(const char* fmt, ...) --#ifndef _WIN32 -+#if defined(__GNUC__) - __attribute__((format(__printf__, 1, 2))) - #endif - ; -diff --speed-large-files --minimal -ru ../build-global/faac-1.28/common/mp4v2/mpeg4ip.h faac-1.28/common/mp4v2/mpeg4ip.h ---- ../build-global/faac-1.28/common/mp4v2/mpeg4ip.h 2009-01-26 23:42:35.000000000 +0100 -+++ faac-1.28/common/mp4v2/mpeg4ip.h 2009-03-20 06:14:07.133127520 +0100 -@@ -65,7 +65,9 @@ - /***************************************************************************** - * UNIX LIKE DEFINES BELOW THIS POINT - *****************************************************************************/ --#ifdef sun -+#if defined(sun) || defined(__sun) || defined(__sun__) -+#include -+#include - #include - #endif - -@@ -194,12 +196,7 @@ - typedef unsigned int socklen_t; - #endif - --#ifdef sun --#include --#define u_int8_t uint8_t --#define u_int16_t uint16_t --#define u_int32_t uint32_t --#define u_int64_t uint64_t -+#if defined(sun) || defined(__sun) || defined(__sun__) - #define __STRING(expr) #expr - #endif - -@@ -328,7 +325,7 @@ - AUDIO_FMT_U16, - AUDIO_FMT_S16, - AUDIO_FMT_FLOAT, -- AUDIO_FMT_HW_AC3, -+ AUDIO_FMT_HW_AC3 - } audio_format_t; - - #endif /* __MPEG4IP_INCLUDED__ */ -diff --speed-large-files --minimal -ru ../build-global/faac-1.28/config.h.in faac-1.28/config.h.in ---- ../build-global/faac-1.28/config.h.in 2009-02-10 09:36:59.000000000 +0100 -+++ faac-1.28/config.h.in 2009-03-20 05:55:21.041828651 +0100 -@@ -1,5 +1,26 @@ - /* config.h.in. Generated from configure.in by autoheader. */ - -+#ifndef __FAAC_CONFIG_H -+#define __FAAC_CONFIG_H -+ -+#if defined(__SUNPRO_C) || defined(__SUNPRO_CC) -+#include -+#include -+ -+typedef uint8_t u_int8_t; -+typedef uint16_t u_int16_t; -+typedef uint32_t u_int32_t; -+typedef uint64_t u_int64_t; -+ -+#define HAVE_INT16_T 1 -+#define HAVE_INT32_T 1 -+#define HAVE_U_INT32_T 1 -+#define HAVE_U_INT16_T 1 -+ -+#define HAVE_STRUCT_IOVEC 1 -+#endif -+ -+ - /* Define if you want to encode for DRM */ - #undef DRM - -@@ -131,3 +152,5 @@ - - /* Define to `long int' if does not define. */ - #undef off_t -+ -+#endif /* __FAAC_CONFIG_H */ -diff --speed-large-files --minimal -ru ../build-global/faac-1.28/configure.in faac-1.28/configure.in ---- ../build-global/faac-1.28/configure.in 2009-02-05 01:55:38.000000000 +0100 -+++ faac-1.28/configure.in 2009-03-20 06:00:25.906642505 +0100 -@@ -10,7 +10,9 @@ - - AC_DEFUN([MY_DEFINE], [ AC_DEFINE($1, 1, [define if needed]) ]) - --CFLAGS=${CFLAGS:-"-O2 -Wall"} -+CFLAGS=${CFLAGS} -+CPPFLAGS=${CPPFLAGS} -+LDFLAGS=${LDFLAGS} - - AC_PROG_CC - AC_PROG_CXX -@@ -20,10 +22,13 @@ - - AC_CHECK_TYPES(u_int32_t) - AC_CHECK_TYPES(u_int16_t) -+AC_CHECK_TYPES(uint64_t) -+AC_CHECK_TYPES(uint32_t) -+AC_CHECK_TYPES(uint16_t) - AC_CHECK_TYPES(int32_t) - AC_CHECK_TYPES(int16_t) - --AC_CHECK_DECL(strcasecmp, MY_DEFINE(HAVE_STRCASECMP)) -+AC_CHECK_DECL(strcasecmp, AC_DEFINE(HAVE_STRCASECMP, 1, [define if needed]) ) - - AC_CHECK_LIB(gnugetopt, getopt_long) - -@@ -41,7 +46,7 @@ - AC_MSG_NOTICE([*** Building with internal mp4v2 ***]) - AM_CONDITIONAL(WITH_MP4V2, true) - AC_CONFIG_LINKS(common/mp4v2/mpeg4ip_config.h:config.h) -- MY_DEFINE(HAVE_LIBMP4V2) -+ MY_DEFINE(HAVE_LIBMP4V2, 1, [define if needed]) - else - AC_MSG_NOTICE([*** Building WITHOUT mp4v2 ***]) - fi -@@ -61,12 +66,12 @@ - dnl Checks for header files required for mp4.h - AC_HEADER_STDC - AC_SYS_LARGEFILE --AC_CHECK_HEADERS(stdint.h inttypes.h) -+AC_CHECK_HEADERS(sys/types.h stdint.h inttypes.h inttypes_gnucompat.h) - AC_CHECK_HEADERS(mathf.h) - AC_CHECK_HEADERS(float.h) --AC_CHECK_DECL(strchr, MY_DEFINE(HAVE_STRCHR)) --AC_CHECK_DECL(memcpy, MY_DEFINE(HAVE_MEMCPY)) --AC_CHECK_DECL(strsep, MY_DEFINE(HAVE_STRSEP)) -+AC_CHECK_DECL(strchr, AC_DEFINE(HAVE_STRCHR, 1, [define if needed]) ) -+AC_CHECK_DECL(memcpy, AC_DEFINE(HAVE_MEMCPY, 1, [define if needed]) ) -+AC_CHECK_DECL(strsep, AC_DEFINE(HAVE_STRSEP, 1, [define if needed]) ) - AC_CHECK_HEADERS(sys/time.h) - AC_HEADER_TIME - AC_TYPE_OFF_T -diff --speed-large-files --minimal -ru ../build-global/faac-1.28/frontend/Makefile.am faac-1.28/frontend/Makefile.am ---- ../build-global/faac-1.28/frontend/Makefile.am 2008-12-16 01:56:00.000000000 +0100 -+++ faac-1.28/frontend/Makefile.am 2009-03-20 05:38:13.063991192 +0100 -@@ -5,7 +5,7 @@ - - if WITH_MP4V2 - INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/common/mp4v2 --LDADD = $(top_builddir)/libfaac/libfaac.la $(top_srcdir)/common/mp4v2/libmp4v2.a -lm -lstdc++ -+LDADD = $(top_builddir)/libfaac/libfaac.la $(top_srcdir)/common/mp4v2/libmp4v2.a -lm -lCrun -lCstd - else - INCLUDES = -I$(top_srcdir)/include - LDADD = $(top_builddir)/libfaac/libfaac.la -lm -diff --speed-large-files --minimal -ru ../build-global/faac-1.28/frontend/Makefile.in faac-1.28/frontend/Makefile.in ---- ../build-global/faac-1.28/frontend/Makefile.in 2009-02-10 09:37:00.000000000 +0100 -+++ faac-1.28/frontend/Makefile.in 2009-03-20 05:42:58.667425673 +0100 -@@ -68,6 +68,9 @@ - CCLD = $(CC) - LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ - $(AM_LDFLAGS) $(LDFLAGS) -o $@ -+CXXLD = $(CXX) -+CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \ -+ $(AM_LDFLAGS) $(LDFLAGS) -o $@ - SOURCES = $(faac_SOURCES) - DIST_SOURCES = $(faac_SOURCES) - man1dir = $(mandir)/man1 -@@ -132,6 +135,7 @@ - USE_DRM_FALSE = @USE_DRM_FALSE@ - USE_DRM_TRUE = @USE_DRM_TRUE@ - VERSION = @VERSION@ -+AM_CFLAGS = $(CFLAGS) - WITH_MP4V2_FALSE = @WITH_MP4V2_FALSE@ - WITH_MP4V2_TRUE = @WITH_MP4V2_TRUE@ - ac_ct_CC = @ac_ct_CC@ -@@ -186,7 +190,7 @@ - @WITH_MP4V2_FALSE at INCLUDES = -I$(top_srcdir)/include - @WITH_MP4V2_TRUE at INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/common/mp4v2 - @WITH_MP4V2_FALSE at LDADD = $(top_builddir)/libfaac/libfaac.la -lm -- at WITH_MP4V2_TRUE@LDADD = $(top_builddir)/libfaac/libfaac.la $(top_srcdir)/common/mp4v2/libmp4v2.a -lm -lstdc++ -+ at WITH_MP4V2_TRUE@LDADD = $(top_builddir)/libfaac/libfaac.la $(top_srcdir)/common/mp4v2/libmp4v2.a -lm -lCrun -lCstd - all: all-am - - .SUFFIXES: -@@ -200,9 +204,9 @@ - exit 1;; \ - esac; \ - done; \ -- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu frontend/Makefile'; \ -+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign frontend/Makefile'; \ - cd $(top_srcdir) && \ -- $(AUTOMAKE) --gnu frontend/Makefile -+ $(AUTOMAKE) --foreign frontend/Makefile - .PRECIOUS: Makefile - Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status - @case '$?' in \ -@@ -250,7 +254,7 @@ - done - faac$(EXEEXT): $(faac_OBJECTS) $(faac_DEPENDENCIES) - @rm -f faac$(EXEEXT) -- $(LINK) $(faac_LDFLAGS) $(faac_OBJECTS) $(faac_LDADD) $(LIBS) -+ $(CXXLINK) $(faac_LDFLAGS) $(faac_OBJECTS) $(faac_LDADD) $(LIBS) - - mostlyclean-compile: - -rm -f *.$(OBJEXT) -diff --speed-large-files --minimal -ru ../build-global/faac-1.28/frontend/input.c faac-1.28/frontend/input.c ---- ../build-global/faac-1.28/frontend/input.c 2009-01-25 19:50:32.000000000 +0100 -+++ faac-1.28/frontend/input.c 2009-03-20 06:06:22.286495928 +0100 -@@ -27,6 +27,10 @@ - #include - #include - -+#if defined(__SUNPRO_C) || defined(__SUNPRO_CC) -+#include /* for BSWAP_8|BSWAP_16|BSWAP_32|BSWAP_64 */ -+#endif -+ - #ifdef _WIN32 - #include - #include -@@ -34,9 +38,14 @@ - - #include "input.h" - -+#if (defined(__SUNPRO_C) || defined(__SUNPRO_CC)) && defined(__SunOS_5_10) -+#define SWAP32(x) BSWAP_32(x) -+#define SWAP16(x) BSWAP_16(x) -+#else - #define SWAP32(x) (((x & 0xff) << 24) | ((x & 0xff00) << 8) \ - | ((x & 0xff0000) >> 8) | ((x & 0xff000000) >> 24)) - #define SWAP16(x) (((x & 0xff) << 8) | ((x & 0xff00) >> 8)) -+#endif - - #ifdef WORDS_BIGENDIAN - # define UINT32(x) SWAP32(x) -diff --speed-large-files --minimal -ru ../build-global/faac-1.28/include/faac.h faac-1.28/include/faac.h ---- ../build-global/faac-1.28/include/faac.h 2009-01-25 19:50:32.000000000 +0100 -+++ faac-1.28/include/faac.h 2009-03-20 06:01:42.801998112 +0100 -@@ -36,7 +36,11 @@ - # endif - #endif - -+#if defined(__SUNPRO_C) || defined(__SUNPRO_CC) -+#pragma pack() -+#else - #pragma pack(push, 1) -+#endif - - typedef struct { - void *ptr; -@@ -90,7 +94,11 @@ - - - -+#if defined(__SUNPRO_C) || defined(__SUNPRO_CC) -+#pragma pack() -+#else - #pragma pack(pop) -+#endif - - #ifdef __cplusplus - } -diff --speed-large-files --minimal -ru ../build-global/faac-1.28/include/faaccfg.h faac-1.28/include/faaccfg.h ---- ../build-global/faac-1.28/include/faaccfg.h 2004-07-04 14:12:05.000000000 +0200 -+++ faac-1.28/include/faaccfg.h 2009-03-20 06:03:00.833899895 +0100 -@@ -45,7 +45,11 @@ - #define SHORTCTL_NOSHORT 1 - #define SHORTCTL_NOLONG 2 - -+#if defined(__SUNPRO_C) || defined(__SUNPRO_CC) -+#pragma pack() -+#else - #pragma pack(push, 1) -+#endif - typedef struct faacEncConfiguration - { - /* config version */ -@@ -117,6 +121,10 @@ - - } faacEncConfiguration, *faacEncConfigurationPtr; - -+#if defined(__SUNPRO_C) || defined(__SUNPRO_CC) -+#pragma pack() -+#else - #pragma pack(pop) -+#endif - - #endif /* _FAACCFG_H_ */ -diff --speed-large-files --minimal -ru ../build-global/faac-1.28/libfaac/aacquant.c faac-1.28/libfaac/aacquant.c ---- ../build-global/faac-1.28/libfaac/aacquant.c 2008-03-24 00:00:25.000000000 +0100 -+++ faac-1.28/libfaac/aacquant.c 2009-03-20 05:53:00.225604748 +0100 -@@ -281,11 +281,16 @@ - - - #if TAKEHIRO_IEEE754_HACK -- -+#if defined(__SUNPRO_C) || defined(__SUNPRO_CC) -+#pragma pack(8) -+#endif - typedef union { - float f; - int i; - } fi_union; -+#if defined(__SUNPRO_C) || defined(__SUNPRO_CC) -+#pragma pack() -+#endif - - #define MAGIC_FLOAT (65536*(128)) - #define MAGIC_INT 0x4b000000 -diff --speed-large-files --minimal -ru ../build-global/faac-1.28/libfaac/aacquant.h faac-1.28/libfaac/aacquant.h ---- ../build-global/faac-1.28/libfaac/aacquant.h 2003-10-12 18:43:39.000000000 +0200 -+++ faac-1.28/libfaac/aacquant.h 2009-03-20 05:53:52.210350072 +0100 -@@ -37,14 +37,22 @@ - #define POW20(x) pow(2.0,((double)x)*.25) - #define IPOW20(x) pow(2.0,-((double)x)*.1875) - -+#if defined(__SUNPRO_C) || defined(__SUNPRO_CC) -+#pragma pack() -+#else - #pragma pack(push, 1) -+#endif - typedef struct - { - double *pow43; - double *adj43; - double quality; - } AACQuantCfg; -+#if defined(__SUNPRO_C) || defined(__SUNPRO_CC) -+#pragma pack() -+#else - #pragma pack(pop) -+#endif - - void AACQuantizeInit(CoderInfo *coderInfo, unsigned int numChannels, - AACQuantCfg *aacquantCfg); -diff --speed-large-files --minimal -ru ../build-global/faac-1.28/libfaac/frame.h faac-1.28/libfaac/frame.h ---- ../build-global/faac-1.28/libfaac/frame.h 2009-01-25 19:50:32.000000000 +0100 -+++ faac-1.28/libfaac/frame.h 2009-03-20 06:03:57.455266251 +0100 -@@ -60,7 +60,11 @@ - #endif - #endif - -+#if defined(__SUNPRO_C) || defined(__SUNPRO_CC) -+#pragma pack() -+#else - #pragma pack(push, 1) -+#endif - - typedef struct { - psymodel_t *model; -@@ -151,7 +155,11 @@ - int FAACAPI faacEncClose(faacEncHandle hEncoder); - - -+#if defined(__SUNPRO_C) || defined(__SUNPRO_CC) -+#pragma pack() -+#else - #pragma pack(pop) -+#endif - - #ifdef __cplusplus - } -diff --speed-large-files --minimal -ru ../build-global/faac-1.28/libfaac/ltp.c faac-1.28/libfaac/ltp.c ---- ../build-global/faac-1.28/libfaac/ltp.c 2003-06-26 21:20:31.000000000 +0200 -+++ faac-1.28/libfaac/ltp.c 2009-03-20 06:07:27.247999333 +0100 -@@ -38,10 +38,13 @@ - #include "util.h" - - -+#if !defined(__SUNPRO_C) && !defined(__SUNPRO_CC) -+/* why is this define here anyway, it is not used anywhere */ - /* short double_to_int(double sig_in); */ - #define double_to_int(sig_in) \ - ((sig_in) > 32767 ? 32767 : ( \ - (sig_in) < -32768 ? -32768 : (sig_in))) -+#endif - - #define _MDCT_SCALE 512 - -diff --speed-large-files --minimal -ru ../build-global/faac-1.28/libfaac/psych.h faac-1.28/libfaac/psych.h ---- ../build-global/faac-1.28/libfaac/psych.h 2005-04-24 21:16:14.000000000 +0200 -+++ faac-1.28/libfaac/psych.h 2009-03-20 06:14:31.902939182 +0100 -@@ -82,4 +82,4 @@ - } - #endif /* __cplusplus */ - --#endif /* PSYCH_H */ -\ No newline at end of file -+#endif /* PSYCH_H */ Deleted: csw/mgar/pkg/libfaad2/trunk/files/Makefile.in.20.diff =================================================================== --- csw/mgar/pkg/libfaac/trunk/files/Makefile.in.20.diff 2009-12-28 14:18:44 UTC (rev 7782) +++ csw/mgar/pkg/libfaad2/trunk/files/Makefile.in.20.diff 2010-01-02 16:37:07 UTC (rev 7830) @@ -1,398 +0,0 @@ -diff --speed-large-files --minimal -ru ../build-global/faac-1.28/common/mp4v2/mp4property.h faac-1.28/common/mp4v2/mp4property.h ---- ../build-global/faac-1.28/common/mp4v2/mp4property.h 2009-01-25 02:14:34.000000000 +0100 -+++ faac-1.28/common/mp4v2/mp4property.h 2009-03-20 06:08:45.678172744 +0100 -@@ -38,7 +38,7 @@ - StringProperty, - BytesProperty, - TableProperty, -- DescriptorProperty, -+ DescriptorProperty - }; - - class MP4Property { -diff --speed-large-files --minimal -ru ../build-global/faac-1.28/common/mp4v2/mp4util.h faac-1.28/common/mp4v2/mp4util.h ---- ../build-global/faac-1.28/common/mp4v2/mp4util.h 2009-01-25 02:14:34.000000000 +0100 -+++ faac-1.28/common/mp4v2/mp4util.h 2009-03-20 00:14:32.128482807 +0100 -@@ -83,7 +83,7 @@ - } - - static inline void MP4Printf(const char* fmt, ...) --#ifndef _WIN32 -+#if defined(__GNUC__) - __attribute__((format(__printf__, 1, 2))) - #endif - ; -diff --speed-large-files --minimal -ru ../build-global/faac-1.28/common/mp4v2/mpeg4ip.h faac-1.28/common/mp4v2/mpeg4ip.h ---- ../build-global/faac-1.28/common/mp4v2/mpeg4ip.h 2009-01-26 23:42:35.000000000 +0100 -+++ faac-1.28/common/mp4v2/mpeg4ip.h 2009-03-20 06:14:07.133127520 +0100 -@@ -65,7 +65,9 @@ - /***************************************************************************** - * UNIX LIKE DEFINES BELOW THIS POINT - *****************************************************************************/ --#ifdef sun -+#if defined(sun) || defined(__sun) || defined(__sun__) -+#include -+#include - #include - #endif - -@@ -194,12 +196,7 @@ - typedef unsigned int socklen_t; - #endif - --#ifdef sun --#include --#define u_int8_t uint8_t --#define u_int16_t uint16_t --#define u_int32_t uint32_t --#define u_int64_t uint64_t -+#if defined(sun) || defined(__sun) || defined(__sun__) - #define __STRING(expr) #expr - #endif - -@@ -328,7 +325,7 @@ - AUDIO_FMT_U16, - AUDIO_FMT_S16, - AUDIO_FMT_FLOAT, -- AUDIO_FMT_HW_AC3, -+ AUDIO_FMT_HW_AC3 - } audio_format_t; - - #endif /* __MPEG4IP_INCLUDED__ */ -diff --speed-large-files --minimal -ru ../build-global/faac-1.28/config.h.in faac-1.28/config.h.in ---- ../build-global/faac-1.28/config.h.in 2009-02-10 09:36:59.000000000 +0100 -+++ faac-1.28/config.h.in 2009-03-20 05:55:21.041828651 +0100 -@@ -1,5 +1,26 @@ - /* config.h.in. Generated from configure.in by autoheader. */ - -+#ifndef __FAAC_CONFIG_H -+#define __FAAC_CONFIG_H -+ -+#if defined(__SUNPRO_C) || defined(__SUNPRO_CC) -+#include -+#include -+ -+typedef uint8_t u_int8_t; -+typedef uint16_t u_int16_t; -+typedef uint32_t u_int32_t; -+typedef uint64_t u_int64_t; -+ -+#define HAVE_INT16_T 1 -+#define HAVE_INT32_T 1 -+#define HAVE_U_INT32_T 1 -+#define HAVE_U_INT16_T 1 -+ -+#define HAVE_STRUCT_IOVEC 1 -+#endif -+ -+ - /* Define if you want to encode for DRM */ - #undef DRM - -@@ -131,3 +152,5 @@ - - /* Define to `long int' if does not define. */ - #undef off_t -+ -+#endif /* __FAAC_CONFIG_H */ -diff --speed-large-files --minimal -ru ../build-global/faac-1.28/configure.in faac-1.28/configure.in ---- ../build-global/faac-1.28/configure.in 2009-02-05 01:55:38.000000000 +0100 -+++ faac-1.28/configure.in 2009-03-20 06:00:25.906642505 +0100 -@@ -10,7 +10,9 @@ - - AC_DEFUN([MY_DEFINE], [ AC_DEFINE($1, 1, [define if needed]) ]) - --CFLAGS=${CFLAGS:-"-O2 -Wall"} -+CFLAGS=${CFLAGS} -+CPPFLAGS=${CPPFLAGS} -+LDFLAGS=${LDFLAGS} - - AC_PROG_CC - AC_PROG_CXX -@@ -20,10 +22,13 @@ - - AC_CHECK_TYPES(u_int32_t) - AC_CHECK_TYPES(u_int16_t) -+AC_CHECK_TYPES(uint64_t) -+AC_CHECK_TYPES(uint32_t) -+AC_CHECK_TYPES(uint16_t) - AC_CHECK_TYPES(int32_t) - AC_CHECK_TYPES(int16_t) - --AC_CHECK_DECL(strcasecmp, MY_DEFINE(HAVE_STRCASECMP)) -+AC_CHECK_DECL(strcasecmp, AC_DEFINE(HAVE_STRCASECMP, 1, [define if needed]) ) - - AC_CHECK_LIB(gnugetopt, getopt_long) - -@@ -41,7 +46,7 @@ - AC_MSG_NOTICE([*** Building with internal mp4v2 ***]) - AM_CONDITIONAL(WITH_MP4V2, true) - AC_CONFIG_LINKS(common/mp4v2/mpeg4ip_config.h:config.h) -- MY_DEFINE(HAVE_LIBMP4V2) -+ MY_DEFINE(HAVE_LIBMP4V2, 1, [define if needed]) - else - AC_MSG_NOTICE([*** Building WITHOUT mp4v2 ***]) - fi -@@ -61,12 +66,12 @@ - dnl Checks for header files required for mp4.h - AC_HEADER_STDC - AC_SYS_LARGEFILE --AC_CHECK_HEADERS(stdint.h inttypes.h) -+AC_CHECK_HEADERS(sys/types.h stdint.h inttypes.h inttypes_gnucompat.h) - AC_CHECK_HEADERS(mathf.h) - AC_CHECK_HEADERS(float.h) --AC_CHECK_DECL(strchr, MY_DEFINE(HAVE_STRCHR)) --AC_CHECK_DECL(memcpy, MY_DEFINE(HAVE_MEMCPY)) --AC_CHECK_DECL(strsep, MY_DEFINE(HAVE_STRSEP)) -+AC_CHECK_DECL(strchr, AC_DEFINE(HAVE_STRCHR, 1, [define if needed]) ) -+AC_CHECK_DECL(memcpy, AC_DEFINE(HAVE_MEMCPY, 1, [define if needed]) ) -+AC_CHECK_DECL(strsep, AC_DEFINE(HAVE_STRSEP, 1, [define if needed]) ) - AC_CHECK_HEADERS(sys/time.h) - AC_HEADER_TIME - AC_TYPE_OFF_T -diff --speed-large-files --minimal -ru ../build-global/faac-1.28/frontend/Makefile.am faac-1.28/frontend/Makefile.am ---- ../build-global/faac-1.28/frontend/Makefile.am 2008-12-16 01:56:00.000000000 +0100 -+++ faac-1.28/frontend/Makefile.am 2009-03-20 05:38:13.063991192 +0100 -@@ -5,7 +5,7 @@ - - if WITH_MP4V2 - INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/common/mp4v2 --LDADD = $(top_builddir)/libfaac/libfaac.la $(top_srcdir)/common/mp4v2/libmp4v2.a -lm -lstdc++ -+LDADD = $(top_builddir)/libfaac/libfaac.la $(top_srcdir)/common/mp4v2/libmp4v2.a -lm -lCrun -lCstd - else - INCLUDES = -I$(top_srcdir)/include - LDADD = $(top_builddir)/libfaac/libfaac.la -lm -diff --speed-large-files --minimal -ru ../build-global/faac-1.28/frontend/Makefile.in faac-1.28/frontend/Makefile.in ---- ../build-global/faac-1.28/frontend/Makefile.in 2009-02-10 09:37:00.000000000 +0100 -+++ faac-1.28/frontend/Makefile.in 2009-03-20 05:42:58.667425673 +0100 -@@ -68,6 +68,9 @@ - CCLD = $(CC) - LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ - $(AM_LDFLAGS) $(LDFLAGS) -o $@ -+CXXLD = $(CXX) -+CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \ -+ $(AM_LDFLAGS) $(LDFLAGS) -o $@ - SOURCES = $(faac_SOURCES) - DIST_SOURCES = $(faac_SOURCES) - man1dir = $(mandir)/man1 -@@ -132,6 +135,7 @@ - USE_DRM_FALSE = @USE_DRM_FALSE@ - USE_DRM_TRUE = @USE_DRM_TRUE@ - VERSION = @VERSION@ -+AM_CFLAGS = $(CFLAGS) - WITH_MP4V2_FALSE = @WITH_MP4V2_FALSE@ - WITH_MP4V2_TRUE = @WITH_MP4V2_TRUE@ - ac_ct_CC = @ac_ct_CC@ -@@ -186,7 +190,7 @@ - @WITH_MP4V2_FALSE at INCLUDES = -I$(top_srcdir)/include - @WITH_MP4V2_TRUE at INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/common/mp4v2 - @WITH_MP4V2_FALSE at LDADD = $(top_builddir)/libfaac/libfaac.la -lm -- at WITH_MP4V2_TRUE@LDADD = $(top_builddir)/libfaac/libfaac.la $(top_srcdir)/common/mp4v2/libmp4v2.a -lm -lstdc++ -+ at WITH_MP4V2_TRUE@LDADD = $(top_builddir)/libfaac/libfaac.la $(top_srcdir)/common/mp4v2/libmp4v2.a -lm -lCrun -lCstd - all: all-am - - .SUFFIXES: -@@ -200,9 +204,9 @@ - exit 1;; \ - esac; \ - done; \ -- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu frontend/Makefile'; \ -+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign frontend/Makefile'; \ - cd $(top_srcdir) && \ -- $(AUTOMAKE) --gnu frontend/Makefile -+ $(AUTOMAKE) --foreign frontend/Makefile - .PRECIOUS: Makefile - Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status - @case '$?' in \ -@@ -250,7 +254,7 @@ - done - faac$(EXEEXT): $(faac_OBJECTS) $(faac_DEPENDENCIES) - @rm -f faac$(EXEEXT) -- $(LINK) $(faac_LDFLAGS) $(faac_OBJECTS) $(faac_LDADD) $(LIBS) -+ $(CXXLINK) $(faac_LDFLAGS) $(faac_OBJECTS) $(faac_LDADD) $(LIBS) - - mostlyclean-compile: - -rm -f *.$(OBJEXT) -diff --speed-large-files --minimal -ru ../build-global/faac-1.28/frontend/input.c faac-1.28/frontend/input.c ---- ../build-global/faac-1.28/frontend/input.c 2009-01-25 19:50:32.000000000 +0100 -+++ faac-1.28/frontend/input.c 2009-03-20 06:06:22.286495928 +0100 -@@ -27,6 +27,10 @@ - #include - #include - -+#if defined(__SUNPRO_C) || defined(__SUNPRO_CC) -+#include /* for BSWAP_8|BSWAP_16|BSWAP_32|BSWAP_64 */ -+#endif -+ - #ifdef _WIN32 - #include - #include -@@ -34,9 +38,14 @@ - - #include "input.h" - -+#if (defined(__SUNPRO_C) || defined(__SUNPRO_CC)) && defined(__SunOS_5_10) -+#define SWAP32(x) BSWAP_32(x) -+#define SWAP16(x) BSWAP_16(x) -+#else - #define SWAP32(x) (((x & 0xff) << 24) | ((x & 0xff00) << 8) \ - | ((x & 0xff0000) >> 8) | ((x & 0xff000000) >> 24)) - #define SWAP16(x) (((x & 0xff) << 8) | ((x & 0xff00) >> 8)) -+#endif - - #ifdef WORDS_BIGENDIAN - # define UINT32(x) SWAP32(x) -diff --speed-large-files --minimal -ru ../build-global/faac-1.28/include/faac.h faac-1.28/include/faac.h ---- ../build-global/faac-1.28/include/faac.h 2009-01-25 19:50:32.000000000 +0100 -+++ faac-1.28/include/faac.h 2009-03-20 06:01:42.801998112 +0100 -@@ -36,7 +36,11 @@ - # endif - #endif - -+#if defined(__SUNPRO_C) || defined(__SUNPRO_CC) -+#pragma pack() -+#else - #pragma pack(push, 1) -+#endif - - typedef struct { - void *ptr; -@@ -90,7 +94,11 @@ - - - -+#if defined(__SUNPRO_C) || defined(__SUNPRO_CC) -+#pragma pack() -+#else - #pragma pack(pop) -+#endif - - #ifdef __cplusplus - } -diff --speed-large-files --minimal -ru ../build-global/faac-1.28/include/faaccfg.h faac-1.28/include/faaccfg.h ---- ../build-global/faac-1.28/include/faaccfg.h 2004-07-04 14:12:05.000000000 +0200 -+++ faac-1.28/include/faaccfg.h 2009-03-20 06:03:00.833899895 +0100 -@@ -45,7 +45,11 @@ - #define SHORTCTL_NOSHORT 1 - #define SHORTCTL_NOLONG 2 - -+#if defined(__SUNPRO_C) || defined(__SUNPRO_CC) -+#pragma pack() -+#else - #pragma pack(push, 1) -+#endif - typedef struct faacEncConfiguration - { - /* config version */ -@@ -117,6 +121,10 @@ - - } faacEncConfiguration, *faacEncConfigurationPtr; - -+#if defined(__SUNPRO_C) || defined(__SUNPRO_CC) -+#pragma pack() -+#else - #pragma pack(pop) -+#endif - - #endif /* _FAACCFG_H_ */ -diff --speed-large-files --minimal -ru ../build-global/faac-1.28/libfaac/aacquant.c faac-1.28/libfaac/aacquant.c ---- ../build-global/faac-1.28/libfaac/aacquant.c 2008-03-24 00:00:25.000000000 +0100 -+++ faac-1.28/libfaac/aacquant.c 2009-03-20 05:53:00.225604748 +0100 -@@ -281,11 +281,16 @@ - - - #if TAKEHIRO_IEEE754_HACK -- -+#if defined(__SUNPRO_C) || defined(__SUNPRO_CC) -+#pragma pack(8) -+#endif - typedef union { - float f; - int i; - } fi_union; -+#if defined(__SUNPRO_C) || defined(__SUNPRO_CC) -+#pragma pack() -+#endif - - #define MAGIC_FLOAT (65536*(128)) - #define MAGIC_INT 0x4b000000 -diff --speed-large-files --minimal -ru ../build-global/faac-1.28/libfaac/aacquant.h faac-1.28/libfaac/aacquant.h ---- ../build-global/faac-1.28/libfaac/aacquant.h 2003-10-12 18:43:39.000000000 +0200 -+++ faac-1.28/libfaac/aacquant.h 2009-03-20 05:53:52.210350072 +0100 -@@ -37,14 +37,22 @@ - #define POW20(x) pow(2.0,((double)x)*.25) - #define IPOW20(x) pow(2.0,-((double)x)*.1875) - -+#if defined(__SUNPRO_C) || defined(__SUNPRO_CC) -+#pragma pack() -+#else - #pragma pack(push, 1) -+#endif - typedef struct - { - double *pow43; - double *adj43; - double quality; - } AACQuantCfg; -+#if defined(__SUNPRO_C) || defined(__SUNPRO_CC) -+#pragma pack() -+#else - #pragma pack(pop) -+#endif - - void AACQuantizeInit(CoderInfo *coderInfo, unsigned int numChannels, - AACQuantCfg *aacquantCfg); -diff --speed-large-files --minimal -ru ../build-global/faac-1.28/libfaac/frame.h faac-1.28/libfaac/frame.h ---- ../build-global/faac-1.28/libfaac/frame.h 2009-01-25 19:50:32.000000000 +0100 -+++ faac-1.28/libfaac/frame.h 2009-03-20 06:03:57.455266251 +0100 -@@ -60,7 +60,11 @@ - #endif - #endif - -+#if defined(__SUNPRO_C) || defined(__SUNPRO_CC) -+#pragma pack() -+#else - #pragma pack(push, 1) -+#endif - - typedef struct { - psymodel_t *model; -@@ -151,7 +155,11 @@ - int FAACAPI faacEncClose(faacEncHandle hEncoder); - - -+#if defined(__SUNPRO_C) || defined(__SUNPRO_CC) -+#pragma pack() -+#else - #pragma pack(pop) -+#endif - - #ifdef __cplusplus - } -diff --speed-large-files --minimal -ru ../build-global/faac-1.28/libfaac/ltp.c faac-1.28/libfaac/ltp.c ---- ../build-global/faac-1.28/libfaac/ltp.c 2003-06-26 21:20:31.000000000 +0200 -+++ faac-1.28/libfaac/ltp.c 2009-03-20 06:07:27.247999333 +0100 -@@ -38,10 +38,13 @@ - #include "util.h" - - -+#if !defined(__SUNPRO_C) && !defined(__SUNPRO_CC) -+/* why is this define here anyway, it is not used anywhere */ - /* short double_to_int(double sig_in); */ - #define double_to_int(sig_in) \ - ((sig_in) > 32767 ? 32767 : ( \ - (sig_in) < -32768 ? -32768 : (sig_in))) -+#endif - - #define _MDCT_SCALE 512 - -diff --speed-large-files --minimal -ru ../build-global/faac-1.28/libfaac/psych.h faac-1.28/libfaac/psych.h ---- ../build-global/faac-1.28/libfaac/psych.h 2005-04-24 21:16:14.000000000 +0200 -+++ faac-1.28/libfaac/psych.h 2009-03-20 06:14:31.902939182 +0100 -@@ -82,4 +82,4 @@ - } - #endif /* __cplusplus */ - --#endif /* PSYCH_H */ -\ No newline at end of file -+#endif /* PSYCH_H */ Deleted: csw/mgar/pkg/libfaad2/trunk/files/Makefile.in.common.mp4v2.diff =================================================================== --- csw/mgar/pkg/libfaac/trunk/files/Makefile.in.common.mp4v2.diff 2009-12-28 14:18:44 UTC (rev 7782) +++ csw/mgar/pkg/libfaad2/trunk/files/Makefile.in.common.mp4v2.diff 2010-01-02 16:37:07 UTC (rev 7830) @@ -1,13 +0,0 @@ ---- ../build-global/faac-1.28/common/mp4v2/Makefile.in 2009-02-10 09:37:00.000000000 +0100 -+++ faac-1.28/common/mp4v2/Makefile.in 2009-04-05 20:42:49.571593147 +0200 -@@ -205,8 +205,8 @@ - sharedstatedir = @sharedstatedir@ - sysconfdir = @sysconfdir@ - target_alias = @target_alias@ --INCLUDES = -I$(top_srcdir)/include --AM_CXXFLAGS = -Wall -+INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/common/mp4v2 -+AM_CXXFLAGS = $(CXXFLAGS) - noinst_LIBRARIES = libmp4v2.a - noinst_HEADERS = mp4.h mpeg4ip.h mpeg4ip_version.h mpeg4ip_config.h - libmp4v2_a_SOURCES = \ Deleted: csw/mgar/pkg/libfaad2/trunk/files/Makefile.in.diff =================================================================== --- csw/mgar/pkg/libfaac/trunk/files/Makefile.in.diff 2009-12-28 14:18:44 UTC (rev 7782) +++ csw/mgar/pkg/libfaad2/trunk/files/Makefile.in.diff 2010-01-02 16:37:07 UTC (rev 7830) @@ -1,35 +0,0 @@ ---- ../build-global/faac-1.28/Makefile.in 2009-02-10 09:37:01.000000000 +0100 -+++ faac-1.28/Makefile.in 2009-03-20 07:46:47.715986781 +0100 -@@ -183,20 +183,7 @@ - - .SUFFIXES: - am--refresh: -- @: --$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) -- @for dep in $?; do \ -- case '$(am__configure_deps)' in \ -- *$$dep*) \ -- echo ' cd $(srcdir) && $(AUTOMAKE) --gnu '; \ -- cd $(srcdir) && $(AUTOMAKE) --gnu \ -- && exit 0; \ -- exit 1;; \ -- esac; \ -- done; \ -- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu Makefile'; \ -- cd $(top_srcdir) && \ -- $(AUTOMAKE) --gnu Makefile -+ - .PRECIOUS: Makefile - Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status - @case '$?' in \ -@@ -225,10 +212,6 @@ - stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status - @rm -f stamp-h1 - cd $(top_builddir) && $(SHELL) ./config.status config.h --$(srcdir)/config.h.in: $(am__configure_deps) -- cd $(top_srcdir) && $(AUTOHEADER) -- rm -f stamp-h1 -- touch $@ - - distclean-hdr: - -rm -f config.h stamp-h1 Deleted: csw/mgar/pkg/libfaad2/trunk/files/Makefile.in.frontend.diff =================================================================== --- csw/mgar/pkg/libfaac/trunk/files/Makefile.in.frontend.diff 2009-12-28 14:18:44 UTC (rev 7782) +++ csw/mgar/pkg/libfaad2/trunk/files/Makefile.in.frontend.diff 2010-01-02 16:37:07 UTC (rev 7830) @@ -1,51 +0,0 @@ -diff --speed-large-files --minimal -ru ../build-global/faac-1.28/frontend/Makefile.in faac-1.28/frontend/Makefile.in ---- ../build-global/faac-1.28/frontend/Makefile.in 2009-02-10 09:37:00.000000000 +0100 -+++ faac-1.28/frontend/Makefile.in 2009-03-20 05:42:58.667425673 +0100 -@@ -68,6 +68,9 @@ - CCLD = $(CC) - LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ - $(AM_LDFLAGS) $(LDFLAGS) -o $@ -+CXXLD = $(CXX) -+CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \ -+ $(AM_LDFLAGS) $(LDFLAGS) -o $@ - SOURCES = $(faac_SOURCES) - DIST_SOURCES = $(faac_SOURCES) - man1dir = $(mandir)/man1 -@@ -132,6 +135,7 @@ - USE_DRM_FALSE = @USE_DRM_FALSE@ - USE_DRM_TRUE = @USE_DRM_TRUE@ - VERSION = @VERSION@ -+AM_CFLAGS = $(CFLAGS) - WITH_MP4V2_FALSE = @WITH_MP4V2_FALSE@ - WITH_MP4V2_TRUE = @WITH_MP4V2_TRUE@ - ac_ct_CC = @ac_ct_CC@ -@@ -186,7 +190,7 @@ - @WITH_MP4V2_FALSE at INCLUDES = -I$(top_srcdir)/include - @WITH_MP4V2_TRUE at INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/common/mp4v2 - @WITH_MP4V2_FALSE at LDADD = $(top_builddir)/libfaac/libfaac.la -lm -- at WITH_MP4V2_TRUE@LDADD = $(top_builddir)/libfaac/libfaac.la $(top_srcdir)/common/mp4v2/libmp4v2.a -lm -lstdc++ -+ at WITH_MP4V2_TRUE@LDADD = $(top_builddir)/libfaac/libfaac.la $(top_srcdir)/common/mp4v2/libmp4v2.a -lm -lCrun -lCstd - all: all-am - - .SUFFIXES: -@@ -200,9 +204,9 @@ - exit 1;; \ - esac; \ - done; \ -- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu frontend/Makefile'; \ -+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign frontend/Makefile'; \ - cd $(top_srcdir) && \ -- $(AUTOMAKE) --gnu frontend/Makefile -+ $(AUTOMAKE) --foreign frontend/Makefile - .PRECIOUS: Makefile - Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status - @case '$?' in \ -@@ -250,7 +254,7 @@ - done - faac$(EXEEXT): $(faac_OBJECTS) $(faac_DEPENDENCIES) - @rm -f faac$(EXEEXT) -- $(LINK) $(faac_LDFLAGS) $(faac_OBJECTS) $(faac_LDADD) $(LIBS) -+ $(CXXLINK) $(faac_LDFLAGS) $(faac_OBJECTS) $(faac_LDADD) $(LIBS) - - mostlyclean-compile: - -rm -f *.$(OBJEXT) Deleted: csw/mgar/pkg/libfaad2/trunk/files/aacquant.c.diff =================================================================== --- csw/mgar/pkg/libfaac/trunk/files/aacquant.c.diff 2009-12-28 14:18:44 UTC (rev 7782) +++ csw/mgar/pkg/libfaad2/trunk/files/aacquant.c.diff 2010-01-02 16:37:07 UTC (rev 7830) @@ -1,21 +0,0 @@ -diff --speed-large-files --minimal -ru ../build-global/faac-1.28/libfaac/aacquant.c faac-1.28/libfaac/aacquant.c ---- ../build-global/faac-1.28/libfaac/aacquant.c 2008-03-24 00:00:25.000000000 +0100 -+++ faac-1.28/libfaac/aacquant.c 2009-03-20 05:53:00.225604748 +0100 -@@ -281,11 +281,16 @@ - - - #if TAKEHIRO_IEEE754_HACK -- -+#if defined(__SUNPRO_C) || defined(__SUNPRO_CC) -+#pragma pack(8) -+#endif - typedef union { - float f; - int i; - } fi_union; -+#if defined(__SUNPRO_C) || defined(__SUNPRO_CC) -+#pragma pack() -+#endif - - #define MAGIC_FLOAT (65536*(128)) - #define MAGIC_INT 0x4b000000 Deleted: csw/mgar/pkg/libfaad2/trunk/files/aacquant.h.diff =================================================================== --- csw/mgar/pkg/libfaac/trunk/files/aacquant.h.diff 2009-12-28 14:18:44 UTC (rev 7782) +++ csw/mgar/pkg/libfaad2/trunk/files/aacquant.h.diff 2010-01-02 16:37:07 UTC (rev 7830) @@ -1,26 +0,0 @@ -diff --speed-large-files --minimal -ru ../build-global/faac-1.28/libfaac/aacquant.h faac-1.28/libfaac/aacquant.h ---- ../build-global/faac-1.28/libfaac/aacquant.h 2003-10-12 18:43:39.000000000 +0200 -+++ faac-1.28/libfaac/aacquant.h 2009-03-20 05:53:52.210350072 +0100 -@@ -37,14 +37,22 @@ - #define POW20(x) pow(2.0,((double)x)*.25) - #define IPOW20(x) pow(2.0,-((double)x)*.1875) - -+#if defined(__SUNPRO_C) || defined(__SUNPRO_CC) -+#pragma pack() -+#else - #pragma pack(push, 1) -+#endif - typedef struct - { - double *pow43; - double *adj43; - double quality; - } AACQuantCfg; -+#if defined(__SUNPRO_C) || defined(__SUNPRO_CC) -+#pragma pack() -+#else - #pragma pack(pop) -+#endif - - void AACQuantizeInit(CoderInfo *coderInfo, unsigned int numChannels, - AACQuantCfg *aacquantCfg); Deleted: csw/mgar/pkg/libfaad2/trunk/files/config.h.in.diff =================================================================== --- csw/mgar/pkg/libfaac/trunk/files/config.h.in.diff 2009-12-28 14:18:44 UTC (rev 7782) +++ csw/mgar/pkg/libfaad2/trunk/files/config.h.in.diff 2010-01-02 16:37:07 UTC (rev 7830) @@ -1,34 +0,0 @@ ---- ../build-global/faac-1.28/config.h.in 2009-02-10 09:36:59.000000000 +0100 -+++ faac-1.28/config.h.in 2009-04-05 18:56:29.025432723 +0200 -@@ -1,5 +1,25 @@ - /* config.h.in. Generated from configure.in by autoheader. */ - -+#ifndef __FAAC_CONFIG_H -+#define __FAAC_CONFIG_H -+ -+#if defined(__SUNPRO_C) || defined(__SUNPRO_CC) -+#include -+ -+typedef uint8_t u_int8_t; -+typedef uint16_t u_int16_t; -+typedef uint32_t u_int32_t; -+typedef uint64_t u_int64_t; -+ -+#define HAVE_INT16_T 1 -+#define HAVE_INT32_T 1 -+#define HAVE_U_INT32_T 1 -+#define HAVE_U_INT16_T 1 -+ -+#define HAVE_STRUCT_IOVEC 1 -+#endif -+ -+ - /* Define if you want to encode for DRM */ - #undef DRM - -@@ -131,3 +151,5 @@ - - /* Define to `long int' if does not define. */ - #undef off_t -+ -+#endif /* __FAAC_CONFIG_H */ Deleted: csw/mgar/pkg/libfaad2/trunk/files/configure.diff =================================================================== --- csw/mgar/pkg/libfaac/trunk/files/configure.diff 2009-12-28 14:18:44 UTC (rev 7782) +++ csw/mgar/pkg/libfaad2/trunk/files/configure.diff 2010-01-02 16:37:07 UTC (rev 7830) @@ -1,20 +0,0 @@ ---- ../build-global/faac-1.28/configure 2009-02-10 09:36:58.000000000 +0100 -+++ faac-1.28/configure 2009-04-05 20:17:04.647262929 +0200 -@@ -19731,7 +19731,7 @@ - echo $ECHO_N "(cached) $ECHO_C" >&6 - else - ac_check_lib_save_LIBS=$LIBS --LIBS="-lmp4v2 -lstdc++ $LIBS" -+LIBS="-lmp4v2 -lCrun -lCstd $LIBS" - cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ - _ACEOF -@@ -19864,7 +19864,7 @@ - echo $ECHO_N "(cached) $ECHO_C" >&6 - else - ac_check_lib_save_LIBS=$LIBS --LIBS="-lmp4v2 -lstdc++ $LIBS" -+LIBS="-lmp4v2 -lCrun -lCstd $LIBS" - cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ - _ACEOF Deleted: csw/mgar/pkg/libfaad2/trunk/files/configure.in.diff =================================================================== --- csw/mgar/pkg/libfaac/trunk/files/configure.in.diff 2009-12-28 14:18:44 UTC (rev 7782) +++ csw/mgar/pkg/libfaad2/trunk/files/configure.in.diff 2010-01-02 16:37:07 UTC (rev 7830) @@ -1,55 +0,0 @@ -diff --speed-large-files --minimal -ru ../build-global/faac-1.28/configure.in faac-1.28/configure.in ---- ../build-global/faac-1.28/configure.in 2009-02-05 01:55:38.000000000 +0100 -+++ faac-1.28/configure.in 2009-03-20 06:00:25.906642505 +0100 -@@ -10,7 +10,9 @@ - - AC_DEFUN([MY_DEFINE], [ AC_DEFINE($1, 1, [define if needed]) ]) - --CFLAGS=${CFLAGS:-"-O2 -Wall"} -+CFLAGS=${CFLAGS} -+CPPFLAGS=${CPPFLAGS} -+LDFLAGS=${LDFLAGS} - - AC_PROG_CC - AC_PROG_CXX -@@ -20,10 +22,13 @@ - - AC_CHECK_TYPES(u_int32_t) - AC_CHECK_TYPES(u_int16_t) -+AC_CHECK_TYPES(uint64_t) -+AC_CHECK_TYPES(uint32_t) -+AC_CHECK_TYPES(uint16_t) - AC_CHECK_TYPES(int32_t) - AC_CHECK_TYPES(int16_t) - --AC_CHECK_DECL(strcasecmp, MY_DEFINE(HAVE_STRCASECMP)) -+AC_CHECK_DECL(strcasecmp, AC_DEFINE(HAVE_STRCASECMP, 1, [define if needed]) ) - - AC_CHECK_LIB(gnugetopt, getopt_long) - -@@ -41,7 +46,7 @@ - AC_MSG_NOTICE([*** Building with internal mp4v2 ***]) - AM_CONDITIONAL(WITH_MP4V2, true) - AC_CONFIG_LINKS(common/mp4v2/mpeg4ip_config.h:config.h) -- MY_DEFINE(HAVE_LIBMP4V2) -+ MY_DEFINE(HAVE_LIBMP4V2, 1, [define if needed]) - else - AC_MSG_NOTICE([*** Building WITHOUT mp4v2 ***]) - fi -@@ -61,12 +66,12 @@ - dnl Checks for header files required for mp4.h - AC_HEADER_STDC - AC_SYS_LARGEFILE --AC_CHECK_HEADERS(stdint.h inttypes.h) -+AC_CHECK_HEADERS(sys/types.h stdint.h inttypes.h inttypes_gnucompat.h) - AC_CHECK_HEADERS(mathf.h) - AC_CHECK_HEADERS(float.h) --AC_CHECK_DECL(strchr, MY_DEFINE(HAVE_STRCHR)) --AC_CHECK_DECL(memcpy, MY_DEFINE(HAVE_MEMCPY)) --AC_CHECK_DECL(strsep, MY_DEFINE(HAVE_STRSEP)) -+AC_CHECK_DECL(strchr, AC_DEFINE(HAVE_STRCHR, 1, [define if needed]) ) -+AC_CHECK_DECL(memcpy, AC_DEFINE(HAVE_MEMCPY, 1, [define if needed]) ) -+AC_CHECK_DECL(strsep, AC_DEFINE(HAVE_STRSEP, 1, [define if needed]) ) - AC_CHECK_HEADERS(sys/time.h) - AC_HEADER_TIME - AC_TYPE_OFF_T Deleted: csw/mgar/pkg/libfaad2/trunk/files/faac.h.diff =================================================================== --- csw/mgar/pkg/libfaac/trunk/files/faac.h.diff 2009-12-28 14:18:44 UTC (rev 7782) +++ csw/mgar/pkg/libfaad2/trunk/files/faac.h.diff 2010-01-02 16:37:07 UTC (rev 7830) @@ -1,27 +0,0 @@ -diff --speed-large-files --minimal -ru ../build-global/faac-1.28/include/faac.h faac-1.28/include/faac.h ---- ../build-global/faac-1.28/include/faac.h 2009-01-25 19:50:32.000000000 +0100 -+++ faac-1.28/include/faac.h 2009-03-20 06:01:42.801998112 +0100 -@@ -36,7 +36,11 @@ - # endif - #endif - -+#if defined(__SUNPRO_C) || defined(__SUNPRO_CC) -+#pragma pack() -+#else - #pragma pack(push, 1) -+#endif - - typedef struct { - void *ptr; -@@ -90,7 +94,11 @@ - - - -+#if defined(__SUNPRO_C) || defined(__SUNPRO_CC) -+#pragma pack() -+#else - #pragma pack(pop) -+#endif - - #ifdef __cplusplus - } Deleted: csw/mgar/pkg/libfaad2/trunk/files/faaccfg.h.diff =================================================================== --- csw/mgar/pkg/libfaac/trunk/files/faaccfg.h.diff 2009-12-28 14:18:44 UTC (rev 7782) +++ csw/mgar/pkg/libfaad2/trunk/files/faaccfg.h.diff 2010-01-02 16:37:07 UTC (rev 7830) @@ -1,26 +0,0 @@ -diff --speed-large-files --minimal -ru ../build-global/faac-1.28/include/faaccfg.h faac-1.28/include/faaccfg.h ---- ../build-global/faac-1.28/include/faaccfg.h 2004-07-04 14:12:05.000000000 +0200 -+++ faac-1.28/include/faaccfg.h 2009-03-20 06:03:00.833899895 +0100 -@@ -45,7 +45,11 @@ - #define SHORTCTL_NOSHORT 1 - #define SHORTCTL_NOLONG 2 - -+#if defined(__SUNPRO_C) || defined(__SUNPRO_CC) -+#pragma pack() -+#else - #pragma pack(push, 1) -+#endif - typedef struct faacEncConfiguration - { - /* config version */ -@@ -117,6 +121,10 @@ - - } faacEncConfiguration, *faacEncConfigurationPtr; - -+#if defined(__SUNPRO_C) || defined(__SUNPRO_CC) -+#pragma pack() -+#else - #pragma pack(pop) -+#endif - - #endif /* _FAACCFG_H_ */ Deleted: csw/mgar/pkg/libfaad2/trunk/files/frame.h.diff =================================================================== --- csw/mgar/pkg/libfaac/trunk/files/frame.h.diff 2009-12-28 14:18:44 UTC (rev 7782) +++ csw/mgar/pkg/libfaad2/trunk/files/frame.h.diff 2010-01-02 16:37:07 UTC (rev 7830) @@ -1,27 +0,0 @@ -diff --speed-large-files --minimal -ru ../build-global/faac-1.28/libfaac/frame.h faac-1.28/libfaac/frame.h ---- ../build-global/faac-1.28/libfaac/frame.h 2009-01-25 19:50:32.000000000 +0100 -+++ faac-1.28/libfaac/frame.h 2009-03-20 06:03:57.455266251 +0100 -@@ -60,7 +60,11 @@ - #endif - #endif - -+#if defined(__SUNPRO_C) || defined(__SUNPRO_CC) -+#pragma pack() -+#else - #pragma pack(push, 1) -+#endif - - typedef struct { - psymodel_t *model; -@@ -151,7 +155,11 @@ - int FAACAPI faacEncClose(faacEncHandle hEncoder); - - -+#if defined(__SUNPRO_C) || defined(__SUNPRO_CC) -+#pragma pack() -+#else - #pragma pack(pop) -+#endif - - #ifdef __cplusplus - } Deleted: csw/mgar/pkg/libfaad2/trunk/files/input.c.diff =================================================================== --- csw/mgar/pkg/libfaac/trunk/files/input.c.diff 2009-12-28 14:18:44 UTC (rev 7782) +++ csw/mgar/pkg/libfaad2/trunk/files/input.c.diff 2010-01-02 16:37:07 UTC (rev 7830) @@ -1,29 +0,0 @@ -diff --speed-large-files --minimal -ru ../build-global/faac-1.28/frontend/input.c faac-1.28/frontend/input.c ---- ../build-global/faac-1.28/frontend/input.c 2009-01-25 19:50:32.000000000 +0100 -+++ faac-1.28/frontend/input.c 2009-03-20 06:06:22.286495928 +0100 -@@ -27,6 +27,10 @@ - #include - #include - -+#if defined(__SUNPRO_C) || defined(__SUNPRO_CC) -+#include /* for BSWAP_8|BSWAP_16|BSWAP_32|BSWAP_64 */ -+#endif -+ - #ifdef _WIN32 - #include - #include -@@ -34,9 +38,14 @@ - - #include "input.h" - -+#if (defined(__SUNPRO_C) || defined(__SUNPRO_CC)) && defined(__SunOS_5_10) -+#define SWAP32(x) BSWAP_32(x) -+#define SWAP16(x) BSWAP_16(x) -+#else - #define SWAP32(x) (((x & 0xff) << 24) | ((x & 0xff00) << 8) \ - | ((x & 0xff0000) >> 8) | ((x & 0xff000000) >> 24)) - #define SWAP16(x) (((x & 0xff) << 8) | ((x & 0xff00) >> 8)) -+#endif - - #ifdef WORDS_BIGENDIAN - # define UINT32(x) SWAP32(x) Deleted: csw/mgar/pkg/libfaad2/trunk/files/ltp.c.diff =================================================================== --- csw/mgar/pkg/libfaac/trunk/files/ltp.c.diff 2009-12-28 14:18:44 UTC (rev 7782) +++ csw/mgar/pkg/libfaad2/trunk/files/ltp.c.diff 2010-01-02 16:37:07 UTC (rev 7830) @@ -1,17 +0,0 @@ -diff --speed-large-files --minimal -ru ../build-global/faac-1.28/libfaac/ltp.c faac-1.28/libfaac/ltp.c ---- ../build-global/faac-1.28/libfaac/ltp.c 2003-06-26 21:20:31.000000000 +0200 -+++ faac-1.28/libfaac/ltp.c 2009-03-20 06:07:27.247999333 +0100 -@@ -38,10 +38,13 @@ - #include "util.h" - - -+#if !defined(__SUNPRO_C) && !defined(__SUNPRO_CC) -+/* why is this define here anyway, it is not used anywhere */ - /* short double_to_int(double sig_in); */ - #define double_to_int(sig_in) \ - ((sig_in) > 32767 ? 32767 : ( \ - (sig_in) < -32768 ? -32768 : (sig_in))) -+#endif - - #define _MDCT_SCALE 512 - Deleted: csw/mgar/pkg/libfaad2/trunk/files/mp4property.h.diff =================================================================== --- csw/mgar/pkg/libfaac/trunk/files/mp4property.h.diff 2009-12-28 14:18:44 UTC (rev 7782) +++ csw/mgar/pkg/libfaad2/trunk/files/mp4property.h.diff 2010-01-02 16:37:07 UTC (rev 7830) @@ -1,12 +0,0 @@ -diff --speed-large-files --minimal -ru ../build-global/faac-1.28/common/mp4v2/mp4property.h faac-1.28/common/mp4v2/mp4property.h ---- ../build-global/faac-1.28/common/mp4v2/mp4property.h 2009-01-25 02:14:34.000000000 +0100 -+++ faac-1.28/common/mp4v2/mp4property.h 2009-03-20 06:08:45.678172744 +0100 -@@ -38,7 +38,7 @@ - StringProperty, - BytesProperty, - TableProperty, -- DescriptorProperty, -+ DescriptorProperty - }; - - class MP4Property { Deleted: csw/mgar/pkg/libfaad2/trunk/files/mp4util.h.diff =================================================================== --- csw/mgar/pkg/libfaac/trunk/files/mp4util.h.diff 2009-12-28 14:18:44 UTC (rev 7782) +++ csw/mgar/pkg/libfaad2/trunk/files/mp4util.h.diff 2010-01-02 16:37:07 UTC (rev 7830) @@ -1,12 +0,0 @@ -diff --speed-large-files --minimal -ru ../build-global/faac-1.28/common/mp4v2/mp4util.h faac-1.28/common/mp4v2/mp4util.h ---- ../build-global/faac-1.28/common/mp4v2/mp4util.h 2009-01-25 02:14:34.000000000 +0100 -+++ faac-1.28/common/mp4v2/mp4util.h 2009-03-20 00:14:32.128482807 +0100 -@@ -83,7 +83,7 @@ - } - - static inline void MP4Printf(const char* fmt, ...) --#ifndef _WIN32 -+#if defined(__GNUC__) - __attribute__((format(__printf__, 1, 2))) - #endif - ; Deleted: csw/mgar/pkg/libfaad2/trunk/files/mpeg4ip.h.diff =================================================================== --- csw/mgar/pkg/libfaac/trunk/files/mpeg4ip.h.diff 2009-12-28 14:18:44 UTC (rev 7782) +++ csw/mgar/pkg/libfaad2/trunk/files/mpeg4ip.h.diff 2010-01-02 16:37:07 UTC (rev 7830) @@ -1,37 +0,0 @@ -diff --speed-large-files --minimal -ru ../build-global/faac-1.28/common/mp4v2/mpeg4ip.h faac-1.28/common/mp4v2/mpeg4ip.h ---- ../build-global/faac-1.28/common/mp4v2/mpeg4ip.h 2009-01-26 23:42:35.000000000 +0100 -+++ faac-1.28/common/mp4v2/mpeg4ip.h 2009-03-20 06:14:07.133127520 +0100 -@@ -65,7 +65,9 @@ - /***************************************************************************** - * UNIX LIKE DEFINES BELOW THIS POINT - *****************************************************************************/ --#ifdef sun -+#if defined(sun) || defined(__sun) || defined(__sun__) -+#include -+#include - #include - #endif - -@@ -194,12 +196,7 @@ - typedef unsigned int socklen_t; - #endif - --#ifdef sun --#include --#define u_int8_t uint8_t --#define u_int16_t uint16_t --#define u_int32_t uint32_t --#define u_int64_t uint64_t -+#if defined(sun) || defined(__sun) || defined(__sun__) - #define __STRING(expr) #expr - #endif - -@@ -328,7 +325,7 @@ - AUDIO_FMT_U16, - AUDIO_FMT_S16, - AUDIO_FMT_FLOAT, -- AUDIO_FMT_HW_AC3, -+ AUDIO_FMT_HW_AC3 - } audio_format_t; - - #endif /* __MPEG4IP_INCLUDED__ */ Deleted: csw/mgar/pkg/libfaad2/trunk/files/psych.h.diff =================================================================== --- csw/mgar/pkg/libfaac/trunk/files/psych.h.diff 2009-12-28 14:18:44 UTC (rev 7782) +++ csw/mgar/pkg/libfaad2/trunk/files/psych.h.diff 2010-01-02 16:37:07 UTC (rev 7830) @@ -1,10 +0,0 @@ -diff --speed-large-files --minimal -ru ../build-global/faac-1.28/libfaac/psych.h faac-1.28/libfaac/psych.h ---- ../build-global/faac-1.28/libfaac/psych.h 2005-04-24 21:16:14.000000000 +0200 -+++ faac-1.28/libfaac/psych.h 2009-03-20 06:14:31.902939182 +0100 -@@ -82,4 +82,4 @@ - } - #endif /* __cplusplus */ - --#endif /* PSYCH_H */ -\ No newline at end of file -+#endif /* PSYCH_H */ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Sat Jan 2 17:54:31 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Sat, 02 Jan 2010 16:54:31 +0000 Subject: [csw-devel] SF.net SVN: gar:[7831] csw/mgar/pkg/libfaad2/trunk Message-ID: Revision: 7831 http://gar.svn.sourceforge.net/gar/?rev=7831&view=rev Author: dmichelsen Date: 2010-01-02 16:54:31 +0000 (Sat, 02 Jan 2010) Log Message: ----------- libfaad2: Initial commit Modified Paths: -------------- csw/mgar/pkg/libfaad2/trunk/Makefile csw/mgar/pkg/libfaad2/trunk/checksums csw/mgar/pkg/libfaad2/trunk/files/0001-Remove-iquote-from-CFLAGS-unknown-to-SS.patch Added Paths: ----------- csw/mgar/pkg/libfaad2/trunk/files/0002-Use-inline-suitable-for-SS.patch Modified: csw/mgar/pkg/libfaad2/trunk/Makefile =================================================================== --- csw/mgar/pkg/libfaad2/trunk/Makefile 2010-01-02 16:37:07 UTC (rev 7830) +++ csw/mgar/pkg/libfaad2/trunk/Makefile 2010-01-02 16:54:31 UTC (rev 7831) @@ -12,6 +12,7 @@ MASTER_SITES = $(SF_MIRRORS) DISTFILES = $(DISTNAME).tar.bz2 PATCHFILES = 0001-Remove-iquote-from-CFLAGS-unknown-to-SS.patch +PATCHFILES += 0002-Use-inline-suitable-for-SS.patch PACKAGES = CSWfaad2 CATALOGNAME = faad2 Modified: csw/mgar/pkg/libfaad2/trunk/checksums =================================================================== --- csw/mgar/pkg/libfaad2/trunk/checksums 2010-01-02 16:37:07 UTC (rev 7830) +++ csw/mgar/pkg/libfaad2/trunk/checksums 2010-01-02 16:54:31 UTC (rev 7831) @@ -1 +1,3 @@ +03a038258ea594c90c9b58e8572a262b 0001-Remove-iquote-from-CFLAGS-unknown-to-SS.patch +ea595fc8a7759c1ca424bcb226c52975 0002-Use-inline-suitable-for-SS.patch 4c332fa23febc0e4648064685a3d4332 faad2-2.7.tar.bz2 Modified: csw/mgar/pkg/libfaad2/trunk/files/0001-Remove-iquote-from-CFLAGS-unknown-to-SS.patch =================================================================== --- csw/mgar/pkg/libfaad2/trunk/files/0001-Remove-iquote-from-CFLAGS-unknown-to-SS.patch 2010-01-02 16:37:07 UTC (rev 7830) +++ csw/mgar/pkg/libfaad2/trunk/files/0001-Remove-iquote-from-CFLAGS-unknown-to-SS.patch 2010-01-02 16:54:31 UTC (rev 7831) @@ -4,24 +4,10 @@ Subject: [PATCH] Remove iquote from CFLAGS unknown to SS --- - libfaad/Makefile | 2 +- libfaad/Makefile.am | 2 +- libfaad/Makefile.in | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) -diff --git a/libfaad/Makefile b/libfaad/Makefile -index 71c9ec1..13edca2 100644 ---- a/libfaad/Makefile -+++ b/libfaad/Makefile -@@ -195,7 +195,7 @@ sharedstatedir = /opt/csw/share - sysconfdir = /opt/csw/etc - target_alias = - lib_LTLIBRARIES = libfaad.la --AM_CFLAGS = -iquote $(top_srcdir)/include -+AM_CFLAGS = $(top_srcdir)/include - include_HEADERS = $(top_srcdir)/include/faad.h \ - $(top_srcdir)/include/neaacdec.h - diff --git a/libfaad/Makefile.am b/libfaad/Makefile.am index e5ad36d..d355989 100644 --- a/libfaad/Makefile.am @@ -30,7 +16,7 @@ lib_LTLIBRARIES = libfaad.la -AM_CFLAGS = -iquote $(top_srcdir)/include -+AM_CFLAGS = $(top_srcdir)/include ++AM_CFLAGS = -I$(top_srcdir)/include include_HEADERS = $(top_srcdir)/include/faad.h \ $(top_srcdir)/include/neaacdec.h @@ -43,7 +29,7 @@ target_alias = @target_alias@ lib_LTLIBRARIES = libfaad.la -AM_CFLAGS = -iquote $(top_srcdir)/include -+AM_CFLAGS = $(top_srcdir)/include ++AM_CFLAGS = -I$(top_srcdir)/include include_HEADERS = $(top_srcdir)/include/faad.h \ $(top_srcdir)/include/neaacdec.h Added: csw/mgar/pkg/libfaad2/trunk/files/0002-Use-inline-suitable-for-SS.patch =================================================================== --- csw/mgar/pkg/libfaad2/trunk/files/0002-Use-inline-suitable-for-SS.patch (rev 0) +++ csw/mgar/pkg/libfaad2/trunk/files/0002-Use-inline-suitable-for-SS.patch 2010-01-02 16:54:31 UTC (rev 7831) @@ -0,0 +1,25 @@ +From f25a74ff2b2bed01cc6e5ed702f4c80947b7c8c6 Mon Sep 17 00:00:00 2001 +From: Dagobert Michelsen +Date: Sat, 2 Jan 2010 17:40:18 +0100 +Subject: [PATCH] Use inline suitable for SS + +--- + libfaad/common.h | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/libfaad/common.h b/libfaad/common.h +index d3b21c3..6247de6 100644 +--- a/libfaad/common.h ++++ b/libfaad/common.h +@@ -41,7 +41,7 @@ extern "C" { + + #include "neaacdec.h" + +-#if 1 ++#if 0 + #define INLINE __inline + #else + #define INLINE inline +-- +1.6.6 + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Sat Jan 2 20:27:00 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Sat, 02 Jan 2010 19:27:00 +0000 Subject: [csw-devel] SF.net SVN: gar:[7832] csw/mgar/pkg/libfaad2/trunk Message-ID: Revision: 7832 http://gar.svn.sourceforge.net/gar/?rev=7832&view=rev Author: dmichelsen Date: 2010-01-02 19:26:57 +0000 (Sat, 02 Jan 2010) Log Message: ----------- libfaad2: Add another SS patch Modified Paths: -------------- csw/mgar/pkg/libfaad2/trunk/Makefile csw/mgar/pkg/libfaad2/trunk/checksums Added Paths: ----------- csw/mgar/pkg/libfaad2/trunk/files/0003-Use-inttypes-instead-of-stdint.patch Modified: csw/mgar/pkg/libfaad2/trunk/Makefile =================================================================== --- csw/mgar/pkg/libfaad2/trunk/Makefile 2010-01-02 16:54:31 UTC (rev 7831) +++ csw/mgar/pkg/libfaad2/trunk/Makefile 2010-01-02 19:26:57 UTC (rev 7832) @@ -13,6 +13,7 @@ DISTFILES = $(DISTNAME).tar.bz2 PATCHFILES = 0001-Remove-iquote-from-CFLAGS-unknown-to-SS.patch PATCHFILES += 0002-Use-inline-suitable-for-SS.patch +PATCHFILES += 0003-Use-inttypes-instead-of-stdint.patch PACKAGES = CSWfaad2 CATALOGNAME = faad2 Modified: csw/mgar/pkg/libfaad2/trunk/checksums =================================================================== --- csw/mgar/pkg/libfaad2/trunk/checksums 2010-01-02 16:54:31 UTC (rev 7831) +++ csw/mgar/pkg/libfaad2/trunk/checksums 2010-01-02 19:26:57 UTC (rev 7832) @@ -1,3 +1,4 @@ 03a038258ea594c90c9b58e8572a262b 0001-Remove-iquote-from-CFLAGS-unknown-to-SS.patch ea595fc8a7759c1ca424bcb226c52975 0002-Use-inline-suitable-for-SS.patch +548781681ae7b3ad6e3ae9c2ff556f11 0003-Use-inttypes-instead-of-stdint.patch 4c332fa23febc0e4648064685a3d4332 faad2-2.7.tar.bz2 Added: csw/mgar/pkg/libfaad2/trunk/files/0003-Use-inttypes-instead-of-stdint.patch =================================================================== --- csw/mgar/pkg/libfaad2/trunk/files/0003-Use-inttypes-instead-of-stdint.patch (rev 0) +++ csw/mgar/pkg/libfaad2/trunk/files/0003-Use-inttypes-instead-of-stdint.patch 2010-01-02 19:26:57 UTC (rev 7832) @@ -0,0 +1,26 @@ +From c02c28a516d3baecef4253f305af295078c530c8 Mon Sep 17 00:00:00 2001 +From: Dagobert Michelsen +Date: Sat, 2 Jan 2010 17:49:08 +0100 +Subject: [PATCH 3/3] Use inttypes instead of stdint + +--- + common/mp4ff/mp4ff_int_types.h | 3 ++- + 1 files changed, 2 insertions(+), 1 deletions(-) + +diff --git a/common/mp4ff/mp4ff_int_types.h b/common/mp4ff/mp4ff_int_types.h +index 15e7fd6..bf8b0c0 100644 +--- a/common/mp4ff/mp4ff_int_types.h ++++ b/common/mp4ff/mp4ff_int_types.h +@@ -19,7 +19,8 @@ typedef unsigned __int64 uint64_t; + + #else + +-#include ++/* #include */ ++#include + + #endif + +-- +1.6.6 + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Sat Jan 2 21:11:54 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Sat, 02 Jan 2010 20:11:54 +0000 Subject: [csw-devel] SF.net SVN: gar:[7833] csw/mgar/pkg Message-ID: Revision: 7833 http://gar.svn.sourceforge.net/gar/?rev=7833&view=rev Author: dmichelsen Date: 2010-01-02 20:11:50 +0000 (Sat, 02 Jan 2010) Log Message: ----------- mpeg4ip: Initial commit Added Paths: ----------- csw/mgar/pkg/mpeg4ip/ csw/mgar/pkg/mpeg4ip/branches/ csw/mgar/pkg/mpeg4ip/tags/ csw/mgar/pkg/mpeg4ip/trunk/ csw/mgar/pkg/mpeg4ip/trunk/Makefile csw/mgar/pkg/mpeg4ip/trunk/checksums csw/mgar/pkg/mpeg4ip/trunk/files/ Property changes on: csw/mgar/pkg/mpeg4ip/trunk ___________________________________________________________________ Added: svn:ignore + cookies download work Added: svn:externals + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 Added: csw/mgar/pkg/mpeg4ip/trunk/Makefile =================================================================== --- csw/mgar/pkg/mpeg4ip/trunk/Makefile (rev 0) +++ csw/mgar/pkg/mpeg4ip/trunk/Makefile 2010-01-02 20:11:50 UTC (rev 7833) @@ -0,0 +1,23 @@ +GARNAME = mpeg4ip +GARVERSION = 1.6.1 +CATEGORIES = lib + +DESCRIPTION = Libraries for MPEG-4/H.261/MPEG-2/H.263 MP3/AAC/AMR +define BLURB + Provided are a live MPEG-4/H.261/MPEG-2/H.263 MP3/AAC/AMR broadcaster + and file recorder, command line utilities such as an MP4 file creator + and hinter, and an player that can both stream and playback from local file. +endef + +SF_PROJ = mpeg4ip +MASTER_SITES = http://download.m0k.org/handbrake/contrib/ +DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz +DISTNAME = $(GARNAME) + +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + +BUILD64 = 1 +CONFIGURE_ARGS = $(DIRPATHS) + +include gar/category.mk Added: csw/mgar/pkg/mpeg4ip/trunk/checksums =================================================================== --- csw/mgar/pkg/mpeg4ip/trunk/checksums (rev 0) +++ csw/mgar/pkg/mpeg4ip/trunk/checksums 2010-01-02 20:11:50 UTC (rev 7833) @@ -0,0 +1 @@ +cd81b566cf2fafc7318f58be8998182c mpeg4ip-1.6.1.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From hson at users.sourceforge.net Sun Jan 3 00:34:09 2010 From: hson at users.sourceforge.net (hson at users.sourceforge.net) Date: Sat, 02 Jan 2010 23:34:09 +0000 Subject: [csw-devel] SF.net SVN: gar:[7834] csw/mgar/pkg Message-ID: Revision: 7834 http://gar.svn.sourceforge.net/gar/?rev=7834&view=rev Author: hson Date: 2010-01-02 23:34:09 +0000 (Sat, 02 Jan 2010) Log Message: ----------- gtksourceview: Initial commit Added Paths: ----------- csw/mgar/pkg/gtksourceview/ csw/mgar/pkg/gtksourceview/Makefile csw/mgar/pkg/gtksourceview/branches/ csw/mgar/pkg/gtksourceview/tags/ csw/mgar/pkg/gtksourceview/trunk/ csw/mgar/pkg/gtksourceview/trunk/Makefile csw/mgar/pkg/gtksourceview/trunk/checksums csw/mgar/pkg/gtksourceview/trunk/files/ Added: csw/mgar/pkg/gtksourceview/Makefile =================================================================== --- csw/mgar/pkg/gtksourceview/Makefile (rev 0) +++ csw/mgar/pkg/gtksourceview/Makefile 2010-01-02 23:34:09 UTC (rev 7834) @@ -0,0 +1,15 @@ +# vim: ft=make ts=4 sw=4 noet + +default: + @echo "You are in the pkg/ directory." + +%: + $(MAKE) -C trunk $* + +paranoid-%: + $(MAKE) -C trunk $* || exit 2 + +export BUILDLOG ?= $(shell pwd)/buildlog.txt + +report-%: + $(MAKE) -C trunk $* || echo " *** make $* in $$i failed ***" >> $(BUILDLOG) Property changes on: csw/mgar/pkg/gtksourceview/trunk ___________________________________________________________________ Added: svn:ignore + cookies download work Added: svn:externals + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 Added: csw/mgar/pkg/gtksourceview/trunk/Makefile =================================================================== --- csw/mgar/pkg/gtksourceview/trunk/Makefile (rev 0) +++ csw/mgar/pkg/gtksourceview/trunk/Makefile 2010-01-02 23:34:09 UTC (rev 7834) @@ -0,0 +1,59 @@ +GARNAME = gtksourceview +GARVERSION = 2.9.3 +CATEGORIES = gnome + +DESCRIPTION = A text widget with features typical of a source code editor +define BLURB + GtkSourceView is a text widget that extends the standard gtk+ 2.x + text widget GtkTextView. + + It improves GtkTextView by implementing syntax highlighting and other + features typical of a source code editor. +endef + +MASTER_SITES = $(GNOME_MIRROR) +DISTFILES = $(GARNAME)-$(GARVERSION).tar.bz2 +DISTNAME = $(GARNAME)-$(GARVERSION) + +PACKAGES = CSWgtksourceview CSWgtksourceviewdev CSWgtksourceviewdoc +CATALOGNAME_CSWgtksourceview = gtksourceview +CATALOGNAME_CSWgtksourceviewdev = gtksourceview_devel +CATALOGNAME_CSWgtksourceviewdoc = gtksourceview_doc + +SPKG_DESC_CSWgtksourceview += A text widget with features typical of a source code editor +SPKG_DESC_CSWgtksourceviewdev += A text widget with features typical of a source code editor - developer package +SPKG_DESC_CSWgtksourceviewdoc += A text widget with features typical of a source code editor - documentation + +REQUIRED_PKGS_CSWgtksourceview += CSWfconfig CSWftype2 CSWgconf2 CSWggettextrt CSWglib2 +REQUIRED_PKGS_CSWgtksourceview += CSWgtk2 CSWlibatk CSWlibcairo CSWlibxml2 CSWpango +REQUIRED_PKGS_CSWgtksourceviewdev += CSWgtksourceview +REQUIRED_PKGS_CSWgtksourceviewdoc += CSWgtksourceview + +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.bz2 + +SPKG_SOURCEURL = http://live.gnome.org/GtkSourceView + +EXTRA_INC = $(prefix)/X11/include +EXTRA_LIB = $(prefix)/X11/lib +EXTRA_PKG_CONFIG_DIRS = $(prefix)/X11/lib + +#NO_ISAEXEC = 1 +#NOISALIST = 1 +#BUILD64 = 1 + +PKGFILES_CSWgtksourceviewdev = $(PKGFILES_DEVEL) +PKGFILES_CSWgtksourceviewdoc = $(sharedstatedir)/gtk-doc/.* + +ARCHALL_CSWgtksourceviewdoc = 1 + +CONFIGURE_ARGS = $(DIRPATHS) + +# Test fails due to: +# Xlib: extension "Generic Event Extension" missing on display ":0.0". +# +#TEST_TARGET = check +TEST_TARGET = + +include gar/category.mk + +PATH := /opt/csw/gnu:$(PATH) Added: csw/mgar/pkg/gtksourceview/trunk/checksums =================================================================== --- csw/mgar/pkg/gtksourceview/trunk/checksums (rev 0) +++ csw/mgar/pkg/gtksourceview/trunk/checksums 2010-01-02 23:34:09 UTC (rev 7834) @@ -0,0 +1 @@ +14e2a838c0a2e5e602103f6715948084 gtksourceview-2.9.3.tar.bz2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From hson at users.sourceforge.net Sun Jan 3 00:46:25 2010 From: hson at users.sourceforge.net (hson at users.sourceforge.net) Date: Sat, 02 Jan 2010 23:46:25 +0000 Subject: [csw-devel] SF.net SVN: gar:[7835] csw/mgar/pkg Message-ID: Revision: 7835 http://gar.svn.sourceforge.net/gar/?rev=7835&view=rev Author: hson Date: 2010-01-02 23:46:25 +0000 (Sat, 02 Jan 2010) Log Message: ----------- goocanvas: Initial commit Added Paths: ----------- csw/mgar/pkg/goocanvas/ csw/mgar/pkg/goocanvas/Makefile csw/mgar/pkg/goocanvas/branches/ csw/mgar/pkg/goocanvas/tags/ csw/mgar/pkg/goocanvas/trunk/ csw/mgar/pkg/goocanvas/trunk/Makefile csw/mgar/pkg/goocanvas/trunk/checksums csw/mgar/pkg/goocanvas/trunk/files/ Added: csw/mgar/pkg/goocanvas/Makefile =================================================================== --- csw/mgar/pkg/goocanvas/Makefile (rev 0) +++ csw/mgar/pkg/goocanvas/Makefile 2010-01-02 23:46:25 UTC (rev 7835) @@ -0,0 +1,15 @@ +# vim: ft=make ts=4 sw=4 noet + +default: + @echo "You are in the pkg/ directory." + +%: + $(MAKE) -C trunk $* + +paranoid-%: + $(MAKE) -C trunk $* || exit 2 + +export BUILDLOG ?= $(shell pwd)/buildlog.txt + +report-%: + $(MAKE) -C trunk $* || echo " *** make $* in $$i failed ***" >> $(BUILDLOG) Property changes on: csw/mgar/pkg/goocanvas/trunk ___________________________________________________________________ Added: svn:ignore + cookies download work Added: svn:externals + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 Added: csw/mgar/pkg/goocanvas/trunk/Makefile =================================================================== --- csw/mgar/pkg/goocanvas/trunk/Makefile (rev 0) +++ csw/mgar/pkg/goocanvas/trunk/Makefile 2010-01-02 23:46:25 UTC (rev 7835) @@ -0,0 +1,55 @@ +GARNAME = goocanvas +GARVERSION = 0.15 +CATEGORIES = gnome + +DESCRIPTION = A cairo-based canvas widget for GTK +define BLURB + GooCanvas is a canvas widget for GTK that uses the cairo 2D library + for drawing. +endef + +MASTER_SITES = $(GNOME_MIRROR) +DISTFILES = $(GARNAME)-$(GARVERSION).tar.bz2 +DISTNAME = $(GARNAME)-$(GARVERSION) + +PACKAGES = CSWgoocanvas CSWgoocanvasdevel CSWgoocanvasdoc +CATALOGNAME_CSWgoocanvas = goocanvas +CATALOGNAME_CSWgoocanvasdevel = goocanvas_devel +CATALOGNAME_CSWgoocanvasdoc = goocanvas_doc + +SPKG_DESC_CSWgoocanvas += A cairo-based canvas widget for GTK +SPKG_DESC_CSWgoocanvasdevel += A cairo-based canvas widget for GTK - developer package +SPKG_DESC_CSWgoocanvasdoc += A cairo-based canvas widget for GTK - documentation + +REQUIRED_PKGS_CSWgoocanvas += CSWfconfig CSWftype2 CSWggettextrt CSWglib2 +REQUIRED_PKGS_CSWgoocanvas += CSWgtk2 CSWlibatk CSWlibcairo CSWpango +REQUIRED_PKGS_CSWgoocanvasdevel += CSWgoocanvas +REQUIRED_PKGS_CSWgoocanvasdoc += CSWgoocanvas + +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.bz2 + +SPKG_SOURCEURL = http://live.gnome.org/GooCanvas + +EXTRA_INC = $(prefix)/X11/include +EXTRA_LIB = $(prefix)/X11/lib +EXTRA_PKG_CONFIG_DIRS = $(prefix)/X11/lib + +#NO_ISAEXEC = 1 +#NOISALIST = 1 +#BUILD64 = 1 + +PKGFILES_CSWgoocanvasdevel = $(PKGFILES_DEVEL) +PKGFILES_CSWgoocanvasdoc = $(sharedstatedir)/gtk-doc/.* + +ARCHALL_CSWgoocanvasdoc = 1 + +LIBS = -lm +export LIBS + +CONFIGURE_ARGS = $(DIRPATHS) + +TEST_TARGET = check + +include gar/category.mk + +PATH := /opt/csw/gnu:$(PATH) Added: csw/mgar/pkg/goocanvas/trunk/checksums =================================================================== --- csw/mgar/pkg/goocanvas/trunk/checksums (rev 0) +++ csw/mgar/pkg/goocanvas/trunk/checksums 2010-01-02 23:46:25 UTC (rev 7835) @@ -0,0 +1 @@ +3f53c01e6aa958db3463c4ce1a8f5238 goocanvas-0.15.tar.bz2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From hson at users.sourceforge.net Sun Jan 3 00:47:58 2010 From: hson at users.sourceforge.net (hson at users.sourceforge.net) Date: Sat, 02 Jan 2010 23:47:58 +0000 Subject: [csw-devel] SF.net SVN: gar:[7836] csw/mgar/pkg Message-ID: Revision: 7836 http://gar.svn.sourceforge.net/gar/?rev=7836&view=rev Author: hson Date: 2010-01-02 23:47:58 +0000 (Sat, 02 Jan 2010) Log Message: ----------- iso-codes: Initial commit Added Paths: ----------- csw/mgar/pkg/iso-codes/ csw/mgar/pkg/iso-codes/Makefile csw/mgar/pkg/iso-codes/branches/ csw/mgar/pkg/iso-codes/tags/ csw/mgar/pkg/iso-codes/trunk/ csw/mgar/pkg/iso-codes/trunk/Makefile csw/mgar/pkg/iso-codes/trunk/checksums csw/mgar/pkg/iso-codes/trunk/files/ Added: csw/mgar/pkg/iso-codes/Makefile =================================================================== --- csw/mgar/pkg/iso-codes/Makefile (rev 0) +++ csw/mgar/pkg/iso-codes/Makefile 2010-01-02 23:47:58 UTC (rev 7836) @@ -0,0 +1,15 @@ +# vim: ft=make ts=4 sw=4 noet + +default: + @echo "You are in the pkg/ directory." + +%: + $(MAKE) -C trunk $* + +paranoid-%: + $(MAKE) -C trunk $* || exit 2 + +export BUILDLOG ?= $(shell pwd)/buildlog.txt + +report-%: + $(MAKE) -C trunk $* || echo " *** make $* in $$i failed ***" >> $(BUILDLOG) Property changes on: csw/mgar/pkg/iso-codes/trunk ___________________________________________________________________ Added: svn:ignore + cookies download work Added: svn:externals + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 Added: csw/mgar/pkg/iso-codes/trunk/Makefile =================================================================== --- csw/mgar/pkg/iso-codes/trunk/Makefile (rev 0) +++ csw/mgar/pkg/iso-codes/trunk/Makefile 2010-01-02 23:47:58 UTC (rev 7836) @@ -0,0 +1,30 @@ +GARNAME = iso-codes +GARVERSION = 3.9 +CATEGORIES = apps + +DESCRIPTION = Translations for names of various ISO standards +define BLURB + This package provides lists of various ISO standards (e.g. country, + language, language scripts, and currency names) in one place, rather + than repeated in many programs throughout the system +endef + +MASTER_SITES = ftp://pkg-isocodes.alioth.debian.org/pub/pkg-isocodes/ +DISTFILES = $(GARNAME)-$(GARVERSION).tar.bz2 +PACKAGES = CSWiso-codes +CATALOGNAME = iso_codes +SPKG_SOURCEURL = http://alioth.debian.org/projects/pkg-isocodes/ + + +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.bz2 + +CONFIGURE_ARGS = $(DIRPATHS) + +TEST_TARGET = check + +ARCHALL = 1 + +include gar/category.mk + +PATH := /opt/csw/gnu:$(PATH) Added: csw/mgar/pkg/iso-codes/trunk/checksums =================================================================== --- csw/mgar/pkg/iso-codes/trunk/checksums (rev 0) +++ csw/mgar/pkg/iso-codes/trunk/checksums 2010-01-02 23:47:58 UTC (rev 7836) @@ -0,0 +1 @@ +78bd12403eddf4439f5def44b1154337 iso-codes-3.9.tar.bz2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From hson at users.sourceforge.net Sun Jan 3 00:51:10 2010 From: hson at users.sourceforge.net (hson at users.sourceforge.net) Date: Sat, 02 Jan 2010 23:51:10 +0000 Subject: [csw-devel] SF.net SVN: gar:[7837] csw/mgar/pkg Message-ID: Revision: 7837 http://gar.svn.sourceforge.net/gar/?rev=7837&view=rev Author: hson Date: 2010-01-02 23:51:10 +0000 (Sat, 02 Jan 2010) Log Message: ----------- libunique: Initial commit Added Paths: ----------- csw/mgar/pkg/libunique/ csw/mgar/pkg/libunique/Makefile csw/mgar/pkg/libunique/branches/ csw/mgar/pkg/libunique/tags/ csw/mgar/pkg/libunique/trunk/ csw/mgar/pkg/libunique/trunk/Makefile csw/mgar/pkg/libunique/trunk/checksums csw/mgar/pkg/libunique/trunk/files/ Added: csw/mgar/pkg/libunique/Makefile =================================================================== --- csw/mgar/pkg/libunique/Makefile (rev 0) +++ csw/mgar/pkg/libunique/Makefile 2010-01-02 23:51:10 UTC (rev 7837) @@ -0,0 +1,15 @@ +# vim: ft=make ts=4 sw=4 noet + +default: + @echo "You are in the pkg/ directory." + +%: + $(MAKE) -C trunk $* + +paranoid-%: + $(MAKE) -C trunk $* || exit 2 + +export BUILDLOG ?= $(shell pwd)/buildlog.txt + +report-%: + $(MAKE) -C trunk $* || echo " *** make $* in $$i failed ***" >> $(BUILDLOG) Property changes on: csw/mgar/pkg/libunique/trunk ___________________________________________________________________ Added: svn:ignore + cookies download work Added: svn:externals + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 Added: csw/mgar/pkg/libunique/trunk/Makefile =================================================================== --- csw/mgar/pkg/libunique/trunk/Makefile (rev 0) +++ csw/mgar/pkg/libunique/trunk/Makefile 2010-01-02 23:51:10 UTC (rev 7837) @@ -0,0 +1,60 @@ +GARNAME = libunique +GARVERSION = 1.1.6 +CATEGORIES = gnome + +DESCRIPTION = Library for writing single instance application +define BLURB + Unique is a library for writing single instance application. If you launch + a single instance application twice, the second instance will either just + quit or will send a message to the running instance. + + Unique makes it easy to write this kind of applications, by providing a + base class, taking care of all the IPC machinery needed to send messages + to a running instance, and also handling the startup notification side. +endef + +MASTER_SITES = $(GNOME_MIRROR) +DISTFILES = $(GARNAME)-$(GARVERSION).tar.bz2 +DISTNAME = $(GARNAME)-$(GARVERSION) + +PACKAGES = CSWlibunique CSWlibuniquedevel CSWlibuniquedoc +CATALOGNAME_CSWlibunique = libunique +CATALOGNAME_CSWlibuniquedevel = libunique_devel +CATALOGNAME_CSWlibuniquedoc = libunique_doc + +SPKG_DESC_CSWlibunique += Library for writing single instance application +SPKG_DESC_CSWlibuniquedevel += Library for writing single instance application - developer package +SPKG_DESC_CSWlibuniquedoc += Library for writing single instance application - documentation + +REQUIRED_PKGS_CSWlibunique += CSWfconfig CSWftype2 CSWggettextrt CSWglib2 +REQUIRED_PKGS_CSWlibunique += CSWgtk2 CSWlibatk CSWlibcairo CSWlibx11 CSWpango +REQUIRED_PKGS_CSWlibuniquedevel += CSWlibunique +REQUIRED_PKGS_CSWlibuniquedoc += CSWlibunique + +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.bz2 + +SPKG_SOURCEURL = http://live.gnome.org/LibUnique + +EXTRA_INC = $(prefix)/X11/include +EXTRA_LIB = $(prefix)/X11/lib +EXTRA_PKG_CONFIG_DIRS = $(prefix)/X11/lib + +#NO_ISAEXEC = 1 +#NOISALIST = 1 +#BUILD64 = 1 + +PKGFILES_CSWlibuniquedevel = $(PKGFILES_DEVEL) +PKGFILES_CSWlibuniquedoc = $(sharedstatedir)/gtk-doc/.* + +ARCHALL_CSWlibuniquedoc = 1 + +LIBS = -lsocket -lnsl +export LIBS + +CONFIGURE_ARGS = $(DIRPATHS) + +TEST_TARGET = check + +include gar/category.mk + +PATH := /opt/csw/gnu:$(PATH) Added: csw/mgar/pkg/libunique/trunk/checksums =================================================================== --- csw/mgar/pkg/libunique/trunk/checksums (rev 0) +++ csw/mgar/pkg/libunique/trunk/checksums 2010-01-02 23:51:10 UTC (rev 7837) @@ -0,0 +1 @@ +7955769ef31f1bc4f83446dbb3625e6d libunique-1.1.6.tar.bz2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Sun Jan 3 02:08:34 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sun, 03 Jan 2010 01:08:34 +0000 Subject: [csw-devel] SF.net SVN: gar:[7838] csw/mgar/gar/v2-checkpkg/bin/checkpkg Message-ID: Revision: 7838 http://gar.svn.sourceforge.net/gar/?rev=7838&view=rev Author: wahwah Date: 2010-01-03 01:08:33 +0000 (Sun, 03 Jan 2010) Log Message: ----------- mGAR v2-checkpkg: Colors only in terminals Modified Paths: -------------- csw/mgar/gar/v2-checkpkg/bin/checkpkg Modified: csw/mgar/gar/v2-checkpkg/bin/checkpkg =================================================================== --- csw/mgar/gar/v2-checkpkg/bin/checkpkg 2010-01-02 23:51:10 UTC (rev 7837) +++ csw/mgar/gar/v2-checkpkg/bin/checkpkg 2010-01-03 01:08:33 UTC (rev 7838) @@ -31,6 +31,17 @@ readonly CHECKPKG_TMPDIR fi +# Colors only when running interactively +if [[ -t 1 ]]; then + GREEN="\\033[0;32;40m" + RED="\\033[1;31;40m" + COLOR_RESET="\\033[00m" +else + GREEN="" + RED="" + COLOR_RESET="" +fi + # always print out a warning message. (to stderr) # exit script, if quit_on_warn set @@ -555,10 +566,10 @@ printf "TEST: ${plugin} running..." ${plugin} $extra_options -e "${EXTRACTDIR}" ${pkgnames} > "${plugin_log}" 2>&1 if [[ "$?" -ne 0 ]]; then - printf "\rTEST: ${plugin} \\033[1;31;40m[FAIL]\\033[00m \\n" + printf "\rTEST: ${plugin} ${RED}[FAIL]${COLOR_RESET} \\n" test_suite_ok=0 else - printf "\rTEST: ${plugin} \\033[0;32;40m[OK]\\033[00m \\n" + printf "\rTEST: ${plugin} ${GREEN}[OK]${COLOR_RESET} \\n" fi else debugmsg "'${plugin}' is not executable" This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From hson at users.sourceforge.net Sun Jan 3 08:28:19 2010 From: hson at users.sourceforge.net (hson at users.sourceforge.net) Date: Sun, 03 Jan 2010 07:28:19 +0000 Subject: [csw-devel] SF.net SVN: gar:[7839] csw/mgar/pkg/libunique/trunk/Makefile Message-ID: Revision: 7839 http://gar.svn.sourceforge.net/gar/?rev=7839&view=rev Author: hson Date: 2010-01-03 07:28:19 +0000 (Sun, 03 Jan 2010) Log Message: ----------- libunique: Fixed Xext-problem which appeared when building on buildfarm Modified Paths: -------------- csw/mgar/pkg/libunique/trunk/Makefile Modified: csw/mgar/pkg/libunique/trunk/Makefile =================================================================== --- csw/mgar/pkg/libunique/trunk/Makefile 2010-01-03 01:08:33 UTC (rev 7838) +++ csw/mgar/pkg/libunique/trunk/Makefile 2010-01-03 07:28:19 UTC (rev 7839) @@ -28,6 +28,7 @@ REQUIRED_PKGS_CSWlibunique += CSWfconfig CSWftype2 CSWggettextrt CSWglib2 REQUIRED_PKGS_CSWlibunique += CSWgtk2 CSWlibatk CSWlibcairo CSWlibx11 CSWpango +REQUIRED_PKGS_CSWlibunique += CSWdbusglib CSWlibdbus CSWlibxext REQUIRED_PKGS_CSWlibuniquedevel += CSWlibunique REQUIRED_PKGS_CSWlibuniquedoc += CSWlibunique @@ -38,9 +39,16 @@ EXTRA_INC = $(prefix)/X11/include EXTRA_LIB = $(prefix)/X11/lib EXTRA_PKG_CONFIG_DIRS = $(prefix)/X11/lib +#This is ugly, should be EXTRA_LINKER_FLAGS, but due to libtool it doesn't work +EXTRA_LD_FLAGS_isa-i386 = -L/usr/openwin/lib -lXext +EXTRA_LD_FLAGS_isa-sparcv8 = -L/usr/openwin/lib -lXext +EXTRA_LD_FLAGS_isa-amd64 = -L/usr/openwin/lib/amd64 -lXext +EXTRA_LD_FLAGS_isa-sparcv9 = -L/usr/openwin/lib/sparcv9 -lXext +EXTRA_LD_FLAGS += $(EXTRA_LD_FLAGS_$(MODULATION)) #NO_ISAEXEC = 1 #NOISALIST = 1 +# libdbus not 64-bit yet #BUILD64 = 1 PKGFILES_CSWlibuniquedevel = $(PKGFILES_DEVEL) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From hson at users.sourceforge.net Sun Jan 3 09:24:00 2010 From: hson at users.sourceforge.net (hson at users.sourceforge.net) Date: Sun, 03 Jan 2010 08:24:00 +0000 Subject: [csw-devel] SF.net SVN: gar:[7840] csw/mgar/pkg/gtksourceview/trunk/Makefile Message-ID: Revision: 7840 http://gar.svn.sourceforge.net/gar/?rev=7840&view=rev Author: hson Date: 2010-01-03 08:24:00 +0000 (Sun, 03 Jan 2010) Log Message: ----------- gtksourceview: Add STRIP_LIBTOOL Modified Paths: -------------- csw/mgar/pkg/gtksourceview/trunk/Makefile Modified: csw/mgar/pkg/gtksourceview/trunk/Makefile =================================================================== --- csw/mgar/pkg/gtksourceview/trunk/Makefile 2010-01-03 07:28:19 UTC (rev 7839) +++ csw/mgar/pkg/gtksourceview/trunk/Makefile 2010-01-03 08:24:00 UTC (rev 7840) @@ -36,9 +36,16 @@ EXTRA_INC = $(prefix)/X11/include EXTRA_LIB = $(prefix)/X11/lib EXTRA_PKG_CONFIG_DIRS = $(prefix)/X11/lib +#This is ugly, should be EXTRA_LINKER_FLAGS, but due to libtool it doesn't work +EXTRA_LD_FLAGS_isa-i386 = -L/usr/openwin/lib -lXext +EXTRA_LD_FLAGS_isa-sparcv8 = -L/usr/openwin/lib -lXext +EXTRA_LD_FLAGS_isa-amd64 = -L/usr/openwin/lib/amd64 -lXext +EXTRA_LD_FLAGS_isa-sparcv9 = -L/usr/openwin/lib/sparcv9 -lXext +EXTRA_LD_FLAGS += $(EXTRA_LD_FLAGS_$(MODULATION)) #NO_ISAEXEC = 1 #NOISALIST = 1 +# gconf-2 not 64-bit yet #BUILD64 = 1 PKGFILES_CSWgtksourceviewdev = $(PKGFILES_DEVEL) @@ -54,6 +61,8 @@ #TEST_TARGET = check TEST_TARGET = +STRIP_LIBTOOL = 1 + include gar/category.mk PATH := /opt/csw/gnu:$(PATH) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From hson at users.sourceforge.net Sun Jan 3 09:30:23 2010 From: hson at users.sourceforge.net (hson at users.sourceforge.net) Date: Sun, 03 Jan 2010 08:30:23 +0000 Subject: [csw-devel] SF.net SVN: gar:[7841] csw/mgar/pkg/gtksourceview/trunk/Makefile Message-ID: Revision: 7841 http://gar.svn.sourceforge.net/gar/?rev=7841&view=rev Author: hson Date: 2010-01-03 08:30:23 +0000 (Sun, 03 Jan 2010) Log Message: ----------- gtksourceview: Add missing dependency Modified Paths: -------------- csw/mgar/pkg/gtksourceview/trunk/Makefile Modified: csw/mgar/pkg/gtksourceview/trunk/Makefile =================================================================== --- csw/mgar/pkg/gtksourceview/trunk/Makefile 2010-01-03 08:24:00 UTC (rev 7840) +++ csw/mgar/pkg/gtksourceview/trunk/Makefile 2010-01-03 08:30:23 UTC (rev 7841) @@ -24,8 +24,9 @@ SPKG_DESC_CSWgtksourceviewdev += A text widget with features typical of a source code editor - developer package SPKG_DESC_CSWgtksourceviewdoc += A text widget with features typical of a source code editor - documentation -REQUIRED_PKGS_CSWgtksourceview += CSWfconfig CSWftype2 CSWgconf2 CSWggettextrt CSWglib2 -REQUIRED_PKGS_CSWgtksourceview += CSWgtk2 CSWlibatk CSWlibcairo CSWlibxml2 CSWpango +REQUIRED_PKGS_CSWgtksourceview += CSWfconfig CSWftype2 CSWgconf2 CSWggettextrt +REQUIRED_PKGS_CSWgtksourceview += CSWglib2 CSWgtk2 CSWlibatk CSWlibcairo +REQUIRED_PKGS_CSWgtksourceview += CSWlibxml2 CSWpango CSWlibxext REQUIRED_PKGS_CSWgtksourceviewdev += CSWgtksourceview REQUIRED_PKGS_CSWgtksourceviewdoc += CSWgtksourceview This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From rthurner at users.sourceforge.net Sun Jan 3 12:12:01 2010 From: rthurner at users.sourceforge.net (rthurner at users.sourceforge.net) Date: Sun, 03 Jan 2010 11:12:01 +0000 Subject: [csw-devel] SF.net SVN: gar:[7842] csw/mgar/pkg/apr/trunk/files/config.layout Message-ID: Revision: 7842 http://gar.svn.sourceforge.net/gar/?rev=7842&view=rev Author: rthurner Date: 2010-01-03 11:12:01 +0000 (Sun, 03 Jan 2010) Log Message: ----------- remove configuration layout not used any more Removed Paths: ------------- csw/mgar/pkg/apr/trunk/files/config.layout Deleted: csw/mgar/pkg/apr/trunk/files/config.layout =================================================================== --- csw/mgar/pkg/apr/trunk/files/config.layout 2010-01-03 08:30:23 UTC (rev 7841) +++ csw/mgar/pkg/apr/trunk/files/config.layout 2010-01-03 11:12:01 UTC (rev 7842) @@ -1,249 +0,0 @@ -## -## config.layout -- Pre-defined Installation Path Layouts -## -## Hints: -## - layouts can be loaded with configure's --enable-layout=ID option -## - when no --enable-layout option is given, the default layout is `apr' -## - a trailing plus character (`+') on paths is replaced with a -## `/' suffix where is currently hardcoded to 'apr'. -## (This may become a configurable parameter at some point.) -## - -# Classical APR path layout designed for parallel installs. - - prefix: /usr/local/apr - exec_prefix: ${prefix} - bindir: ${exec_prefix}/bin - sbindir: ${exec_prefix}/bin - libdir: ${exec_prefix}/lib - libexecdir: ${exec_prefix}/modules - mandir: ${prefix}/man - sysconfdir: ${prefix}/conf - datadir: ${prefix} - installbuilddir: ${datadir}/build - includedir: ${prefix}/include/apr-${APR_MAJOR_VERSION} - localstatedir: ${prefix} - libsuffix: -${APR_MAJOR_VERSION} - - -# Classical single-installation APR path layout. - - prefix: /usr/local/apr - exec_prefix: ${prefix} - bindir: ${exec_prefix}/bin - sbindir: ${exec_prefix}/bin - libdir: ${exec_prefix}/lib - libexecdir: ${exec_prefix}/modules - mandir: ${prefix}/man - sysconfdir: ${prefix}/conf - datadir: ${prefix} - installbuilddir: ${datadir}/build - includedir: ${prefix}/include - localstatedir: ${prefix} - - -# GNU standards conforming path layout. -# See FSF's GNU project `make-stds' document for details. - - prefix: /usr/local - exec_prefix: ${prefix} - bindir: ${exec_prefix}/bin - sbindir: ${exec_prefix}/sbin - libdir: ${exec_prefix}/lib - libexecdir: ${exec_prefix}/libexec - mandir: ${prefix}/man - sysconfdir: ${prefix}/etc+ - datadir: ${prefix}/share+ - installbuilddir: ${datadir}/build - includedir: ${prefix}/include+ - localstatedir: ${prefix}/var+ - runtimedir: ${localstatedir}/run - - -# Mac OS X Server (Rhapsody) - - prefix: /Local/Library/WebServer - exec_prefix: /usr - bindir: ${exec_prefix}/bin - sbindir: ${exec_prefix}/sbin - libdir: ${exec_prefix}/lib - libexecdir: /System/Library/apr/Modules - mandir: ${exec_prefix}/share/man - sysconfdir: ${prefix}/Configuration - datadir: ${prefix} - installbuilddir: /System/Library/apr/Build - includedir: /System/Library/Frameworks/apr.framework/Versions/2.0/Headers - localstatedir: /var - runtimedir: ${prefix}/Logs - - -# Darwin/Mac OS Layout - - prefix: /usr - exec_prefix: ${prefix} - bindir: ${exec_prefix}/bin - sbindir: ${exec_prefix}/sbin - libdir: ${exec_prefix}/lib - libexecdir: ${exec_prefix}/libexec+ - mandir: ${prefix}/share/man - datadir: /Library/WebServer - sysconfdir: /etc+ - installbuilddir: ${prefix}/share/httpd/build - includedir: ${prefix}/include+ - localstatedir: /var - runtimedir: ${localstatedir}/run - - -# Red Hat Linux 7.x layout - - prefix: /usr - exec_prefix: ${prefix} - bindir: ${prefix}/bin - sbindir: ${prefix}/sbin - libdir: ${prefix}/lib - libexecdir: ${prefix}/lib/apr - mandir: ${prefix}/man - sysconfdir: /etc/httpd/conf - datadir: /var/www - installbuilddir: ${datadir}/build - includedir: ${prefix}/include/apr - localstatedir: /var - runtimedir: ${localstatedir}/run - - -# According to the /opt filesystem conventions - - prefix: /opt/apr - exec_prefix: ${prefix} - bindir: ${exec_prefix}/bin - sbindir: ${exec_prefix}/sbin - libdir: ${exec_prefix}/lib - libexecdir: ${exec_prefix}/libexec - mandir: ${prefix}/man - sysconfdir: /etc${prefix} - datadir: ${prefix}/share - installbuilddir: ${datadir}/build - includedir: ${prefix}/include - localstatedir: /var${prefix} - runtimedir: ${localstatedir}/run - - -# BeOS layout... - - prefix: /boot/home/apr - exec_prefix: ${prefix} - bindir: ${exec_prefix}/bin - sbindir: ${exec_prefix}/bin - libdir: ${exec_prefix}/lib - libexecdir: ${exec_prefix}/libexec - mandir: ${prefix}/man - sysconfdir: ${prefix}/conf - datadir: ${prefix} - installbuilddir: ${datadir}/build - includedir: ${prefix}/include - localstatedir: ${prefix} - runtimedir: ${localstatedir}/logs - - -# SuSE 6.x layout - - prefix: /usr - exec_prefix: ${prefix} - bindir: ${prefix}/bin - sbindir: ${prefix}/sbin - libdir: ${prefix}/lib - libexecdir: ${prefix}/lib/apr - mandir: ${prefix}/share/man - sysconfdir: /etc/httpd - datadir: /usr/local/httpd - installbuilddir: ${datadir}/build - includedir: ${prefix}/include/apr - localstatedir: /var/lib/httpd - runtimedir: /var/run - - -# BSD/OS layout - - prefix: /var/www - exec_prefix: /usr/contrib - bindir: ${exec_prefix}/bin - sbindir: ${exec_prefix}/bin - libdir: ${exec_prefix}/lib - libexecdir: ${exec_prefix}/libexec/apr - mandir: ${exec_prefix}/man - sysconfdir: ${prefix}/conf - datadir: ${prefix} - installbuilddir: ${datadir}/build - includedir: ${exec_prefix}/include/apr - localstatedir: /var - runtimedir: ${localstatedir}/run - - -# Solaris 8 Layout - - prefix: /usr/apr - exec_prefix: ${prefix} - bindir: ${exec_prefix}/bin - sbindir: ${exec_prefix}/bin - libdir: ${exec_prefix}/lib - libexecdir: ${exec_prefix}/libexec - mandir: ${exec_prefix}/man - sysconfdir: /etc/apr - datadir: /var/apr - installbuilddir: ${datadir}/build - includedir: ${exec_prefix}/include - localstatedir: ${prefix} - runtimedir: /var/run - - -# OpenBSD Layout - - prefix: /var/www - exec_prefix: /usr - bindir: ${exec_prefix}/bin - sbindir: ${exec_prefix}/sbin - libdir: ${exec_prefix}/lib - libexecdir: ${exec_prefix}/lib/apr/modules - mandir: ${exec_prefix}/share/man - sysconfdir: ${prefix}/conf - datadir: ${prefix} - installbuilddir: ${prefix}/build - includedir: ${exec_prefix}/lib/apr/include - localstatedir: ${prefix} - runtimedir: ${prefix}/logs - - -# Debian layout - - prefix: - exec_prefix: ${prefix}/usr - bindir: ${exec_prefix}/bin - sbindir: ${exec_prefix}/sbin - libdir: ${exec_prefix}/lib - libexecdir: ${exec_prefix}/lib/apr/modules - mandir: ${exec_prefix}/share/man - datadir: ${exec_prefix}/share/apr - includedir: ${exec_prefix}/include/apr-${APR_MAJOR_VERSION} - localstatedir: ${prefix}/var/run - runtimedir: ${prefix}/var/run - infodir: ${exec_prefix}/share/info - libsuffix: -${APR_MAJOR_VERSION} - - -# csw layout - - prefix: INSTALL_PREFIX - exec_prefix: ${prefix} - bindir: ${exec_prefix}/bin - sbindir: ${exec_prefix}/sbin - libdir: ${exec_prefix}/lib - libexecdir: ${exec_prefix}/lib/apr/modules - mandir: ${exec_prefix}/share/man - datadir: ${exec_prefix}/share/apr - includedir: ${exec_prefix}/include/apr-${APR_MAJOR_VERSION} - localstatedir: ${prefix}/var/run - runtimedir: ${prefix}/var/run - infodir: ${exec_prefix}/share/info - libsuffix: -${APR_MAJOR_VERSION} - - This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Sun Jan 3 13:11:11 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sun, 03 Jan 2010 12:11:11 +0000 Subject: [csw-devel] SF.net SVN: gar:[7843] csw/mgar/pkg/template/trunk Message-ID: Revision: 7843 http://gar.svn.sourceforge.net/gar/?rev=7843&view=rev Author: wahwah Date: 2010-01-03 12:11:11 +0000 (Sun, 03 Jan 2010) Log Message: ----------- template: Reverting to the template Modified Paths: -------------- csw/mgar/pkg/template/trunk/Makefile Property Changed: ---------------- csw/mgar/pkg/template/trunk/ Property changes on: csw/mgar/pkg/template/trunk ___________________________________________________________________ Modified: svn:externals - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2-checkpkg + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 Modified: csw/mgar/pkg/template/trunk/Makefile =================================================================== --- csw/mgar/pkg/template/trunk/Makefile 2010-01-03 11:12:01 UTC (rev 7842) +++ csw/mgar/pkg/template/trunk/Makefile 2010-01-03 12:11:11 UTC (rev 7843) @@ -2,62 +2,184 @@ # Distributed under the terms of the GNU General Public License v2 # $Id$ -GARNAME = oracle -GARVERSION = 10.2.0 -CATEGORIES = apps +## This file contains comments to guide you through various GAR settings. +## Please remove unnecessary comments before committing your code to the code +## repository. The comments to remove are marked with double hashes. +## If you want to remove them all in-place, use: +## gsed -i -e '/^##/d' Makefile +## +## For more information about GAR variables, please see: +## https://sourceforge.net/apps/trac/gar/wiki/GAR%20Variable%20Reference +## +GARNAME = mypkg +GARVERSION = 1.0 +## +## The category that your software fits in. This is not a descriptive field, but +## influences the build process. Depending on the CATEGORIES setting, different +## Makefiles are included from gar/categories/ in your trunk directory, which +## adjust the build settings for the respective category. +## +## Possible settings are: +## apps, cpan, devel, gnome, java, kde, lang, lib, meta, net, python, server, +## utils, x11, xfce, xorg, xtra +CATEGORIES = lib +## +## A one-line description of the package, which will appear in the pkginfo. +DESCRIPTION = +## +## A longer description of the package. This is only for descriptive purposes +## inside the Makefile and is not used elsewhere. define BLURB + endef +## +## Upstream URL that should show up in the VENDOR field as well as on +## http://opencsw.org/packages/. SPKG_SOURCEURL = +## +## Whitespace-separated list of URLs to download the source package from. +## There are presets: $(SF_MIRRORS), $(GNU_MIRRORS) and $(GOOGLE_MIRROR). MASTER_SITES = -DISTFILES = -CONFIGURE_SCRIPTS = -BUILD_SCRIPTS = -INSTALL_SCRIPTS = oracle -TEST_SCRIPTS = +## +## SF_PROJ is required if you set $(MASTER_SITES) to $(SF_MIRRORS) and the +## Sourceforge project name differs from $(GARNAME). Specifies the Sourceforge +## project name of the software you wish to download. +## SF_PROJ = +## +## A list of space separated patch filenames from files/ that are to be applied +## to the extracted software before the ./configure stage. Patches need to be +## included in the DISTFILES variable as well. +## PATCHFILES = +## +## Whitespace-separated list of files which comprise this build. mGAR will look +## for the files in the $(FILEDIR) (trunk/files) directory and on the +## $(MASTER_SITES). +DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz +## +## We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz +## +## Catalog name is the name to be used with pkg{-get,util} -i . +## It is different from the system package name, which by convention is CSWpkgname. +## CATALOGNAME = +## +## Set to 1 to mark the package as architecture-independent. +## ARCHALL = 0 +## +## A list of files / patterns that should be excluded from the package. Amends +## the default list of excluded filenames $(MERGE_EXCLUDE_DEFAULT), which +## contains things like libtool .la files and files with a leading ~. +## EXTRA_MERGE_EXCLUDE_FILES = +## +## A list of space separated package names that should be marked as +## incompatible with the current package. This will go into the depend file. +## When a user has one of the incompatible packages installed and installs +## your package, he will be prompted that the incompatible package must be +## removed. He will however not be prevented to install your package without +## removing the conflicting package first. +## INCOMPATIBLE_PKGS = +## +## The name of the license file that should be included in your package. Defaults +## to COPYING. See http://sourceforge.net/apps/trac/gar/wiki/CopyRightfor details +## on including and displaying licenses. +## LICENSE = +## +## A list of space separated package names that should be produced from your +## Makefile. This is used when a software has different components that can be +## packaged and used individually (think runtime libraries, client tools, server +## files, development headers). You don't need to set this when you just want to +## produce one package. +## +## When you set this variable to include more than one package, you also need to +## set PKGFILES_CSWpkgname for each package (except for the first one in your +## $(PACKAGES) list) to define which files go into each package. The first +## package from $(PACKAGES) one will hold all files that are not matched by +## PKGFILES_ for other packages. +## PACKAGES = +## +## If specified, GAR feeds the almost-final package prototype file to +## $(PROTOTYPE_FILTER) and reads the final package prototype file from it. +## $(PROTOTYPE_FILTER) is usually a sed/awk/perl one-liner, which was mostly used +## to prepare the prototype file for use with cswclassutils (see +## $(SPKG_CLASSES)). Now that there are convenience variables for cswclassutils, +## you will rarely have to use this. A still valid use case would be to change +## the file permissions of a file to be set-UID. +## See http://wiki.opencsw.org/cswclassutils-package for common usage information +## PROTOTYPE_FILTER = +## +## cswclassutils settings +## +## A list of action classes. Possible values are: +## none cswpreserveconf cswcpsampleconf cswpycompile cswusergroup cswinitsmf +## cswinetd cswetcservices +## The class 'cswinitsmf' must be the last class listed. When you use cswclassutils, +## you need to add CSWcswclassutils to REQUIRED_PKGS. +## SPKG_CLASSES = none +## Simplified settings for classes: +## PRESERVECONF = +## SAMPLECONF = +## INITSMF = +## USERGROUP = +## ETCSERVICES = +## INETDCONF = +## A list of runtime package dependencies in the form of CSWfoo. +## REQUIRED_PKGS = +## +## A list of packages necessary to build this package +## PREREQUISITE_PKGS = $(REQUIRED_PKGS) +## +## When using non-empty $(PACKAGES): +## REQUIRED_PKGS_CSWpkgname = +## SPKG_DESC_CSWpkgname = +## PKGFILES_CSWpkgname = +## CATALOGNAME_CSWpkgname = +## +## A list of space separated directories where objects should be stripped in +## addition to the bin/ and sbin/ directories. +## STRIP_DIRS = +## +## Define a custom target for the configure phase. When you set this, the target +## that will be used instead of configure: target, is named +## configure-$(CONFIGURE_SCRIPTS) and you will need to define it in your Makefile +## after including gar/gar.include.mk. If you want to skip the configure phase +## completely (for example when your software doesn't need to be compiled) assign +## this variable an empty value. The procedure works for configure, build, +## install and test steps. +## CONFIGURE_SCRIPTS = +## BUILD_SCRIPTS = +## INSTALL_SCRIPTS = +## TEST_SCRIPTS = +## +## Compilation settings +## +## The build directory. +## WORKSRC = $(WORKDIR)/$(GARNAME)-$(GARVERSION) +## +## BUILD_ARGS is passed as an argument to gmake during the build phase. Use this +## for example, if you need to override Makefile variables. +## BUILD_ARGS = +## +## Arguments passed to the ./configure script. +CONFIGURE_ARGS = $(DIRPATHS) +## +## BUILD64 = +## CONFIGURE_ENV = +## EXTRA_CFLAGS = +## EXTRA_LDFLAGS = +## EXTRA_INC = +## EXTRA_LIB = +## GARFLAVOR = +## INSTALL_ARGS = +## OPT_FLAGS_SOS = -xO3 +## OPT_FLAGS_GCC = -O2 -pipe +## +## The compiler to use. Defaults to SOS11, can be also: SOS12, GCC3, GCC4. +## GARCOMPILER = SOS11 +## +# Remove the following rules and uncomment the +# include before building. +all: .DEFAULT +.DEFAULT: + @true -prefix = /opt/oracle - -PACKAGES = CSWoracle -CATALOGNAME_CSWoracle = oracle -SPKG_DESC_CSWoracle = The Oracle database - -REQUIRED_PKGS = -# Maybe CSWunixodbc, but how would it know how to locate the shared library? - -PROTOTYPE_FILTER = awk '$$$$3 ~/\/extjob$$$$/ \ - { $$$$4 = 3755; $$$$5 = "nobody"; $$$$6 = "nobody" } \ - { print }' - -ORACLE_HOME = $(prefix)/product/$(GARVERSION)/Db_1 - -include gar/category.mk - -install-oracle: - ginstall -m 755 -d $(DESTDIR)$(prefix) - @$(MAKECOOKIE) - -post-merge: - # This takes a really long time. - gtar -cf - -C $(prefix) . | gtar -xpf - -C $(PKGROOT)$(prefix) - # echo foo > $(PKGROOT)$(prefix)/bar - grm -fv $(PKGROOT)$(ORACLE_HOME)/inventory/Templates/perl/lib/5.8.3/sun4-solaris-thread-multi/perllocal.pod - grm -fv $(PKGROOT)$(ORACLE_HOME)/perl/lib/5.8.3/sun4-solaris-thread-multi/perllocal.pod - # Removing shared libraries, because they depend on other shared - # libraries that aren't there. - grm -fv $(PKGROOT)$(ORACLE_HOME)/lib32/libnnzentr10.so - grm -fv $(PKGROOT)$(ORACLE_HOME)/lib/libcxa.so.3 - grm -fv $(PKGROOT)$(ORACLE_HOME)/bin/rtsora32 - grm -fv $(PKGROOT)$(ORACLE_HOME)/lib32/hsdb_inf.so - grm -fv $(PKGROOT)$(ORACLE_HOME)/lib/hsdb_inf.so - grm -fv $(PKGROOT)$(ORACLE_HOME)/lib32/hsdb_syb.so - grm -fv $(PKGROOT)$(ORACLE_HOME)/lib/hsdb_syb.so - grm -fv $(PKGROOT)$(ORACLE_HOME)/jre/1.4.2/lib/sparcv9/libJdbcOdbc.so - grm -fv $(PKGROOT)$(ORACLE_HOME)/jre/1.4.2/lib/sparc/libJdbcOdbc.so - grm -fv $(PKGROOT)$(ORACLE_HOME)/jdk/jre/lib/sparcv9/libJdbcOdbc.so - grm -fv $(PKGROOT)$(ORACLE_HOME)/jdk/jre/lib/sparc/libJdbcOdbc.so - grm -fv $(PKGROOT)$(ORACLE_HOME)/lib/libcoresh10.so - grm -fv $(PKGROOT)$(ORACLE_HOME)/lib32/libsqora.so.10.1 - grm -fv $(PKGROOT)$(ORACLE_HOME)/lib/libsqora.so.10.1 - grm -fv $(PKGROOT)$(ORACLE_HOME)/ctx/lib/libxml4c.so.54.0 - grm -fv $(PKGROOT)$(ORACLE_HOME)/ctx/lib/xmllib.so - @$(MAKECOOKIE) +#include gar/category.mk This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Sun Jan 3 13:12:55 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sun, 03 Jan 2010 12:12:55 +0000 Subject: [csw-devel] SF.net SVN: gar:[7844] csw/mgar/pkg Message-ID: Revision: 7844 http://gar.svn.sourceforge.net/gar/?rev=7844&view=rev Author: wahwah Date: 2010-01-03 12:12:52 +0000 (Sun, 03 Jan 2010) Log Message: ----------- oracle: Initial commit Modified Paths: -------------- csw/mgar/pkg/oracle/trunk/Makefile Added Paths: ----------- csw/mgar/pkg/oracle/ csw/mgar/pkg/oracle/trunk/ csw/mgar/pkg/oracle/trunk/checksums csw/mgar/pkg/oracle/trunk/files/ Removed Paths: ------------- csw/mgar/pkg/oracle/trunk/ csw/mgar/pkg/oracle/trunk/checksums csw/mgar/pkg/oracle/trunk/files/ Modified: csw/mgar/pkg/oracle/trunk/Makefile =================================================================== --- csw/mgar/pkg/template/trunk/Makefile 2010-01-03 12:11:11 UTC (rev 7843) +++ csw/mgar/pkg/oracle/trunk/Makefile 2010-01-03 12:12:52 UTC (rev 7844) @@ -2,184 +2,62 @@ # Distributed under the terms of the GNU General Public License v2 # $Id$ -## This file contains comments to guide you through various GAR settings. -## Please remove unnecessary comments before committing your code to the code -## repository. The comments to remove are marked with double hashes. -## If you want to remove them all in-place, use: -## gsed -i -e '/^##/d' Makefile -## -## For more information about GAR variables, please see: -## https://sourceforge.net/apps/trac/gar/wiki/GAR%20Variable%20Reference -## -GARNAME = mypkg -GARVERSION = 1.0 -## -## The category that your software fits in. This is not a descriptive field, but -## influences the build process. Depending on the CATEGORIES setting, different -## Makefiles are included from gar/categories/ in your trunk directory, which -## adjust the build settings for the respective category. -## -## Possible settings are: -## apps, cpan, devel, gnome, java, kde, lang, lib, meta, net, python, server, -## utils, x11, xfce, xorg, xtra -CATEGORIES = lib -## -## A one-line description of the package, which will appear in the pkginfo. -DESCRIPTION = -## -## A longer description of the package. This is only for descriptive purposes -## inside the Makefile and is not used elsewhere. +GARNAME = oracle +GARVERSION = 10.2.0 +CATEGORIES = apps define BLURB - endef -## -## Upstream URL that should show up in the VENDOR field as well as on -## http://opencsw.org/packages/. SPKG_SOURCEURL = -## -## Whitespace-separated list of URLs to download the source package from. -## There are presets: $(SF_MIRRORS), $(GNU_MIRRORS) and $(GOOGLE_MIRROR). MASTER_SITES = -## -## SF_PROJ is required if you set $(MASTER_SITES) to $(SF_MIRRORS) and the -## Sourceforge project name differs from $(GARNAME). Specifies the Sourceforge -## project name of the software you wish to download. -## SF_PROJ = -## -## A list of space separated patch filenames from files/ that are to be applied -## to the extracted software before the ./configure stage. Patches need to be -## included in the DISTFILES variable as well. -## PATCHFILES = -## -## Whitespace-separated list of files which comprise this build. mGAR will look -## for the files in the $(FILEDIR) (trunk/files) directory and on the -## $(MASTER_SITES). -DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz -## -## We define upstream file regex so we can be notifed of new upstream software release -UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz -## -## Catalog name is the name to be used with pkg{-get,util} -i . -## It is different from the system package name, which by convention is CSWpkgname. -## CATALOGNAME = -## -## Set to 1 to mark the package as architecture-independent. -## ARCHALL = 0 -## -## A list of files / patterns that should be excluded from the package. Amends -## the default list of excluded filenames $(MERGE_EXCLUDE_DEFAULT), which -## contains things like libtool .la files and files with a leading ~. -## EXTRA_MERGE_EXCLUDE_FILES = -## -## A list of space separated package names that should be marked as -## incompatible with the current package. This will go into the depend file. -## When a user has one of the incompatible packages installed and installs -## your package, he will be prompted that the incompatible package must be -## removed. He will however not be prevented to install your package without -## removing the conflicting package first. -## INCOMPATIBLE_PKGS = -## -## The name of the license file that should be included in your package. Defaults -## to COPYING. See http://sourceforge.net/apps/trac/gar/wiki/CopyRightfor details -## on including and displaying licenses. -## LICENSE = -## -## A list of space separated package names that should be produced from your -## Makefile. This is used when a software has different components that can be -## packaged and used individually (think runtime libraries, client tools, server -## files, development headers). You don't need to set this when you just want to -## produce one package. -## -## When you set this variable to include more than one package, you also need to -## set PKGFILES_CSWpkgname for each package (except for the first one in your -## $(PACKAGES) list) to define which files go into each package. The first -## package from $(PACKAGES) one will hold all files that are not matched by -## PKGFILES_ for other packages. -## PACKAGES = -## -## If specified, GAR feeds the almost-final package prototype file to -## $(PROTOTYPE_FILTER) and reads the final package prototype file from it. -## $(PROTOTYPE_FILTER) is usually a sed/awk/perl one-liner, which was mostly used -## to prepare the prototype file for use with cswclassutils (see -## $(SPKG_CLASSES)). Now that there are convenience variables for cswclassutils, -## you will rarely have to use this. A still valid use case would be to change -## the file permissions of a file to be set-UID. -## See http://wiki.opencsw.org/cswclassutils-package for common usage information -## PROTOTYPE_FILTER = -## -## cswclassutils settings -## -## A list of action classes. Possible values are: -## none cswpreserveconf cswcpsampleconf cswpycompile cswusergroup cswinitsmf -## cswinetd cswetcservices -## The class 'cswinitsmf' must be the last class listed. When you use cswclassutils, -## you need to add CSWcswclassutils to REQUIRED_PKGS. -## SPKG_CLASSES = none -## Simplified settings for classes: -## PRESERVECONF = -## SAMPLECONF = -## INITSMF = -## USERGROUP = -## ETCSERVICES = -## INETDCONF = -## A list of runtime package dependencies in the form of CSWfoo. -## REQUIRED_PKGS = -## -## A list of packages necessary to build this package -## PREREQUISITE_PKGS = $(REQUIRED_PKGS) -## -## When using non-empty $(PACKAGES): -## REQUIRED_PKGS_CSWpkgname = -## SPKG_DESC_CSWpkgname = -## PKGFILES_CSWpkgname = -## CATALOGNAME_CSWpkgname = -## -## A list of space separated directories where objects should be stripped in -## addition to the bin/ and sbin/ directories. -## STRIP_DIRS = -## -## Define a custom target for the configure phase. When you set this, the target -## that will be used instead of configure: target, is named -## configure-$(CONFIGURE_SCRIPTS) and you will need to define it in your Makefile -## after including gar/gar.include.mk. If you want to skip the configure phase -## completely (for example when your software doesn't need to be compiled) assign -## this variable an empty value. The procedure works for configure, build, -## install and test steps. -## CONFIGURE_SCRIPTS = -## BUILD_SCRIPTS = -## INSTALL_SCRIPTS = -## TEST_SCRIPTS = -## -## Compilation settings -## -## The build directory. -## WORKSRC = $(WORKDIR)/$(GARNAME)-$(GARVERSION) -## -## BUILD_ARGS is passed as an argument to gmake during the build phase. Use this -## for example, if you need to override Makefile variables. -## BUILD_ARGS = -## -## Arguments passed to the ./configure script. -CONFIGURE_ARGS = $(DIRPATHS) -## -## BUILD64 = -## CONFIGURE_ENV = -## EXTRA_CFLAGS = -## EXTRA_LDFLAGS = -## EXTRA_INC = -## EXTRA_LIB = -## GARFLAVOR = -## INSTALL_ARGS = -## OPT_FLAGS_SOS = -xO3 -## OPT_FLAGS_GCC = -O2 -pipe -## -## The compiler to use. Defaults to SOS11, can be also: SOS12, GCC3, GCC4. -## GARCOMPILER = SOS11 -## -# Remove the following rules and uncomment the -# include before building. -all: .DEFAULT -.DEFAULT: - @true +DISTFILES = +CONFIGURE_SCRIPTS = +BUILD_SCRIPTS = +INSTALL_SCRIPTS = oracle +TEST_SCRIPTS = -#include gar/category.mk +prefix = /opt/oracle + +PACKAGES = CSWoracle +CATALOGNAME_CSWoracle = oracle +SPKG_DESC_CSWoracle = The Oracle database + +REQUIRED_PKGS = +# Maybe CSWunixodbc, but how would it know how to locate the shared library? + +PROTOTYPE_FILTER = awk '$$$$3 ~/\/extjob$$$$/ \ + { $$$$4 = 3755; $$$$5 = "nobody"; $$$$6 = "nobody" } \ + { print }' + +ORACLE_HOME = $(prefix)/product/$(GARVERSION)/Db_1 + +include gar/category.mk + +install-oracle: + ginstall -m 755 -d $(DESTDIR)$(prefix) + @$(MAKECOOKIE) + +post-merge: + # This takes a really long time. + gtar -cf - -C $(prefix) . | gtar -xpf - -C $(PKGROOT)$(prefix) + # echo foo > $(PKGROOT)$(prefix)/bar + grm -fv $(PKGROOT)$(ORACLE_HOME)/inventory/Templates/perl/lib/5.8.3/sun4-solaris-thread-multi/perllocal.pod + grm -fv $(PKGROOT)$(ORACLE_HOME)/perl/lib/5.8.3/sun4-solaris-thread-multi/perllocal.pod + # Removing shared libraries, because they depend on other shared + # libraries that aren't there. + grm -fv $(PKGROOT)$(ORACLE_HOME)/lib32/libnnzentr10.so + grm -fv $(PKGROOT)$(ORACLE_HOME)/lib/libcxa.so.3 + grm -fv $(PKGROOT)$(ORACLE_HOME)/bin/rtsora32 + grm -fv $(PKGROOT)$(ORACLE_HOME)/lib32/hsdb_inf.so + grm -fv $(PKGROOT)$(ORACLE_HOME)/lib/hsdb_inf.so + grm -fv $(PKGROOT)$(ORACLE_HOME)/lib32/hsdb_syb.so + grm -fv $(PKGROOT)$(ORACLE_HOME)/lib/hsdb_syb.so + grm -fv $(PKGROOT)$(ORACLE_HOME)/jre/1.4.2/lib/sparcv9/libJdbcOdbc.so + grm -fv $(PKGROOT)$(ORACLE_HOME)/jre/1.4.2/lib/sparc/libJdbcOdbc.so + grm -fv $(PKGROOT)$(ORACLE_HOME)/jdk/jre/lib/sparcv9/libJdbcOdbc.so + grm -fv $(PKGROOT)$(ORACLE_HOME)/jdk/jre/lib/sparc/libJdbcOdbc.so + grm -fv $(PKGROOT)$(ORACLE_HOME)/lib/libcoresh10.so + grm -fv $(PKGROOT)$(ORACLE_HOME)/lib32/libsqora.so.10.1 + grm -fv $(PKGROOT)$(ORACLE_HOME)/lib/libsqora.so.10.1 + grm -fv $(PKGROOT)$(ORACLE_HOME)/ctx/lib/libxml4c.so.54.0 + grm -fv $(PKGROOT)$(ORACLE_HOME)/ctx/lib/xmllib.so + @$(MAKECOOKIE) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Sun Jan 3 14:41:40 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sun, 03 Jan 2010 13:41:40 +0000 Subject: [csw-devel] SF.net SVN: gar:[7845] csw/mgar/pkg/examples Message-ID: Revision: 7845 http://gar.svn.sourceforge.net/gar/?rev=7845&view=rev Author: wahwah Date: 2010-01-03 13:41:40 +0000 (Sun, 03 Jan 2010) Log Message: ----------- examples/users-and-groups: Initial commit Modified Paths: -------------- csw/mgar/pkg/examples/users-and-groups/trunk/Makefile Added Paths: ----------- csw/mgar/pkg/examples/users-and-groups/ csw/mgar/pkg/examples/users-and-groups/trunk/ csw/mgar/pkg/examples/users-and-groups/trunk/checksums csw/mgar/pkg/examples/users-and-groups/trunk/files/ Removed Paths: ------------- csw/mgar/pkg/examples/users-and-groups/trunk/ csw/mgar/pkg/examples/users-and-groups/trunk/checksums csw/mgar/pkg/examples/users-and-groups/trunk/files/ Modified: csw/mgar/pkg/examples/users-and-groups/trunk/Makefile =================================================================== --- csw/mgar/pkg/template/trunk/Makefile 2010-01-03 12:11:11 UTC (rev 7843) +++ csw/mgar/pkg/examples/users-and-groups/trunk/Makefile 2010-01-03 13:41:40 UTC (rev 7845) @@ -2,184 +2,50 @@ # Distributed under the terms of the GNU General Public License v2 # $Id$ -## This file contains comments to guide you through various GAR settings. -## Please remove unnecessary comments before committing your code to the code -## repository. The comments to remove are marked with double hashes. -## If you want to remove them all in-place, use: -## gsed -i -e '/^##/d' Makefile -## -## For more information about GAR variables, please see: -## https://sourceforge.net/apps/trac/gar/wiki/GAR%20Variable%20Reference -## -GARNAME = mypkg -GARVERSION = 1.0 -## -## The category that your software fits in. This is not a descriptive field, but -## influences the build process. Depending on the CATEGORIES setting, different -## Makefiles are included from gar/categories/ in your trunk directory, which -## adjust the build settings for the respective category. -## -## Possible settings are: -## apps, cpan, devel, gnome, java, kde, lang, lib, meta, net, python, server, -## utils, x11, xfce, xorg, xtra +# => Installing CSWusers-and-groups-0.1,REV=2010.01.03 +# pkgadd: ERROR: unable to create package object . +# pathname does not exist +# group name not found in group table(s) +# owner name not found in passwd table(s) +# ERROR: attribute verification of failed +# group name not found in group table(s) +# owner name not found in passwd table(s) +# Installing class ... +# Group cswgroup has been added +# User cswuser has been added + + +GARNAME = users_and_groups +GARVERSION = 0.1 CATEGORIES = lib -## -## A one-line description of the package, which will appear in the pkginfo. -DESCRIPTION = -## -## A longer description of the package. This is only for descriptive purposes -## inside the Makefile and is not used elsewhere. +DESCRIPTION = An example build adding users, groups and files owned by them define BLURB - endef -## -## Upstream URL that should show up in the VENDOR field as well as on -## http://opencsw.org/packages/. -SPKG_SOURCEURL = -## -## Whitespace-separated list of URLs to download the source package from. -## There are presets: $(SF_MIRRORS), $(GNU_MIRRORS) and $(GOOGLE_MIRROR). MASTER_SITES = -## -## SF_PROJ is required if you set $(MASTER_SITES) to $(SF_MIRRORS) and the -## Sourceforge project name differs from $(GARNAME). Specifies the Sourceforge -## project name of the software you wish to download. -## SF_PROJ = -## -## A list of space separated patch filenames from files/ that are to be applied -## to the extracted software before the ./configure stage. Patches need to be -## included in the DISTFILES variable as well. -## PATCHFILES = -## -## Whitespace-separated list of files which comprise this build. mGAR will look -## for the files in the $(FILEDIR) (trunk/files) directory and on the -## $(MASTER_SITES). -DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz -## -## We define upstream file regex so we can be notifed of new upstream software release -UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz -## -## Catalog name is the name to be used with pkg{-get,util} -i . -## It is different from the system package name, which by convention is CSWpkgname. -## CATALOGNAME = -## -## Set to 1 to mark the package as architecture-independent. -## ARCHALL = 0 -## -## A list of files / patterns that should be excluded from the package. Amends -## the default list of excluded filenames $(MERGE_EXCLUDE_DEFAULT), which -## contains things like libtool .la files and files with a leading ~. -## EXTRA_MERGE_EXCLUDE_FILES = -## -## A list of space separated package names that should be marked as -## incompatible with the current package. This will go into the depend file. -## When a user has one of the incompatible packages installed and installs -## your package, he will be prompted that the incompatible package must be -## removed. He will however not be prevented to install your package without -## removing the conflicting package first. -## INCOMPATIBLE_PKGS = -## -## The name of the license file that should be included in your package. Defaults -## to COPYING. See http://sourceforge.net/apps/trac/gar/wiki/CopyRightfor details -## on including and displaying licenses. -## LICENSE = -## -## A list of space separated package names that should be produced from your -## Makefile. This is used when a software has different components that can be -## packaged and used individually (think runtime libraries, client tools, server -## files, development headers). You don't need to set this when you just want to -## produce one package. -## -## When you set this variable to include more than one package, you also need to -## set PKGFILES_CSWpkgname for each package (except for the first one in your -## $(PACKAGES) list) to define which files go into each package. The first -## package from $(PACKAGES) one will hold all files that are not matched by -## PKGFILES_ for other packages. -## PACKAGES = -## -## If specified, GAR feeds the almost-final package prototype file to -## $(PROTOTYPE_FILTER) and reads the final package prototype file from it. -## $(PROTOTYPE_FILTER) is usually a sed/awk/perl one-liner, which was mostly used -## to prepare the prototype file for use with cswclassutils (see -## $(SPKG_CLASSES)). Now that there are convenience variables for cswclassutils, -## you will rarely have to use this. A still valid use case would be to change -## the file permissions of a file to be set-UID. -## See http://wiki.opencsw.org/cswclassutils-package for common usage information -## PROTOTYPE_FILTER = -## -## cswclassutils settings -## -## A list of action classes. Possible values are: -## none cswpreserveconf cswcpsampleconf cswpycompile cswusergroup cswinitsmf -## cswinetd cswetcservices -## The class 'cswinitsmf' must be the last class listed. When you use cswclassutils, -## you need to add CSWcswclassutils to REQUIRED_PKGS. -## SPKG_CLASSES = none -## Simplified settings for classes: -## PRESERVECONF = -## SAMPLECONF = -## INITSMF = -## USERGROUP = -## ETCSERVICES = -## INETDCONF = -## A list of runtime package dependencies in the form of CSWfoo. -## REQUIRED_PKGS = -## -## A list of packages necessary to build this package -## PREREQUISITE_PKGS = $(REQUIRED_PKGS) -## -## When using non-empty $(PACKAGES): -## REQUIRED_PKGS_CSWpkgname = -## SPKG_DESC_CSWpkgname = -## PKGFILES_CSWpkgname = -## CATALOGNAME_CSWpkgname = -## -## A list of space separated directories where objects should be stripped in -## addition to the bin/ and sbin/ directories. -## STRIP_DIRS = -## -## Define a custom target for the configure phase. When you set this, the target -## that will be used instead of configure: target, is named -## configure-$(CONFIGURE_SCRIPTS) and you will need to define it in your Makefile -## after including gar/gar.include.mk. If you want to skip the configure phase -## completely (for example when your software doesn't need to be compiled) assign -## this variable an empty value. The procedure works for configure, build, -## install and test steps. -## CONFIGURE_SCRIPTS = -## BUILD_SCRIPTS = -## INSTALL_SCRIPTS = -## TEST_SCRIPTS = -## -## Compilation settings -## -## The build directory. -## WORKSRC = $(WORKDIR)/$(GARNAME)-$(GARVERSION) -## -## BUILD_ARGS is passed as an argument to gmake during the build phase. Use this -## for example, if you need to override Makefile variables. -## BUILD_ARGS = -## -## Arguments passed to the ./configure script. -CONFIGURE_ARGS = $(DIRPATHS) -## -## BUILD64 = -## CONFIGURE_ENV = -## EXTRA_CFLAGS = -## EXTRA_LDFLAGS = -## EXTRA_INC = -## EXTRA_LIB = -## GARFLAVOR = -## INSTALL_ARGS = -## OPT_FLAGS_SOS = -xO3 -## OPT_FLAGS_GCC = -O2 -pipe -## -## The compiler to use. Defaults to SOS11, can be also: SOS12, GCC3, GCC4. -## GARCOMPILER = SOS11 -## -# Remove the following rules and uncomment the -# include before building. -all: .DEFAULT -.DEFAULT: - @true +CONFIGURE_SCRIPTS = +BUILD_SCRIPTS = +INSTALL_SCRIPTS = example +TEST_SCRIPTS = -#include gar/category.mk +MAIN_PKGNAME = CSWusers-and-groups +PACKAGES = $(MAIN_PKGNAME) +CATALOGNAME_$(MAIN_PKGNAME) = users_and_groups +USERGROUP = /etc/opt/csw/pkg/$(MAIN_PKGNAME)/cswusergroup + +PROTOTYPE_MODIFIERS = example +PROTOTYPE_FILES_example = $(datadir)/$(GARNAME) +PROTOTYPE_USER_example = cswuser +PROTOTYPE_GROUP_example = cswgroup +PROTOTYPE_PERMS_example = 0700 +PROTOTYPE_CLASS_example = ugfiles + +SPKG_CLASSES = none ugfiles + +include gar/category.mk + +install-example: + ginstall -m 755 -d $(DESTDIR)/etc/opt/csw/pkg/$(MAIN_PKGNAME) + ginstall -m 644 $(FILEDIR)/cswusergroup $(DESTDIR)/etc/opt/csw/pkg/$(MAIN_PKGNAME) + +post-merge: + ginstall -m 755 -d $(PKGROOT)$(datadir)/$(GARNAME) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Sun Jan 3 15:17:52 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sun, 03 Jan 2010 14:17:52 +0000 Subject: [csw-devel] SF.net SVN: gar:[7846] csw/mgar/gar/v2/gar.pkg.mk Message-ID: Revision: 7846 http://gar.svn.sourceforge.net/gar/?rev=7846&view=rev Author: wahwah Date: 2010-01-03 14:17:52 +0000 (Sun, 03 Jan 2010) Log Message: ----------- mGAR v2: Adding ugfiles automatically after 'cswusergroup' when USERGROUP is used Modified Paths: -------------- csw/mgar/gar/v2/gar.pkg.mk Modified: csw/mgar/gar/v2/gar.pkg.mk =================================================================== --- csw/mgar/gar/v2/gar.pkg.mk 2010-01-03 13:41:40 UTC (rev 7845) +++ csw/mgar/gar/v2/gar.pkg.mk 2010-01-03 14:17:52 UTC (rev 7846) @@ -199,7 +199,7 @@ _CSWCLASSES = cswmigrateconf cswcpsampleconf cswpreserveconf _CSWCLASSES += cswetcservices -_CSWCLASSES += cswusergroup +_CSWCLASSES += cswusergroup ugfiles _CSWCLASSES += cswcrontab _CSWCLASSES += cswpycompile _CSWCLASSES += cswinetd This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Sun Jan 3 15:41:05 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sun, 03 Jan 2010 14:41:05 +0000 Subject: [csw-devel] SF.net SVN: gar:[7847] csw/mgar/pkg/mysql5/branches/mysql-5.0.x Message-ID: Revision: 7847 http://gar.svn.sourceforge.net/gar/?rev=7847&view=rev Author: wahwah Date: 2010-01-03 14:41:04 +0000 (Sun, 03 Jan 2010) Log Message: ----------- mysql-5.0.x: Configuring and starting the database during installation Modified Paths: -------------- csw/mgar/pkg/mysql5/branches/mysql-5.0.x/checksums csw/mgar/pkg/mysql5/branches/mysql-5.0.x/files/CSWmysql5.postinstall csw/mgar/pkg/mysql5/branches/mysql-5.0.x/files/quick_start-csw Property Changed: ---------------- csw/mgar/pkg/mysql5/branches/mysql-5.0.x/ Property changes on: csw/mgar/pkg/mysql5/branches/mysql-5.0.x ___________________________________________________________________ Modified: svn:externals - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2-checkpkg + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 Modified: csw/mgar/pkg/mysql5/branches/mysql-5.0.x/checksums =================================================================== --- csw/mgar/pkg/mysql5/branches/mysql-5.0.x/checksums 2010-01-03 14:17:52 UTC (rev 7846) +++ csw/mgar/pkg/mysql5/branches/mysql-5.0.x/checksums 2010-01-03 14:41:04 UTC (rev 7847) @@ -2,11 +2,11 @@ 1414d06fab1530484a508927a0de4154 0002-cast-user_info-pw_gid-to-gid_t.patch 5415f365f1b0f7a179d1efc25f45bbee 0003-OpenCSW-perl-for-tests.patch 8ab232cd4d232b3cda3bbced93f80237 0004-basedir-and-datadir-in-the-cnf-files.patch -747637bc4be42207974ae845d832ae65 CSWmysql5.postinstall +8cfe94c6a9c0e43d17de20b551e15837 CSWmysql5.postinstall 60162ea667507a6a487027e7c389ca55 CSWmysql5.preinstall e691b0cf00a3925ac55c1844045d6e30 ChangeLog e42afb5ec1b1ab02d2ec3b46d0922636 README.CSW aaca748fc044834e71ad544ab293c494 cswmysql5 67228e1f096fe08a94f4267439a4ec36 cswusergroup 65e6229cc98b6a8d4c5206d7fe16c7be mysql-5.0.87.tar.gz -90b7cfcd11ab56e021a195a6a085fa21 quick_start-csw +4313c963657ac820a20eea2a50be27f3 quick_start-csw Modified: csw/mgar/pkg/mysql5/branches/mysql-5.0.x/files/CSWmysql5.postinstall =================================================================== --- csw/mgar/pkg/mysql5/branches/mysql-5.0.x/files/CSWmysql5.postinstall 2010-01-03 14:17:52 UTC (rev 7846) +++ csw/mgar/pkg/mysql5/branches/mysql-5.0.x/files/CSWmysql5.postinstall 2010-01-03 14:41:04 UTC (rev 7847) @@ -1,15 +1,95 @@ -#!/bin/sh +#!/bin/ksh -p # # $Id$ # +# initial version for blastwave.org by Alex Moore 2006.02.25 +# Revised 2006.03.25 - see bug report 0001542 +# +# This script creates a default database with the small-memory footprint. +# Input may be provided for DATADIR and DEFAULTS_FILE +# +BASEDIR=/opt/csw/mysql5 +MYSQL_VAR=/var/opt/csw/mysql5 +DEFAULTS_FILE=$BASEDIR/my.cnf +SAVE_DEFAULTS_FILE=$MYSQL_VAR/my.cnf +MYSQLD_USER=mysql +# Provide the default data directory +MYSQLD_DATADIR=$MYSQL_VAR -MYSQLDATADIR=/var/opt/csw/mysql5 -if [ ! -d "${MYSQLDATADIR}/mysql" ] ; then - echo "No database directory found in the default location:" - echo "${MYSQLDATADIR}/mysql" - echo "If you need to build the initial database directory," - echo " see /opt/csw/mysql5/share/mysql/quick_start-csw" - echo "If you are using a non-default database directory location," - echo " please start mysql manually." - exit 0 +# http://bugs.mysql.com/bug.php?id=31164 +# ERROR: 1004 Can't create file '/var/tmp//installRJaiQ3/#sql6fee_1_0.frm' (errno: 13) +unset TMPDIR + +if [ ! -f "$DEFAULTS_FILE" ]; then + IN_DEFAULTS_FILE=$BASEDIR/share/mysql/my-small.cnf + echo "Using $IN_DEFAULTS_FILE to create the options file." +else + IN_DEFAULTS_FILE=$DEFAULTS_FILE + echo "Using $DEFAULTS_FILE as the options file." fi + +if [ -d "$MYSQLD_DATADIR/mysql" ]; then + echo "mysql database already exists." + echo "Leaving script without initializing a database." + exit 0 +fi + +echo "Setting up the database" +# Create the database directory and set the permissions if needed +if [ ! -d "$MYSQLD_DATADIR" ] ; then + mkdir -p $MYSQLD_DATADIR + chown -R mysql:mysql $MYSQLD_DATADIR + chmod 0700 $MYSQLD_DATADIR +fi +# +# copy the configuration file if not exists. +CNFCOPIED=no +if [ ! -f "$DEFAULTS_FILE" ] ; then + cp -p $IN_DEFAULTS_FILE $DEFAULTS_FILE + CNFCOPIED=yes +fi +# +# Run the mysql script to create the database +echo "Creating MySQL core database in $MYSQLD_DATADIR" +echo +echo "### The following messages are from mysql_install_db." +$BASEDIR/bin/mysql_install_db \ + --defaults-extra-file="$DEFAULTS_FILE" \ + --user="$MYSQLD_USER" \ + --basedir="$BASEDIR" \ + --datadir="$MYSQLD_DATADIR" + +# Fix permissions on the data directory, since mysql_install_db was run as +# root. +chown -R mysql:mysql $MYSQLD_DATADIR + +# Update --datadir in the cnf file with the correct value if file was copied +if [ x"$CNFCOPIED" = xyes ]; then + sed -e "s|/var/opt/csw/mysql5|$MYSQLD_DATADIR|g" $DEFAULTS_FILE >$DEFAULTS_FILE.new + mv $DEFAULTS_FILE.new $DEFAULTS_FILE +fi + +# Ending message +echo +echo "### The following messages are from $0." +echo "See /opt/csw/mysql5/share/mysql/doc/README.CSW for packaging changes." +echo "Please ignore references to starting mysqld_safe in the messages above." +echo " These messages are from mysql_install_db. See the following" +echo " for starting CSWmysql5." +smf=no +if [ -f /usr/sbin/svccfg -a -f /usr/sbin/svcadm ] ; then smf=yes ; fi +if [ $smf = yes ] +then + echo "Running \`svcadm enable cswmysql5\` start to start the database." + # First, we clear the status, since it's likely to be 'maintenance'. + svcadm disable cswmysql5 + svcadm clear cswmysql5 + svcadm enable cswmysql5 +else + echo "Running \`/etc/opt/csw/init.d/cswmysql\` start to start the database." + /etc/opt/csw/init.d/cswmysql start +fi + +exit 0 + +# vim:set ts=2 sw=2 sts=2 expandtab: Modified: csw/mgar/pkg/mysql5/branches/mysql-5.0.x/files/quick_start-csw =================================================================== --- csw/mgar/pkg/mysql5/branches/mysql-5.0.x/files/quick_start-csw 2010-01-03 14:17:52 UTC (rev 7846) +++ csw/mgar/pkg/mysql5/branches/mysql-5.0.x/files/quick_start-csw 2010-01-03 14:41:04 UTC (rev 7847) @@ -2,12 +2,14 @@ # # $Id$ # -# initial version for blastwave.org by Alex Moore 2006.02.25 -# Revised 2006.03.25 - see bug report 0001542 +# initial version for blastwave.org by Alex Moore 2006.02.25 Revised 2006.03.25 +# - see bug report 0001542 # # This script creates a default database with the small-memory footprint. # Input may be provided for DATADIR and DEFAULTS_FILE # +# TODO: This file should be integrated with CSWmysql5.postinstall file. + BASEDIR=/opt/csw/mysql5 MYSQL_VAR=/var/opt/csw/mysql5 DEFAULTS_FILE=$BASEDIR/my.cnf This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Sun Jan 3 15:47:00 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sun, 03 Jan 2010 14:47:00 +0000 Subject: [csw-devel] SF.net SVN: gar:[7848] csw/mgar/pkg/mysql5/branches/mysql-5.0.x/checksums Message-ID: Revision: 7848 http://gar.svn.sourceforge.net/gar/?rev=7848&view=rev Author: wahwah Date: 2010-01-03 14:47:00 +0000 (Sun, 03 Jan 2010) Log Message: ----------- myusql-5.0.x: Updating checksums of files with the Id tags Modified Paths: -------------- csw/mgar/pkg/mysql5/branches/mysql-5.0.x/checksums Modified: csw/mgar/pkg/mysql5/branches/mysql-5.0.x/checksums =================================================================== --- csw/mgar/pkg/mysql5/branches/mysql-5.0.x/checksums 2010-01-03 14:41:04 UTC (rev 7847) +++ csw/mgar/pkg/mysql5/branches/mysql-5.0.x/checksums 2010-01-03 14:47:00 UTC (rev 7848) @@ -2,11 +2,11 @@ 1414d06fab1530484a508927a0de4154 0002-cast-user_info-pw_gid-to-gid_t.patch 5415f365f1b0f7a179d1efc25f45bbee 0003-OpenCSW-perl-for-tests.patch 8ab232cd4d232b3cda3bbced93f80237 0004-basedir-and-datadir-in-the-cnf-files.patch -8cfe94c6a9c0e43d17de20b551e15837 CSWmysql5.postinstall +a723d7b35d76794c910daa20e6f86158 CSWmysql5.postinstall 60162ea667507a6a487027e7c389ca55 CSWmysql5.preinstall e691b0cf00a3925ac55c1844045d6e30 ChangeLog e42afb5ec1b1ab02d2ec3b46d0922636 README.CSW aaca748fc044834e71ad544ab293c494 cswmysql5 67228e1f096fe08a94f4267439a4ec36 cswusergroup 65e6229cc98b6a8d4c5206d7fe16c7be mysql-5.0.87.tar.gz -4313c963657ac820a20eea2a50be27f3 quick_start-csw +0d083f6dab0bc083fd302ef1375e3d59 quick_start-csw This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From hson at users.sourceforge.net Sun Jan 3 16:27:58 2010 From: hson at users.sourceforge.net (hson at users.sourceforge.net) Date: Sun, 03 Jan 2010 15:27:58 +0000 Subject: [csw-devel] SF.net SVN: gar:[7849] csw/mgar/pkg/goocanvas/trunk/Makefile Message-ID: Revision: 7849 http://gar.svn.sourceforge.net/gar/?rev=7849&view=rev Author: hson Date: 2010-01-03 15:27:58 +0000 (Sun, 03 Jan 2010) Log Message: ----------- goocanvas: Add STRIP_LIBTOOL Modified Paths: -------------- csw/mgar/pkg/goocanvas/trunk/Makefile Modified: csw/mgar/pkg/goocanvas/trunk/Makefile =================================================================== --- csw/mgar/pkg/goocanvas/trunk/Makefile 2010-01-03 14:47:00 UTC (rev 7848) +++ csw/mgar/pkg/goocanvas/trunk/Makefile 2010-01-03 15:27:58 UTC (rev 7849) @@ -33,10 +33,15 @@ EXTRA_INC = $(prefix)/X11/include EXTRA_LIB = $(prefix)/X11/lib EXTRA_PKG_CONFIG_DIRS = $(prefix)/X11/lib +EXTRA_LINKER_FLAGS_isa-i386 = /usr/openwin/lib/libXext.so +EXTRA_LINKER_FLAGS_isa-sparcv8 = /usr/openwin/lib/libXext.so +EXTRA_LINKER_FLAGS_isa-amd64 = /usr/openwin/lib/amd64/libXext.so +EXTRA_LINKER_FLAGS_isa-sparcv9 = /usr/openwin/lib/sparcv9/libXext.so +EXTRA_LINKER_FLAGS += $(EXTRA_LINKER_FLAGS_$(MODULATION)) #NO_ISAEXEC = 1 #NOISALIST = 1 -#BUILD64 = 1 +BUILD64 = 1 PKGFILES_CSWgoocanvasdevel = $(PKGFILES_DEVEL) PKGFILES_CSWgoocanvasdoc = $(sharedstatedir)/gtk-doc/.* @@ -46,6 +51,8 @@ LIBS = -lm export LIBS +STRIP_LIBTOOL = 1 + CONFIGURE_ARGS = $(DIRPATHS) TEST_TARGET = check This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From hson at users.sourceforge.net Sun Jan 3 17:11:21 2010 From: hson at users.sourceforge.net (hson at users.sourceforge.net) Date: Sun, 03 Jan 2010 16:11:21 +0000 Subject: [csw-devel] SF.net SVN: gar:[7850] csw/mgar/pkg/libunique/trunk/Makefile Message-ID: Revision: 7850 http://gar.svn.sourceforge.net/gar/?rev=7850&view=rev Author: hson Date: 2010-01-03 16:11:21 +0000 (Sun, 03 Jan 2010) Log Message: ----------- libunique: Add STRIP_LIBTOOL Modified Paths: -------------- csw/mgar/pkg/libunique/trunk/Makefile Modified: csw/mgar/pkg/libunique/trunk/Makefile =================================================================== --- csw/mgar/pkg/libunique/trunk/Makefile 2010-01-03 15:27:58 UTC (rev 7849) +++ csw/mgar/pkg/libunique/trunk/Makefile 2010-01-03 16:11:21 UTC (rev 7850) @@ -59,6 +59,8 @@ LIBS = -lsocket -lnsl export LIBS +STRIP_LIBTOOL = 1 + CONFIGURE_ARGS = $(DIRPATHS) TEST_TARGET = check This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Sun Jan 3 18:25:25 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sun, 03 Jan 2010 17:25:25 +0000 Subject: [csw-devel] SF.net SVN: gar:[7851] csw/mgar/pkg/mysql5/branches/mysql-5.0.x/Makefile Message-ID: Revision: 7851 http://gar.svn.sourceforge.net/gar/?rev=7851&view=rev Author: wahwah Date: 2010-01-03 17:25:21 +0000 (Sun, 03 Jan 2010) Log Message: ----------- mysql-5.0.x: Removing the explicit reference to ugfiles in SPKG_CLASSES, it breaks the installation. Modified Paths: -------------- csw/mgar/pkg/mysql5/branches/mysql-5.0.x/Makefile Modified: csw/mgar/pkg/mysql5/branches/mysql-5.0.x/Makefile =================================================================== --- csw/mgar/pkg/mysql5/branches/mysql-5.0.x/Makefile 2010-01-03 16:11:21 UTC (rev 7850) +++ csw/mgar/pkg/mysql5/branches/mysql-5.0.x/Makefile 2010-01-03 17:25:21 UTC (rev 7851) @@ -169,8 +169,6 @@ PROTOTYPE_PERMS_dbdir = 0700 PROTOTYPE_CLASS_dbdir = ugfiles -SPKG_CLASSES = none ugfiles - include gar/category.mk CFLAGS := $(filter-out -I%,$(CFLAGS)) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From hson at users.sourceforge.net Sun Jan 3 18:48:34 2010 From: hson at users.sourceforge.net (hson at users.sourceforge.net) Date: Sun, 03 Jan 2010 17:48:34 +0000 Subject: [csw-devel] SF.net SVN: gar:[7852] csw/mgar/pkg Message-ID: Revision: 7852 http://gar.svn.sourceforge.net/gar/?rev=7852&view=rev Author: hson Date: 2010-01-03 17:48:33 +0000 (Sun, 03 Jan 2010) Log Message: ----------- Add intermediate Makefile Added Paths: ----------- csw/mgar/pkg/gobject-introspection/Makefile csw/mgar/pkg/json-glib/Makefile csw/mgar/pkg/libmcrypt/Makefile csw/mgar/pkg/pxlib/Makefile csw/mgar/pkg/wireshark/Makefile Added: csw/mgar/pkg/gobject-introspection/Makefile =================================================================== --- csw/mgar/pkg/gobject-introspection/Makefile (rev 0) +++ csw/mgar/pkg/gobject-introspection/Makefile 2010-01-03 17:48:33 UTC (rev 7852) @@ -0,0 +1,15 @@ +# vim: ft=make ts=4 sw=4 noet + +default: + @echo "You are in the pkg/ directory." + +%: + $(MAKE) -C trunk $* + +paranoid-%: + $(MAKE) -C trunk $* || exit 2 + +export BUILDLOG ?= $(shell pwd)/buildlog.txt + +report-%: + $(MAKE) -C trunk $* || echo " *** make $* in $$i failed ***" >> $(BUILDLOG) Added: csw/mgar/pkg/json-glib/Makefile =================================================================== --- csw/mgar/pkg/json-glib/Makefile (rev 0) +++ csw/mgar/pkg/json-glib/Makefile 2010-01-03 17:48:33 UTC (rev 7852) @@ -0,0 +1,15 @@ +# vim: ft=make ts=4 sw=4 noet + +default: + @echo "You are in the pkg/ directory." + +%: + $(MAKE) -C trunk $* + +paranoid-%: + $(MAKE) -C trunk $* || exit 2 + +export BUILDLOG ?= $(shell pwd)/buildlog.txt + +report-%: + $(MAKE) -C trunk $* || echo " *** make $* in $$i failed ***" >> $(BUILDLOG) Added: csw/mgar/pkg/libmcrypt/Makefile =================================================================== --- csw/mgar/pkg/libmcrypt/Makefile (rev 0) +++ csw/mgar/pkg/libmcrypt/Makefile 2010-01-03 17:48:33 UTC (rev 7852) @@ -0,0 +1,15 @@ +# vim: ft=make ts=4 sw=4 noet + +default: + @echo "You are in the pkg/ directory." + +%: + $(MAKE) -C trunk $* + +paranoid-%: + $(MAKE) -C trunk $* || exit 2 + +export BUILDLOG ?= $(shell pwd)/buildlog.txt + +report-%: + $(MAKE) -C trunk $* || echo " *** make $* in $$i failed ***" >> $(BUILDLOG) Added: csw/mgar/pkg/pxlib/Makefile =================================================================== --- csw/mgar/pkg/pxlib/Makefile (rev 0) +++ csw/mgar/pkg/pxlib/Makefile 2010-01-03 17:48:33 UTC (rev 7852) @@ -0,0 +1,15 @@ +# vim: ft=make ts=4 sw=4 noet + +default: + @echo "You are in the pkg/ directory." + +%: + $(MAKE) -C trunk $* + +paranoid-%: + $(MAKE) -C trunk $* || exit 2 + +export BUILDLOG ?= $(shell pwd)/buildlog.txt + +report-%: + $(MAKE) -C trunk $* || echo " *** make $* in $$i failed ***" >> $(BUILDLOG) Added: csw/mgar/pkg/wireshark/Makefile =================================================================== --- csw/mgar/pkg/wireshark/Makefile (rev 0) +++ csw/mgar/pkg/wireshark/Makefile 2010-01-03 17:48:33 UTC (rev 7852) @@ -0,0 +1,15 @@ +# vim: ft=make ts=4 sw=4 noet + +default: + @echo "You are in the pkg/ directory." + +%: + $(MAKE) -C trunk $* + +paranoid-%: + $(MAKE) -C trunk $* || exit 2 + +export BUILDLOG ?= $(shell pwd)/buildlog.txt + +report-%: + $(MAKE) -C trunk $* || echo " *** make $* in $$i failed ***" >> $(BUILDLOG) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From hson at users.sourceforge.net Sun Jan 3 23:22:45 2010 From: hson at users.sourceforge.net (hson at users.sourceforge.net) Date: Sun, 03 Jan 2010 22:22:45 +0000 Subject: [csw-devel] SF.net SVN: gar:[7853] csw/mgar/pkg Message-ID: Revision: 7853 http://gar.svn.sourceforge.net/gar/?rev=7853&view=rev Author: hson Date: 2010-01-03 22:22:45 +0000 (Sun, 03 Jan 2010) Log Message: ----------- tiff: Initial commit Added Paths: ----------- csw/mgar/pkg/tiff/ csw/mgar/pkg/tiff/Makefile csw/mgar/pkg/tiff/branches/ csw/mgar/pkg/tiff/tags/ csw/mgar/pkg/tiff/trunk/ csw/mgar/pkg/tiff/trunk/Makefile csw/mgar/pkg/tiff/trunk/checksums csw/mgar/pkg/tiff/trunk/files/ Added: csw/mgar/pkg/tiff/Makefile =================================================================== --- csw/mgar/pkg/tiff/Makefile (rev 0) +++ csw/mgar/pkg/tiff/Makefile 2010-01-03 22:22:45 UTC (rev 7853) @@ -0,0 +1,15 @@ +# vim: ft=make ts=4 sw=4 noet + +default: + @echo "You are in the pkg/ directory." + +%: + $(MAKE) -C trunk $* + +paranoid-%: + $(MAKE) -C trunk $* || exit 2 + +export BUILDLOG ?= $(shell pwd)/buildlog.txt + +report-%: + $(MAKE) -C trunk $* || echo " *** make $* in $$i failed ***" >> $(BUILDLOG) Property changes on: csw/mgar/pkg/tiff/trunk ___________________________________________________________________ Added: svn:ignore + cookies download work Added: svn:externals + gar https://gar.svn.sf.net/svnroot/gar/csw/mgar/gar/v2 Added: csw/mgar/pkg/tiff/trunk/Makefile =================================================================== --- csw/mgar/pkg/tiff/trunk/Makefile (rev 0) +++ csw/mgar/pkg/tiff/trunk/Makefile 2010-01-03 22:22:45 UTC (rev 7853) @@ -0,0 +1,51 @@ +GARNAME = tiff +GARVERSION = 3.9.2 +CATEGORIES = lib + +DESCRIPTION = lib and tools for Tag Image File Format +define BLURB +endef + +MASTER_SITES = http://download.osgeo.org/libtiff/ +DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz +DISTNAME = $(GARNAME)-$(GARVERSION) + +PACKAGES = CSWtiff CSWtiffdevel CSWtiffdoc +CATALOGNAME_CSWtiff = tiff +CATALOGNAME_CSWtiffdevel = tiff_devel +CATALOGNAME_CSWtiffdoc = tiff_doc + +SPKG_DESC_CSWtiff += Library for writing single instance application +SPKG_DESC_CSWtiffdevel += Library for writing single instance application - developer package +SPKG_DESC_CSWtiffdoc += Library for writing single instance application - documentation + +REQUIRED_PKGS_CSWtiff += CSWjbigkit CSWjpeg CSWzlib +REQUIRED_PKGS_CSWtiffdevel += CSWtiff +REQUIRED_PKGS_CSWtiffdoc += CSWtiff + +PKGFILES_CSWtiffdevel = $(PKGFILES_DEVEL) +PKGFILES_CSWtiffdoc = $(sharedstatedir)/doc/.* + +ARCHALL_CSWtiffdoc = 1 + +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.bz2 + +SPKG_SOURCEURL = http://www.remotesensing.org/libtiff/ + +BUILD64 = 1 + +STRIP_LIBTOOL = 1 + +EXTRA_INC = $(prefix)/X11/include +EXTRA_LIB = $(prefix)/X11/lib +EXTRA_PKG_CONFIG_DIRS = $(prefix)/X11/lib + +CONFIGURE_ARGS = $(DIRPATHS) +CONFIGURE_ARGS += --with-zlib-include-dir=/opt/csw/include +CONFIGURE_ARGS += --with-zlib-lib-dir=/opt/csw/lib +CONFIGURE_ARGS += --with-jpeg-include-dir=/opt/csw/include +CONFIGURE_ARGS += --with-jpeg-lib-dir=/opt/csw/lib +CONFIGURE_ARGS += --with-jbig-include-dir=/opt/csw/include +CONFIGURE_ARGS += --with-jbig-lib-dir=/opt/csw/lib + +include gar/category.mk Added: csw/mgar/pkg/tiff/trunk/checksums =================================================================== --- csw/mgar/pkg/tiff/trunk/checksums (rev 0) +++ csw/mgar/pkg/tiff/trunk/checksums 2010-01-03 22:22:45 UTC (rev 7853) @@ -0,0 +1 @@ +93e56e421679c591de7552db13384cb8 tiff-3.9.2.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Mon Jan 4 00:03:17 2010 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Sun, 03 Jan 2010 23:03:17 +0000 Subject: [csw-devel] SF.net SVN: gar:[7854] csw/mgar/pkg/asciidoc/trunk Message-ID: Revision: 7854 http://gar.svn.sourceforge.net/gar/?rev=7854&view=rev Author: bdwalton Date: 2010-01-03 23:03:17 +0000 (Sun, 03 Jan 2010) Log Message: ----------- asciidoc: version bump to 8.5.2 Modified Paths: -------------- csw/mgar/pkg/asciidoc/trunk/Makefile csw/mgar/pkg/asciidoc/trunk/checksums Modified: csw/mgar/pkg/asciidoc/trunk/Makefile =================================================================== --- csw/mgar/pkg/asciidoc/trunk/Makefile 2010-01-03 22:22:45 UTC (rev 7853) +++ csw/mgar/pkg/asciidoc/trunk/Makefile 2010-01-03 23:03:17 UTC (rev 7854) @@ -1,5 +1,5 @@ GARNAME = asciidoc -GARVERSION = 8.4.5 +GARVERSION = 8.5.2 CATEGORIES = utils DESCRIPTION = An Documentation Generator Modified: csw/mgar/pkg/asciidoc/trunk/checksums =================================================================== --- csw/mgar/pkg/asciidoc/trunk/checksums 2010-01-03 22:22:45 UTC (rev 7853) +++ csw/mgar/pkg/asciidoc/trunk/checksums 2010-01-03 23:03:17 UTC (rev 7854) @@ -1,3 +1,3 @@ 62c15a6f036ca40ad0dffb0b14ad6630 add-csw-gnu-path-to-a2x.patch -9f21d6e352b3ab668f9def3eb7497da2 asciidoc-8.4.5.tar.gz +3ed69184645b233b83a52f8a722d1461 asciidoc-8.5.2.tar.gz ec48eeea1eafdaa7e507bc11327f6eae handle-csw-etc-paths.patch This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From hson at users.sourceforge.net Mon Jan 4 04:57:35 2010 From: hson at users.sourceforge.net (hson at users.sourceforge.net) Date: Mon, 04 Jan 2010 03:57:35 +0000 Subject: [csw-devel] SF.net SVN: gar:[7855] csw/mgar/pkg/ilmbase/trunk Message-ID: Revision: 7855 http://gar.svn.sourceforge.net/gar/?rev=7855&view=rev Author: hson Date: 2010-01-04 03:57:34 +0000 (Mon, 04 Jan 2010) Log Message: ----------- Split package in two 64-bit fixes Modified Paths: -------------- csw/mgar/pkg/ilmbase/trunk/Makefile csw/mgar/pkg/ilmbase/trunk/checksums Added Paths: ----------- csw/mgar/pkg/ilmbase/trunk/files/ltmain.sh.patch Modified: csw/mgar/pkg/ilmbase/trunk/Makefile =================================================================== --- csw/mgar/pkg/ilmbase/trunk/Makefile 2010-01-03 23:03:17 UTC (rev 7854) +++ csw/mgar/pkg/ilmbase/trunk/Makefile 2010-01-04 03:57:34 UTC (rev 7855) @@ -29,41 +29,65 @@ DISTFILES += libImath.so.2.0.2.i DISTFILES += libImath.so.2.0.2.s +PACKAGES = CSWilmbase CSWilmbasedevel +CATALOGNAME_CSWilmbase = ilmbase +CATALOGNAME_CSWilmbasedevel = ilmbase_devel + +SPKG_DESC_CSWilmbase += Base libraries used by OpenEXR +SPKG_DESC_CSWilmbasedevel += Base libraries used by OpenEXR - developer package + +PKGFILES_CSWilmbasedevel = $(PKGFILES_DEVEL) + +REQUIRED_PKGS_CSWilmbase += +REQUIRED_PKGS_CSWilmbasedevel += CSWilmbase + SPKG_SOURCEURL = http://www.openexr.com LICENSE = LICENSE -# We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz +UPSTREAM_MASTER_SITES = http://download.savannah.nongnu.org/releases/openexr/ -# If the url used to check for software update is different of MASTER_SITES, then -# uncomment the next line. Otherwise it is set by default to the value of MASTER_SITES -# UPSTREAM_MASTER_SITES = - CONFIGURE_ARGS = $(DIRPATHS) PATCHFILES = ImathMath.patch +PATCHFILES += ltmain.sh.patch LIBS += -lCstd -lCrun -lc -lm export LIBS -TEST_TARGET = check +BUILD64 = 1 +# Check fails if library isn't installed /opt/csw/lib and until a 64-bit +#TEST_TARGET = check +TEST_TARGET = + +STRIP_LIBTOOL = 1 + include gar/category.mk +#pre-configure-modulated: +# @echo " ==> Regenerating build tools..." +# @(cd $(WORKSRC) ; \ +# aclocal && \ +# autoconf && \ +# libtoolize --automake --force && \ +# aclocal && \ +# automake -a ) +# @$(MAKECOOKIE) post-install-isa-sparcv8: @cp $(FILEDIR)/libHalf.so.2.0.2.s $(INSTALLISADIR)/opt/csw/lib/libHalf.so.2.0.2 @cp $(FILEDIR)/libIex.so.2.0.2.s $(INSTALLISADIR)/opt/csw/lib/libIex.so.2.0.2 @cp $(FILEDIR)/libImath.so.2.0.2.s $(INSTALLISADIR)/opt/csw/lib/libImath.so.2.0.2 - @ln -s libHalf.so.2.0.2 $(INSTALLISADIR)/opt/csw/lib/libHalf.so.2 - @ln -s libIex.so.2.0.2 $(INSTALLISADIR)/opt/csw/lib/libIex.so.2 - @ln -s libImath.so.2.0.2 $(INSTALLISADIR)/opt/csw/lib/libImath.so.2 + @( if [ ! -r $(INSTALLISADIR)$(libdir)/libHalf.so.2 ] ; then ln -s libHalf.so.2.0.2 $(INSTALLISADIR)/opt/csw/lib/libHalf.so.2 ; fi ) + @( if [ ! -r $(INSTALLISADIR)$(libdir)/libIex.so.2 ] ; then ln -s libIex.so.2.0.2 $(INSTALLISADIR)/opt/csw/lib/libIex.so.2 ; fi ) + @( if [ ! -r $(INSTALLISADIR)$(libdir)/libImath.so.2 ] ; then ln -s libImath.so.2.0.2 $(INSTALLISADIR)/opt/csw/lib/libImath.so.2 ; fi ) post-install-isa-i386: @cp $(FILEDIR)/libHalf.so.2.0.2.i $(INSTALLISADIR)/opt/csw/lib/libHalf.so.2.0.2 @cp $(FILEDIR)/libIex.so.2.0.2.i $(INSTALLISADIR)/opt/csw/lib/libIex.so.2.0.2 @cp $(FILEDIR)/libImath.so.2.0.2.i $(INSTALLISADIR)/opt/csw/lib/libImath.so.2.0.2 - @ln -s libHalf.so.2.0.2 $(INSTALLISADIR)/opt/csw/lib/libHalf.so.2 - @ln -s libIex.so.2.0.2 $(INSTALLISADIR)/opt/csw/lib/libIex.so.2 - @ln -s libImath.so.2.0.2 $(INSTALLISADIR)/opt/csw/lib/libImath.so.2 + @( if [ ! -r $(INSTALLISADIR)$(libdir)/libHalf.so.2 ] ; then ln -s libHalf.so.2.0.2 $(INSTALLISADIR)/opt/csw/lib/libHalf.so.2 ; fi ) + @( if [ ! -r $(INSTALLISADIR)$(libdir)/libIex.so.2 ] ; then ln -s libIex.so.2.0.2 $(INSTALLISADIR)/opt/csw/lib/libIex.so.2 ; fi ) + @( if [ ! -r $(INSTALLISADIR)$(libdir)/libImath.so.2 ] ; then ln -s libImath.so.2.0.2 $(INSTALLISADIR)/opt/csw/lib/libImath.so.2 ; fi ) Modified: csw/mgar/pkg/ilmbase/trunk/checksums =================================================================== --- csw/mgar/pkg/ilmbase/trunk/checksums 2010-01-03 23:03:17 UTC (rev 7854) +++ csw/mgar/pkg/ilmbase/trunk/checksums 2010-01-04 03:57:34 UTC (rev 7855) @@ -1,8 +1,9 @@ -f76f094e69a6079b0beb93d97e2a217e download/ilmbase-1.0.1.tar.gz -b7daafc6a6c92a3cf9dfb47e24fa630f download/libHalf.so.2.0.2.i -cdce2f2b1c7d00dc76124ecb5418b9a2 download/libHalf.so.2.0.2.s -1b589f5b747846688c27f55de9b1ec7a download/libIex.so.2.0.2.i -ddf913c9000dc4580ad330b9dd938826 download/libIex.so.2.0.2.s -756523f803ce1be3e125b6ce63e3183c download/libImath.so.2.0.2.i -ce47a211381deadfc38722f5abda54d7 download/libImath.so.2.0.2.s -6873969f50e5d1c43ec93a90a65d85bd download/ImathMath.patch +6873969f50e5d1c43ec93a90a65d85bd ImathMath.patch +f76f094e69a6079b0beb93d97e2a217e ilmbase-1.0.1.tar.gz +b7daafc6a6c92a3cf9dfb47e24fa630f libHalf.so.2.0.2.i +cdce2f2b1c7d00dc76124ecb5418b9a2 libHalf.so.2.0.2.s +1b589f5b747846688c27f55de9b1ec7a libIex.so.2.0.2.i +ddf913c9000dc4580ad330b9dd938826 libIex.so.2.0.2.s +756523f803ce1be3e125b6ce63e3183c libImath.so.2.0.2.i +ce47a211381deadfc38722f5abda54d7 libImath.so.2.0.2.s +f1016498bff3cce0c722108f4603e6c5 ltmain.sh.patch Added: csw/mgar/pkg/ilmbase/trunk/files/ltmain.sh.patch =================================================================== --- csw/mgar/pkg/ilmbase/trunk/files/ltmain.sh.patch (rev 0) +++ csw/mgar/pkg/ilmbase/trunk/files/ltmain.sh.patch 2010-01-04 03:57:34 UTC (rev 7855) @@ -0,0 +1,24 @@ +--- ilmbase-1.0.1.orig/ltmain.sh 2006-12-16 00:23:48.000000000 +0100 ++++ ilmbase-1.0.1/ltmain.sh 2010-01-04 03:01:58.123927193 +0100 +@@ -1553,9 +1553,10 @@ + esac + compile_command="$compile_command $arg" + finalize_command="$finalize_command $arg" +- if test "$with_gcc" = "yes" ; then ++# Fix for 64-bit CC ++# if test "$with_gcc" = "yes" ; then + compiler_flags="$compiler_flags $arg" +- fi ++# fi + continue + ;; + +@@ -4015,7 +4016,7 @@ + save_ifs="$IFS"; IFS='~' + for cmd in $cmds; do + IFS="$save_ifs" +- eval cmd=\"$cmd\" ++ eval cmd=\"$cmd -norunpath\" + $show "$cmd" + $run eval "$cmd" || exit $? + done This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Mon Jan 4 11:28:16 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Mon, 04 Jan 2010 10:28:16 +0000 Subject: [csw-devel] SF.net SVN: gar:[7856] csw/mgar/gar/v2 Message-ID: Revision: 7856 http://gar.svn.sourceforge.net/gar/?rev=7856&view=rev Author: wahwah Date: 2010-01-04 10:28:15 +0000 (Mon, 04 Jan 2010) Log Message: ----------- mGAR v2: Merging the v2-checkpkg branch in Modified Paths: -------------- csw/mgar/gar/v2/bin/checkpkg Added Paths: ----------- csw/mgar/gar/v2/bin/checkpkg.d/ csw/mgar/gar/v2/bin/checkpkg.d/checkpkg-dummy.py csw/mgar/gar/v2/bin/checkpkg.d/checkpkg-libs.py csw/mgar/gar/v2/bin/checkpkg.d/checkpkg-obsolete-deps.py csw/mgar/gar/v2/bin/checkpkg.d/checkpkg.py csw/mgar/gar/v2/bin/checkpkg.d/checkpkg_test.py csw/mgar/gar/v2/bin/checkpkg.d/testdata/ csw/mgar/gar/v2/bin/checkpkg.d/testdata/__init__.py csw/mgar/gar/v2/bin/checkpkg.d/testdata/checkpkg_test_data_CSWlibpq_84.py csw/mgar/gar/v2/bin/checkpkg.d/testdata/checkpkg_test_data_CSWmysql51.py csw/mgar/gar/v2/bin/checkpkg.d/testdata/checkpkg_test_data_CSWmysql51client.py csw/mgar/gar/v2/bin/checkpkg.d/testdata/checkpkg_test_data_CSWmysql51devel.py csw/mgar/gar/v2/bin/checkpkg.d/testdata/checkpkg_test_data_CSWmysql51rt.py csw/mgar/gar/v2/bin/checkpkg.d/testdata/checkpkg_test_data_CSWmysql5client_8x.py csw/mgar/gar/v2/bin/checkpkg.d/testdata/dump_output_1.py csw/mgar/gar/v2/bin/checkpkg.d/testdata/dump_output_2.py Removed Paths: ------------- csw/mgar/gar/v2/bin/checkpkg.d/checkpkg-dummy.py csw/mgar/gar/v2/bin/checkpkg.d/checkpkg-libs.py csw/mgar/gar/v2/bin/checkpkg.d/checkpkg-obsolete-deps.py csw/mgar/gar/v2/bin/checkpkg.d/checkpkg.py csw/mgar/gar/v2/bin/checkpkg.d/checkpkg_test.py csw/mgar/gar/v2/bin/checkpkg.d/testdata/ csw/mgar/gar/v2/bin/checkpkg.d/testdata/__init__.py csw/mgar/gar/v2/bin/checkpkg.d/testdata/checkpkg_test_data_CSWlibpq_84.py csw/mgar/gar/v2/bin/checkpkg.d/testdata/checkpkg_test_data_CSWmysql51.py csw/mgar/gar/v2/bin/checkpkg.d/testdata/checkpkg_test_data_CSWmysql51client.py csw/mgar/gar/v2/bin/checkpkg.d/testdata/checkpkg_test_data_CSWmysql51devel.py csw/mgar/gar/v2/bin/checkpkg.d/testdata/checkpkg_test_data_CSWmysql51rt.py csw/mgar/gar/v2/bin/checkpkg.d/testdata/checkpkg_test_data_CSWmysql5client_8x.py csw/mgar/gar/v2/bin/checkpkg.d/testdata/dump_output_1.py csw/mgar/gar/v2/bin/checkpkg.d/testdata/dump_output_2.py Property Changed: ---------------- csw/mgar/gar/v2/ csw/mgar/gar/v2/bin/checkpkg csw/mgar/gar/v2/pkglib/csw/depend Property changes on: csw/mgar/gar/v2 ___________________________________________________________________ Modified: svn:mergeinfo - /csw/mgar/gar/v2:4936-6678 /csw/mgar/gar/v2-collapsed-modulations:6895 /csw/mgar/gar/v2-migrateconf:7082-7211 /csw/mgar/gar/v2-skayser:6087-6132 + /csw/mgar/gar/v2:4936-6678 /csw/mgar/gar/v2-checkpkg:7722-7855 /csw/mgar/gar/v2-collapsed-modulations:6895 /csw/mgar/gar/v2-migrateconf:7082-7211 /csw/mgar/gar/v2-skayser:6087-6132 Modified: csw/mgar/gar/v2/bin/checkpkg =================================================================== --- csw/mgar/gar/v2/bin/checkpkg 2010-01-04 03:57:34 UTC (rev 7855) +++ csw/mgar/gar/v2/bin/checkpkg 2010-01-04 10:28:15 UTC (rev 7856) @@ -1,6 +1,13 @@ #!/bin/ksh -p - -# checkpkg 1.50 (diff to 1.46a: check multiple package files) +# +# $Id$ +# +# checkpkg 1.51 +# +# diff to 1.46a +# - check multiple package files +# - checkpkg.d plugin support +# # This script examines a package that has been put together # for submittal to the CSW archive at opencsw.org # @@ -18,7 +25,22 @@ PATH=$PATH:/usr/sbin LOCAL_ARCH=`uname -p` +if [[ -z "${CHECKPKG_TMPDIR}" ]]; then + readonly CHECKPKG_TMPDIR="/var/tmp" +else + readonly CHECKPKG_TMPDIR +fi +# Colors only when running interactively +if [[ -t 1 ]]; then + GREEN="\\033[0;32;40m" + RED="\\033[1;31;40m" + COLOR_RESET="\\033[00m" +else + GREEN="" + RED="" + COLOR_RESET="" +fi # always print out a warning message. (to stderr) # exit script, if quit_on_warn set @@ -28,11 +50,17 @@ if [[ -d "$EXTRACTDIR" ]] ; then rm -rf $EXTRACTDIR fi - if [[ "$TMPARCHIVE" != "" ]] ; then - [ -f "$TMPARCHIVE" ] && rm $TMPARCHIVE - fi + cleantmparchives } +cleantmparchives() { + for TMPARCHIVE in $tmparchives; do + if [[ "$TMPARCHIVE" != "" ]]; then + [ -f "$TMPARCHIVE" ] && rm $TMPARCHIVE + fi + done +} + cleanupset(){ if [ "`echo $SETINF*`" != "$SETINF*" ]; then rm $SETINF* @@ -54,6 +82,33 @@ exit 1 } +debugmsg() { + if [[ "${DEBUG}" != "" ]]; then + print "DEBUG: $*" > /dev/fd/2 + fi +} + +set_variables_for_individual_package_check() { + f=$1 + file $f |sed 's/^.*://' |grep gzip >/dev/null + if [ $? -eq 0 ] ; then + TMPARCHIVE=$CHECKPKG_TMPDIR/`basename $f` + if [[ -f $TMPARCHIVE ]] ; then + print ERROR: $TMPARCHIVE already exists + + fi + gzcat $f >$TMPARCHIVE || exit 1 + f=$TMPARCHIVE + fi + pkgname=`nawk 'NR == 2 {print $1; exit;}' $f` + pkgnames="$pkgnames $pkgname" +} + +if [[ "$1" == "-d" ]] ; then + DEBUG=1 + shift +fi + if [[ "$1" == "-e" ]] ; then quit_on_warn=1; shift @@ -65,11 +120,19 @@ fi # a unique filename for the list of package deps and libs we see in a 'set' -SETINF=/tmp/checkpkg.$$.`date +%Y%m%d%H%M%S` +SETINF=$CHECKPKG_TMPDIR/checkpkg.$$.`date +%Y%m%d%H%M%S` SETLIBS=$SETINF.libs SETDEPS=$SETINF.deps +pkgnames="" +tmparchives="" +EXTRACTDIR=$CHECKPKG_TMPDIR/dissect.$$ +if [ -d $EXTRACTDIR ] ; then + print ERROR: $EXTRACTDIR already exists + exit 1 +fi + for f in "$@" do @@ -82,9 +145,6 @@ case $f in - cswutils-*) - : - ;; *) print Examining $f @@ -111,30 +171,13 @@ done esac -print Extracting files for more detailed inspection... +print Extracting all files for more detailed inspection... -file $f |sed 's/^.*://' |grep gzip >/dev/null -if [ $? -eq 0 ] ; then - TMPARCHIVE=/tmp/`basename $f` - if [[ -f $TMPARCHIVE ]] ; then - print ERROR: $TMPARCHIVE already exists - - fi - gzcat $f >$TMPARCHIVE || exit 1 - f=$TMPARCHIVE -fi +set_variables_for_individual_package_check "$f" -pkgname=`nawk 'NR == 2 {print $1; exit;}' $f` - -EXTRACTDIR=/tmp/dissect.$$ - -if [ -d $EXTRACTDIR ] ; then - print ERROR: $EXTRACTDIR already exists - exit 1 -fi - mkdir $EXTRACTDIR +# FIXME: This doesn't support multiple packages TMPFILE=$EXTRACTDIR/pkginfo @@ -304,7 +347,6 @@ print Extracing pkg for examination of files... pkgtrans $f $EXTRACTDIR $pkgname - ############################################################# # We now have the package expanded, in "directory" form, in # $EXTRACTDIR/$pkgname @@ -406,7 +448,7 @@ #cat $EXTRACTDIR/elflist| xargs ldd 2>/dev/null |fgrep '.so' | # sed 's:^.*=>[^/]*::' | nawk '{print $1}' |sort -u >$EXTRACTDIR/liblist - cat $EXTRACTDIR/elflist| xargs dump -Lv |nawk '$2=="NEEDED"{print $3}' | + cat $EXTRACTDIR/elflist| xargs /usr/ccs/bin/dump -Lv |nawk '$2=="NEEDED"{print $3}' | sort -u | egrep -v $EXTRACTDIR >$EXTRACTDIR/liblist @@ -443,13 +485,12 @@ exit 1 fi -# Verify that there are no double depends +# Verify that there are no multiple depends repeated_depends="$(awk '{print $2}' $EXTRACTDIR/$pkgname/install/depend \ | sort | uniq -c | awk '{print $1}' | sort | uniq | wc -l)" if [[ "$repeated_depends" -gt 1 ]]; then cat $EXTRACTDIR/$pkgname/install/depend - print ERROR: $pkgname has double depends - exit 1 + errmsg "$pkgname has multiple depends" fi #to retain a record of all packages currently being examined from $@ @@ -474,47 +515,6 @@ fi done -egrep -v 'SUNWbcp|SUNWowbcp|SUNWucb' /var/sadm/install/contents | - fgrep -f $EXTRACTDIR/liblist >$EXTRACTDIR/shortcatalog - - - -for lib in `cat $EXTRACTDIR/liblist` ; do - grep "[/=]$lib[ =]" $EXTRACTDIR/$pkgname/pkgmap - if [[ $? -eq 0 ]] ; then - echo $lib provided by package itself - continue - else - grep "[/=]$lib[ =]" $SETLIBS - if [[ $? -eq 0 ]]; then - echo "$lib provided by package set being evaluated." - continue - fi - fi - - libpkg=`grep /$lib $EXTRACTDIR/shortcatalog | - sed 's/^.* \([^ ]*\)$/\1/' |sort -u` - - if [[ -z "$libpkg" ]] ; then - echo "$lib $pkgname" >> $SETLIBS.missing - print Cannot find package providing $lib. Storing for delayed validation. - else - print $libpkg | fmt -1 >>$EXTRACTDIR/libpkgs - fi -done - -sort -u $EXTRACTDIR/libpkgs >$EXTRACTDIR/libpkgs.x -mv $EXTRACTDIR/libpkgs.x $EXTRACTDIR/libpkgs - -diff $EXTRACTDIR/deppkgs $EXTRACTDIR/libpkgs >/dev/null -if [[ $? -ne 0 ]] ; then - print SUGGESTION: you may want to add some or all of the following as depends: - print ' (Feel free to ignore SUNW or SPRO packages)' - diff $EXTRACTDIR/deppkgs $EXTRACTDIR/libpkgs | fgrep '>' -fi - - - if [[ "$basedir" != "" ]] ; then print if [[ -f $EXTRACTDIR/elflist ]] ; then @@ -530,13 +530,78 @@ fi fi +# Plugin section. +# +# Plugins should live in checkpkg.d subdirectory in the same directory in which +# checkpkg is. Each plugin file name should be an executable and begin with +# "checkpkg-". -cleanup +tmparchives="$tmparchives $TMPARCHIVE" +done -print "" +# All packages have been extracted. +# Now running all the plugin checks + +set_variables_for_individual_package_check "$f" + +echo "Running the experimental plugin infrastructure." +test_suite_ok=1 +checkpkg_scriptname=`basename $0` +checkpkg_basedir=${0%/${checkpkg_scriptname}} +plugindir=${checkpkg_basedir}/checkpkg.d +if [[ "${DEBUG}" != "" ]]; then + extra_options="--debug" +fi +debugmsg "plugindir: '$plugindir'" +log_files="" +if [[ -d "$plugindir" ]]; then + # echo plugin dir exists + for plugin in "${plugindir}"/checkpkg-*; do + if [[ -x "${plugin}" ]]; then + debugmsg "Executing: ${plugin} $extra_options -e \"${EXTRACTDIR}\" ${pkgnames}" + plugin_base_name=`basename ${plugin}` + plugin_log="${EXTRACTDIR}/${plugin_base_name}.log" + log_files="${log_files} ${plugin_log}" + printf "TEST: ${plugin} running..." + ${plugin} $extra_options -e "${EXTRACTDIR}" ${pkgnames} > "${plugin_log}" 2>&1 + if [[ "$?" -ne 0 ]]; then + printf "\rTEST: ${plugin} ${RED}[FAIL]${COLOR_RESET} \\n" + test_suite_ok=0 + else + printf "\rTEST: ${plugin} ${GREEN}[OK]${COLOR_RESET} \\n" + fi + else + debugmsg "'${plugin}' is not executable" + fi + done +else + debugmsg "plugin dir does not exist" +fi + +echo +for log_file in ${log_files}; do + if [[ -s "${log_file}" ]]; then + echo "LOG START: ${log_file}" + echo + cat "${log_file}" + echo + echo "LOG END: ${log_file}" + fi done +echo +if [[ ${test_suite_ok} -ne 1 ]]; then + errmsg "One or more tests have failed." +else + print "All tests were successful." +fi + +print "" + +# Cleaning up after all packages +cleanup + if [ -s $SETDEPS.missing ]; then print "Doing late evaluations of package dependencies." while read mdep; do @@ -551,19 +616,4 @@ done < $SETDEPS.missing fi -if [ -s $SETLIBS.missing ]; then - print "Doing late evaluations of package library dependencies." - while read ldep; do - lib=`echo $ldep | nawk '{print $1}'` - [ "$lib" = "libm.so.2" ] && continue - pkg=`echo $ldep | nawk '{print $2}'` - /usr/bin/grep "[/=]$lib[ =]" $SETLIBS >/dev/null - if [ $? -ne 0 ]; then - errmsg "Couldn't find a package providing $lib" - else - print "A package in the set being evaluated provides $lib" - fi - done < $SETLIBS.missing -fi - cleanupset Property changes on: csw/mgar/gar/v2/bin/checkpkg ___________________________________________________________________ Added: svn:keywords + Id Deleted: csw/mgar/gar/v2/bin/checkpkg.d/checkpkg-dummy.py =================================================================== --- csw/mgar/gar/v2-checkpkg/bin/checkpkg.d/checkpkg-dummy.py 2010-01-04 03:57:34 UTC (rev 7855) +++ csw/mgar/gar/v2/bin/checkpkg.d/checkpkg-dummy.py 2010-01-04 10:28:15 UTC (rev 7856) @@ -1,21 +0,0 @@ -#!/opt/csw/bin/python2.6 -# $Id$ - -import checkpkg -import os.path -import logging - -def main(): - options, args = checkpkg.GetOptions() - if not os.path.isdir(options.extractdir): - raise checkpkg.PackageError("The extract base directory doesn't exist: %s" % options.extractdir) - for pkgname in args: - pkgpath = os.path.join(options.extractdir, pkgname) - if not os.path.isdir(pkgpath): - raise checkpkg.PackageError("The package directory doesn't exist: %s" % pkgpath) - logging.debug("Dummy plugin says the package %s is extracted to %s", - pkgname, options.extractdir) - - -if __name__ == '__main__': - main() Copied: csw/mgar/gar/v2/bin/checkpkg.d/checkpkg-dummy.py (from rev 7855, csw/mgar/gar/v2-checkpkg/bin/checkpkg.d/checkpkg-dummy.py) =================================================================== --- csw/mgar/gar/v2/bin/checkpkg.d/checkpkg-dummy.py (rev 0) +++ csw/mgar/gar/v2/bin/checkpkg.d/checkpkg-dummy.py 2010-01-04 10:28:15 UTC (rev 7856) @@ -0,0 +1,21 @@ +#!/opt/csw/bin/python2.6 +# $Id$ + +import checkpkg +import os.path +import logging + +def main(): + options, args = checkpkg.GetOptions() + if not os.path.isdir(options.extractdir): + raise checkpkg.PackageError("The extract base directory doesn't exist: %s" % options.extractdir) + for pkgname in args: + pkgpath = os.path.join(options.extractdir, pkgname) + if not os.path.isdir(pkgpath): + raise checkpkg.PackageError("The package directory doesn't exist: %s" % pkgpath) + logging.debug("Dummy plugin says the package %s is extracted to %s", + pkgname, options.extractdir) + + +if __name__ == '__main__': + main() Deleted: csw/mgar/gar/v2/bin/checkpkg.d/checkpkg-libs.py =================================================================== --- csw/mgar/gar/v2-checkpkg/bin/checkpkg.d/checkpkg-libs.py 2010-01-04 03:57:34 UTC (rev 7855) +++ csw/mgar/gar/v2/bin/checkpkg.d/checkpkg-libs.py 2010-01-04 10:28:15 UTC (rev 7856) @@ -1,225 +0,0 @@ -#!/opt/csw/bin/python2.6 -# -# $Id$ -# -# A check for dependencies between shared libraries. -# -# This is currently more of a prototype than a mature program, but it has some -# unit tests and it appears to be working. The main problem is that it's not -# divided into smaller testable sections. - -import checkpkg -import os -import os.path -import copy -import re -import subprocess -import logging -import sys -import textwrap - -DUMP_BIN = "/usr/ccs/bin/dump" - -def GetIsalist(): - args = ["isalist"] - isalist_proc = subprocess.Popen(args, stdout=subprocess.PIPE) - stdout, stderr = isalist_proc.communicate() - ret = isalist_proc.wait() - if ret: - logging.error("Calling isalist has failed.") - isalist = re.split(r"\s+", stdout.strip()) - return isalist - - -def main(): - result_ok = True - errors = [] - options, args = checkpkg.GetOptions() - pkgnames = args - if options.debug: - logging.basicConfig(level=logging.DEBUG) - else: - logging.basicConfig(level=logging.INFO) - checkers = [] - for pkgname in pkgnames: - checker = checkpkg.CheckpkgBase(options.extractdir, pkgname) - checkers.append(checker) - binaries = [] - binaries_by_pkgname = {} - sonames_by_pkgname = {} - pkg_by_any_filename = {} - for checker in checkers: - pkg_binary_paths = checker.ListBinaries() - binaries_base = [os.path.split(x)[1] for x in pkg_binary_paths] - binaries_by_pkgname[checker.pkgname] = binaries_base - binaries.extend(pkg_binary_paths) - for filename in checker.GetAllFilenames(): - pkg_by_any_filename[filename] = checker.pkgname - # Making the binaries unique - binaries = set(binaries) - ws_re = re.compile(r"\s+") - - # man ld.so.1 for more info on this hack - env = copy.copy(os.environ) - env["LD_NOAUXFLTR"] = "1" - needed_sonames_by_binary = {} - filenames_by_soname = {} - # Assembling a data structure with the data about binaries. - # { - # : { checkpkg.NEEDED_SONAMES: [...], - # checkpkg.RUNPATH: [...]}, - # : ..., - # ... - # } - # - for binary in binaries: - binary_base_name = binary.split("/")[-1] - args = [DUMP_BIN, "-Lv", binary] - dump_proc = subprocess.Popen(args, stdout=subprocess.PIPE, env=env) - stdout, stderr = dump_proc.communicate() - ret = dump_proc.wait() - binary_data = checkpkg.ParseDumpOutput(stdout) - needed_sonames_by_binary[binary_base_name] = binary_data - if checkpkg.SONAME not in binary_data: - logging.info("The %s shared library doesn't provide a SONAME.", - binary_base_name) - # The shared library doesn't tell its SONAME. We're guessing it's the - # same as the base file name. - binary_data[checkpkg.SONAME] = binary_base_name - filenames_by_soname[binary_data[checkpkg.SONAME]] = binary_base_name - - isalist = GetIsalist() - - # Building indexes by soname to simplify further processing - # These are indexes "by soname". - (needed_sonames, - binaries_by_soname, - runpath_by_needed_soname) = checkpkg.BuildIndexesBySoname( - needed_sonames_by_binary) - - pkgmap = checkpkg.SystemPkgmap() - logging.debug("Determining the soname-package relationships.") - # lines by soname is an equivalent of $EXTRACTDIR/shortcatalog - lines_by_soname = checkpkg.GetLinesBySoname( - pkgmap, needed_sonames, runpath_by_needed_soname, isalist) - - # Creating a map from files to packages. - pkgs_by_filename = {} - for soname, line in lines_by_soname.iteritems(): - # TODO: Find all the packages, not just the last field. - fields = re.split(ws_re, line.strip()) - # For now, we'll assume that the last field is the package. - pkgname = fields[-1] - pkgs_by_filename[soname] = pkgname - - # A shared object dependency/provisioning report, plus checking. - # - # This section is somewhat overlapping with checkpkg.AnalyzeDependencies(), - # it has a different purpose: it reports the relationships between shared - # libraries, binaries using them and packages providing them. Ideally, the - # same bit of code with do checking and reporting. - # - # TODO: Rewrite this using cheetah templates - if needed_sonames: - print "Analysis of sonames needed by the package set:" - binaries_with_missing_sonames = set([]) - for soname in needed_sonames: - logging.debug("Analyzing: %s", soname) - if soname in filenames_by_soname: - print "%s is provided by the package itself" % soname - elif soname in lines_by_soname: - print ("%s is provided by %s and required by:" - % (soname, - repr(pkgs_by_filename[soname]))) - filename_lines = " ".join(sorted(binaries_by_soname[soname])) - for line in textwrap.wrap(filename_lines, 70): - print " ", line - else: - print ("%s is required by %s, but we don't know what provides it." - % (soname, binaries_by_soname[soname])) - for binary in binaries_by_soname[soname]: - binaries_with_missing_sonames.add(binary) - if soname in checkpkg.ALLOWED_ORPHAN_SONAMES: - print "However, it's a whitelisted soname." - else: - errors.append( - checkpkg.Error("%s is required by %s, but " - "we don't know what provides it." - % (soname, binaries_by_soname[soname]))) - if binaries_with_missing_sonames: - print "The following are binaries with missing sonames:" - binary_lines = " ".join(sorted(binaries_with_missing_sonames)) - for line in textwrap.wrap(binary_lines, 70): - print " ", line - print - - dependent_pkgs = {} - for checker in checkers: - pkgname = checker.pkgname - declared_dependencies = checker.GetDependencies() - if options.debug: - sanitized_pkgname = pkgname.replace("-", "_") - data_file_name = "/var/tmp/checkpkg_test_data_%s.py" % sanitized_pkgname - logging.warn("Saving test data to %s." % repr(data_file_name)) - test_fd = open(data_file_name, "w") - print >>test_fd, "# Testing data for %s" % pkgname - print >>test_fd, "# $Id$" - print >>test_fd, "DATA_PKGNAME =", repr(pkgname) - print >>test_fd, "DATA_DECLARED_DEPENDENCIES =", repr(declared_dependencies) - print >>test_fd, "DATA_BINARIES_BY_PKGNAME =", repr(binaries_by_pkgname) - print >>test_fd, "DATA_NEEDED_SONAMES_BY_BINARY =", repr(needed_sonames_by_binary) - print >>test_fd, "DATA_PKGS_BY_FILENAME =", repr(pkgs_by_filename) - print >>test_fd, "DATA_FILENAMES_BY_SONAME =", repr(filenames_by_soname) - print >>test_fd, "DATA_PKG_BY_ANY_FILENAME =", repr(pkg_by_any_filename) - print >>test_fd, "DATA_LINES_BY_SONAME =", repr(lines_by_soname) - print >>test_fd, "DATA_PKGMAP_CACHE =", repr(pkgmap.cache) - print >>test_fd, "DATA_BINARIES_BY_SONAME =", repr(binaries_by_soname) - print >>test_fd, "DATA_ISALIST =", repr(isalist) - test_fd.close() - - missing_deps, surplus_deps, orphan_sonames = checkpkg.AnalyzeDependencies( - pkgname, - declared_dependencies, - binaries_by_pkgname, - needed_sonames_by_binary, - pkgs_by_filename, - filenames_by_soname, - pkg_by_any_filename) - - # TODO: Rewrite this using cheetah templates. - print "%s:" % pkgname - msg_printed = False - if missing_deps: - print "SUGGESTION: you may want to add some or all of the following as depends:" - print " (Feel free to ignore SUNW or SPRO packages)" - for dep_pkgname in sorted(missing_deps): - print ">", dep_pkgname - msg_printed = True - if surplus_deps: - print "The following packages might be unnecessary dependencies:" - for dep_pkgname in surplus_deps: - print "? ", dep_pkgname - msg_printed = True - if orphan_sonames: - print "The following sonames don't belong to any package:" - for soname in sorted(orphan_sonames): - errors.append(checkpkg.Error("The following soname does't belong to " - "any package: %s" % soname)) - print "! ", soname - msg_printed = True - if not msg_printed: - print "+ Dependencies of %s look good." % pkgname - print - - if errors: - for error in errors: - logging.error(error) - sys.exit(1) - else: - sys.exit(0) - - -if __name__ == '__main__': - main() - -# vim:set sw=2 ts=2 sts=2 expandtab: Copied: csw/mgar/gar/v2/bin/checkpkg.d/checkpkg-libs.py (from rev 7855, csw/mgar/gar/v2-checkpkg/bin/checkpkg.d/checkpkg-libs.py) =================================================================== --- csw/mgar/gar/v2/bin/checkpkg.d/checkpkg-libs.py (rev 0) +++ csw/mgar/gar/v2/bin/checkpkg.d/checkpkg-libs.py 2010-01-04 10:28:15 UTC (rev 7856) @@ -0,0 +1,225 @@ +#!/opt/csw/bin/python2.6 +# +# $Id$ +# +# A check for dependencies between shared libraries. +# +# This is currently more of a prototype than a mature program, but it has some +# unit tests and it appears to be working. The main problem is that it's not +# divided into smaller testable sections. + +import checkpkg +import os +import os.path +import copy +import re +import subprocess +import logging +import sys +import textwrap + +DUMP_BIN = "/usr/ccs/bin/dump" + +def GetIsalist(): + args = ["isalist"] + isalist_proc = subprocess.Popen(args, stdout=subprocess.PIPE) + stdout, stderr = isalist_proc.communicate() + ret = isalist_proc.wait() + if ret: + logging.error("Calling isalist has failed.") + isalist = re.split(r"\s+", stdout.strip()) + return isalist + + +def main(): + result_ok = True + errors = [] + options, args = checkpkg.GetOptions() + pkgnames = args + if options.debug: + logging.basicConfig(level=logging.DEBUG) + else: + logging.basicConfig(level=logging.INFO) + checkers = [] + for pkgname in pkgnames: + checker = checkpkg.CheckpkgBase(options.extractdir, pkgname) + checkers.append(checker) + binaries = [] + binaries_by_pkgname = {} + sonames_by_pkgname = {} + pkg_by_any_filename = {} + for checker in checkers: + pkg_binary_paths = checker.ListBinaries() + binaries_base = [os.path.split(x)[1] for x in pkg_binary_paths] + binaries_by_pkgname[checker.pkgname] = binaries_base + binaries.extend(pkg_binary_paths) + for filename in checker.GetAllFilenames(): + pkg_by_any_filename[filename] = checker.pkgname + # Making the binaries unique + binaries = set(binaries) + ws_re = re.compile(r"\s+") + + # man ld.so.1 for more info on this hack + env = copy.copy(os.environ) + env["LD_NOAUXFLTR"] = "1" + needed_sonames_by_binary = {} + filenames_by_soname = {} + # Assembling a data structure with the data about binaries. + # { + # : { checkpkg.NEEDED_SONAMES: [...], + # checkpkg.RUNPATH: [...]}, + # : ..., + # ... + # } + # + for binary in binaries: + binary_base_name = binary.split("/")[-1] + args = [DUMP_BIN, "-Lv", binary] + dump_proc = subprocess.Popen(args, stdout=subprocess.PIPE, env=env) + stdout, stderr = dump_proc.communicate() + ret = dump_proc.wait() + binary_data = checkpkg.ParseDumpOutput(stdout) + needed_sonames_by_binary[binary_base_name] = binary_data + if checkpkg.SONAME not in binary_data: + logging.info("The %s shared library doesn't provide a SONAME.", + binary_base_name) + # The shared library doesn't tell its SONAME. We're guessing it's the + # same as the base file name. + binary_data[checkpkg.SONAME] = binary_base_name + filenames_by_soname[binary_data[checkpkg.SONAME]] = binary_base_name + + isalist = GetIsalist() + + # Building indexes by soname to simplify further processing + # These are indexes "by soname". + (needed_sonames, + binaries_by_soname, + runpath_by_needed_soname) = checkpkg.BuildIndexesBySoname( + needed_sonames_by_binary) + + pkgmap = checkpkg.SystemPkgmap() + logging.debug("Determining the soname-package relationships.") + # lines by soname is an equivalent of $EXTRACTDIR/shortcatalog + lines_by_soname = checkpkg.GetLinesBySoname( + pkgmap, needed_sonames, runpath_by_needed_soname, isalist) + + # Creating a map from files to packages. + pkgs_by_filename = {} + for soname, line in lines_by_soname.iteritems(): + # TODO: Find all the packages, not just the last field. + fields = re.split(ws_re, line.strip()) + # For now, we'll assume that the last field is the package. + pkgname = fields[-1] + pkgs_by_filename[soname] = pkgname + + # A shared object dependency/provisioning report, plus checking. + # + # This section is somewhat overlapping with checkpkg.AnalyzeDependencies(), + # it has a different purpose: it reports the relationships between shared + # libraries, binaries using them and packages providing them. Ideally, the + # same bit of code with do checking and reporting. + # + # TODO: Rewrite this using cheetah templates + if needed_sonames: + print "Analysis of sonames needed by the package set:" + binaries_with_missing_sonames = set([]) + for soname in needed_sonames: + logging.debug("Analyzing: %s", soname) + if soname in filenames_by_soname: + print "%s is provided by the package itself" % soname + elif soname in lines_by_soname: + print ("%s is provided by %s and required by:" + % (soname, + repr(pkgs_by_filename[soname]))) + filename_lines = " ".join(sorted(binaries_by_soname[soname])) + for line in textwrap.wrap(filename_lines, 70): + print " ", line + else: + print ("%s is required by %s, but we don't know what provides it." + % (soname, binaries_by_soname[soname])) + for binary in binaries_by_soname[soname]: + binaries_with_missing_sonames.add(binary) + if soname in checkpkg.ALLOWED_ORPHAN_SONAMES: + print "However, it's a whitelisted soname." + else: + errors.append( + checkpkg.Error("%s is required by %s, but " + "we don't know what provides it." + % (soname, binaries_by_soname[soname]))) + if binaries_with_missing_sonames: + print "The following are binaries with missing sonames:" + binary_lines = " ".join(sorted(binaries_with_missing_sonames)) + for line in textwrap.wrap(binary_lines, 70): + print " ", line + print + + dependent_pkgs = {} + for checker in checkers: + pkgname = checker.pkgname + declared_dependencies = checker.GetDependencies() + if options.debug: + sanitized_pkgname = pkgname.replace("-", "_") + data_file_name = "/var/tmp/checkpkg_test_data_%s.py" % sanitized_pkgname + logging.warn("Saving test data to %s." % repr(data_file_name)) + test_fd = open(data_file_name, "w") + print >>test_fd, "# Testing data for %s" % pkgname + print >>test_fd, "# $Id$" + print >>test_fd, "DATA_PKGNAME =", repr(pkgname) + print >>test_fd, "DATA_DECLARED_DEPENDENCIES =", repr(declared_dependencies) + print >>test_fd, "DATA_BINARIES_BY_PKGNAME =", repr(binaries_by_pkgname) + print >>test_fd, "DATA_NEEDED_SONAMES_BY_BINARY =", repr(needed_sonames_by_binary) + print >>test_fd, "DATA_PKGS_BY_FILENAME =", repr(pkgs_by_filename) + print >>test_fd, "DATA_FILENAMES_BY_SONAME =", repr(filenames_by_soname) + print >>test_fd, "DATA_PKG_BY_ANY_FILENAME =", repr(pkg_by_any_filename) + print >>test_fd, "DATA_LINES_BY_SONAME =", repr(lines_by_soname) + print >>test_fd, "DATA_PKGMAP_CACHE =", repr(pkgmap.cache) + print >>test_fd, "DATA_BINARIES_BY_SONAME =", repr(binaries_by_soname) + print >>test_fd, "DATA_ISALIST =", repr(isalist) + test_fd.close() + + missing_deps, surplus_deps, orphan_sonames = checkpkg.AnalyzeDependencies( + pkgname, + declared_dependencies, + binaries_by_pkgname, + needed_sonames_by_binary, + pkgs_by_filename, + filenames_by_soname, + pkg_by_any_filename) + + # TODO: Rewrite this using cheetah templates. + print "%s:" % pkgname + msg_printed = False + if missing_deps: + print "SUGGESTION: you may want to add some or all of the following as depends:" + print " (Feel free to ignore SUNW or SPRO packages)" + for dep_pkgname in sorted(missing_deps): + print ">", dep_pkgname + msg_printed = True + if surplus_deps: + print "The following packages might be unnecessary dependencies:" + for dep_pkgname in surplus_deps: + print "? ", dep_pkgname + msg_printed = True + if orphan_sonames: + print "The following sonames don't belong to any package:" + for soname in sorted(orphan_sonames): + errors.append(checkpkg.Error("The following soname does't belong to " + "any package: %s" % soname)) + print "! ", soname + msg_printed = True + if not msg_printed: + print "+ Dependencies of %s look good." % pkgname + print + + if errors: + for error in errors: + logging.error(error) + sys.exit(1) + else: + sys.exit(0) + + +if __name__ == '__main__': + main() + +# vim:set sw=2 ts=2 sts=2 expandtab: Deleted: csw/mgar/gar/v2/bin/checkpkg.d/checkpkg-obsolete-deps.py =================================================================== --- csw/mgar/gar/v2-checkpkg/bin/checkpkg.d/checkpkg-obsolete-deps.py 2010-01-04 03:57:34 UTC (rev 7855) +++ csw/mgar/gar/v2/bin/checkpkg.d/checkpkg-obsolete-deps.py 2010-01-04 10:28:15 UTC (rev 7856) @@ -1,43 +0,0 @@ -#!/opt/csw/bin/python2.6 -# $Id$ - -import checkpkg -import logging -import os.path -import sys - -OBSOLETE_DEPS = { - # "CSWfoo": { - # "hint": "Do this...", - # "url": "http://www.opencsw.org/bugtrack/view.php?id=..." - # }, - "CSWpython-rt": { - "hint": "CSWpython-rt is deprecated, use CSWpython instead.", - "url": "http://www.opencsw.org/bugtrack/view.php?id=4031" - }, -} - -def main(): - options, args = checkpkg.GetOptions() - ok = True - for pkgname in args: - pkgpath = os.path.join(options.extractdir, pkgname) - checker = checkpkg.CheckpkgBase(options.extractdir, pkgname) - deps = set(checker.GetDependencies()) - obsolete_pkg_deps = deps.intersection(set(OBSOLETE_DEPS)) - if obsolete_pkg_deps: - ok = False - for pkg in obsolete_pkg_deps: - print ("ERROR: Package %s should not depend on %s." - % (checker.pkgname, pkg)) - if "hint" in OBSOLETE_DEPS[pkg]: - print "Hint:", OBSOLETE_DEPS[pkg]["hint"] - if "url" in OBSOLETE_DEPS[pkg]: - print "URL:", OBSOLETE_DEPS[pkg]["url"] - if ok: - sys.exit(0) - else: - sys.exit(1) - -if __name__ == '__main__': - main() Copied: csw/mgar/gar/v2/bin/checkpkg.d/checkpkg-obsolete-deps.py (from rev 7855, csw/mgar/gar/v2-checkpkg/bin/checkpkg.d/checkpkg-obsolete-deps.py) =================================================================== --- csw/mgar/gar/v2/bin/checkpkg.d/checkpkg-obsolete-deps.py (rev 0) +++ csw/mgar/gar/v2/bin/checkpkg.d/checkpkg-obsolete-deps.py 2010-01-04 10:28:15 UTC (rev 7856) @@ -0,0 +1,43 @@ +#!/opt/csw/bin/python2.6 +# $Id$ + +import checkpkg +import logging +import os.path +import sys + +OBSOLETE_DEPS = { + # "CSWfoo": { + # "hint": "Do this...", + # "url": "http://www.opencsw.org/bugtrack/view.php?id=..." + # }, + "CSWpython-rt": { + "hint": "CSWpython-rt is deprecated, use CSWpython instead.", + "url": "http://www.opencsw.org/bugtrack/view.php?id=4031" + }, +} + +def main(): + options, args = checkpkg.GetOptions() + ok = True + for pkgname in args: + pkgpath = os.path.join(options.extractdir, pkgname) + checker = checkpkg.CheckpkgBase(options.extractdir, pkgname) + deps = set(checker.GetDependencies()) + obsolete_pkg_deps = deps.intersection(set(OBSOLETE_DEPS)) + if obsolete_pkg_deps: + ok = False + for pkg in obsolete_pkg_deps: + print ("ERROR: Package %s should not depend on %s." + % (checker.pkgname, pkg)) + if "hint" in OBSOLETE_DEPS[pkg]: + print "Hint:", OBSOLETE_DEPS[pkg]["hint"] + if "url" in OBSOLETE_DEPS[pkg]: + print "URL:", OBSOLETE_DEPS[pkg]["url"] + if ok: + sys.exit(0) + else: + sys.exit(1) + +if __name__ == '__main__': + main() Deleted: csw/mgar/gar/v2/bin/checkpkg.d/checkpkg.py =================================================================== --- csw/mgar/gar/v2-checkpkg/bin/checkpkg.d/checkpkg.py 2010-01-04 03:57:34 UTC (rev 7855) +++ csw/mgar/gar/v2/bin/checkpkg.d/checkpkg.py 2010-01-04 10:28:15 UTC (rev 7856) @@ -1,486 +0,0 @@ -# $Id$ -# -# This is the checkpkg library, common for all checkpkg tests written in -# Python. - -import itertools -import logging -import optparse -import os -import os.path -import re -import socket -import sqlite3 -import subprocess - -SYSTEM_PKGMAP = "/var/sadm/install/contents" -WS_RE = re.compile(r"\s+") -NEEDED_SONAMES = "needed sonames" -RUNPATH = "runpath" -SONAME = "soname" -CONFIG_MTIME = "mtime" -DO_NOT_REPORT_SURPLUS = set([u"CSWcommon", u"CSWcswclassutils", u"CSWisaexec"]) -DO_NOT_REPORT_MISSING = set([u"SUNWlibC", u"SUNWcsl", u"SUNWlibms", - u"*SUNWcslr", u"*SUNWlibC", u"*SUNWlibms"]) - -# This shared library is present on Solaris 10 on amd64, but it's missing on -# Solaris 8 on i386. It's okay if it's missing. -ALLOWED_ORPHAN_SONAMES = set([u"libm.so.2"]) - -class Error(Exception): - pass - - -class ConfigurationError(Error): - pass - - -class PackageError(Error): - pass - - -def GetOptions(): - parser = optparse.OptionParser() - parser.add_option("-e", dest="extractdir", - help="The directory into which the package has been extracted") - parser.add_option("-d", "--debug", dest="debug", - default=False, action="store_true", - help="Turn on debugging messages") - (options, args) = parser.parse_args() - if not options.extractdir: - raise ConfigurationError("ERROR: -e option is missing.") - # Using set() to make the arguments unique. - return options, set(args) - - -class CheckpkgBase(object): - """This class has functionality overlapping with DirectoryFormatPackage - from the opencsw.py library. The classes should be merged. - """ - - def __init__(self, extractdir, pkgname): - self.extractdir = extractdir - self.pkgname = pkgname - self.pkgpath = os.path.join(self.extractdir, self.pkgname) - - def CheckPkgpathExists(self): - if not os.path.isdir(self.pkgpath): - raise PackageError("%s does not exist or is not a directory" - % self.pkgpath) - - def ListBinaries(self): - """Shells out to list all the binaries from a given package. - - Original checkpkg code: - - # ######################################### - # # find all executables and dynamic libs,and list their filenames. - # listbinaries() { - # if [ ! -d $1 ] ; then - # print errmsg $1 not a directory - # rm -rf $EXTRACTDIR - # exit 1 - # fi - # - # find $1 -print | xargs file |grep ELF |nawk -F: '{print $1}' - # } - """ - self.CheckPkgpathExists() - find_tmpl = "find %s -print | xargs file | grep ELF | nawk -F: '{print $1}'" - find_proc = subprocess.Popen(find_tmpl % self.pkgpath, - shell=True, stdout=subprocess.PIPE) - stdout, stderr = find_proc.communicate() - ret = find_proc.wait() - if ret: - logging.error("The find command returned an error.") - return stdout.splitlines() - - def GetAllFilenames(self): - self.CheckPkgpathExists() - file_basenames = [] - for root, dirs, files in os.walk(self.pkgpath): - file_basenames.extend(files) - return file_basenames - - def GetDependencies(self): - fd = open(os.path.join(self.pkgpath, "install", "depend"), "r") - depends = {} - for line in fd: - fields = re.split(WS_RE, line) - if fields[0] == "P": - depends[fields[1]] = " ".join(fields[1:]) - fd.close() - return depends - - -class SystemPkgmap(object): - """A class to hold and manipulate the /var/sadm/install/contents file. - - TODO: Implement timestamp checking and refreshing the cache. - """ - - STOP_PKGS = ["SUNWbcp", "SUNWowbcp", "SUNWucb"] - CHECKPKG_DIR = ".checkpkg" - SQLITE3_DBNAME_TMPL = "var-sadm-install-contents-cache-%s" - - def __init__(self): - """There is no need to re-parse it each time. - - Read it slowly the first time and cache it for later.""" - self.cache = {} - self.checkpkg_dir = os.path.join(os.environ["HOME"], self.CHECKPKG_DIR) - self.fqdn = socket.getfqdn() - self.db_path = os.path.join(self.checkpkg_dir, - self.SQLITE3_DBNAME_TMPL % self.fqdn) - self.file_mtime = None - self.cache_mtime = None - if os.path.exists(self.db_path): - logging.debug("Connecting to the %s database.", self.db_path) - self.conn = sqlite3.connect(self.db_path) - if not self.IsDatabaseUpToDate(): - self.PurgeDatabase() - self.PopulateDatabase() - else: - print "Building a cache of /var/sadm/install/contents." - print "The cache will be kept in %s." % self.db_path - if not os.path.exists(self.checkpkg_dir): - logging.debug("Creating %s", self.checkpkg_dir) - os.mkdir(self.checkpkg_dir) - self.conn = sqlite3.connect(self.db_path) - c = self.conn.cursor() - c.execute(""" - CREATE TABLE systempkgmap ( - id INTEGER PRIMARY KEY, - basename TEXT, - path TEXT, - line TEXT - ); - """) - logging.debug("Creating the config table.") - c.execute(""" - CREATE TABLE config ( - key VARCHAR(255) PRIMARY KEY, - float_value FLOAT, - str_value VARCHAR(255) - ); - """) - self.PopulateDatabase() - - def PopulateDatabase(self): - """Imports data into the database. - - Original bit of code from checkpkg: - - egrep -v 'SUNWbcp|SUNWowbcp|SUNWucb' /var/sadm/install/contents | - fgrep -f $EXTRACTDIR/liblist >$EXTRACTDIR/shortcatalog - """ - - system_pkgmap_fd = open(SYSTEM_PKGMAP, "r") - stop_re = re.compile("(%s)" % "|".join(self.STOP_PKGS)) - # Creating a data structure: - # soname - {: , : , ...} - logging.debug("Building sqlite3 cache db of the %s file", - SYSTEM_PKGMAP) - c = self.conn.cursor() - count = itertools.count() - for line in system_pkgmap_fd: - i = count.next() - if not i % 1000: - print "\r%s" % i, - if stop_re.search(line): - continue - fields = re.split(WS_RE, line) - pkgmap_entry_path = fields[0].split("=")[0] - pkgmap_entry_dir, pkgmap_entry_base_name = os.path.split(pkgmap_entry_path) - sql = "INSERT INTO systempkgmap (basename, path, line) VALUES (?, ?, ?);" - c.execute(sql, (pkgmap_entry_base_name, pkgmap_entry_dir, line.strip())) - print - print "Creating the main database index." - sql = "CREATE INDEX basename_idx ON systempkgmap(basename);" - c.execute(sql) - self.SetDatabaseMtime() - self.conn.commit() - - def SetDatabaseMtime(self): - c = self.conn.cursor() - sql = "DELETE FROM config WHERE key = ?;" - c.execute(sql, [CONFIG_MTIME]) - mtime = self.GetFileMtime() - logging.debug("Inserting the mtime (%s) into the database.", mtime) - sql = """ - INSERT INTO config (key, float_value) - VALUES (?, ?); - """ - c.execute(sql, [CONFIG_MTIME, mtime]) - - def GetPkgmapLineByBasename(self, filename): - if filename in self.cache: - return self.cache[filename] - sql = "SELECT path, line FROM systempkgmap WHERE basename = ?;" - c = self.conn.cursor() - c.execute(sql, [filename]) - lines = {} - for row in c: - lines[row[0]] = row[1] - if len(lines) == 0: - logging.debug("Cache doesn't contain filename %s", filename) - self.cache[filename] = lines - return lines - - def GetDatabaseMtime(self): - if not self.cache_mtime: - sql = """ - SELECT float_value FROM config - WHERE key = ?; - """ - c = self.conn.cursor() - c.execute(sql, [CONFIG_MTIME]) - row = c.fetchone() - if not row: - # raise ConfigurationError("Could not find the mtime setting") - self.cache_mtime = 1 - else: - self.cache_mtime = row[0] - return self.cache_mtime - - def GetFileMtime(self): - if not self.file_mtime: - stat_data = os.stat(SYSTEM_PKGMAP) - self.file_mtime = stat_data.st_mtime - return self.file_mtime - - def IsDatabaseUpToDate(self): - f_mtime = self.GetFileMtime() - d_mtime = self.GetDatabaseMtime() - logging.debug("f_mtime", f_mtime, "d_time", d_mtime) - return self.GetFileMtime() <= self.GetDatabaseMtime() - - def PurgeDatabase(self): - c = self.conn.cursor() - sql = "DELETE FROM config;" - c.execute(sql) - sql = "DELETE FROM systempkgmap;" - c.execute(sql) - sql = "DROP INDEX basename_idx;" - try: - c.execute(sql) - except sqlite3.OperationalError, e: - logging.warn(e) - -def SharedObjectDependencies(pkgname, - binaries_by_pkgname, - needed_sonames_by_binary, - pkgs_by_soname, - filenames_by_soname, - pkg_by_any_filename): - """This is one of the more obscure and more important pieces of code. - - I tried to make it simpler, but given that the operations here involve - whole sets of packages, it's not easy. - """ - so_dependencies = set() - orphan_sonames = set() - self_provided = set() - for binary in binaries_by_pkgname[pkgname]: - needed_sonames = needed_sonames_by_binary[binary][NEEDED_SONAMES] - for soname in needed_sonames: - if soname in filenames_by_soname: - filename = filenames_by_soname[soname] - pkg = pkg_by_any_filename[filename] - self_provided.add(soname) - so_dependencies.add(pkg) - elif soname in pkgs_by_soname: - so_dependencies.add(pkgs_by_soname[soname]) - else: - orphan_sonames.add(soname) - return so_dependencies, self_provided, orphan_sonames - - -def GuessDepsByFilename(pkgname, pkg_by_any_filename): - """Guesses dependencies based on filename regexes.""" - guessed_deps = set() - patterns = ( - (r".*\.py", u"CSWpython"), - (r".*\.pl", u"CSWperl"), - (r".*\.rb", u"CSWruby"), - ) - for pattern, dep_pkgname in patterns: - # If any file name matches, add the dep, go to the next pattern/pkg - # combination. - pattern_re = re.compile("^%s$" % pattern) - for filename in pkg_by_any_filename: - if (re.match(pattern_re, filename) - and - pkgname == pkg_by_any_filename[filename]): - guessed_deps.add(dep_pkgname) - break - return guessed_deps - - -def GuessDepsByPkgname(pkgname, pkg_by_any_filename): - # More guessed dependencies: If one package is a substring of another, it - # might be a hint. For example, CSWmysql51test should depend on CSWmysql51. - # However, the rt (runtime) packages should not want to depend on the main - # package. - guessed_deps = set() - all_other_pkgs = set(pkg_by_any_filename.values()) - for other_pkg in all_other_pkgs: - other_pkg = unicode(other_pkg) - if pkgname == other_pkg: - continue - if pkgname.startswith(other_pkg): - endings = ["devel", "test", "bench", "dev"] - for ending in endings: - if pkgname.endswith(ending): - guessed_deps.add(other_pkg) - return guessed_deps - - -def AnalyzeDependencies(pkgname, - declared_dependencies, - binaries_by_pkgname, - needed_sonames_by_binary, - pkgs_by_soname, - filenames_by_soname, - pkg_by_any_filename): - """Gathers and merges dependency results from other functions. - - declared_dependencies: Dependencies that the package in question claims to - have. - - binaries_by_pkgname: A dictionary mapping pkgnames (CSWfoo) to binary names - (without paths) - - needed_sonames_by_binary: A dictionary mapping binary file name to - a dictionary containing: "needed sonames", - "soname", "rpath". Based on examining the binary - files within the packages. - - pkgs_by_soname: A dictionary mapping sonames to pkgnames, based on the - contents of the system wide pkgmap - (/var/sadm/install/contents) - - filenames_by_soname: A dictionary mapping shared library sonames to filenames, - based on files within packages - - pkg_by_any_filename: Mapping from file names to packages names, based on the - contents of the packages under examination. - """ - declared_dependencies_set = set(declared_dependencies) - - so_dependencies, self_provided, orphan_sonames = SharedObjectDependencies( - pkgname, - binaries_by_pkgname, - needed_sonames_by_binary, - pkgs_by_soname, - filenames_by_soname, - pkg_by_any_filename) - auto_dependencies = reduce(lambda x, y: x.union(y), - [ - so_dependencies, - GuessDepsByFilename(pkgname, pkg_by_any_filename), - GuessDepsByPkgname(pkgname, pkg_by_any_filename), - ]) - missing_deps = auto_dependencies.difference(declared_dependencies_set) - # Don't report itself as a suggested dependency. - missing_deps = missing_deps.difference(set([pkgname])) - missing_deps = missing_deps.difference(set(DO_NOT_REPORT_MISSING)) - surplus_deps = declared_dependencies_set.difference(auto_dependencies) - surplus_deps = surplus_deps.difference(DO_NOT_REPORT_SURPLUS) - orphan_sonames = orphan_sonames.difference(ALLOWED_ORPHAN_SONAMES) - return missing_deps, surplus_deps, orphan_sonames - - -def ExpandRunpath(runpath, isalist): - # Emulating $ISALIST expansion - if '$ISALIST' in runpath: - expanded_list = [runpath.replace('$ISALIST', isa) for isa in isalist] - else: - expanded_list = [runpath] - return expanded_list - -def Emulate64BitSymlinks(runpath_list): - """Need to emulate the 64 -> amd64, 64 -> sparcv9 symlink - - Since we don't know the architecture, we'll adding both amd64 and sparcv9. - It should be safe. - """ - symlinked_list = [] - for runpath in runpath_list: - if "/64" in runpath: - symlinked_list.append(runpath.replace("/64", "/amd64")) - symlinked_list.append(runpath.replace("/64", "/sparcv9")) - else: - symlinked_list.append(runpath) - return symlinked_list - - -def GetLinesBySoname(pkgmap, needed_sonames, runpath_by_needed_soname, isalist): - """Works out which system pkgmap lines correspond to given sonames.""" - lines_by_soname = {} - for soname in needed_sonames: - # This is the critical part of the algorithm: it iterates over the - # runpath and finds the first matching one. - runpath_found = False - for runpath in runpath_by_needed_soname[soname]: - runpath_list = ExpandRunpath(runpath, isalist) - runpath_list = Emulate64BitSymlinks(runpath_list) - soname_runpath_data = pkgmap.GetPkgmapLineByBasename(soname) - logging.debug("%s: will be looking for %s in %s" % - (soname, runpath_list, soname_runpath_data.keys())) - for runpath_expanded in runpath_list: - if runpath_expanded in soname_runpath_data: - lines_by_soname[soname] = soname_runpath_data[runpath_expanded] - runpath_found = True - # This break only goes out of the inner loop, - # need another one below to finish the outer loop. - break - if runpath_found: - break - return lines_by_soname - - -def BuildIndexesBySoname(needed_sonames_by_binary): - """Builds data structures indexed by soname. - - Building indexes - {"foo.so": ["/opt/csw/lib/gcc4", "/opt/csw/lib", ...], - ... - } - """ - needed_sonames = set() - binaries_by_soname = {} - runpath_by_needed_soname = {} - for binary_name, data in needed_sonames_by_binary.iteritems(): - for soname in data[NEEDED_SONAMES]: - needed_sonames.add(soname) - if soname not in runpath_by_needed_soname: - runpath_by_needed_soname[soname] = [] - runpath_by_needed_soname[soname].extend(data[RUNPATH]) - if soname not in binaries_by_soname: - binaries_by_soname[soname] = set() - binaries_by_soname[soname].add(binary_name) - return needed_sonames, binaries_by_soname, runpath_by_needed_soname - - -def ParseDumpOutput(dump_output): - binary_data = {RUNPATH: [], - NEEDED_SONAMES: []} - for line in dump_output.splitlines(): - fields = re.split(WS_RE, line) - # TODO: Make it a unit test - # logging.debug("%s says: %s", DUMP_BIN, fields) - if len(fields) < 3: - continue - if fields[1] == "NEEDED": - binary_data[NEEDED_SONAMES].append(fields[2]) - elif fields[1] == "RUNPATH": - binary_data[RUNPATH].extend(fields[2].split(":")) - elif fields[1] == "SONAME": - binary_data[SONAME] = fields[2] - # Adding the default runtime path search option. - binary_data[RUNPATH].append("/usr/lib/$ISALIST") - binary_data[RUNPATH].append("/usr/lib") - binary_data[RUNPATH].append("/lib/$ISALIST") - binary_data[RUNPATH].append("/lib") - return binary_data Copied: csw/mgar/gar/v2/bin/checkpkg.d/checkpkg.py (from rev 7855, csw/mgar/gar/v2-checkpkg/bin/checkpkg.d/checkpkg.py) =================================================================== --- csw/mgar/gar/v2/bin/checkpkg.d/checkpkg.py (rev 0) +++ csw/mgar/gar/v2/bin/checkpkg.d/checkpkg.py 2010-01-04 10:28:15 UTC (rev 7856) @@ -0,0 +1,486 @@ +# $Id$ +# +# This is the checkpkg library, common for all checkpkg tests written in +# Python. + +import itertools +import logging +import optparse +import os +import os.path +import re +import socket +import sqlite3 +import subprocess + +SYSTEM_PKGMAP = "/var/sadm/install/contents" +WS_RE = re.compile(r"\s+") +NEEDED_SONAMES = "needed sonames" +RUNPATH = "runpath" +SONAME = "soname" +CONFIG_MTIME = "mtime" +DO_NOT_REPORT_SURPLUS = set([u"CSWcommon", u"CSWcswclassutils", u"CSWisaexec"]) +DO_NOT_REPORT_MISSING = set([u"SUNWlibC", u"SUNWcsl", u"SUNWlibms", + u"*SUNWcslr", u"*SUNWlibC", u"*SUNWlibms"]) + +# This shared library is present on Solaris 10 on amd64, but it's missing on +# Solaris 8 on i386. It's okay if it's missing. +ALLOWED_ORPHAN_SONAMES = set([u"libm.so.2"]) + +class Error(Exception): + pass + + +class ConfigurationError(Error): + pass + + +class PackageError(Error): + pass + + +def GetOptions(): + parser = optparse.OptionParser() + parser.add_option("-e", dest="extractdir", + help="The directory into which the package has been extracted") + parser.add_option("-d", "--debug", dest="debug", + default=False, action="store_true", + help="Turn on debugging messages") + (options, args) = parser.parse_args() + if not options.extractdir: + raise ConfigurationError("ERROR: -e option is missing.") + # Using set() to make the arguments unique. + return options, set(args) + + +class CheckpkgBase(object): + """This class has functionality overlapping with DirectoryFormatPackage + from the opencsw.py library. The classes should be merged. + """ + + def __init__(self, extractdir, pkgname): + self.extractdir = extractdir + self.pkgname = pkgname + self.pkgpath = os.path.join(self.extractdir, self.pkgname) + + def CheckPkgpathExists(self): + if not os.path.isdir(self.pkgpath): + raise PackageError("%s does not exist or is not a directory" + % self.pkgpath) + + def ListBinaries(self): + """Shells out to list all the binaries from a given package. + + Original checkpkg code: + + # ######################################### + # # find all executables and dynamic libs,and list their filenames. + # listbinaries() { + # if [ ! -d $1 ] ; then + # print errmsg $1 not a directory + # rm -rf $EXTRACTDIR + # exit 1 + # fi + # + # find $1 -print | xargs file |grep ELF |nawk -F: '{print $1}' + # } + """ + self.CheckPkgpathExists() + find_tmpl = "find %s -print | xargs file | grep ELF | nawk -F: '{print $1}'" + find_proc = subprocess.Popen(find_tmpl % self.pkgpath, + shell=True, stdout=subprocess.PIPE) + stdout, stderr = find_proc.communicate() + ret = find_proc.wait() + if ret: + logging.error("The find command returned an error.") + return stdout.splitlines() + + def GetAllFilenames(self): + self.CheckPkgpathExists() + file_basenames = [] + for root, dirs, files in os.walk(self.pkgpath): + file_basenames.extend(files) + return file_basenames + + def GetDependencies(self): + fd = open(os.path.join(self.pkgpath, "install", "depend"), "r") + depends = {} + for line in fd: + fields = re.split(WS_RE, line) + if fields[0] == "P": + depends[fields[1]] = " ".join(fields[1:]) + fd.close() + return depends + + +class SystemPkgmap(object): + """A class to hold and manipulate the /var/sadm/install/contents file. + + TODO: Implement timestamp checking and refreshing the cache. + """ + + STOP_PKGS = ["SUNWbcp", "SUNWowbcp", "SUNWucb"] + CHECKPKG_DIR = ".checkpkg" + SQLITE3_DBNAME_TMPL = "var-sadm-install-contents-cache-%s" + + def __init__(self): + """There is no need to re-parse it each time. + + Read it slowly the first time and cache it for later.""" + self.cache = {} + self.checkpkg_dir = os.path.join(os.environ["HOME"], self.CHECKPKG_DIR) + self.fqdn = socket.getfqdn() + self.db_path = os.path.join(self.checkpkg_dir, + self.SQLITE3_DBNAME_TMPL % self.fqdn) + self.file_mtime = None + self.cache_mtime = None + if os.path.exists(self.db_path): + logging.debug("Connecting to the %s database.", self.db_path) + self.conn = sqlite3.connect(self.db_path) + if not self.IsDatabaseUpToDate(): + self.PurgeDatabase() + self.PopulateDatabase() + else: + print "Building a cache of /var/sadm/install/contents." + print "The cache will be kept in %s." % self.db_path + if not os.path.exists(self.checkpkg_dir): + logging.debug("Creating %s", self.checkpkg_dir) + os.mkdir(self.checkpkg_dir) + self.conn = sqlite3.connect(self.db_path) + c = self.conn.cursor() + c.execute(""" + CREATE TABLE systempkgmap ( + id INTEGER PRIMARY KEY, + basename TEXT, + path TEXT, + line TEXT + ); + """) + logging.debug("Creating the config table.") + c.execute(""" + CREATE TABLE config ( + key VARCHAR(255) PRIMARY KEY, + float_value FLOAT, + str_value VARCHAR(255) + ); + """) + self.PopulateDatabase() + + def PopulateDatabase(self): + """Imports data into the database. + + Original bit of code from checkpkg: + + egrep -v 'SUNWbcp|SUNWowbcp|SUNWucb' /var/sadm/install/contents | + fgrep -f $EXTRACTDIR/liblist >$EXTRACTDIR/shortcatalog + """ + + system_pkgmap_fd = open(SYSTEM_PKGMAP, "r") + stop_re = re.compile("(%s)" % "|".join(self.STOP_PKGS)) + # Creating a data structure: + # soname - {: , : , ...} + logging.debug("Building sqlite3 cache db of the %s file", + SYSTEM_PKGMAP) + c = self.conn.cursor() + count = itertools.count() + for line in system_pkgmap_fd: + i = count.next() + if not i % 1000: + print "\r%s" % i, + if stop_re.search(line): + continue + fields = re.split(WS_RE, line) + pkgmap_entry_path = fields[0].split("=")[0] + pkgmap_entry_dir, pkgmap_entry_base_name = os.path.split(pkgmap_entry_path) + sql = "INSERT INTO systempkgmap (basename, path, line) VALUES (?, ?, ?);" + c.execute(sql, (pkgmap_entry_base_name, pkgmap_entry_dir, line.strip())) + print + print "Creating the main database index." + sql = "CREATE INDEX basename_idx ON systempkgmap(basename);" + c.execute(sql) + self.SetDatabaseMtime() + self.conn.commit() + + def SetDatabaseMtime(self): + c = self.conn.cursor() + sql = "DELETE FROM config WHERE key = ?;" + c.execute(sql, [CONFIG_MTIME]) + mtime = self.GetFileMtime() + logging.debug("Inserting the mtime (%s) into the database.", mtime) + sql = """ + INSERT INTO config (key, float_value) + VALUES (?, ?); + """ + c.execute(sql, [CONFIG_MTIME, mtime]) + + def GetPkgmapLineByBasename(self, filename): + if filename in self.cache: + return self.cache[filename] + sql = "SELECT path, line FROM systempkgmap WHERE basename = ?;" + c = self.conn.cursor() + c.execute(sql, [filename]) + lines = {} + for row in c: + lines[row[0]] = row[1] + if len(lines) == 0: + logging.debug("Cache doesn't contain filename %s", filename) + self.cache[filename] = lines + return lines + + def GetDatabaseMtime(self): + if not self.cache_mtime: + sql = """ + SELECT float_value FROM config + WHERE key = ?; + """ + c = self.conn.cursor() + c.execute(sql, [CONFIG_MTIME]) + row = c.fetchone() + if not row: + # raise ConfigurationError("Could not find the mtime setting") + self.cache_mtime = 1 + else: + self.cache_mtime = row[0] + return self.cache_mtime + + def GetFileMtime(self): + if not self.file_mtime: + stat_data = os.stat(SYSTEM_PKGMAP) + self.file_mtime = stat_data.st_mtime + return self.file_mtime + + def IsDatabaseUpToDate(self): + f_mtime = self.GetFileMtime() + d_mtime = self.GetDatabaseMtime() + logging.debug("f_mtime", f_mtime, "d_time", d_mtime) + return self.GetFileMtime() <= self.GetDatabaseMtime() + + def PurgeDatabase(self): + c = self.conn.cursor() + sql = "DELETE FROM config;" + c.execute(sql) + sql = "DELETE FROM systempkgmap;" + c.execute(sql) + sql = "DROP INDEX basename_idx;" + try: + c.execute(sql) + except sqlite3.OperationalError, e: + logging.warn(e) + +def SharedObjectDependencies(pkgname, + binaries_by_pkgname, + needed_sonames_by_binary, + pkgs_by_soname, + filenames_by_soname, + pkg_by_any_filename): + """This is one of the more obscure and more important pieces of code. + + I tried to make it simpler, but given that the operations here involve + whole sets of packages, it's not easy. + """ + so_dependencies = set() + orphan_sonames = set() + self_provided = set() + for binary in binaries_by_pkgname[pkgname]: + needed_sonames = needed_sonames_by_binary[binary][NEEDED_SONAMES] + for soname in needed_sonames: + if soname in filenames_by_soname: + filename = filenames_by_soname[soname] + pkg = pkg_by_any_filename[filename] + self_provided.add(soname) + so_dependencies.add(pkg) + elif soname in pkgs_by_soname: + so_dependencies.add(pkgs_by_soname[soname]) + else: + orphan_sonames.add(soname) + return so_dependencies, self_provided, orphan_sonames + + +def GuessDepsByFilename(pkgname, pkg_by_any_filename): + """Guesses dependencies based on filename regexes.""" + guessed_deps = set() + patterns = ( + (r".*\.py", u"CSWpython"), + (r".*\.pl", u"CSWperl"), + (r".*\.rb", u"CSWruby"), + ) + for pattern, dep_pkgname in patterns: + # If any file name matches, add the dep, go to the next pattern/pkg + # combination. + pattern_re = re.compile("^%s$" % pattern) + for filename in pkg_by_any_filename: + if (re.match(pattern_re, filename) + and + pkgname == pkg_by_any_filename[filename]): + guessed_deps.add(dep_pkgname) + break + return guessed_deps + + +def GuessDepsByPkgname(pkgname, pkg_by_any_filename): + # More guessed dependencies: If one package is a substring of another, it + # might be a hint. For example, CSWmysql51test should depend on CSWmysql51. + # However, the rt (runtime) packages should not want to depend on the main + # package. + guessed_deps = set() + all_other_pkgs = set(pkg_by_any_filename.values()) + for other_pkg in all_other_pkgs: + other_pkg = unicode(other_pkg) + if pkgname == other_pkg: + continue + if pkgname.startswith(other_pkg): + endings = ["devel", "test", "bench", "dev"] + for ending in endings: + if pkgname.endswith(ending): + guessed_deps.add(other_pkg) + return guessed_deps + + +def AnalyzeDependencies(pkgname, + declared_dependencies, + binaries_by_pkgname, + needed_sonames_by_binary, + pkgs_by_soname, + filenames_by_soname, + pkg_by_any_filename): + """Gathers and merges dependency results from other functions. + + declared_dependencies: Dependencies that the package in question claims to + have. + + binaries_by_pkgname: A dictionary mapping pkgnames (CSWfoo) to binary names + (without paths) + + needed_sonames_by_binary: A dictionary mapping binary file name to + a dictionary containing: "needed sonames", + "soname", "rpath". Based on examining the binary + files within the packages. + + pkgs_by_soname: A dictionary mapping sonames to pkgnames, based on the + contents of the system wide pkgmap + (/var/sadm/install/contents) + + filenames_by_soname: A dictionary mapping shared library sonames to filenames, + based on files within packages + + pkg_by_any_filename: Mapping from file names to packages names, based on the + contents of the packages under examination. + """ + declared_dependencies_set = set(declared_dependencies) + + so_dependencies, self_provided, orphan_sonames = SharedObjectDependencies( + pkgname, + binaries_by_pkgname, + needed_sonames_by_binary, + pkgs_by_soname, + filenames_by_soname, + pkg_by_any_filename) + auto_dependencies = reduce(lambda x, y: x.union(y), + [ + so_dependencies, + GuessDepsByFilename(pkgname, pkg_by_any_filename), + GuessDepsByPkgname(pkgname, pkg_by_any_filename), + ]) + missing_deps = auto_dependencies.difference(declared_dependencies_set) + # Don't report itself as a suggested dependency. + missing_deps = missing_deps.difference(set([pkgname])) + missing_deps = missing_deps.difference(set(DO_NOT_REPORT_MISSING)) + surplus_deps = declared_dependencies_set.difference(auto_dependencies) + surplus_deps = surplus_deps.difference(DO_NOT_REPORT_SURPLUS) + orphan_sonames = orphan_sonames.difference(ALLOWED_ORPHAN_SONAMES) + return missing_deps, surplus_deps, orphan_sonames + + +def ExpandRunpath(runpath, isalist): + # Emulating $ISALIST expansion + if '$ISALIST' in runpath: + expanded_list = [runpath.replace('$ISALIST', isa) for isa in isalist] + else: + expanded_list = [runpath] + return expanded_list + +def Emulate64BitSymlinks(runpath_list): + """Need to emulate the 64 -> amd64, 64 -> sparcv9 symlink + + Since we don't know the architecture, we'll adding both amd64 and sparcv9. + It should be safe. + """ + symlinked_list = [] + for runpath in runpath_list: + if "/64" in runpath: + symlinked_list.append(runpath.replace("/64", "/amd64")) + symlinked_list.append(runpath.replace("/64", "/sparcv9")) + else: + symlinked_list.append(runpath) + return symlinked_list + + +def GetLinesBySoname(pkgmap, needed_sonames, runpath_by_needed_soname, isalist): + """Works out which system pkgmap lines correspond to given sonames.""" + lines_by_soname = {} + for soname in needed_sonames: + # This is the critical part of the algorithm: it iterates over the + # runpath and finds the first matching one. + runpath_found = False + for runpath in runpath_by_needed_soname[soname]: + runpath_list = ExpandRunpath(runpath, isalist) + runpath_list = Emulate64BitSymlinks(runpath_list) + soname_runpath_data = pkgmap.GetPkgmapLineByBasename(soname) + logging.debug("%s: will be looking for %s in %s" % + (soname, runpath_list, soname_runpath_data.keys())) + for runpath_expanded in runpath_list: + if runpath_expanded in soname_runpath_data: + lines_by_soname[soname] = soname_runpath_data[runpath_expanded] + runpath_found = True + # This break only goes out of the inner loop, + # need another one below to finish the outer loop. + break + if runpath_found: + break + return lines_by_soname + + +def BuildIndexesBySoname(needed_sonames_by_binary): + """Builds data structures indexed by soname. + + Building indexes + {"foo.so": ["/opt/csw/lib/gcc4", "/opt/csw/lib", ...], + ... + } + """ + needed_sonames = set() + binaries_by_soname = {} + runpath_by_needed_soname = {} + for binary_name, data in needed_sonames_by_binary.iteritems(): + for soname in data[NEEDED_SONAMES]: + needed_sonames.add(soname) + if soname not in runpath_by_needed_soname: + runpath_by_needed_soname[soname] = [] + runpath_by_needed_soname[soname].extend(data[RUNPATH]) + if soname not in binaries_by_soname: + binaries_by_soname[soname] = set() + binaries_by_soname[soname].add(binary_name) + return needed_sonames, binaries_by_soname, runpath_by_needed_soname + + +def ParseDumpOutput(dump_output): + binary_data = {RUNPATH: [], + NEEDED_SONAMES: []} + for line in dump_output.splitlines(): + fields = re.split(WS_RE, line) + # TODO: Make it a unit test + # logging.debug("%s says: %s", DUMP_BIN, fields) + if len(fields) < 3: + continue + if fields[1] == "NEEDED": + binary_data[NEEDED_SONAMES].append(fields[2]) + elif fields[1] == "RUNPATH": + binary_data[RUNPATH].extend(fields[2].split(":")) + elif fields[1] == "SONAME": + binary_data[SONAME] = fields[2] + # Adding the default runtime path search option. + binary_data[RUNPATH].append("/usr/lib/$ISALIST") + binary_data[RUNPATH].append("/usr/lib") + binary_data[RUNPATH].append("/lib/$ISALIST") + binary_data[RUNPATH].append("/lib") + return binary_data Deleted: csw/mgar/gar/v2/bin/checkpkg.d/checkpkg_test.py =================================================================== --- csw/mgar/gar/v2-checkpkg/bin/checkpkg.d/checkpkg_test.py 2010-01-04 03:57:34 UTC (rev 7855) +++ csw/mgar/gar/v2/bin/checkpkg.d/checkpkg_test.py 2010-01-04 10:28:15 UTC (rev 7856) @@ -1,438 +0,0 @@ -#!/opt/csw/bin/python2.6 -# $Id$ - -import unittest -import mox -import checkpkg -import testdata.checkpkg_test_data_CSWmysql51rt as d1 -import testdata.checkpkg_test_data_CSWmysql51client as d2 -import testdata.checkpkg_test_data_CSWmysql51 as d3 -import testdata.checkpkg_test_data_CSWmysql51devel as d4 -import testdata.checkpkg_test_data_CSWlibpq_84 as d5 -import testdata.checkpkg_test_data_CSWmysql5client_8x as d6 -import testdata.dump_output_1 as dump_1 -import testdata.dump_output_2 as dump_2 - -"""A set of unit tests for the library checking code. - -A bunch of lines to test in the interactive Python shell. - -import sys -sys.path.append("gar/bin/checkpkg.d") -import checkpkg -import testdata.checkpkg_test_data_CSWmysql5client_8x as d6 - -checkpkg.SharedObjectDependencies("CSWmysql5client", -d6.DATA_BINARIES_BY_PKGNAME, d6.DATA_NEEDED_SONAMES_BY_BINARY, -d6.DATA_PKGS_BY_FILENAME, d6.DATA_FILENAMES_BY_SONAME, -d6.DATA_PKG_BY_ANY_FILENAME) - -sqlite3 ~/.checkpkg/var-sadm-install-contents-cache-build8x -SELECT * FROM systempkgmap WHERE basename = 'libncursesw.so.5'; -""" - -class DependenciesUnitTest_1(unittest.TestCase): - - def setUp(self): - self.missing_deps, self.surplus_deps, self.orphan_sonames = checkpkg.AnalyzeDependencies( - d1.DATA_PKGNAME, - d1.DATA_DECLARED_DEPENDENCIES, - d1.DATA_BINARIES_BY_PKGNAME, - d1.DATA_NEEDED_SONAMES_BY_BINARY, - d1.DATA_PKGS_BY_FILENAME, - d1.DATA_FILENAMES_BY_SONAME, - d1.DATA_PKG_BY_ANY_FILENAME, - ) - - def testSurplusDeps(self): - self.assertEquals(set([]), self.surplus_deps) - - def testOrphanSonames(self): - self.assertEquals(set([]), self.orphan_sonames) - - def testMissingDeps(self): - expected = set([]) - self.assertEquals(expected, self.missing_deps) - - -class DependenciesUnitTest_2(unittest.TestCase): - - def setUp(self): - self.missing_deps, self.surplus_deps, self.orphan_sonames = checkpkg.AnalyzeDependencies( - d2.DATA_PKGNAME, - d2.DATA_DECLARED_DEPENDENCIES, - d2.DATA_BINARIES_BY_PKGNAME, - d2.DATA_NEEDED_SONAMES_BY_BINARY, - d2.DATA_PKGS_BY_FILENAME, - d2.DATA_FILENAMES_BY_SONAME, - d2.DATA_PKG_BY_ANY_FILENAME, - ) - - def testSurplusDeps(self): - self.assertEquals(set([]), self.surplus_deps) - - def testOrphanSonames(self): - self.assertEquals(set([]), self.orphan_sonames) - - def testMissingDeps(self): - expected = set([]) - self.assertEquals(expected, self.missing_deps) - - -class DependenciesUnitTest_3(unittest.TestCase): - - def setUp(self): - self.missing_deps, self.surplus_deps, self.orphan_sonames = checkpkg.AnalyzeDependencies( - d3.DATA_PKGNAME, - d3.DATA_DECLARED_DEPENDENCIES, - d3.DATA_BINARIES_BY_PKGNAME, - d3.DATA_NEEDED_SONAMES_BY_BINARY, - d3.DATA_PKGS_BY_FILENAME, - d3.DATA_FILENAMES_BY_SONAME, - d3.DATA_PKG_BY_ANY_FILENAME, - ) - - def testSurplusDeps(self): - self.assertEquals(set([u'CSWmysql51client']), self.surplus_deps) - - def testOrphanSonames(self): - self.assertEquals(set([]), self.orphan_sonames) - - def testMissingDeps(self): - expected = set(['CSWmysql51rt']) - self.assertEquals(expected, self.missing_deps) - - -class DependenciesUnitTest_4(unittest.TestCase): - - def setUp(self): - self.missing_deps, self.surplus_deps, self.orphan_sonames = checkpkg.AnalyzeDependencies( - d4.DATA_PKGNAME, - d4.DATA_DECLARED_DEPENDENCIES, - d4.DATA_BINARIES_BY_PKGNAME, - d4.DATA_NEEDED_SONAMES_BY_BINARY, - d4.DATA_PKGS_BY_FILENAME, - d4.DATA_FILENAMES_BY_SONAME, - d4.DATA_PKG_BY_ANY_FILENAME, - ) - - def testSurplusDeps(self): - self.assertEquals(set([]), self.surplus_deps) - - def testOrphanSonames(self): - self.assertEquals(set([]), self.orphan_sonames) - - def testMissingDeps(self): - expected = set([]) - self.assertEquals(expected, self.missing_deps) - - -class DependenciesUnitTest_5(unittest.TestCase): - - def setUp(self): - self.missing_deps, self.surplus_deps, self.orphan_sonames = checkpkg.AnalyzeDependencies( - d5.DATA_PKGNAME, - d5.DATA_DECLARED_DEPENDENCIES, - d5.DATA_BINARIES_BY_PKGNAME, - d5.DATA_NEEDED_SONAMES_BY_BINARY, - d5.DATA_PKGS_BY_FILENAME, - d5.DATA_FILENAMES_BY_SONAME, - d5.DATA_PKG_BY_ANY_FILENAME, - ) - - def testSurplusDeps(self): - self.assertEquals(set([]), self.surplus_deps) - - def testOrphanSonames(self): - self.assertEquals(set([]), self.orphan_sonames) - - def testMissingDeps(self): - # This tends to report itself... - expected = set([u'SUNWgss']) - self.assertEquals(expected, self.missing_deps) - - -class DependenciesUnitTest_6(unittest.TestCase): - - def setUp(self): - (self.missing_deps, - self.surplus_deps, - self.orphan_sonames) = checkpkg.AnalyzeDependencies( - d6.DATA_PKGNAME, - d6.DATA_DECLARED_DEPENDENCIES, - d6.DATA_BINARIES_BY_PKGNAME, - d6.DATA_NEEDED_SONAMES_BY_BINARY, - d6.DATA_PKGS_BY_FILENAME, - d6.DATA_FILENAMES_BY_SONAME, - d6.DATA_PKG_BY_ANY_FILENAME, - ) - - def testSurplusDeps(self): - self.assertEquals(set([]), self.surplus_deps) - - def testOrphanSonames(self): - self.assertEquals(set([]), self.orphan_sonames) - - def testMissingDeps(self): - expected = set([]) - self.assertEquals(expected, self.missing_deps) - - -class GuessDepsUnitTest(unittest.TestCase): - - def testGuessDepsByFilename1(self): - expected = set([u"CSWpython"]) - pkgname = u"CSWfoo" - pkg_by_filename = { - "/opt/csw/bin/bar": u"CSWfoo", - "/opt/csw/lib/python/site-packages/foo.py": u"CSWfoo", - } - self.assertEqual(expected, - checkpkg.GuessDepsByFilename(pkgname, pkg_by_filename)) - - def testGuessDepsByFilename2(self): - expected = set([]) - pkgname = u"CSWfoo" - pkg_by_filename = { - "/opt/csw/bin/bar": u"CSWfoo", - "/opt/csw/lib/python/site-packages/foo.py": u"CSWbar", - } - self.assertEqual(expected, - checkpkg.GuessDepsByFilename(pkgname, pkg_by_filename)) - - def testGuessDepsByPkgname1(self): - expected = set([u"CSWfoo"]) - pkgname = u"CSWfoo-devel" - pkg_by_filename = { - "/opt/csw/bin/bar": u"CSWfoo", - "/opt/csw/bin/barfoo": u"CSWfoobar", - "/opt/csw/lib/python/site-packages/foo.py": u"CSWfoo", - } - self.assertEqual(expected, - checkpkg.GuessDepsByPkgname(pkgname, pkg_by_filename)) - - def testGuessDepsByPkgname2(self): - expected = set([]) - pkgname = u"CSWzfoo-devel" - pkg_by_filename = { - "/opt/csw/bin/bar": u"CSWfoo", - "/opt/csw/bin/barfoo": u"CSWfoobar", - "/opt/csw/lib/python/site-packages/foo.py": u"CSWfoo", - } - self.assertEqual(expected, - checkpkg.GuessDepsByPkgname(pkgname, pkg_by_filename)) - - def testGuessDepsByPkgname3(self): - self.assertEqual(set([u"CSWmysql51"]), - checkpkg.GuessDepsByPkgname(u"CSWmysql51devel", - d4.DATA_PKG_BY_ANY_FILENAME)) - - def testGuessDepsByPkgname4(self): - data1 = set(['CSWmysql51', 'CSWmysql51rt', 'CSWmysql51test', - 'CSWmysql51client', 'CSWmysql51bench', 'CSWmysql51devel']) - data2 = dict(((x, x) for x in data1)) - self.assertEqual(set([u"CSWmysql51"]), checkpkg.GuessDepsByPkgname(u"CSWmysql51devel", data2)) - - def testGuessDepsByPkgname4(self): - data1 = set(['CSWmysql51', 'CSWmysql51rt', 'CSWmysql51test', - 'CSWmysql51client', 'CSWmysql51bench', 'CSWmysql51devel']) - data2 = dict(((x, x) for x in data1)) - self.assertEqual(set([]), checkpkg.GuessDepsByPkgname(u"CSWmysql51rt", data2)) - - -class GetLinesBySonameUnitTest(unittest.TestCase): - - class PkgmapStub(object): - - def __init__(self, cache): - self.cache = cache - - def GetPkgmapLineByBasename(self, soname): - return self.cache[soname] - - def setUp(self): - self.pkgmap_mocker = mox.Mox() - - def testExpandRunpath_1(self): - isalist = ["foo", "bar"] - runpath = "/opt/csw/lib/$ISALIST" - expected = ["/opt/csw/lib/foo", "/opt/csw/lib/bar"] - self.assertEquals(expected, checkpkg.ExpandRunpath(runpath, isalist)) - - def testExpandRunpath_2(self): - isalist = ["foo", "bar"] - runpath = "/opt/csw/mysql5/lib/$ISALIST/mysql" - expected = ["/opt/csw/mysql5/lib/foo/mysql", "/opt/csw/mysql5/lib/bar/mysql"] - self.assertEquals(expected, checkpkg.ExpandRunpath(runpath, isalist)) - - def testEmulate64BitSymlinks_1(self): - runpath_list = ["/opt/csw/mysql5/lib/foo/mysql/64"] - expected = "/opt/csw/mysql5/lib/foo/mysql/amd64" - self.assertTrue(expected in checkpkg.Emulate64BitSymlinks(runpath_list)) - - def testEmulate64BitSymlinks_2(self): - runpath_list = ["/opt/csw/mysql5/lib/64/mysql/foo"] - expected = "/opt/csw/mysql5/lib/amd64/mysql/foo" - result = checkpkg.Emulate64BitSymlinks(runpath_list) - self.assertTrue(expected in result, "%s not in %s" % (expected, result)) - - def testGetLinesBySoname(self): - expected = {'foo.so.1': '/opt/csw/lib/isa-value-1/foo.so.1 foo'} - pkgmap = self.pkgmap_mocker.CreateMock(checkpkg.SystemPkgmap) - pkgmap.GetPkgmapLineByBasename("foo") - lines1 = {"/opt/csw/lib/isa-value-1": "/opt/csw/lib/isa-value-1/foo.so.1 foo", - "/usr/lib": "/usr/lib/foo.so.1 foo"} - # pkgmap.GetPkgmapLineByBasename("foo.so.1").AndReturn(lines1) - pkgmap.GetPkgmapLineByBasename("foo.so.1").AndReturn(lines1) - self.pkgmap_mocker.ReplayAll() - pkgmap.GetPkgmapLineByBasename("foo") - needed_sonames = set(["foo.so.1"]) - runpath_by_needed_soname = {"foo.so.1": ["/opt/csw/lib/$ISALIST", "/usr/lib"]} - isalist = ["isa-value-1", "isa-value-2"] - result = checkpkg.GetLinesBySoname(pkgmap, needed_sonames, runpath_by_needed_soname, isalist) - self.pkgmap_mocker.VerifyAll() - self.assertEqual(expected, result) - - def testGetLinesBySoname_3(self): - expected = {'foo.so.1': '/opt/csw/lib/isa-value-1/foo.so.1 foo'} - pkgmap = self.pkgmap_mocker.CreateMock(checkpkg.SystemPkgmap) - pkgmap.GetPkgmapLineByBasename("foo") - lines1 = { - "/opt/csw/lib/isa-value-1": "/opt/csw/lib/isa-value-1/foo.so.1 foo", - "/opt/csw/lib": "/opt/csw/lib/foo.so.1 foo", - "/usr/lib": "/usr/lib/foo.so.1 foo"} - # pkgmap.GetPkgmapLineByBasename("foo.so.1").AndReturn(lines1) - pkgmap.GetPkgmapLineByBasename("foo.so.1").AndReturn(lines1) - self.pkgmap_mocker.ReplayAll() - pkgmap.GetPkgmapLineByBasename("foo") - needed_sonames = set(["foo.so.1"]) - runpath_by_needed_soname = { - "foo.so.1": ["/opt/csw/lib/$ISALIST", "/usr/lib"]} - isalist = ["isa-value-1", "isa-value-2"] - result = checkpkg.GetLinesBySoname( - pkgmap, needed_sonames, runpath_by_needed_soname, isalist) - self.pkgmap_mocker.VerifyAll() - self.assertEqual(expected, result) - - def testGetLinesBySoname_4(self): - """A more complex test, four ISAs.""" - expected = {'foo.so.1': '/opt/csw/lib/isa-value-1/foo.so.1 foo'} - pkgmap = self.pkgmap_mocker.CreateMock(checkpkg.SystemPkgmap) - pkgmap.GetPkgmapLineByBasename("foo") - lines1 = { - "/opt/csw/lib/isa-value-1": - "/opt/csw/lib/isa-value-1/foo.so.1 foo", - "/opt/csw/mysql5/lib/isa-value-2": - "/opt/csw/mysql5/lib/isa-value-2/foo.so.1 foo", - "/opt/csw/mysql5/lib/isa-value-1": - "/opt/csw/mysql5/lib/isa-value-1/foo.so.1 foo", - "/opt/csw/lib": - "/opt/csw/lib/foo.so.1 foo", - "/usr/lib": - "/usr/lib/foo.so.1 foo"} - pkgmap.GetPkgmapLineByBasename("foo.so.1").AndReturn(lines1) - pkgmap.GetPkgmapLineByBasename("foo.so.1").AndReturn(lines1) - self.pkgmap_mocker.ReplayAll() - pkgmap.GetPkgmapLineByBasename("foo") - needed_sonames = set(["foo.so.1"]) - runpath_by_needed_soname = { - "foo.so.1": ["/opt/csw/mysql5/lib/$ISALIST/mysql", - "/opt/csw/lib/$ISALIST", - "/usr/lib"]} - isalist = ["isa-value-1", "isa-value-2"] - result = checkpkg.GetLinesBySoname( - pkgmap, needed_sonames, runpath_by_needed_soname, isalist) - self.pkgmap_mocker.VerifyAll() - self.assertEqual(expected, result) - - def testGetLinesBySoname_5(self): - """Based on CSWmysql5client on build8x.""" - soname = u'libm.so.1' - expected = {u'libm.so.1': u'/usr/lib/libm.so.1 f none 0755 root bin ' - u'99844 3884 1050525375 SUNWlibms\n'} - - pkgmap_stub = self.PkgmapStub(d6.DATA_PKGMAP_CACHE) - (needed_sonames, - binaries_by_soname, - runpath_by_needed_soname) = checkpkg.BuildIndexesBySoname( - d6.DATA_NEEDED_SONAMES_BY_BINARY) - result = checkpkg.GetLinesBySoname( - pkgmap_stub, - set([soname]), - runpath_by_needed_soname, - d6.DATA_ISALIST) - self.assertEqual(expected, result) - - def testGetLinesBySoname_6(self): - """Based on CSWmysql5client on build8x.""" - soname = u'libz.so.1' - expected = {u'libz.so.1': u'/opt/csw/lib/pentium_pro+mmx/libz.so.1=libz.so.1.2.3 ' - u's none CSWzlib\n'} - pkgmap_stub = self.PkgmapStub(d6.DATA_PKGMAP_CACHE) - (needed_sonames, - binaries_by_soname, - runpath_by_needed_soname) = checkpkg.BuildIndexesBySoname( - d6.DATA_NEEDED_SONAMES_BY_BINARY) - result = checkpkg.GetLinesBySoname( - pkgmap_stub, - set([soname]), - runpath_by_needed_soname, - d6.DATA_ISALIST) - self.assertEqual(expected, result) - - def testGetLinesBySoname_7(self): - """A test for 64-bit symlink expansion.""" - soname = u'libncursesw.so.5' - # To test the 64-bit symlink expansion - expected = { - u'libncursesw.so.5': - u'/opt/csw/lib/amd64/libncursesw.so.5=libncursesw.so.5.7 ' - u's none CSWncurses\n'} - pkgmap_stub = self.PkgmapStub(d6.DATA_PKGMAP_CACHE) - (needed_sonames, - binaries_by_soname, - runpath_by_needed_soname) = checkpkg.BuildIndexesBySoname( - d6.DATA_NEEDED_SONAMES_BY_BINARY) - result = checkpkg.GetLinesBySoname( - pkgmap_stub, - set([soname]), - runpath_by_needed_soname, - d6.DATA_ISALIST) - self.assertEqual(expected, result) - - -class ParseDumpOutputUnitTest(unittest.TestCase): - - def test_1(self): - expected = { - 'soname': 'libmysqlclient.so.15', - 'runpath': ['/opt/csw/lib/$ISALIST', - '/opt/csw/lib', - '/opt/csw/mysql5/lib/$ISALIST', - '/opt/csw/mysql5/lib', - '/opt/csw/mysql5/lib/$ISALIST/mysql', - # These four are artificially appended - '/usr/lib/$ISALIST', - '/usr/lib', - '/lib/$ISALIST', - '/lib'], - 'needed sonames': ['librt.so.1', - 'libresolv.so.2', - 'libc.so.1', - 'libgen.so.1', - 'libsocket.so.1', - 'libnsl.so.1', - 'libm.so.1', - 'libz.so.1']} - self.assertEqual(expected, - checkpkg.ParseDumpOutput(dump_1.DATA_DUMP_OUTPUT)) - - def test_2(self): - expected_runpath = ['/usr/lib/$ISALIST', '/usr/lib', '/lib/$ISALIST', '/lib'] - self.assertEqual( - expected_runpath, - checkpkg.ParseDumpOutput(dump_2.DATA_DUMP_OUTPUT)["runpath"]) - - -if __name__ == '__main__': - unittest.main() Copied: csw/mgar/gar/v2/bin/checkpkg.d/checkpkg_test.py (from rev 7855, csw/mgar/gar/v2-checkpkg/bin/checkpkg.d/checkpkg_test.py) =================================================================== --- csw/mgar/gar/v2/bin/checkpkg.d/checkpkg_test.py (rev 0) +++ csw/mgar/gar/v2/bin/checkpkg.d/checkpkg_test.py 2010-01-04 10:28:15 UTC (rev 7856) @@ -0,0 +1,438 @@ +#!/opt/csw/bin/python2.6 +# $Id$ + +import unittest +import mox +import checkpkg +import testdata.checkpkg_test_data_CSWmysql51rt as d1 +import testdata.checkpkg_test_data_CSWmysql51client as d2 +import testdata.checkpkg_test_data_CSWmysql51 as d3 +import testdata.checkpkg_test_data_CSWmysql51devel as d4 +import testdata.checkpkg_test_data_CSWlibpq_84 as d5 +import testdata.checkpkg_test_data_CSWmysql5client_8x as d6 +import testdata.dump_output_1 as dump_1 +import testdata.dump_output_2 as dump_2 + +"""A set of unit tests for the library checking code. + +A bunch of lines to test in the interactive Python shell. + +import sys +sys.path.append("gar/bin/checkpkg.d") +import checkpkg +import testdata.checkpkg_test_data_CSWmysql5client_8x as d6 + +checkpkg.SharedObjectDependencies("CSWmysql5client", +d6.DATA_BINARIES_BY_PKGNAME, d6.DATA_NEEDED_SONAMES_BY_BINARY, +d6.DATA_PKGS_BY_FILENAME, d6.DATA_FILENAMES_BY_SONAME, +d6.DATA_PKG_BY_ANY_FILENAME) + +sqlite3 ~/.checkpkg/var-sadm-install-contents-cache-build8x +SELECT * FROM systempkgmap WHERE basename = 'libncursesw.so.5'; +""" + +class DependenciesUnitTest_1(unittest.TestCase): + + def setUp(self): + self.missing_deps, self.surplus_deps, self.orphan_sonames = checkpkg.AnalyzeDependencies( + d1.DATA_PKGNAME, + d1.DATA_DECLARED_DEPENDENCIES, + d1.DATA_BINARIES_BY_PKGNAME, + d1.DATA_NEEDED_SONAMES_BY_BINARY, + d1.DATA_PKGS_BY_FILENAME, + d1.DATA_FILENAMES_BY_SONAME, + d1.DATA_PKG_BY_ANY_FILENAME, + ) + + def testSurplusDeps(self): + self.assertEquals(set([]), self.surplus_deps) + + def testOrphanSonames(self): + self.assertEquals(set([]), self.orphan_sonames) + + def testMissingDeps(self): + expected = set([]) + self.assertEquals(expected, self.missing_deps) + + +class DependenciesUnitTest_2(unittest.TestCase): + + def setUp(self): + self.missing_deps, self.surplus_deps, self.orphan_sonames = checkpkg.AnalyzeDependencies( + d2.DATA_PKGNAME, + d2.DATA_DECLARED_DEPENDENCIES, + d2.DATA_BINARIES_BY_PKGNAME, + d2.DATA_NEEDED_SONAMES_BY_BINARY, + d2.DATA_PKGS_BY_FILENAME, + d2.DATA_FILENAMES_BY_SONAME, + d2.DATA_PKG_BY_ANY_FILENAME, + ) + + def testSurplusDeps(self): + self.assertEquals(set([]), self.surplus_deps) + + def testOrphanSonames(self): + self.assertEquals(set([]), self.orphan_sonames) + + def testMissingDeps(self): + expected = set([]) + self.assertEquals(expected, self.missing_deps) + + +class DependenciesUnitTest_3(unittest.TestCase): + + def setUp(self): + self.missing_deps, self.surplus_deps, self.orphan_sonames = checkpkg.AnalyzeDependencies( + d3.DATA_PKGNAME, + d3.DATA_DECLARED_DEPENDENCIES, + d3.DATA_BINARIES_BY_PKGNAME, + d3.DATA_NEEDED_SONAMES_BY_BINARY, + d3.DATA_PKGS_BY_FILENAME, + d3.DATA_FILENAMES_BY_SONAME, + d3.DATA_PKG_BY_ANY_FILENAME, + ) + + def testSurplusDeps(self): + self.assertEquals(set([u'CSWmysql51client']), self.surplus_deps) + + def testOrphanSonames(self): + self.assertEquals(set([]), self.orphan_sonames) + + def testMissingDeps(self): + expected = set(['CSWmysql51rt']) + self.assertEquals(expected, self.missing_deps) + + +class DependenciesUnitTest_4(unittest.TestCase): + + def setUp(self): + self.missing_deps, self.surplus_deps, self.orphan_sonames = checkpkg.AnalyzeDependencies( + d4.DATA_PKGNAME, + d4.DATA_DECLARED_DEPENDENCIES, + d4.DATA_BINARIES_BY_PKGNAME, + d4.DATA_NEEDED_SONAMES_BY_BINARY, + d4.DATA_PKGS_BY_FILENAME, + d4.DATA_FILENAMES_BY_SONAME, + d4.DATA_PKG_BY_ANY_FILENAME, + ) + + def testSurplusDeps(self): + self.assertEquals(set([]), self.surplus_deps) + + def testOrphanSonames(self): + self.assertEquals(set([]), self.orphan_sonames) + + def testMissingDeps(self): + expected = set([]) + self.assertEquals(expected, self.missing_deps) + + +class DependenciesUnitTest_5(unittest.TestCase): + + def setUp(self): + self.missing_deps, self.surplus_deps, self.orphan_sonames = checkpkg.AnalyzeDependencies( + d5.DATA_PKGNAME, + d5.DATA_DECLARED_DEPENDENCIES, + d5.DATA_BINARIES_BY_PKGNAME, + d5.DATA_NEEDED_SONAMES_BY_BINARY, + d5.DATA_PKGS_BY_FILENAME, + d5.DATA_FILENAMES_BY_SONAME, + d5.DATA_PKG_BY_ANY_FILENAME, + ) + + def testSurplusDeps(self): + self.assertEquals(set([]), self.surplus_deps) + + def testOrphanSonames(self): + self.assertEquals(set([]), self.orphan_sonames) + + def testMissingDeps(self): + # This tends to report itself... + expected = set([u'SUNWgss']) + self.assertEquals(expected, self.missing_deps) + + +class DependenciesUnitTest_6(unittest.TestCase): + + def setUp(self): + (self.missing_deps, + self.surplus_deps, + self.orphan_sonames) = checkpkg.AnalyzeDependencies( + d6.DATA_PKGNAME, + d6.DATA_DECLARED_DEPENDENCIES, + d6.DATA_BINARIES_BY_PKGNAME, + d6.DATA_NEEDED_SONAMES_BY_BINARY, + d6.DATA_PKGS_BY_FILENAME, + d6.DATA_FILENAMES_BY_SONAME, + d6.DATA_PKG_BY_ANY_FILENAME, + ) + + def testSurplusDeps(self): + self.assertEquals(set([]), self.surplus_deps) + + def testOrphanSonames(self): + self.assertEquals(set([]), self.orphan_sonames) + + def testMissingDeps(self): + expected = set([]) + self.assertEquals(expected, self.missing_deps) + + +class GuessDepsUnitTest(unittest.TestCase): + + def testGuessDepsByFilename1(self): + expected = set([u"CSWpython"]) + pkgname = u"CSWfoo" + pkg_by_filename = { + "/opt/csw/bin/bar": u"CSWfoo", + "/opt/csw/lib/python/site-packages/foo.py": u"CSWfoo", + } + self.assertEqual(expected, + checkpkg.GuessDepsByFilename(pkgname, pkg_by_filename)) + + def testGuessDepsByFilename2(self): + expected = set([]) + pkgname = u"CSWfoo" + pkg_by_filename = { + "/opt/csw/bin/bar": u"CSWfoo", + "/opt/csw/lib/python/site-packages/foo.py": u"CSWbar", + } + self.assertEqual(expected, + checkpkg.GuessDepsByFilename(pkgname, pkg_by_filename)) + + def testGuessDepsByPkgname1(self): + expected = set([u"CSWfoo"]) + pkgname = u"CSWfoo-devel" + pkg_by_filename = { + "/opt/csw/bin/bar": u"CSWfoo", + "/opt/csw/bin/barfoo": u"CSWfoobar", + "/opt/csw/lib/python/site-packages/foo.py": u"CSWfoo", + } + self.assertEqual(expected, + checkpkg.GuessDepsByPkgname(pkgname, pkg_by_filename)) + + def testGuessDepsByPkgname2(self): + expected = set([]) + pkgname = u"CSWzfoo-devel" + pkg_by_filename = { + "/opt/csw/bin/bar": u"CSWfoo", + "/opt/csw/bin/barfoo": u"CSWfoobar", + "/opt/csw/lib/python/site-packages/foo.py": u"CSWfoo", + } + self.assertEqual(expected, + checkpkg.GuessDepsByPkgname(pkgname, pkg_by_filename)) + + def testGuessDepsByPkgname3(self): + self.assertEqual(set([u"CSWmysql51"]), + checkpkg.GuessDepsByPkgname(u"CSWmysql51devel", + d4.DATA_PKG_BY_ANY_FILENAME)) + + def testGuessDepsByPkgname4(self): + data1 = set(['CSWmysql51', 'CSWmysql51rt', 'CSWmysql51test', + 'CSWmysql51client', 'CSWmysql51bench', 'CSWmysql51devel']) + data2 = dict(((x, x) for x in data1)) + self.assertEqual(set([u"CSWmysql51"]), checkpkg.GuessDepsByPkgname(u"CSWmysql51devel", data2)) + + def testGuessDepsByPkgname4(self): + data1 = set(['CSWmysql51', 'CSWmysql51rt', 'CSWmysql51test', + 'CSWmysql51client', 'CSWmysql51bench', 'CSWmysql51devel']) + data2 = dict(((x, x) for x in data1)) + self.assertEqual(set([]), checkpkg.GuessDepsByPkgname(u"CSWmysql51rt", data2)) + + +class GetLinesBySonameUnitTest(unittest.TestCase): + + class PkgmapStub(object): + + def __init__(self, cache): + self.cache = cache + + def GetPkgmapLineByBasename(self, soname): + return self.cache[soname] + + def setUp(self): + self.pkgmap_mocker = mox.Mox() + + def testExpandRunpath_1(self): + isalist = ["foo", "bar"] + runpath = "/opt/csw/lib/$ISALIST" + expected = ["/opt/csw/lib/foo", "/opt/csw/lib/bar"] + self.assertEquals(expected, checkpkg.ExpandRunpath(runpath, isalist)) + + def testExpandRunpath_2(self): + isalist = ["foo", "bar"] + runpath = "/opt/csw/mysql5/lib/$ISALIST/mysql" + expected = ["/opt/csw/mysql5/lib/foo/mysql", "/opt/csw/mysql5/lib/bar/mysql"] + self.assertEquals(expected, checkpkg.ExpandRunpath(runpath, isalist)) + + def testEmulate64BitSymlinks_1(self): + runpath_list = ["/opt/csw/mysql5/lib/foo/mysql/64"] + expected = "/opt/csw/mysql5/lib/foo/mysql/amd64" + self.assertTrue(expected in checkpkg.Emulate64BitSymlinks(runpath_list)) + + def testEmulate64BitSymlinks_2(self): + runpath_list = ["/opt/csw/mysql5/lib/64/mysql/foo"] + expected = "/opt/csw/mysql5/lib/amd64/mysql/foo" + result = checkpkg.Emulate64BitSymlinks(runpath_list) + self.assertTrue(expected in result, "%s not in %s" % (expected, result)) + + def testGetLinesBySoname(self): + expected = {'foo.so.1': '/opt/csw/lib/isa-value-1/foo.so.1 foo'} + pkgmap = self.pkgmap_mocker.CreateMock(checkpkg.SystemPkgmap) + pkgmap.GetPkgmapLineByBasename("foo") + lines1 = {"/opt/csw/lib/isa-value-1": "/opt/csw/lib/isa-value-1/foo.so.1 foo", + "/usr/lib": "/usr/lib/foo.so.1 foo"} + # pkgmap.GetPkgmapLineByBasename("foo.so.1").AndReturn(lines1) + pkgmap.GetPkgmapLineByBasename("foo.so.1").AndReturn(lines1) + self.pkgmap_mocker.ReplayAll() + pkgmap.GetPkgmapLineByBasename("foo") + needed_sonames = set(["foo.so.1"]) + runpath_by_needed_soname = {"foo.so.1": ["/opt/csw/lib/$ISALIST", "/usr/lib"]} + isalist = ["isa-value-1", "isa-value-2"] + result = checkpkg.GetLinesBySoname(pkgmap, needed_sonames, runpath_by_needed_soname, isalist) + self.pkgmap_mocker.VerifyAll() + self.assertEqual(expected, result) + + def testGetLinesBySoname_3(self): + expected = {'foo.so.1': '/opt/csw/lib/isa-value-1/foo.so.1 foo'} + pkgmap = self.pkgmap_mocker.CreateMock(checkpkg.SystemPkgmap) + pkgmap.GetPkgmapLineByBasename("foo") + lines1 = { + "/opt/csw/lib/isa-value-1": "/opt/csw/lib/isa-value-1/foo.so.1 foo", + "/opt/csw/lib": "/opt/csw/lib/foo.so.1 foo", + "/usr/lib": "/usr/lib/foo.so.1 foo"} + # pkgmap.GetPkgmapLineByBasename("foo.so.1").AndReturn(lines1) + pkgmap.GetPkgmapLineByBasename("foo.so.1").AndReturn(lines1) + self.pkgmap_mocker.ReplayAll() + pkgmap.GetPkgmapLineByBasename("foo") + needed_sonames = set(["foo.so.1"]) + runpath_by_needed_soname = { + "foo.so.1": ["/opt/csw/lib/$ISALIST", "/usr/lib"]} + isalist = ["isa-value-1", "isa-value-2"] + result = checkpkg.GetLinesBySoname( + pkgmap, needed_sonames, runpath_by_needed_soname, isalist) + self.pkgmap_mocker.VerifyAll() + self.assertEqual(expected, result) + + def testGetLinesBySoname_4(self): + """A more complex test, four ISAs.""" + expected = {'foo.so.1': '/opt/csw/lib/isa-value-1/foo.so.1 foo'} + pkgmap = self.pkgmap_mocker.CreateMock(checkpkg.SystemPkgmap) + pkgmap.GetPkgmapLineByBasename("foo") + lines1 = { + "/opt/csw/lib/isa-value-1": + "/opt/csw/lib/isa-value-1/foo.so.1 foo", + "/opt/csw/mysql5/lib/isa-value-2": + "/opt/csw/mysql5/lib/isa-value-2/foo.so.1 foo", + "/opt/csw/mysql5/lib/isa-value-1": + "/opt/csw/mysql5/lib/isa-value-1/foo.so.1 foo", + "/opt/csw/lib": + "/opt/csw/lib/foo.so.1 foo", + "/usr/lib": + "/usr/lib/foo.so.1 foo"} + pkgmap.GetPkgmapLineByBasename("foo.so.1").AndReturn(lines1) + pkgmap.GetPkgmapLineByBasename("foo.so.1").AndReturn(lines1) + self.pkgmap_mocker.ReplayAll() + pkgmap.GetPkgmapLineByBasename("foo") + needed_sonames = set(["foo.so.1"]) + runpath_by_needed_soname = { + "foo.so.1": ["/opt/csw/mysql5/lib/$ISALIST/mysql", + "/opt/csw/lib/$ISALIST", + "/usr/lib"]} + isalist = ["isa-value-1", "isa-value-2"] + result = checkpkg.GetLinesBySoname( + pkgmap, needed_sonames, runpath_by_needed_soname, isalist) + self.pkgmap_mocker.VerifyAll() + self.assertEqual(expected, result) + + def testGetLinesBySoname_5(self): + """Based on CSWmysql5client on build8x.""" + soname = u'libm.so.1' + expected = {u'libm.so.1': u'/usr/lib/libm.so.1 f none 0755 root bin ' + u'99844 3884 1050525375 SUNWlibms\n'} + + pkgmap_stub = self.PkgmapStub(d6.DATA_PKGMAP_CACHE) + (needed_sonames, + binaries_by_soname, + runpath_by_needed_soname) = checkpkg.BuildIndexesBySoname( + d6.DATA_NEEDED_SONAMES_BY_BINARY) + result = checkpkg.GetLinesBySoname( + pkgmap_stub, + set([soname]), + runpath_by_needed_soname, + d6.DATA_ISALIST) + self.assertEqual(expected, result) + + def testGetLinesBySoname_6(self): + """Based on CSWmysql5client on build8x.""" + soname = u'libz.so.1' + expected = {u'libz.so.1': u'/opt/csw/lib/pentium_pro+mmx/libz.so.1=libz.so.1.2.3 ' + u's none CSWzlib\n'} + pkgmap_stub = self.PkgmapStub(d6.DATA_PKGMAP_CACHE) + (needed_sonames, + binaries_by_soname, + runpath_by_needed_soname) = checkpkg.BuildIndexesBySoname( + d6.DATA_NEEDED_SONAMES_BY_BINARY) + result = checkpkg.GetLinesBySoname( + pkgmap_stub, + set([soname]), + runpath_by_needed_soname, + d6.DATA_ISALIST) + self.assertEqual(expected, result) + + def testGetLinesBySoname_7(self): + """A test for 64-bit symlink expansion.""" + soname = u'libncursesw.so.5' + # To test the 64-bit symlink expansion + expected = { + u'libncursesw.so.5': + u'/opt/csw/lib/amd64/libncursesw.so.5=libncursesw.so.5.7 ' + u's none CSWncurses\n'} + pkgmap_stub = self.PkgmapStub(d6.DATA_PKGMAP_CACHE) + (needed_sonames, + binaries_by_soname, + runpath_by_needed_soname) = checkpkg.BuildIndexesBySoname( + d6.DATA_NEEDED_SONAMES_BY_BINARY) + result = checkpkg.GetLinesBySoname( + pkgmap_stub, + set([soname]), + runpath_by_needed_soname, + d6.DATA_ISALIST) + self.assertEqual(expected, result) + + +class ParseDumpOutputUnitTest(unittest.TestCase): + + def test_1(self): + expected = { + 'soname': 'libmysqlclient.so.15', + 'runpath': ['/opt/csw/lib/$ISALIST', + '/opt/csw/lib', + '/opt/csw/mysql5/lib/$ISALIST', + '/opt/csw/mysql5/lib', + '/opt/csw/mysql5/lib/$ISALIST/mysql', + # These four are artificially appended + '/usr/lib/$ISALIST', + '/usr/lib', + '/lib/$ISALIST', + '/lib'], + 'needed sonames': ['librt.so.1', + 'libresolv.so.2', + 'libc.so.1', + 'libgen.so.1', + 'libsocket.so.1', + 'libnsl.so.1', + 'libm.so.1', + 'libz.so.1']} + self.assertEqual(expected, + checkpkg.ParseDumpOutput(dump_1.DATA_DUMP_OUTPUT)) + + def test_2(self): + expected_runpath = ['/usr/lib/$ISALIST', '/usr/lib', '/lib/$ISALIST', '/lib'] + self.assertEqual( + expected_runpath, + checkpkg.ParseDumpOutput(dump_2.DATA_DUMP_OUTPUT)["runpath"]) + + +if __name__ == '__main__': + unittest.main() Deleted: csw/mgar/gar/v2/bin/checkpkg.d/testdata/checkpkg_test_data_CSWlibpq_84.py =================================================================== --- csw/mgar/gar/v2-checkpkg/bin/checkpkg.d/testdata/checkpkg_test_data_CSWlibpq_84.py 2010-01-04 03:57:34 UTC (rev 7855) +++ csw/mgar/gar/v2/bin/checkpkg.d/testdata/checkpkg_test_data_CSWlibpq_84.py 2010-01-04 10:28:15 UTC (rev 7856) @@ -1,10 +0,0 @@ -# Testing data for CSWlibpq-84 -# $Id$ -DATA_PKGNAME = 'CSWlibpq-84' -DATA_DECLARED_DEPENDENCIES = {'CSWlibxml2': 'CSWlibxml2 libxml2 - XML Parser Library ', 'CSWkrb5lib': 'CSWkrb5lib krb5_lib - MIT Kerberos 5 core libraries ', 'CSWlibxslt': 'CSWlibxslt libxslt - XSLT engine runtime package ', 'CSWcommon': 'CSWcommon common - common files and dirs for CSW packages ', 'CSWisaexec': 'CSWisaexec isaexec - sneaky wrapper around Sun isaexec ', 'CSWzlib': 'CSWzlib zlib - Zlib Data Compression Library ', 'CSWosslrt': 'CSWosslrt openssl_rt - Openssl runtime libraries '} @@ Diff output truncated at 100000 characters. @@ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Mon Jan 4 12:52:35 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Mon, 04 Jan 2010 11:52:35 +0000 Subject: [csw-devel] SF.net SVN: gar:[7857] csw/mgar/pkg/mpeg4ip Message-ID: Revision: 7857 http://gar.svn.sourceforge.net/gar/?rev=7857&view=rev Author: dmichelsen Date: 2010-01-04 11:52:34 +0000 (Mon, 04 Jan 2010) Log Message: ----------- mpeg4ip: Add patch from Murray Jensen Modified Paths: -------------- csw/mgar/pkg/mpeg4ip/trunk/Makefile csw/mgar/pkg/mpeg4ip/trunk/checksums Added Paths: ----------- csw/mgar/pkg/mpeg4ip/tags/legacy/ csw/mgar/pkg/mpeg4ip/tags/legacy/mjj_build csw/mgar/pkg/mpeg4ip/tags/legacy/mjj_setup csw/mgar/pkg/mpeg4ip/tags/legacy/mpeg4ip-1.6.1-mjj.patch csw/mgar/pkg/mpeg4ip/tags/legacy/pkghelper.pl csw/mgar/pkg/mpeg4ip/trunk/files/mpeg4ip-1.6.1-mjj.patch Added: csw/mgar/pkg/mpeg4ip/tags/legacy/mjj_build =================================================================== --- csw/mgar/pkg/mpeg4ip/tags/legacy/mjj_build (rev 0) +++ csw/mgar/pkg/mpeg4ip/tags/legacy/mjj_build 2010-01-04 11:52:34 UTC (rev 7857) @@ -0,0 +1,13 @@ +#!/bin/echo ERROR_you_must_source_this_file + +if [ ! -s ${cfgmarker:-"Makefile"} ]; then + eval ${cfgprogram:-"$SHELL ./configure"} ${cfgflags:-"--prefix=/opt/csw"} +fi + +eval "$MAKE MAKE=$MAKE $mkflags" || exit + +mkdir -p $buildroot || exit + +rootvar=${rootvar:-DESTDIR} + +eval "$MAKE MAKE=$MAKE $rootvar=$buildroot $instflags install" || exit Added: csw/mgar/pkg/mpeg4ip/tags/legacy/mjj_setup =================================================================== --- csw/mgar/pkg/mpeg4ip/tags/legacy/mjj_setup (rev 0) +++ csw/mgar/pkg/mpeg4ip/tags/legacy/mjj_setup 2010-01-04 11:52:34 UTC (rev 7857) @@ -0,0 +1,93 @@ +#!/bin/echo ERROR_you_must_source_this_file + +[ -n "$LD_LIBRARY_PATH" ] && unset LD_LIBRARY_PATH + +SHELL=bash +CONFIG_SHELL=bash +MAKE=gmake + +PATH=/opt/csw/bin:/usr/openwin/bin:/usr/ccs/bin:/usr/sbin:/usr/xpg4/bin:/usr/bin + +CPPFLAGS="-D_FILE_OFFSET_BITS=64 -D_REENTRANT -I/opt/csw/include" +CFLAGS="-g" +CXXFLAGS="-g" +LDFLAGS="-g -L/opt/csw/lib" +if [ -n "$nozdefs" ]; then + LD_OPTIONS="-R/opt/csw/lib -L/opt/csw/lib" +else + LD_OPTIONS="-z defs -R/opt/csw/lib -L/opt/csw/lib" +fi + +case `uname -p` in + +sparc) + gccopt="-O3 -mcpu=v8" + ccopt="-fast -xarch=v8" + ;; + +i386) + gccopt="-O3 -march=i486" + ccopt="-fast -xarch=386" + ;; + +*) + echo huh\? 1>&2 + exit 1 + ;; + +esac + +case ${compiler-ss8} in + +gcc[34]) + base=/opt/csw/${compiler} + gccver=`$base/bin/gcc -dumpversion` + PATH=$base/bin:$PATH + CPPFLAGS="-I$base/include -I$base/include/c++/$gccver $CPPFLAGS" + CFLAGS="$gccopt $CFLAGS" + CXXFLAGS="$gccopt $CXXFLAGS" + LD_OPTIONS="-L$base/lib $LD_OPTIONS" + CC=${CC-"gcc"} + CXX=${CXX-"g++"} + PICFLAG=${PICFLAG-"-fPIC"} + SHLDFLAG=${SHLDFLAG-"-shared"} + [ -n "$noztext" ] && SHLDFLAG="$SHLDFLAG -mimpure-text" + ;; + +gcc2) + CFLAGS="$gccopt $CFLAGS" + CXXFLAGS="$gccopt $CXXFLAGS" + CC=${CC-"gcc"} + CXX=${CXX-"g++"} + PICFLAG=${PICFLAG-"-fPIC"} + SHLDFLAG=${SHLDFLAG-"-shared"} + [ -n "$noztext" ] && SHLDFLAG="$SHLDFLAG -mimpure-text" + ;; + +ss8|cc|ss10|ss11) + case ${compiler-ss8} in + ss8|cc) base=/opt/SUNWspro ;; + ss10) base=/opt/studio10/SUNWspro ;; + ss11) base=/opt/studio11/SUNWspro ;; + *) echo huh\? 1>&2; exit 1 ;; + esac + PATH="$base/bin:$PATH" + CFLAGS="$ccopt $CFLAGS" + CXXFLAGS="$ccopt $CXXFLAGS" + LD_OPTIONS="-L$base/lib $LD_OPTIONS" + CC=${CC-"cc"} + CXX=${CXX-"CC"} + PICFLAG=${PICFLAG-"-KPIC"} + SHLDFLAG=${SHLDFLAG-"-G"} + ;; + +esac + +export PATH SHELL CONFIG_SHELL MAKE CPPFLAGS CC CFLAGS CXX CXXFLAGS +export LDFLAGS LD_OPTIONS PICFLAG SHLDFLAG + +# configure sometimes gets this wrong ... the csw +# gcc is set up to use system as/ld/etc from /usr/ccs +lt_cv_path_LD=/usr/ccs/bin/ld; export lt_cv_path_LD +# speed up +lt_cv_sys_max_cmd_len=262144; export lt_cv_sys_max_cmd_len Added: csw/mgar/pkg/mpeg4ip/tags/legacy/mpeg4ip-1.6.1-mjj.patch =================================================================== --- csw/mgar/pkg/mpeg4ip/tags/legacy/mpeg4ip-1.6.1-mjj.patch (rev 0) +++ csw/mgar/pkg/mpeg4ip/tags/legacy/mpeg4ip-1.6.1-mjj.patch 2010-01-04 11:52:34 UTC (rev 7857) @@ -0,0 +1,304 @@ +Index: mpeg4ip-1.6.1/common/video/iso-mpeg4/src/Makefile.am +=================================================================== +--- mpeg4ip-1.6.1.orig/common/video/iso-mpeg4/src/Makefile.am 2006-02-10 04:57:29.000000000 +1100 ++++ mpeg4ip-1.6.1/common/video/iso-mpeg4/src/Makefile.am 2008-03-28 13:20:24.083621000 +1100 +@@ -1,5 +1,5 @@ + +-AM_CXXFLAGS = -D__TRACE_AND_STATS_ -D__DOUBLE_PRECISION_ -D_REENTRANT -DNOCONTROLS -fexceptions -Wall -Werror -D_OBSS_ @BILLS_CPPWARNINGS@ ++AM_CXXFLAGS = -D__TRACE_AND_STATS_ -D__DOUBLE_PRECISION_ -D_REENTRANT -DNOCONTROLS -fexceptions -Wall -D_OBSS_ @BILLS_CPPWARNINGS@ + + INCLUDES = -I$(srcdir)/../include + +Index: mpeg4ip-1.6.1/common/video/iso-mpeg4/src/Makefile.in +=================================================================== +--- mpeg4ip-1.6.1.orig/common/video/iso-mpeg4/src/Makefile.in 2007-04-27 09:59:31.000000000 +1000 ++++ mpeg4ip-1.6.1/common/video/iso-mpeg4/src/Makefile.in 2008-03-27 01:55:41.267172000 +1100 +@@ -106,7 +106,7 @@ + am__quote = @am__quote@ + install_sh = @install_sh@ + +-AM_CXXFLAGS = -D__TRACE_AND_STATS_ -D__DOUBLE_PRECISION_ -D_REENTRANT -DNOCONTROLS -fexceptions -Wall -Werror -D_OBSS_ @BILLS_CPPWARNINGS@ ++AM_CXXFLAGS = -D__TRACE_AND_STATS_ -D__DOUBLE_PRECISION_ -D_REENTRANT -DNOCONTROLS -fexceptions -Wall -D_OBSS_ @BILLS_CPPWARNINGS@ + + INCLUDES = -I$(srcdir)/../include + +Index: mpeg4ip-1.6.1/common/video/mpeg4-2000/app/convertpar/Makefile.am +=================================================================== +--- mpeg4ip-1.6.1.orig/common/video/mpeg4-2000/app/convertpar/Makefile.am 2003-05-06 07:07:21.000000000 +1000 ++++ mpeg4ip-1.6.1/common/video/mpeg4-2000/app/convertpar/Makefile.am 2008-03-28 13:20:43.452101000 +1100 +@@ -1,6 +1,6 @@ + # + +-AM_CXXFLAGS = -D__TRACE_AND_STATS_ -D__DOUBLE_PRECISION_ -D_REENTRANT -DNOCONTROLS -fexceptions -Wall -Werror -D_OBSS_ ++AM_CXXFLAGS = -D__TRACE_AND_STATS_ -D__DOUBLE_PRECISION_ -D_REENTRANT -DNOCONTROLS -fexceptions -Wall -D_OBSS_ + + check_PROGRAMS = convertpar + +Index: mpeg4ip-1.6.1/common/video/mpeg4-2000/idct/Makefile.am +=================================================================== +--- mpeg4ip-1.6.1.orig/common/video/mpeg4-2000/idct/Makefile.am 2003-11-14 09:08:37.000000000 +1100 ++++ mpeg4ip-1.6.1/common/video/mpeg4-2000/idct/Makefile.am 2008-03-28 13:21:08.940124000 +1100 +@@ -1,6 +1,6 @@ + AM_CFLAGS = -D__TRACE_AND_STATS_ -D__DOUBLE_PRECISION_ -D_OBSS_ -DFGSPOSTCLIP -Wall -Wpointer-arith -Wcast-align -Wmissing-prototypes -fexceptions + +-AM_CXXFLAGS = -D__TRACE_AND_STATS_ -D__DOUBLE_PRECISION_ -D_OBSS_ -DFGSPOSTCLIP -D_REENTRANT -DNOCONTROLS -fexceptions -Wall -Werror ++AM_CXXFLAGS = -D__TRACE_AND_STATS_ -D__DOUBLE_PRECISION_ -D_OBSS_ -DFGSPOSTCLIP -D_REENTRANT -DNOCONTROLS -fexceptions -Wall + + noinst_LTLIBRARIES = libobj_idct.la + +Index: mpeg4ip-1.6.1/configure.in +=================================================================== +--- mpeg4ip-1.6.1.orig/configure.in 2007-11-12 04:39:13.000000000 +1100 ++++ mpeg4ip-1.6.1/configure.in 2008-06-17 22:13:47.888186000 +1000 +@@ -237,7 +237,7 @@ + [have_mpeg2=false]) + if test x$have_mpeg2 = xtrue; then + AC_MSG_CHECKING([libmpeg2 version]) +- AC_COMPILE_IFELSE([#include ++ AC_COMPILE_IFELSE([$ac_includes_default + #include + + #ifndef MPEG2_VERSION +@@ -513,9 +513,9 @@ + AC_DEFINE(HAVE_FFMPEG_INSTALLED, 1, [defined if ffmpeg is installed]) + FFMPEG_INC= + FFMPEG_LIB="-lavcodec -lz $ffmpeg_add_libs" +- AC_CHECK_TYPES([AVRational], , , [#include ]) +- AC_CHECK_MEMBERS(AVCodecContext.time_base, , , [#include ]) +- AC_CHECK_DECLS([avcodec_decode_audio2], , ,[#include ]) ++ AC_CHECK_TYPES([AVRational], , , [#include ]) ++ AC_CHECK_MEMBERS(AVCodecContext.time_base, , , [#include ]) ++ AC_CHECK_DECLS([avcodec_decode_audio2], , ,[#include ]) + AC_DEFINE(HAVE_FFMPEG, 1, [enable ffmpeg for mp4live]) + AC_CHECK_LIB(amrnb, VADxEncoder_Interface_init, + [have_amr_nb=true], [have_amr_nb=false]) +@@ -769,7 +769,7 @@ + + if test x$USENASM = xtrue; then + AC_MSG_CHECKING(nasm version...) +- BILLSNASM_arg=`nasm -r | tr '.' ' '` ++ BILLSNASM_arg=`nasm -v | tr '.' ' '` + BILLSNASM_ret=`util/testnasm.sh $BILLSNASM_arg` + if test x$BILLSNASM_ret = x"yes"; then + USENASM=true +Index: mpeg4ip-1.6.1/cvs_bootstrap +=================================================================== +--- mpeg4ip-1.6.1.orig/cvs_bootstrap 2007-04-27 09:38:03.000000000 +1000 ++++ mpeg4ip-1.6.1/cvs_bootstrap 2008-03-27 15:09:40.972209000 +1100 +@@ -6,7 +6,7 @@ + + # Check that we can find libtool + # Frequently it hasn't been installed +-if glibtool --version > /dev/null 2> /dev/null ++if (glibtool --version >/dev/null 2>/dev/null) + then + libtool=glibtool + if libtoolize --version > /dev/null +@@ -87,19 +87,19 @@ + + # + # This tries to find all the aclocal files that we need +-for dir in /usr/local /usr/contrib /opt/gnome /usr /opt/local +-do +- if test -d $dir/share/aclocal -a `which aclocal` != $dir/bin/aclocal +- then +- ACLOCAL_FLAGS="-I $dir/share/aclocal $ACLOCAL_FLAGS" +- fi +-done +- +-if test $target_system != "CYGWIN_NT-5.1"; then +-ERRCMD=--enable-warns-as-err +-else ++#for dir in /usr/local /usr/contrib /opt/gnome /usr /opt/local ++#do ++# if test -d $dir/share/aclocal -a `which aclocal` != $dir/bin/aclocal ++# then ++# ACLOCAL_FLAGS="-I $dir/share/aclocal $ACLOCAL_FLAGS" ++# fi ++#done ++ ++#if test $target_system != "CYGWIN_NT-5.1"; then ++#ERRCMD=--enable-warns-as-err ++#else + ERRCMD= +-fi ++#fi + + pwd=`pwd` + if test $target_system != "Darwin"; then +Index: mpeg4ip-1.6.1/lib/SDLAudio/configure.in +=================================================================== +--- mpeg4ip-1.6.1.orig/lib/SDLAudio/configure.in 2005-01-18 07:46:07.000000000 +1100 ++++ mpeg4ip-1.6.1/lib/SDLAudio/configure.in 2008-03-27 15:13:02.326777000 +1100 +@@ -45,6 +45,7 @@ + + dnl Check for tools + ++AM_PROG_AS + AC_LIBTOOL_WIN32_DLL + AM_PROG_LIBTOOL + AC_PROG_MAKE_SET +Index: mpeg4ip-1.6.1/lib/gnu/Makefile.am +=================================================================== +--- mpeg4ip-1.6.1.orig/lib/gnu/Makefile.am 2007-11-12 04:39:19.000000000 +1100 ++++ mpeg4ip-1.6.1/lib/gnu/Makefile.am 2008-03-28 13:21:33.278293000 +1100 +@@ -12,5 +12,5 @@ + EXTRA_DIST = libmissing60.dsp libmissing.vcproj \ + need_for_win32.c + +-AM_CFLAGS = -D_REENTRANT -Werror -Wall -Wcast-align -Wstrict-prototypes -Wmissing-prototypes ++AM_CFLAGS = -D_REENTRANT -Wall -Wcast-align -Wstrict-prototypes -Wmissing-prototypes + +Index: mpeg4ip-1.6.1/lib/gnu/Makefile.in +=================================================================== +--- mpeg4ip-1.6.1.orig/lib/gnu/Makefile.in 2007-11-12 05:04:47.000000000 +1100 ++++ mpeg4ip-1.6.1/lib/gnu/Makefile.in 2008-03-27 01:56:56.241400000 +1100 +@@ -141,7 +141,7 @@ + need_for_win32.c + + +-AM_CFLAGS = -D_REENTRANT -Werror -Wall -Wcast-align -Wstrict-prototypes -Wmissing-prototypes ++AM_CFLAGS = -D_REENTRANT -Wall -Wcast-align -Wstrict-prototypes -Wmissing-prototypes + subdir = lib/gnu + mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs + CONFIG_HEADER = $(top_builddir)/mpeg4ip_config.h +Index: mpeg4ip-1.6.1/lib/rtp/Makefile.am +=================================================================== +--- mpeg4ip-1.6.1.orig/lib/rtp/Makefile.am 2007-11-12 04:39:25.000000000 +1100 ++++ mpeg4ip-1.6.1/lib/rtp/Makefile.am 2008-03-28 13:23:26.489602000 +1100 +@@ -74,7 +74,7 @@ + + check_PROGRAMS = test_rtp_client test_rtp_server + +-AM_CFLAGS = -DDEBUG -Wall -Werror ++AM_CFLAGS = -DDEBUG -Wall + test_rtp_client_SOURCES = test_rtp_client.c + test_rtp_client_LDADD = libuclmmbase.la \ + $(top_builddir)/lib/utils/libmutex.la \ +Index: mpeg4ip-1.6.1/lib/rtp/Makefile.in +=================================================================== +--- mpeg4ip-1.6.1.orig/lib/rtp/Makefile.in 2007-11-12 05:04:25.000000000 +1100 ++++ mpeg4ip-1.6.1/lib/rtp/Makefile.in 2008-03-27 01:54:27.572853000 +1100 +@@ -202,7 +202,7 @@ + + check_PROGRAMS = test_rtp_client test_rtp_server + +-AM_CFLAGS = -DDEBUG -Wall -Werror ++AM_CFLAGS = -DDEBUG -Wall + test_rtp_client_SOURCES = test_rtp_client.c + test_rtp_client_LDADD = libuclmmbase.la \ + $(top_builddir)/lib/utils/libmutex.la \ +Index: mpeg4ip-1.6.1/lib/rtp/configure.in +=================================================================== +--- mpeg4ip-1.6.1.orig/lib/rtp/configure.in 2006-03-21 10:13:25.000000000 +1100 ++++ mpeg4ip-1.6.1/lib/rtp/configure.in 2008-03-28 13:22:21.554566000 +1100 +@@ -275,7 +275,7 @@ + [AC_MSG_NOTICE([compiler warnings will not be errs])]) + + BILLS_CWARNINGS="$BASE_ERR" +-CFLAGS="$CFLAGS -Wall -Werror" ++CFLAGS="$CFLAGS -Wall" + MY_CHECK_CC_OPT_SET([-Wmissing-prototypes], BILLS_CWARNINGS, [c compiler]) + MY_CHECK_CC_OPT_SET([-Wmissing-declarations], BILLS_CWARNINGS, [c compiler]) + MY_CHECK_CC_OPT_SET([-Wbad-function-cast], BILLS_CWARNINGS, [c compiler]) +Index: mpeg4ip-1.6.1/lib/rtp/rtp.c +=================================================================== +--- mpeg4ip-1.6.1.orig/lib/rtp/rtp.c 2007-01-23 04:31:08.000000000 +1100 ++++ mpeg4ip-1.6.1/lib/rtp/rtp.c 2008-03-27 01:54:27.582899000 +1100 +@@ -2489,6 +2489,9 @@ + buffer_len += iov[i].iov_len; + } + if (buffer_len > session->m_output_buffer_size) { ++#ifndef MAX ++#define MAX(a,b) (((a)>(b))?(a):(b)) ++#endif + session->m_output_buffer = (uint8_t *)xrealloc(session->m_output_buffer, + MAX(buffer_len, 1500)); + session->m_output_buffer_size = MAX(buffer_len, 1500); +Index: mpeg4ip-1.6.1/player/lib/audio/faad/Makefile.in +=================================================================== +--- mpeg4ip-1.6.1.orig/player/lib/audio/faad/Makefile.in 2007-11-12 05:03:57.000000000 +1100 ++++ mpeg4ip-1.6.1/player/lib/audio/faad/Makefile.in 2008-03-27 01:57:58.796587000 +1100 +@@ -161,7 +161,7 @@ + util.h + + INCLUDES = -I$(top_srcdir)/include +-AM_CFLAGS = -O2 -Werror -Wall -fexceptions -fno-strict-aliasing ++AM_CFLAGS = -O2 -Wall -fexceptions -fno-strict-aliasing + + EXTRA_DIST = COPYING libfaad60.dsp README libfaad.vcproj + subdir = player/lib/audio/faad +Index: mpeg4ip-1.6.1/player/plugin/audio/ffmpeg/ffmpeg.h +=================================================================== +--- mpeg4ip-1.6.1.orig/player/plugin/audio/ffmpeg/ffmpeg.h 2007-11-12 04:39:28.000000000 +1100 ++++ mpeg4ip-1.6.1/player/plugin/audio/ffmpeg/ffmpeg.h 2008-06-17 22:11:13.309632000 +1000 +@@ -26,7 +26,7 @@ + #include "codec_plugin.h" + extern "C" { + #ifdef HAVE_FFMPEG_INSTALLED +-#include ++#include + #else + #include + #endif +Index: mpeg4ip-1.6.1/player/plugin/video/ffmpeg/ffmpeg.h +=================================================================== +--- mpeg4ip-1.6.1.orig/player/plugin/video/ffmpeg/ffmpeg.h 2007-11-12 04:39:30.000000000 +1100 ++++ mpeg4ip-1.6.1/player/plugin/video/ffmpeg/ffmpeg.h 2008-06-17 22:11:20.199119000 +1000 +@@ -27,7 +27,7 @@ + #include "codec_plugin.h" + extern "C" { + #ifdef HAVE_FFMPEG_INSTALLED +-#include ++#include + #else + #include + #endif +Index: mpeg4ip-1.6.1/server/mp4live/audio_ffmpeg.h +=================================================================== +--- mpeg4ip-1.6.1.orig/server/mp4live/audio_ffmpeg.h 2007-11-12 04:39:33.000000000 +1100 ++++ mpeg4ip-1.6.1/server/mp4live/audio_ffmpeg.h 2008-06-17 22:11:24.108828000 +1000 +@@ -25,7 +25,7 @@ + #include "audio_encoder.h" + extern "C" { + #ifdef HAVE_FFMPEG_INSTALLED +-#include ++#include + #else + #include + #endif +Index: mpeg4ip-1.6.1/server/mp4live/video_encoder_class.cpp +=================================================================== +--- mpeg4ip-1.6.1.orig/server/mp4live/video_encoder_class.cpp 2007-11-12 04:39:33.000000000 +1100 ++++ mpeg4ip-1.6.1/server/mp4live/video_encoder_class.cpp 2008-06-17 22:11:28.738579000 +1000 +@@ -27,7 +27,7 @@ + #ifdef HAVE_FFMPEG + extern "C" { + #ifdef HAVE_FFMPEG_INSTALLED +-#include ++#include + #else + #include + #endif +Index: mpeg4ip-1.6.1/server/mp4live/video_ffmpeg.h +=================================================================== +--- mpeg4ip-1.6.1.orig/server/mp4live/video_ffmpeg.h 2007-11-12 04:39:33.000000000 +1100 ++++ mpeg4ip-1.6.1/server/mp4live/video_ffmpeg.h 2008-06-17 22:11:32.758184000 +1000 +@@ -25,7 +25,7 @@ + #include "video_encoder.h" + extern "C" { + #ifdef HAVE_FFMPEG_INSTALLED +-#include ++#include + #else + #include + #endif +Index: mpeg4ip-1.6.1/server/util/mp4encode/Makefile.am +=================================================================== +--- mpeg4ip-1.6.1.orig/server/util/mp4encode/Makefile.am 2004-08-18 07:38:06.000000000 +1000 ++++ mpeg4ip-1.6.1/server/util/mp4encode/Makefile.am 2008-03-27 01:54:27.592870000 +1100 +@@ -1 +1,3 @@ +-EXTRA_DIST = mp4encode mp4venc_template.par ++EXTRA_DIST = mp4venc_template.par ++ ++bin_SCRIPTS = mp4encode Added: csw/mgar/pkg/mpeg4ip/tags/legacy/pkghelper.pl =================================================================== --- csw/mgar/pkg/mpeg4ip/tags/legacy/pkghelper.pl (rev 0) +++ csw/mgar/pkg/mpeg4ip/tags/legacy/pkghelper.pl 2010-01-04 11:52:34 UTC (rev 7857) @@ -0,0 +1,894 @@ +#!/opt/csw/bin/perl -w +use strict; +use warnings FATAL => 'uninitialized'; + +use FindBin qw($RealBin $RealScript); +use File::Basename; +use Getopt::Long; + +my @csw_ignore = qw( +opt/csw +opt/csw/bin +opt/csw/bin/sparcv8 +opt/csw/bin/sparcv8plus +opt/csw/bin/sparcv8plus+vis +opt/csw/bin/sparcv9 +opt/csw/etc +opt/csw/include +opt/csw/lib +opt/csw/lib/X11 +opt/csw/lib/X11/app-defaults +opt/csw/lib/sparcv8plus +opt/csw/lib/sparcv8plus+vis +opt/csw/lib/sparcv9 +opt/csw/libexec +opt/csw/sbin +opt/csw/share +opt/csw/share/doc +opt/csw/share/info +opt/csw/share/info/dir +opt/csw/share/locale +opt/csw/share/locale/az +opt/csw/share/locale/az/LC_MESSAGES +opt/csw/share/locale/be +opt/csw/share/locale/be/LC_MESSAGES +opt/csw/share/locale/bg +opt/csw/share/locale/bg/LC_MESSAGES +opt/csw/share/locale/ca +opt/csw/share/locale/ca/LC_MESSAGES +opt/csw/share/locale/cs +opt/csw/share/locale/cs/LC_MESSAGES +opt/csw/share/locale/da +opt/csw/share/locale/da/LC_MESSAGES +opt/csw/share/locale/de +opt/csw/share/locale/de/LC_MESSAGES +opt/csw/share/locale/el +opt/csw/share/locale/el/LC_MESSAGES +opt/csw/share/locale/en\@boldquot +opt/csw/share/locale/en\@boldquot/LC_MESSAGES +opt/csw/share/locale/en\@quot +opt/csw/share/locale/en\@quot/LC_MESSAGES +opt/csw/share/locale/es +opt/csw/share/locale/es/LC_MESSAGES +opt/csw/share/locale/et +opt/csw/share/locale/et/LC_MESSAGES +opt/csw/share/locale/eu +opt/csw/share/locale/eu/LC_MESSAGES +opt/csw/share/locale/fi +opt/csw/share/locale/fi/LC_MESSAGES +opt/csw/share/locale/fr +opt/csw/share/locale/fr/LC_MESSAGES +opt/csw/share/locale/ga +opt/csw/share/locale/ga/LC_MESSAGES +opt/csw/share/locale/gl +opt/csw/share/locale/gl/LC_MESSAGES +opt/csw/share/locale/he +opt/csw/share/locale/he/LC_MESSAGES +opt/csw/share/locale/hr +opt/csw/share/locale/hr/LC_MESSAGES +opt/csw/share/locale/hu +opt/csw/share/locale/hu/LC_MESSAGES +opt/csw/share/locale/id +opt/csw/share/locale/id/LC_MESSAGES +opt/csw/share/locale/it +opt/csw/share/locale/it/LC_MESSAGES +opt/csw/share/locale/ja +opt/csw/share/locale/ja/LC_MESSAGES +opt/csw/share/locale/ko +opt/csw/share/locale/ko/LC_MESSAGES +opt/csw/share/locale/locale.alias +opt/csw/share/locale/lt +opt/csw/share/locale/lt/LC_MESSAGES +opt/csw/share/locale/nl +opt/csw/share/locale/nl/LC_MESSAGES +opt/csw/share/locale/nn +opt/csw/share/locale/nn/LC_MESSAGES +opt/csw/share/locale/no +opt/csw/share/locale/no/LC_MESSAGES +opt/csw/share/locale/pl +opt/csw/share/locale/pl/LC_MESSAGES +opt/csw/share/locale/pt +opt/csw/share/locale/pt/LC_MESSAGES +opt/csw/share/locale/pt_BR +opt/csw/share/locale/pt_BR/LC_MESSAGES +opt/csw/share/locale/ro +opt/csw/share/locale/ro/LC_MESSAGES +opt/csw/share/locale/ru +opt/csw/share/locale/ru/LC_MESSAGES +opt/csw/share/locale/sk +opt/csw/share/locale/sk/LC_MESSAGES +opt/csw/share/locale/sl +opt/csw/share/locale/sl/LC_MESSAGES +opt/csw/share/locale/sp +opt/csw/share/locale/sp/LC_MESSAGES +opt/csw/share/locale/sr +opt/csw/share/locale/sr/LC_MESSAGES +opt/csw/share/locale/sv +opt/csw/share/locale/sv/LC_MESSAGES +opt/csw/share/locale/tr +opt/csw/share/locale/tr/LC_MESSAGES +opt/csw/share/locale/uk +opt/csw/share/locale/uk/LC_MESSAGES +opt/csw/share/locale/vi +opt/csw/share/locale/vi/LC_MESSAGES +opt/csw/share/locale/wa +opt/csw/share/locale/wa/LC_MESSAGES +opt/csw/share/locale/zh +opt/csw/share/locale/zh/LC_MESSAGES +opt/csw/share/locale/zh_CN +opt/csw/share/locale/zh_CN/LC_MESSAGES +opt/csw/share/locale/zh_CN.GB2312 +opt/csw/share/locale/zh_CN.GB2312/LC_MESSAGES +opt/csw/share/locale/zh_TW +opt/csw/share/locale/zh_TW/LC_MESSAGES +opt/csw/share/locale/zh_TW.Big5 +opt/csw/share/locale/zh_TW.Big5/LC_MESSAGES +opt/csw/share/man +opt/csw/share/man/man1 +opt/csw/share/man/man2 +opt/csw/share/man/man3 +opt/csw/share/man/man4 +opt/csw/share/man/man5 +opt/csw/share/man/man6 +opt/csw/share/man/man7 +opt/csw/share/man/man8 +opt/csw/var +etc +etc/dt +etc/dt/appconfig +etc/dt/appconfig/icons +etc/dt/appconfig/icons/C +etc/dt/appconfig/types +etc/dt/appconfig/types/C +etc/dt/appconfig/appmanager +etc/dt/appconfig/appmanager/C +etc/dt/appconfig/help +etc/dt/config +etc/dt/config/C +etc/dt/config/C/Xresources.d +etc/dt/config/ar +etc/dt/config/ar/Xresources.d +etc/dt/config/ar_EG.UTF-8 +etc/dt/config/ar_EG.UTF-8/Xresources.d +etc/dt/config/cs_CZ.ISO8859-2 +etc/dt/config/cs_CZ.ISO8859-2/Xresources.d +etc/dt/config/de +etc/dt/config/de/Xresources.d +etc/dt/config/de.ISO8859-15 +etc/dt/config/de.ISO8859-15/Xresources.d +etc/dt/config/de.UTF-8 +etc/dt/config/de.UTF-8/Xresources.d +etc/dt/config/de_AT.ISO8859-15 +etc/dt/config/de_AT.ISO8859-15/Xresources.d +etc/dt/config/en_GB.ISO8859-15 +etc/dt/config/en_GB.ISO8859-15/Xresources.d +etc/dt/config/en_IE.ISO8859-15 +etc/dt/config/en_IE.ISO8859-15/Xresources.d +etc/dt/config/en_US.ISO8859-15 +etc/dt/config/en_US.ISO8859-15/Xresources.d +etc/dt/config/en_US.UTF-8 +etc/dt/config/en_US.UTF-8/Xresources.d +etc/dt/config/es +etc/dt/config/es/Xresources.d +etc/dt/config/es.ISO8859-15 +etc/dt/config/es.ISO8859-15/Xresources.d +etc/dt/config/es.UTF-8 +etc/dt/config/es.UTF-8/Xresources.d +etc/dt/config/fr +etc/dt/config/fr/Xresources.d +etc/dt/config/fr.ISO8859-15 +etc/dt/config/fr.ISO8859-15/Xresources.d +etc/dt/config/fr.UTF-8 +etc/dt/config/fr.UTF-8/Xresources.d +etc/dt/config/fr_BE.ISO8859-15 +etc/dt/config/fr_BE.ISO8859-15/Xresources.d +etc/dt/config/he +etc/dt/config/he/Xresources.d +etc/dt/config/he_IL.UTF-8 +etc/dt/config/he_IL.UTF-8/Xresources.d +etc/dt/config/hu_HU.ISO8859-2 +etc/dt/config/hu_HU.ISO8859-2/Xresources.d +etc/dt/config/it +etc/dt/config/it/Xresources.d +etc/dt/config/it.ISO8859-15 +etc/dt/config/it.ISO8859-15/Xresources.d +etc/dt/config/it.UTF-8 +etc/dt/config/it.UTF-8/Xresources.d +etc/dt/config/ja +etc/dt/config/ja/Xresources.d +etc/dt/config/ja_JP.PCK +etc/dt/config/ja_JP.PCK/Xresources.d +etc/dt/config/ja_JP.UTF-8 +etc/dt/config/ja_JP.UTF-8/Xresources.d +etc/dt/config/ja_JP.eucJP +etc/dt/config/ja_JP.eucJP/Xresources.d +etc/dt/config/ko +etc/dt/config/ko/Xresources.d +etc/dt/config/ko.UTF-8 +etc/dt/config/ko.UTF-8/Xresources.d +etc/dt/config/pl_PL.ISO8859-2 +etc/dt/config/pl_PL.ISO8859-2/Xresources.d +etc/dt/config/pl_PL.UTF-8 +etc/dt/config/pl_PL.UTF-8/Xresources.d +etc/dt/config/pt_BR +etc/dt/config/pt_BR/Xresources.d +etc/dt/config/pt_BR.ISO8859-1 +etc/dt/config/pt_BR.ISO8859-1/Xresources.d +etc/dt/config/pt_BR.UTF-8 +etc/dt/config/pt_BR.UTF-8/Xresources.d +etc/dt/config/ru_RU.ISO8859-5 +etc/dt/config/ru_RU.ISO8859-5/Xresources.d +etc/dt/config/ru_RU.UTF-8 +etc/dt/config/ru_RU.UTF-8/Xresources.d +etc/dt/config/sk_SK.ISO8859-2 +etc/dt/config/sk_SK.ISO8859-2/Xresources.d +etc/dt/config/sv +etc/dt/config/sv/Xresources.d +etc/dt/config/sv.ISO8859-15 +etc/dt/config/sv.ISO8859-15/Xresources.d +etc/dt/config/sv.UTF-8 +etc/dt/config/sv.UTF-8/Xresources.d +etc/dt/config/th_TH +etc/dt/config/th_TH/Xresources.d +etc/dt/config/th_TH.ISO8859-11 +etc/dt/config/th_TH.ISO8859-11/Xresources.d +etc/dt/config/th_TH.TIS620 +etc/dt/config/th_TH.TIS620/Xresources.d +etc/dt/config/th_TH.UTF-8 +etc/dt/config/th_TH.UTF-8/Xresources.d +etc/dt/config/zh +etc/dt/config/zh/Xresources.d +etc/dt/config/zh.GBK +etc/dt/config/zh.GBK/Xresources.d +etc/dt/config/zh.UTF-8 +etc/dt/config/zh.UTF-8/Xresources.d +etc/dt/config/zh_HK.BIG5HK +etc/dt/config/zh_HK.BIG5HK/Xresources.d +etc/dt/config/zh_TW +etc/dt/config/zh_TW/Xresources.d +etc/dt/config/zh_TW.BIG5 +etc/dt/config/zh_TW.BIG5/Xresources.d +etc/dt/config/zh_TW.UTF-8 +etc/dt/config/zh_TW.UTF-8/Xresources.d +.*/perllocal.pod +.*\\.a +); + +my @csw_dirs = qw( +etc/init.d +etc/rc0.d +etc/rc1.d +etc/rc2.d +etc/rc3.d +etc/rcS.d +opt/csw +opt/csw/etc +opt/csw/bin +opt/csw/bin/sparcv8 +opt/csw/bin/sparcv8plus +opt/csw/bin/sparcv8plus+vis +opt/csw/bin/sparcv9 +opt/csw/sbin +opt/csw/share +opt/csw/share/doc +opt/csw/share/locale +opt/csw/share/man +opt/csw/share/man/man1 +opt/csw/share/man/man2 +opt/csw/share/man/man3 +opt/csw/share/man/man4 +opt/csw/share/man/man5 +opt/csw/share/man/man6 +opt/csw/share/man/man7 +opt/csw/share/man/man8 +opt/csw/share/info +opt/csw/lib +opt/csw/lib/X11 +opt/csw/lib/X11/app-defaults +opt/csw/include +opt/csw/libexec +opt/csw/var +); + +my @possible_scripts = qw(request checkinstall preinstall postinstall preremove postremove i.smfno i.smfyes space); + +my @sunwsprolocs = ('/opt/forte8/SUNWspro/bin', '/opt/SUNWspro/bin', '/opt/studio11/SUNWspro/bin'); +my $builddir = $ENV{'BUILDDIR'} || '/var/tmp/sithglan-pkg'; +my $packagedir = $ENV{'PACKAGEDIR'} || "${RealBin}/../packages"; +my $content = "/var/sadm/install/contents"; +my %options; # getopt + +# variables defined via eval +my $progname = undef; +my $version = undef; +my $buildroot = undef; +my $category = undef; +my $vendor = undef; +my $hotline = 'http://www.opencsw.org/bugtrack/'; +my $email = 'thomas at opencsw.org'; +my @sources = undef; +my $prepatch = undef; +my @patches = (); # default to no patches +my $copyright = undef; +my $build = undef; +my $suffix = undef; +my $rev = undef; +my $defarch = undef; +my $osversion = undef; +my @packages = undef; +my @isaexecs = (); +my $sunwspropath = undef; +my %attributes = (); +my %seenpaths = (); +my %contents = (); +my $prototypeadd = undef; + +# helper applications +my $tar = '/opt/csw/bin/gtar'; +my $svn = '/opt/csw/bin/svn'; + +sub +system_dieonfail +{ + my $cmd = shift; + system($cmd) == 0 or die "system '$cmd' failed: $?" +} + +sub +prepare +{ + chdir($builddir) || die("can't change to $builddir"); + + foreach my $source (@sources) { + if (($source =~ /tar\.gz$/) + ||($source =~ /tgz$/) + ||($source =~ /tar\.Z$/)) { + system_dieonfail("/bin/gzcat ${RealBin}/../sources/${source} | ${tar} xf -"); + + } elsif ($source =~ /tar\.bz2$/) { + system_dieonfail("LD_LIBRARY_PATH= /bin/bzcat ${RealBin}/../sources/${source} | ${tar} xf -"); + + } elsif ($source =~ /tar$/) { + system_dieonfail("${tar} xf ${RealBin}/../sources/${source}"); + + } elsif (my @svn_subs = ($source =~ /^svn:\/\/([^\/]+)([^\?]+)(\?(.*))?/)) { + my $svn_host = shift @svn_subs; + my $svn_path = shift @svn_subs; + + my $svn_dir = ""; + my $svn_rev = ""; + my $svn_proto = ""; + + if ($#svn_subs == 1) { + my @svn_prms = split(/\&/, $svn_subs[1]); + + foreach my $svn_prm (@svn_prms) { + my @svn_pair = split(/=/, $svn_prm); + + if ($svn_pair[0] eq "dir") { + $svn_dir = $svn_pair[1]; + } elsif ($svn_pair[0] eq "rev") { + $svn_rev = $svn_pair[1]; + } elsif ($svn_pair[0] eq "proto") { + $svn_proto = $svn_pair[1]; + } else { + die("huh? name='$svn_pair[0]' value='$svn_pair[1]'"); + } + } + } + + if ($svn_dir eq "") { + $svn_dir = $svn_path; + $svn_dir =~ s/^.+\///; + } + + if ($svn_rev eq "") { + $svn_rev = "HEAD"; + } + + if ($svn_proto eq "") { + $svn_proto = "svn"; + } + + system_dieonfail("${svn} checkout --quiet --non-interactive --revision ${svn_rev} ${svn_proto}://${svn_host}${svn_path} ${svn_dir}"); + } else { + die("don't know how to extrace ${source}"); + } + } + + if (defined($prepatch)) { + open(PREPATCH, "> $builddir/prepatch") || die ("can't create $builddir/prepatch: $!"); + print PREPATCH $prepatch; + close(PREPATCH); + system_dieonfail("chmod +x $builddir/prepatch"); + system_dieonfail("/bin/bash -x $builddir/prepatch"); + unlink("$builddir/prepatch"); + } + + foreach my $patch (@patches) { + chdir("$builddir/@{$patch}[1]") || die("can't change to $builddir/@{$patch}[1]"); + system_dieonfail("gpatch @{$patch}[2] < ${RealBin}/../sources/@{$patch}[0]"); + } +} + +sub probe_directory +{ + while (my $dir = shift) { + -d $dir && return $dir; + } + + return undef; +} + + +sub +isaexec +{ + foreach my $exec (@isaexecs) { + open(ISA, "> ${builddir}/isaexec.c") || die("can't create ${builddir}/isaexec.c for overwrite: $!"); + print ISA <<"EOF"; +#include + +int +main(int argc, char *argv[], char *envp[]) +{ + return (isaexec("${exec}", argv, envp)); +} +EOF + close(ISA); + system_dieonfail("${sunwspropath}/cc -o ${buildroot}${exec} ${builddir}/isaexec.c"); + unlink("${builddir}/isaexec.c"); + } +} + +sub +build +{ + my $buildscript = "${builddir}/${progname}-${version}-buildscript"; + + chdir($builddir) || die("can't change to $builddir"); + + open(BUILD, "> $buildscript") || die ("can't create $buildscript: $!"); + print BUILD $build; + close(BUILD); + system_dieonfail("chmod +x $buildscript"); + system_dieonfail("/bin/bash -xe $buildscript"); + # unlink("$buildscript"); + isaexec(); + strip(); +} + +sub +compute_ownership +{ + my $path = shift; + my $perm = shift; + my $user = 'root'; + my $group = 'bin'; + + if (%attributes) { + $perm = $attributes{$path}->{perm} || $perm; + $user = $attributes{$path}->{user} || $user; + $group = $attributes{$path}->{group} || $group; + } + + return "$perm $user $group\n"; +} + +# This functions purpose is to get sure that all directories in /path/to/file +# are also in file list. It also accounts which filename was packaged in what +# package. So that it possible to warn the user if a file has been packaed in +# more than one package. + +sub +verify_path +{ + my $r = shift; + my $prototype = shift; + my $path = shift; + + push(@{$seenpaths{$path}}, "CSW$r->{pkgname}"); + + # Handle symlinks in the art of etc/rcS.d/K03cswsamba=../init.d + $path =~ s/=.*$//; + + while ('.' ne ($path = dirname($path))) { + if (! grep($_ =~ /^d none \/\Q${path}\E\s+/, @$prototype)) { + pkgproto($r, $prototype, `echo ${path} | pkgproto`); + } + } +} + +sub +pkgproto +{ + my $r = shift; + my $prototype = shift; + + while (my $line = shift) { + my @fields = split(/\s+/, $line); + if ((! ($fields[2] =~ /\//) ) || (grep(eval "\$fields[2] =~ m|^$_\$|", @csw_ignore))) { + # skip certain paths (opt, etc, ...) + # print STDERR "WARNING: Ignoring prototype path <$fields[2] ($fields[0])>\n"; + next; + } + if ($fields[0] eq 'd') { + # d none opt/csw 0755 sithglan icipguru + if (grep($fields[2] eq $_, @csw_dirs)) { + unshift(@$prototype, "$fields[0] $fields[1] /$fields[2] ? ? ?\n"); + } else { + unshift(@$prototype, "$fields[0] $fields[1] /$fields[2] " . compute_ownership("/$fields[2]", "$fields[3]")); + } + + } elsif ($fields[0] eq 'f') { + # f none opt/csw 0755 sithglan icipguru + push(@$prototype, "$fields[0] $fields[1] /$fields[2] " . compute_ownership("/$fields[2]", "$fields[3]")); + verify_path($r, $prototype, $fields[2]); + + } elsif ( ($fields[0] eq 's') + ||($fields[0] eq 'l')) { + push(@$prototype, "$fields[0] $fields[1] /$fields[2]\n"); + verify_path($r, $prototype, $fields[2]); + } else { + die ("unknown line: <$line>"); + } + } +} + +sub +generate_prototype +{ + my $r = shift; + + my @prototype = (); + + chdir($buildroot) || die("can't change to ${buildroot}: $!"); + push(@prototype, "i pkginfo\n"); + push(@prototype, "i depend\n"); + if (defined(${copyright})) { + -f "$builddir/${copyright}" || die("can't find copyrightfile: $!"); + system_dieonfail("cp $builddir/${copyright} copyright"); + push(@prototype, "i copyright\n"); + } + foreach my $file (@possible_scripts) { + if (defined($r->{"$file"})) { + -f "${RealBin}/../sources/$r->{$file}" || die("can't find $file: $!"); + system_dieonfail("cp -f ${RealBin}/../sources/$r->{$file} $file"); + push(@prototype, "i $file\n"); + } + } + + my @dirs = `gfind @{$r->{filelist}} -type d | sort | uniq | pkgproto`; + pkgproto($r, \@prototype, @dirs); + my @links = `gfind @{$r->{filelist}} -type l | sort | uniq | pkgproto`; + pkgproto($r, \@prototype, @links); + my @files = `gfind @{$r->{filelist}} -type f | sort | uniq | pkgproto`; + pkgproto($r, \@prototype, @files); + + open(PROTOTYPE, "> ${buildroot}/prototype") || die("can't open ${buildroot}/prototype for overwrite: $!"); + print PROTOTYPE @prototype; + if (defined(${prototypeadd})) { + print PROTOTYPE $prototypeadd; + } + close(PROTOTYPE); +} + +sub +uniq +{ + my %hash; @hash{@_} = (); + return sort keys %hash; +} + +sub +write_dependencies +{ + my $r = shift || die("one reference expected"); + + my @out = `pkginfo`; + my %pkg = (); + foreach my $line (@out) { + if ($line =~ /^[^\s]+\s+([^\s]+)\s+([^\s].*)/) { + $pkg{$1} = "$2"; + } + } + + open(DEP, '> depend') || die("can't open depend file: $!"); + + foreach my $dep (@{$r->{dependencies}}) { + if (! defined($pkg{$dep})) { + print STDERR "WARNING: FAKEING dependency for <$dep>\n"; + $pkg{$dep} = 'common - THIS IS A FAKE DEPENDENCY'; + } + print DEP "P $dep $pkg{$dep}\n"; + } + + if (defined($r->{incompatibilities})) { + foreach my $inc (@{$r->{incompatibilities}}) { + if (! defined($pkg{$inc})) { + print STDERR "WARNING: FAKEING incompatibiltie for <$inc>\n"; + $pkg{$inc} = 'common - THIS IS A FAKE INCOMPATIBILTY'; + } + print DEP "I $inc $pkg{$inc}\n"; + } + } + + close(DEP); +} + +sub +resolve_link +{ + my $file = shift || die ("one argument expected"); + my $count = 0; + + chomp($file); + + while ((-l $file) + && ($count < 10)) { + my $dirname = dirname($file); + $file = readlink($file); + if(! ($file =~ /^\//)) { + $file = $dirname . '/' . $file; + } + $count++; + } + + return $file; +} + +sub +a1minusa2 +{ + my ($a1,$a2) = @_; + my %h; + @h{@$a2} = (1) x @$a2; + return grep {!exists $h{$_}} @$a1; +} + +sub +populate_contents +{ + open(FILE, ${content}) || die("can't open ${content}: $!"); + for my $line () { + # /etc/cron.d/queuedefs f none 0644 root sys 17 1164 1018133064 SUNWcsr + # 0 1 2 3 4 5 6 7 8 9 + my @array = split(/\s+/, $line); + my ($file, $type, @packages) = @array[0, 1, 9 ... $#array]; + if ($type =~ /^f$/) { + push(@{$contents{$file}}, @packages); + } + } + close(FILE); +} + +sub +find_dependencies +{ + my $r = shift || die("one reference expected"); + populate_contents(); + + chdir(${buildroot}) || die("can't change to ${buildroot}: $!"); + # look for shared libaries + my @deps = `gfind @{$r->{filelist}} \\( \\( -type f -perm +111 \\) -o -name \\*.so\\* \\) | xargs ldd 2> /dev/null | grep -v 'file not found' 2> /dev/null | grep '=>' | awk '{print \$3}'`; + + # look for bangs + my @files = `gfind @{$r->{filelist}} -type f -perm +111`; + foreach my $file (@possible_scripts) { + -f "${buildroot}/${file}" && push(@files, "${buildroot}/${file}"); + } + foreach my $file (@files) { + chomp($file); + open(FILE, $file) || die("can't open ${file}: $!"); + my $firstline = ; + if ($firstline =~ /^#!\s?([^\s]+)/) { + push(@deps, "$1\n"); + } + close(FILE); + } + + # resolve symlinks / substitute + @deps = uniq(@deps); + for my $element (@deps) { + # /bin and /lib are packages in /usr/{bin,lib} + $element =~ s#^/bin#/usr/bin#; + $element =~ s#^/lib#/usr/lib#; + # /opt/csw/lib/sparcv8 is a symlink to . + $element =~ s#^/opt/csw/lib/sparcv8#/opt/csw/lib#; + # Resolve links if necessary + $element = resolve_link($element); + } + + # get dependencies + my @newdeps = (); + foreach my $dep (@deps) { + # + $dep =~ s#\w+\/\.\.##g; + + if (defined($contents{$dep})) { + push(@newdeps, @{$contents{$dep}}); + } + } + + # exclude anything that starts with SUNW (but only from discovered + # list, not from the list specified in the spec file) + @newdeps = grep(!/^SUNW/, @newdeps); + push(@{$r->{dependencies}}, @newdeps); + + # make them uniq and don't include a dependency to the packet itself + @{$r->{dependencies}} = grep("CSW$r->{pkgname}" ne $_, uniq(@{$r->{dependencies}})); + + if (defined($r->{exclude_dependencies})) { + @{$r->{dependencies}} = a1minusa2($r->{dependencies}, $r->{exclude_dependencies}); + } + + write_dependencies($r); +} + +sub +strip +{ + system("/usr/ccs/bin/strip ${buildroot}/opt/csw/bin/* ${buildroot}/opt/csw/bin/sparcv8/* ${buildroot}/opt/csw/bin/sparcv8plus/* ${buildroot}/opt/csw/bin/sparcv8plus+vis/* ${buildroot}/opt/csw/bin/sparcv9/* 2> /dev/null"); +} + +sub +generate_pkginfo +{ + my $r = shift || die("one reference expected"); + my $a = $r->{arch} || $defarch; + my $p = $r->{pstamp} || undef; + + chdir(${buildroot}) || die("can't change to ${buildroot}: $!"); + open(PKGINFO, '> pkginfo'); + +print PKGINFO <<"EOF"; +PKG=CSW$r->{pkgname} +NAME=$r->{name} +ARCH=$a +CATEGORY=${category} +VERSION=${version} +VENDOR=${vendor} +HOTLINE=${hotline} +EMAIL=${email} +EOF +print PKGINFO "PSTAMP=$p\n" if ($p); +# DESC=[Optional extra info about software. Omit this line if you wish] + close(PKGINFO); +} + +sub +actually_package +{ + my $r = shift || die("one reference expected"); + my $a = $r->{arch} || $defarch; + + my $filename="$r->{filename}-${version}-SunOS${osversion}-$a-CSW.pkg"; + + chdir(${buildroot}) || die("can't change to ${buildroot}: $!"); + system_dieonfail("/usr/bin/pkgmk -o -r ${buildroot}"); + system_dieonfail("/usr/bin/pkgtrans -s /var/spool/pkg ${packagedir}/$filename CSW$r->{pkgname}"); + unlink("${packagedir}/${filename}.gz"); + system_dieonfail("/usr/bin/gzip ${packagedir}/$filename"); + system("rm -rf /var/spool/pkg/CSW$r->{pkgname}"); + system_dieonfail("/opt/csw/bin/checkpkg ${packagedir}/${filename}.gz"); +} + +# This function makes all files not readable by me readable. This is because +# the bang checker and pkgmk needs this. The correct permissions are allready +# in pkginfo file so everything is as it should be. + +sub +make_all_files_readable_by_user +{ + my $r = shift || die("one reference expected"); + + chdir(${buildroot}) || die("can't change to ${buildroot}: $!"); + system_dieonfail("gfind @{$r->{filelist}} \\( -perm -400 -o -print \\) | xargs -x -n 1 chmod u+r"); +} + +sub +mkpackage +{ + foreach my $r (@packages) { + generate_prototype($r); + make_all_files_readable_by_user($r); + generate_pkginfo($r); + find_dependencies($r); + actually_package($r); + } + + foreach my $key (keys(%seenpaths)) { + if (1 < @{$seenpaths{$key}}) { + print "$key -> @{$seenpaths{$key}}\n"; + } + } +} + +if (! (-d $builddir)) { + mkdir("$builddir", 0755) || die("can't create $builddir: $!"); +} + +#main +# { + +if (! GetOptions(\%options, "p", "b", "c", "s", "u", "rev=s")) { + print <<"__EOF__"; +${RealBin}/${RealScript} [-p] [-b] [-c] [-s] specfile ... + + -p prepare: extract and patch sources + -b build: build and install sources into destenation + -c create: create package + -s show: show build script and exit (high precedence!) + -u cleanUp: remove ${builddir} + -rev use instead of current date + + If no parameter is specified. The given specfile is processed. (eg. + prepared, build and packaged) +__EOF__ + exit(1); +} + +# Unset makeflags +$ENV{'MFLAGS'} = ''; +$ENV{'MAKEFLAGS'} = ''; + +my $infile = shift || die('one argument expected'); + +if (! defined($defarch)) { + $defarch = `/bin/uname -p` || die("can't get arch: $!"); + chomp($defarch); +} + +$sunwspropath = probe_directory(@sunwsprolocs) || die ("couldn't find SUNWspro"); + +eval `/bin/cat $infile`; + +if (! defined($rev)) { + $rev = $options{'rev'} || $ENV{'REV'} || `/bin/date '+20%y.%m.%d'`; +} +chomp ($rev); + +$version .= ',REV=' . ${rev}; + +if (defined($suffix)) { + $version .= $suffix; +} + +if (! defined($osversion)) { + $osversion = `/bin/uname -r`; + chomp($osversion); +} + +if (! -d "${packagedir}") { + system("/bin/mkdir -p ${packagedir}"); +} + +if (! keys(%options)) { + prepare(); + build(); + mkpackage(); + exit(); +} + +if (defined($options{'s'})) { + print $build; + exit(); +} + +if (defined($options{'p'})) { + prepare(); +} + +if (defined($options{'b'})) { + build(); +} + +if (defined($options{'c'})) { + mkpackage(); +} + +if (defined($options{'u'})) { + system("/bin/rm -rf ${builddir}"); +} + +# } Modified: csw/mgar/pkg/mpeg4ip/trunk/Makefile =================================================================== --- csw/mgar/pkg/mpeg4ip/trunk/Makefile 2010-01-04 10:28:15 UTC (rev 7856) +++ csw/mgar/pkg/mpeg4ip/trunk/Makefile 2010-01-04 11:52:34 UTC (rev 7857) @@ -10,9 +10,12 @@ endef SF_PROJ = mpeg4ip +# SF doesn't have the latest version as it was removed due to some breakage +# So we get it from another place and patch the flaw away MASTER_SITES = http://download.m0k.org/handbrake/contrib/ DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz DISTNAME = $(GARNAME) +PATCHFILES = mpeg4ip-1.6.1-mjj.patch # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz Modified: csw/mgar/pkg/mpeg4ip/trunk/checksums =================================================================== --- csw/mgar/pkg/mpeg4ip/trunk/checksums 2010-01-04 10:28:15 UTC (rev 7856) +++ csw/mgar/pkg/mpeg4ip/trunk/checksums 2010-01-04 11:52:34 UTC (rev 7857) @@ -1 +1,2 @@ +0ae174e13da77a783e636aa2904b7c90 mpeg4ip-1.6.1-mjj.patch cd81b566cf2fafc7318f58be8998182c mpeg4ip-1.6.1.tar.gz Added: csw/mgar/pkg/mpeg4ip/trunk/files/mpeg4ip-1.6.1-mjj.patch =================================================================== --- csw/mgar/pkg/mpeg4ip/trunk/files/mpeg4ip-1.6.1-mjj.patch (rev 0) +++ csw/mgar/pkg/mpeg4ip/trunk/files/mpeg4ip-1.6.1-mjj.patch 2010-01-04 11:52:34 UTC (rev 7857) @@ -0,0 +1,304 @@ +Index: mpeg4ip-1.6.1/common/video/iso-mpeg4/src/Makefile.am +=================================================================== +--- mpeg4ip-1.6.1.orig/common/video/iso-mpeg4/src/Makefile.am 2006-02-10 04:57:29.000000000 +1100 ++++ mpeg4ip-1.6.1/common/video/iso-mpeg4/src/Makefile.am 2008-03-28 13:20:24.083621000 +1100 +@@ -1,5 +1,5 @@ + +-AM_CXXFLAGS = -D__TRACE_AND_STATS_ -D__DOUBLE_PRECISION_ -D_REENTRANT -DNOCONTROLS -fexceptions -Wall -Werror -D_OBSS_ @BILLS_CPPWARNINGS@ ++AM_CXXFLAGS = -D__TRACE_AND_STATS_ -D__DOUBLE_PRECISION_ -D_REENTRANT -DNOCONTROLS -fexceptions -Wall -D_OBSS_ @BILLS_CPPWARNINGS@ + + INCLUDES = -I$(srcdir)/../include + +Index: mpeg4ip-1.6.1/common/video/iso-mpeg4/src/Makefile.in +=================================================================== +--- mpeg4ip-1.6.1.orig/common/video/iso-mpeg4/src/Makefile.in 2007-04-27 09:59:31.000000000 +1000 ++++ mpeg4ip-1.6.1/common/video/iso-mpeg4/src/Makefile.in 2008-03-27 01:55:41.267172000 +1100 +@@ -106,7 +106,7 @@ + am__quote = @am__quote@ + install_sh = @install_sh@ + +-AM_CXXFLAGS = -D__TRACE_AND_STATS_ -D__DOUBLE_PRECISION_ -D_REENTRANT -DNOCONTROLS -fexceptions -Wall -Werror -D_OBSS_ @BILLS_CPPWARNINGS@ ++AM_CXXFLAGS = -D__TRACE_AND_STATS_ -D__DOUBLE_PRECISION_ -D_REENTRANT -DNOCONTROLS -fexceptions -Wall -D_OBSS_ @BILLS_CPPWARNINGS@ + + INCLUDES = -I$(srcdir)/../include + +Index: mpeg4ip-1.6.1/common/video/mpeg4-2000/app/convertpar/Makefile.am +=================================================================== +--- mpeg4ip-1.6.1.orig/common/video/mpeg4-2000/app/convertpar/Makefile.am 2003-05-06 07:07:21.000000000 +1000 ++++ mpeg4ip-1.6.1/common/video/mpeg4-2000/app/convertpar/Makefile.am 2008-03-28 13:20:43.452101000 +1100 +@@ -1,6 +1,6 @@ + # + +-AM_CXXFLAGS = -D__TRACE_AND_STATS_ -D__DOUBLE_PRECISION_ -D_REENTRANT -DNOCONTROLS -fexceptions -Wall -Werror -D_OBSS_ ++AM_CXXFLAGS = -D__TRACE_AND_STATS_ -D__DOUBLE_PRECISION_ -D_REENTRANT -DNOCONTROLS -fexceptions -Wall -D_OBSS_ + + check_PROGRAMS = convertpar + +Index: mpeg4ip-1.6.1/common/video/mpeg4-2000/idct/Makefile.am +=================================================================== +--- mpeg4ip-1.6.1.orig/common/video/mpeg4-2000/idct/Makefile.am 2003-11-14 09:08:37.000000000 +1100 ++++ mpeg4ip-1.6.1/common/video/mpeg4-2000/idct/Makefile.am 2008-03-28 13:21:08.940124000 +1100 +@@ -1,6 +1,6 @@ + AM_CFLAGS = -D__TRACE_AND_STATS_ -D__DOUBLE_PRECISION_ -D_OBSS_ -DFGSPOSTCLIP -Wall -Wpointer-arith -Wcast-align -Wmissing-prototypes -fexceptions + +-AM_CXXFLAGS = -D__TRACE_AND_STATS_ -D__DOUBLE_PRECISION_ -D_OBSS_ -DFGSPOSTCLIP -D_REENTRANT -DNOCONTROLS -fexceptions -Wall -Werror ++AM_CXXFLAGS = -D__TRACE_AND_STATS_ -D__DOUBLE_PRECISION_ -D_OBSS_ -DFGSPOSTCLIP -D_REENTRANT -DNOCONTROLS -fexceptions -Wall + + noinst_LTLIBRARIES = libobj_idct.la + +Index: mpeg4ip-1.6.1/configure.in +=================================================================== +--- mpeg4ip-1.6.1.orig/configure.in 2007-11-12 04:39:13.000000000 +1100 ++++ mpeg4ip-1.6.1/configure.in 2008-06-17 22:13:47.888186000 +1000 +@@ -237,7 +237,7 @@ + [have_mpeg2=false]) + if test x$have_mpeg2 = xtrue; then + AC_MSG_CHECKING([libmpeg2 version]) +- AC_COMPILE_IFELSE([#include ++ AC_COMPILE_IFELSE([$ac_includes_default + #include + + #ifndef MPEG2_VERSION +@@ -513,9 +513,9 @@ + AC_DEFINE(HAVE_FFMPEG_INSTALLED, 1, [defined if ffmpeg is installed]) + FFMPEG_INC= + FFMPEG_LIB="-lavcodec -lz $ffmpeg_add_libs" +- AC_CHECK_TYPES([AVRational], , , [#include ]) +- AC_CHECK_MEMBERS(AVCodecContext.time_base, , , [#include ]) +- AC_CHECK_DECLS([avcodec_decode_audio2], , ,[#include ]) ++ AC_CHECK_TYPES([AVRational], , , [#include ]) ++ AC_CHECK_MEMBERS(AVCodecContext.time_base, , , [#include ]) ++ AC_CHECK_DECLS([avcodec_decode_audio2], , ,[#include ]) + AC_DEFINE(HAVE_FFMPEG, 1, [enable ffmpeg for mp4live]) + AC_CHECK_LIB(amrnb, VADxEncoder_Interface_init, + [have_amr_nb=true], [have_amr_nb=false]) +@@ -769,7 +769,7 @@ + + if test x$USENASM = xtrue; then + AC_MSG_CHECKING(nasm version...) +- BILLSNASM_arg=`nasm -r | tr '.' ' '` ++ BILLSNASM_arg=`nasm -v | tr '.' ' '` + BILLSNASM_ret=`util/testnasm.sh $BILLSNASM_arg` + if test x$BILLSNASM_ret = x"yes"; then + USENASM=true +Index: mpeg4ip-1.6.1/cvs_bootstrap +=================================================================== +--- mpeg4ip-1.6.1.orig/cvs_bootstrap 2007-04-27 09:38:03.000000000 +1000 ++++ mpeg4ip-1.6.1/cvs_bootstrap 2008-03-27 15:09:40.972209000 +1100 +@@ -6,7 +6,7 @@ + + # Check that we can find libtool + # Frequently it hasn't been installed +-if glibtool --version > /dev/null 2> /dev/null ++if (glibtool --version >/dev/null 2>/dev/null) + then + libtool=glibtool + if libtoolize --version > /dev/null +@@ -87,19 +87,19 @@ + + # + # This tries to find all the aclocal files that we need +-for dir in /usr/local /usr/contrib /opt/gnome /usr /opt/local +-do +- if test -d $dir/share/aclocal -a `which aclocal` != $dir/bin/aclocal +- then +- ACLOCAL_FLAGS="-I $dir/share/aclocal $ACLOCAL_FLAGS" +- fi +-done +- +-if test $target_system != "CYGWIN_NT-5.1"; then +-ERRCMD=--enable-warns-as-err +-else ++#for dir in /usr/local /usr/contrib /opt/gnome /usr /opt/local ++#do ++# if test -d $dir/share/aclocal -a `which aclocal` != $dir/bin/aclocal ++# then ++# ACLOCAL_FLAGS="-I $dir/share/aclocal $ACLOCAL_FLAGS" ++# fi ++#done ++ ++#if test $target_system != "CYGWIN_NT-5.1"; then ++#ERRCMD=--enable-warns-as-err ++#else + ERRCMD= +-fi ++#fi + + pwd=`pwd` + if test $target_system != "Darwin"; then +Index: mpeg4ip-1.6.1/lib/SDLAudio/configure.in +=================================================================== +--- mpeg4ip-1.6.1.orig/lib/SDLAudio/configure.in 2005-01-18 07:46:07.000000000 +1100 ++++ mpeg4ip-1.6.1/lib/SDLAudio/configure.in 2008-03-27 15:13:02.326777000 +1100 +@@ -45,6 +45,7 @@ + + dnl Check for tools + ++AM_PROG_AS + AC_LIBTOOL_WIN32_DLL + AM_PROG_LIBTOOL + AC_PROG_MAKE_SET +Index: mpeg4ip-1.6.1/lib/gnu/Makefile.am +=================================================================== +--- mpeg4ip-1.6.1.orig/lib/gnu/Makefile.am 2007-11-12 04:39:19.000000000 +1100 ++++ mpeg4ip-1.6.1/lib/gnu/Makefile.am 2008-03-28 13:21:33.278293000 +1100 +@@ -12,5 +12,5 @@ + EXTRA_DIST = libmissing60.dsp libmissing.vcproj \ + need_for_win32.c + +-AM_CFLAGS = -D_REENTRANT -Werror -Wall -Wcast-align -Wstrict-prototypes -Wmissing-prototypes ++AM_CFLAGS = -D_REENTRANT -Wall -Wcast-align -Wstrict-prototypes -Wmissing-prototypes + +Index: mpeg4ip-1.6.1/lib/gnu/Makefile.in +=================================================================== +--- mpeg4ip-1.6.1.orig/lib/gnu/Makefile.in 2007-11-12 05:04:47.000000000 +1100 ++++ mpeg4ip-1.6.1/lib/gnu/Makefile.in 2008-03-27 01:56:56.241400000 +1100 +@@ -141,7 +141,7 @@ + need_for_win32.c + + +-AM_CFLAGS = -D_REENTRANT -Werror -Wall -Wcast-align -Wstrict-prototypes -Wmissing-prototypes ++AM_CFLAGS = -D_REENTRANT -Wall -Wcast-align -Wstrict-prototypes -Wmissing-prototypes + subdir = lib/gnu + mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs + CONFIG_HEADER = $(top_builddir)/mpeg4ip_config.h +Index: mpeg4ip-1.6.1/lib/rtp/Makefile.am +=================================================================== +--- mpeg4ip-1.6.1.orig/lib/rtp/Makefile.am 2007-11-12 04:39:25.000000000 +1100 ++++ mpeg4ip-1.6.1/lib/rtp/Makefile.am 2008-03-28 13:23:26.489602000 +1100 +@@ -74,7 +74,7 @@ + + check_PROGRAMS = test_rtp_client test_rtp_server + +-AM_CFLAGS = -DDEBUG -Wall -Werror ++AM_CFLAGS = -DDEBUG -Wall + test_rtp_client_SOURCES = test_rtp_client.c + test_rtp_client_LDADD = libuclmmbase.la \ + $(top_builddir)/lib/utils/libmutex.la \ +Index: mpeg4ip-1.6.1/lib/rtp/Makefile.in +=================================================================== +--- mpeg4ip-1.6.1.orig/lib/rtp/Makefile.in 2007-11-12 05:04:25.000000000 +1100 ++++ mpeg4ip-1.6.1/lib/rtp/Makefile.in 2008-03-27 01:54:27.572853000 +1100 +@@ -202,7 +202,7 @@ + + check_PROGRAMS = test_rtp_client test_rtp_server + +-AM_CFLAGS = -DDEBUG -Wall -Werror ++AM_CFLAGS = -DDEBUG -Wall + test_rtp_client_SOURCES = test_rtp_client.c + test_rtp_client_LDADD = libuclmmbase.la \ + $(top_builddir)/lib/utils/libmutex.la \ +Index: mpeg4ip-1.6.1/lib/rtp/configure.in +=================================================================== +--- mpeg4ip-1.6.1.orig/lib/rtp/configure.in 2006-03-21 10:13:25.000000000 +1100 ++++ mpeg4ip-1.6.1/lib/rtp/configure.in 2008-03-28 13:22:21.554566000 +1100 +@@ -275,7 +275,7 @@ + [AC_MSG_NOTICE([compiler warnings will not be errs])]) + + BILLS_CWARNINGS="$BASE_ERR" +-CFLAGS="$CFLAGS -Wall -Werror" ++CFLAGS="$CFLAGS -Wall" + MY_CHECK_CC_OPT_SET([-Wmissing-prototypes], BILLS_CWARNINGS, [c compiler]) + MY_CHECK_CC_OPT_SET([-Wmissing-declarations], BILLS_CWARNINGS, [c compiler]) + MY_CHECK_CC_OPT_SET([-Wbad-function-cast], BILLS_CWARNINGS, [c compiler]) +Index: mpeg4ip-1.6.1/lib/rtp/rtp.c +=================================================================== +--- mpeg4ip-1.6.1.orig/lib/rtp/rtp.c 2007-01-23 04:31:08.000000000 +1100 ++++ mpeg4ip-1.6.1/lib/rtp/rtp.c 2008-03-27 01:54:27.582899000 +1100 +@@ -2489,6 +2489,9 @@ + buffer_len += iov[i].iov_len; + } + if (buffer_len > session->m_output_buffer_size) { ++#ifndef MAX ++#define MAX(a,b) (((a)>(b))?(a):(b)) ++#endif + session->m_output_buffer = (uint8_t *)xrealloc(session->m_output_buffer, + MAX(buffer_len, 1500)); + session->m_output_buffer_size = MAX(buffer_len, 1500); +Index: mpeg4ip-1.6.1/player/lib/audio/faad/Makefile.in +=================================================================== +--- mpeg4ip-1.6.1.orig/player/lib/audio/faad/Makefile.in 2007-11-12 05:03:57.000000000 +1100 ++++ mpeg4ip-1.6.1/player/lib/audio/faad/Makefile.in 2008-03-27 01:57:58.796587000 +1100 +@@ -161,7 +161,7 @@ + util.h + + INCLUDES = -I$(top_srcdir)/include +-AM_CFLAGS = -O2 -Werror -Wall -fexceptions -fno-strict-aliasing ++AM_CFLAGS = -O2 -Wall -fexceptions -fno-strict-aliasing + + EXTRA_DIST = COPYING libfaad60.dsp README libfaad.vcproj + subdir = player/lib/audio/faad +Index: mpeg4ip-1.6.1/player/plugin/audio/ffmpeg/ffmpeg.h +=================================================================== +--- mpeg4ip-1.6.1.orig/player/plugin/audio/ffmpeg/ffmpeg.h 2007-11-12 04:39:28.000000000 +1100 ++++ mpeg4ip-1.6.1/player/plugin/audio/ffmpeg/ffmpeg.h 2008-06-17 22:11:13.309632000 +1000 +@@ -26,7 +26,7 @@ + #include "codec_plugin.h" + extern "C" { + #ifdef HAVE_FFMPEG_INSTALLED +-#include ++#include + #else + #include + #endif +Index: mpeg4ip-1.6.1/player/plugin/video/ffmpeg/ffmpeg.h +=================================================================== +--- mpeg4ip-1.6.1.orig/player/plugin/video/ffmpeg/ffmpeg.h 2007-11-12 04:39:30.000000000 +1100 ++++ mpeg4ip-1.6.1/player/plugin/video/ffmpeg/ffmpeg.h 2008-06-17 22:11:20.199119000 +1000 +@@ -27,7 +27,7 @@ + #include "codec_plugin.h" + extern "C" { + #ifdef HAVE_FFMPEG_INSTALLED +-#include ++#include + #else + #include + #endif +Index: mpeg4ip-1.6.1/server/mp4live/audio_ffmpeg.h +=================================================================== +--- mpeg4ip-1.6.1.orig/server/mp4live/audio_ffmpeg.h 2007-11-12 04:39:33.000000000 +1100 ++++ mpeg4ip-1.6.1/server/mp4live/audio_ffmpeg.h 2008-06-17 22:11:24.108828000 +1000 +@@ -25,7 +25,7 @@ + #include "audio_encoder.h" + extern "C" { + #ifdef HAVE_FFMPEG_INSTALLED +-#include ++#include + #else + #include + #endif +Index: mpeg4ip-1.6.1/server/mp4live/video_encoder_class.cpp +=================================================================== +--- mpeg4ip-1.6.1.orig/server/mp4live/video_encoder_class.cpp 2007-11-12 04:39:33.000000000 +1100 ++++ mpeg4ip-1.6.1/server/mp4live/video_encoder_class.cpp 2008-06-17 22:11:28.738579000 +1000 +@@ -27,7 +27,7 @@ + #ifdef HAVE_FFMPEG + extern "C" { + #ifdef HAVE_FFMPEG_INSTALLED +-#include ++#include + #else + #include + #endif +Index: mpeg4ip-1.6.1/server/mp4live/video_ffmpeg.h +=================================================================== +--- mpeg4ip-1.6.1.orig/server/mp4live/video_ffmpeg.h 2007-11-12 04:39:33.000000000 +1100 ++++ mpeg4ip-1.6.1/server/mp4live/video_ffmpeg.h 2008-06-17 22:11:32.758184000 +1000 +@@ -25,7 +25,7 @@ + #include "video_encoder.h" + extern "C" { + #ifdef HAVE_FFMPEG_INSTALLED +-#include ++#include + #else + #include + #endif +Index: mpeg4ip-1.6.1/server/util/mp4encode/Makefile.am +=================================================================== +--- mpeg4ip-1.6.1.orig/server/util/mp4encode/Makefile.am 2004-08-18 07:38:06.000000000 +1000 ++++ mpeg4ip-1.6.1/server/util/mp4encode/Makefile.am 2008-03-27 01:54:27.592870000 +1100 +@@ -1 +1,3 @@ +-EXTRA_DIST = mp4encode mp4venc_template.par ++EXTRA_DIST = mp4venc_template.par ++ ++bin_SCRIPTS = mp4encode This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Mon Jan 4 14:38:21 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Mon, 04 Jan 2010 13:38:21 +0000 Subject: [csw-devel] SF.net SVN: gar:[7858] csw/mgar/gar/v2/bin/checkpkg.d/testdata/README Message-ID: Revision: 7858 http://gar.svn.sourceforge.net/gar/?rev=7858&view=rev Author: wahwah Date: 2010-01-04 13:38:20 +0000 (Mon, 04 Jan 2010) Log Message: ----------- mGAR v2: Adding a readme file for the test data Added Paths: ----------- csw/mgar/gar/v2/bin/checkpkg.d/testdata/README Added: csw/mgar/gar/v2/bin/checkpkg.d/testdata/README =================================================================== --- csw/mgar/gar/v2/bin/checkpkg.d/testdata/README (rev 0) +++ csw/mgar/gar/v2/bin/checkpkg.d/testdata/README 2010-01-04 13:38:20 UTC (rev 7858) @@ -0,0 +1,4 @@ +$Id$ + +This directory holds unit test input data. There currently is no better place +to put them, so they have to be distributed together with the main GAR code. Property changes on: csw/mgar/gar/v2/bin/checkpkg.d/testdata/README ___________________________________________________________________ Added: svn:keywords + Id This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Mon Jan 4 15:00:16 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Mon, 04 Jan 2010 14:00:16 +0000 Subject: [csw-devel] SF.net SVN: gar:[7859] csw/mgar/gar/v2/bin/checkpkg.d/README Message-ID: Revision: 7859 http://gar.svn.sourceforge.net/gar/?rev=7859&view=rev Author: wahwah Date: 2010-01-04 14:00:16 +0000 (Mon, 04 Jan 2010) Log Message: ----------- mGAR v2: Adding checkpkg.d-level README file Added Paths: ----------- csw/mgar/gar/v2/bin/checkpkg.d/README Added: csw/mgar/gar/v2/bin/checkpkg.d/README =================================================================== --- csw/mgar/gar/v2/bin/checkpkg.d/README (rev 0) +++ csw/mgar/gar/v2/bin/checkpkg.d/README 2010-01-04 14:00:16 UTC (rev 7859) @@ -0,0 +1,11 @@ +$Id$ + +This directory contains modular checks. Each check is an executable file, +written in any language, accepting specific command line options and returning +the result as a status exit code. + +To see the required flags, issue: + +./checkpkg-dummy.py -h + +Each test's file name must begin with "checkpkg-". Property changes on: csw/mgar/gar/v2/bin/checkpkg.d/README ___________________________________________________________________ Added: svn:keywords + Id This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Mon Jan 4 15:59:02 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Mon, 04 Jan 2010 14:59:02 +0000 Subject: [csw-devel] SF.net SVN: gar:[7860] csw/mgar/pkg/mpeg4ip/trunk Message-ID: Revision: 7860 http://gar.svn.sourceforge.net/gar/?rev=7860&view=rev Author: dmichelsen Date: 2010-01-04 14:59:02 +0000 (Mon, 04 Jan 2010) Log Message: ----------- mpeg4ip: Commit patches Modified Paths: -------------- csw/mgar/pkg/mpeg4ip/trunk/Makefile csw/mgar/pkg/mpeg4ip/trunk/checksums Added Paths: ----------- csw/mgar/pkg/mpeg4ip/trunk/files/0001-Bootstrap-again.patch Modified: csw/mgar/pkg/mpeg4ip/trunk/Makefile =================================================================== --- csw/mgar/pkg/mpeg4ip/trunk/Makefile 2010-01-04 14:00:16 UTC (rev 7859) +++ csw/mgar/pkg/mpeg4ip/trunk/Makefile 2010-01-04 14:59:02 UTC (rev 7860) @@ -15,7 +15,8 @@ MASTER_SITES = http://download.m0k.org/handbrake/contrib/ DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz DISTNAME = $(GARNAME) -PATCHFILES = mpeg4ip-1.6.1-mjj.patch +# PATCHFILES = mpeg4ip-1.6.1-mjj.patch +PATCHFILES += 0001-Bootstrap-again.patch # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz Modified: csw/mgar/pkg/mpeg4ip/trunk/checksums =================================================================== --- csw/mgar/pkg/mpeg4ip/trunk/checksums 2010-01-04 14:00:16 UTC (rev 7859) +++ csw/mgar/pkg/mpeg4ip/trunk/checksums 2010-01-04 14:59:02 UTC (rev 7860) @@ -1,2 +1,2 @@ -0ae174e13da77a783e636aa2904b7c90 mpeg4ip-1.6.1-mjj.patch +68f13fa229cb7e3cc9bd8b4b693766be 0001-Bootstrap-again.patch cd81b566cf2fafc7318f58be8998182c mpeg4ip-1.6.1.tar.gz Added: csw/mgar/pkg/mpeg4ip/trunk/files/0001-Bootstrap-again.patch =================================================================== --- csw/mgar/pkg/mpeg4ip/trunk/files/0001-Bootstrap-again.patch (rev 0) +++ csw/mgar/pkg/mpeg4ip/trunk/files/0001-Bootstrap-again.patch 2010-01-04 14:59:02 UTC (rev 7860) @@ -0,0 +1,149274 @@ +From 55f208309fcf9f18267158f26058a8630721d28f Mon Sep 17 00:00:00 2001 +From: Dagobert Michelsen +Date: Mon, 4 Jan 2010 14:38:17 +0100 +Subject: [PATCH] Bootstrap again + +--- + common/video/iso-mpeg4/config.guess | 1502 ++- + common/video/iso-mpeg4/config.sub | 1706 +++- + common/video/iso-mpeg4/depcomp | 631 +- + common/video/iso-mpeg4/install-sh | 521 +- + common/video/iso-mpeg4/libtool | 8978 ++++++++----- + common/video/iso-mpeg4/ltmain.sh | 8407 +++++++++++- + common/video/iso-mpeg4/missing | 377 +- + common/video/iso-mpeg4/mkinstalldirs | 163 +- + common/video/iso-mpeg4/mpeg4-2000.h | 18 +- + config.guess | 1502 ++- + config.sub | 1706 +++- + configure | 2 +- + configure.in | 2 +- + depcomp | 631 +- + install-sh | 521 +- + lib/SDLAudio/INSTALL | 365 + + lib/SDLAudio/Makefile.in | 788 ++ + lib/SDLAudio/aclocal.m4 | 8920 ++++++++++++ + lib/SDLAudio/autom4te.cache/output.0 |20944 ++++++++++++++++++++++++++++ + lib/SDLAudio/autom4te.cache/output.1 |20940 +++++++++++++++++++++++++++ + lib/SDLAudio/autom4te.cache/requests | 278 + + lib/SDLAudio/autom4te.cache/traces.0 | 2968 ++++ + lib/SDLAudio/autom4te.cache/traces.1 | 1142 ++ + lib/SDLAudio/configure |20940 +++++++++++++++++++++++++++ + lib/SDLAudio/include/Makefile.in | 414 + + lib/SDLAudio/libtool | 9061 ++++++++++++ + lib/SDLAudio/src/Makefile.in | 726 + + lib/SDLAudio/src/audio/Makefile.in | 726 + + lib/SDLAudio/src/audio/alsa/Makefile.in | 526 + + lib/SDLAudio/src/audio/arts/Makefile.in | 527 + + lib/SDLAudio/src/audio/baudio/Makefile.in | 536 + + lib/SDLAudio/src/audio/dc/Makefile.in | 530 + + lib/SDLAudio/src/audio/disk/Makefile.in | 527 + + lib/SDLAudio/src/audio/dma/Makefile.in | 527 + + lib/SDLAudio/src/audio/dmedia/Makefile.in | 527 + + lib/SDLAudio/src/audio/dsp/Makefile.in | 527 + + lib/SDLAudio/src/audio/esd/Makefile.in | 527 + + lib/SDLAudio/src/audio/macrom/Makefile.in | 527 + + lib/SDLAudio/src/audio/mint/Makefile.in | 573 + + lib/SDLAudio/src/audio/mme/Makefile.in | 527 + + lib/SDLAudio/src/audio/nas/Makefile.in | 527 + + lib/SDLAudio/src/audio/nto/Makefile.in | 527 + + lib/SDLAudio/src/audio/openbsd/Makefile.in | 527 + + lib/SDLAudio/src/audio/paudio/Makefile.in | 527 + + lib/SDLAudio/src/audio/riscos/Makefile.in | 527 + + lib/SDLAudio/src/audio/sun/Makefile.in | 527 + + lib/SDLAudio/src/audio/ums/Makefile.in | 527 + + lib/SDLAudio/src/audio/windib/Makefile.in | 527 + + lib/SDLAudio/src/audio/windx5/Makefile.in | 527 + + libtool | 8978 ++++++++----- + ltmain.sh | 8407 +++++++++++- + missing | 377 +- + mkinstalldirs | 163 +- + mpeg4ip-config | 4 +- + mpeg4ip_config.h | 24 +- + 55 files changed, 136901 insertions(+), 7055 deletions(-) + mode change 120000 => 100755 common/video/iso-mpeg4/config.guess + mode change 120000 => 100755 common/video/iso-mpeg4/config.sub + mode change 120000 => 100755 common/video/iso-mpeg4/depcomp + mode change 120000 => 100755 common/video/iso-mpeg4/install-sh + mode change 120000 => 100755 common/video/iso-mpeg4/ltmain.sh + mode change 120000 => 100755 common/video/iso-mpeg4/missing + mode change 120000 => 100755 common/video/iso-mpeg4/mkinstalldirs + mode change 120000 => 100755 config.guess + mode change 120000 => 100755 config.sub + mode change 120000 => 100755 depcomp + mode change 120000 => 100755 install-sh + create mode 100644 lib/SDLAudio/AUTHORS + create mode 100644 lib/SDLAudio/ChangeLog + create mode 100644 lib/SDLAudio/INSTALL + create mode 100644 lib/SDLAudio/Makefile.in + create mode 100644 lib/SDLAudio/NEWS + create mode 100644 lib/SDLAudio/aclocal.m4 + create mode 100644 lib/SDLAudio/autom4te.cache/output.0 + create mode 100644 lib/SDLAudio/autom4te.cache/output.1 + create mode 100644 lib/SDLAudio/autom4te.cache/requests + create mode 100644 lib/SDLAudio/autom4te.cache/traces.0 + create mode 100644 lib/SDLAudio/autom4te.cache/traces.1 + create mode 100755 lib/SDLAudio/configure + create mode 100644 lib/SDLAudio/include/Makefile.in + create mode 100755 lib/SDLAudio/libtool + create mode 100644 lib/SDLAudio/src/Makefile.in + create mode 100644 lib/SDLAudio/src/audio/Makefile.in + create mode 100644 lib/SDLAudio/src/audio/alsa/Makefile.in + create mode 100644 lib/SDLAudio/src/audio/arts/Makefile.in + create mode 100644 lib/SDLAudio/src/audio/baudio/Makefile.in + create mode 100644 lib/SDLAudio/src/audio/dc/Makefile.in + create mode 100644 lib/SDLAudio/src/audio/disk/Makefile.in + create mode 100644 lib/SDLAudio/src/audio/dma/Makefile.in + create mode 100644 lib/SDLAudio/src/audio/dmedia/Makefile.in + create mode 100644 lib/SDLAudio/src/audio/dsp/Makefile.in + create mode 100644 lib/SDLAudio/src/audio/esd/Makefile.in + create mode 100644 lib/SDLAudio/src/audio/macrom/Makefile.in + create mode 100644 lib/SDLAudio/src/audio/mint/Makefile.in + create mode 100644 lib/SDLAudio/src/audio/mme/Makefile.in + create mode 100644 lib/SDLAudio/src/audio/nas/Makefile.in + create mode 100644 lib/SDLAudio/src/audio/nto/Makefile.in + create mode 100644 lib/SDLAudio/src/audio/openbsd/Makefile.in + create mode 100644 lib/SDLAudio/src/audio/paudio/Makefile.in + create mode 100644 lib/SDLAudio/src/audio/riscos/Makefile.in + create mode 100644 lib/SDLAudio/src/audio/sun/Makefile.in + create mode 100644 lib/SDLAudio/src/audio/ums/Makefile.in + create mode 100644 lib/SDLAudio/src/audio/windib/Makefile.in + create mode 100644 lib/SDLAudio/src/audio/windx5/Makefile.in + mode change 120000 => 100755 ltmain.sh + mode change 120000 => 100755 missing + mode change 120000 => 100755 mkinstalldirs + +diff --git a/common/video/iso-mpeg4/config.guess b/common/video/iso-mpeg4/config.guess +deleted file mode 120000 +index d0bb19b..0000000 +--- a/common/video/iso-mpeg4/config.guess ++++ /dev/null +@@ -1 +0,0 @@ +-/usr/share/libtool/config.guess +\ No newline at end of file +diff --git a/common/video/iso-mpeg4/config.guess b/common/video/iso-mpeg4/config.guess +new file mode 100755 +index 0000000..dc84c68 +--- /dev/null ++++ b/common/video/iso-mpeg4/config.guess +@@ -0,0 +1,1501 @@ ++#! /bin/sh ++# Attempt to guess a canonical system name. ++# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, ++# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 ++# Free Software Foundation, Inc. ++ ++timestamp='2009-11-20' ++ ++# This file is free software; you can redistribute it and/or modify it ++# under the terms of the GNU General Public License as published by ++# the Free Software Foundation; either version 2 of the License, or ++# (at your option) any later version. ++# ++# This program is distributed in the hope that it will be useful, but ++# WITHOUT ANY WARRANTY; without even the implied warranty of ++# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ++# General Public License for more details. ++# ++# You should have received a copy of the GNU General Public License ++# along with this program; if not, write to the Free Software ++# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA ++# 02110-1301, USA. ++# ++# As a special exception to the GNU General Public License, if you ++# distribute this file as part of a program that contains a ++# configuration script generated by Autoconf, you may include it under ++# the same distribution terms that you use for the rest of that program. ++ ++ ++# Originally written by Per Bothner. Please send patches (context ++# diff format) to and include a ChangeLog ++# entry. ++# ++# This script attempts to guess a canonical system name similar to ++# config.sub. If it succeeds, it prints the system name on stdout, and ++# exits with 0. Otherwise, it exits with 1. ++# ++# You can get the latest version of this script from: ++# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD ++ ++me=`echo "$0" | sed -e 's,.*/,,'` ++ ++usage="\ ++Usage: $0 [OPTION] ++ ++Output the configuration name of the system \`$me' is run on. ++ ++Operation modes: ++ -h, --help print this help, then exit ++ -t, --time-stamp print date of last modification, then exit ++ -v, --version print version number, then exit ++ ++Report bugs and patches to ." ++ ++version="\ ++GNU config.guess ($timestamp) ++ ++Originally written by Per Bothner. ++Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, ++2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. ++ ++This is free software; see the source for copying conditions. There is NO ++warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." ++ ++help=" ++Try \`$me --help' for more information." ++ ++# Parse command line ++while test $# -gt 0 ; do ++ case $1 in ++ --time-stamp | --time* | -t ) ++ echo "$timestamp" ; exit ;; ++ --version | -v ) ++ echo "$version" ; exit ;; ++ --help | --h* | -h ) ++ echo "$usage"; exit ;; ++ -- ) # Stop option processing ++ shift; break ;; ++ - ) # Use stdin as input. ++ break ;; ++ -* ) ++ echo "$me: invalid option $1$help" >&2 ++ exit 1 ;; ++ * ) ++ break ;; ++ esac ++done ++ ++if test $# != 0; then ++ echo "$me: too many arguments$help" >&2 ++ exit 1 ++fi ++ ++trap 'exit 1' 1 2 15 ++ ++# CC_FOR_BUILD -- compiler used by this script. Note that the use of a ++# compiler to aid in system detection is discouraged as it requires ++# temporary files to be created and, as you can see below, it is a ++# headache to deal with in a portable fashion. ++ ++# Historically, `CC_FOR_BUILD' used to be named `HOST_CC'. We still ++# use `HOST_CC' if defined, but it is deprecated. ++ ++# Portable tmp directory creation inspired by the Autoconf team. ++ ++set_cc_for_build=' ++trap "exitcode=\$?; (rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null) && exit \$exitcode" 0 ; ++trap "rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null; exit 1" 1 2 13 15 ; ++: ${TMPDIR=/tmp} ; ++ { tmp=`(umask 077 && mktemp -d "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } || ++ { test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir $tmp) ; } || ++ { tmp=$TMPDIR/cg-$$ && (umask 077 && mkdir $tmp) && echo "Warning: creating insecure temp directory" >&2 ; } || ++ { echo "$me: cannot create a temporary directory in $TMPDIR" >&2 ; exit 1 ; } ; ++dummy=$tmp/dummy ; ++tmpfiles="$dummy.c $dummy.o $dummy.rel $dummy" ; ++case $CC_FOR_BUILD,$HOST_CC,$CC in ++ ,,) echo "int x;" > $dummy.c ; ++ for c in cc gcc c89 c99 ; do ++ if ($c -c -o $dummy.o $dummy.c) >/dev/null 2>&1 ; then ++ CC_FOR_BUILD="$c"; break ; ++ fi ; ++ done ; ++ if test x"$CC_FOR_BUILD" = x ; then ++ CC_FOR_BUILD=no_compiler_found ; ++ fi ++ ;; ++ ,,*) CC_FOR_BUILD=$CC ;; ++ ,*,*) CC_FOR_BUILD=$HOST_CC ;; ++esac ; set_cc_for_build= ;' ++ ++# This is needed to find uname on a Pyramid OSx when run in the BSD universe. ++# (ghazi at noc.rutgers.edu 1994-08-24) ++if (test -f /.attbin/uname) >/dev/null 2>&1 ; then ++ PATH=$PATH:/.attbin ; export PATH ++fi ++ ++UNAME_MACHINE=`(uname -m) 2>/dev/null` || UNAME_MACHINE=unknown ++UNAME_RELEASE=`(uname -r) 2>/dev/null` || UNAME_RELEASE=unknown ++UNAME_SYSTEM=`(uname -s) 2>/dev/null` || UNAME_SYSTEM=unknown ++UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown ++ ++# Note: order is significant - the case branches are not exclusive. ++ ++case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in ++ *:NetBSD:*:*) ++ # NetBSD (nbsd) targets should (where applicable) match one or ++ # more of the tupples: *-*-netbsdelf*, *-*-netbsdaout*, ++ # *-*-netbsdecoff* and *-*-netbsd*. For targets that recently ++ # switched to ELF, *-*-netbsd* would select the old ++ # object file format. This provides both forward ++ # compatibility and a consistent mechanism for selecting the ++ # object file format. ++ # ++ # Note: NetBSD doesn't particularly care about the vendor ++ # portion of the name. We always set it to "unknown". ++ sysctl="sysctl -n hw.machine_arch" ++ UNAME_MACHINE_ARCH=`(/sbin/$sysctl 2>/dev/null || \ ++ /usr/sbin/$sysctl 2>/dev/null || echo unknown)` ++ case "${UNAME_MACHINE_ARCH}" in ++ armeb) machine=armeb-unknown ;; ++ arm*) machine=arm-unknown ;; ++ sh3el) machine=shl-unknown ;; ++ sh3eb) machine=sh-unknown ;; ++ sh5el) machine=sh5le-unknown ;; ++ *) machine=${UNAME_MACHINE_ARCH}-unknown ;; ++ esac ++ # The Operating System including object format, if it has switched ++ # to ELF recently, or will in the future. ++ case "${UNAME_MACHINE_ARCH}" in ++ arm*|i386|m68k|ns32k|sh3*|sparc|vax) ++ eval $set_cc_for_build ++ if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \ ++ | grep -q __ELF__ ++ then ++ # Once all utilities can be ECOFF (netbsdecoff) or a.out (netbsdaout). ++ # Return netbsd for either. FIX? ++ os=netbsd ++ else ++ os=netbsdelf ++ fi ++ ;; ++ *) ++ os=netbsd ++ ;; ++ esac ++ # The OS release ++ # Debian GNU/NetBSD machines have a different userland, and ++ # thus, need a distinct triplet. However, they do not need ++ # kernel version information, so it can be replaced with a ++ # suitable tag, in the style of linux-gnu. ++ case "${UNAME_VERSION}" in ++ Debian*) ++ release='-gnu' ++ ;; ++ *) ++ release=`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'` ++ ;; ++ esac ++ # Since CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM: ++ # contains redundant information, the shorter form: ++ # CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used. ++ echo "${machine}-${os}${release}" ++ exit ;; ++ *:OpenBSD:*:*) ++ UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'` ++ echo ${UNAME_MACHINE_ARCH}-unknown-openbsd${UNAME_RELEASE} ++ exit ;; ++ *:ekkoBSD:*:*) ++ echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE} ++ exit ;; ++ *:SolidBSD:*:*) ++ echo ${UNAME_MACHINE}-unknown-solidbsd${UNAME_RELEASE} ++ exit ;; ++ macppc:MirBSD:*:*) ++ echo powerpc-unknown-mirbsd${UNAME_RELEASE} ++ exit ;; ++ *:MirBSD:*:*) ++ echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE} ++ exit ;; ++ alpha:OSF1:*:*) ++ case $UNAME_RELEASE in ++ *4.0) ++ UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'` ++ ;; ++ *5.*) ++ UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'` ++ ;; ++ esac ++ # According to Compaq, /usr/sbin/psrinfo has been available on ++ # OSF/1 and Tru64 systems produced since 1995. I hope that ++ # covers most systems running today. This code pipes the CPU ++ # types through head -n 1, so we only detect the type of CPU 0. ++ ALPHA_CPU_TYPE=`/usr/sbin/psrinfo -v | sed -n -e 's/^ The alpha \(.*\) processor.*$/\1/p' | head -n 1` ++ case "$ALPHA_CPU_TYPE" in ++ "EV4 (21064)") ++ UNAME_MACHINE="alpha" ;; ++ "EV4.5 (21064)") ++ UNAME_MACHINE="alpha" ;; ++ "LCA4 (21066/21068)") ++ UNAME_MACHINE="alpha" ;; ++ "EV5 (21164)") ++ UNAME_MACHINE="alphaev5" ;; ++ "EV5.6 (21164A)") ++ UNAME_MACHINE="alphaev56" ;; ++ "EV5.6 (21164PC)") ++ UNAME_MACHINE="alphapca56" ;; ++ "EV5.7 (21164PC)") ++ UNAME_MACHINE="alphapca57" ;; ++ "EV6 (21264)") ++ UNAME_MACHINE="alphaev6" ;; ++ "EV6.7 (21264A)") ++ UNAME_MACHINE="alphaev67" ;; ++ "EV6.8CB (21264C)") ++ UNAME_MACHINE="alphaev68" ;; ++ "EV6.8AL (21264B)") ++ UNAME_MACHINE="alphaev68" ;; ++ "EV6.8CX (21264D)") ++ UNAME_MACHINE="alphaev68" ;; ++ "EV6.9A (21264/EV69A)") ++ UNAME_MACHINE="alphaev69" ;; ++ "EV7 (21364)") ++ UNAME_MACHINE="alphaev7" ;; ++ "EV7.9 (21364A)") ++ UNAME_MACHINE="alphaev79" ;; ++ esac ++ # A Pn.n version is a patched version. ++ # A Vn.n version is a released version. ++ # A Tn.n version is a released field test version. ++ # A Xn.n version is an unreleased experimental baselevel. ++ # 1.2 uses "1.2" for uname -r. ++ echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` ++ exit ;; ++ Alpha\ *:Windows_NT*:*) ++ # How do we know it's Interix rather than the generic POSIX subsystem? ++ # Should we change UNAME_MACHINE based on the output of uname instead ++ # of the specific Alpha model? ++ echo alpha-pc-interix ++ exit ;; ++ 21064:Windows_NT:50:3) ++ echo alpha-dec-winnt3.5 ++ exit ;; ++ Amiga*:UNIX_System_V:4.0:*) ++ echo m68k-unknown-sysv4 ++ exit ;; ++ *:[Aa]miga[Oo][Ss]:*:*) ++ echo ${UNAME_MACHINE}-unknown-amigaos ++ exit ;; ++ *:[Mm]orph[Oo][Ss]:*:*) ++ echo ${UNAME_MACHINE}-unknown-morphos ++ exit ;; ++ *:OS/390:*:*) ++ echo i370-ibm-openedition ++ exit ;; ++ *:z/VM:*:*) ++ echo s390-ibm-zvmoe ++ exit ;; ++ *:OS400:*:*) ++ echo powerpc-ibm-os400 ++ exit ;; ++ arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*) ++ echo arm-acorn-riscix${UNAME_RELEASE} ++ exit ;; ++ arm:riscos:*:*|arm:RISCOS:*:*) ++ echo arm-unknown-riscos ++ exit ;; ++ SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*) ++ echo hppa1.1-hitachi-hiuxmpp ++ exit ;; ++ Pyramid*:OSx*:*:* | MIS*:OSx*:*:* | MIS*:SMP_DC-OSx*:*:*) ++ # akee at wpdis03.wpafb.af.mil (Earle F. Ake) contributed MIS and NILE. ++ if test "`(/bin/universe) 2>/dev/null`" = att ; then ++ echo pyramid-pyramid-sysv3 ++ else ++ echo pyramid-pyramid-bsd ++ fi ++ exit ;; ++ NILE*:*:*:dcosx) ++ echo pyramid-pyramid-svr4 ++ exit ;; ++ DRS?6000:unix:4.0:6*) ++ echo sparc-icl-nx6 ++ exit ;; ++ DRS?6000:UNIX_SV:4.2*:7* | DRS?6000:isis:4.2*:7*) ++ case `/usr/bin/uname -p` in ++ sparc) echo sparc-icl-nx7; exit ;; ++ esac ;; ++ s390x:SunOS:*:*) ++ echo ${UNAME_MACHINE}-ibm-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` ++ exit ;; ++ sun4H:SunOS:5.*:*) ++ echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` ++ exit ;; ++ sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*) ++ echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` ++ exit ;; ++ i86pc:AuroraUX:5.*:* | i86xen:AuroraUX:5.*:*) ++ echo i386-pc-auroraux${UNAME_RELEASE} ++ exit ;; ++ i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*) ++ eval $set_cc_for_build ++ SUN_ARCH="i386" ++ # If there is a compiler, see if it is configured for 64-bit objects. ++ # Note that the Sun cc does not turn __LP64__ into 1 like gcc does. ++ # This test works for both compilers. ++ if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then ++ if (echo '#ifdef __amd64'; echo IS_64BIT_ARCH; echo '#endif') | \ ++ (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \ ++ grep IS_64BIT_ARCH >/dev/null ++ then ++ SUN_ARCH="x86_64" ++ fi ++ fi ++ echo ${SUN_ARCH}-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` ++ exit ;; ++ sun4*:SunOS:6*:*) ++ # According to config.sub, this is the proper way to canonicalize ++ # SunOS6. Hard to guess exactly what SunOS6 will be like, but ++ # it's likely to be more like Solaris than SunOS4. ++ echo sparc-sun-solaris3`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` ++ exit ;; ++ sun4*:SunOS:*:*) ++ case "`/usr/bin/arch -k`" in ++ Series*|S4*) ++ UNAME_RELEASE=`uname -v` ++ ;; ++ esac ++ # Japanese Language versions have a version number like `4.1.3-JL'. ++ echo sparc-sun-sunos`echo ${UNAME_RELEASE}|sed -e 's/-/_/'` ++ exit ;; ++ sun3*:SunOS:*:*) ++ echo m68k-sun-sunos${UNAME_RELEASE} ++ exit ;; ++ sun*:*:4.2BSD:*) ++ UNAME_RELEASE=`(sed 1q /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null` ++ test "x${UNAME_RELEASE}" = "x" && UNAME_RELEASE=3 ++ case "`/bin/arch`" in ++ sun3) ++ echo m68k-sun-sunos${UNAME_RELEASE} ++ ;; ++ sun4) ++ echo sparc-sun-sunos${UNAME_RELEASE} ++ ;; ++ esac ++ exit ;; ++ aushp:SunOS:*:*) ++ echo sparc-auspex-sunos${UNAME_RELEASE} ++ exit ;; ++ # The situation for MiNT is a little confusing. The machine name ++ # can be virtually everything (everything which is not ++ # "atarist" or "atariste" at least should have a processor ++ # > m68000). The system name ranges from "MiNT" over "FreeMiNT" ++ # to the lowercase version "mint" (or "freemint"). Finally ++ # the system name "TOS" denotes a system which is actually not ++ # MiNT. But MiNT is downward compatible to TOS, so this should ++ # be no problem. ++ atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*) ++ echo m68k-atari-mint${UNAME_RELEASE} ++ exit ;; ++ atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*) ++ echo m68k-atari-mint${UNAME_RELEASE} ++ exit ;; ++ *falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*) ++ echo m68k-atari-mint${UNAME_RELEASE} ++ exit ;; ++ milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*) ++ echo m68k-milan-mint${UNAME_RELEASE} ++ exit ;; ++ hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*) ++ echo m68k-hades-mint${UNAME_RELEASE} ++ exit ;; ++ *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*) ++ echo m68k-unknown-mint${UNAME_RELEASE} ++ exit ;; ++ m68k:machten:*:*) ++ echo m68k-apple-machten${UNAME_RELEASE} ++ exit ;; ++ powerpc:machten:*:*) ++ echo powerpc-apple-machten${UNAME_RELEASE} ++ exit ;; ++ RISC*:Mach:*:*) ++ echo mips-dec-mach_bsd4.3 ++ exit ;; ++ RISC*:ULTRIX:*:*) ++ echo mips-dec-ultrix${UNAME_RELEASE} ++ exit ;; ++ VAX*:ULTRIX*:*:*) ++ echo vax-dec-ultrix${UNAME_RELEASE} ++ exit ;; ++ 2020:CLIX:*:* | 2430:CLIX:*:*) ++ echo clipper-intergraph-clix${UNAME_RELEASE} ++ exit ;; ++ mips:*:*:UMIPS | mips:*:*:RISCos) ++ eval $set_cc_for_build ++ sed 's/^ //' << EOF >$dummy.c ++#ifdef __cplusplus ++#include /* for printf() prototype */ ++ int main (int argc, char *argv[]) { ++#else ++ int main (argc, argv) int argc; char *argv[]; { ++#endif ++ #if defined (host_mips) && defined (MIPSEB) ++ #if defined (SYSTYPE_SYSV) ++ printf ("mips-mips-riscos%ssysv\n", argv[1]); exit (0); ++ #endif ++ #if defined (SYSTYPE_SVR4) ++ printf ("mips-mips-riscos%ssvr4\n", argv[1]); exit (0); ++ #endif ++ #if defined (SYSTYPE_BSD43) || defined(SYSTYPE_BSD) ++ printf ("mips-mips-riscos%sbsd\n", argv[1]); exit (0); ++ #endif ++ #endif ++ exit (-1); ++ } ++EOF ++ $CC_FOR_BUILD -o $dummy $dummy.c && ++ dummyarg=`echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` && ++ SYSTEM_NAME=`$dummy $dummyarg` && ++ { echo "$SYSTEM_NAME"; exit; } ++ echo mips-mips-riscos${UNAME_RELEASE} ++ exit ;; ++ Motorola:PowerMAX_OS:*:*) ++ echo powerpc-motorola-powermax ++ exit ;; ++ Motorola:*:4.3:PL8-*) ++ echo powerpc-harris-powermax ++ exit ;; ++ Night_Hawk:*:*:PowerMAX_OS | Synergy:PowerMAX_OS:*:*) ++ echo powerpc-harris-powermax ++ exit ;; ++ Night_Hawk:Power_UNIX:*:*) ++ echo powerpc-harris-powerunix ++ exit ;; ++ m88k:CX/UX:7*:*) ++ echo m88k-harris-cxux7 ++ exit ;; ++ m88k:*:4*:R4*) ++ echo m88k-motorola-sysv4 ++ exit ;; ++ m88k:*:3*:R3*) ++ echo m88k-motorola-sysv3 ++ exit ;; ++ AViiON:dgux:*:*) ++ # DG/UX returns AViiON for all architectures ++ UNAME_PROCESSOR=`/usr/bin/uname -p` ++ if [ $UNAME_PROCESSOR = mc88100 ] || [ $UNAME_PROCESSOR = mc88110 ] ++ then ++ if [ ${TARGET_BINARY_INTERFACE}x = m88kdguxelfx ] || \ ++ [ ${TARGET_BINARY_INTERFACE}x = x ] ++ then ++ echo m88k-dg-dgux${UNAME_RELEASE} ++ else ++ echo m88k-dg-dguxbcs${UNAME_RELEASE} ++ fi ++ else ++ echo i586-dg-dgux${UNAME_RELEASE} ++ fi ++ exit ;; ++ M88*:DolphinOS:*:*) # DolphinOS (SVR3) ++ echo m88k-dolphin-sysv3 ++ exit ;; ++ M88*:*:R3*:*) ++ # Delta 88k system running SVR3 ++ echo m88k-motorola-sysv3 ++ exit ;; ++ XD88*:*:*:*) # Tektronix XD88 system running UTekV (SVR3) ++ echo m88k-tektronix-sysv3 ++ exit ;; ++ Tek43[0-9][0-9]:UTek:*:*) # Tektronix 4300 system running UTek (BSD) ++ echo m68k-tektronix-bsd ++ exit ;; ++ *:IRIX*:*:*) ++ echo mips-sgi-irix`echo ${UNAME_RELEASE}|sed -e 's/-/_/g'` ++ exit ;; ++ ????????:AIX?:[12].1:2) # AIX 2.2.1 or AIX 2.1.1 is RT/PC AIX. ++ echo romp-ibm-aix # uname -m gives an 8 hex-code CPU id ++ exit ;; # Note that: echo "'`uname -s`'" gives 'AIX ' ++ i*86:AIX:*:*) ++ echo i386-ibm-aix ++ exit ;; ++ ia64:AIX:*:*) ++ if [ -x /usr/bin/oslevel ] ; then ++ IBM_REV=`/usr/bin/oslevel` ++ else ++ IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE} ++ fi ++ echo ${UNAME_MACHINE}-ibm-aix${IBM_REV} ++ exit ;; ++ *:AIX:2:3) ++ if grep bos325 /usr/include/stdio.h >/dev/null 2>&1; then ++ eval $set_cc_for_build ++ sed 's/^ //' << EOF >$dummy.c ++ #include ++ ++ main() ++ { ++ if (!__power_pc()) ++ exit(1); ++ puts("powerpc-ibm-aix3.2.5"); ++ exit(0); ++ } ++EOF ++ if $CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy` ++ then ++ echo "$SYSTEM_NAME" ++ else ++ echo rs6000-ibm-aix3.2.5 ++ fi ++ elif grep bos324 /usr/include/stdio.h >/dev/null 2>&1; then ++ echo rs6000-ibm-aix3.2.4 ++ else ++ echo rs6000-ibm-aix3.2 ++ fi ++ exit ;; ++ *:AIX:*:[456]) ++ IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'` ++ if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then ++ IBM_ARCH=rs6000 ++ else ++ IBM_ARCH=powerpc ++ fi ++ if [ -x /usr/bin/oslevel ] ; then ++ IBM_REV=`/usr/bin/oslevel` ++ else ++ IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE} ++ fi ++ echo ${IBM_ARCH}-ibm-aix${IBM_REV} ++ exit ;; ++ *:AIX:*:*) ++ echo rs6000-ibm-aix ++ exit ;; ++ ibmrt:4.4BSD:*|romp-ibm:BSD:*) ++ echo romp-ibm-bsd4.4 ++ exit ;; ++ ibmrt:*BSD:*|romp-ibm:BSD:*) # covers RT/PC BSD and ++ echo romp-ibm-bsd${UNAME_RELEASE} # 4.3 with uname added to ++ exit ;; # report: romp-ibm BSD 4.3 ++ *:BOSX:*:*) ++ echo rs6000-bull-bosx ++ exit ;; ++ DPX/2?00:B.O.S.:*:*) ++ echo m68k-bull-sysv3 ++ exit ;; ++ 9000/[34]??:4.3bsd:1.*:*) ++ echo m68k-hp-bsd ++ exit ;; ++ hp300:4.4BSD:*:* | 9000/[34]??:4.3bsd:2.*:*) ++ echo m68k-hp-bsd4.4 ++ exit ;; ++ 9000/[34678]??:HP-UX:*:*) ++ HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'` ++ case "${UNAME_MACHINE}" in ++ 9000/31? ) HP_ARCH=m68000 ;; ++ 9000/[34]?? ) HP_ARCH=m68k ;; ++ 9000/[678][0-9][0-9]) ++ if [ -x /usr/bin/getconf ]; then ++ sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null` ++ sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null` ++ case "${sc_cpu_version}" in ++ 523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0 ++ 528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1 ++ 532) # CPU_PA_RISC2_0 ++ case "${sc_kernel_bits}" in ++ 32) HP_ARCH="hppa2.0n" ;; ++ 64) HP_ARCH="hppa2.0w" ;; ++ '') HP_ARCH="hppa2.0" ;; # HP-UX 10.20 ++ esac ;; ++ esac ++ fi ++ if [ "${HP_ARCH}" = "" ]; then ++ eval $set_cc_for_build ++ sed 's/^ //' << EOF >$dummy.c ++ ++ #define _HPUX_SOURCE ++ #include ++ #include ++ ++ int main () ++ { ++ #if defined(_SC_KERNEL_BITS) ++ long bits = sysconf(_SC_KERNEL_BITS); ++ #endif ++ long cpu = sysconf (_SC_CPU_VERSION); ++ ++ switch (cpu) ++ { ++ case CPU_PA_RISC1_0: puts ("hppa1.0"); break; ++ case CPU_PA_RISC1_1: puts ("hppa1.1"); break; ++ case CPU_PA_RISC2_0: ++ #if defined(_SC_KERNEL_BITS) ++ switch (bits) ++ { ++ case 64: puts ("hppa2.0w"); break; ++ case 32: puts ("hppa2.0n"); break; ++ default: puts ("hppa2.0"); break; ++ } break; ++ #else /* !defined(_SC_KERNEL_BITS) */ ++ puts ("hppa2.0"); break; ++ #endif ++ default: puts ("hppa1.0"); break; ++ } ++ exit (0); ++ } ++EOF ++ (CCOPTS= $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy` ++ test -z "$HP_ARCH" && HP_ARCH=hppa ++ fi ;; ++ esac ++ if [ ${HP_ARCH} = "hppa2.0w" ] ++ then ++ eval $set_cc_for_build ++ ++ # hppa2.0w-hp-hpux* has a 64-bit kernel and a compiler generating ++ # 32-bit code. hppa64-hp-hpux* has the same kernel and a compiler ++ # generating 64-bit code. GNU and HP use different nomenclature: ++ # ++ # $ CC_FOR_BUILD=cc ./config.guess ++ # => hppa2.0w-hp-hpux11.23 ++ # $ CC_FOR_BUILD="cc +DA2.0w" ./config.guess ++ # => hppa64-hp-hpux11.23 ++ ++ if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | ++ grep -q __LP64__ ++ then ++ HP_ARCH="hppa2.0w" ++ else ++ HP_ARCH="hppa64" ++ fi ++ fi ++ echo ${HP_ARCH}-hp-hpux${HPUX_REV} ++ exit ;; ++ ia64:HP-UX:*:*) ++ HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'` ++ echo ia64-hp-hpux${HPUX_REV} ++ exit ;; ++ 3050*:HI-UX:*:*) ++ eval $set_cc_for_build ++ sed 's/^ //' << EOF >$dummy.c ++ #include ++ int ++ main () ++ { ++ long cpu = sysconf (_SC_CPU_VERSION); ++ /* The order matters, because CPU_IS_HP_MC68K erroneously returns ++ true for CPU_PA_RISC1_0. CPU_IS_PA_RISC returns correct ++ results, however. */ ++ if (CPU_IS_PA_RISC (cpu)) ++ { ++ switch (cpu) ++ { ++ case CPU_PA_RISC1_0: puts ("hppa1.0-hitachi-hiuxwe2"); break; ++ case CPU_PA_RISC1_1: puts ("hppa1.1-hitachi-hiuxwe2"); break; ++ case CPU_PA_RISC2_0: puts ("hppa2.0-hitachi-hiuxwe2"); break; ++ default: puts ("hppa-hitachi-hiuxwe2"); break; ++ } ++ } ++ else if (CPU_IS_HP_MC68K (cpu)) ++ puts ("m68k-hitachi-hiuxwe2"); ++ else puts ("unknown-hitachi-hiuxwe2"); ++ exit (0); ++ } ++EOF ++ $CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy` && ++ { echo "$SYSTEM_NAME"; exit; } ++ echo unknown-hitachi-hiuxwe2 ++ exit ;; ++ 9000/7??:4.3bsd:*:* | 9000/8?[79]:4.3bsd:*:* ) ++ echo hppa1.1-hp-bsd ++ exit ;; ++ 9000/8??:4.3bsd:*:*) ++ echo hppa1.0-hp-bsd ++ exit ;; ++ *9??*:MPE/iX:*:* | *3000*:MPE/iX:*:*) ++ echo hppa1.0-hp-mpeix ++ exit ;; ++ hp7??:OSF1:*:* | hp8?[79]:OSF1:*:* ) ++ echo hppa1.1-hp-osf ++ exit ;; ++ hp8??:OSF1:*:*) ++ echo hppa1.0-hp-osf ++ exit ;; ++ i*86:OSF1:*:*) ++ if [ -x /usr/sbin/sysversion ] ; then ++ echo ${UNAME_MACHINE}-unknown-osf1mk ++ else ++ echo ${UNAME_MACHINE}-unknown-osf1 ++ fi ++ exit ;; ++ parisc*:Lites*:*:*) ++ echo hppa1.1-hp-lites ++ exit ;; ++ C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*) ++ echo c1-convex-bsd ++ exit ;; ++ C2*:ConvexOS:*:* | convex:ConvexOS:C2*:*) ++ if getsysinfo -f scalar_acc ++ then echo c32-convex-bsd ++ else echo c2-convex-bsd ++ fi ++ exit ;; ++ C34*:ConvexOS:*:* | convex:ConvexOS:C34*:*) ++ echo c34-convex-bsd ++ exit ;; ++ C38*:ConvexOS:*:* | convex:ConvexOS:C38*:*) ++ echo c38-convex-bsd ++ exit ;; ++ C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*) ++ echo c4-convex-bsd ++ exit ;; ++ CRAY*Y-MP:*:*:*) ++ echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' ++ exit ;; ++ CRAY*[A-Z]90:*:*:*) ++ echo ${UNAME_MACHINE}-cray-unicos${UNAME_RELEASE} \ ++ | sed -e 's/CRAY.*\([A-Z]90\)/\1/' \ ++ -e y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/ \ ++ -e 's/\.[^.]*$/.X/' ++ exit ;; ++ CRAY*TS:*:*:*) ++ echo t90-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' ++ exit ;; ++ CRAY*T3E:*:*:*) ++ echo alphaev5-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' ++ exit ;; ++ CRAY*SV1:*:*:*) ++ echo sv1-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' ++ exit ;; ++ *:UNICOS/mp:*:*) ++ echo craynv-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' ++ exit ;; ++ F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*) ++ FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` ++ FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` ++ FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'` ++ echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" ++ exit ;; ++ 5000:UNIX_System_V:4.*:*) ++ FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` ++ FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'` ++ echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" ++ exit ;; ++ i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*) ++ echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE} ++ exit ;; ++ sparc*:BSD/OS:*:*) ++ echo sparc-unknown-bsdi${UNAME_RELEASE} ++ exit ;; ++ *:BSD/OS:*:*) ++ echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE} ++ exit ;; ++ *:FreeBSD:*:*) ++ case ${UNAME_MACHINE} in ++ pc98) ++ echo i386-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; ++ amd64) ++ echo x86_64-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; ++ *) ++ echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; ++ esac ++ exit ;; ++ i*:CYGWIN*:*) ++ echo ${UNAME_MACHINE}-pc-cygwin ++ exit ;; ++ *:MINGW*:*) ++ echo ${UNAME_MACHINE}-pc-mingw32 ++ exit ;; ++ i*:windows32*:*) ++ # uname -m includes "-pc" on this system. ++ echo ${UNAME_MACHINE}-mingw32 ++ exit ;; ++ i*:PW*:*) ++ echo ${UNAME_MACHINE}-pc-pw32 ++ exit ;; ++ *:Interix*:*) ++ case ${UNAME_MACHINE} in ++ x86) ++ echo i586-pc-interix${UNAME_RELEASE} ++ exit ;; ++ authenticamd | genuineintel | EM64T) ++ echo x86_64-unknown-interix${UNAME_RELEASE} ++ exit ;; ++ IA64) ++ echo ia64-unknown-interix${UNAME_RELEASE} ++ exit ;; ++ esac ;; ++ [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*) ++ echo i${UNAME_MACHINE}-pc-mks ++ exit ;; ++ 8664:Windows_NT:*) ++ echo x86_64-pc-mks ++ exit ;; ++ i*:Windows_NT*:* | Pentium*:Windows_NT*:*) ++ # How do we know it's Interix rather than the generic POSIX subsystem? ++ # It also conflicts with pre-2.0 versions of AT&T UWIN. Should we ++ # UNAME_MACHINE based on the output of uname instead of i386? ++ echo i586-pc-interix ++ exit ;; ++ i*:UWIN*:*) ++ echo ${UNAME_MACHINE}-pc-uwin ++ exit ;; ++ amd64:CYGWIN*:*:* | x86_64:CYGWIN*:*:*) ++ echo x86_64-unknown-cygwin ++ exit ;; ++ p*:CYGWIN*:*) ++ echo powerpcle-unknown-cygwin ++ exit ;; ++ prep*:SunOS:5.*:*) ++ echo powerpcle-unknown-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` ++ exit ;; ++ *:GNU:*:*) ++ # the GNU system ++ echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'` ++ exit ;; ++ *:GNU/*:*:*) ++ # other systems with GNU libc and userland ++ echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-gnu ++ exit ;; ++ i*86:Minix:*:*) ++ echo ${UNAME_MACHINE}-pc-minix ++ exit ;; ++ alpha:Linux:*:*) ++ case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in ++ EV5) UNAME_MACHINE=alphaev5 ;; ++ EV56) UNAME_MACHINE=alphaev56 ;; ++ PCA56) UNAME_MACHINE=alphapca56 ;; ++ PCA57) UNAME_MACHINE=alphapca56 ;; ++ EV6) UNAME_MACHINE=alphaev6 ;; ++ EV67) UNAME_MACHINE=alphaev67 ;; ++ EV68*) UNAME_MACHINE=alphaev68 ;; ++ esac ++ objdump --private-headers /bin/sh | grep -q ld.so.1 ++ if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi ++ echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC} ++ exit ;; ++ arm*:Linux:*:*) ++ eval $set_cc_for_build ++ if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \ ++ | grep -q __ARM_EABI__ ++ then ++ echo ${UNAME_MACHINE}-unknown-linux-gnu ++ else ++ echo ${UNAME_MACHINE}-unknown-linux-gnueabi ++ fi ++ exit ;; ++ avr32*:Linux:*:*) ++ echo ${UNAME_MACHINE}-unknown-linux-gnu ++ exit ;; ++ cris:Linux:*:*) ++ echo cris-axis-linux-gnu ++ exit ;; ++ crisv32:Linux:*:*) ++ echo crisv32-axis-linux-gnu ++ exit ;; ++ frv:Linux:*:*) ++ echo frv-unknown-linux-gnu ++ exit ;; ++ i*86:Linux:*:*) ++ LIBC=gnu ++ eval $set_cc_for_build ++ sed 's/^ //' << EOF >$dummy.c ++ #ifdef __dietlibc__ ++ LIBC=dietlibc ++ #endif ++EOF ++ eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC'` ++ echo "${UNAME_MACHINE}-pc-linux-${LIBC}" ++ exit ;; ++ ia64:Linux:*:*) ++ echo ${UNAME_MACHINE}-unknown-linux-gnu ++ exit ;; ++ m32r*:Linux:*:*) ++ echo ${UNAME_MACHINE}-unknown-linux-gnu ++ exit ;; ++ m68*:Linux:*:*) ++ echo ${UNAME_MACHINE}-unknown-linux-gnu ++ exit ;; ++ mips:Linux:*:* | mips64:Linux:*:*) ++ eval $set_cc_for_build ++ sed 's/^ //' << EOF >$dummy.c ++ #undef CPU ++ #undef ${UNAME_MACHINE} ++ #undef ${UNAME_MACHINE}el ++ #if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL) ++ CPU=${UNAME_MACHINE}el ++ #else ++ #if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB) ++ CPU=${UNAME_MACHINE} ++ #else ++ CPU= ++ #endif ++ #endif ++EOF ++ eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'` ++ test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; } ++ ;; ++ or32:Linux:*:*) ++ echo or32-unknown-linux-gnu ++ exit ;; ++ padre:Linux:*:*) ++ echo sparc-unknown-linux-gnu ++ exit ;; ++ parisc64:Linux:*:* | hppa64:Linux:*:*) ++ echo hppa64-unknown-linux-gnu ++ exit ;; ++ parisc:Linux:*:* | hppa:Linux:*:*) ++ # Look for CPU level ++ case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in ++ PA7*) echo hppa1.1-unknown-linux-gnu ;; ++ PA8*) echo hppa2.0-unknown-linux-gnu ;; ++ *) echo hppa-unknown-linux-gnu ;; ++ esac ++ exit ;; ++ ppc64:Linux:*:*) ++ echo powerpc64-unknown-linux-gnu ++ exit ;; ++ ppc:Linux:*:*) ++ echo powerpc-unknown-linux-gnu ++ exit ;; ++ s390:Linux:*:* | s390x:Linux:*:*) ++ echo ${UNAME_MACHINE}-ibm-linux ++ exit ;; ++ sh64*:Linux:*:*) ++ echo ${UNAME_MACHINE}-unknown-linux-gnu ++ exit ;; ++ sh*:Linux:*:*) ++ echo ${UNAME_MACHINE}-unknown-linux-gnu ++ exit ;; ++ sparc:Linux:*:* | sparc64:Linux:*:*) ++ echo ${UNAME_MACHINE}-unknown-linux-gnu ++ exit ;; ++ vax:Linux:*:*) ++ echo ${UNAME_MACHINE}-dec-linux-gnu ++ exit ;; ++ x86_64:Linux:*:*) ++ echo x86_64-unknown-linux-gnu ++ exit ;; ++ xtensa*:Linux:*:*) ++ echo ${UNAME_MACHINE}-unknown-linux-gnu ++ exit ;; ++ i*86:DYNIX/ptx:4*:*) ++ # ptx 4.0 does uname -s correctly, with DYNIX/ptx in there. ++ # earlier versions are messed up and put the nodename in both ++ # sysname and nodename. ++ echo i386-sequent-sysv4 ++ exit ;; ++ i*86:UNIX_SV:4.2MP:2.*) ++ # Unixware is an offshoot of SVR4, but it has its own version ++ # number series starting with 2... ++ # I am not positive that other SVR4 systems won't match this, ++ # I just have to hope. -- rms. ++ # Use sysv4.2uw... so that sysv4* matches it. ++ echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION} ++ exit ;; ++ i*86:OS/2:*:*) ++ # If we were able to find `uname', then EMX Unix compatibility ++ # is probably installed. ++ echo ${UNAME_MACHINE}-pc-os2-emx ++ exit ;; ++ i*86:XTS-300:*:STOP) ++ echo ${UNAME_MACHINE}-unknown-stop ++ exit ;; ++ i*86:atheos:*:*) ++ echo ${UNAME_MACHINE}-unknown-atheos ++ exit ;; ++ i*86:syllable:*:*) ++ echo ${UNAME_MACHINE}-pc-syllable ++ exit ;; ++ i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.[02]*:*) ++ echo i386-unknown-lynxos${UNAME_RELEASE} ++ exit ;; ++ i*86:*DOS:*:*) ++ echo ${UNAME_MACHINE}-pc-msdosdjgpp ++ exit ;; ++ i*86:*:4.*:* | i*86:SYSTEM_V:4.*:*) ++ UNAME_REL=`echo ${UNAME_RELEASE} | sed 's/\/MP$//'` ++ if grep Novell /usr/include/link.h >/dev/null 2>/dev/null; then ++ echo ${UNAME_MACHINE}-univel-sysv${UNAME_REL} ++ else ++ echo ${UNAME_MACHINE}-pc-sysv${UNAME_REL} ++ fi ++ exit ;; ++ i*86:*:5:[678]*) ++ # UnixWare 7.x, OpenUNIX and OpenServer 6. ++ case `/bin/uname -X | grep "^Machine"` in ++ *486*) UNAME_MACHINE=i486 ;; ++ *Pentium) UNAME_MACHINE=i586 ;; ++ *Pent*|*Celeron) UNAME_MACHINE=i686 ;; ++ esac ++ echo ${UNAME_MACHINE}-unknown-sysv${UNAME_RELEASE}${UNAME_SYSTEM}${UNAME_VERSION} ++ exit ;; ++ i*86:*:3.2:*) ++ if test -f /usr/options/cb.name; then ++ UNAME_REL=`sed -n 's/.*Version //p' /dev/null >/dev/null ; then ++ UNAME_REL=`(/bin/uname -X|grep Release|sed -e 's/.*= //')` ++ (/bin/uname -X|grep i80486 >/dev/null) && UNAME_MACHINE=i486 ++ (/bin/uname -X|grep '^Machine.*Pentium' >/dev/null) \ ++ && UNAME_MACHINE=i586 ++ (/bin/uname -X|grep '^Machine.*Pent *II' >/dev/null) \ ++ && UNAME_MACHINE=i686 ++ (/bin/uname -X|grep '^Machine.*Pentium Pro' >/dev/null) \ ++ && UNAME_MACHINE=i686 ++ echo ${UNAME_MACHINE}-pc-sco$UNAME_REL ++ else ++ echo ${UNAME_MACHINE}-pc-sysv32 ++ fi ++ exit ;; ++ pc:*:*:*) ++ # Left here for compatibility: ++ # uname -m prints for DJGPP always 'pc', but it prints nothing about ++ # the processor, so we play safe by assuming i586. ++ # Note: whatever this is, it MUST be the same as what config.sub ++ # prints for the "djgpp" host, or else GDB configury will decide that ++ # this is a cross-build. ++ echo i586-pc-msdosdjgpp ++ exit ;; ++ Intel:Mach:3*:*) ++ echo i386-pc-mach3 ++ exit ;; ++ paragon:*:*:*) ++ echo i860-intel-osf1 ++ exit ;; ++ i860:*:4.*:*) # i860-SVR4 ++ if grep Stardent /usr/include/sys/uadmin.h >/dev/null 2>&1 ; then ++ echo i860-stardent-sysv${UNAME_RELEASE} # Stardent Vistra i860-SVR4 ++ else # Add other i860-SVR4 vendors below as they are discovered. ++ echo i860-unknown-sysv${UNAME_RELEASE} # Unknown i860-SVR4 ++ fi ++ exit ;; ++ mini*:CTIX:SYS*5:*) ++ # "miniframe" ++ echo m68010-convergent-sysv ++ exit ;; ++ mc68k:UNIX:SYSTEM5:3.51m) ++ echo m68k-convergent-sysv ++ exit ;; ++ M680?0:D-NIX:5.3:*) ++ echo m68k-diab-dnix ++ exit ;; ++ M68*:*:R3V[5678]*:*) ++ test -r /sysV68 && { echo 'm68k-motorola-sysv'; exit; } ;; ++ 3[345]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 3[34]??/*:*:4.0:3.0 | 4400:*:4.0:3.0 | 4850:*:4.0:3.0 | SKA40:*:4.0:3.0 | SDS2:*:4.0:3.0 | SHG2:*:4.0:3.0 | S7501*:*:4.0:3.0) ++ OS_REL='' ++ test -r /etc/.relid \ ++ && OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid` ++ /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ ++ && { echo i486-ncr-sysv4.3${OS_REL}; exit; } ++ /bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \ ++ && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;; ++ 3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*) ++ /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ ++ && { echo i486-ncr-sysv4; exit; } ;; ++ NCR*:*:4.2:* | MPRAS*:*:4.2:*) ++ OS_REL='.3' ++ test -r /etc/.relid \ ++ && OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid` ++ /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ ++ && { echo i486-ncr-sysv4.3${OS_REL}; exit; } ++ /bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \ ++ && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ++ /bin/uname -p 2>/dev/null | /bin/grep pteron >/dev/null \ ++ && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;; ++ m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*) ++ echo m68k-unknown-lynxos${UNAME_RELEASE} ++ exit ;; ++ mc68030:UNIX_System_V:4.*:*) ++ echo m68k-atari-sysv4 ++ exit ;; ++ TSUNAMI:LynxOS:2.*:*) ++ echo sparc-unknown-lynxos${UNAME_RELEASE} ++ exit ;; ++ rs6000:LynxOS:2.*:*) ++ echo rs6000-unknown-lynxos${UNAME_RELEASE} ++ exit ;; ++ PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.[02]*:*) ++ echo powerpc-unknown-lynxos${UNAME_RELEASE} ++ exit ;; ++ SM[BE]S:UNIX_SV:*:*) ++ echo mips-dde-sysv${UNAME_RELEASE} ++ exit ;; ++ RM*:ReliantUNIX-*:*:*) ++ echo mips-sni-sysv4 ++ exit ;; ++ RM*:SINIX-*:*:*) ++ echo mips-sni-sysv4 ++ exit ;; ++ *:SINIX-*:*:*) ++ if uname -p 2>/dev/null >/dev/null ; then ++ UNAME_MACHINE=`(uname -p) 2>/dev/null` ++ echo ${UNAME_MACHINE}-sni-sysv4 ++ else ++ echo ns32k-sni-sysv ++ fi ++ exit ;; ++ PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort ++ # says ++ echo i586-unisys-sysv4 ++ exit ;; ++ *:UNIX_System_V:4*:FTX*) ++ # From Gerald Hewes . ++ # How about differentiating between stratus architectures? -djm ++ echo hppa1.1-stratus-sysv4 ++ exit ;; ++ *:*:*:FTX*) ++ # From seanf at swdc.stratus.com. ++ echo i860-stratus-sysv4 ++ exit ;; ++ i*86:VOS:*:*) ++ # From Paul.Green at stratus.com. ++ echo ${UNAME_MACHINE}-stratus-vos ++ exit ;; ++ *:VOS:*:*) ++ # From Paul.Green at stratus.com. ++ echo hppa1.1-stratus-vos ++ exit ;; ++ mc68*:A/UX:*:*) ++ echo m68k-apple-aux${UNAME_RELEASE} ++ exit ;; ++ news*:NEWS-OS:6*:*) ++ echo mips-sony-newsos6 ++ exit ;; ++ R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*) ++ if [ -d /usr/nec ]; then ++ echo mips-nec-sysv${UNAME_RELEASE} ++ else ++ echo mips-unknown-sysv${UNAME_RELEASE} ++ fi ++ exit ;; ++ BeBox:BeOS:*:*) # BeOS running on hardware made by Be, PPC only. ++ echo powerpc-be-beos ++ exit ;; ++ BeMac:BeOS:*:*) # BeOS running on Mac or Mac clone, PPC only. ++ echo powerpc-apple-beos ++ exit ;; ++ BePC:BeOS:*:*) # BeOS running on Intel PC compatible. ++ echo i586-pc-beos ++ exit ;; ++ BePC:Haiku:*:*) # Haiku running on Intel PC compatible. ++ echo i586-pc-haiku ++ exit ;; ++ SX-4:SUPER-UX:*:*) ++ echo sx4-nec-superux${UNAME_RELEASE} ++ exit ;; ++ SX-5:SUPER-UX:*:*) ++ echo sx5-nec-superux${UNAME_RELEASE} ++ exit ;; ++ SX-6:SUPER-UX:*:*) ++ echo sx6-nec-superux${UNAME_RELEASE} ++ exit ;; ++ SX-7:SUPER-UX:*:*) ++ echo sx7-nec-superux${UNAME_RELEASE} ++ exit ;; ++ SX-8:SUPER-UX:*:*) ++ echo sx8-nec-superux${UNAME_RELEASE} ++ exit ;; ++ SX-8R:SUPER-UX:*:*) ++ echo sx8r-nec-superux${UNAME_RELEASE} ++ exit ;; ++ Power*:Rhapsody:*:*) ++ echo powerpc-apple-rhapsody${UNAME_RELEASE} ++ exit ;; ++ *:Rhapsody:*:*) ++ echo ${UNAME_MACHINE}-apple-rhapsody${UNAME_RELEASE} ++ exit ;; ++ *:Darwin:*:*) ++ UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown ++ case $UNAME_PROCESSOR in ++ i386) ++ eval $set_cc_for_build ++ if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then ++ if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \ ++ (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \ ++ grep IS_64BIT_ARCH >/dev/null ++ then ++ UNAME_PROCESSOR="x86_64" ++ fi ++ fi ;; ++ unknown) UNAME_PROCESSOR=powerpc ;; ++ esac ++ echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE} ++ exit ;; ++ *:procnto*:*:* | *:QNX:[0123456789]*:*) ++ UNAME_PROCESSOR=`uname -p` ++ if test "$UNAME_PROCESSOR" = "x86"; then ++ UNAME_PROCESSOR=i386 ++ UNAME_MACHINE=pc ++ fi ++ echo ${UNAME_PROCESSOR}-${UNAME_MACHINE}-nto-qnx${UNAME_RELEASE} ++ exit ;; ++ *:QNX:*:4*) ++ echo i386-pc-qnx ++ exit ;; ++ NSE-?:NONSTOP_KERNEL:*:*) ++ echo nse-tandem-nsk${UNAME_RELEASE} ++ exit ;; ++ NSR-?:NONSTOP_KERNEL:*:*) ++ echo nsr-tandem-nsk${UNAME_RELEASE} ++ exit ;; ++ *:NonStop-UX:*:*) ++ echo mips-compaq-nonstopux ++ exit ;; ++ BS2000:POSIX*:*:*) ++ echo bs2000-siemens-sysv ++ exit ;; ++ DS/*:UNIX_System_V:*:*) ++ echo ${UNAME_MACHINE}-${UNAME_SYSTEM}-${UNAME_RELEASE} ++ exit ;; ++ *:Plan9:*:*) ++ # "uname -m" is not consistent, so use $cputype instead. 386 ++ # is converted to i386 for consistency with other x86 ++ # operating systems. ++ if test "$cputype" = "386"; then ++ UNAME_MACHINE=i386 ++ else ++ UNAME_MACHINE="$cputype" ++ fi ++ echo ${UNAME_MACHINE}-unknown-plan9 ++ exit ;; ++ *:TOPS-10:*:*) ++ echo pdp10-unknown-tops10 ++ exit ;; ++ *:TENEX:*:*) ++ echo pdp10-unknown-tenex ++ exit ;; ++ KS10:TOPS-20:*:* | KL10:TOPS-20:*:* | TYPE4:TOPS-20:*:*) ++ echo pdp10-dec-tops20 ++ exit ;; ++ XKL-1:TOPS-20:*:* | TYPE5:TOPS-20:*:*) ++ echo pdp10-xkl-tops20 ++ exit ;; ++ *:TOPS-20:*:*) ++ echo pdp10-unknown-tops20 ++ exit ;; ++ *:ITS:*:*) ++ echo pdp10-unknown-its ++ exit ;; ++ SEI:*:*:SEIUX) ++ echo mips-sei-seiux${UNAME_RELEASE} ++ exit ;; ++ *:DragonFly:*:*) ++ echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ++ exit ;; ++ *:*VMS:*:*) ++ UNAME_MACHINE=`(uname -p) 2>/dev/null` ++ case "${UNAME_MACHINE}" in ++ A*) echo alpha-dec-vms ; exit ;; ++ I*) echo ia64-dec-vms ; exit ;; ++ V*) echo vax-dec-vms ; exit ;; ++ esac ;; ++ *:XENIX:*:SysV) ++ echo i386-pc-xenix ++ exit ;; ++ i*86:skyos:*:*) ++ echo ${UNAME_MACHINE}-pc-skyos`echo ${UNAME_RELEASE}` | sed -e 's/ .*$//' ++ exit ;; ++ i*86:rdos:*:*) ++ echo ${UNAME_MACHINE}-pc-rdos ++ exit ;; ++ i*86:AROS:*:*) ++ echo ${UNAME_MACHINE}-pc-aros ++ exit ;; ++esac ++ ++#echo '(No uname command or uname output not recognized.)' 1>&2 ++#echo "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" 1>&2 ++ ++eval $set_cc_for_build ++cat >$dummy.c < ++# include ++#endif ++main () ++{ ++#if defined (sony) ++#if defined (MIPSEB) ++ /* BFD wants "bsd" instead of "newsos". Perhaps BFD should be changed, ++ I don't know.... */ ++ printf ("mips-sony-bsd\n"); exit (0); ++#else ++#include ++ printf ("m68k-sony-newsos%s\n", ++#ifdef NEWSOS4 ++ "4" ++#else ++ "" ++#endif ++ ); exit (0); ++#endif ++#endif ++ ++#if defined (__arm) && defined (__acorn) && defined (__unix) ++ printf ("arm-acorn-riscix\n"); exit (0); ++#endif ++ ++#if defined (hp300) && !defined (hpux) ++ printf ("m68k-hp-bsd\n"); exit (0); ++#endif ++ ++#if defined (NeXT) ++#if !defined (__ARCHITECTURE__) ++#define __ARCHITECTURE__ "m68k" ++#endif ++ int version; ++ version=`(hostinfo | sed -n 's/.*NeXT Mach \([0-9]*\).*/\1/p') 2>/dev/null`; ++ if (version < 4) ++ printf ("%s-next-nextstep%d\n", __ARCHITECTURE__, version); ++ else ++ printf ("%s-next-openstep%d\n", __ARCHITECTURE__, version); ++ exit (0); ++#endif ++ ++#if defined (MULTIMAX) || defined (n16) ++#if defined (UMAXV) ++ printf ("ns32k-encore-sysv\n"); exit (0); ++#else ++#if defined (CMU) ++ printf ("ns32k-encore-mach\n"); exit (0); ++#else ++ printf ("ns32k-encore-bsd\n"); exit (0); ++#endif ++#endif ++#endif ++ ++#if defined (__386BSD__) ++ printf ("i386-pc-bsd\n"); exit (0); ++#endif ++ ++#if defined (sequent) ++#if defined (i386) ++ printf ("i386-sequent-dynix\n"); exit (0); ++#endif ++#if defined (ns32000) ++ printf ("ns32k-sequent-dynix\n"); exit (0); ++#endif ++#endif ++ ++#if defined (_SEQUENT_) ++ struct utsname un; ++ ++ uname(&un); ++ ++ if (strncmp(un.version, "V2", 2) == 0) { ++ printf ("i386-sequent-ptx2\n"); exit (0); ++ } ++ if (strncmp(un.version, "V1", 2) == 0) { /* XXX is V1 correct? */ ++ printf ("i386-sequent-ptx1\n"); exit (0); ++ } ++ printf ("i386-sequent-ptx\n"); exit (0); ++ ++#endif ++ ++#if defined (vax) ++# if !defined (ultrix) ++# include ++# if defined (BSD) ++# if BSD == 43 ++ printf ("vax-dec-bsd4.3\n"); exit (0); ++# else ++# if BSD == 199006 ++ printf ("vax-dec-bsd4.3reno\n"); exit (0); ++# else ++ printf ("vax-dec-bsd\n"); exit (0); ++# endif ++# endif ++# else ++ printf ("vax-dec-bsd\n"); exit (0); ++# endif ++# else ++ printf ("vax-dec-ultrix\n"); exit (0); ++# endif ++#endif ++ ++#if defined (alliant) && defined (i860) ++ printf ("i860-alliant-bsd\n"); exit (0); ++#endif ++ ++ exit (1); ++} ++EOF ++ ++$CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null && SYSTEM_NAME=`$dummy` && ++ { echo "$SYSTEM_NAME"; exit; } ++ ++# Apollos put the system type in the environment. ++ ++test -d /usr/apollo && { echo ${ISP}-apollo-${SYSTYPE}; exit; } ++ ++# Convex versions that predate uname can use getsysinfo(1) ++ ++if [ -x /usr/convex/getsysinfo ] ++then ++ case `getsysinfo -f cpu_type` in ++ c1*) ++ echo c1-convex-bsd ++ exit ;; ++ c2*) ++ if getsysinfo -f scalar_acc ++ then echo c32-convex-bsd ++ else echo c2-convex-bsd ++ fi ++ exit ;; ++ c34*) ++ echo c34-convex-bsd ++ exit ;; ++ c38*) ++ echo c38-convex-bsd ++ exit ;; ++ c4*) ++ echo c4-convex-bsd ++ exit ;; ++ esac ++fi ++ ++cat >&2 < in order to provide the needed ++information to handle your system. ++ ++config.guess timestamp = $timestamp ++ ++uname -m = `(uname -m) 2>/dev/null || echo unknown` ++uname -r = `(uname -r) 2>/dev/null || echo unknown` ++uname -s = `(uname -s) 2>/dev/null || echo unknown` ++uname -v = `(uname -v) 2>/dev/null || echo unknown` ++ ++/usr/bin/uname -p = `(/usr/bin/uname -p) 2>/dev/null` ++/bin/uname -X = `(/bin/uname -X) 2>/dev/null` ++ ++hostinfo = `(hostinfo) 2>/dev/null` ++/bin/universe = `(/bin/universe) 2>/dev/null` ++/usr/bin/arch -k = `(/usr/bin/arch -k) 2>/dev/null` ++/bin/arch = `(/bin/arch) 2>/dev/null` ++/usr/bin/oslevel = `(/usr/bin/oslevel) 2>/dev/null` ++/usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null` ++ ++UNAME_MACHINE = ${UNAME_MACHINE} ++UNAME_RELEASE = ${UNAME_RELEASE} ++UNAME_SYSTEM = ${UNAME_SYSTEM} ++UNAME_VERSION = ${UNAME_VERSION} ++EOF ++ ++exit 1 ++ ++# Local variables: ++# eval: (add-hook 'write-file-hooks 'time-stamp) ++# time-stamp-start: "timestamp='" ++# time-stamp-format: "%:y-%02m-%02d" ++# time-stamp-end: "'" ++# End: +diff --git a/common/video/iso-mpeg4/config.sub b/common/video/iso-mpeg4/config.sub +deleted file mode 120000 +index 31a57ca..0000000 +--- a/common/video/iso-mpeg4/config.sub ++++ /dev/null +@@ -1 +0,0 @@ +-/usr/share/libtool/config.sub +\ No newline at end of file +diff --git a/common/video/iso-mpeg4/config.sub b/common/video/iso-mpeg4/config.sub +new file mode 100755 +index 0000000..2a55a50 +--- /dev/null ++++ b/common/video/iso-mpeg4/config.sub +@@ -0,0 +1,1705 @@ ++#! /bin/sh ++# Configuration validation subroutine script. ++# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, ++# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 ++# Free Software Foundation, Inc. ++ ++timestamp='2009-11-20' ++ ++# This file is (in principle) common to ALL GNU software. ++# The presence of a machine in this file suggests that SOME GNU software ++# can handle that machine. It does not imply ALL GNU software can. ++# ++# This file is free software; you can redistribute it and/or modify ++# it under the terms of the GNU General Public License as published by ++# the Free Software Foundation; either version 2 of the License, or ++# (at your option) any later version. ++# ++# This program is distributed in the hope that it will be useful, ++# but WITHOUT ANY WARRANTY; without even the implied warranty of ++# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++# GNU General Public License for more details. ++# ++# You should have received a copy of the GNU General Public License ++# along with this program; if not, write to the Free Software ++# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA ++# 02110-1301, USA. ++# ++# As a special exception to the GNU General Public License, if you ++# distribute this file as part of a program that contains a ++# configuration script generated by Autoconf, you may include it under ++# the same distribution terms that you use for the rest of that program. ++ ++ ++# Please send patches to . Submit a context ++# diff and a properly formatted GNU ChangeLog entry. ++# ++# Configuration subroutine to validate and canonicalize a configuration type. ++# Supply the specified configuration type as an argument. ++# If it is invalid, we print an error message on stderr and exit with code 1. ++# Otherwise, we print the canonical config type on stdout and succeed. ++ ++# You can get the latest version of this script from: ++# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD ++ ++# This file is supposed to be the same for all GNU packages ++# and recognize all the CPU types, system types and aliases ++# that are meaningful with *any* GNU software. ++# Each package is responsible for reporting which valid configurations ++# it does not support. The user should be able to distinguish ++# a failure to support a valid configuration from a meaningless ++# configuration. ++ ++# The goal of this file is to map all the various variations of a given ++# machine specification into a single specification in the form: ++# CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM ++# or in some cases, the newer four-part form: ++# CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM ++# It is wrong to echo any other type of specification. ++ ++me=`echo "$0" | sed -e 's,.*/,,'` ++ ++usage="\ ++Usage: $0 [OPTION] CPU-MFR-OPSYS ++ $0 [OPTION] ALIAS ++ ++Canonicalize a configuration name. ++ ++Operation modes: ++ -h, --help print this help, then exit ++ -t, --time-stamp print date of last modification, then exit ++ -v, --version print version number, then exit ++ ++Report bugs and patches to ." ++ ++version="\ ++GNU config.sub ($timestamp) ++ ++Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, ++2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. ++ ++This is free software; see the source for copying conditions. There is NO ++warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." ++ ++help=" ++Try \`$me --help' for more information." ++ ++# Parse command line ++while test $# -gt 0 ; do ++ case $1 in ++ --time-stamp | --time* | -t ) ++ echo "$timestamp" ; exit ;; ++ --version | -v ) ++ echo "$version" ; exit ;; ++ --help | --h* | -h ) ++ echo "$usage"; exit ;; ++ -- ) # Stop option processing ++ shift; break ;; ++ - ) # Use stdin as input. ++ break ;; ++ -* ) ++ echo "$me: invalid option $1$help" ++ exit 1 ;; ++ ++ *local*) ++ # First pass through any local machine types. ++ echo $1 ++ exit ;; ++ ++ * ) ++ break ;; ++ esac ++done ++ ++case $# in ++ 0) echo "$me: missing argument$help" >&2 ++ exit 1;; ++ 1) ;; ++ *) echo "$me: too many arguments$help" >&2 ++ exit 1;; ++esac ++ ++# Separate what the user gave into CPU-COMPANY and OS or KERNEL-OS (if any). ++# Here we must recognize all the valid KERNEL-OS combinations. ++maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'` ++case $maybe_os in ++ nto-qnx* | linux-gnu* | linux-dietlibc | linux-newlib* | linux-uclibc* | \ ++ uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | \ ++ kopensolaris*-gnu* | \ ++ storm-chaos* | os2-emx* | rtmk-nova*) ++ os=-$maybe_os ++ basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'` ++ ;; ++ *) ++ basic_machine=`echo $1 | sed 's/-[^-]*$//'` ++ if [ $basic_machine != $1 ] ++ then os=`echo $1 | sed 's/.*-/-/'` ++ else os=; fi ++ ;; ++esac ++ ++### Let's recognize common machines as not being operating systems so ++### that things like config.sub decstation-3100 work. We also ++### recognize some manufacturers as not being operating systems, so we ++### can provide default operating systems below. ++case $os in ++ -sun*os*) ++ # Prevent following clause from handling this invalid input. ++ ;; ++ -dec* | -mips* | -sequent* | -encore* | -pc532* | -sgi* | -sony* | \ ++ -att* | -7300* | -3300* | -delta* | -motorola* | -sun[234]* | \ ++ -unicom* | -ibm* | -next | -hp | -isi* | -apollo | -altos* | \ ++ -convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\ ++ -c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \ ++ -harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \ ++ -apple | -axis | -knuth | -cray | -microblaze) ++ os= ++ basic_machine=$1 ++ ;; ++ -bluegene*) ++ os=-cnk ++ ;; ++ -sim | -cisco | -oki | -wec | -winbond) ++ os= ++ basic_machine=$1 ++ ;; ++ -scout) ++ ;; ++ -wrs) ++ os=-vxworks ++ basic_machine=$1 ++ ;; ++ -chorusos*) ++ os=-chorusos ++ basic_machine=$1 ++ ;; ++ -chorusrdb) ++ os=-chorusrdb ++ basic_machine=$1 ++ ;; ++ -hiux*) ++ os=-hiuxwe2 ++ ;; ++ -sco6) ++ os=-sco5v6 ++ basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` ++ ;; ++ -sco5) ++ os=-sco3.2v5 ++ basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` ++ ;; ++ -sco4) ++ os=-sco3.2v4 ++ basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` ++ ;; ++ -sco3.2.[4-9]*) ++ os=`echo $os | sed -e 's/sco3.2./sco3.2v/'` ++ basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` ++ ;; ++ -sco3.2v[4-9]*) ++ # Don't forget version if it is 3.2v4 or newer. ++ basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` ++ ;; ++ -sco5v6*) ++ # Don't forget version if it is 3.2v4 or newer. ++ basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` ++ ;; ++ -sco*) ++ os=-sco3.2v2 ++ basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` ++ ;; ++ -udk*) ++ basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` ++ ;; ++ -isc) ++ os=-isc2.2 ++ basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` ++ ;; ++ -clix*) ++ basic_machine=clipper-intergraph ++ ;; ++ -isc*) ++ basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` ++ ;; ++ -lynx*) ++ os=-lynxos ++ ;; ++ -ptx*) ++ basic_machine=`echo $1 | sed -e 's/86-.*/86-sequent/'` ++ ;; ++ -windowsnt*) ++ os=`echo $os | sed -e 's/windowsnt/winnt/'` ++ ;; ++ -psos*) ++ os=-psos ++ ;; ++ -mint | -mint[0-9]*) ++ basic_machine=m68k-atari ++ os=-mint ++ ;; ++esac ++ ++# Decode aliases for certain CPU-COMPANY combinations. ++case $basic_machine in ++ # Recognize the basic CPU types without company name. ++ # Some are omitted here because they have special meanings below. ++ 1750a | 580 \ ++ | a29k \ ++ | alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \ ++ | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \ ++ | am33_2.0 \ ++ | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr | avr32 \ ++ | bfin \ ++ | c4x | clipper \ ++ | d10v | d30v | dlx | dsp16xx \ ++ | fido | fr30 | frv \ ++ | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \ ++ | i370 | i860 | i960 | ia64 \ ++ | ip2k | iq2000 \ ++ | lm32 \ ++ | m32c | m32r | m32rle | m68000 | m68k | m88k \ ++ | maxq | mb | microblaze | mcore | mep | metag \ ++ | mips | mipsbe | mipseb | mipsel | mipsle \ ++ | mips16 \ ++ | mips64 | mips64el \ ++ | mips64octeon | mips64octeonel \ ++ | mips64orion | mips64orionel \ ++ | mips64r5900 | mips64r5900el \ ++ | mips64vr | mips64vrel \ ++ | mips64vr4100 | mips64vr4100el \ ++ | mips64vr4300 | mips64vr4300el \ ++ | mips64vr5000 | mips64vr5000el \ ++ | mips64vr5900 | mips64vr5900el \ ++ | mipsisa32 | mipsisa32el \ ++ | mipsisa32r2 | mipsisa32r2el \ ++ | mipsisa64 | mipsisa64el \ ++ | mipsisa64r2 | mipsisa64r2el \ ++ | mipsisa64sb1 | mipsisa64sb1el \ ++ | mipsisa64sr71k | mipsisa64sr71kel \ ++ | mipstx39 | mipstx39el \ ++ | mn10200 | mn10300 \ ++ | moxie \ ++ | mt \ ++ | msp430 \ ++ | nios | nios2 \ ++ | ns16k | ns32k \ ++ | or32 \ ++ | pdp10 | pdp11 | pj | pjl \ ++ | powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \ ++ | pyramid \ ++ | rx \ ++ | score \ ++ | sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \ ++ | sh64 | sh64le \ ++ | sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \ ++ | sparcv8 | sparcv9 | sparcv9b | sparcv9v \ ++ | spu | strongarm \ ++ | tahoe | thumb | tic4x | tic80 | tron \ ++ | ubicom32 \ ++ | v850 | v850e \ ++ | we32k \ ++ | x86 | xc16x | xscale | xscalee[bl] | xstormy16 | xtensa \ ++ | z8k | z80) ++ basic_machine=$basic_machine-unknown ++ ;; ++ m6811 | m68hc11 | m6812 | m68hc12 | picochip) ++ # Motorola 68HC11/12. ++ basic_machine=$basic_machine-unknown ++ os=-none ++ ;; ++ m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | v70 | w65 | z8k) ++ ;; ++ ms1) ++ basic_machine=mt-unknown ++ ;; ++ ++ # We use `pc' rather than `unknown' ++ # because (1) that's what they normally are, and ++ # (2) the word "unknown" tends to confuse beginning users. ++ i*86 | x86_64) ++ basic_machine=$basic_machine-pc ++ ;; ++ # Object if more than one company name word. ++ *-*-*) ++ echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2 ++ exit 1 ++ ;; ++ # Recognize the basic CPU types with company name. ++ 580-* \ ++ | a29k-* \ ++ | alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \ ++ | alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \ ++ | alphapca5[67]-* | alpha64pca5[67]-* | arc-* \ ++ | arm-* | armbe-* | armle-* | armeb-* | armv*-* \ ++ | avr-* | avr32-* \ ++ | bfin-* | bs2000-* \ ++ | c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \ ++ | clipper-* | craynv-* | cydra-* \ ++ | d10v-* | d30v-* | dlx-* \ ++ | elxsi-* \ ++ | f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \ ++ | h8300-* | h8500-* \ ++ | hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \ ++ | i*86-* | i860-* | i960-* | ia64-* \ ++ | ip2k-* | iq2000-* \ ++ | lm32-* \ ++ | m32c-* | m32r-* | m32rle-* \ ++ | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \ ++ | m88110-* | m88k-* | maxq-* | mcore-* | metag-* | microblaze-* \ ++ | mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \ ++ | mips16-* \ ++ | mips64-* | mips64el-* \ ++ | mips64octeon-* | mips64octeonel-* \ ++ | mips64orion-* | mips64orionel-* \ ++ | mips64r5900-* | mips64r5900el-* \ ++ | mips64vr-* | mips64vrel-* \ ++ | mips64vr4100-* | mips64vr4100el-* \ ++ | mips64vr4300-* | mips64vr4300el-* \ ++ | mips64vr5000-* | mips64vr5000el-* \ ++ | mips64vr5900-* | mips64vr5900el-* \ ++ | mipsisa32-* | mipsisa32el-* \ ++ | mipsisa32r2-* | mipsisa32r2el-* \ ++ | mipsisa64-* | mipsisa64el-* \ ++ | mipsisa64r2-* | mipsisa64r2el-* \ ++ | mipsisa64sb1-* | mipsisa64sb1el-* \ ++ | mipsisa64sr71k-* | mipsisa64sr71kel-* \ ++ | mipstx39-* | mipstx39el-* \ ++ | mmix-* \ ++ | mt-* \ ++ | msp430-* \ ++ | nios-* | nios2-* \ ++ | none-* | np1-* | ns16k-* | ns32k-* \ ++ | orion-* \ ++ | pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \ ++ | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \ ++ | pyramid-* \ ++ | romp-* | rs6000-* | rx-* \ ++ | sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \ ++ | shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \ ++ | sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \ ++ | sparclite-* \ ++ | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | strongarm-* | sv1-* | sx?-* \ ++ | tahoe-* | thumb-* \ ++ | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* | tile-* \ ++ | tron-* \ ++ | ubicom32-* \ ++ | v850-* | v850e-* | vax-* \ ++ | we32k-* \ ++ | x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \ ++ | xstormy16-* | xtensa*-* \ ++ | ymp-* \ ++ | z8k-* | z80-*) ++ ;; ++ # Recognize the basic CPU types without company name, with glob match. ++ xtensa*) ++ basic_machine=$basic_machine-unknown ++ ;; ++ # Recognize the various machine names and aliases which stand ++ # for a CPU type and a company and sometimes even an OS. ++ 386bsd) ++ basic_machine=i386-unknown ++ os=-bsd ++ ;; ++ 3b1 | 7300 | 7300-att | att-7300 | pc7300 | safari | unixpc) ++ basic_machine=m68000-att ++ ;; ++ 3b*) ++ basic_machine=we32k-att ++ ;; ++ a29khif) ++ basic_machine=a29k-amd ++ os=-udi ++ ;; ++ abacus) ++ basic_machine=abacus-unknown ++ ;; ++ adobe68k) ++ basic_machine=m68010-adobe ++ os=-scout ++ ;; ++ alliant | fx80) ++ basic_machine=fx80-alliant ++ ;; ++ altos | altos3068) ++ basic_machine=m68k-altos ++ ;; ++ am29k) ++ basic_machine=a29k-none ++ os=-bsd ++ ;; ++ amd64) ++ basic_machine=x86_64-pc ++ ;; ++ amd64-*) ++ basic_machine=x86_64-`echo $basic_machine | sed 's/^[^-]*-//'` ++ ;; ++ amdahl) ++ basic_machine=580-amdahl ++ os=-sysv ++ ;; ++ amiga | amiga-*) ++ basic_machine=m68k-unknown ++ ;; ++ amigaos | amigados) ++ basic_machine=m68k-unknown ++ os=-amigaos ++ ;; ++ amigaunix | amix) ++ basic_machine=m68k-unknown ++ os=-sysv4 ++ ;; ++ apollo68) ++ basic_machine=m68k-apollo ++ os=-sysv ++ ;; ++ apollo68bsd) ++ basic_machine=m68k-apollo ++ os=-bsd ++ ;; ++ aros) ++ basic_machine=i386-pc ++ os=-aros ++ ;; ++ aux) ++ basic_machine=m68k-apple ++ os=-aux ++ ;; ++ balance) ++ basic_machine=ns32k-sequent ++ os=-dynix ++ ;; ++ blackfin) ++ basic_machine=bfin-unknown ++ os=-linux ++ ;; ++ blackfin-*) ++ basic_machine=bfin-`echo $basic_machine | sed 's/^[^-]*-//'` ++ os=-linux ++ ;; ++ bluegene*) ++ basic_machine=powerpc-ibm ++ os=-cnk ++ ;; ++ c90) ++ basic_machine=c90-cray ++ os=-unicos ++ ;; ++ cegcc) ++ basic_machine=arm-unknown ++ os=-cegcc ++ ;; ++ convex-c1) ++ basic_machine=c1-convex ++ os=-bsd ++ ;; ++ convex-c2) ++ basic_machine=c2-convex ++ os=-bsd ++ ;; ++ convex-c32) ++ basic_machine=c32-convex ++ os=-bsd ++ ;; ++ convex-c34) ++ basic_machine=c34-convex ++ os=-bsd ++ ;; ++ convex-c38) ++ basic_machine=c38-convex ++ os=-bsd ++ ;; ++ cray | j90) ++ basic_machine=j90-cray ++ os=-unicos ++ ;; ++ craynv) ++ basic_machine=craynv-cray ++ os=-unicosmp ++ ;; ++ cr16) ++ basic_machine=cr16-unknown ++ os=-elf ++ ;; ++ crds | unos) ++ basic_machine=m68k-crds ++ ;; ++ crisv32 | crisv32-* | etraxfs*) ++ basic_machine=crisv32-axis ++ ;; ++ cris | cris-* | etrax*) ++ basic_machine=cris-axis ++ ;; ++ crx) ++ basic_machine=crx-unknown ++ os=-elf ++ ;; ++ da30 | da30-*) ++ basic_machine=m68k-da30 ++ ;; ++ decstation | decstation-3100 | pmax | pmax-* | pmin | dec3100 | decstatn) ++ basic_machine=mips-dec ++ ;; ++ decsystem10* | dec10*) ++ basic_machine=pdp10-dec ++ os=-tops10 ++ ;; ++ decsystem20* | dec20*) ++ basic_machine=pdp10-dec ++ os=-tops20 ++ ;; ++ delta | 3300 | motorola-3300 | motorola-delta \ ++ | 3300-motorola | delta-motorola) ++ basic_machine=m68k-motorola ++ ;; ++ delta88) ++ basic_machine=m88k-motorola ++ os=-sysv3 ++ ;; ++ dicos) ++ basic_machine=i686-pc ++ os=-dicos ++ ;; ++ djgpp) ++ basic_machine=i586-pc ++ os=-msdosdjgpp ++ ;; ++ dpx20 | dpx20-*) ++ basic_machine=rs6000-bull ++ os=-bosx ++ ;; ++ dpx2* | dpx2*-bull) ++ basic_machine=m68k-bull ++ os=-sysv3 ++ ;; ++ ebmon29k) ++ basic_machine=a29k-amd ++ os=-ebmon ++ ;; ++ elxsi) ++ basic_machine=elxsi-elxsi ++ os=-bsd ++ ;; ++ encore | umax | mmax) ++ basic_machine=ns32k-encore ++ ;; ++ es1800 | OSE68k | ose68k | ose | OSE) ++ basic_machine=m68k-ericsson ++ os=-ose ++ ;; ++ fx2800) ++ basic_machine=i860-alliant ++ ;; ++ genix) ++ basic_machine=ns32k-ns ++ ;; ++ gmicro) ++ basic_machine=tron-gmicro ++ os=-sysv ++ ;; ++ go32) ++ basic_machine=i386-pc ++ os=-go32 ++ ;; ++ h3050r* | hiux*) ++ basic_machine=hppa1.1-hitachi ++ os=-hiuxwe2 ++ ;; ++ h8300hms) ++ basic_machine=h8300-hitachi ++ os=-hms ++ ;; ++ h8300xray) ++ basic_machine=h8300-hitachi ++ os=-xray ++ ;; ++ h8500hms) ++ basic_machine=h8500-hitachi ++ os=-hms ++ ;; ++ harris) ++ basic_machine=m88k-harris ++ os=-sysv3 ++ ;; ++ hp300-*) ++ basic_machine=m68k-hp ++ ;; ++ hp300bsd) ++ basic_machine=m68k-hp ++ os=-bsd ++ ;; ++ hp300hpux) ++ basic_machine=m68k-hp ++ os=-hpux ++ ;; ++ hp3k9[0-9][0-9] | hp9[0-9][0-9]) ++ basic_machine=hppa1.0-hp ++ ;; ++ hp9k2[0-9][0-9] | hp9k31[0-9]) ++ basic_machine=m68000-hp ++ ;; ++ hp9k3[2-9][0-9]) ++ basic_machine=m68k-hp ++ ;; ++ hp9k6[0-9][0-9] | hp6[0-9][0-9]) ++ basic_machine=hppa1.0-hp ++ ;; ++ hp9k7[0-79][0-9] | hp7[0-79][0-9]) ++ basic_machine=hppa1.1-hp ++ ;; ++ hp9k78[0-9] | hp78[0-9]) ++ # FIXME: really hppa2.0-hp ++ basic_machine=hppa1.1-hp ++ ;; ++ hp9k8[67]1 | hp8[67]1 | hp9k80[24] | hp80[24] | hp9k8[78]9 | hp8[78]9 | hp9k893 | hp893) ++ # FIXME: really hppa2.0-hp ++ basic_machine=hppa1.1-hp ++ ;; ++ hp9k8[0-9][13679] | hp8[0-9][13679]) ++ basic_machine=hppa1.1-hp ++ ;; ++ hp9k8[0-9][0-9] | hp8[0-9][0-9]) ++ basic_machine=hppa1.0-hp ++ ;; ++ hppa-next) ++ os=-nextstep3 ++ ;; ++ hppaosf) ++ basic_machine=hppa1.1-hp ++ os=-osf ++ ;; ++ hppro) ++ basic_machine=hppa1.1-hp ++ os=-proelf ++ ;; ++ i370-ibm* | ibm*) ++ basic_machine=i370-ibm ++ ;; ++# I'm not sure what "Sysv32" means. Should this be sysv3.2? ++ i*86v32) ++ basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'` ++ os=-sysv32 ++ ;; ++ i*86v4*) ++ basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'` ++ os=-sysv4 ++ ;; ++ i*86v) ++ basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'` ++ os=-sysv ++ ;; ++ i*86sol2) ++ basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'` ++ os=-solaris2 ++ ;; ++ i386mach) ++ basic_machine=i386-mach ++ os=-mach ++ ;; ++ i386-vsta | vsta) ++ basic_machine=i386-unknown ++ os=-vsta ++ ;; ++ iris | iris4d) ++ basic_machine=mips-sgi ++ case $os in ++ -irix*) ++ ;; ++ *) ++ os=-irix4 ++ ;; ++ esac ++ ;; ++ isi68 | isi) ++ basic_machine=m68k-isi ++ os=-sysv ++ ;; ++ m68knommu) ++ basic_machine=m68k-unknown ++ os=-linux ++ ;; ++ m68knommu-*) ++ basic_machine=m68k-`echo $basic_machine | sed 's/^[^-]*-//'` ++ os=-linux ++ ;; ++ m88k-omron*) ++ basic_machine=m88k-omron ++ ;; ++ magnum | m3230) ++ basic_machine=mips-mips ++ os=-sysv ++ ;; ++ merlin) ++ basic_machine=ns32k-utek ++ os=-sysv ++ ;; ++ microblaze) ++ basic_machine=microblaze-xilinx ++ ;; ++ mingw32) ++ basic_machine=i386-pc ++ os=-mingw32 ++ ;; ++ mingw32ce) ++ basic_machine=arm-unknown ++ os=-mingw32ce ++ ;; ++ miniframe) ++ basic_machine=m68000-convergent ++ ;; ++ *mint | -mint[0-9]* | *MiNT | *MiNT[0-9]*) ++ basic_machine=m68k-atari ++ os=-mint ++ ;; ++ mips3*-*) ++ basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'` ++ ;; ++ mips3*) ++ basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`-unknown ++ ;; ++ monitor) ++ basic_machine=m68k-rom68k ++ os=-coff ++ ;; ++ morphos) ++ basic_machine=powerpc-unknown ++ os=-morphos ++ ;; ++ msdos) ++ basic_machine=i386-pc ++ os=-msdos ++ ;; ++ ms1-*) ++ basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'` ++ ;; ++ mvs) ++ basic_machine=i370-ibm ++ os=-mvs ++ ;; ++ ncr3000) ++ basic_machine=i486-ncr ++ os=-sysv4 ++ ;; ++ netbsd386) ++ basic_machine=i386-unknown ++ os=-netbsd ++ ;; ++ netwinder) ++ basic_machine=armv4l-rebel ++ os=-linux ++ ;; ++ news | news700 | news800 | news900) ++ basic_machine=m68k-sony ++ os=-newsos ++ ;; ++ news1000) ++ basic_machine=m68030-sony ++ os=-newsos ++ ;; ++ news-3600 | risc-news) ++ basic_machine=mips-sony ++ os=-newsos ++ ;; ++ necv70) ++ basic_machine=v70-nec ++ os=-sysv ++ ;; ++ next | m*-next ) ++ basic_machine=m68k-next ++ case $os in ++ -nextstep* ) ++ ;; ++ -ns2*) ++ os=-nextstep2 ++ ;; ++ *) ++ os=-nextstep3 ++ ;; ++ esac ++ ;; ++ nh3000) ++ basic_machine=m68k-harris ++ os=-cxux ++ ;; ++ nh[45]000) ++ basic_machine=m88k-harris ++ os=-cxux ++ ;; ++ nindy960) ++ basic_machine=i960-intel ++ os=-nindy ++ ;; ++ mon960) ++ basic_machine=i960-intel ++ os=-mon960 ++ ;; ++ nonstopux) ++ basic_machine=mips-compaq ++ os=-nonstopux ++ ;; ++ np1) ++ basic_machine=np1-gould ++ ;; ++ nsr-tandem) ++ basic_machine=nsr-tandem ++ ;; ++ op50n-* | op60c-*) ++ basic_machine=hppa1.1-oki ++ os=-proelf ++ ;; ++ openrisc | openrisc-*) ++ basic_machine=or32-unknown ++ ;; ++ os400) ++ basic_machine=powerpc-ibm ++ os=-os400 ++ ;; ++ OSE68000 | ose68000) ++ basic_machine=m68000-ericsson ++ os=-ose ++ ;; ++ os68k) ++ basic_machine=m68k-none ++ os=-os68k ++ ;; ++ pa-hitachi) ++ basic_machine=hppa1.1-hitachi ++ os=-hiuxwe2 ++ ;; ++ paragon) ++ basic_machine=i860-intel ++ os=-osf ++ ;; ++ parisc) ++ basic_machine=hppa-unknown ++ os=-linux ++ ;; ++ parisc-*) ++ basic_machine=hppa-`echo $basic_machine | sed 's/^[^-]*-//'` ++ os=-linux ++ ;; ++ pbd) ++ basic_machine=sparc-tti ++ ;; ++ pbb) ++ basic_machine=m68k-tti ++ ;; ++ pc532 | pc532-*) ++ basic_machine=ns32k-pc532 ++ ;; ++ pc98) ++ basic_machine=i386-pc ++ ;; ++ pc98-*) ++ basic_machine=i386-`echo $basic_machine | sed 's/^[^-]*-//'` ++ ;; ++ pentium | p5 | k5 | k6 | nexgen | viac3) ++ basic_machine=i586-pc ++ ;; ++ pentiumpro | p6 | 6x86 | athlon | athlon_*) ++ basic_machine=i686-pc ++ ;; ++ pentiumii | pentium2 | pentiumiii | pentium3) ++ basic_machine=i686-pc ++ ;; ++ pentium4) ++ basic_machine=i786-pc ++ ;; ++ pentium-* | p5-* | k5-* | k6-* | nexgen-* | viac3-*) ++ basic_machine=i586-`echo $basic_machine | sed 's/^[^-]*-//'` ++ ;; ++ pentiumpro-* | p6-* | 6x86-* | athlon-*) ++ basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'` ++ ;; ++ pentiumii-* | pentium2-* | pentiumiii-* | pentium3-*) ++ basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'` ++ ;; ++ pentium4-*) ++ basic_machine=i786-`echo $basic_machine | sed 's/^[^-]*-//'` ++ ;; ++ pn) ++ basic_machine=pn-gould ++ ;; ++ power) basic_machine=power-ibm ++ ;; ++ ppc) basic_machine=powerpc-unknown ++ ;; ++ ppc-*) basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'` ++ ;; ++ ppcle | powerpclittle | ppc-le | powerpc-little) ++ basic_machine=powerpcle-unknown ++ ;; ++ ppcle-* | powerpclittle-*) ++ basic_machine=powerpcle-`echo $basic_machine | sed 's/^[^-]*-//'` ++ ;; ++ ppc64) basic_machine=powerpc64-unknown ++ ;; ++ ppc64-*) basic_machine=powerpc64-`echo $basic_machine | sed 's/^[^-]*-//'` ++ ;; ++ ppc64le | powerpc64little | ppc64-le | powerpc64-little) ++ basic_machine=powerpc64le-unknown ++ ;; ++ ppc64le-* | powerpc64little-*) ++ basic_machine=powerpc64le-`echo $basic_machine | sed 's/^[^-]*-//'` ++ ;; ++ ps2) ++ basic_machine=i386-ibm ++ ;; ++ pw32) ++ basic_machine=i586-unknown ++ os=-pw32 ++ ;; ++ rdos) ++ basic_machine=i386-pc ++ os=-rdos ++ ;; ++ rom68k) ++ basic_machine=m68k-rom68k ++ os=-coff ++ ;; ++ rm[46]00) ++ basic_machine=mips-siemens ++ ;; ++ rtpc | rtpc-*) ++ basic_machine=romp-ibm ++ ;; ++ s390 | s390-*) ++ basic_machine=s390-ibm ++ ;; ++ s390x | s390x-*) ++ basic_machine=s390x-ibm ++ ;; ++ sa29200) ++ basic_machine=a29k-amd ++ os=-udi ++ ;; ++ sb1) ++ basic_machine=mipsisa64sb1-unknown ++ ;; ++ sb1el) ++ basic_machine=mipsisa64sb1el-unknown ++ ;; ++ sde) ++ basic_machine=mipsisa32-sde ++ os=-elf ++ ;; ++ sei) ++ basic_machine=mips-sei ++ os=-seiux ++ ;; ++ sequent) ++ basic_machine=i386-sequent ++ ;; ++ sh) ++ basic_machine=sh-hitachi ++ os=-hms ++ ;; ++ sh5el) ++ basic_machine=sh5le-unknown ++ ;; ++ sh64) ++ basic_machine=sh64-unknown ++ ;; ++ sparclite-wrs | simso-wrs) ++ basic_machine=sparclite-wrs ++ os=-vxworks ++ ;; ++ sps7) ++ basic_machine=m68k-bull ++ os=-sysv2 ++ ;; ++ spur) ++ basic_machine=spur-unknown ++ ;; ++ st2000) ++ basic_machine=m68k-tandem ++ ;; ++ stratus) ++ basic_machine=i860-stratus ++ os=-sysv4 ++ ;; ++ sun2) ++ basic_machine=m68000-sun ++ ;; ++ sun2os3) ++ basic_machine=m68000-sun ++ os=-sunos3 ++ ;; ++ sun2os4) ++ basic_machine=m68000-sun ++ os=-sunos4 ++ ;; ++ sun3os3) ++ basic_machine=m68k-sun ++ os=-sunos3 ++ ;; ++ sun3os4) ++ basic_machine=m68k-sun ++ os=-sunos4 ++ ;; ++ sun4os3) ++ basic_machine=sparc-sun ++ os=-sunos3 ++ ;; ++ sun4os4) ++ basic_machine=sparc-sun ++ os=-sunos4 ++ ;; ++ sun4sol2) ++ basic_machine=sparc-sun ++ os=-solaris2 ++ ;; ++ sun3 | sun3-*) ++ basic_machine=m68k-sun ++ ;; ++ sun4) ++ basic_machine=sparc-sun ++ ;; ++ sun386 | sun386i | roadrunner) ++ basic_machine=i386-sun ++ ;; ++ sv1) ++ basic_machine=sv1-cray ++ os=-unicos ++ ;; ++ symmetry) ++ basic_machine=i386-sequent ++ os=-dynix ++ ;; ++ t3e) ++ basic_machine=alphaev5-cray ++ os=-unicos ++ ;; ++ t90) ++ basic_machine=t90-cray ++ os=-unicos ++ ;; ++ tic54x | c54x*) ++ basic_machine=tic54x-unknown ++ os=-coff ++ ;; ++ tic55x | c55x*) ++ basic_machine=tic55x-unknown ++ os=-coff ++ ;; ++ tic6x | c6x*) ++ basic_machine=tic6x-unknown ++ os=-coff ++ ;; ++ tile*) ++ basic_machine=tile-unknown ++ os=-linux-gnu ++ ;; ++ tx39) ++ basic_machine=mipstx39-unknown ++ ;; ++ tx39el) ++ basic_machine=mipstx39el-unknown ++ ;; ++ toad1) ++ basic_machine=pdp10-xkl ++ os=-tops20 ++ ;; ++ tower | tower-32) ++ basic_machine=m68k-ncr ++ ;; ++ tpf) ++ basic_machine=s390x-ibm ++ os=-tpf ++ ;; ++ udi29k) ++ basic_machine=a29k-amd ++ os=-udi ++ ;; ++ ultra3) ++ basic_machine=a29k-nyu ++ os=-sym1 ++ ;; ++ v810 | necv810) ++ basic_machine=v810-nec ++ os=-none ++ ;; ++ vaxv) ++ basic_machine=vax-dec ++ os=-sysv ++ ;; ++ vms) ++ basic_machine=vax-dec ++ os=-vms ++ ;; ++ vpp*|vx|vx-*) ++ basic_machine=f301-fujitsu ++ ;; ++ vxworks960) ++ basic_machine=i960-wrs ++ os=-vxworks ++ ;; ++ vxworks68) ++ basic_machine=m68k-wrs ++ os=-vxworks ++ ;; ++ vxworks29k) ++ basic_machine=a29k-wrs ++ os=-vxworks ++ ;; ++ w65*) ++ basic_machine=w65-wdc ++ os=-none ++ ;; ++ w89k-*) ++ basic_machine=hppa1.1-winbond ++ os=-proelf ++ ;; ++ xbox) ++ basic_machine=i686-pc ++ os=-mingw32 ++ ;; ++ xps | xps100) ++ basic_machine=xps100-honeywell ++ ;; ++ ymp) ++ basic_machine=ymp-cray ++ os=-unicos ++ ;; ++ z8k-*-coff) ++ basic_machine=z8k-unknown ++ os=-sim ++ ;; ++ z80-*-coff) ++ basic_machine=z80-unknown ++ os=-sim ++ ;; ++ none) ++ basic_machine=none-none ++ os=-none ++ ;; ++ ++# Here we handle the default manufacturer of certain CPU types. It is in ++# some cases the only manufacturer, in others, it is the most popular. ++ w89k) ++ basic_machine=hppa1.1-winbond ++ ;; ++ op50n) ++ basic_machine=hppa1.1-oki ++ ;; ++ op60c) ++ basic_machine=hppa1.1-oki ++ ;; ++ romp) ++ basic_machine=romp-ibm ++ ;; ++ mmix) ++ basic_machine=mmix-knuth ++ ;; ++ rs6000) ++ basic_machine=rs6000-ibm ++ ;; ++ vax) ++ basic_machine=vax-dec ++ ;; ++ pdp10) ++ # there are many clones, so DEC is not a safe bet ++ basic_machine=pdp10-unknown ++ ;; ++ pdp11) ++ basic_machine=pdp11-dec ++ ;; ++ we32k) ++ basic_machine=we32k-att ++ ;; ++ sh[1234] | sh[24]a | sh[24]aeb | sh[34]eb | sh[1234]le | sh[23]ele) ++ basic_machine=sh-unknown ++ ;; ++ sparc | sparcv8 | sparcv9 | sparcv9b | sparcv9v) ++ basic_machine=sparc-sun ++ ;; ++ cydra) ++ basic_machine=cydra-cydrome ++ ;; ++ orion) ++ basic_machine=orion-highlevel ++ ;; ++ orion105) ++ basic_machine=clipper-highlevel ++ ;; ++ mac | mpw | mac-mpw) ++ basic_machine=m68k-apple ++ ;; ++ pmac | pmac-mpw) ++ basic_machine=powerpc-apple ++ ;; ++ *-unknown) ++ # Make sure to match an already-canonicalized machine name. ++ ;; ++ *) ++ echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2 ++ exit 1 ++ ;; ++esac ++ ++# Here we canonicalize certain aliases for manufacturers. ++case $basic_machine in ++ *-digital*) ++ basic_machine=`echo $basic_machine | sed 's/digital.*/dec/'` ++ ;; ++ *-commodore*) ++ basic_machine=`echo $basic_machine | sed 's/commodore.*/cbm/'` ++ ;; ++ *) ++ ;; ++esac ++ ++# Decode manufacturer-specific aliases for certain operating systems. ++ ++if [ x"$os" != x"" ] ++then ++case $os in ++ # First match some system type aliases ++ # that might get confused with valid system types. ++ # -solaris* is a basic system type, with this one exception. ++ -auroraux) ++ os=-auroraux ++ ;; ++ -solaris1 | -solaris1.*) ++ os=`echo $os | sed -e 's|solaris1|sunos4|'` ++ ;; ++ -solaris) ++ os=-solaris2 ++ ;; ++ -svr4*) ++ os=-sysv4 ++ ;; ++ -unixware*) ++ os=-sysv4.2uw ++ ;; ++ -gnu/linux*) ++ os=`echo $os | sed -e 's|gnu/linux|linux-gnu|'` ++ ;; ++ # First accept the basic system types. ++ # The portable systems comes first. ++ # Each alternative MUST END IN A *, to match a version number. ++ # -sysv* is not here because it comes later, after sysvr4. ++ -gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \ ++ | -*vms* | -sco* | -esix* | -isc* | -aix* | -cnk* | -sunos | -sunos[34]*\ ++ | -hpux* | -unos* | -osf* | -luna* | -dgux* | -auroraux* | -solaris* \ ++ | -sym* | -kopensolaris* \ ++ | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \ ++ | -aos* | -aros* \ ++ | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \ ++ | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \ ++ | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \ ++ | -openbsd* | -solidbsd* \ ++ | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \ ++ | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \ ++ | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \ ++ | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \ ++ | -chorusos* | -chorusrdb* | -cegcc* \ ++ | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ ++ | -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \ ++ | -uxpv* | -beos* | -mpeix* | -udk* \ ++ | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \ ++ | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \ ++ | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \ ++ | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \ ++ | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \ ++ | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \ ++ | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es*) ++ # Remember, each alternative MUST END IN *, to match a version number. ++ ;; ++ -qnx*) ++ case $basic_machine in ++ x86-* | i*86-*) ++ ;; ++ *) ++ os=-nto$os ++ ;; ++ esac ++ ;; ++ -nto-qnx*) ++ ;; ++ -nto*) ++ os=`echo $os | sed -e 's|nto|nto-qnx|'` ++ ;; ++ -sim | -es1800* | -hms* | -xray | -os68k* | -none* | -v88r* \ ++ | -windows* | -osx | -abug | -netware* | -os9* | -beos* | -haiku* \ ++ | -macos* | -mpw* | -magic* | -mmixware* | -mon960* | -lnews*) ++ ;; ++ -mac*) ++ os=`echo $os | sed -e 's|mac|macos|'` ++ ;; ++ -linux-dietlibc) ++ os=-linux-dietlibc ++ ;; ++ -linux*) ++ os=`echo $os | sed -e 's|linux|linux-gnu|'` ++ ;; ++ -sunos5*) ++ os=`echo $os | sed -e 's|sunos5|solaris2|'` ++ ;; ++ -sunos6*) ++ os=`echo $os | sed -e 's|sunos6|solaris3|'` ++ ;; ++ -opened*) ++ os=-openedition ++ ;; ++ -os400*) ++ os=-os400 ++ ;; ++ -wince*) ++ os=-wince ++ ;; ++ -osfrose*) ++ os=-osfrose ++ ;; ++ -osf*) ++ os=-osf ++ ;; ++ -utek*) ++ os=-bsd ++ ;; ++ -dynix*) ++ os=-bsd ++ ;; ++ -acis*) ++ os=-aos ++ ;; ++ -atheos*) ++ os=-atheos ++ ;; ++ -syllable*) ++ os=-syllable ++ ;; ++ -386bsd) ++ os=-bsd ++ ;; ++ -ctix* | -uts*) ++ os=-sysv ++ ;; ++ -nova*) ++ os=-rtmk-nova ++ ;; ++ -ns2 ) ++ os=-nextstep2 ++ ;; ++ -nsk*) ++ os=-nsk ++ ;; ++ # Preserve the version number of sinix5. ++ -sinix5.*) ++ os=`echo $os | sed -e 's|sinix|sysv|'` ++ ;; ++ -sinix*) ++ os=-sysv4 ++ ;; ++ -tpf*) ++ os=-tpf ++ ;; ++ -triton*) ++ os=-sysv3 ++ ;; ++ -oss*) ++ os=-sysv3 ++ ;; ++ -svr4) ++ os=-sysv4 ++ ;; ++ -svr3) ++ os=-sysv3 ++ ;; ++ -sysvr4) ++ os=-sysv4 ++ ;; ++ # This must come after -sysvr4. ++ -sysv*) ++ ;; ++ -ose*) ++ os=-ose ++ ;; ++ -es1800*) ++ os=-ose ++ ;; ++ -xenix) ++ os=-xenix ++ ;; ++ -*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*) ++ os=-mint ++ ;; ++ -aros*) ++ os=-aros ++ ;; ++ -kaos*) ++ os=-kaos ++ ;; ++ -zvmoe) ++ os=-zvmoe ++ ;; ++ -dicos*) ++ os=-dicos ++ ;; ++ -none) ++ ;; ++ *) ++ # Get rid of the `-' at the beginning of $os. ++ os=`echo $os | sed 's/[^-]*-//'` ++ echo Invalid configuration \`$1\': system \`$os\' not recognized 1>&2 ++ exit 1 ++ ;; ++esac ++else ++ ++# Here we handle the default operating systems that come with various machines. ++# The value should be what the vendor currently ships out the door with their ++# machine or put another way, the most popular os provided with the machine. ++ ++# Note that if you're going to try to match "-MANUFACTURER" here (say, ++# "-sun"), then you have to tell the case statement up towards the top ++# that MANUFACTURER isn't an operating system. Otherwise, code above ++# will signal an error saying that MANUFACTURER isn't an operating ++# system, and we'll never get to this point. ++ ++case $basic_machine in ++ score-*) ++ os=-elf ++ ;; ++ spu-*) ++ os=-elf ++ ;; ++ *-acorn) ++ os=-riscix1.2 ++ ;; ++ arm*-rebel) ++ os=-linux ++ ;; ++ arm*-semi) ++ os=-aout ++ ;; ++ c4x-* | tic4x-*) ++ os=-coff ++ ;; ++ # This must come before the *-dec entry. ++ pdp10-*) ++ os=-tops20 ++ ;; ++ pdp11-*) ++ os=-none ++ ;; ++ *-dec | vax-*) ++ os=-ultrix4.2 ++ ;; ++ m68*-apollo) ++ os=-domain ++ ;; ++ i386-sun) ++ os=-sunos4.0.2 ++ ;; ++ m68000-sun) ++ os=-sunos3 ++ # This also exists in the configure program, but was not the ++ # default. ++ # os=-sunos4 ++ ;; ++ m68*-cisco) ++ os=-aout ++ ;; ++ mep-*) ++ os=-elf ++ ;; ++ mips*-cisco) ++ os=-elf ++ ;; ++ mips*-*) ++ os=-elf ++ ;; ++ or32-*) ++ os=-coff ++ ;; ++ *-tti) # must be before sparc entry or we get the wrong os. ++ os=-sysv3 ++ ;; ++ sparc-* | *-sun) ++ os=-sunos4.1.1 ++ ;; ++ *-be) ++ os=-beos ++ ;; ++ *-haiku) ++ os=-haiku ++ ;; ++ *-ibm) ++ os=-aix ++ ;; ++ *-knuth) ++ os=-mmixware ++ ;; ++ *-wec) ++ os=-proelf ++ ;; ++ *-winbond) ++ os=-proelf ++ ;; ++ *-oki) ++ os=-proelf ++ ;; ++ *-hp) ++ os=-hpux ++ ;; ++ *-hitachi) ++ os=-hiux ++ ;; ++ i860-* | *-att | *-ncr | *-altos | *-motorola | *-convergent) ++ os=-sysv ++ ;; ++ *-cbm) ++ os=-amigaos ++ ;; ++ *-dg) ++ os=-dgux ++ ;; ++ *-dolphin) ++ os=-sysv3 ++ ;; ++ m68k-ccur) ++ os=-rtu ++ ;; ++ m88k-omron*) ++ os=-luna ++ ;; ++ *-next ) ++ os=-nextstep ++ ;; ++ *-sequent) ++ os=-ptx ++ ;; ++ *-crds) ++ os=-unos ++ ;; ++ *-ns) ++ os=-genix ++ ;; ++ i370-*) ++ os=-mvs ++ ;; ++ *-next) ++ os=-nextstep3 ++ ;; ++ *-gould) ++ os=-sysv ++ ;; ++ *-highlevel) ++ os=-bsd ++ ;; ++ *-encore) ++ os=-bsd ++ ;; ++ *-sgi) ++ os=-irix ++ ;; ++ *-siemens) ++ os=-sysv4 ++ ;; ++ *-masscomp) ++ os=-rtu ++ ;; ++ f30[01]-fujitsu | f700-fujitsu) ++ os=-uxpv ++ ;; ++ *-rom68k) ++ os=-coff ++ ;; ++ *-*bug) ++ os=-coff ++ ;; ++ *-apple) ++ os=-macos ++ ;; ++ *-atari*) ++ os=-mint ++ ;; ++ *) ++ os=-none ++ ;; ++esac ++fi ++ ++# Here we handle the case where we know the os, and the CPU type, but not the ++# manufacturer. We pick the logical manufacturer. ++vendor=unknown ++case $basic_machine in ++ *-unknown) ++ case $os in ++ -riscix*) ++ vendor=acorn ++ ;; ++ -sunos*) ++ vendor=sun ++ ;; ++ -cnk*|-aix*) ++ vendor=ibm ++ ;; ++ -beos*) ++ vendor=be ++ ;; ++ -hpux*) ++ vendor=hp ++ ;; ++ -mpeix*) ++ vendor=hp ++ ;; ++ -hiux*) ++ vendor=hitachi ++ ;; ++ -unos*) ++ vendor=crds ++ ;; ++ -dgux*) ++ vendor=dg ++ ;; ++ -luna*) ++ vendor=omron ++ ;; ++ -genix*) ++ vendor=ns ++ ;; ++ -mvs* | -opened*) ++ vendor=ibm ++ ;; ++ -os400*) ++ vendor=ibm ++ ;; ++ -ptx*) ++ vendor=sequent ++ ;; ++ -tpf*) ++ vendor=ibm ++ ;; ++ -vxsim* | -vxworks* | -windiss*) ++ vendor=wrs ++ ;; ++ -aux*) ++ vendor=apple ++ ;; ++ -hms*) ++ vendor=hitachi ++ ;; ++ -mpw* | -macos*) ++ vendor=apple ++ ;; ++ -*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*) ++ vendor=atari ++ ;; ++ -vos*) ++ vendor=stratus ++ ;; ++ esac ++ basic_machine=`echo $basic_machine | sed "s/unknown/$vendor/"` ++ ;; ++esac ++ ++echo $basic_machine$os ++exit ++ ++# Local variables: ++# eval: (add-hook 'write-file-hooks 'time-stamp) ++# time-stamp-start: "timestamp='" ++# time-stamp-format: "%:y-%02m-%02d" ++# time-stamp-end: "'" ++# End: +diff --git a/common/video/iso-mpeg4/depcomp b/common/video/iso-mpeg4/depcomp +deleted file mode 120000 +index 9d2d67e..0000000 +--- a/common/video/iso-mpeg4/depcomp ++++ /dev/null +@@ -1 +0,0 @@ +-/usr/share/automake-1.6/depcomp +\ No newline at end of file +diff --git a/common/video/iso-mpeg4/depcomp b/common/video/iso-mpeg4/depcomp +new file mode 100755 +index 0000000..df8eea7 +--- /dev/null ++++ b/common/video/iso-mpeg4/depcomp +@@ -0,0 +1,630 @@ ++#! /bin/sh ++# depcomp - compile a program generating dependencies as side-effects ++ ++scriptversion=2009-04-28.21; # UTC ++ ++# Copyright (C) 1999, 2000, 2003, 2004, 2005, 2006, 2007, 2009 Free ++# Software Foundation, Inc. ++ ++# This program is free software; you can redistribute it and/or modify ++# it under the terms of the GNU General Public License as published by ++# the Free Software Foundation; either version 2, or (at your option) ++# any later version. ++ ++# This program is distributed in the hope that it will be useful, ++# but WITHOUT ANY WARRANTY; without even the implied warranty of ++# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++# GNU General Public License for more details. ++ ++# You should have received a copy of the GNU General Public License ++# along with this program. If not, see . ++ ++# As a special exception to the GNU General Public License, if you ++# distribute this file as part of a program that contains a ++# configuration script generated by Autoconf, you may include it under ++# the same distribution terms that you use for the rest of that program. ++ ++# Originally written by Alexandre Oliva . ++ ++case $1 in ++ '') ++ echo "$0: No command. Try \`$0 --help' for more information." 1>&2 ++ exit 1; ++ ;; ++ -h | --h*) ++ cat <<\EOF ++Usage: depcomp [--help] [--version] PROGRAM [ARGS] ++ ++Run PROGRAMS ARGS to compile a file, generating dependencies ++as side-effects. ++ ++Environment variables: ++ depmode Dependency tracking mode. ++ source Source file read by `PROGRAMS ARGS'. ++ object Object file output by `PROGRAMS ARGS'. ++ DEPDIR directory where to store dependencies. ++ depfile Dependency file to output. ++ tmpdepfile Temporary file to use when outputing dependencies. ++ libtool Whether libtool is used (yes/no). ++ ++Report bugs to . ++EOF ++ exit $? ++ ;; ++ -v | --v*) ++ echo "depcomp $scriptversion" ++ exit $? ++ ;; ++esac ++ ++if test -z "$depmode" || test -z "$source" || test -z "$object"; then ++ echo "depcomp: Variables source, object and depmode must be set" 1>&2 ++ exit 1 ++fi ++ ++# Dependencies for sub/bar.o or sub/bar.obj go into sub/.deps/bar.Po. ++depfile=${depfile-`echo "$object" | ++ sed 's|[^\\/]*$|'${DEPDIR-.deps}'/&|;s|\.\([^.]*\)$|.P\1|;s|Pobj$|Po|'`} ++tmpdepfile=${tmpdepfile-`echo "$depfile" | sed 's/\.\([^.]*\)$/.T\1/'`} ++ ++rm -f "$tmpdepfile" ++ ++# Some modes work just like other modes, but use different flags. We ++# parameterize here, but still list the modes in the big case below, ++# to make depend.m4 easier to write. Note that we *cannot* use a case ++# here, because this file can only contain one case statement. ++if test "$depmode" = hp; then ++ # HP compiler uses -M and no extra arg. ++ gccflag=-M ++ depmode=gcc ++fi ++ ++if test "$depmode" = dashXmstdout; then ++ # This is just like dashmstdout with a different argument. ++ dashmflag=-xM ++ depmode=dashmstdout ++fi ++ ++cygpath_u="cygpath -u -f -" ++if test "$depmode" = msvcmsys; then ++ # This is just like msvisualcpp but w/o cygpath translation. ++ # Just convert the backslash-escaped backslashes to single forward ++ # slashes to satisfy depend.m4 ++ cygpath_u="sed s,\\\\\\\\,/,g" ++ depmode=msvisualcpp ++fi ++ ++case "$depmode" in ++gcc3) ++## gcc 3 implements dependency tracking that does exactly what ++## we want. Yay! Note: for some reason libtool 1.4 doesn't like ++## it if -MD -MP comes after the -MF stuff. Hmm. ++## Unfortunately, FreeBSD c89 acceptance of flags depends upon ++## the command line argument order; so add the flags where they ++## appear in depend2.am. Note that the slowdown incurred here ++## affects only configure: in makefiles, %FASTDEP% shortcuts this. ++ for arg ++ do ++ case $arg in ++ -c) set fnord "$@" -MT "$object" -MD -MP -MF "$tmpdepfile" "$arg" ;; ++ *) set fnord "$@" "$arg" ;; ++ esac ++ shift # fnord ++ shift # $arg ++ done ++ "$@" ++ stat=$? ++ if test $stat -eq 0; then : ++ else ++ rm -f "$tmpdepfile" ++ exit $stat ++ fi ++ mv "$tmpdepfile" "$depfile" ++ ;; ++ ++gcc) ++## There are various ways to get dependency output from gcc. Here's ++## why we pick this rather obscure method: ++## - Don't want to use -MD because we'd like the dependencies to end ++## up in a subdir. Having to rename by hand is ugly. ++## (We might end up doing this anyway to support other compilers.) ++## - The DEPENDENCIES_OUTPUT environment variable makes gcc act like ++## -MM, not -M (despite what the docs say). ++## - Using -M directly means running the compiler twice (even worse ++## than renaming). ++ if test -z "$gccflag"; then ++ gccflag=-MD, ++ fi ++ "$@" -Wp,"$gccflag$tmpdepfile" ++ stat=$? ++ if test $stat -eq 0; then : ++ else ++ rm -f "$tmpdepfile" ++ exit $stat ++ fi ++ rm -f "$depfile" ++ echo "$object : \\" > "$depfile" ++ alpha=ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz ++## The second -e expression handles DOS-style file names with drive letters. ++ sed -e 's/^[^:]*: / /' \ ++ -e 's/^['$alpha']:\/[^:]*: / /' < "$tmpdepfile" >> "$depfile" ++## This next piece of magic avoids the `deleted header file' problem. ++## The problem is that when a header file which appears in a .P file ++## is deleted, the dependency causes make to die (because there is ++## typically no way to rebuild the header). We avoid this by adding ++## dummy dependencies for each header file. Too bad gcc doesn't do ++## this for us directly. ++ tr ' ' ' ++' < "$tmpdepfile" | ++## Some versions of gcc put a space before the `:'. On the theory ++## that the space means something, we add a space to the output as ++## well. ++## Some versions of the HPUX 10.20 sed can't process this invocation ++## correctly. Breaking it into two sed invocations is a workaround. ++ sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile" ++ rm -f "$tmpdepfile" ++ ;; ++ ++hp) ++ # This case exists only to let depend.m4 do its work. It works by ++ # looking at the text of this script. This case will never be run, ++ # since it is checked for above. ++ exit 1 ++ ;; ++ ++sgi) ++ if test "$libtool" = yes; then ++ "$@" "-Wp,-MDupdate,$tmpdepfile" ++ else ++ "$@" -MDupdate "$tmpdepfile" ++ fi ++ stat=$? ++ if test $stat -eq 0; then : ++ else ++ rm -f "$tmpdepfile" ++ exit $stat ++ fi ++ rm -f "$depfile" ++ ++ if test -f "$tmpdepfile"; then # yes, the sourcefile depend on other files ++ echo "$object : \\" > "$depfile" ++ ++ # Clip off the initial element (the dependent). Don't try to be ++ # clever and replace this with sed code, as IRIX sed won't handle ++ # lines with more than a fixed number of characters (4096 in ++ # IRIX 6.2 sed, 8192 in IRIX 6.5). We also remove comment lines; ++ # the IRIX cc adds comments like `#:fec' to the end of the ++ # dependency line. ++ tr ' ' ' ++' < "$tmpdepfile" \ ++ | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' | \ ++ tr ' ++' ' ' >> "$depfile" ++ echo >> "$depfile" ++ ++ # The second pass generates a dummy entry for each header file. ++ tr ' ' ' ++' < "$tmpdepfile" \ ++ | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' -e 's/$/:/' \ ++ >> "$depfile" ++ else ++ # The sourcefile does not contain any dependencies, so just ++ # store a dummy comment line, to avoid errors with the Makefile ++ # "include basename.Plo" scheme. ++ echo "#dummy" > "$depfile" ++ fi ++ rm -f "$tmpdepfile" ++ ;; ++ ++aix) ++ # The C for AIX Compiler uses -M and outputs the dependencies ++ # in a .u file. In older versions, this file always lives in the ++ # current directory. Also, the AIX compiler puts `$object:' at the ++ # start of each line; $object doesn't have directory information. ++ # Version 6 uses the directory in both cases. ++ dir=`echo "$object" | sed -e 's|/[^/]*$|/|'` ++ test "x$dir" = "x$object" && dir= ++ base=`echo "$object" | sed -e 's|^.*/||' -e 's/\.o$//' -e 's/\.lo$//'` ++ if test "$libtool" = yes; then ++ tmpdepfile1=$dir$base.u ++ tmpdepfile2=$base.u ++ tmpdepfile3=$dir.libs/$base.u ++ "$@" -Wc,-M ++ else ++ tmpdepfile1=$dir$base.u ++ tmpdepfile2=$dir$base.u ++ tmpdepfile3=$dir$base.u ++ "$@" -M ++ fi ++ stat=$? ++ ++ if test $stat -eq 0; then : ++ else ++ rm -f "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" ++ exit $stat ++ fi ++ ++ for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" ++ do ++ test -f "$tmpdepfile" && break ++ done ++ if test -f "$tmpdepfile"; then @@ Diff output truncated at 100000 characters. @@ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From hson at users.sourceforge.net Mon Jan 4 17:27:16 2010 From: hson at users.sourceforge.net (hson at users.sourceforge.net) Date: Mon, 04 Jan 2010 16:27:16 +0000 Subject: [csw-devel] SF.net SVN: gar:[7861] csw/mgar/pkg/ilmbase/trunk/Makefile Message-ID: Revision: 7861 http://gar.svn.sourceforge.net/gar/?rev=7861&view=rev Author: hson Date: 2010-01-04 16:27:14 +0000 (Mon, 04 Jan 2010) Log Message: ----------- ilmbase: Minor comiler flag fixes to try to get the tests working on 64-bit Modified Paths: -------------- csw/mgar/pkg/ilmbase/trunk/Makefile Modified: csw/mgar/pkg/ilmbase/trunk/Makefile =================================================================== --- csw/mgar/pkg/ilmbase/trunk/Makefile 2010-01-04 14:59:02 UTC (rev 7860) +++ csw/mgar/pkg/ilmbase/trunk/Makefile 2010-01-04 16:27:14 UTC (rev 7861) @@ -53,12 +53,17 @@ PATCHFILES = ImathMath.patch PATCHFILES += ltmain.sh.patch -LIBS += -lCstd -lCrun -lc -lm -export LIBS +EXTRA_LD_FLAGS += -lCstd -lCrun -lc -lm +EXTRA_CXX_FLAGS_isa-i386 = +EXTRA_CXX_FLAGS_isa-sparcv8 = +EXTRA_CXX_FLAGS_isa-amd64 = -KPIC +EXTRA_CXX_FLAGS_isa-sparcv9 = -KPIC +EXTRA_CXX_FLAGS += $(EXTRA_LD_FLAGS_$(MODULATION)) BUILD64 = 1 # Check fails if library isn't installed /opt/csw/lib and until a 64-bit +# lib is installed test has to be disabled #TEST_TARGET = check TEST_TARGET = @@ -66,6 +71,9 @@ include gar/category.mk +# +# Test to see if rebuilding libtool would fix 64-bit problem... +# #pre-configure-modulated: # @echo " ==> Regenerating build tools..." # @(cd $(WORKSRC) ; \ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From hson at users.sourceforge.net Mon Jan 4 20:05:04 2010 From: hson at users.sourceforge.net (hson at users.sourceforge.net) Date: Mon, 04 Jan 2010 19:05:04 +0000 Subject: [csw-devel] SF.net SVN: gar:[7862] csw/mgar/pkg/openexr/trunk Message-ID: Revision: 7862 http://gar.svn.sourceforge.net/gar/?rev=7862&view=rev Author: hson Date: 2010-01-04 19:01:36 +0000 (Mon, 04 Jan 2010) Log Message: ----------- Split package into two Prepare for 64-bit build pending ilmbase install Modified Paths: -------------- csw/mgar/pkg/openexr/trunk/Makefile csw/mgar/pkg/openexr/trunk/checksums Added Paths: ----------- csw/mgar/pkg/openexr/trunk/files/ltmain.sh.patch csw/mgar/pkg/openexr/trunk/files/makePreview.cpp.patch Modified: csw/mgar/pkg/openexr/trunk/Makefile =================================================================== --- csw/mgar/pkg/openexr/trunk/Makefile 2010-01-04 16:27:14 UTC (rev 7861) +++ csw/mgar/pkg/openexr/trunk/Makefile 2010-01-04 19:01:36 UTC (rev 7862) @@ -22,27 +22,52 @@ DISTFILES += libIlmImf.so.2.0.2.i DISTFILES += libIlmImf.so.2.0.2.s +PACKAGES = CSWopenexr CSWopenexrdevel +CATALOGNAME_CSWopenexr = openexr +CATALOGNAME_CSWopenexrdevel = openexr_devel + +SPKG_DESC_CSWopenexr += High dynamic-range (HDR) image file format developed by Industrial Light & Magic +SPKG_DESC_CSWopenexrdevel += High dynamic-range (HDR) image file format developed by Industrial Light & Magic - developer package + +PKGFILES_CSWopenexrdevel = $(PKGFILES_DEVEL) + +REQUIRED_PKGS_CSWopenexr += CSWilmbase CSWzlib +REQUIRED_PKGS_CSWopenexrdevel += CSWopenexr + SPKG_SOURCEURL = http://www.openexr.com + LICENSE = LICENSE -REQUIRED_PKGS += CSWilmbase CSWzlib - -# We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz -CONFIGURE_ARGS = $(DIRPATHS) +PATCHFILES += ltmain.sh.patch +PATCHFILES += makePreview.cpp.patch -LIBS += -lCstd -lCrun -lc -lm -export LIBS +EXTRA_LD_FLAGS += -lCstd -lCrun -lc -lm +EXTRA_CXX_FLAGS_isa-i386 = +EXTRA_CXX_FLAGS_isa-sparcv8 = +EXTRA_CXX_FLAGS_isa-amd64 = -KPIC +EXTRA_CXX_FLAGS_isa-sparcv9 = -KPIC +EXTRA_CXX_FLAGS += $(EXTRA_LD_FLAGS_$(MODULATION)) -TEST_SCRIPTS = +BUILD64 = 1 +# Check fails if library isn't installed /opt/csw/lib and until a 64-bit +# lib is installed test has to be disabled +TEST_TARGET = check +#TEST_TARGET = + +STRIP_LIBTOOL = 1 + +CONFIGURE_ARGS = $(DIRPATHS) + include gar/category.mk +# Until kdeoffice_gcc is rebuilt using new openexr/ilmbase post-install-isa-sparcv8: @cp $(FILEDIR)/libIlmImf.so.2.0.2.s $(INSTALLISADIR)/opt/csw/lib/libIlmImf.so.2.0.2 - @ln -s libIlmImf.so.2.0.2 $(INSTALLISADIR)/opt/csw/lib/libIlmImf.so.2 + @( if [ ! -r $(INSTALLISADIR)$(libdir)/libIlmImf.so.2 ] ; then ln -s libIlmImf.so.2.0.2 $(INSTALLISADIR)/opt/csw/lib/libIlmImf.so.2 ; fi ) post-install-isa-i386: @cp $(FILEDIR)/libIlmImf.so.2.0.2.i $(INSTALLISADIR)/opt/csw/lib/libIlmImf.so.2.0.2 - @ln -s libIlmImf.so.2.0.2 $(INSTALLISADIR)/opt/csw/lib/libIlmImf.so.2 + @( if [ ! -r $(INSTALLISADIR)$(libdir)/libIlmImf.so.2 ] ; then ln -s libIlmImf.so.2.0.2 $(INSTALLISADIR)/opt/csw/lib/libIlmImf.so.2 ; fi ) Modified: csw/mgar/pkg/openexr/trunk/checksums =================================================================== --- csw/mgar/pkg/openexr/trunk/checksums 2010-01-04 16:27:14 UTC (rev 7861) +++ csw/mgar/pkg/openexr/trunk/checksums 2010-01-04 19:01:36 UTC (rev 7862) @@ -1,3 +1,5 @@ -11951f164f9c872b183df75e66de145a download/openexr-1.6.1.tar.gz -0d08a0c9f251d385b5d3c86ac7da84e5 download/libIlmImf.so.2.0.2.i -32dec457461b5d371eb2dd4a2e5d2231 download/libIlmImf.so.2.0.2.s +0d08a0c9f251d385b5d3c86ac7da84e5 libIlmImf.so.2.0.2.i +32dec457461b5d371eb2dd4a2e5d2231 libIlmImf.so.2.0.2.s +aab7ae39a7fc1317192aa5663e0ba3d7 ltmain.sh.patch +462c6cb9708c254261fd1515c1294336 makePreview.cpp.patch +11951f164f9c872b183df75e66de145a openexr-1.6.1.tar.gz Added: csw/mgar/pkg/openexr/trunk/files/ltmain.sh.patch =================================================================== --- csw/mgar/pkg/openexr/trunk/files/ltmain.sh.patch (rev 0) +++ csw/mgar/pkg/openexr/trunk/files/ltmain.sh.patch 2010-01-04 19:01:36 UTC (rev 7862) @@ -0,0 +1,43 @@ +diff -Nru openexr-1.6.1.orig/ltmain.sh openexr-1.6.1/ltmain.sh +--- openexr-1.6.1.orig/ltmain.sh 2004-05-24 20:14:34.000000000 +0200 ++++ openexr-1.6.1/ltmain.sh 2010-01-04 18:01:46.879978336 +0100 +@@ -1382,7 +1382,7 @@ + # but this is not reliable with gcc because gcc may use -mfoo to + # select a different linker, different libraries, etc, while + # -Wl,-mfoo simply passes -mfoo to the linker. +- -m*) ++ -m*|-xarch=*) + # Unknown arguments in both finalize_command and compile_command need + # to be aesthetically quoted because they are evaled later. + arg=`$echo "X$arg" | $Xsed -e "$sed_quote_subst"` +@@ -1393,9 +1393,10 @@ + esac + compile_command="$compile_command $arg" + finalize_command="$finalize_command $arg" +- if test "$with_gcc" = "yes" ; then ++# 64-bit fix for CC ++# if test "$with_gcc" = "yes" ; then + compiler_flags="$compiler_flags $arg" +- fi ++# fi + continue + ;; + +@@ -3890,7 +3891,7 @@ + save_ifs="$IFS"; IFS='~' + for cmd in $cmds; do + IFS="$save_ifs" +- eval cmd=\"$cmd\" ++ eval cmd=\"$cmd -norunpath\" + $show "$cmd" + $run eval "$cmd" || exit $? + done +@@ -4512,7 +4513,7 @@ + $echo "$modename: \`$output' will be relinked during installation" 1>&2 + else + if test "$fast_install" != no; then +- link_command="$finalize_var$compile_command$finalize_rpath" ++ link_command="$finalize_var$compile_command -norunpath" + if test "$fast_install" = yes; then + relink_command=`$echo "X$compile_var$compile_command$compile_rpath" | $Xsed -e 's%@OUTPUT@%\$progdir/\$file%g'` + else Added: csw/mgar/pkg/openexr/trunk/files/makePreview.cpp.patch =================================================================== --- csw/mgar/pkg/openexr/trunk/files/makePreview.cpp.patch (rev 0) +++ csw/mgar/pkg/openexr/trunk/files/makePreview.cpp.patch 2010-01-04 19:01:36 UTC (rev 7862) @@ -0,0 +1,23 @@ +diff -Nru openexr-1.6.1.orig/exrmakepreview/makePreview.cpp openexr-1.6.1/exrmakepreview/makePreview.cpp +--- openexr-1.6.1.orig/exrmakepreview/makePreview.cpp 2006-06-06 07:58:20.000000000 +0200 ++++ openexr-1.6.1/exrmakepreview/makePreview.cpp 2010-01-04 17:58:55.457462356 +0100 +@@ -78,7 +78,8 @@ + // at 0.0, 0.0, and 5.0 respectively. + // + +- float x = max (0.f, h * m); ++ float x = max (0.f, (float)(h * m)); ++ + + if (x > 1) + x = 1 + knee (x - 1, 0.184874f); +@@ -132,7 +133,8 @@ + preview.r = gamma (pixel.r, m); + preview.g = gamma (pixel.g, m); + preview.b = gamma (pixel.b, m); +- preview.a = int (clamp (pixel.a * 255.f, 0.f, 255.f) + .5f); ++ preview.a = int (clamp ((double)(pixel.a * 255.f), (double)0.f, (double)255.f) + .5f); ++ + } + } + } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From hson at users.sourceforge.net Mon Jan 4 20:20:53 2010 From: hson at users.sourceforge.net (hson at users.sourceforge.net) Date: Mon, 04 Jan 2010 19:20:53 +0000 Subject: [csw-devel] SF.net SVN: gar:[7863] csw/mgar/pkg/evolution Message-ID: Revision: 7863 http://gar.svn.sourceforge.net/gar/?rev=7863&view=rev Author: hson Date: 2010-01-04 19:17:34 +0000 (Mon, 04 Jan 2010) Log Message: ----------- evolution: Add Makefile and more in preparation for upgrade to 2.28.2 Added Paths: ----------- csw/mgar/pkg/evolution/branches/ csw/mgar/pkg/evolution/tags/ csw/mgar/pkg/evolution/trunk/Makefile csw/mgar/pkg/evolution/trunk/checksums csw/mgar/pkg/evolution/trunk/files/ Property Changed: ---------------- csw/mgar/pkg/evolution/trunk/ Property changes on: csw/mgar/pkg/evolution/trunk ___________________________________________________________________ Added: svn:ignore + cookies download work Added: svn:externals + gar https://gar.svn.sf.net/svnroot/gar/csw/mgar/gar/v2 Added: csw/mgar/pkg/evolution/trunk/Makefile =================================================================== --- csw/mgar/pkg/evolution/trunk/Makefile (rev 0) +++ csw/mgar/pkg/evolution/trunk/Makefile 2010-01-04 19:17:34 UTC (rev 7863) @@ -0,0 +1,33 @@ +GARNAME = evolution +GARVERSION = 2.28.2 +CATEGORIES = gnome + +DESCRIPTION = GNOME mail client and PIM +define BLURB + Evolution provides integrated mail, addressbook and calendaring + functionality to users of the GNOME desktop +endef + +MASTER_SITES = $(GNOME_MIRROR) +DISTFILES = $(GARNAME)-$(GARVERSION).tar.bz2 +DISTNAME = $(GARNAME)-$(GARVERSION) + +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.bz2 + +SPKG_SOURCEURL = http://projects.gnome.org/evolution/ + +EXTRA_INC = $(prefix)/X11/include +EXTRA_LIB = $(prefix)/X11/lib +EXTRA_PKG_CONFIG_DIRS = $(prefix)/X11/lib + +BUILD64 = 1 + +STRIP_LIBTOOL = 1 + +CONFIGURE_ARGS = $(DIRPATHS) + +TEST_TARGET = check + +include gar/category.mk + +PATH := /opt/csw/gnu:$(PATH) Added: csw/mgar/pkg/evolution/trunk/checksums =================================================================== --- csw/mgar/pkg/evolution/trunk/checksums (rev 0) +++ csw/mgar/pkg/evolution/trunk/checksums 2010-01-04 19:17:34 UTC (rev 7863) @@ -0,0 +1 @@ +2af2e699cd8a46b8f7b9baec3184f685 evolution-2.28.2.tar.bz2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From hson at users.sourceforge.net Mon Jan 4 20:51:37 2010 From: hson at users.sourceforge.net (hson at users.sourceforge.net) Date: Mon, 04 Jan 2010 19:51:37 +0000 Subject: [csw-devel] SF.net SVN: gar:[7864] csw/mgar/pkg/evolution-ds Message-ID: Revision: 7864 http://gar.svn.sourceforge.net/gar/?rev=7864&view=rev Author: hson Date: 2010-01-04 19:51:27 +0000 (Mon, 04 Jan 2010) Log Message: ----------- Add Makefile and more in preparation for upgrade to 2.28.2 Added Paths: ----------- csw/mgar/pkg/evolution-ds/branches/ csw/mgar/pkg/evolution-ds/tags/ csw/mgar/pkg/evolution-ds/trunk/Makefile csw/mgar/pkg/evolution-ds/trunk/checksums csw/mgar/pkg/evolution-ds/trunk/files/ Property Changed: ---------------- csw/mgar/pkg/evolution-ds/trunk/ Property changes on: csw/mgar/pkg/evolution-ds/trunk ___________________________________________________________________ Added: svn:ignore + cookies download work Added: svn:externals + gar https://gar.svn.sf.net/svnroot/gar/csw/mgar/gar/v2 Added: csw/mgar/pkg/evolution-ds/trunk/Makefile =================================================================== --- csw/mgar/pkg/evolution-ds/trunk/Makefile (rev 0) +++ csw/mgar/pkg/evolution-ds/trunk/Makefile 2010-01-04 19:51:27 UTC (rev 7864) @@ -0,0 +1,53 @@ +GARNAME = evolution-data-server +GARVERSION = 2.28.2 +CATEGORIES = gnome + +DESCRIPTION = Evolution database backend server +define BLURB + The data server, called "Evolution Data Server" is responsible for + managing calendar and addressbook information. +endef + +MASTER_SITES = $(GNOME_MIRROR) +DISTFILES = $(GARNAME)-$(GARVERSION).tar.bz2 +DISTNAME = $(GARNAME)-$(GARVERSION) + +PACKAGES = CSWevolution-ds CSWevolution-ds-devel CSWevolution-ds-doc +CATALOGNAME_CSWevolution-ds = evolution_ds +CATALOGNAME_CSWevolution-ds-devel = evolution_ds_devel +CATALOGNAME_CSWevolution-ds-doc = evolution_ds_doc + +SPKG_DESC_CSWevolution-ds += Evolution database backend server +SPKG_DESC_CSWevolution-ds-devel += Evolution database backend server - developer package +SPKG_DESC_CSWevolution-ds-doc += Evolution database backend server - documentation + +REQUIRED_PKGS_CSWevolution-ds += +REQUIRED_PKGS_CSWevolution-ds += +REQUIRED_PKGS_CSWevolution-ds += +REQUIRED_PKGS_CSWevolution-dsdevel += CSWevolution +REQUIRED_PKGS_CSWevolution-dsdoc += CSWevolution + +PKGFILES_CSWevolution-dsdevel = $(PKGFILES_DEVEL) +PKGFILES_CSWevolution-dsdoc = $(sharedstatedir)/gtk-doc/.* + +ARCHALL_CSWevolution-dsdoc = 1 + +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.bz2 + +SPKG_SOURCEURL =http://projects.gnome.org/evolution + +EXTRA_INC = $(prefix)/X11/include +EXTRA_LIB = $(prefix)/X11/lib +EXTRA_PKG_CONFIG_DIRS = $(prefix)/X11/lib + +BUILD64 = 1 + +STRIP_LIBTOOL = 1 + +CONFIGURE_ARGS = $(DIRPATHS) + +TEST_TARGET = check + +include gar/category.mk + +PATH := /opt/csw/gnu:$(PATH) Added: csw/mgar/pkg/evolution-ds/trunk/checksums =================================================================== --- csw/mgar/pkg/evolution-ds/trunk/checksums (rev 0) +++ csw/mgar/pkg/evolution-ds/trunk/checksums 2010-01-04 19:51:27 UTC (rev 7864) @@ -0,0 +1 @@ +416248e60b1bec3f913a6857576cbcb0 evolution-data-server-2.28.2.tar.bz2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From hson at users.sourceforge.net Mon Jan 4 21:31:51 2010 From: hson at users.sourceforge.net (hson at users.sourceforge.net) Date: Mon, 04 Jan 2010 20:31:51 +0000 Subject: [csw-devel] SF.net SVN: gar:[7865] csw/mgar/pkg Message-ID: Revision: 7865 http://gar.svn.sourceforge.net/gar/?rev=7865&view=rev Author: hson Date: 2010-01-04 20:31:50 +0000 (Mon, 04 Jan 2010) Log Message: ----------- evolution-mapi: Initial commit Added Paths: ----------- csw/mgar/pkg/evolution-mapi/ csw/mgar/pkg/evolution-mapi/Makefile csw/mgar/pkg/evolution-mapi/branches/ csw/mgar/pkg/evolution-mapi/tags/ csw/mgar/pkg/evolution-mapi/trunk/ csw/mgar/pkg/evolution-mapi/trunk/Makefile csw/mgar/pkg/evolution-mapi/trunk/checksums csw/mgar/pkg/evolution-mapi/trunk/files/ Added: csw/mgar/pkg/evolution-mapi/Makefile =================================================================== --- csw/mgar/pkg/evolution-mapi/Makefile (rev 0) +++ csw/mgar/pkg/evolution-mapi/Makefile 2010-01-04 20:31:50 UTC (rev 7865) @@ -0,0 +1,15 @@ +# vim: ft=make ts=4 sw=4 noet + +default: + @echo "You are in the pkg/ directory." + +%: + $(MAKE) -C trunk $* + +paranoid-%: + $(MAKE) -C trunk $* || exit 2 + +export BUILDLOG ?= $(shell pwd)/buildlog.txt + +report-%: + $(MAKE) -C trunk $* || echo " *** make $* in $$i failed ***" >> $(BUILDLOG) Property changes on: csw/mgar/pkg/evolution-mapi/trunk ___________________________________________________________________ Added: svn:ignore + cookies download work Added: svn:externals + gar https://gar.svn.sf.net/svnroot/gar/csw/mgar/gar/v2 Added: csw/mgar/pkg/evolution-mapi/trunk/Makefile =================================================================== --- csw/mgar/pkg/evolution-mapi/trunk/Makefile (rev 0) +++ csw/mgar/pkg/evolution-mapi/trunk/Makefile 2010-01-04 20:31:50 UTC (rev 7865) @@ -0,0 +1,53 @@ +GARNAME = evolution-mapi +GARVERSION = 0.28.2 +CATEGORIES = gnome + +DESCRIPTION = Evolution extension for MS Exchange 2007 servers +define BLURB + A provider for Evolution that can connect to Exchange 2007 servers and + also to Exchange 2003, 2000 and 5.5. +endef + +MASTER_SITES = $(GNOME_MIRROR) +DISTFILES = $(GARNAME)-$(GARVERSION).tar.bz2 +DISTNAME = $(GARNAME)-$(GARVERSION) + +PACKAGES = CSWevolutionmapi CSWevolutionmapidev CSWevolutionmapidoc +CATALOGNAME_CSWevolutionmapi = evolution_mapi +CATALOGNAME_CSWevolutionmapidev = evolution_mapi_devel +CATALOGNAME_CSWevolutionmapidoc = evolution_mapi_doc + +SPKG_DESC_CSWevolutionmapi += Evolution extension for MS Exchange 2007 servers +SPKG_DESC_CSWevolutionmapidevel += Evolution extension for MS Exchange 2007 servers - developer package +SPKG_DESC_CSWevolutionmapidoc += Evolution extension for MS Exchange 2007 servers - documentation + +REQUIRED_PKGS_CSWevolutionmapi += +REQUIRED_PKGS_CSWevolutionmapi += +REQUIRED_PKGS_CSWevolutionmapi += +REQUIRED_PKGS_CSWevolutionmapidev += CSWevolutionmapi +REQUIRED_PKGS_CSWevolutionmapidoc += CSWevolutionmapi + +PKGFILES_CSWevolutionmapidev = $(PKGFILES_DEVEL) +PKGFILES_CSWevolutionmapidoc = $(sharedstatedir)/gtk-doc/.* + +ARCHALL_CSWevolutionmapidoc = 1 + +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.bz2 + +SPKG_SOURCEURL = http://projects.gnome.org/evolution + +EXTRA_INC = $(prefix)/X11/include +EXTRA_LIB = $(prefix)/X11/lib +EXTRA_PKG_CONFIG_DIRS = $(prefix)/X11/lib + +BUILD64 = 1 + +STRIP_LIBTOOL = 1 + +CONFIGURE_ARGS = $(DIRPATHS) + +TEST_TARGET = check + +include gar/category.mk + +PATH := /opt/csw/gnu:$(PATH) Added: csw/mgar/pkg/evolution-mapi/trunk/checksums =================================================================== --- csw/mgar/pkg/evolution-mapi/trunk/checksums (rev 0) +++ csw/mgar/pkg/evolution-mapi/trunk/checksums 2010-01-04 20:31:50 UTC (rev 7865) @@ -0,0 +1 @@ +6f1c61b28778983806d39214f717810f evolution-mapi-0.28.2.tar.bz2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Mon Jan 4 22:23:44 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Mon, 04 Jan 2010 21:23:44 +0000 Subject: [csw-devel] SF.net SVN: gar:[7866] csw/mgar/pkg/colordiff/trunk/Makefile Message-ID: Revision: 7866 http://gar.svn.sourceforge.net/gar/?rev=7866&view=rev Author: dmichelsen Date: 2010-01-04 21:23:44 +0000 (Mon, 04 Jan 2010) Log Message: ----------- colordiff: Fix docdir Modified Paths: -------------- csw/mgar/pkg/colordiff/trunk/Makefile Modified: csw/mgar/pkg/colordiff/trunk/Makefile =================================================================== --- csw/mgar/pkg/colordiff/trunk/Makefile 2010-01-04 20:31:50 UTC (rev 7865) +++ csw/mgar/pkg/colordiff/trunk/Makefile 2010-01-04 21:23:44 UTC (rev 7866) @@ -31,8 +31,8 @@ include gar/category.mk install-custom: - ginstall -d $(DESTDIR)$(docdir) - (cd $(WORKSRC) && ginstall BUGS CHANGES INSTALL README TODO $(DESTDIR)$(docdir)) + ginstall -d $(DESTDIR)$(docdir)/colordiff + (cd $(WORKSRC) && ginstall BUGS CHANGES INSTALL README TODO $(DESTDIR)$(docdir)/colordiff) ginstall -d $(DESTDIR)$(mandir)/man1 (cd $(WORKSRC) && ginstall cdiff.1 colordiff.1 $(DESTDIR)$(mandir)/man1) ginstall -d $(DESTDIR)$(sysconfdir) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Mon Jan 4 22:40:39 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Mon, 04 Jan 2010 21:40:39 +0000 Subject: [csw-devel] SF.net SVN: gar:[7867] csw/mgar/pkg/binutils/trunk Message-ID: Revision: 7867 http://gar.svn.sourceforge.net/gar/?rev=7867&view=rev Author: dmichelsen Date: 2010-01-04 21:40:39 +0000 (Mon, 04 Jan 2010) Log Message: ----------- binutils: Update to 2.20, add patches Modified Paths: -------------- csw/mgar/pkg/binutils/trunk/Makefile csw/mgar/pkg/binutils/trunk/checksums Added Paths: ----------- csw/mgar/pkg/binutils/trunk/files/0001-Remove-gcc-specific-warning-no-error.patch csw/mgar/pkg/binutils/trunk/files/0002-Use-func-instead-of-FUNCTION.patch Modified: csw/mgar/pkg/binutils/trunk/Makefile =================================================================== --- csw/mgar/pkg/binutils/trunk/Makefile 2010-01-04 21:23:44 UTC (rev 7866) +++ csw/mgar/pkg/binutils/trunk/Makefile 2010-01-04 21:40:39 UTC (rev 7867) @@ -1,5 +1,5 @@ GARNAME = binutils -GARVERSION = 2.19.1 +GARVERSION = 2.20 CATEGORIES = utils DESCRIPTION = GNU binary utilities: gas, gld, gprof, and others @@ -7,8 +7,13 @@ endef MASTER_SITES = $(GNU_MIRROR) -DISTFILES = $(GARNAME)-$(GARVERSION).tar.bz2 +DISTFILES = $(GARNAME)-$(GARVERSION).tar.bz2 +# These have been reported as +# +PATCHFILES = 0001-Remove-gcc-specific-warning-no-error.patch +PATCHFILES += 0002-Use-func-instead-of-FUNCTION.patch + REQUIRED_PKGS = CSWzlib CSWiconv CSWggettextrt # We define upstream file regex so we can be notifed of new upstream software release @@ -16,7 +21,16 @@ BUILD64 = 1 CONFIGURE_ARGS = $(DIRPATHS) +CONFIGURE_ARGS += --program-prefix=g +ifeq ($(GARCH),i386) +CONFIGURE_ARGS += --enable-targets=i386-pc-solaris2.10,i686-pc-mingw32 +endif + TEST_TARGET = check +# Do not run tests until this is fixed: +# +SKIPTEST ?= 1 + include gar/category.mk Modified: csw/mgar/pkg/binutils/trunk/checksums =================================================================== --- csw/mgar/pkg/binutils/trunk/checksums 2010-01-04 21:23:44 UTC (rev 7866) +++ csw/mgar/pkg/binutils/trunk/checksums 2010-01-04 21:40:39 UTC (rev 7867) @@ -1 +1,3 @@ -09a8c5821a2dfdbb20665bc0bd680791 download/binutils-2.19.1.tar.bz2 +da13e88df454002f329e47f26cc51018 0001-Remove-gcc-specific-warning-no-error.patch +52296e0f180d98a9857913a5d9050907 0002-Use-func-instead-of-FUNCTION.patch +ee2d3e996e9a2d669808713360fa96f8 binutils-2.20.tar.bz2 Added: csw/mgar/pkg/binutils/trunk/files/0001-Remove-gcc-specific-warning-no-error.patch =================================================================== --- csw/mgar/pkg/binutils/trunk/files/0001-Remove-gcc-specific-warning-no-error.patch (rev 0) +++ csw/mgar/pkg/binutils/trunk/files/0001-Remove-gcc-specific-warning-no-error.patch 2010-01-04 21:40:39 UTC (rev 7867) @@ -0,0 +1,63 @@ +From 36557d4e77aaca996e7906ec5c9e9899f8b44135 Mon Sep 17 00:00:00 2001 +From: Dagobert Michelsen +Date: Mon, 4 Jan 2010 10:33:49 +0100 +Subject: [PATCH] Remove gcc specific warning no-error + +--- + binutils/Makefile.am | 8 ++++---- + binutils/Makefile.in | 8 ++++---- + 2 files changed, 8 insertions(+), 8 deletions(-) + +diff --git a/binutils/Makefile.am b/binutils/Makefile.am +index abade21..ff935bc 100644 +--- a/binutils/Makefile.am ++++ b/binutils/Makefile.am +@@ -255,16 +255,16 @@ sysinfo$(EXEEXT_FOR_BUILD): sysinfo.o syslex.o + + syslex.o: syslex.c sysinfo.h config.h + if [ -r syslex.c ]; then \ +- $(CC_FOR_BUILD) -c -I. $(AM_CFLAGS) $(CFLAGS_FOR_BUILD) syslex.c -Wno-error ; \ ++ $(CC_FOR_BUILD) -c -I. $(AM_CFLAGS) $(CFLAGS_FOR_BUILD) syslex.c ; \ + else \ +- $(CC_FOR_BUILD) -c -I. -I$(srcdir) $(AM_CFLAGS) $(CFLAGS_FOR_BUILD) $(srcdir)/syslex.c -Wno-error ;\ ++ $(CC_FOR_BUILD) -c -I. -I$(srcdir) $(AM_CFLAGS) $(CFLAGS_FOR_BUILD) $(srcdir)/syslex.c ;\ + fi + + sysinfo.o: sysinfo.c + if [ -r sysinfo.c ]; then \ +- $(CC_FOR_BUILD) -c -I. $(AM_CFLAGS) $(CFLAGS_FOR_BUILD) sysinfo.c -Wno-error ; \ ++ $(CC_FOR_BUILD) -c -I. $(AM_CFLAGS) $(CFLAGS_FOR_BUILD) sysinfo.c ; \ + else \ +- $(CC_FOR_BUILD) -c -I. $(AM_CFLAGS) $(CFLAGS_FOR_BUILD) $(srcdir)/sysinfo.c -Wno-error ; \ ++ $(CC_FOR_BUILD) -c -I. $(AM_CFLAGS) $(CFLAGS_FOR_BUILD) $(srcdir)/sysinfo.c ; \ + fi + + bin2c$(EXEEXT_FOR_BUILD): +diff --git a/binutils/Makefile.in b/binutils/Makefile.in +index a1f3800..543ab6c 100644 +--- a/binutils/Makefile.in ++++ b/binutils/Makefile.in +@@ -1197,16 +1197,16 @@ sysinfo$(EXEEXT_FOR_BUILD): sysinfo.o syslex.o + + syslex.o: syslex.c sysinfo.h config.h + if [ -r syslex.c ]; then \ +- $(CC_FOR_BUILD) -c -I. $(AM_CFLAGS) $(CFLAGS_FOR_BUILD) syslex.c -Wno-error ; \ ++ $(CC_FOR_BUILD) -c -I. $(AM_CFLAGS) $(CFLAGS_FOR_BUILD) syslex.c ; \ + else \ +- $(CC_FOR_BUILD) -c -I. -I$(srcdir) $(AM_CFLAGS) $(CFLAGS_FOR_BUILD) $(srcdir)/syslex.c -Wno-error ;\ ++ $(CC_FOR_BUILD) -c -I. -I$(srcdir) $(AM_CFLAGS) $(CFLAGS_FOR_BUILD) $(srcdir)/syslex.c ;\ + fi + + sysinfo.o: sysinfo.c + if [ -r sysinfo.c ]; then \ +- $(CC_FOR_BUILD) -c -I. $(AM_CFLAGS) $(CFLAGS_FOR_BUILD) sysinfo.c -Wno-error ; \ ++ $(CC_FOR_BUILD) -c -I. $(AM_CFLAGS) $(CFLAGS_FOR_BUILD) sysinfo.c ; \ + else \ +- $(CC_FOR_BUILD) -c -I. $(AM_CFLAGS) $(CFLAGS_FOR_BUILD) $(srcdir)/sysinfo.c -Wno-error ; \ ++ $(CC_FOR_BUILD) -c -I. $(AM_CFLAGS) $(CFLAGS_FOR_BUILD) $(srcdir)/sysinfo.c ; \ + fi + + bin2c$(EXEEXT_FOR_BUILD): +-- +1.6.6 + Added: csw/mgar/pkg/binutils/trunk/files/0002-Use-func-instead-of-FUNCTION.patch =================================================================== --- csw/mgar/pkg/binutils/trunk/files/0002-Use-func-instead-of-FUNCTION.patch (rev 0) +++ csw/mgar/pkg/binutils/trunk/files/0002-Use-func-instead-of-FUNCTION.patch 2010-01-04 21:40:39 UTC (rev 7867) @@ -0,0 +1,39 @@ +From de1f53ab369be21c59cc9b2dd2e68aee27b19de8 Mon Sep 17 00:00:00 2001 +From: Dagobert Michelsen +Date: Mon, 4 Jan 2010 12:34:30 +0100 +Subject: [PATCH] Use func instead of FUNCTION + +--- + bfd/elf32-i386.c | 2 ++ + bfd/elf64-x86-64.c | 2 ++ + 2 files changed, 4 insertions(+), 0 deletions(-) + +diff --git a/bfd/elf32-i386.c b/bfd/elf32-i386.c +index 9de1a6c..d39fd6e 100644 +--- a/bfd/elf32-i386.c ++++ b/bfd/elf32-i386.c +@@ -29,6 +29,8 @@ + #include "objalloc.h" + #include "hashtab.h" + ++#define __FUNCTION__ __func__ ++ + /* 386 uses REL relocations instead of RELA. */ + #define USE_REL 1 + +diff --git a/bfd/elf64-x86-64.c b/bfd/elf64-x86-64.c +index 4fb325a..4f24260 100644 +--- a/bfd/elf64-x86-64.c ++++ b/bfd/elf64-x86-64.c +@@ -31,6 +31,8 @@ + + #include "elf/x86-64.h" + ++#define __FUNCTION__ __func__ ++ + /* In case we're on a 32-bit machine, construct a 64-bit "-1" value. */ + #define MINUS_ONE (~ (bfd_vma) 0) + +-- +1.6.5.1 + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From hson at users.sourceforge.net Tue Jan 5 02:50:12 2010 From: hson at users.sourceforge.net (hson at users.sourceforge.net) Date: Tue, 05 Jan 2010 01:50:12 +0000 Subject: [csw-devel] SF.net SVN: gar:[7868] csw/mgar/pkg Message-ID: Revision: 7868 http://gar.svn.sourceforge.net/gar/?rev=7868&view=rev Author: hson Date: 2010-01-05 01:50:12 +0000 (Tue, 05 Jan 2010) Log Message: ----------- evolution-webcal: Initial commit Added Paths: ----------- csw/mgar/pkg/evolution-webcal/ csw/mgar/pkg/evolution-webcal/branches/ csw/mgar/pkg/evolution-webcal/tags/ csw/mgar/pkg/evolution-webcal/trunk/ csw/mgar/pkg/evolution-webcal/trunk/Makefile csw/mgar/pkg/evolution-webcal/trunk/files/ Property changes on: csw/mgar/pkg/evolution-webcal/trunk ___________________________________________________________________ Added: svn:ignore + cookies download work Added: svn:externals + gar https://gar.svn.sf.net/svnroot/gar/csw/mgar/gar/v2 Added: csw/mgar/pkg/evolution-webcal/trunk/Makefile =================================================================== --- csw/mgar/pkg/evolution-webcal/trunk/Makefile (rev 0) +++ csw/mgar/pkg/evolution-webcal/trunk/Makefile 2010-01-05 01:50:12 UTC (rev 7868) @@ -0,0 +1,51 @@ +GARNAME = evolution-webcal +GARVERSION = 2.28.0 +CATEGORIES = gnome + +DESCRIPTION = Evolution Web Calendar +define BLURB +endef + +MASTER_SITES = $(GNOME_MIRROR) +DISTFILES = $(GARNAME)-$(GARVERSION).tar.bz2 +DISTNAME = $(GARNAME)-$(GARVERSION) + +PACKAGES = CSWevolutionwebcal CSWevolutionwebcal-devel CSWevolutionwebcal-doc +CATALOGNAME_CSWevolutionwebcal = evolution_webcal +CATALOGNAME_CSWevolutionwebcal-devel = evolution_webcal_devel +CATALOGNAME_CSWevolutionwebcal-doc = evolution_webcal_doc + +SPKG_DESC_CSWevolutionwebcal += Evolution Web Calendar +SPKG_DESC_CSWevolutionwebcal-devel += Evolution Web Calendar - developer package +SPKG_DESC_CSWevolutionwebcal-doc += Evolution Web Calendar - documentation + +REQUIRED_PKGS_CSWevolutionwebcal += +REQUIRED_PKGS_CSWevolutionwebcal += +REQUIRED_PKGS_CSWevolutionwebcal += +REQUIRED_PKGS_CSWevolutionwebcal-devel += CSWevolution +REQUIRED_PKGS_CSWevolutionwebcal-doc += CSWevolution + +PKGFILES_CSWevolutionwebcal-devel = $(PKGFILES_DEVEL) +PKGFILES_CSWevolutionwebcal-doc = $(sharedstatedir)/gtk-doc/.* + +ARCHALL_CSWevolutionwebcal-doc = 1 + +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.bz2 + +SPKG_SOURCEURL =http://projects.gnome.org/evolution-webcal + +EXTRA_INC = $(prefix)/X11/include +EXTRA_LIB = $(prefix)/X11/lib +EXTRA_PKG_CONFIG_DIRS = $(prefix)/X11/lib + +BUILD64 = 1 + +STRIP_LIBTOOL = 1 + +CONFIGURE_ARGS = $(DIRPATHS) + +TEST_TARGET = check + +include gar/category.mk + +PATH := /opt/csw/gnu:$(PATH) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From hson at users.sourceforge.net Tue Jan 5 02:58:24 2010 From: hson at users.sourceforge.net (hson at users.sourceforge.net) Date: Tue, 05 Jan 2010 01:58:24 +0000 Subject: [csw-devel] SF.net SVN: gar:[7869] csw/mgar/pkg/evolution-webcal Message-ID: Revision: 7869 http://gar.svn.sourceforge.net/gar/?rev=7869&view=rev Author: hson Date: 2010-01-05 01:58:24 +0000 (Tue, 05 Jan 2010) Log Message: ----------- evolution-webcal: Add missing files Added Paths: ----------- csw/mgar/pkg/evolution-webcal/Makefile csw/mgar/pkg/evolution-webcal/trunk/checksums Added: csw/mgar/pkg/evolution-webcal/Makefile =================================================================== --- csw/mgar/pkg/evolution-webcal/Makefile (rev 0) +++ csw/mgar/pkg/evolution-webcal/Makefile 2010-01-05 01:58:24 UTC (rev 7869) @@ -0,0 +1,15 @@ +# vim: ft=make ts=4 sw=4 noet + +default: + @echo "You are in the pkg/ directory." + +%: + $(MAKE) -C trunk $* + +paranoid-%: + $(MAKE) -C trunk $* || exit 2 + +export BUILDLOG ?= $(shell pwd)/buildlog.txt + +report-%: + $(MAKE) -C trunk $* || echo " *** make $* in $$i failed ***" >> $(BUILDLOG) Added: csw/mgar/pkg/evolution-webcal/trunk/checksums =================================================================== --- csw/mgar/pkg/evolution-webcal/trunk/checksums (rev 0) +++ csw/mgar/pkg/evolution-webcal/trunk/checksums 2010-01-05 01:58:24 UTC (rev 7869) @@ -0,0 +1 @@ +7b506d06c56b579977d4ebc56463ff23 evolution-webcal-2.28.0.tar.bz2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From hson at users.sourceforge.net Tue Jan 5 04:14:34 2010 From: hson at users.sourceforge.net (hson at users.sourceforge.net) Date: Tue, 05 Jan 2010 03:14:34 +0000 Subject: [csw-devel] SF.net SVN: gar:[7870] csw/mgar/pkg/gnomedesktop Message-ID: Revision: 7870 http://gar.svn.sourceforge.net/gar/?rev=7870&view=rev Author: hson Date: 2010-01-05 03:14:34 +0000 (Tue, 05 Jan 2010) Log Message: ----------- gnomedesktop: Added some missing files Added Paths: ----------- csw/mgar/pkg/gnomedesktop/branches/ csw/mgar/pkg/gnomedesktop/tags/ csw/mgar/pkg/gnomedesktop/trunk/Makefile csw/mgar/pkg/gnomedesktop/trunk/checksums csw/mgar/pkg/gnomedesktop/trunk/files/ Property Changed: ---------------- csw/mgar/pkg/gnomedesktop/trunk/ Property changes on: csw/mgar/pkg/gnomedesktop/trunk ___________________________________________________________________ Added: svn:ignore + echo cookies download work Added: svn:externals + gar https://gar.svn.sf.net/svnroot/gar/csw/mgar/gar/v2 Added: csw/mgar/pkg/gnomedesktop/trunk/Makefile =================================================================== --- csw/mgar/pkg/gnomedesktop/trunk/Makefile (rev 0) +++ csw/mgar/pkg/gnomedesktop/trunk/Makefile 2010-01-05 03:14:34 UTC (rev 7870) @@ -0,0 +1,53 @@ +GARNAME = gnome-desktop +GARVERSION = 2.28.2 +CATEGORIES = gnome + +DESCRIPTION = Evolution database backend server +define BLURB + The data server, called "Evolution Data Server" is responsible for + managing calendar and addressbook information. +endef + +MASTER_SITES = $(GNOME_MIRROR) +DISTFILES = $(GARNAME)-$(GARVERSION).tar.bz2 +DISTNAME = $(GARNAME)-$(GARVERSION) + +PACKAGES = CSWgnomedesktop CSWgnomedesktop-devel CSWgnomedesktop-doc +CATALOGNAME_CSWgnomedesktop = gnomedesktop +CATALOGNAME_CSWgnomedesktop-devel = gnomedesktop_devel +CATALOGNAME_CSWgnomedesktop-doc = gnomedesktop_doc + +SPKG_DESC_CSWgnomedesktop += Evolution database backend server +SPKG_DESC_CSWgnomedesktop-devel += Evolution database backend server - developer package +SPKG_DESC_CSWgnomedesktop-doc += Evolution database backend server - documentation + +REQUIRED_PKGS_CSWgnomedesktop += +REQUIRED_PKGS_CSWgnomedesktop += +REQUIRED_PKGS_CSWgnomedesktop += +REQUIRED_PKGS_CSWgnomedesktopdevel += CSWevolution +REQUIRED_PKGS_CSWgnomedesktopdoc += CSWevolution + +PKGFILES_CSWgnomedesktopdevel = $(PKGFILES_DEVEL) +PKGFILES_CSWgnomedesktopdoc = $(sharedstatedir)/gtk-doc/.* + +ARCHALL_CSWgnomedesktopdoc = 1 + +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.bz2 + +SPKG_SOURCEURL = http://projects.gnome.org/evolution + +EXTRA_INC = $(prefix)/X11/include +EXTRA_LIB = $(prefix)/X11/lib +EXTRA_PKG_CONFIG_DIRS = $(prefix)/X11/lib + +BUILD64 = 1 + +STRIP_LIBTOOL = 1 + +CONFIGURE_ARGS = $(DIRPATHS) + +TEST_TARGET = check + +include gar/category.mk + +PATH := /opt/csw/gnu:$(PATH) Added: csw/mgar/pkg/gnomedesktop/trunk/checksums =================================================================== --- csw/mgar/pkg/gnomedesktop/trunk/checksums (rev 0) +++ csw/mgar/pkg/gnomedesktop/trunk/checksums 2010-01-05 03:14:34 UTC (rev 7870) @@ -0,0 +1 @@ +036423159a3240a258cc3892573f0e0f gnome-desktop-2.28.2.tar.bz2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From hson at users.sourceforge.net Tue Jan 5 10:02:16 2010 From: hson at users.sourceforge.net (hson at users.sourceforge.net) Date: Tue, 05 Jan 2010 09:02:16 +0000 Subject: [csw-devel] SF.net SVN: gar:[7871] csw/mgar/pkg Message-ID: Revision: 7871 http://gar.svn.sourceforge.net/gar/?rev=7871&view=rev Author: hson Date: 2010-01-05 09:02:16 +0000 (Tue, 05 Jan 2010) Log Message: ----------- libfpx: Initial commit Added Paths: ----------- csw/mgar/pkg/libfpx/ csw/mgar/pkg/libfpx/branches/ csw/mgar/pkg/libfpx/tags/ csw/mgar/pkg/libfpx/trunk/ csw/mgar/pkg/libfpx/trunk/Makefile csw/mgar/pkg/libfpx/trunk/checksums csw/mgar/pkg/libfpx/trunk/files/ csw/mgar/pkg/libfpx/trunk/files/olecomm.h.patch Property changes on: csw/mgar/pkg/libfpx/trunk ___________________________________________________________________ Added: svn:ignore + cookies download work Added: svn:externals + gar https://gar.svn.sf.net/svnroot/gar/csw/mgar/gar/v2 Added: csw/mgar/pkg/libfpx/trunk/Makefile =================================================================== --- csw/mgar/pkg/libfpx/trunk/Makefile (rev 0) +++ csw/mgar/pkg/libfpx/trunk/Makefile 2010-01-05 09:02:16 UTC (rev 7871) @@ -0,0 +1,54 @@ +GARNAME = libfpx +GARVERSION = 1.3.0 +GARSUBREV = 1 +CATEGORIES = lib + +DESCRIPTION = FlashPIX library +define BLURB +endef + +MASTER_SITES = ftp://ftp.imagemagick.org/pub/ImageMagick/delegates/ +DISTFILES = $(GARNAME)-$(GARVERSION)-$(GARSUBREV).tar.bz2 + +#PACKAGES = CSWlibfpx CSWlibfpxdevel CSWlibfpxdoc +PACKAGES = CSWlibfpx CSWlibfpxdevel +CATALOGNAME_CSWlibfpx = libfpx +CATALOGNAME_CSWlibfpxdevel = libfpx_devel +#CATALOGNAME_CSWlibfpxdoc = libfpx_doc + +SPKG_DESC_CSWlibfpx += FlashPIX library +SPKG_DESC_CSWlibfpxdevel += FlashPIX library - developer package +#SPKG_DESC_CSWlibfpxdoc += FlashPIX library - documentation + +REQUIRED_PKGS_CSWlibfpx += +REQUIRED_PKGS_CSWlibfpxdevel += CSWlibfpx +#REQUIRED_PKGS_CSWlibfpxdoc += CSWlibfpx + +PKGFILES_CSWlibfpxdevel = $(PKGFILES_DEVEL) +#PKGFILES_CSWlibfpxdoc = $(sharedstatedir)/doc/.* + +#ARCHALL_CSWlibfpxdoc = 1 + +SPKG_SOURCEURL = http://www.imagemagick.org + +PATCHFILES = olecomm.h.patch +#PATCHFILES += tchar.patch + +LICENSE = flashpix.h + +DOCFILES = AUTHORS ChangeLog NEWS README + +UFILES_REGEX = $(GARNAME)-((\d+(?:\.\d+)*)-(\d+)?).tar.bz2 + +CONFIGURE_ARGS = $(DIRPATHS) + +STRIP_LIBTOOL=1 + +TEST_TARGET = check + +BUILD64 = 1 + +# libfpx have some problems with rw/trait +GARCOMPILER = GCC4 + +include gar/category.mk Added: csw/mgar/pkg/libfpx/trunk/checksums =================================================================== --- csw/mgar/pkg/libfpx/trunk/checksums (rev 0) +++ csw/mgar/pkg/libfpx/trunk/checksums 2010-01-05 09:02:16 UTC (rev 7871) @@ -0,0 +1,3 @@ +d65c555aa68a296d6eba384929434d70 libfpx-1.3.0-1.tar.bz2 +d921300d89983df26f66f45b391bdc60 olecomm.h.patch +0e4672051619c7da13f643b8c42560cd tchar.patch Added: csw/mgar/pkg/libfpx/trunk/files/olecomm.h.patch =================================================================== --- csw/mgar/pkg/libfpx/trunk/files/olecomm.h.patch (rev 0) +++ csw/mgar/pkg/libfpx/trunk/files/olecomm.h.patch 2010-01-05 09:02:16 UTC (rev 7871) @@ -0,0 +1,11 @@ +--- libfpx-1.3.0.orig/ole/olecomm.h 2007-11-02 08:10:05.000000000 +0100 ++++ libfpx-1.3.0/ole/olecomm.h 2010-01-05 01:12:45.667877575 +0100 +@@ -68,7 +68,7 @@ + # ifdef __linux__ + # include + # elif defined(__sun) +-# include ++# include + # else + # include + # endif This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From hson at users.sourceforge.net Tue Jan 5 11:49:00 2010 From: hson at users.sourceforge.net (hson at users.sourceforge.net) Date: Tue, 05 Jan 2010 10:49:00 +0000 Subject: [csw-devel] SF.net SVN: gar:[7872] csw/mgar/pkg/tiff/trunk/Makefile Message-ID: Revision: 7872 http://gar.svn.sourceforge.net/gar/?rev=7872&view=rev Author: hson Date: 2010-01-05 10:48:59 +0000 (Tue, 05 Jan 2010) Log Message: ----------- tiff: Disable static build, docdir should be version independent Modified Paths: -------------- csw/mgar/pkg/tiff/trunk/Makefile Modified: csw/mgar/pkg/tiff/trunk/Makefile =================================================================== --- csw/mgar/pkg/tiff/trunk/Makefile 2010-01-05 09:02:16 UTC (rev 7871) +++ csw/mgar/pkg/tiff/trunk/Makefile 2010-01-05 10:48:59 UTC (rev 7872) @@ -41,6 +41,8 @@ EXTRA_PKG_CONFIG_DIRS = $(prefix)/X11/lib CONFIGURE_ARGS = $(DIRPATHS) +CONFIGURE_ARGS += --with-docdir=/opt/csw/share/doc/tiff +CONFIGURE_ARGS += --disable-static CONFIGURE_ARGS += --with-zlib-include-dir=/opt/csw/include CONFIGURE_ARGS += --with-zlib-lib-dir=/opt/csw/lib CONFIGURE_ARGS += --with-jpeg-include-dir=/opt/csw/include This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From hson at users.sourceforge.net Tue Jan 5 11:59:30 2010 From: hson at users.sourceforge.net (hson at users.sourceforge.net) Date: Tue, 05 Jan 2010 10:59:30 +0000 Subject: [csw-devel] SF.net SVN: gar:[7873] csw/mgar/pkg/ImageMagick/trunk Message-ID: Revision: 7873 http://gar.svn.sourceforge.net/gar/?rev=7873&view=rev Author: hson Date: 2010-01-05 10:59:30 +0000 (Tue, 05 Jan 2010) Log Message: ----------- imagemagick: Update to 6.5.8-10 Modified Paths: -------------- csw/mgar/pkg/ImageMagick/trunk/Makefile csw/mgar/pkg/ImageMagick/trunk/checksums Modified: csw/mgar/pkg/ImageMagick/trunk/Makefile =================================================================== --- csw/mgar/pkg/ImageMagick/trunk/Makefile 2010-01-05 10:48:59 UTC (rev 7872) +++ csw/mgar/pkg/ImageMagick/trunk/Makefile 2010-01-05 10:59:30 UTC (rev 7873) @@ -1,6 +1,6 @@ GARNAME = imagemagick GARVERSION = 6.5.8 -GARSUBREV = 6 +GARSUBREV = 10 CATEGORIES = lib DESCRIPTION = A comprehensive package supporting automated and interative manipulation of images @@ -60,11 +60,10 @@ @cp $(FILEDIR)/libMagick.so.10.0.4.s $(INSTALLISADIR)$(libdir)/libMagick.so.10.0.4 @cp $(FILEDIR)/libWand.so.10.0.4.s $(INSTALLISADIR)$(libdir)/libWand.so.10.0.4 @cp $(FILEDIR)/libMagick++.so.10.0.4.s $(INSTALLISADIR)$(libdir)/libMagick++.so.10.0.4 - @ln -s libMagick.so.10.0.4 $(INSTALLISADIR)$(libdir)/libMagick.so.10 - @ln -s libWand.so.10.0.4 $(INSTALLISADIR)$(libdir)/libWand.so.10 - @ln -s libMagick++.so.10.0.4 $(INSTALLISADIR)$(libdir)/libMagick++.so.10 + @( if [ ! -r $(INSTALLISADIR)$(libdir)/libMagick.so.10.0.4 ] ; then ln -s libMagick.so.10.0.4 $(INSTALLISADIR)$(libdir)/libMagick.so.10 ; fi ) + @( if [ ! -r $(INSTALLISADIR)$(libdir)/libWand.so.10.0.4 ] ; then ln -s libWand.so.10.0.4 $(INSTALLISADIR)$(libdir)/libWand.so.10 ; fi ) + @( if [ ! -r $(INSTALLISADIR)$(libdir)/libMagick++.so.10.0.4 ] ; then ln -s libMagick++.so.10.0.4 $(INSTALLISADIR)$(libdir)/libMagick++.so.10 ; fi ) @ln -s ImageMagick-$(GARVERSION) $(INSTALLISADIR)$(docdir)/ImageMagick - echo $(DESTDIR) @( cd $(INSTALLISADIR)$(libdir) ; gzip -dc $(DESTDIR)/../../$(FILEDIR)/lib_6.2.9_s.tar.gz |tar xf -) @mv $(INSTALLISADIR)$(mandir)/man1/compare.1 $(INSTALLISADIR)$(mandir)/man1/compare2.1 @mv $(INSTALLISADIR)$(bindir)/compare $(INSTALLISADIR)$(bindir)/compare2 @@ -74,11 +73,10 @@ @cp $(FILEDIR)/libMagick.so.10.0.4.i $(INSTALLISADIR)$(libdir)/libMagick.so.10.0.4 @cp $(FILEDIR)/libWand.so.10.0.4.i $(INSTALLISADIR)$(libdir)/libWand.so.10.0.4 @cp $(FILEDIR)/libMagick++.so.10.0.4.i $(INSTALLISADIR)$(libdir)/libMagick++.so.10.0.4 - @ln -s libMagick.so.10.0.4 $(INSTALLISADIR)$(libdir)/libMagick.so.10 - @ln -s libWand.so.10.0.4 $(INSTALLISADIR)$(libdir)/libWand.so.10 - @ln -s libMagick++.so.10.0.4 $(INSTALLISADIR)$(libdir)/libMagick++.so.10 + @( if [ ! -r $(INSTALLISADIR)$(libdir)/libMagick.so.10.0.4 ] ; then ln -s libMagick.so.10.0.4 $(INSTALLISADIR)$(libdir)/libMagick.so.10 ; fi ) + @( if [ ! -r $(INSTALLISADIR)$(libdir)/libWand.so.10.0.4 ] ; then ln -s libWand.so.10.0.4 $(INSTALLISADIR)$(libdir)/libWand.so.10 ; fi ) + @( if [ ! -r $(INSTALLISADIR)$(libdir)/libMagick++.so.10.0.4 ] ; then ln -s libMagick++.so.10.0.4 $(INSTALLISADIR)$(libdir)/libMagick++.so.10 ; fi ) @ln -s ImageMagick-$(GARVERSION) $(INSTALLISADIR)$(docdir)/ImageMagick - echo $(DESTDIR) @( cd $(INSTALLISADIR)$(libdir) ; gzip -dc $(DESTDIR)/../../$(FILEDIR)/lib_6.2.9_i.tar.gz |tar xf -) @mv $(INSTALLISADIR)$(mandir)/man1/compare.1 $(INSTALLISADIR)$(mandir)/man1/compare2.1 @mv $(INSTALLISADIR)$(bindir)/compare $(INSTALLISADIR)$(bindir)/compare2 Modified: csw/mgar/pkg/ImageMagick/trunk/checksums =================================================================== --- csw/mgar/pkg/ImageMagick/trunk/checksums 2010-01-05 10:48:59 UTC (rev 7872) +++ csw/mgar/pkg/ImageMagick/trunk/checksums 2010-01-05 10:59:30 UTC (rev 7873) @@ -1,2 +1,2 @@ -7ba3d32af33d716cc0fedb4d4a9e359f ImageMagick-6.5.8-6.tar.bz2 +fc04d56c32bb2eebba7885d0db042f9a ImageMagick-6.5.8-10.tar.bz2 6bd361fe352c7d497d60d8d2cbe7cfd4 Makefile.patch This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Tue Jan 5 14:59:38 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Tue, 05 Jan 2010 13:59:38 +0000 Subject: [csw-devel] SF.net SVN: gar:[7875] csw/mgar/pkg/wgetpaste/trunk/checksums Message-ID: Revision: 7875 http://gar.svn.sourceforge.net/gar/?rev=7875&view=rev Author: wahwah Date: 2010-01-05 13:59:38 +0000 (Tue, 05 Jan 2010) Log Message: ----------- wgetpaste: Checksum update Modified Paths: -------------- csw/mgar/pkg/wgetpaste/trunk/checksums Modified: csw/mgar/pkg/wgetpaste/trunk/checksums =================================================================== --- csw/mgar/pkg/wgetpaste/trunk/checksums 2010-01-05 13:58:17 UTC (rev 7874) +++ csw/mgar/pkg/wgetpaste/trunk/checksums 2010-01-05 13:59:38 UTC (rev 7875) @@ -1,4 +1,4 @@ -0a96eee7e51fe1b7e9054dd302ca0508 download/0001-Using-gwhoami-instead-of-whoami.patch -4ce4101e5be2ea7af5b5ea18be7f8693 download/0002-CSW-bash.patch -f270d87c5ea9939b2818d38f43b51936 download/wgetpaste-2.16.tar.bz2 -67425820c0281729a7f63e3e3339c49f download/wgetpaste.conf +cde06fef294da4cbe91f8945ab53b3e2 0001-Using-gwhoami-instead-of-whoami.patch +4ce4101e5be2ea7af5b5ea18be7f8693 0002-CSW-bash.patch +f270d87c5ea9939b2818d38f43b51936 wgetpaste-2.16.tar.bz2 +67425820c0281729a7f63e3e3339c49f wgetpaste.conf This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Tue Jan 5 15:01:05 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Tue, 05 Jan 2010 14:01:05 +0000 Subject: [csw-devel] SF.net SVN: gar:[7876] csw/mgar/pkg/wgetpaste/trunk Message-ID: Revision: 7876 http://gar.svn.sourceforge.net/gar/?rev=7876&view=rev Author: wahwah Date: 2010-01-05 14:01:04 +0000 (Tue, 05 Jan 2010) Log Message: ----------- wgetpaste: Patch depth update, checksum update Modified Paths: -------------- csw/mgar/pkg/wgetpaste/trunk/checksums csw/mgar/pkg/wgetpaste/trunk/files/0001-Using-gwhoami-instead-of-whoami.patch Modified: csw/mgar/pkg/wgetpaste/trunk/checksums =================================================================== --- csw/mgar/pkg/wgetpaste/trunk/checksums 2010-01-05 13:59:38 UTC (rev 7875) +++ csw/mgar/pkg/wgetpaste/trunk/checksums 2010-01-05 14:01:04 UTC (rev 7876) @@ -1,4 +1,4 @@ -cde06fef294da4cbe91f8945ab53b3e2 0001-Using-gwhoami-instead-of-whoami.patch +ca8e4122a420d95c0cd96d731b5b9777 0001-Using-gwhoami-instead-of-whoami.patch 4ce4101e5be2ea7af5b5ea18be7f8693 0002-CSW-bash.patch f270d87c5ea9939b2818d38f43b51936 wgetpaste-2.16.tar.bz2 67425820c0281729a7f63e3e3339c49f wgetpaste.conf Modified: csw/mgar/pkg/wgetpaste/trunk/files/0001-Using-gwhoami-instead-of-whoami.patch =================================================================== --- csw/mgar/pkg/wgetpaste/trunk/files/0001-Using-gwhoami-instead-of-whoami.patch 2010-01-05 13:59:38 UTC (rev 7875) +++ csw/mgar/pkg/wgetpaste/trunk/files/0001-Using-gwhoami-instead-of-whoami.patch 2010-01-05 14:01:04 UTC (rev 7876) @@ -1,5 +1,5 @@ ---- work/solaris8-sparc/build-isa-sparcv8/wgetpaste-2.16/wgetpaste.orig 2010-01-05 14:42:30.127801164 +0100 -+++ work/solaris8-sparc/build-isa-sparcv8/wgetpaste-2.16/wgetpaste 2010-01-05 14:43:42.007282206 +0100 +--- wgetpaste-2.16/wgetpaste.orig 2010-01-05 14:42:30.127801164 +0100 ++++ wgetpaste-2.16/wgetpaste 2010-01-05 14:43:42.007282206 +0100 @@ -114,7 +114,7 @@ noxclip() { cat <&2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Tue Jan 5 14:58:18 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Tue, 05 Jan 2010 13:58:18 +0000 Subject: [csw-devel] SF.net SVN: gar:[7874] csw/mgar/pkg/wgetpaste/trunk Message-ID: Revision: 7874 http://gar.svn.sourceforge.net/gar/?rev=7874&view=rev Author: wahwah Date: 2010-01-05 13:58:17 +0000 (Tue, 05 Jan 2010) Log Message: ----------- wgetpaste: Version bump to 2.16 Modified Paths: -------------- csw/mgar/pkg/wgetpaste/trunk/Makefile csw/mgar/pkg/wgetpaste/trunk/checksums csw/mgar/pkg/wgetpaste/trunk/files/0001-Using-gwhoami-instead-of-whoami.patch Modified: csw/mgar/pkg/wgetpaste/trunk/Makefile =================================================================== --- csw/mgar/pkg/wgetpaste/trunk/Makefile 2010-01-05 10:59:30 UTC (rev 7873) +++ csw/mgar/pkg/wgetpaste/trunk/Makefile 2010-01-05 13:58:17 UTC (rev 7874) @@ -1,5 +1,5 @@ GARNAME = wgetpaste -GARVERSION = 2.13 +GARVERSION = 2.16 CATEGORIES = utils DESCRIPTION = A command-line utility for text pasting websites. Modified: csw/mgar/pkg/wgetpaste/trunk/checksums =================================================================== --- csw/mgar/pkg/wgetpaste/trunk/checksums 2010-01-05 10:59:30 UTC (rev 7873) +++ csw/mgar/pkg/wgetpaste/trunk/checksums 2010-01-05 13:58:17 UTC (rev 7874) @@ -1,4 +1,4 @@ 0a96eee7e51fe1b7e9054dd302ca0508 download/0001-Using-gwhoami-instead-of-whoami.patch 4ce4101e5be2ea7af5b5ea18be7f8693 download/0002-CSW-bash.patch -a341c778d745b0a7ad11163a4a2c1ea9 download/wgetpaste-2.13.tar.bz2 +f270d87c5ea9939b2818d38f43b51936 download/wgetpaste-2.16.tar.bz2 67425820c0281729a7f63e3e3339c49f download/wgetpaste.conf Modified: csw/mgar/pkg/wgetpaste/trunk/files/0001-Using-gwhoami-instead-of-whoami.patch =================================================================== --- csw/mgar/pkg/wgetpaste/trunk/files/0001-Using-gwhoami-instead-of-whoami.patch 2010-01-05 10:59:30 UTC (rev 7873) +++ csw/mgar/pkg/wgetpaste/trunk/files/0001-Using-gwhoami-instead-of-whoami.patch 2010-01-05 13:58:17 UTC (rev 7874) @@ -1,17 +1,6 @@ -From c98a64ed5f18a50d9d249bd4bd0916374272a597 Mon Sep 17 00:00:00 2001 -From: Maciej Blizinski -Date: Sat, 29 Aug 2009 11:20:28 +0200 -Subject: [PATCH 1/2] Using gwhoami instead of whoami - ---- - wgetpaste | 10 +++++----- - 1 files changed, 5 insertions(+), 5 deletions(-) - -diff --git a/wgetpaste b/wgetpaste -index d4addbd..9b40432 100755 ---- a/wgetpaste -+++ b/wgetpaste -@@ -99,7 +99,7 @@ notreadable() { +--- work/solaris8-sparc/build-isa-sparcv8/wgetpaste-2.16/wgetpaste.orig 2010-01-05 14:42:30.127801164 +0100 ++++ work/solaris8-sparc/build-isa-sparcv8/wgetpaste-2.16/wgetpaste 2010-01-05 14:43:42.007282206 +0100 +@@ -114,7 +114,7 @@ noxclip() { cat <&2 Could not find xclip on your system. In order to use --x$1 you must either @@ -20,7 +9,7 @@ per user in ~/.wgetpaste.conf to use another program (such as e.g. xcut or klipper) to $2 your clipboard. -@@ -288,11 +288,11 @@ Options: +@@ -303,11 +303,11 @@ --debug be *very* verbose (implies -v) -h, --help show this help @@ -34,7 +23,7 @@ ~/.wgetpaste.conf or ~/.wgetpaste.d/*.conf. EOF } -@@ -568,7 +568,7 @@ load_configs() { +@@ -586,7 +586,7 @@ if [[ ! $IGNORECONFIGS ]]; then # compatibility code local f deprecated= @@ -43,15 +32,12 @@ if [[ -f $f ]]; then if [[ -z $deprecated ]]; then echo "The config files for wgetpaste have changed to *.conf.$N" >&2 -@@ -589,7 +589,7 @@ load_configs() { +@@ -607,7 +607,7 @@ } load_configs [[ $SERVICESET ]] && verifyservice "$SERVICESET" && SERVICE=$(escape "$SERVICESET") -DEFAULT_NICK=${DEFAULT_NICK:-$(whoami)} || die "whoami failed" -+DEFAULT_NICK=${DEFAULT_NICK:-$(gwhoami)} || die "whoami failed" - DEFAULT_SERVICE=${DEFAULT_SERVICE:-dpaste} ++DEFAULT_NICK=${DEFAULT_NICK:-$(gwhoami)} || die "gwhoami failed" + DEFAULT_SERVICE=${DEFAULT_SERVICE:-pocoo} DEFAULT_LANGUAGE=${DEFAULT_LANGUAGE:-Plain Text} DEFAULT_EXPIRATION=${DEFAULT_EXPIRATION:-1 month} --- -1.6.3.2 - This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Tue Jan 5 15:09:36 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Tue, 05 Jan 2010 14:09:36 +0000 Subject: [csw-devel] SF.net SVN: gar:[7877] csw/mgar/pkg/wgetpaste/trunk/Makefile Message-ID: Revision: 7877 http://gar.svn.sourceforge.net/gar/?rev=7877&view=rev Author: wahwah Date: 2010-01-05 14:09:35 +0000 (Tue, 05 Jan 2010) Log Message: ----------- wgetpaste: Removed double depends, simplified cswsampleconf invocation, removed unnecessary bits Modified Paths: -------------- csw/mgar/pkg/wgetpaste/trunk/Makefile Modified: csw/mgar/pkg/wgetpaste/trunk/Makefile =================================================================== --- csw/mgar/pkg/wgetpaste/trunk/Makefile 2010-01-05 14:01:04 UTC (rev 7876) +++ csw/mgar/pkg/wgetpaste/trunk/Makefile 2010-01-05 14:09:35 UTC (rev 7877) @@ -12,10 +12,11 @@ DISTFILES = $(GARNAME)-$(GARVERSION).tar.bz2 DISTFILES += wgetpaste.conf -# We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.bz2 -REQUIRED_PKGS = CSWshutils CSWwget CSWcswclassutils CSWbash +REQUIRED_PKGS = CSWbash +REQUIRED_PKGS += CSWshutils +REQUIRED_PKGS += CSWwget PATCHFILES = 0001-Using-gwhoami-instead-of-whoami.patch PATCHFILES += 0002-CSW-bash.patch @@ -24,23 +25,18 @@ sysconfdir = /etc/opt/csw -SPKG_CLASSES = none cswcpsampleconf -PROTOTYPE_FILTER = awk ' \ - $$$$3 ~ /\/wgetpaste.conf.CSW$$$$/ { $$$$2 = "cswcpsampleconf" } \ - { print }' +SAMPLECONF = /etc/opt/csw/wgetpaste\.conf\.CSW - -CONFIGURE_ARGS = $(DIRPATHS) CONFIGURE_SCRIPTS = BUILD_SCRIPTS = INSTALL_SCRIPTS = wgetpaste TEST_SCRIPTS = +include gar/category.mk + install-wgetpaste: ginstall -d $(DESTDIR)$(bindir) ginstall -m 755 $(WORKSRC)/wgetpaste $(DESTDIR)$(bindir) ginstall -d $(DESTDIR)$(sysconfdir) ginstall -m 644 $(FILEDIR)/wgetpaste.conf $(DESTDIR)$(sysconfdir)/wgetpaste.conf.CSW @$(MAKECOOKIE) - -include gar/category.mk This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Tue Jan 5 15:17:41 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 05 Jan 2010 14:17:41 +0000 Subject: [csw-devel] SF.net SVN: gar:[7878] csw/mgar/pkg/libtool/trunk/Makefile Message-ID: Revision: 7878 http://gar.svn.sourceforge.net/gar/?rev=7878&view=rev Author: dmichelsen Date: 2010-01-05 14:17:41 +0000 (Tue, 05 Jan 2010) Log Message: ----------- libtool: Apply patch to correct version Modified Paths: -------------- csw/mgar/pkg/libtool/trunk/Makefile Modified: csw/mgar/pkg/libtool/trunk/Makefile =================================================================== --- csw/mgar/pkg/libtool/trunk/Makefile 2010-01-05 14:09:35 UTC (rev 7877) +++ csw/mgar/pkg/libtool/trunk/Makefile 2010-01-05 14:17:41 UTC (rev 7878) @@ -23,8 +23,8 @@ DISTFILES = $(SOURCEFILES) PATCH_LIBTOOL = patch-libtool.diff -PATCHFILES_POSTINSTALL_isa-i386-garversion-2.2.6-garcompiler-SOS11 = $(PATCH_LIBTOOL) -PATCHFILES_POSTINSTALL_isa-sparcv8-garversion-2.2.6-garcompiler-SOS11 = $(PATCH_LIBTOOL) +PATCHFILES_POSTINSTALL_isa-i386-garversion-2.2.6b-garcompiler-SOS11 = $(PATCH_LIBTOOL) +PATCHFILES_POSTINSTALL_isa-sparcv8-garversion-2.2.6b-garcompiler-SOS11 = $(PATCH_LIBTOOL) DISTFILES += $(PATCH_LIBTOOL) NOEXTRACT = $(filter-out $(GARNAME)-$(GARVERSION).tar.gz,$(SOURCEFILES)) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Tue Jan 5 15:53:27 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 05 Jan 2010 14:53:27 +0000 Subject: [csw-devel] SF.net SVN: gar:[7879] csw/mgar/pkg Message-ID: Revision: 7879 http://gar.svn.sourceforge.net/gar/?rev=7879&view=rev Author: dmichelsen Date: 2010-01-05 14:53:27 +0000 (Tue, 05 Jan 2010) Log Message: ----------- libproxy: Initial commit, doesn't build yet Added Paths: ----------- csw/mgar/pkg/libproxy/ csw/mgar/pkg/libproxy/branches/ csw/mgar/pkg/libproxy/tags/ csw/mgar/pkg/libproxy/trunk/ csw/mgar/pkg/libproxy/trunk/Makefile csw/mgar/pkg/libproxy/trunk/checksums csw/mgar/pkg/libproxy/trunk/files/ csw/mgar/pkg/libproxy/trunk/files/0001-Use-xc99-for-Sun-Studio-compiler.patch csw/mgar/pkg/libproxy/trunk/files/0002-Dont-preset-CFLAGS.patch Property changes on: csw/mgar/pkg/libproxy/trunk ___________________________________________________________________ Added: svn:ignore + cookies download work Added: svn:externals + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 Added: csw/mgar/pkg/libproxy/trunk/Makefile =================================================================== --- csw/mgar/pkg/libproxy/trunk/Makefile (rev 0) +++ csw/mgar/pkg/libproxy/trunk/Makefile 2010-01-05 14:53:27 UTC (rev 7879) @@ -0,0 +1,25 @@ +GARNAME = libproxy +GARVERSION = 0.3.0 +CATEGORIES = lib + +DESCRIPTION = A library that provides automatic proxy configuration management +define BLURB + libproxy exists to answer the question: Given a network resource, how do I + reach it? It handles all the details, enabling you to get back to programming. + GNOME? KDE? Command line? WPAD? PAC? Network changed? It doesn't matter! Just + ask libproxy what proxy to use: you get simple code and your users get correct, + consistant behavior and broad infrastructure compatibility. +endef + +MASTER_SITES = http://libproxy.googlecode.com/files/ +DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz +PATCHFILES = 0001-Use-xc99-for-Sun-Studio-compiler.patch +PATCHFILES += 0002-Dont-preset-CFLAGS.patch + +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + +BUILD64 = 1 +CONFIGURE_ARGS = $(DIRPATHS) + +include gar/category.mk Added: csw/mgar/pkg/libproxy/trunk/checksums =================================================================== --- csw/mgar/pkg/libproxy/trunk/checksums (rev 0) +++ csw/mgar/pkg/libproxy/trunk/checksums 2010-01-05 14:53:27 UTC (rev 7879) @@ -0,0 +1,3 @@ +70b8c804d1e0a5e98a1e708bd3102329 0001-Use-xc99-for-Sun-Studio-compiler.patch +d5847505f454b61bd3ddc32b7f00eb7b 0002-Dont-preset-CFLAGS.patch +6ded75a6c6aef53be657ece207cc26c4 libproxy-0.3.0.tar.gz Added: csw/mgar/pkg/libproxy/trunk/files/0001-Use-xc99-for-Sun-Studio-compiler.patch =================================================================== --- csw/mgar/pkg/libproxy/trunk/files/0001-Use-xc99-for-Sun-Studio-compiler.patch (rev 0) +++ csw/mgar/pkg/libproxy/trunk/files/0001-Use-xc99-for-Sun-Studio-compiler.patch 2010-01-05 14:53:27 UTC (rev 7879) @@ -0,0 +1,91 @@ +From 3ea26b980c8929de2f92a33de49a09dc12f63a68 Mon Sep 17 00:00:00 2001 +From: Dagobert Michelsen +Date: Tue, 5 Jan 2010 15:29:01 +0100 +Subject: [PATCH] Use xc99 for Sun Studio compiler + +--- + src/bin/Makefile.am | 2 +- + src/bin/Makefile.in | 2 +- + src/lib/Makefile.am | 2 +- + src/lib/Makefile.in | 2 +- + src/modules/Makefile.am | 2 +- + src/modules/Makefile.in | 2 +- + 6 files changed, 6 insertions(+), 6 deletions(-) + +diff --git a/src/bin/Makefile.am b/src/bin/Makefile.am +index 0248879..9c7633e 100644 +--- a/src/bin/Makefile.am ++++ b/src/bin/Makefile.am +@@ -2,5 +2,5 @@ bin_PROGRAMS = proxy + + # Command line interface to libproxy + proxy_SOURCES = proxy.c +-proxy_CPPFLAGS = -I$(top_srcdir)/src/lib -std=c99 ++proxy_CPPFLAGS = -I$(top_srcdir)/src/lib -xc99 + proxy_LDADD = ../lib/libproxy.la +diff --git a/src/bin/Makefile.in b/src/bin/Makefile.in +index 625fbb3..ed8cd56 100644 +--- a/src/bin/Makefile.in ++++ b/src/bin/Makefile.in +@@ -239,7 +239,7 @@ xmu_LIBS = @xmu_LIBS@ + + # Command line interface to libproxy + proxy_SOURCES = proxy.c +-proxy_CPPFLAGS = -I$(top_srcdir)/src/lib -std=c99 ++proxy_CPPFLAGS = -I$(top_srcdir)/src/lib -xc99 + proxy_LDADD = ../lib/libproxy.la + all: all-am + +diff --git a/src/lib/Makefile.am b/src/lib/Makefile.am +index 626d1c4..b1c6b80 100644 +--- a/src/lib/Makefile.am ++++ b/src/lib/Makefile.am +@@ -10,7 +10,7 @@ libproxy_la_SOURCES = \ + strdict.c strdict.h \ + url.c url.h + +-libproxy_la_CFLAGS = -DMODULEDIR=\"@MODULEDIR@@DIR_SEPARATOR@\" -DSYSCONFDIR=\"@SYSCONFDIR@@DIR_SEPARATOR@\" -std=c99 -D_POSIX_C_SOURCE=200112L ++libproxy_la_CFLAGS = -DMODULEDIR=\"@MODULEDIR@@DIR_SEPARATOR@\" -DSYSCONFDIR=\"@SYSCONFDIR@@DIR_SEPARATOR@\" -xc99 -D_POSIX_C_SOURCE=200112L + libproxy_la_LDFLAGS = -lpthread -lm -no-undefined + + include_HEADERS = proxy.h +diff --git a/src/lib/Makefile.in b/src/lib/Makefile.in +index 77bb2da..73e087c 100644 +--- a/src/lib/Makefile.in ++++ b/src/lib/Makefile.in +@@ -277,7 +277,7 @@ libproxy_la_SOURCES = \ + strdict.c strdict.h \ + url.c url.h + +-libproxy_la_CFLAGS = -DMODULEDIR=\"@MODULEDIR@@DIR_SEPARATOR@\" -DSYSCONFDIR=\"@SYSCONFDIR@@DIR_SEPARATOR@\" -std=c99 -D_POSIX_C_SOURCE=200112L ++libproxy_la_CFLAGS = -DMODULEDIR=\"@MODULEDIR@@DIR_SEPARATOR@\" -DSYSCONFDIR=\"@SYSCONFDIR@@DIR_SEPARATOR@\" -xc99 -D_POSIX_C_SOURCE=200112L + libproxy_la_LDFLAGS = -lpthread -lm -no-undefined + include_HEADERS = proxy.h + all: all-am +diff --git a/src/modules/Makefile.am b/src/modules/Makefile.am +index 170791b..84bd0b5 100644 +--- a/src/modules/Makefile.am ++++ b/src/modules/Makefile.am +@@ -1,5 +1,5 @@ + moduledir = @MODULEDIR@ +-AM_CFLAGS = -std=c99 ++AM_CFLAGS = -xc99 + AM_LDFLAGS = -module -avoid-version -no-undefined + + +diff --git a/src/modules/Makefile.in b/src/modules/Makefile.in +index 6965056..45c9c57 100644 +--- a/src/modules/Makefile.in ++++ b/src/modules/Makefile.in +@@ -359,7 +359,7 @@ x11_LIBS = @x11_LIBS@ + xmu_CFLAGS = @xmu_CFLAGS@ + xmu_LIBS = @xmu_LIBS@ + moduledir = @MODULEDIR@ +-AM_CFLAGS = -std=c99 ++AM_CFLAGS = -xc99 + AM_LDFLAGS = -module -avoid-version -no-undefined + + # Which modules to build +-- +1.6.6 + Added: csw/mgar/pkg/libproxy/trunk/files/0002-Dont-preset-CFLAGS.patch =================================================================== --- csw/mgar/pkg/libproxy/trunk/files/0002-Dont-preset-CFLAGS.patch (rev 0) +++ csw/mgar/pkg/libproxy/trunk/files/0002-Dont-preset-CFLAGS.patch 2010-01-05 14:53:27 UTC (rev 7879) @@ -0,0 +1,35 @@ +From 6677cc7bc95aeeee76c7741ee9edd03469b7936e Mon Sep 17 00:00:00 2001 +From: Dagobert Michelsen +Date: Tue, 5 Jan 2010 15:35:21 +0100 +Subject: [PATCH 2/2] Initial commit + +--- a/configure ++++ b/configure +@@ -14683,7 +14683,7 @@ fi + + esac + +-CFLAGS="-g -Wall -pedantic $CFLAGS" ++# CFLAGS="-g -Wall -pedantic $CFLAGS" + ac_config_files="$ac_config_files libproxy-1.0.pc Makefile libproxy.spec src/Makefile src/lib/Makefile src/modules/Makefile src/bin/Makefile src/bindings/Makefile src/bindings/python/Makefile src/bindings/java/Makefile src/platform/Makefile src/platform/win32/Makefile src/bindings/dotnet/Makefile src/bindings/dotnet/libproxy-sharp-1.0.pc src/bindings/dotnet/AssemblyInfo.cs" + + cat >confcache <<\_ACEOF +diff --git a/configure.ac b/configure.ac +index c9e0bb9..4139f95 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -238,7 +238,7 @@ case $host in + AC_CHECK_LIB(ws2_32, main) + esac + +-CFLAGS="-g -Wall -pedantic $CFLAGS" ++#CFLAGS="-g -Wall -pedantic $CFLAGS" + AC_CONFIG_FILES([libproxy-1.0.pc Makefile libproxy.spec src/Makefile src/lib/Makefile + src/modules/Makefile src/bin/Makefile src/bindings/Makefile + src/bindings/python/Makefile src/bindings/java/Makefile +diff --git a/src/lib/Makefile b/src/lib/Makefile +index 867b01b..0ba55f6 100644 + +-- +1.6.6 + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Tue Jan 5 21:21:32 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 05 Jan 2010 20:21:32 +0000 Subject: [csw-devel] SF.net SVN: gar:[7880] csw/mgar/pkg/libtool/tags/libtool-2.2.6b, REV=2010.01 .05/ Message-ID: Revision: 7880 http://gar.svn.sourceforge.net/gar/?rev=7880&view=rev Author: dmichelsen Date: 2010-01-05 20:21:32 +0000 (Tue, 05 Jan 2010) Log Message: ----------- libtool: Tag libtool-2.2.6b,REV=2010.01.05 Added Paths: ----------- csw/mgar/pkg/libtool/tags/libtool-2.2.6b,REV=2010.01.05/ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Tue Jan 5 21:43:05 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 05 Jan 2010 20:43:05 +0000 Subject: [csw-devel] SF.net SVN: gar:[7881] csw/mgar/pkg/libproxy/trunk Message-ID: Revision: 7881 http://gar.svn.sourceforge.net/gar/?rev=7881&view=rev Author: dmichelsen Date: 2010-01-05 20:43:05 +0000 (Tue, 05 Jan 2010) Log Message: ----------- libproxy: Add patches Modified Paths: -------------- csw/mgar/pkg/libproxy/trunk/Makefile csw/mgar/pkg/libproxy/trunk/checksums csw/mgar/pkg/libproxy/trunk/files/0001-Use-xc99-for-Sun-Studio-compiler.patch csw/mgar/pkg/libproxy/trunk/files/0002-Dont-preset-CFLAGS.patch Added Paths: ----------- csw/mgar/pkg/libproxy/trunk/files/0001-Use-xc99-for-Sun-Studio-compiler.patch.orig csw/mgar/pkg/libproxy/trunk/files/0002-Dont-preset-CFLAGS.patch.orig Modified: csw/mgar/pkg/libproxy/trunk/Makefile =================================================================== --- csw/mgar/pkg/libproxy/trunk/Makefile 2010-01-05 20:21:32 UTC (rev 7880) +++ csw/mgar/pkg/libproxy/trunk/Makefile 2010-01-05 20:43:05 UTC (rev 7881) @@ -19,7 +19,15 @@ # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz +PACKAGING_PLATFORMS = solaris10-sparc solaris10-i386 + +EXTRA_LINKER_FLAGS = -lnsl BUILD64 = 1 CONFIGURE_ARGS = $(DIRPATHS) +TEST_TARGET = check + include gar/category.mk + +# There is actually the cpp executable in /usr/lib +PATH := $(PATH):/usr/lib Modified: csw/mgar/pkg/libproxy/trunk/checksums =================================================================== --- csw/mgar/pkg/libproxy/trunk/checksums 2010-01-05 20:21:32 UTC (rev 7880) +++ csw/mgar/pkg/libproxy/trunk/checksums 2010-01-05 20:43:05 UTC (rev 7881) @@ -1,3 +1,3 @@ -70b8c804d1e0a5e98a1e708bd3102329 0001-Use-xc99-for-Sun-Studio-compiler.patch -d5847505f454b61bd3ddc32b7f00eb7b 0002-Dont-preset-CFLAGS.patch +ce2d836df293fa8183265176459cf87e 0001-Use-xc99-for-Sun-Studio-compiler.patch +acd3e61f107ff188722fb1335e0ed37c 0002-Dont-preset-CFLAGS.patch 6ded75a6c6aef53be657ece207cc26c4 libproxy-0.3.0.tar.gz Modified: csw/mgar/pkg/libproxy/trunk/files/0001-Use-xc99-for-Sun-Studio-compiler.patch =================================================================== --- csw/mgar/pkg/libproxy/trunk/files/0001-Use-xc99-for-Sun-Studio-compiler.patch 2010-01-05 20:21:32 UTC (rev 7880) +++ csw/mgar/pkg/libproxy/trunk/files/0001-Use-xc99-for-Sun-Studio-compiler.patch 2010-01-05 20:43:05 UTC (rev 7881) @@ -12,17 +12,6 @@ src/modules/Makefile.in | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) -diff --git a/src/bin/Makefile.am b/src/bin/Makefile.am -index 0248879..9c7633e 100644 ---- a/src/bin/Makefile.am -+++ b/src/bin/Makefile.am -@@ -2,5 +2,5 @@ bin_PROGRAMS = proxy - - # Command line interface to libproxy - proxy_SOURCES = proxy.c --proxy_CPPFLAGS = -I$(top_srcdir)/src/lib -std=c99 -+proxy_CPPFLAGS = -I$(top_srcdir)/src/lib -xc99 - proxy_LDADD = ../lib/libproxy.la diff --git a/src/bin/Makefile.in b/src/bin/Makefile.in index 625fbb3..ed8cd56 100644 --- a/src/bin/Makefile.in @@ -36,19 +25,6 @@ proxy_LDADD = ../lib/libproxy.la all: all-am -diff --git a/src/lib/Makefile.am b/src/lib/Makefile.am -index 626d1c4..b1c6b80 100644 ---- a/src/lib/Makefile.am -+++ b/src/lib/Makefile.am -@@ -10,7 +10,7 @@ libproxy_la_SOURCES = \ - strdict.c strdict.h \ - url.c url.h - --libproxy_la_CFLAGS = -DMODULEDIR=\"@MODULEDIR@@DIR_SEPARATOR@\" -DSYSCONFDIR=\"@SYSCONFDIR@@DIR_SEPARATOR@\" -std=c99 -D_POSIX_C_SOURCE=200112L -+libproxy_la_CFLAGS = -DMODULEDIR=\"@MODULEDIR@@DIR_SEPARATOR@\" -DSYSCONFDIR=\"@SYSCONFDIR@@DIR_SEPARATOR@\" -xc99 -D_POSIX_C_SOURCE=200112L - libproxy_la_LDFLAGS = -lpthread -lm -no-undefined - - include_HEADERS = proxy.h diff --git a/src/lib/Makefile.in b/src/lib/Makefile.in index 77bb2da..73e087c 100644 --- a/src/lib/Makefile.in @@ -62,17 +38,6 @@ libproxy_la_LDFLAGS = -lpthread -lm -no-undefined include_HEADERS = proxy.h all: all-am -diff --git a/src/modules/Makefile.am b/src/modules/Makefile.am -index 170791b..84bd0b5 100644 ---- a/src/modules/Makefile.am -+++ b/src/modules/Makefile.am -@@ -1,5 +1,5 @@ - moduledir = @MODULEDIR@ --AM_CFLAGS = -std=c99 -+AM_CFLAGS = -xc99 - AM_LDFLAGS = -module -avoid-version -no-undefined - - diff --git a/src/modules/Makefile.in b/src/modules/Makefile.in index 6965056..45c9c57 100644 --- a/src/modules/Makefile.in Added: csw/mgar/pkg/libproxy/trunk/files/0001-Use-xc99-for-Sun-Studio-compiler.patch.orig =================================================================== --- csw/mgar/pkg/libproxy/trunk/files/0001-Use-xc99-for-Sun-Studio-compiler.patch.orig (rev 0) +++ csw/mgar/pkg/libproxy/trunk/files/0001-Use-xc99-for-Sun-Studio-compiler.patch.orig 2010-01-05 20:43:05 UTC (rev 7881) @@ -0,0 +1,91 @@ +From 3ea26b980c8929de2f92a33de49a09dc12f63a68 Mon Sep 17 00:00:00 2001 +From: Dagobert Michelsen +Date: Tue, 5 Jan 2010 15:29:01 +0100 +Subject: [PATCH] Use xc99 for Sun Studio compiler + +--- + src/bin/Makefile.am | 2 +- + src/bin/Makefile.in | 2 +- + src/lib/Makefile.am | 2 +- + src/lib/Makefile.in | 2 +- + src/modules/Makefile.am | 2 +- + src/modules/Makefile.in | 2 +- + 6 files changed, 6 insertions(+), 6 deletions(-) + +diff --git a/src/bin/Makefile.am b/src/bin/Makefile.am +index 0248879..9c7633e 100644 +--- a/src/bin/Makefile.am ++++ b/src/bin/Makefile.am +@@ -2,5 +2,5 @@ bin_PROGRAMS = proxy + + # Command line interface to libproxy + proxy_SOURCES = proxy.c +-proxy_CPPFLAGS = -I$(top_srcdir)/src/lib -std=c99 ++proxy_CPPFLAGS = -I$(top_srcdir)/src/lib -xc99 + proxy_LDADD = ../lib/libproxy.la +diff --git a/src/bin/Makefile.in b/src/bin/Makefile.in +index 625fbb3..ed8cd56 100644 +--- a/src/bin/Makefile.in ++++ b/src/bin/Makefile.in +@@ -239,7 +239,7 @@ xmu_LIBS = @xmu_LIBS@ + + # Command line interface to libproxy + proxy_SOURCES = proxy.c +-proxy_CPPFLAGS = -I$(top_srcdir)/src/lib -std=c99 ++proxy_CPPFLAGS = -I$(top_srcdir)/src/lib -xc99 + proxy_LDADD = ../lib/libproxy.la + all: all-am + +diff --git a/src/lib/Makefile.am b/src/lib/Makefile.am +index 626d1c4..b1c6b80 100644 +--- a/src/lib/Makefile.am ++++ b/src/lib/Makefile.am +@@ -10,7 +10,7 @@ libproxy_la_SOURCES = \ + strdict.c strdict.h \ + url.c url.h + +-libproxy_la_CFLAGS = -DMODULEDIR=\"@MODULEDIR@@DIR_SEPARATOR@\" -DSYSCONFDIR=\"@SYSCONFDIR@@DIR_SEPARATOR@\" -std=c99 -D_POSIX_C_SOURCE=200112L ++libproxy_la_CFLAGS = -DMODULEDIR=\"@MODULEDIR@@DIR_SEPARATOR@\" -DSYSCONFDIR=\"@SYSCONFDIR@@DIR_SEPARATOR@\" -xc99 -D_POSIX_C_SOURCE=200112L + libproxy_la_LDFLAGS = -lpthread -lm -no-undefined + + include_HEADERS = proxy.h +diff --git a/src/lib/Makefile.in b/src/lib/Makefile.in +index 77bb2da..73e087c 100644 +--- a/src/lib/Makefile.in ++++ b/src/lib/Makefile.in +@@ -277,7 +277,7 @@ libproxy_la_SOURCES = \ + strdict.c strdict.h \ + url.c url.h + +-libproxy_la_CFLAGS = -DMODULEDIR=\"@MODULEDIR@@DIR_SEPARATOR@\" -DSYSCONFDIR=\"@SYSCONFDIR@@DIR_SEPARATOR@\" -std=c99 -D_POSIX_C_SOURCE=200112L ++libproxy_la_CFLAGS = -DMODULEDIR=\"@MODULEDIR@@DIR_SEPARATOR@\" -DSYSCONFDIR=\"@SYSCONFDIR@@DIR_SEPARATOR@\" -xc99 -D_POSIX_C_SOURCE=200112L + libproxy_la_LDFLAGS = -lpthread -lm -no-undefined + include_HEADERS = proxy.h + all: all-am +diff --git a/src/modules/Makefile.am b/src/modules/Makefile.am +index 170791b..84bd0b5 100644 +--- a/src/modules/Makefile.am ++++ b/src/modules/Makefile.am +@@ -1,5 +1,5 @@ + moduledir = @MODULEDIR@ +-AM_CFLAGS = -std=c99 ++AM_CFLAGS = -xc99 + AM_LDFLAGS = -module -avoid-version -no-undefined + + +diff --git a/src/modules/Makefile.in b/src/modules/Makefile.in +index 6965056..45c9c57 100644 +--- a/src/modules/Makefile.in ++++ b/src/modules/Makefile.in +@@ -359,7 +359,7 @@ x11_LIBS = @x11_LIBS@ + xmu_CFLAGS = @xmu_CFLAGS@ + xmu_LIBS = @xmu_LIBS@ + moduledir = @MODULEDIR@ +-AM_CFLAGS = -std=c99 ++AM_CFLAGS = -xc99 + AM_LDFLAGS = -module -avoid-version -no-undefined + + # Which modules to build +-- +1.6.6 + Modified: csw/mgar/pkg/libproxy/trunk/files/0002-Dont-preset-CFLAGS.patch =================================================================== --- csw/mgar/pkg/libproxy/trunk/files/0002-Dont-preset-CFLAGS.patch 2010-01-05 20:21:32 UTC (rev 7880) +++ csw/mgar/pkg/libproxy/trunk/files/0002-Dont-preset-CFLAGS.patch 2010-01-05 20:43:05 UTC (rev 7881) @@ -14,21 +14,6 @@ ac_config_files="$ac_config_files libproxy-1.0.pc Makefile libproxy.spec src/Makefile src/lib/Makefile src/modules/Makefile src/bin/Makefile src/bindings/Makefile src/bindings/python/Makefile src/bindings/java/Makefile src/platform/Makefile src/platform/win32/Makefile src/bindings/dotnet/Makefile src/bindings/dotnet/libproxy-sharp-1.0.pc src/bindings/dotnet/AssemblyInfo.cs" cat >confcache <<\_ACEOF -diff --git a/configure.ac b/configure.ac -index c9e0bb9..4139f95 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -238,7 +238,7 @@ case $host in - AC_CHECK_LIB(ws2_32, main) - esac - --CFLAGS="-g -Wall -pedantic $CFLAGS" -+#CFLAGS="-g -Wall -pedantic $CFLAGS" - AC_CONFIG_FILES([libproxy-1.0.pc Makefile libproxy.spec src/Makefile src/lib/Makefile - src/modules/Makefile src/bin/Makefile src/bindings/Makefile - src/bindings/python/Makefile src/bindings/java/Makefile -diff --git a/src/lib/Makefile b/src/lib/Makefile -index 867b01b..0ba55f6 100644 -- 1.6.6 Added: csw/mgar/pkg/libproxy/trunk/files/0002-Dont-preset-CFLAGS.patch.orig =================================================================== --- csw/mgar/pkg/libproxy/trunk/files/0002-Dont-preset-CFLAGS.patch.orig (rev 0) +++ csw/mgar/pkg/libproxy/trunk/files/0002-Dont-preset-CFLAGS.patch.orig 2010-01-05 20:43:05 UTC (rev 7881) @@ -0,0 +1,35 @@ +From 6677cc7bc95aeeee76c7741ee9edd03469b7936e Mon Sep 17 00:00:00 2001 +From: Dagobert Michelsen +Date: Tue, 5 Jan 2010 15:35:21 +0100 +Subject: [PATCH 2/2] Initial commit + +--- a/configure ++++ b/configure +@@ -14683,7 +14683,7 @@ fi + + esac + +-CFLAGS="-g -Wall -pedantic $CFLAGS" ++# CFLAGS="-g -Wall -pedantic $CFLAGS" + ac_config_files="$ac_config_files libproxy-1.0.pc Makefile libproxy.spec src/Makefile src/lib/Makefile src/modules/Makefile src/bin/Makefile src/bindings/Makefile src/bindings/python/Makefile src/bindings/java/Makefile src/platform/Makefile src/platform/win32/Makefile src/bindings/dotnet/Makefile src/bindings/dotnet/libproxy-sharp-1.0.pc src/bindings/dotnet/AssemblyInfo.cs" + + cat >confcache <<\_ACEOF +diff --git a/configure.ac b/configure.ac +index c9e0bb9..4139f95 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -238,7 +238,7 @@ case $host in + AC_CHECK_LIB(ws2_32, main) + esac + +-CFLAGS="-g -Wall -pedantic $CFLAGS" ++#CFLAGS="-g -Wall -pedantic $CFLAGS" + AC_CONFIG_FILES([libproxy-1.0.pc Makefile libproxy.spec src/Makefile src/lib/Makefile + src/modules/Makefile src/bin/Makefile src/bindings/Makefile + src/bindings/python/Makefile src/bindings/java/Makefile +diff --git a/src/lib/Makefile b/src/lib/Makefile +index 867b01b..0ba55f6 100644 + +-- +1.6.6 + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Tue Jan 5 21:55:17 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 05 Jan 2010 20:55:17 +0000 Subject: [csw-devel] SF.net SVN: gar:[7882] csw/mgar/pkg/mpg123/trunk/Makefile Message-ID: Revision: 7882 http://gar.svn.sourceforge.net/gar/?rev=7882&view=rev Author: dmichelsen Date: 2010-01-05 20:55:17 +0000 (Tue, 05 Jan 2010) Log Message: ----------- mpg123: Do not use assembler optimizations with Sun Studio Modified Paths: -------------- csw/mgar/pkg/mpg123/trunk/Makefile Modified: csw/mgar/pkg/mpg123/trunk/Makefile =================================================================== --- csw/mgar/pkg/mpg123/trunk/Makefile 2010-01-05 20:43:05 UTC (rev 7881) +++ csw/mgar/pkg/mpg123/trunk/Makefile 2010-01-05 20:55:17 UTC (rev 7882) @@ -23,6 +23,7 @@ NO_ISAEXEC = 1 EXTRA_BUILD_ISAS = sparcv8plus+vis pentium CONFIGURE_ARGS = $(DIRPATHS) +CONFIGURE_ARGS += --with-cpu=generic_fpu # When we compile 64 bit largefiles are always on CONFIGURE_ARGS_mm-64 += --disable-largefile This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Tue Jan 5 22:38:12 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Tue, 05 Jan 2010 21:38:12 +0000 Subject: [csw-devel] SF.net SVN: gar:[7883] csw/mgar/pkg/keychain/trunk Message-ID: Revision: 7883 http://gar.svn.sourceforge.net/gar/?rev=7883&view=rev Author: wahwah Date: 2010-01-05 21:38:12 +0000 (Tue, 05 Jan 2010) Log Message: ----------- keychain: Version bump up to 2.7.0 Modified Paths: -------------- csw/mgar/pkg/keychain/trunk/Makefile csw/mgar/pkg/keychain/trunk/checksums Added Paths: ----------- csw/mgar/pkg/keychain/trunk/files/gsed.patch Modified: csw/mgar/pkg/keychain/trunk/Makefile =================================================================== --- csw/mgar/pkg/keychain/trunk/Makefile 2010-01-05 20:55:17 UTC (rev 7882) +++ csw/mgar/pkg/keychain/trunk/Makefile 2010-01-05 21:38:12 UTC (rev 7883) @@ -3,7 +3,7 @@ # $Header$ GARNAME = keychain -GARVERSION = 2.6.8 +GARVERSION = 2.7.0 CATEGORIES = utils DESCRIPTION = Convenient ssh-agent and gpg-agent manager @@ -18,26 +18,34 @@ . ~/.keychain/$$HOSTNAME-sh endef -MASTER_SITES = http://agriffis.n01se.net/keychain/ +MASTER_SITES = http://www.funtoo.org/archive/keychain/ DISTFILES = $(GARNAME)-$(GARVERSION).tar.bz2 +PATCHFILES = gsed.patch -# We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.bz2 ARCHALL = 1 CONFIGURE_SCRIPTS = -BUILD_SCRIPTS = +BUILD_SCRIPTS = keychain INSTALL_SCRIPTS = keychain TEST_SCRIPTS = +PREREQUISITE_PKGS = CSWperl + +include gar/category.mk + +build-keychain: + (cd $(WORKSRC); gmake keychain) + (cd $(WORKSRC); gmake keychain.1) + @$(MAKECOOKIE) + install-keychain: ginstall -d $(DESTDIR)$(bindir_install) ginstall -m 755 $(WORKSRC)/keychain $(DESTDIR)$(bindir_install) ginstall -d $(DESTDIR)$(mandir)/man1 ginstall -m 644 $(WORKSRC)/keychain.1 $(DESTDIR)$(mandir)/man1/ ginstall -d $(DESTDIR)$(docdir)/$(GARNAME) - ginstall $(WORKSRC)/README $(DESTDIR)$(docdir)/$(GARNAME) + ginstall $(WORKSRC)/README.rst $(DESTDIR)$(docdir)/$(GARNAME) ginstall $(WORKSRC)/ChangeLog $(DESTDIR)$(docdir)/$(GARNAME) ginstall $(WORKSRC)/keychain.pod $(DESTDIR)$(docdir)/$(GARNAME) - -include gar/category.mk + @$(MAKECOOKIE) Modified: csw/mgar/pkg/keychain/trunk/checksums =================================================================== --- csw/mgar/pkg/keychain/trunk/checksums 2010-01-05 20:55:17 UTC (rev 7882) +++ csw/mgar/pkg/keychain/trunk/checksums 2010-01-05 21:38:12 UTC (rev 7883) @@ -1 +1,2 @@ -2a23b311e438ecebed5639b568738d28 download/keychain-2.6.8.tar.bz2 +8efbaa227e87387db062f22d371b4157 gsed.patch +c5eecd36130d9e8617a77f96b746982d keychain-2.7.0.tar.bz2 Added: csw/mgar/pkg/keychain/trunk/files/gsed.patch =================================================================== --- csw/mgar/pkg/keychain/trunk/files/gsed.patch (rev 0) +++ csw/mgar/pkg/keychain/trunk/files/gsed.patch 2010-01-05 21:38:12 UTC (rev 7883) @@ -0,0 +1,11 @@ +--- keychain-2.7.0/Makefile.orig 2010-01-05 22:14:32.175890134 +0100 ++++ keychain-2.7.0/Makefile 2010-01-05 22:14:48.137272015 +0100 +@@ -1,7 +1,7 @@ + V:=$(shell /bin/sh keychain.sh --version 2>&1 | \ + awk -F'[ ;]' '/^K/{print $$2; exit}') + D:=$(shell date +'%d %b %Y') +-SED = $(shell sed --version > /dev/null && echo sed || (gsed --version && echo gsed || false)) ++SED = $(shell sed --version > /dev/null && echo sed || gsed --version && echo gsed || false) + TARBALL_CONTENTS=keychain README.rst ChangeLog COPYING keychain.pod keychain.1 \ + keychain.spec + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Tue Jan 5 23:29:07 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Tue, 05 Jan 2010 22:29:07 +0000 Subject: [csw-devel] SF.net SVN: gar:[7884] csw/mgar/pkg/keychain/trunk Message-ID: Revision: 7884 http://gar.svn.sourceforge.net/gar/?rev=7884&view=rev Author: wahwah Date: 2010-01-05 22:29:07 +0000 (Tue, 05 Jan 2010) Log Message: ----------- keychain: A better patch Modified Paths: -------------- csw/mgar/pkg/keychain/trunk/Makefile csw/mgar/pkg/keychain/trunk/checksums csw/mgar/pkg/keychain/trunk/files/gsed.patch Modified: csw/mgar/pkg/keychain/trunk/Makefile =================================================================== --- csw/mgar/pkg/keychain/trunk/Makefile 2010-01-05 21:38:12 UTC (rev 7883) +++ csw/mgar/pkg/keychain/trunk/Makefile 2010-01-05 22:29:07 UTC (rev 7884) @@ -35,8 +35,8 @@ include gar/category.mk build-keychain: - (cd $(WORKSRC); gmake keychain) - (cd $(WORKSRC); gmake keychain.1) + (cd $(WORKSRC); gmake SED=gsed keychain) + (cd $(WORKSRC); gmake SED=gsed keychain.1) @$(MAKECOOKIE) install-keychain: Modified: csw/mgar/pkg/keychain/trunk/checksums =================================================================== --- csw/mgar/pkg/keychain/trunk/checksums 2010-01-05 21:38:12 UTC (rev 7883) +++ csw/mgar/pkg/keychain/trunk/checksums 2010-01-05 22:29:07 UTC (rev 7884) @@ -1,2 +1,2 @@ -8efbaa227e87387db062f22d371b4157 gsed.patch +ad52a3ab14a63ccff22cac5076286bcb gsed.patch c5eecd36130d9e8617a77f96b746982d keychain-2.7.0.tar.bz2 Modified: csw/mgar/pkg/keychain/trunk/files/gsed.patch =================================================================== --- csw/mgar/pkg/keychain/trunk/files/gsed.patch 2010-01-05 21:38:12 UTC (rev 7883) +++ csw/mgar/pkg/keychain/trunk/files/gsed.patch 2010-01-05 22:29:07 UTC (rev 7884) @@ -1,11 +1,27 @@ ---- keychain-2.7.0/Makefile.orig 2010-01-05 22:14:32.175890134 +0100 -+++ keychain-2.7.0/Makefile 2010-01-05 22:14:48.137272015 +0100 -@@ -1,7 +1,7 @@ +--- a/Makefile 2010-01-05 22:40:37.832643496 +0100 ++++ b/Makefile 2010-01-05 23:01:25.428084486 +0100 +@@ -1,19 +1,22 @@ V:=$(shell /bin/sh keychain.sh --version 2>&1 | \ awk -F'[ ;]' '/^K/{print $$2; exit}') D:=$(shell date +'%d %b %Y') --SED = $(shell sed --version > /dev/null && echo sed || (gsed --version && echo gsed || false)) -+SED = $(shell sed --version > /dev/null && echo sed || gsed --version && echo gsed || false) ++ifndef SED ++SED = sed ++endif TARBALL_CONTENTS=keychain README.rst ChangeLog COPYING keychain.pod keychain.1 \ keychain.spec + all: keychain.1.gz keychain keychain.spec + + keychain.spec: keychain.spec.in keychain.sh +- sed 's/KEYCHAIN_VERSION/$V/' keychain.spec.in > keychain.spec ++ $(SED) 's/KEYCHAIN_VERSION/$V/' keychain.spec.in > keychain.spec + + keychain.1: keychain.pod keychain.sh + pod2man --name=keychain --release=$V \ + --center='http://gentoo.org/proj/en/keychain.xml' \ + keychain.pod keychain.1 +- sed -i.orig -e "s/^'br/.br/" keychain.1 ++ $(SED) -i.orig -e "s/^'br/.br/" keychain.1 + + keychain.1.gz: keychain.1 + gzip -9 keychain.1 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From skayser at users.sourceforge.net Wed Jan 6 01:19:47 2010 From: skayser at users.sourceforge.net (skayser at users.sourceforge.net) Date: Wed, 06 Jan 2010 00:19:47 +0000 Subject: [csw-devel] SF.net SVN: gar:[7885] csw/mgar/pkg/mbuffer/trunk Message-ID: Revision: 7885 http://gar.svn.sourceforge.net/gar/?rev=7885&view=rev Author: skayser Date: 2010-01-06 00:19:47 +0000 (Wed, 06 Jan 2010) Log Message: ----------- mbuffer: bumped to 227 (looks good eventually), fixed test suite, switched to isaexec Modified Paths: -------------- csw/mgar/pkg/mbuffer/trunk/Makefile csw/mgar/pkg/mbuffer/trunk/checksums csw/mgar/pkg/mbuffer/trunk/files/changelog.CSW Added Paths: ----------- csw/mgar/pkg/mbuffer/trunk/files/0001-Makefile-put-background-jobs-in-same-shell-as-the-wa.patch Modified: csw/mgar/pkg/mbuffer/trunk/Makefile =================================================================== --- csw/mgar/pkg/mbuffer/trunk/Makefile 2010-01-05 22:29:07 UTC (rev 7884) +++ csw/mgar/pkg/mbuffer/trunk/Makefile 2010-01-06 00:19:47 UTC (rev 7885) @@ -1,8 +1,5 @@ -# STATUS/TODO -# - provide feedback about -xarch=generic64 to upstream -# - verify that tests pass GARNAME = mbuffer -GARVERSION = 20091122 +GARVERSION = 20091227 CATEGORIES = utils DESCRIPTION = A tool for buffering data streams @@ -22,25 +19,26 @@ LICENSE = LICENSE +# The tests use background process and wait, but don't issue the wait +# in the same shell as the background processes were launched in. Fix this. +# Already submitted to upstream, maybe integrated in future versions. +PATCHFILES = 0001-Makefile-put-background-jobs-in-same-shell-as-the-wa.patch + # Required during packaging (for the "test" target) -PREREQUISITE_PKGS = CSWmktemp CSWgcc4core +PREREQUISITE_PKGS = CSWmktemp +PREREQUISITE_PKGS += CSWgcc4core -REQUIRED_PKGS = CSWosslrt CSWlibmhash +REQUIRED_PKGS = CSWlibmhash -# To build the mixed package for x86 you have to do the following -# 1) build8x: gmake merge -# 2) build10x: gmake merge -# 3) build8x: gmake package +# 64-bit build enables buffers >= 2GB (see README). BUILD64 = 1 -# 64-bit isn't thorougly tested by upstream, default to 32-bit, but still -# deliver 64-bit in case someone might want to play around with 2GB+ buffers -# ISAEXEC_BINS = $(bindir)/mbuffer -NO_ISAEXEC = 1 - CONFIGURE_ARGS = $(DIRPATHS) -TEST_SCRIPTS = custom +# While we have IPv6 loopback interfaces on the buildfarm now, build10x +# is missing an localhost IPv6 address entry for /etc/hosts. test3 requires +# one, thus we omit it for the time being. +TEST_TARGET = -o test3 check # Required for updated libmhash (mbuffer builds against it) which allows for # flexible const/non-const definitions. There should be a more intelligent @@ -50,36 +48,10 @@ include gar/category.mk -# The test scripts do file IO and this is so sloooooow when being run -# in a NFS mounted $HOME. The local disk on build8x is no better, so -# just do the testing from /tmp instead. -# -# TODO: -# * Clean up $TMPDIR even when the nested make fails. -# * Somehow assert that the isa-amd64 test is run on build10x -# -test-custom: TMPDIR := $(shell mktemp -d -p /tmp) -test-custom: - echo "Running target test-custom, TMPDIR = $(TMPDIR)" - cp $(WORKSRC)/mbuffer $(WORKSRC)/Makefile $(TMPDIR)/ - - # Target test3 is skipped because it contains IPV6 tests which - # are not supported by the build farm boxes (yet). - $(MAKE) -C $(TMPDIR) -o test3 check || rm -rf $(TMPDIR) && exit 1 - test -d $(TMPDIR) && rm -rf $(TMPDIR) - @$(MAKECOOKIE) - -# mbuffer-20091122 always tries to use -xarch=generic64, -# even for non-64bit builds -post-configure-modulated: - [ "$(GARCH)" -eq "i386" -o "$(GARCH)" -eq "sparcv8" ] && \ - gsed -ie 's/-xarch=generic64//' $(WORKSRC)/Makefile - @$(MAKECOOKIE) - post-install-modulated: DOCS = ChangeLog README AUTHORS post-install-modulated: DOCDEST = $(DESTDIR)$(docdir)/$(GARNAME) post-install-modulated: ginstall -d $(DOCDEST) - $(foreach DOC,$(DOCS),cp $(WORKSRC)/$(DOC) $(DOCDEST);) + cp $(addprefix $(WORKSRC)/,$(DOCS)) $(DOCDEST) cp $(FILEDIR)/changelog.CSW $(DOCDEST) @$(MAKECOOKIE) Modified: csw/mgar/pkg/mbuffer/trunk/checksums =================================================================== --- csw/mgar/pkg/mbuffer/trunk/checksums 2010-01-05 22:29:07 UTC (rev 7884) +++ csw/mgar/pkg/mbuffer/trunk/checksums 2010-01-06 00:19:47 UTC (rev 7885) @@ -1 +1,2 @@ -3f05bd393ac749ed820636e5aaed7848 mbuffer-20091122.tgz +59fc19279af037462bd96279f5580c58 0001-Makefile-put-background-jobs-in-same-shell-as-the-wa.patch +191663396b4b1752d7104803631b9e54 mbuffer-20091227.tgz Added: csw/mgar/pkg/mbuffer/trunk/files/0001-Makefile-put-background-jobs-in-same-shell-as-the-wa.patch =================================================================== --- csw/mgar/pkg/mbuffer/trunk/files/0001-Makefile-put-background-jobs-in-same-shell-as-the-wa.patch (rev 0) +++ csw/mgar/pkg/mbuffer/trunk/files/0001-Makefile-put-background-jobs-in-same-shell-as-the-wa.patch 2010-01-06 00:19:47 UTC (rev 7885) @@ -0,0 +1,50 @@ +From 280c3806583428f2d20718839129ea0758e8cdbc Mon Sep 17 00:00:00 2001 +From: Sebastian Kayser +Date: Tue, 5 Jan 2010 23:19:33 +0100 +Subject: [PATCH] Makefile: put background jobs in same shell as the wait call + +--- + Makefile.in | 20 ++++++++++---------- + 1 files changed, 10 insertions(+), 10 deletions(-) + +diff --git a/Makefile.in b/Makefile.in +index b381ade..bf9953f 100644 +--- a/Makefile.in ++++ b/Makefile.in +@@ -73,11 +73,11 @@ test1: test.md5 + touch $@ + + test2: test.md5 +- ./mbuffer -q -I :8000 -o $@.tar -o - | openssl md5 > $@.md5 & +- sleep 1 +- -rm -f $@.tar +- ./mbuffer -i test.tar -o /dev/null -O localhost:8000 -H +- wait ++ ./mbuffer -q -I :8000 -o $@.tar -o - | openssl md5 > $@.md5 & \ ++ sleep 1; \ ++ rm -f $@.tar; \ ++ ./mbuffer -i test.tar -o /dev/null -O localhost:8000 -H; \ ++ wait + sync + diff $@.md5 test.md5 + rm $@.md5 +@@ -88,11 +88,11 @@ test2: test.md5 + touch $@ + + test3: test.md5 +- ./mbuffer -q -6 -I :8000 | openssl md5 > $@.md5 & +- sleep 1 +- -rm -f $@.tar +- ./mbuffer -i test.tar -o /dev/null -6 -O localhost:8000 -o $@.tar -H +- wait ++ ./mbuffer -q -6 -I :8000 | openssl md5 > $@.md5 & \ ++ sleep 1; \ ++ rm -f $@.tar; \ ++ ./mbuffer -i test.tar -o /dev/null -6 -O localhost:8000 -o $@.tar -H; \ ++ wait + sync + diff $@.md5 test.md5 + rm $@.md5 +-- +1.6.5.1 + Modified: csw/mgar/pkg/mbuffer/trunk/files/changelog.CSW =================================================================== --- csw/mgar/pkg/mbuffer/trunk/files/changelog.CSW 2010-01-05 22:29:07 UTC (rev 7884) +++ csw/mgar/pkg/mbuffer/trunk/files/changelog.CSW 2010-01-06 00:19:47 UTC (rev 7885) @@ -1,3 +1,12 @@ +mbuffer (20091227,REV=2010.01.06) + + * Updated to new upstream release 20091227 (Closes #3912, #3980). + * Links against libmhash instead of openssl_rt for hash creation. + * /opt/csw/bin/mbuffer is now a link to isaexec which automatically + calls the appropriate mbuffer platform binary (32-bit or 64-bit). + + -- Sebastian Kayser Wed, 6 Jan 2010 00:50:20 +0100 + mbuffer (20090215,REV=2009.05.10) * Recompiled with updated GAR build system (Closes: #3561). This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Wed Jan 6 02:13:57 2010 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Wed, 06 Jan 2010 01:13:57 +0000 Subject: [csw-devel] SF.net SVN: gar:[7886] csw/mgar/pkg/asciidoc/trunk Message-ID: Revision: 7886 http://gar.svn.sourceforge.net/gar/?rev=7886&view=rev Author: bdwalton Date: 2010-01-06 01:13:57 +0000 (Wed, 06 Jan 2010) Log Message: ----------- asciidoc: update PATH munging patch for a2x bash -> python conversion Modified Paths: -------------- csw/mgar/pkg/asciidoc/trunk/checksums csw/mgar/pkg/asciidoc/trunk/files/add-csw-gnu-path-to-a2x.patch Modified: csw/mgar/pkg/asciidoc/trunk/checksums =================================================================== --- csw/mgar/pkg/asciidoc/trunk/checksums 2010-01-06 00:19:47 UTC (rev 7885) +++ csw/mgar/pkg/asciidoc/trunk/checksums 2010-01-06 01:13:57 UTC (rev 7886) @@ -1,3 +1,3 @@ -62c15a6f036ca40ad0dffb0b14ad6630 add-csw-gnu-path-to-a2x.patch +0f4502395f72632388628d3720bdfd42 add-csw-gnu-path-to-a2x.patch 3ed69184645b233b83a52f8a722d1461 asciidoc-8.5.2.tar.gz ec48eeea1eafdaa7e507bc11327f6eae handle-csw-etc-paths.patch Modified: csw/mgar/pkg/asciidoc/trunk/files/add-csw-gnu-path-to-a2x.patch =================================================================== --- csw/mgar/pkg/asciidoc/trunk/files/add-csw-gnu-path-to-a2x.patch 2010-01-06 00:19:47 UTC (rev 7885) +++ csw/mgar/pkg/asciidoc/trunk/files/add-csw-gnu-path-to-a2x.patch 2010-01-06 01:13:57 UTC (rev 7886) @@ -1,13 +1,12 @@ -diff --speed-large-files --minimal -Nru asciidoc-8.4.5.orig/a2x asciidoc-8.4.5/a2x ---- asciidoc-8.4.5.orig/a2x 2009-05-12 00:26:16.000000000 +0200 -+++ asciidoc-8.4.5/a2x 2009-09-18 21:32:44.546730245 +0200 -@@ -7,6 +7,9 @@ - # under the terms of the GNU General Public License (GPL). - # +diff -ru asciidoc-8.5.2.orig/a2x.py asciidoc-8.5.2/a2x.py +--- asciidoc-8.5.2.orig/a2x.py 2010-01-06 01:42:35.549886234 +0100 ++++ asciidoc-8.5.2/a2x.py 2010-01-06 01:53:47.076069410 +0100 +@@ -57,6 +57,8 @@ -+PATH=/opt/csw/gnu:/opt/csw/bin:$PATH -+export PATH + OPTIONS = None # These functions read verbose and dry_run command options. + ++os.environ["PATH"] = "/opt/csw/gnu:/opt/csw/bin:" + os.environ["PATH"] + - VERSION=1.0.0 - BASENAME=$(basename "$0") - REALNAME="$0" + def errmsg(msg): + sys.stderr.write('%s: %s\n' % (PROG,msg)) + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From hson at users.sourceforge.net Wed Jan 6 02:57:42 2010 From: hson at users.sourceforge.net (hson at users.sourceforge.net) Date: Wed, 06 Jan 2010 01:57:42 +0000 Subject: [csw-devel] SF.net SVN: gar:[7887] csw/mgar/pkg Message-ID: Revision: 7887 http://gar.svn.sourceforge.net/gar/?rev=7887&view=rev Author: hson Date: 2010-01-06 01:57:42 +0000 (Wed, 06 Jan 2010) Log Message: ----------- evolution-exchange: Initial commit Added Paths: ----------- csw/mgar/pkg/evolution-exchange/ csw/mgar/pkg/evolution-exchange/Makefile csw/mgar/pkg/evolution-exchange/branches/ csw/mgar/pkg/evolution-exchange/tags/ csw/mgar/pkg/evolution-exchange/trunk/ csw/mgar/pkg/evolution-exchange/trunk/Makefile csw/mgar/pkg/evolution-exchange/trunk/checksums csw/mgar/pkg/evolution-exchange/trunk/files/ Added: csw/mgar/pkg/evolution-exchange/Makefile =================================================================== --- csw/mgar/pkg/evolution-exchange/Makefile (rev 0) +++ csw/mgar/pkg/evolution-exchange/Makefile 2010-01-06 01:57:42 UTC (rev 7887) @@ -0,0 +1,15 @@ +# vim: ft=make ts=4 sw=4 noet + +default: + @echo "You are in the pkg/ directory." + +%: + $(MAKE) -C trunk $* + +paranoid-%: + $(MAKE) -C trunk $* || exit 2 + +export BUILDLOG ?= $(shell pwd)/buildlog.txt + +report-%: + $(MAKE) -C trunk $* || echo " *** make $* in $$i failed ***" >> $(BUILDLOG) Property changes on: csw/mgar/pkg/evolution-exchange/trunk ___________________________________________________________________ Added: svn:ignore + cookies download work Added: svn:externals + gar https://gar.svn.sf.net/svnroot/gar/csw/mgar/gar/v2 Added: csw/mgar/pkg/evolution-exchange/trunk/Makefile =================================================================== --- csw/mgar/pkg/evolution-exchange/trunk/Makefile (rev 0) +++ csw/mgar/pkg/evolution-exchange/trunk/Makefile 2010-01-06 01:57:42 UTC (rev 7887) @@ -0,0 +1,53 @@ +GARNAME = evolution-exchange +GARVERSION = 2.28.2 +CATEGORIES = gnome + +DESCRIPTION = Evolution Web Calendar +define BLURB +endef + +MASTER_SITES = $(GNOME_MIRROR) +DISTFILES = $(GARNAME)-$(GARVERSION).tar.bz2 +DISTNAME = $(GARNAME)-$(GARVERSION) + +PACKAGES = CSWevolutionexchange CSWevolutionexchange-devel CSWevolutionexchange-doc +CATALOGNAME_CSWevolutionexchange = evolution_webcal +CATALOGNAME_CSWevolutionexchange-devel = evolution_webcal_devel +CATALOGNAME_CSWevolutionexchange-doc = evolution_webcal_doc + +SPKG_DESC_CSWevolutionexchange += Evolution Web Calendar +SPKG_DESC_CSWevolutionexchange-devel += Evolution Web Calendar - developer package +SPKG_DESC_CSWevolutionexchange-doc += Evolution Web Calendar - documentation + +REQUIRED_PKGS_CSWevolutionexchange += +REQUIRED_PKGS_CSWevolutionexchange += +REQUIRED_PKGS_CSWevolutionexchange += +REQUIRED_PKGS_CSWevolutionexchange-devel += CSWevolution +REQUIRED_PKGS_CSWevolutionexchange-doc += CSWevolution + +PKGFILES_CSWevolutionexchange-devel = $(PKGFILES_DEVEL) +PKGFILES_CSWevolutionexchange-doc = $(sharedstatedir)/gtk-doc/.* + +ARCHALL_CSWevolutionexchange-doc = 1 + +INCOMPATIBLE_PKGS_CSWevolutionexchange = CSWximian-connector + +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.bz2 + +SPKG_SOURCEURL =http://projects.gnome.org/evolution-webcal + +EXTRA_INC = $(prefix)/X11/include +EXTRA_LIB = $(prefix)/X11/lib +EXTRA_PKG_CONFIG_DIRS = $(prefix)/X11/lib + +BUILD64 = 1 + +STRIP_LIBTOOL = 1 + +CONFIGURE_ARGS = $(DIRPATHS) + +TEST_TARGET = check + +include gar/category.mk + +PATH := /opt/csw/gnu:$(PATH) Added: csw/mgar/pkg/evolution-exchange/trunk/checksums =================================================================== --- csw/mgar/pkg/evolution-exchange/trunk/checksums (rev 0) +++ csw/mgar/pkg/evolution-exchange/trunk/checksums 2010-01-06 01:57:42 UTC (rev 7887) @@ -0,0 +1 @@ +82f70761960c7e9efdb24650c1b3229b evolution-exchange-2.28.2.tar.bz2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Wed Jan 6 12:28:36 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 06 Jan 2010 11:28:36 +0000 Subject: [csw-devel] SF.net SVN: gar:[7888] csw/mgar/pkg/wavpack/tags/wavpack-4.60.0, REV=2009.11 .06/ Message-ID: Revision: 7888 http://gar.svn.sourceforge.net/gar/?rev=7888&view=rev Author: dmichelsen Date: 2010-01-06 11:28:36 +0000 (Wed, 06 Jan 2010) Log Message: ----------- wavpack: Tag wavpack-4.60.0,REV=2009.11.06 Added Paths: ----------- csw/mgar/pkg/wavpack/tags/wavpack-4.60.0,REV=2009.11.06/ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Wed Jan 6 12:39:14 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 06 Jan 2010 11:39:14 +0000 Subject: [csw-devel] SF.net SVN: gar:[7889] csw/mgar/pkg/wavpack/trunk Message-ID: Revision: 7889 http://gar.svn.sourceforge.net/gar/?rev=7889&view=rev Author: dmichelsen Date: 2010-01-06 11:39:13 +0000 (Wed, 06 Jan 2010) Log Message: ----------- wavpack: Update to 4.60.1 Modified Paths: -------------- csw/mgar/pkg/wavpack/trunk/Makefile csw/mgar/pkg/wavpack/trunk/checksums Removed Paths: ------------- csw/mgar/pkg/wavpack/trunk/files/0001-Add-support-for-Sun-Studio-compiler.patch Modified: csw/mgar/pkg/wavpack/trunk/Makefile =================================================================== --- csw/mgar/pkg/wavpack/trunk/Makefile 2010-01-06 11:28:36 UTC (rev 7888) +++ csw/mgar/pkg/wavpack/trunk/Makefile 2010-01-06 11:39:13 UTC (rev 7889) @@ -1,5 +1,5 @@ GARNAME = wavpack -GARVERSION = 4.60.0 +GARVERSION = 4.60.1 CATEGORIES = lib DESCRIPTION = Open audio compression format @@ -13,13 +13,14 @@ MASTER_SITES = http://www.wavpack.com/ DISTFILES = $(GARNAME)-$(GARVERSION).tar.bz2 -PATCHFILES += 0001-Add-support-for-Sun-Studio-compiler.patch # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.bz2 REQUIRED_PKGS = CSWiconv +LICENSE = license.txt + BUILD64 = 1 NO_ISAEXEC = 1 CONFIGURE_ARGS = $(DIRPATHS) Modified: csw/mgar/pkg/wavpack/trunk/checksums =================================================================== --- csw/mgar/pkg/wavpack/trunk/checksums 2010-01-06 11:28:36 UTC (rev 7888) +++ csw/mgar/pkg/wavpack/trunk/checksums 2010-01-06 11:39:13 UTC (rev 7889) @@ -1,2 +1 @@ -a8cbb0b205d3865731e359f24341bd7d 0001-Add-support-for-Sun-Studio-compiler.patch -722f90393b292cd1413e8af8250a3783 wavpack-4.60.0.tar.bz2 +7bb1528f910e4d0003426c02db856063 wavpack-4.60.1.tar.bz2 Deleted: csw/mgar/pkg/wavpack/trunk/files/0001-Add-support-for-Sun-Studio-compiler.patch =================================================================== --- csw/mgar/pkg/wavpack/trunk/files/0001-Add-support-for-Sun-Studio-compiler.patch 2010-01-06 11:28:36 UTC (rev 7888) +++ csw/mgar/pkg/wavpack/trunk/files/0001-Add-support-for-Sun-Studio-compiler.patch 2010-01-06 11:39:13 UTC (rev 7889) @@ -1,48 +0,0 @@ -From e4e9a2384beca0d8be8f2742ec5c9b6607b20f10 Mon Sep 17 00:00:00 2001 -From: Dagobert Michelsen -Date: Fri, 6 Nov 2009 13:49:55 +0100 -Subject: [PATCH] Add support for Sun Studio compiler - ---- - cli/utils.c | 4 ++-- - include/wavpack.h | 2 +- - 2 files changed, 3 insertions(+), 3 deletions(-) - -diff --git a/cli/utils.c b/cli/utils.c -index 6094f52..442685b 100644 ---- a/cli/utils.c -+++ b/cli/utils.c -@@ -16,7 +16,7 @@ - #include - #include - #include --#elif defined(__GNUC__) -+#elif defined(__GNUC__) || defined(__sun) - #include - #include - #endif -@@ -164,7 +164,7 @@ char *filespec_ext (char *filespec) - // returned. // - ////////////////////////////////////////////////////////////////////////////// - --#if defined(__GNUC__) && !defined(WIN32) -+#if (defined(__GNUC__) || defined(__sun)) && !defined(WIN32) - - char *filespec_path (char *filespec) - { -diff --git a/include/wavpack.h b/include/wavpack.h -index d264bdc..92caa48 100644 ---- a/include/wavpack.h -+++ b/include/wavpack.h -@@ -33,7 +33,7 @@ typedef float float32_t; - - typedef unsigned char uchar; - --#if !defined(__GNUC__) || defined(WIN32) -+#if (!defined(__GNUC__) && !defined(__sun)) || defined(WIN32) - typedef unsigned short ushort; - typedef unsigned int uint; - #endif --- -1.6.5.1 - This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Wed Jan 6 13:52:54 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 06 Jan 2010 12:52:54 +0000 Subject: [csw-devel] SF.net SVN: gar:[7890] csw/mgar/pkg Message-ID: Revision: 7890 http://gar.svn.sourceforge.net/gar/?rev=7890&view=rev Author: dmichelsen Date: 2010-01-06 12:51:41 +0000 (Wed, 06 Jan 2010) Log Message: ----------- scons: Initial commit Added Paths: ----------- csw/mgar/pkg/scons/ csw/mgar/pkg/scons/branches/ csw/mgar/pkg/scons/tags/ csw/mgar/pkg/scons/trunk/ csw/mgar/pkg/scons/trunk/Makefile csw/mgar/pkg/scons/trunk/checksums csw/mgar/pkg/scons/trunk/files/ Property changes on: csw/mgar/pkg/scons/trunk ___________________________________________________________________ Added: svn:ignore + cookies download work Added: svn:externals + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 Added: csw/mgar/pkg/scons/trunk/Makefile =================================================================== --- csw/mgar/pkg/scons/trunk/Makefile (rev 0) +++ csw/mgar/pkg/scons/trunk/Makefile 2010-01-06 12:51:41 UTC (rev 7890) @@ -0,0 +1,36 @@ +GARNAME = scons +GARVERSION = 1.2.0 +CATEGORIES = devel + +DESCRIPTION = A next-generation build tool +define BLURB + SCons is an Open Source software construction tool - that is, + a next-generation build tool. Think of SCons as an improved, + cross-platform substitute for the classic Make utility with + integrated functionality similar to autoconf/automake and compiler + caches such as ccache. In short, SCons is an easier, more + reliable and faster way to build software. +endef + +SF_PROJ = scons +MASTER_SITES = $(SF_MIRRORS) +DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz + +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + +SPKG_SOURCEURL = http://www.scons.org/ + +LICENSE = LICENSE.txt + +CONFIGURE_SCRIPTS = +BUILD_SCRIPTS = $(WORKSRC)/setup.py +TEST_SCRIPTS = +INSTALL_SCRIPTS = $(WORKSRC)/setup.py +INSTALL_ARGS = --root=$(DESTDIR) + +EXTRA_PAX_ARGS = -s ",\./opt/csw/man,./opt/csw/share/man," + +ARCHALL = 1 + +include gar/category.mk Added: csw/mgar/pkg/scons/trunk/checksums =================================================================== --- csw/mgar/pkg/scons/trunk/checksums (rev 0) +++ csw/mgar/pkg/scons/trunk/checksums 2010-01-06 12:51:41 UTC (rev 7890) @@ -0,0 +1 @@ +53b6aa7281811717a57598e319441cf7 scons-1.2.0.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From chninkel at users.sourceforge.net Wed Jan 6 16:00:16 2010 From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net) Date: Wed, 06 Jan 2010 15:00:16 +0000 Subject: [csw-devel] SF.net SVN: gar:[7891] csw/mgar/pkg/bash/trunk Message-ID: Revision: 7891 http://gar.svn.sourceforge.net/gar/?rev=7891&view=rev Author: chninkel Date: 2010-01-06 15:00:16 +0000 (Wed, 06 Jan 2010) Log Message: ----------- bash: fixed a compilation error caused by vsnprintf redefinition Modified Paths: -------------- csw/mgar/pkg/bash/trunk/Makefile csw/mgar/pkg/bash/trunk/checksums Added Paths: ----------- csw/mgar/pkg/bash/trunk/files/vsnprintf.patch Modified: csw/mgar/pkg/bash/trunk/Makefile =================================================================== --- csw/mgar/pkg/bash/trunk/Makefile 2010-01-06 12:51:41 UTC (rev 7890) +++ csw/mgar/pkg/bash/trunk/Makefile 2010-01-06 15:00:16 UTC (rev 7891) @@ -67,6 +67,8 @@ # opencsw bash use /etc/bash.bashrc and /etc/bash.bash_logout files PATCHFILES += use_system_bashrc_and_logout.patch +# Temporary fix for vsnprintf definition clash +PATCHFILES += vsnprintf.patch ##### Build and installation information ##### Modified: csw/mgar/pkg/bash/trunk/checksums =================================================================== --- csw/mgar/pkg/bash/trunk/checksums 2010-01-06 12:51:41 UTC (rev 7890) +++ csw/mgar/pkg/bash/trunk/checksums 2010-01-06 15:00:16 UTC (rev 7891) @@ -3,3 +3,4 @@ 8b104a3cddca41849186af53c8602eef changelog.CSW 60956e6be20f69dafbb06fcc83bab88e shells 29607316cff22f7427322d8f190cbadf use_system_bashrc_and_logout.patch +f2876ca41b05f236621abddc713af3e7 vsnprintf.patch Added: csw/mgar/pkg/bash/trunk/files/vsnprintf.patch =================================================================== --- csw/mgar/pkg/bash/trunk/files/vsnprintf.patch (rev 0) +++ csw/mgar/pkg/bash/trunk/files/vsnprintf.patch 2010-01-06 15:00:16 UTC (rev 7891) @@ -0,0 +1,47 @@ +diff --speed-large-files -Nur builtins/printf.def builtins/printf.def +--- builtins/printf.def 2010-01-06 15:15:00.498275417 +0100 ++++ builtins/printf.def 2010-01-06 15:13:39.646642489 +0100 +@@ -172,7 +172,9 @@ + #endif + + #if !HAVE_VSNPRINTF +-extern int vsnprintf __P((char *, size_t, const char *, ...)) __attribute__((__format__ (printf, 3, 4))); ++extern int bash_vsnprintf __P((char *, size_t, const char *, ...)) __attribute__((__format__ (printf, 3, 4))); ++#else ++# define bash_vsnprintf vsnprintf + #endif + + static void printf_erange __P((char *)); +@@ -885,7 +887,7 @@ + int blen; + + SH_VA_START (args, format); +- blen = vsnprintf (vbuf + vblen, vbsize - vblen, format, args); ++ blen = bash_vsnprintf (vbuf + vblen, vbsize - vblen, format, args); + va_end (args); + + nlen = vblen + blen + 1; +@@ -894,7 +896,7 @@ + vbsize = ((nlen + 63) >> 6) << 6; + vbuf = (char *)xrealloc (vbuf, vbsize); + SH_VA_START (args, format); +- blen = vsnprintf (vbuf + vblen, vbsize - vblen, format, args); ++ blen = bash_vsnprintf (vbuf + vblen, vbsize - vblen, format, args); + va_end (args); + } + +diff --speed-large-files -Nur lib/sh/snprintf.c lib/sh/snprintf.c +--- lib/sh/snprintf.c 2010-01-06 15:14:47.740952207 +0100 ++++ lib/sh/snprintf.c 2010-01-06 15:14:25.727971179 +0100 +@@ -1655,9 +1655,9 @@ + + int + #if defined (__STDC__) +-vsnprintf(char *string, size_t length, const char *format, va_list args) ++bash_vsnprintf(char *string, size_t length, const char *format, va_list args) + #else +-vsnprintf(string, length, format, args) ++bash_vsnprintf(string, length, format, args) + char *string; + size_t length; + const char *format; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Wed Jan 6 18:14:06 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 06 Jan 2010 17:14:06 +0000 Subject: [csw-devel] SF.net SVN: gar:[7892] csw/mgar/pkg Message-ID: Revision: 7892 http://gar.svn.sourceforge.net/gar/?rev=7892&view=rev Author: dmichelsen Date: 2010-01-06 17:14:06 +0000 (Wed, 06 Jan 2010) Log Message: ----------- unzip: Initial commit, doesnt compile yet Added Paths: ----------- csw/mgar/pkg/unzip/ csw/mgar/pkg/unzip/branches/ csw/mgar/pkg/unzip/tags/ csw/mgar/pkg/unzip/trunk/ csw/mgar/pkg/unzip/trunk/Makefile csw/mgar/pkg/unzip/trunk/checksums csw/mgar/pkg/unzip/trunk/files/ Property changes on: csw/mgar/pkg/unzip/trunk ___________________________________________________________________ Added: svn:ignore + cookies download work Added: svn:externals + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 Added: csw/mgar/pkg/unzip/trunk/Makefile =================================================================== --- csw/mgar/pkg/unzip/trunk/Makefile (rev 0) +++ csw/mgar/pkg/unzip/trunk/Makefile 2010-01-06 17:14:06 UTC (rev 7892) @@ -0,0 +1,30 @@ +GARNAME = unzip +GARVERSION = 6.0 +CATEGORIES = utils + +DESCRIPTION = Info-Zip UnZip extraction utility for archives compressed in .zip format +define BLURB +endef + +SF_PROJ = infozip +MASTER_SITES = $(SF_MIRRORS) +DISTNAME = unzip60 +DISTFILES = $(DISTNAME).tar.gz + +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + +SPKG_SOURCEURL = http://www.info-zip.org/ + +LICENSE = LICENSE + +CONFIGURE_SCRIPTS = $(WORKSRC)/unix/configure +# CONFIGURE_ARGS = $(DIRPATHS) + +BUILD_SCRIPTS = $(WORKSRC)/unix/Makefile +BUILD_ARGS = sunos + +TEST_SCRIPTS = $(WORKSRC)/unix/Makefile +INSTALL_SCRIPTS = $(WORKSRC)/unix/Makefile + +include gar/category.mk Added: csw/mgar/pkg/unzip/trunk/checksums =================================================================== --- csw/mgar/pkg/unzip/trunk/checksums (rev 0) +++ csw/mgar/pkg/unzip/trunk/checksums 2010-01-06 17:14:06 UTC (rev 7892) @@ -0,0 +1 @@ +62b490407489521db863b523a7f86375 unzip60.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Wed Jan 6 22:01:51 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 06 Jan 2010 21:01:51 +0000 Subject: [csw-devel] SF.net SVN: gar:[7894] csw/mgar/pkg/mplayer/tags/mplayer-1.0rc2-jwheeler/ Message-ID: Revision: 7894 http://gar.svn.sourceforge.net/gar/?rev=7894&view=rev Author: dmichelsen Date: 2010-01-06 21:01:51 +0000 (Wed, 06 Jan 2010) Log Message: ----------- mplayer: Tag (unreleased?) 1.0rc2 Added Paths: ----------- csw/mgar/pkg/mplayer/tags/mplayer-1.0rc2-jwheeler/ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From skayser at users.sourceforge.net Wed Jan 6 21:30:08 2010 From: skayser at users.sourceforge.net (skayser at users.sourceforge.net) Date: Wed, 06 Jan 2010 20:30:08 +0000 Subject: [csw-devel] SF.net SVN: gar:[7893] csw/mgar/pkg/watch/trunk Message-ID: Revision: 7893 http://gar.svn.sourceforge.net/gar/?rev=7893&view=rev Author: skayser Date: 2010-01-06 20:30:08 +0000 (Wed, 06 Jan 2010) Log Message: ----------- watch: document character handling flaws/versioning, move back to ncurses Modified Paths: -------------- csw/mgar/pkg/watch/trunk/Makefile csw/mgar/pkg/watch/trunk/files/changelog.CSW Modified: csw/mgar/pkg/watch/trunk/Makefile =================================================================== --- csw/mgar/pkg/watch/trunk/Makefile 2010-01-06 17:14:06 UTC (rev 7892) +++ csw/mgar/pkg/watch/trunk/Makefile 2010-01-06 20:30:08 UTC (rev 7893) @@ -1,8 +1,13 @@ -# TODO -# - Although watch links against ncursesw, non-ASCII character handling -# is broken. German umlauts for example won't display at all. Try: -# python -c 'print u"\u00E4"' vs. watch -d python -c 'print u"\u00E4"' -# Needs further investigation. +# Known issues +# - watch only handles characters on a byte-by-byte basis, as such it +# doesn't cope with wide characters like the ones encoded via UTF-8. +# LATIN SMALL LETTER A WITH DIAERESIS (U+00E4) encoded in UTF-8 +# for example is simply skipped in the output. For the current +# implementation of watch it depends on the result of isprint() +# whether a one byte component of a character is printed. + +# watch doesn't follow the procps versioning. It has a hardcoded +# version in watch.c which is emitted when calling watch -v GARNAME = watch GARVERSION = 0.2.0 CATEGORIES = utils @@ -14,11 +19,12 @@ # Usually we would use $(SF_MIRROR), but the procps folks didn't upload # procps the usual way -SF_PROJ = procps -SF_PROJ_VER = 3.2.8 -MASTER_SITES = http://$(SF_PROJ).sourceforge.net/ -DISTFILES = $(SF_PROJ)-$(SF_PROJ_VER).tar.gz -DISTNAME = $(SF_PROJ)-$(SF_PROJ_VER) +SF_PROJ = procps +SF_PROJ_VER = 3.2.8 +MASTER_SITES = http://$(SF_PROJ).sourceforge.net/ +DISTFILES = $(SF_PROJ)-$(SF_PROJ_VER).tar.gz +DISTNAME = $(SF_PROJ)-$(SF_PROJ_VER) +UFILES_REGEX = $(SF_PROJ)-(\d+(?:\.\d+)*).tar.gz REQUIRED_PKGS = CSWncurses @@ -35,7 +41,7 @@ CONFIGURE_ARGS = $(DIRPATHS) -EXTRA_INC = /opt/csw/include/ncursesw +EXTRA_INC = /opt/csw/include/ncurses include gar/category.mk @@ -62,17 +68,15 @@ CFLAGS := $(CFLAGS) -DHAVE_INTTYPES_H -DHAVE_LOCALE_H -DHAVE_LOCALECONV CFLAGS := $(CFLAGS) -DHAVE_LOCALECONV -DHAVE_UINTMAX_T -DHAVE_VA_COPY -# CURSES and BUILD_ARGS w/ ALL_?FLAGS req. for $(WORKSRC)/Makefile -build-custom: CURSES=-lncursesw +# BUILD_ARGS with ALL_?FLAGS req. for $(WORKSRC)/Makefile build-custom: BUILD_ARGS:=ALL_CFLAGS="$(CFLAGS)" ALL_LDFLAGS="$(LDFLAGS)" build-custom: $(BUILD_ENV) gmake -C $(WORKSRC) $(BUILD_ARGS) snprintf.o $(BUILD_ENV) gmake -C $(WORKSRC) $(BUILD_ARGS) getopt.o $(BUILD_ENV) gmake -C $(WORKSRC) $(BUILD_ARGS) getopt1.o $(BUILD_ENV) gmake -C $(WORKSRC) \ - ALL_CFLAGS="$(CFLAGS) snprintf.o getopt.o getopt1.o" \ - ALL_LDFLAGS="$(LDFLAGS)" \ - CURSES=$(CURSES) watch + ALL_CFLAGS="$(CPPFLAGS) $(CFLAGS) snprintf.o getopt.o getopt1.o" \ + ALL_LDFLAGS="$(LDFLAGS)" watch @$(MAKECOOKIE) install-custom: DOCDEST=$(DESTDIR)$(docdir)/$(GARNAME) @@ -83,4 +87,7 @@ ginstall -m 755 $(WORKSRC)/watch $(DESTDIR)$(bindir) cp $(WORKSRC)/watch.1 $(DESTDIR)$(mandir)/man1 cp $(FILEDIR)/changelog.CSW $(DOCDEST) + printf "This watch version (%s) was taken from procps %s, %s\n" \ + $(GARVERSION) $(SF_PROJ_VER) $(subst sourceforge,sf,$(MASTER_SITES)) \ + >> $(DOCDEST)/README.CSW @$(MAKECOOKIE) Modified: csw/mgar/pkg/watch/trunk/files/changelog.CSW =================================================================== --- csw/mgar/pkg/watch/trunk/files/changelog.CSW 2010-01-06 17:14:06 UTC (rev 7892) +++ csw/mgar/pkg/watch/trunk/files/changelog.CSW 2010-01-06 20:30:08 UTC (rev 7893) @@ -1,3 +1,10 @@ +watch (0.2.0,REV=2010.01.06) + + * Updated upstream version. Fixes 8-bit character handling when using + the -d option. (Closes: #3952). + + -- Sebastian Kayser Wed, 6 Jan 2010 19:28:33 +0100 + watch (0.2.0,REV=2009.05.10) * Recompiled with adjusted GAR build system (Closes: #3603). This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From skayser at users.sourceforge.net Wed Jan 6 23:54:33 2010 From: skayser at users.sourceforge.net (skayser at users.sourceforge.net) Date: Wed, 06 Jan 2010 22:54:33 +0000 Subject: [csw-devel] SF.net SVN: gar:[7895] csw/mgar/pkg/mbuffer/trunk/Makefile Message-ID: Revision: 7895 http://gar.svn.sourceforge.net/gar/?rev=7895&view=rev Author: skayser Date: 2010-01-06 22:54:18 +0000 (Wed, 06 Jan 2010) Log Message: ----------- mbuffer: IPv6 resolution on build boxes fixed, test3 now functional Modified Paths: -------------- csw/mgar/pkg/mbuffer/trunk/Makefile Modified: csw/mgar/pkg/mbuffer/trunk/Makefile =================================================================== --- csw/mgar/pkg/mbuffer/trunk/Makefile 2010-01-06 21:01:51 UTC (rev 7894) +++ csw/mgar/pkg/mbuffer/trunk/Makefile 2010-01-06 22:54:18 UTC (rev 7895) @@ -35,10 +35,7 @@ CONFIGURE_ARGS = $(DIRPATHS) -# While we have IPv6 loopback interfaces on the buildfarm now, build10x -# is missing an localhost IPv6 address entry for /etc/hosts. test3 requires -# one, thus we omit it for the time being. -TEST_TARGET = -o test3 check +TEST_TARGET = check # Required for updated libmhash (mbuffer builds against it) which allows for # flexible const/non-const definitions. There should be a more intelligent This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Thu Jan 7 00:47:07 2010 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Wed, 06 Jan 2010 23:47:07 +0000 Subject: [csw-devel] SF.net SVN: gar:[7896] csw/mgar/pkg/git/trunk/Makefile Message-ID: Revision: 7896 http://gar.svn.sourceforge.net/gar/?rev=7896&view=rev Author: bdwalton Date: 2010-01-06 23:47:07 +0000 (Wed, 06 Jan 2010) Log Message: ----------- git: add/set (new) VENDOR_URL variable; disable scripts until next version bump Modified Paths: -------------- csw/mgar/pkg/git/trunk/Makefile Modified: csw/mgar/pkg/git/trunk/Makefile =================================================================== --- csw/mgar/pkg/git/trunk/Makefile 2010-01-06 22:54:18 UTC (rev 7895) +++ csw/mgar/pkg/git/trunk/Makefile 2010-01-06 23:47:07 UTC (rev 7896) @@ -3,8 +3,10 @@ # PATCHLEVEL = rc2 CATEGORIES = devel +VENDOR_URL = http://git-scm.org/ + # disable tests until next version bump (at the top so it stands out) -TEST_SCRIPTS = +# TEST_SCRIPTS = PACKAGES = CSWgit CSWgitk CSWgitgui CSWgitsvn CSWgitcvs CSWgitemacs CSWgitdoc PACKAGES += CSWgitcompletion CSWgitdevel This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Thu Jan 7 00:52:21 2010 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Wed, 06 Jan 2010 23:52:21 +0000 Subject: [csw-devel] SF.net SVN: gar:[7897] csw/mgar/gar/v2/gar.pkg.mk Message-ID: Revision: 7897 http://gar.svn.sourceforge.net/gar/?rev=7897&view=rev Author: bdwalton Date: 2010-01-06 23:52:20 +0000 (Wed, 06 Jan 2010) Log Message: ----------- gar: Enhance values for SPKG_SOURCEURL (for VENDOR in pkginfo) SPKG_SOURCEURL is now set to the first of VENDOR_URL, MASTER_SITES or GIT_REPOS. It was originally only MASTER_SITES, but this doesn't work when GIT_REPOS but no MASTER_SITES are set. GIT_REPOS on it's own isn't a good stand-in as it's a less 'pretty' url. Allowing an explicit VENDOR_URL gives control to the maintainer, retains backward compatibility by default and extends the old behaviour with a new fallback possibility. Modified Paths: -------------- csw/mgar/gar/v2/gar.pkg.mk Modified: csw/mgar/gar/v2/gar.pkg.mk =================================================================== --- csw/mgar/gar/v2/gar.pkg.mk 2010-01-06 23:47:07 UTC (rev 7896) +++ csw/mgar/gar/v2/gar.pkg.mk 2010-01-06 23:52:20 UTC (rev 7897) @@ -141,7 +141,7 @@ SPKG_DESC ?= $(DESCRIPTION) SPKG_VERSION ?= $(GARVERSION) SPKG_CATEGORY ?= application -SPKG_SOURCEURL ?= $(firstword $(MASTER_SITES)) +SPKG_SOURCEURL ?= $(firstword $(VENDOR_URL) $(MASTER_SITES) $(GIT_REPOS)) SPKG_VENDOR ?= $(SPKG_SOURCEURL) packaged for CSW by $(SPKG_PACKAGER) SPKG_PSTAMP ?= $(LOGNAME)@$(shell hostname)-$(call _REVISION)-$(shell date '+%Y%m%d%H%M%S') SPKG_BASEDIR ?= $(prefix) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Thu Jan 7 08:48:54 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 07 Jan 2010 07:48:54 +0000 Subject: [csw-devel] SF.net SVN: gar:[7898] csw/mgar/pkg Message-ID: Revision: 7898 http://gar.svn.sourceforge.net/gar/?rev=7898&view=rev Author: dmichelsen Date: 2010-01-07 07:48:54 +0000 (Thu, 07 Jan 2010) Log Message: ----------- libcddb: Initial commit, some tests failing Added Paths: ----------- csw/mgar/pkg/libcddb/ csw/mgar/pkg/libcddb/branches/ csw/mgar/pkg/libcddb/tags/ csw/mgar/pkg/libcddb/trunk/ csw/mgar/pkg/libcddb/trunk/Makefile csw/mgar/pkg/libcddb/trunk/checksums csw/mgar/pkg/libcddb/trunk/files/ Property changes on: csw/mgar/pkg/libcddb/trunk ___________________________________________________________________ Added: svn:ignore + cookies download work Added: svn:externals + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 Added: csw/mgar/pkg/libcddb/trunk/Makefile =================================================================== --- csw/mgar/pkg/libcddb/trunk/Makefile (rev 0) +++ csw/mgar/pkg/libcddb/trunk/Makefile 2010-01-07 07:48:54 UTC (rev 7898) @@ -0,0 +1,37 @@ +GARNAME = libcddb +GARVERSION = 1.3.2 +CATEGORIES = lib + +DESCRIPTION = A C library to access data on a CDDB server +define BLURB + Libcddb supports both the custom CDDB protocol and tunnelling the query + and read operations over plain HTTP. It is also possible to use an HTTP + proxy server. If you want to speed things up, you can make use of the + built-in caching facility provided by the library. +endef + +MASTER_SITES = $(SF_MIRROR) +DISTFILES = $(GARNAME)-$(GARVERSION).tar.bz2 + +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.bz2 + +PACKAGES = CSWlibcddb CSWlibcddbutil + +SPKG_DESC_CSWlibcddb = A C library to access data on a CDDB server +SPKG_DESC_CSWlibcddbutil = A CDDB query tool + +REQUIRED_PKGS_CSWlibcddbutil = CSWlibcddb CSWlibcdio + +BUILD64 = 1 +CONFIGURE_ARGS = $(DIRPATHS) + +http_proxy='$(http_proxy)' +EXTRA_TEST_EXPORTS = http_proxy + +export http_proxy +TEST_TARGET = check + +PKGFILES_CSWlibcddbutil = $(bindir)/.* + +include gar/category.mk Added: csw/mgar/pkg/libcddb/trunk/checksums =================================================================== --- csw/mgar/pkg/libcddb/trunk/checksums (rev 0) +++ csw/mgar/pkg/libcddb/trunk/checksums 2010-01-07 07:48:54 UTC (rev 7898) @@ -0,0 +1 @@ +8bb4a6f542197e8e9648ae597cd6bc8a libcddb-1.3.2.tar.bz2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From janholzh at users.sourceforge.net Thu Jan 7 13:42:37 2010 From: janholzh at users.sourceforge.net (janholzh at users.sourceforge.net) Date: Thu, 07 Jan 2010 12:42:37 +0000 Subject: [csw-devel] SF.net SVN: gar:[7899] csw/mgar/pkg/transmission/trunk Message-ID: Revision: 7899 http://gar.svn.sourceforge.net/gar/?rev=7899&view=rev Author: janholzh Date: 2010-01-07 12:42:37 +0000 (Thu, 07 Jan 2010) Log Message: ----------- Updated to 1.76 and splitt of GTK2 part Modified Paths: -------------- csw/mgar/pkg/transmission/trunk/Makefile csw/mgar/pkg/transmission/trunk/checksums Added Paths: ----------- csw/mgar/pkg/transmission/trunk/files/icons-makefile.patch csw/mgar/pkg/transmission/trunk/files/linker-include.patch Modified: csw/mgar/pkg/transmission/trunk/Makefile =================================================================== --- csw/mgar/pkg/transmission/trunk/Makefile 2010-01-07 07:48:54 UTC (rev 7898) +++ csw/mgar/pkg/transmission/trunk/Makefile 2010-01-07 12:42:37 UTC (rev 7899) @@ -1,23 +1,68 @@ GARNAME = transmission -GARVERSION = 1.60 +GARVERSION = 1.76 CATEGORIES = net DESCRIPTION = Fast, easy, and free multi-platform BitTorrent client define BLURB endef - MASTER_SITES = http://mirrors.m0k.org/transmission/files/ DISTFILES = $(GARNAME)-$(GARVERSION).tar.bz2 -DISTFILES += $(call admfiles,CSWtransmission,) +PATCHFILES = icons-makefile.patch +PATCHFILES += linker-include.patch # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = -(\d+(?:\.\d+)*).tar.bz2 -GARCOMPILER = GNU -EXTRA_CFLAGS = -DNO_SYS_QUEUE_H +PACKAGES = CSWtransmisson +PACKAGES += CSWtransmissongtk2 +SPKG_DESC_CSWtransmisson = Fast, easy, and free multi-platform BitTorrent client +SPKG_DESC_CSWtransmissongtk2 = Fast, easy, and free multi-platform BitTorrent client , gtk2 Interface -CONFIGURE_ARGS = $(DIRPATHS) +REQUIRED_PKGS_CSWtransmissongtk2 = CSWcurlrt +REQUIRED_PKGS_CSWtransmissongtk2 += CSWdbusglib +REQUIRED_PKGS_CSWtransmissongtk2 += CSWfconfig +REQUIRED_PKGS_CSWtransmissongtk2 += CSWftype2 +REQUIRED_PKGS_CSWtransmissongtk2 += CSWggettextrt +REQUIRED_PKGS_CSWtransmissongtk2 += CSWglib2 +REQUIRED_PKGS_CSWtransmissongtk2 += CSWgtk2 +REQUIRED_PKGS_CSWtransmissongtk2 += CSWlibatk +REQUIRED_PKGS_CSWtransmissongtk2 += CSWlibcairo +REQUIRED_PKGS_CSWtransmissongtk2 += CSWlibdbus +REQUIRED_PKGS_CSWtransmissongtk2 += CSWlibevent +REQUIRED_PKGS_CSWtransmissongtk2 += CSWlibxext +REQUIRED_PKGS_CSWtransmissongtk2 += CSWosslrt +REQUIRED_PKGS_CSWtransmissongtk2 += CSWpango +REQUIRED_PKGS_CSWtransmissongtk2 += CSWzlib +REQUIRED_PKGS_CSWtransmissongtk2 += CSWdbus +REQUIRED_PKGS_CSWtransmisson = CSWcurlrt +REQUIRED_PKGS_CSWtransmisson += CSWlibevent +REQUIRED_PKGS_CSWtransmisson += CSWggettextrt +REQUIRED_PKGS_CSWtransmisson += CSWosslrt +REQUIRED_PKGS_CSWtransmisson += CSWzlib + + + +REQUIRED_PKGS_CSWtransmissongtk2 += CSWtransmisson + +PKGFILES_CSWtransmisson = /opt/csw/bin/transmissioncli +PKGFILES_CSWtransmisson += /opt/csw/bin/transmission-.* +PKGFILES_CSWtransmisson += /opt/csw/share/locale/.* +PKGFILES_CSWtransmisson += /opt/csw/share/man/.* +PKGFILES_CSWtransmisson += /opt/csw/share/transmission/.* + +CATALOGNAME_CSWtransmisson = transmisson +CATALOGNAME_CSWtransmissongtk2 = transmisson_gtk2 + + +EXTRA_CFLAGS = -DNO_SYS_QUEUE_H -lresolv -mt + +EXTRA_INC = /opt/csw/X11/include +EXTRA_LIB = /opt/csw/X11/lib +EXTRA_PKG_CONFIG_DIRS = $(prefix)/X11/lib + +CONFIGURE_ARGS = $(DIRPATHS) --enable-gtk + TEST_TARGET = check include gar/category.mk Modified: csw/mgar/pkg/transmission/trunk/checksums =================================================================== --- csw/mgar/pkg/transmission/trunk/checksums 2010-01-07 07:48:54 UTC (rev 7898) +++ csw/mgar/pkg/transmission/trunk/checksums 2010-01-07 12:42:37 UTC (rev 7899) @@ -1,2 +1,3 @@ -0b6395df62da35201f8663ceea204f51 download/CSWtransmission.gspec -8b30cf189240f0c50ccd11c618a6906a download/transmission-1.60.tar.bz2 +cbdb5cfaf24b68727042c3828b252534 icons-makefile.patch +7124b4836210a10fe649bba75c706cc9 linker-include.patch +ac44511ba4c203998be3079626126ede transmission-1.76.tar.bz2 Added: csw/mgar/pkg/transmission/trunk/files/icons-makefile.patch =================================================================== --- csw/mgar/pkg/transmission/trunk/files/icons-makefile.patch (rev 0) +++ csw/mgar/pkg/transmission/trunk/files/icons-makefile.patch 2010-01-07 12:42:37 UTC (rev 7899) @@ -0,0 +1,39 @@ +From 450c6c8c49e7992fbca39d4cf5f3920b62540e75 Mon Sep 17 00:00:00 2001 +From: Jan Holzhueter +Date: Wed, 6 Jan 2010 14:26:25 +0100 +Subject: [PATCH] describe your change + +--- + gtk/icons/Makefile.in | 16 ++++++++-------- + 1 files changed, 8 insertions(+), 8 deletions(-) + +diff --git a/gtk/icons/Makefile.in b/gtk/icons/Makefile.in +index 879e4e3..3c7c529 100644 +--- a/gtk/icons/Makefile.in ++++ b/gtk/icons/Makefile.in +@@ -474,14 +474,14 @@ install-icons: + mkdir -p $(DESTDIR)$(datadir)/icons/$$THEME/$$SIZE/$$CONTEXT; \ + $(INSTALL_DATA) $(srcdir)/$$icon $(DESTDIR)$(datadir)/icons/$$THEME/$$SIZE/$$CONTEXT/$$ICONFILE; \ + done; \ +- for icon in $(private_icons); do \ +- THEME=`echo $$icon | cut -d_ -f1`; \ +- CONTEXT=`echo $$icon | cut -d_ -f2`; \ +- SIZE=`echo $$icon | cut -d_ -f3`; \ +- ICONFILE=`echo $$icon | cut -d_ -f4`; \ +- mkdir -p $(DESTDIR)$(pkgdatadir)/icons/$$THEME/$$SIZE/$$CONTEXT; \ +- $(INSTALL_DATA) $(srcdir)/$$icon $(DESTDIR)$(pkgdatadir)/icons/$$THEME/$$SIZE/$$CONTEXT/$$ICONFILE; \ +- done ++# for icon in $(private_icons); do \ ++# THEME=`echo $$icon | cut -d_ -f1`; \ ++# CONTEXT=`echo $$icon | cut -d_ -f2`; \ ++# SIZE=`echo $$icon | cut -d_ -f3`; \ ++# ICONFILE=`echo $$icon | cut -d_ -f4`; \ ++# mkdir -p $(DESTDIR)$(pkgdatadir)/icons/$$THEME/$$SIZE/$$CONTEXT; \ ++# $(INSTALL_DATA) $(srcdir)/$$icon $(DESTDIR)$(pkgdatadir)/icons/$$THEME/$$SIZE/$$CONTEXT/$$ICONFILE; \ ++# done + + uninstall-icons: + -for icon in $(public_icons); do \ +-- +1.6.6 + Added: csw/mgar/pkg/transmission/trunk/files/linker-include.patch =================================================================== --- csw/mgar/pkg/transmission/trunk/files/linker-include.patch (rev 0) +++ csw/mgar/pkg/transmission/trunk/files/linker-include.patch 2010-01-07 12:42:37 UTC (rev 7899) @@ -0,0 +1,25 @@ +From 84469352eccf90852d7d58241516619ad1545272 Mon Sep 17 00:00:00 2001 +From: Jan Holzhueter +Date: Wed, 6 Jan 2010 15:28:43 +0100 +Subject: [PATCH] describe your change + +--- + gtk/Makefile.in | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/gtk/Makefile.in b/gtk/Makefile.in +index 81b4e46..0c145b8 100644 +--- a/gtk/Makefile.in ++++ b/gtk/Makefile.in +@@ -88,7 +88,7 @@ am__v_lt_ = $(am__v_lt_$(AM_DEFAULT_VERBOSITY)) + am__v_lt_0 = --silent + transmission_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ +- $(transmission_LDFLAGS) $(LDFLAGS) -o $@ ++ $(transmission_LDFLAGS) $(LDFLAGS) /usr/openwin/lib/libXext.so -o $@ + DEFAULT_INCLUDES = -I. at am__isrc@ + depcomp = $(SHELL) $(top_srcdir)/depcomp + am__depfiles_maybe = depfiles +-- +1.6.6 + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From janholzh at users.sourceforge.net Thu Jan 7 14:42:05 2010 From: janholzh at users.sourceforge.net (janholzh at users.sourceforge.net) Date: Thu, 07 Jan 2010 13:42:05 +0000 Subject: [csw-devel] SF.net SVN: gar:[7900] csw/mgar/pkg/transmission/trunk/files/ CSWtransmission.gspec Message-ID: Revision: 7900 http://gar.svn.sourceforge.net/gar/?rev=7900&view=rev Author: janholzh Date: 2010-01-07 13:42:05 +0000 (Thu, 07 Jan 2010) Log Message: ----------- removed gspec file Removed Paths: ------------- csw/mgar/pkg/transmission/trunk/files/CSWtransmission.gspec Deleted: csw/mgar/pkg/transmission/trunk/files/CSWtransmission.gspec =================================================================== --- csw/mgar/pkg/transmission/trunk/files/CSWtransmission.gspec 2010-01-07 12:42:37 UTC (rev 7899) +++ csw/mgar/pkg/transmission/trunk/files/CSWtransmission.gspec 2010-01-07 13:42:05 UTC (rev 7900) @@ -1,4 +0,0 @@ -%var bitname transmission -%var pkgname CSWtransmission -%include url file://%{PKGLIB}/csw_dyndepend.gspec -%copyright url file://%{WORKSRC}/LICENSE This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Thu Jan 7 16:02:31 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 07 Jan 2010 15:02:31 +0000 Subject: [csw-devel] SF.net SVN: gar:[7901] csw/mgar/pkg Message-ID: Revision: 7901 http://gar.svn.sourceforge.net/gar/?rev=7901&view=rev Author: dmichelsen Date: 2010-01-07 15:02:30 +0000 (Thu, 07 Jan 2010) Log Message: ----------- remake: Initial commit Added Paths: ----------- csw/mgar/pkg/remake/ csw/mgar/pkg/remake/branches/ csw/mgar/pkg/remake/tags/ csw/mgar/pkg/remake/trunk/ csw/mgar/pkg/remake/trunk/Makefile csw/mgar/pkg/remake/trunk/checksums csw/mgar/pkg/remake/trunk/files/ Property changes on: csw/mgar/pkg/remake/trunk ___________________________________________________________________ Added: svn:ignore + cookies download work Added: svn:externals + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 Added: csw/mgar/pkg/remake/trunk/Makefile =================================================================== --- csw/mgar/pkg/remake/trunk/Makefile (rev 0) +++ csw/mgar/pkg/remake/trunk/Makefile 2010-01-07 15:02:30 UTC (rev 7901) @@ -0,0 +1,22 @@ +GARNAME = remake +GARVERSION = 3.81_dbg_0.2 +CATEGORIES = devel + +DESCRIPTION = GNU Make debugger +define BLURB + remake is a patched and modernized version of GNU make utility that adds + improved error reporting, the ability to trace execution in a comprehensible + way, and a debugger. +endef + +MASTER_SITES = http://cloud.github.com/downloads/rocky/remake/ +DISTFILES = $(GARNAME)-$(GARVERSION).tar.bz2 + +SPKG_SOURCEURL = http://bashdb.sourceforge.net/remake/ + +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.bz2 + +CONFIGURE_ARGS = $(DIRPATHS) + +include gar/category.mk This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Thu Jan 7 16:54:33 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 07 Jan 2010 15:54:33 +0000 Subject: [csw-devel] SF.net SVN: gar:[7902] csw/mgar/pkg/libsndfile/tags/libsndfile-1.0.20, REV= 2009.11.04/ Message-ID: Revision: 7902 http://gar.svn.sourceforge.net/gar/?rev=7902&view=rev Author: dmichelsen Date: 2010-01-07 15:54:33 +0000 (Thu, 07 Jan 2010) Log Message: ----------- libsndfile: Tag libsndfile-1.0.20,REV=2009.11.04 Added Paths: ----------- csw/mgar/pkg/libsndfile/tags/libsndfile-1.0.20,REV=2009.11.04/ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Thu Jan 7 16:55:05 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 07 Jan 2010 15:55:05 +0000 Subject: [csw-devel] SF.net SVN: gar:[7903] csw/mgar/pkg Message-ID: Revision: 7903 http://gar.svn.sourceforge.net/gar/?rev=7903&view=rev Author: dmichelsen Date: 2010-01-07 15:55:05 +0000 (Thu, 07 Jan 2010) Log Message: ----------- twolame: Initial commit, doesnt build due to missing C99 standard of Solaris 8/9 again Added Paths: ----------- csw/mgar/pkg/twolame/ csw/mgar/pkg/twolame/branches/ csw/mgar/pkg/twolame/tags/ csw/mgar/pkg/twolame/trunk/ csw/mgar/pkg/twolame/trunk/Makefile csw/mgar/pkg/twolame/trunk/checksums csw/mgar/pkg/twolame/trunk/files/ Property changes on: csw/mgar/pkg/twolame/trunk ___________________________________________________________________ Added: svn:ignore + cookies download work Added: svn:externals + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 Added: csw/mgar/pkg/twolame/trunk/Makefile =================================================================== --- csw/mgar/pkg/twolame/trunk/Makefile (rev 0) +++ csw/mgar/pkg/twolame/trunk/Makefile 2010-01-07 15:55:05 UTC (rev 7903) @@ -0,0 +1,21 @@ +GARNAME = twolame +GARVERSION = 0.3.12 +CATEGORIES = utils + +DESCRIPTION = An optimised MPEG Audio Layer 2 (MP2) encoder based on tooLAME +define BLURB +endef + +SF_PROJ = twolame +MASTER_SITES = $(SF_MIRRORS) +DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz + +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + +BUILD64 = 1 +CONFIGURE_ARGS = $(DIRPATHS) + +MERGE_DIRS_isa-extra = $(libdir) + +include gar/category.mk Added: csw/mgar/pkg/twolame/trunk/checksums =================================================================== --- csw/mgar/pkg/twolame/trunk/checksums (rev 0) +++ csw/mgar/pkg/twolame/trunk/checksums 2010-01-07 15:55:05 UTC (rev 7903) @@ -0,0 +1 @@ +d38c3ead5ac49b7425c1a9ef91126a35 twolame-0.3.12.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Thu Jan 7 17:07:27 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 07 Jan 2010 16:07:27 +0000 Subject: [csw-devel] SF.net SVN: gar:[7904] csw/mgar/pkg/libsndfile/trunk Message-ID: Revision: 7904 http://gar.svn.sourceforge.net/gar/?rev=7904&view=rev Author: dmichelsen Date: 2010-01-07 16:07:24 +0000 (Thu, 07 Jan 2010) Log Message: ----------- libsndfile: Update to 1.0.21 Modified Paths: -------------- csw/mgar/pkg/libsndfile/trunk/Makefile csw/mgar/pkg/libsndfile/trunk/checksums Modified: csw/mgar/pkg/libsndfile/trunk/Makefile =================================================================== --- csw/mgar/pkg/libsndfile/trunk/Makefile 2010-01-07 15:55:05 UTC (rev 7903) +++ csw/mgar/pkg/libsndfile/trunk/Makefile 2010-01-07 16:07:24 UTC (rev 7904) @@ -3,7 +3,7 @@ # $Id$ GARNAME = libsndfile -GARVERSION = 1.0.20 +GARVERSION = 1.0.21 CATEGORIES = lib @@ -30,7 +30,7 @@ writing new sound file formats. endef -MASTER_SITES = http://www.mega-nerd.com/libsndfile/ +MASTER_SITES = http://www.mega-nerd.com/libsndfile/files/ DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz PATCHFILES = 0001-Add-lrintf-workaround-to-regtest.patch Modified: csw/mgar/pkg/libsndfile/trunk/checksums =================================================================== --- csw/mgar/pkg/libsndfile/trunk/checksums 2010-01-07 15:55:05 UTC (rev 7903) +++ csw/mgar/pkg/libsndfile/trunk/checksums 2010-01-07 16:07:24 UTC (rev 7904) @@ -2,4 +2,4 @@ ab0c6ea20d4bda60f6f6dd4fa4c26871 0002-Add-workaround-for-missing-libm-function-lrint-and-l.patch 599bd5f64872bbddf993ce0815d28417 0003-Workaround-mising-stdint.h-and-Sun-Studio-shortcomin.patch 732c648739e94cb5fd2e70d983390318 0004-Disable-stop-on-error-until-cpp_test-refcount-error-.patch -e0553e12c7a467af44693e95e2eac668 libsndfile-1.0.20.tar.gz +880a40ec636ab2185b97f8927299b292 libsndfile-1.0.21.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From chninkel at users.sourceforge.net Thu Jan 7 17:10:39 2010 From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net) Date: Thu, 07 Jan 2010 16:10:39 +0000 Subject: [csw-devel] SF.net SVN: gar:[7905] csw/mgar/pkg/bash/trunk Message-ID: Revision: 7905 http://gar.svn.sourceforge.net/gar/?rev=7905&view=rev Author: chninkel Date: 2010-01-07 16:10:39 +0000 (Thu, 07 Jan 2010) Log Message: ----------- bash: updated vsnprintf.patch following upstream advice Modified Paths: -------------- csw/mgar/pkg/bash/trunk/Makefile csw/mgar/pkg/bash/trunk/checksums csw/mgar/pkg/bash/trunk/files/changelog.CSW csw/mgar/pkg/bash/trunk/files/vsnprintf.patch Modified: csw/mgar/pkg/bash/trunk/Makefile =================================================================== --- csw/mgar/pkg/bash/trunk/Makefile 2010-01-07 16:07:24 UTC (rev 7904) +++ csw/mgar/pkg/bash/trunk/Makefile 2010-01-07 16:10:39 UTC (rev 7905) @@ -67,7 +67,7 @@ # opencsw bash use /etc/bash.bashrc and /etc/bash.bash_logout files PATCHFILES += use_system_bashrc_and_logout.patch -# Temporary fix for vsnprintf definition clash +# Temporary fix for vsnprintf definition PATCHFILES += vsnprintf.patch ##### Build and installation information ##### Modified: csw/mgar/pkg/bash/trunk/checksums =================================================================== --- csw/mgar/pkg/bash/trunk/checksums 2010-01-07 16:07:24 UTC (rev 7904) +++ csw/mgar/pkg/bash/trunk/checksums 2010-01-07 16:10:39 UTC (rev 7905) @@ -1,6 +1,6 @@ f93b41b44ce6b023df65b72f00386ac5 CSWbash.prototype 9800d8724815fd84994d9be65ab5e7b8 bash-4.1.tar.gz -8b104a3cddca41849186af53c8602eef changelog.CSW +c2f23fbca9f119574b933d4f335a838d changelog.CSW 60956e6be20f69dafbb06fcc83bab88e shells 29607316cff22f7427322d8f190cbadf use_system_bashrc_and_logout.patch -f2876ca41b05f236621abddc713af3e7 vsnprintf.patch +44859f2b196b79f037134d32c4ee79ea vsnprintf.patch Modified: csw/mgar/pkg/bash/trunk/files/changelog.CSW =================================================================== --- csw/mgar/pkg/bash/trunk/files/changelog.CSW 2010-01-07 16:07:24 UTC (rev 7904) +++ csw/mgar/pkg/bash/trunk/files/changelog.CSW 2010-01-07 16:10:39 UTC (rev 7905) @@ -1,6 +1,7 @@ -bash (4.1,REV=2010.01.02) unstable +bash (4.1,REV=2010.01.07) unstable * New upstream release. + * Added patch vsnprintf.patch to fix bash vsnprintf declaration. -- Yann Rouillard Sat, 02 Jan 2010 14:12:18 +0100 Modified: csw/mgar/pkg/bash/trunk/files/vsnprintf.patch =================================================================== --- csw/mgar/pkg/bash/trunk/files/vsnprintf.patch 2010-01-07 16:07:24 UTC (rev 7904) +++ csw/mgar/pkg/bash/trunk/files/vsnprintf.patch 2010-01-07 16:10:39 UTC (rev 7905) @@ -1,47 +1,15 @@ -diff --speed-large-files -Nur builtins/printf.def builtins/printf.def ---- builtins/printf.def 2010-01-06 15:15:00.498275417 +0100 -+++ builtins/printf.def 2010-01-06 15:13:39.646642489 +0100 -@@ -172,7 +172,9 @@ - #endif - - #if !HAVE_VSNPRINTF --extern int vsnprintf __P((char *, size_t, const char *, ...)) __attribute__((__format__ (printf, 3, 4))); -+extern int bash_vsnprintf __P((char *, size_t, const char *, ...)) __attribute__((__format__ (printf, 3, 4))); -+#else -+# define bash_vsnprintf vsnprintf - #endif - - static void printf_erange __P((char *)); -@@ -885,7 +887,7 @@ - int blen; - - SH_VA_START (args, format); -- blen = vsnprintf (vbuf + vblen, vbsize - vblen, format, args); -+ blen = bash_vsnprintf (vbuf + vblen, vbsize - vblen, format, args); - va_end (args); - - nlen = vblen + blen + 1; -@@ -894,7 +896,7 @@ - vbsize = ((nlen + 63) >> 6) << 6; - vbuf = (char *)xrealloc (vbuf, vbsize); - SH_VA_START (args, format); -- blen = vsnprintf (vbuf + vblen, vbsize - vblen, format, args); -+ blen = bash_vsnprintf (vbuf + vblen, vbsize - vblen, format, args); - va_end (args); - } - -diff --speed-large-files -Nur lib/sh/snprintf.c lib/sh/snprintf.c ---- lib/sh/snprintf.c 2010-01-06 15:14:47.740952207 +0100 -+++ lib/sh/snprintf.c 2010-01-06 15:14:25.727971179 +0100 -@@ -1655,9 +1655,9 @@ - - int - #if defined (__STDC__) --vsnprintf(char *string, size_t length, const char *format, va_list args) -+bash_vsnprintf(char *string, size_t length, const char *format, va_list args) - #else --vsnprintf(string, length, format, args) -+bash_vsnprintf(string, length, format, args) - char *string; - size_t length; - const char *format; +*** ../bash-4.1/builtins/printf.def 2009-11-20 15:31:23.000000000 -0500 +--- builtins/printf.def 2010-01-07 08:50:06.000000000 -0500 +*************** +*** 173,177 **** + + #if !HAVE_VSNPRINTF +! extern int vsnprintf __P((char *, size_t, const char *, ...)) __attribute__((__format__ (printf, 3, 4))); + #endif + +--- 173,177 ---- + + #if !HAVE_VSNPRINTF +! extern int vsnprintf __P((char *, size_t, const char *, va_list)) __attribute__((__format__ (printf, 3, 0))); + #endif + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From janholzh at users.sourceforge.net Thu Jan 7 17:25:20 2010 From: janholzh at users.sourceforge.net (janholzh at users.sourceforge.net) Date: Thu, 07 Jan 2010 16:25:20 +0000 Subject: [csw-devel] SF.net SVN: gar:[7906] csw/mgar/pkg/transmission/trunk/Makefile Message-ID: Revision: 7906 http://gar.svn.sourceforge.net/gar/?rev=7906&view=rev Author: janholzh Date: 2010-01-07 16:25:20 +0000 (Thu, 07 Jan 2010) Log Message: ----------- correct spelling Modified Paths: -------------- csw/mgar/pkg/transmission/trunk/Makefile Modified: csw/mgar/pkg/transmission/trunk/Makefile =================================================================== --- csw/mgar/pkg/transmission/trunk/Makefile 2010-01-07 16:10:39 UTC (rev 7905) +++ csw/mgar/pkg/transmission/trunk/Makefile 2010-01-07 16:25:20 UTC (rev 7906) @@ -1,4 +1,4 @@ -GARNAME = transmission +GARNAME = transmission GARVERSION = 1.76 CATEGORIES = net @@ -13,46 +13,46 @@ # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = -(\d+(?:\.\d+)*).tar.bz2 -PACKAGES = CSWtransmisson -PACKAGES += CSWtransmissongtk2 -SPKG_DESC_CSWtransmisson = Fast, easy, and free multi-platform BitTorrent client -SPKG_DESC_CSWtransmissongtk2 = Fast, easy, and free multi-platform BitTorrent client , gtk2 Interface +PACKAGES = CSWtransmission +PACKAGES += CSWtransmissiongtk2 +SPKG_DESC_CSWtransmission = Fast, easy, and free multi-platform BitTorrent client +SPKG_DESC_CSWtransmissiongtk2 = Fast, easy, and free multi-platform BitTorrent client , gtk2 Interface -REQUIRED_PKGS_CSWtransmissongtk2 = CSWcurlrt -REQUIRED_PKGS_CSWtransmissongtk2 += CSWdbusglib -REQUIRED_PKGS_CSWtransmissongtk2 += CSWfconfig -REQUIRED_PKGS_CSWtransmissongtk2 += CSWftype2 -REQUIRED_PKGS_CSWtransmissongtk2 += CSWggettextrt -REQUIRED_PKGS_CSWtransmissongtk2 += CSWglib2 -REQUIRED_PKGS_CSWtransmissongtk2 += CSWgtk2 -REQUIRED_PKGS_CSWtransmissongtk2 += CSWlibatk -REQUIRED_PKGS_CSWtransmissongtk2 += CSWlibcairo -REQUIRED_PKGS_CSWtransmissongtk2 += CSWlibdbus -REQUIRED_PKGS_CSWtransmissongtk2 += CSWlibevent -REQUIRED_PKGS_CSWtransmissongtk2 += CSWlibxext -REQUIRED_PKGS_CSWtransmissongtk2 += CSWosslrt -REQUIRED_PKGS_CSWtransmissongtk2 += CSWpango -REQUIRED_PKGS_CSWtransmissongtk2 += CSWzlib -REQUIRED_PKGS_CSWtransmissongtk2 += CSWdbus +REQUIRED_PKGS_CSWtransmissiongtk2 = CSWcurlrt +REQUIRED_PKGS_CSWtransmissiongtk2 += CSWdbusglib +REQUIRED_PKGS_CSWtransmissiongtk2 += CSWfconfig +REQUIRED_PKGS_CSWtransmissiongtk2 += CSWftype2 +REQUIRED_PKGS_CSWtransmissiongtk2 += CSWggettextrt +REQUIRED_PKGS_CSWtransmissiongtk2 += CSWglib2 +REQUIRED_PKGS_CSWtransmissiongtk2 += CSWgtk2 +REQUIRED_PKGS_CSWtransmissiongtk2 += CSWlibatk +REQUIRED_PKGS_CSWtransmissiongtk2 += CSWlibcairo +REQUIRED_PKGS_CSWtransmissiongtk2 += CSWlibdbus +REQUIRED_PKGS_CSWtransmissiongtk2 += CSWlibevent +REQUIRED_PKGS_CSWtransmissiongtk2 += CSWlibxext +REQUIRED_PKGS_CSWtransmissiongtk2 += CSWosslrt +REQUIRED_PKGS_CSWtransmissiongtk2 += CSWpango +REQUIRED_PKGS_CSWtransmissiongtk2 += CSWzlib +REQUIRED_PKGS_CSWtransmissiongtk2 += CSWdbus -REQUIRED_PKGS_CSWtransmisson = CSWcurlrt -REQUIRED_PKGS_CSWtransmisson += CSWlibevent -REQUIRED_PKGS_CSWtransmisson += CSWggettextrt -REQUIRED_PKGS_CSWtransmisson += CSWosslrt -REQUIRED_PKGS_CSWtransmisson += CSWzlib +REQUIRED_PKGS_CSWtransmission = CSWcurlrt +REQUIRED_PKGS_CSWtransmission += CSWlibevent +REQUIRED_PKGS_CSWtransmission += CSWggettextrt +REQUIRED_PKGS_CSWtransmission += CSWosslrt +REQUIRED_PKGS_CSWtransmission += CSWzlib -REQUIRED_PKGS_CSWtransmissongtk2 += CSWtransmisson +REQUIRED_PKGS_CSWtransmissiongtk2 += CSWtransmission -PKGFILES_CSWtransmisson = /opt/csw/bin/transmissioncli -PKGFILES_CSWtransmisson += /opt/csw/bin/transmission-.* -PKGFILES_CSWtransmisson += /opt/csw/share/locale/.* -PKGFILES_CSWtransmisson += /opt/csw/share/man/.* -PKGFILES_CSWtransmisson += /opt/csw/share/transmission/.* +PKGFILES_CSWtransmission = /opt/csw/bin/transmissioncli +PKGFILES_CSWtransmission += /opt/csw/bin/transmission-.* +PKGFILES_CSWtransmission += /opt/csw/share/locale/.* +PKGFILES_CSWtransmission += /opt/csw/share/man/.* +PKGFILES_CSWtransmission += /opt/csw/share/transmission/.* -CATALOGNAME_CSWtransmisson = transmisson -CATALOGNAME_CSWtransmissongtk2 = transmisson_gtk2 +CATALOGNAME_CSWtransmission = transmission +CATALOGNAME_CSWtransmissiongtk2 = transmission_gtk2 EXTRA_CFLAGS = -DNO_SYS_QUEUE_H -lresolv -mt This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From janholzh at users.sourceforge.net Thu Jan 7 17:36:01 2010 From: janholzh at users.sourceforge.net (janholzh at users.sourceforge.net) Date: Thu, 07 Jan 2010 16:36:01 +0000 Subject: [csw-devel] SF.net SVN: gar:[7907] csw/mgar/pkg/transmission/trunk/Makefile Message-ID: Revision: 7907 http://gar.svn.sourceforge.net/gar/?rev=7907&view=rev Author: janholzh Date: 2010-01-07 16:36:01 +0000 (Thu, 07 Jan 2010) Log Message: ----------- correct error Modified Paths: -------------- csw/mgar/pkg/transmission/trunk/Makefile Modified: csw/mgar/pkg/transmission/trunk/Makefile =================================================================== --- csw/mgar/pkg/transmission/trunk/Makefile 2010-01-07 16:25:20 UTC (rev 7906) +++ csw/mgar/pkg/transmission/trunk/Makefile 2010-01-07 16:36:01 UTC (rev 7907) @@ -1,4 +1,4 @@ -GARNAME = transmission +GARNAME = transmission GARVERSION = 1.76 CATEGORIES = net This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From hson at users.sourceforge.net Thu Jan 7 17:39:38 2010 From: hson at users.sourceforge.net (hson at users.sourceforge.net) Date: Thu, 07 Jan 2010 16:39:38 +0000 Subject: [csw-devel] SF.net SVN: gar:[7908] csw/mgar/pkg/lcms/trunk Message-ID: Revision: 7908 http://gar.svn.sourceforge.net/gar/?rev=7908&view=rev Author: hson Date: 2010-01-07 16:39:38 +0000 (Thu, 07 Jan 2010) Log Message: ----------- Split package in two, lib and developer Make 64-bit targets Update to 1.19 Modified Paths: -------------- csw/mgar/pkg/lcms/trunk/Makefile csw/mgar/pkg/lcms/trunk/checksums Modified: csw/mgar/pkg/lcms/trunk/Makefile =================================================================== --- csw/mgar/pkg/lcms/trunk/Makefile 2010-01-07 16:36:01 UTC (rev 7907) +++ csw/mgar/pkg/lcms/trunk/Makefile 2010-01-07 16:39:38 UTC (rev 7908) @@ -1,6 +1,6 @@ GARNAME = lcms -GARVERSION = 1.18 -GARSUBREV = a +GARVERSION = 1.19 +GARSUBREV = CATEGORIES = lib DESCRIPTION = The little color management system and tools @@ -16,9 +16,20 @@ MASTER_SITES = $(SF_MIRRORS) DISTFILES = $(GARNAME)-$(GARVERSION)$(GARSUBREV).tar.gz +#DISTFILES = $(GARNAME)-$(GARVERSION)$(GARSUBREV).tar.gz -REQUIRED_PKGS += CSWjpeg CSWtiff CSWzlib +PACKAGES = CSWlcms CSWlcmsdevel +CATALOGNAME_CSWlcms = lcms +CATALOGNAME_CSWlcmsdevel = lcms_devel +SPKG_DESC_CSWlcms += The little color management system and tools +SPKG_DESC_CSWlcmsdevel += The little color management system and tools - developer package + +REQUIRED_PKGS_CSWlcms += CSWjpeg CSWtiff CSWzlib +REQUIRED_PKGS_CSWlcmsdevel += CSWlcms + +PKGFILES_CSWlcmsdevel = $(PKGFILES_DEVEL) + SPKG_SOURCEURL = http://www.littlecms.com LICENSE = COPYING @@ -34,8 +45,10 @@ CONFIGURE_ARGS = $(DIRPATHS) +BUILD64 = 1 + TEST_TARGET = check include gar/category.mk -SPKG_REVSTAMP := $(SPKG_REVSTAMP)_rev=$(GARSUBREV) +#SPKG_REVSTAMP := $(SPKG_REVSTAMP)_rev=$(GARSUBREV) Modified: csw/mgar/pkg/lcms/trunk/checksums =================================================================== --- csw/mgar/pkg/lcms/trunk/checksums 2010-01-07 16:36:01 UTC (rev 7907) +++ csw/mgar/pkg/lcms/trunk/checksums 2010-01-07 16:39:38 UTC (rev 7908) @@ -1 +1 @@ -f4abfe1c57ea3f633c2e9d034e74e3e8 download/lcms-1.18a.tar.gz +8af94611baf20d9646c7c2c285859818 lcms-1.19.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From idogan23 at users.sourceforge.net Thu Jan 7 19:33:27 2010 From: idogan23 at users.sourceforge.net (idogan23 at users.sourceforge.net) Date: Thu, 07 Jan 2010 18:33:27 +0000 Subject: [csw-devel] SF.net SVN: gar:[7909] csw/mgar/pkg/nsd/trunk Message-ID: Revision: 7909 http://gar.svn.sourceforge.net/gar/?rev=7909&view=rev Author: idogan23 Date: 2010-01-07 18:33:27 +0000 (Thu, 07 Jan 2010) Log Message: ----------- nsd: bump version to 3.2.4 Modified Paths: -------------- csw/mgar/pkg/nsd/trunk/Makefile csw/mgar/pkg/nsd/trunk/checksums Modified: csw/mgar/pkg/nsd/trunk/Makefile =================================================================== --- csw/mgar/pkg/nsd/trunk/Makefile 2010-01-07 16:39:38 UTC (rev 7908) +++ csw/mgar/pkg/nsd/trunk/Makefile 2010-01-07 18:33:27 UTC (rev 7909) @@ -1,5 +1,5 @@ GARNAME = nsd -GARVERSION = 3.2.3 +GARVERSION = 3.2.4 CATEGORIES = server DESCRIPTION = An authoritative only non-recursive name server @@ -8,7 +8,8 @@ authoritative DNS nameserver. endef -MASTER_SITES = http://www.nlnetlabs.nl/projects/nsd/ +MASTER_SITES = http://www.nlnetlabs.nl/downloads/nsd/ +SPKG_SOURCE_URL = http://www.nlnetlabs.nl/projects/nsd/ # If the url used to check for software update is different of MASTER_SITES, then # uncomment the next line. Otherwise it is set by default to the value of MASTER_SITES @@ -18,7 +19,7 @@ UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz PACKAGES = CSWnsd -REQUIRED_PKGS = CSWcswclassutils CSWosslrt +REQUIRED_PKGS = CSWosslrt CATALOGNAME = nsd SPKG_DESC = An authoritative only non-recursive name server Modified: csw/mgar/pkg/nsd/trunk/checksums =================================================================== --- csw/mgar/pkg/nsd/trunk/checksums 2010-01-07 16:39:38 UTC (rev 7908) +++ csw/mgar/pkg/nsd/trunk/checksums 2010-01-07 18:33:27 UTC (rev 7909) @@ -1,4 +1,3 @@ -bc1f6a6a33f1204454cf013273f0521c download/Makefile.in.diff -0eece57abde9d1cef8a962461b453d03 download/cswnsd -7a7560acb5d56847ea16fb8cd77b6ca5 download/cswusergroup -5ddb35dfb7da0defb82cda4f7388cba2 download/nsd-3.2.3.tar.gz +0eece57abde9d1cef8a962461b453d03 cswnsd +7a7560acb5d56847ea16fb8cd77b6ca5 cswusergroup +0c394fd713d194bde24a1035e56d5a79 nsd-3.2.4.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Fri Jan 8 00:08:06 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Thu, 07 Jan 2010 23:08:06 +0000 Subject: [csw-devel] SF.net SVN: gar:[7910] csw/mgar/gar/v2/gar.conf.mk Message-ID: Revision: 7910 http://gar.svn.sourceforge.net/gar/?rev=7910&view=rev Author: wahwah Date: 2010-01-07 23:08:06 +0000 (Thu, 07 Jan 2010) Log Message: ----------- mGAR v2: Adding CSWpython and CSWpy-cheetah to DEF_BASE_PKGS Modified Paths: -------------- csw/mgar/gar/v2/gar.conf.mk Modified: csw/mgar/gar/v2/gar.conf.mk =================================================================== --- csw/mgar/gar/v2/gar.conf.mk 2010-01-07 18:33:27 UTC (rev 7909) +++ csw/mgar/gar/v2/gar.conf.mk 2010-01-07 23:08:06 UTC (rev 7910) @@ -168,7 +168,21 @@ COMMON_PKG_DEPENDS ?= CSWcommon # These are the core packages which must be installed for GAR to function correctly -DEF_BASE_PKGS = CSWgmake CSWgtar CSWggrep CSWdiffutils CSWgfile CSWtextutils CSWwget CSWfindutils CSWgsed CSWgawk CSWbzip2 + +DEF_BASE_PKGS += CSWbzip2 +DEF_BASE_PKGS += CSWdiffutils +DEF_BASE_PKGS += CSWfindutils +DEF_BASE_PKGS += CSWgawk +DEF_BASE_PKGS += CSWgfile +DEF_BASE_PKGS += CSWggrep +DEF_BASE_PKGS += CSWgmake +DEF_BASE_PKGS += CSWgsed +DEF_BASE_PKGS += CSWgtar +DEF_BASE_PKGS += CSWpy-cheetah +DEF_BASE_PKGS += CSWpython +DEF_BASE_PKGS += CSWtextutils +DEF_BASE_PKGS += CSWwget + ifdef GIT_REPOS # netcat and bash are for the gitproxy script. DEF_BASE_PKGS += CSWgit CSWnetcat This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Fri Jan 8 00:34:57 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Thu, 07 Jan 2010 23:34:57 +0000 Subject: [csw-devel] SF.net SVN: gar:[7911] csw/mgar/gar/v2/bin/checkpkg.d/checkpkg-libs.py Message-ID: Revision: 7911 http://gar.svn.sourceforge.net/gar/?rev=7911&view=rev Author: wahwah Date: 2010-01-07 23:34:57 +0000 (Thu, 07 Jan 2010) Log Message: ----------- mGAR v2: checkpkg-libs.py, skayser's suggestions from http://lists.opencsw.org/pipermail/maintainers/2010-January/005375.html Modified Paths: -------------- csw/mgar/gar/v2/bin/checkpkg.d/checkpkg-libs.py Modified: csw/mgar/gar/v2/bin/checkpkg.d/checkpkg-libs.py =================================================================== --- csw/mgar/gar/v2/bin/checkpkg.d/checkpkg-libs.py 2010-01-07 23:08:06 UTC (rev 7910) +++ csw/mgar/gar/v2/bin/checkpkg.d/checkpkg-libs.py 2010-01-07 23:34:57 UTC (rev 7911) @@ -81,7 +81,8 @@ binary_data = checkpkg.ParseDumpOutput(stdout) needed_sonames_by_binary[binary_base_name] = binary_data if checkpkg.SONAME not in binary_data: - logging.info("The %s shared library doesn't provide a SONAME.", + logging.debug("The %s binary doesn't provide a SONAME. " + "(It might be an executable)", binary_base_name) # The shared library doesn't tell its SONAME. We're guessing it's the # same as the base file name. @@ -130,7 +131,7 @@ elif soname in lines_by_soname: print ("%s is provided by %s and required by:" % (soname, - repr(pkgs_by_filename[soname]))) + pkgs_by_filename[soname])) filename_lines = " ".join(sorted(binaries_by_soname[soname])) for line in textwrap.wrap(filename_lines, 70): print " ", line This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Fri Jan 8 01:37:22 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Fri, 08 Jan 2010 00:37:22 +0000 Subject: [csw-devel] SF.net SVN: gar:[7912] csw/mgar/gar/v2/bin/checkpkg.d Message-ID: Revision: 7912 http://gar.svn.sourceforge.net/gar/?rev=7912&view=rev Author: wahwah Date: 2010-01-08 00:37:22 +0000 (Fri, 08 Jan 2010) Log Message: ----------- mGAR v2: Part of output formatting moved to a function Modified Paths: -------------- csw/mgar/gar/v2/bin/checkpkg.d/checkpkg-libs.py csw/mgar/gar/v2/bin/checkpkg.d/checkpkg.py csw/mgar/gar/v2/bin/checkpkg.d/checkpkg_test.py Modified: csw/mgar/gar/v2/bin/checkpkg.d/checkpkg-libs.py =================================================================== --- csw/mgar/gar/v2/bin/checkpkg.d/checkpkg-libs.py 2010-01-07 23:34:57 UTC (rev 7911) +++ csw/mgar/gar/v2/bin/checkpkg.d/checkpkg-libs.py 2010-01-08 00:37:22 UTC (rev 7912) @@ -186,31 +186,13 @@ pkgs_by_filename, filenames_by_soname, pkg_by_any_filename) + print checker.FormatDepsReport(missing_deps, + surplus_deps, + orphan_sonames) - # TODO: Rewrite this using cheetah templates. - print "%s:" % pkgname - msg_printed = False - if missing_deps: - print "SUGGESTION: you may want to add some or all of the following as depends:" - print " (Feel free to ignore SUNW or SPRO packages)" - for dep_pkgname in sorted(missing_deps): - print ">", dep_pkgname - msg_printed = True - if surplus_deps: - print "The following packages might be unnecessary dependencies:" - for dep_pkgname in surplus_deps: - print "? ", dep_pkgname - msg_printed = True - if orphan_sonames: - print "The following sonames don't belong to any package:" - for soname in sorted(orphan_sonames): - errors.append(checkpkg.Error("The following soname does't belong to " - "any package: %s" % soname)) - print "! ", soname - msg_printed = True - if not msg_printed: - print "+ Dependencies of %s look good." % pkgname - print + for soname in orphan_sonames: + errors.append(checkpkg.Error("The following soname does't belong to " + "any package: %s" % checker.soname)) if errors: for error in errors: Modified: csw/mgar/gar/v2/bin/checkpkg.d/checkpkg.py =================================================================== --- csw/mgar/gar/v2/bin/checkpkg.d/checkpkg.py 2010-01-07 23:34:57 UTC (rev 7911) +++ csw/mgar/gar/v2/bin/checkpkg.d/checkpkg.py 2010-01-08 00:37:22 UTC (rev 7912) @@ -12,6 +12,7 @@ import socket import sqlite3 import subprocess +import StringIO SYSTEM_PKGMAP = "/var/sadm/install/contents" WS_RE = re.compile(r"\s+") @@ -112,7 +113,33 @@ fd.close() return depends + def FormatDepsReport(self, missing_deps, surplus_deps, orphan_sonames): + """A intermediate version in which StringIO is used.""" + s = StringIO.StringIO() + print >>s, "%s:" % self.pkgname + msg_printed = False + if missing_deps: + print >>s, "SUGGESTION: you may want to add some or all of the following as depends:" + print >>s, " (Feel free to ignore SUNW or SPRO packages)" + for dep_pkgname in sorted(missing_deps): + print >>s, ">", dep_pkgname + msg_printed = True + if surplus_deps: + print >>s, "The following packages might be unnecessary dependencies:" + for dep_pkgname in surplus_deps: + print >>s, "? ", dep_pkgname + msg_printed = True + if orphan_sonames: + print >>s, "The following sonames don't belong to any package:" + for soname in sorted(orphan_sonames): + print >>s, "! ", soname + msg_printed = True + if not msg_printed: + print >>s, "+ Dependencies of %s look good." % self.pkgname + s.seek(0) + return s.read() + class SystemPkgmap(object): """A class to hold and manipulate the /var/sadm/install/contents file. Modified: csw/mgar/gar/v2/bin/checkpkg.d/checkpkg_test.py =================================================================== --- csw/mgar/gar/v2/bin/checkpkg.d/checkpkg_test.py 2010-01-07 23:34:57 UTC (rev 7911) +++ csw/mgar/gar/v2/bin/checkpkg.d/checkpkg_test.py 2010-01-08 00:37:22 UTC (rev 7912) @@ -3,6 +3,7 @@ import unittest import mox +import difflib import checkpkg import testdata.checkpkg_test_data_CSWmysql51rt as d1 import testdata.checkpkg_test_data_CSWmysql51client as d2 @@ -434,5 +435,30 @@ checkpkg.ParseDumpOutput(dump_2.DATA_DUMP_OUTPUT)["runpath"]) +class FormatDepsReportUnitTest(unittest.TestCase): + + def AssertTextEqual(self, text1, text2): + difference = "\n".join(difflib.context_diff(text2.splitlines(), text1.splitlines())) + self.assertEqual(text1, text2, difference) + + def test_1(self): + missing_deps = set([u'SUNWgss', u'*SUNWlxsl']) + surplus_deps = set(['CSWsudo', 'CSWlibxslt']) + orphan_sonames = set([]) + testdata = (missing_deps, surplus_deps, orphan_sonames) + checker = checkpkg.CheckpkgBase("/tmp/nonexistent", "CSWfoo") + expected = u"""CSWfoo: +SUGGESTION: you may want to add some or all of the following as depends: + (Feel free to ignore SUNW or SPRO packages) +> *SUNWlxsl +> SUNWgss +The following packages might be unnecessary dependencies: +? CSWsudo +? CSWlibxslt +""" + result = checker.FormatDepsReport(*testdata) + self.AssertTextEqual(result, expected) + + if __name__ == '__main__': unittest.main() This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Fri Jan 8 01:42:28 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Fri, 08 Jan 2010 00:42:28 +0000 Subject: [csw-devel] SF.net SVN: gar:[7913] csw/mgar/pkg/mysql5/branches/mysql-5.0.x Message-ID: Revision: 7913 http://gar.svn.sourceforge.net/gar/?rev=7913&view=rev Author: wahwah Date: 2010-01-08 00:42:27 +0000 (Fri, 08 Jan 2010) Log Message: ----------- mysql5.0.x: Added --enable-thread-safe-client Modified Paths: -------------- csw/mgar/pkg/mysql5/branches/mysql-5.0.x/Makefile csw/mgar/pkg/mysql5/branches/mysql-5.0.x/checksums csw/mgar/pkg/mysql5/branches/mysql-5.0.x/files/CSWmysql5.postinstall Modified: csw/mgar/pkg/mysql5/branches/mysql-5.0.x/Makefile =================================================================== --- csw/mgar/pkg/mysql5/branches/mysql-5.0.x/Makefile 2010-01-08 00:37:22 UTC (rev 7912) +++ csw/mgar/pkg/mysql5/branches/mysql-5.0.x/Makefile 2010-01-08 00:42:27 UTC (rev 7913) @@ -144,15 +144,16 @@ # Set ./configure options CONFIGURE_ARGS = $(DIRPATHS) CONFIGURE_ARGS += --disable-assembler -CONFIGURE_ARGS += --without-docs CONFIGURE_ARGS += --enable-local-infile +CONFIGURE_ARGS += --enable-thread-safe-client CONFIGURE_ARGS += --with-extra-charsets=all CONFIGURE_ARGS += --with-low-memory +CONFIGURE_ARGS += --with-plugins=max-no-ndb CONFIGURE_ARGS += --with-pthread CONFIGURE_ARGS += --with-readline +CONFIGURE_ARGS += --with-ssl=/opt/csw CONFIGURE_ARGS += --with-zlib-dir=/opt/csw -CONFIGURE_ARGS += --with-ssl=/opt/csw -CONFIGURE_ARGS += --with-plugins=max-no-ndb +CONFIGURE_ARGS += --without-docs CONFIGURE_ARGS_DBG = --with-debug CONFIGURE_ARGS += $(CONFIGURE_ARGS_$(GARFLAVOR)) Modified: csw/mgar/pkg/mysql5/branches/mysql-5.0.x/checksums =================================================================== --- csw/mgar/pkg/mysql5/branches/mysql-5.0.x/checksums 2010-01-08 00:37:22 UTC (rev 7912) +++ csw/mgar/pkg/mysql5/branches/mysql-5.0.x/checksums 2010-01-08 00:42:27 UTC (rev 7913) @@ -2,7 +2,7 @@ 1414d06fab1530484a508927a0de4154 0002-cast-user_info-pw_gid-to-gid_t.patch 5415f365f1b0f7a179d1efc25f45bbee 0003-OpenCSW-perl-for-tests.patch 8ab232cd4d232b3cda3bbced93f80237 0004-basedir-and-datadir-in-the-cnf-files.patch -a723d7b35d76794c910daa20e6f86158 CSWmysql5.postinstall +a441f22d615222a04118805d3976a248 CSWmysql5.postinstall 60162ea667507a6a487027e7c389ca55 CSWmysql5.preinstall e691b0cf00a3925ac55c1844045d6e30 ChangeLog e42afb5ec1b1ab02d2ec3b46d0922636 README.CSW Modified: csw/mgar/pkg/mysql5/branches/mysql-5.0.x/files/CSWmysql5.postinstall =================================================================== --- csw/mgar/pkg/mysql5/branches/mysql-5.0.x/files/CSWmysql5.postinstall 2010-01-08 00:37:22 UTC (rev 7912) +++ csw/mgar/pkg/mysql5/branches/mysql-5.0.x/files/CSWmysql5.postinstall 2010-01-08 00:42:27 UTC (rev 7913) @@ -86,8 +86,8 @@ svcadm clear cswmysql5 svcadm enable cswmysql5 else - echo "Running \`/etc/opt/csw/init.d/cswmysql\` start to start the database." - /etc/opt/csw/init.d/cswmysql start + echo "Running \`/etc/opt/csw/init.d/cswmysql\` start to start the database." + /etc/opt/csw/init.d/cswmysql start fi exit 0 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Fri Jan 8 01:43:07 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Fri, 08 Jan 2010 00:43:07 +0000 Subject: [csw-devel] SF.net SVN: gar:[7914] csw/mgar/pkg/mysql5/branches/mysql-5.0.x/checksums Message-ID: Revision: 7914 http://gar.svn.sourceforge.net/gar/?rev=7914&view=rev Author: wahwah Date: 2010-01-08 00:43:06 +0000 (Fri, 08 Jan 2010) Log Message: ----------- mysql5.0.x: Updating checksum for files with the $Id$ tag Modified Paths: -------------- csw/mgar/pkg/mysql5/branches/mysql-5.0.x/checksums Modified: csw/mgar/pkg/mysql5/branches/mysql-5.0.x/checksums =================================================================== --- csw/mgar/pkg/mysql5/branches/mysql-5.0.x/checksums 2010-01-08 00:42:27 UTC (rev 7913) +++ csw/mgar/pkg/mysql5/branches/mysql-5.0.x/checksums 2010-01-08 00:43:06 UTC (rev 7914) @@ -2,7 +2,7 @@ 1414d06fab1530484a508927a0de4154 0002-cast-user_info-pw_gid-to-gid_t.patch 5415f365f1b0f7a179d1efc25f45bbee 0003-OpenCSW-perl-for-tests.patch 8ab232cd4d232b3cda3bbced93f80237 0004-basedir-and-datadir-in-the-cnf-files.patch -a441f22d615222a04118805d3976a248 CSWmysql5.postinstall +bd7647733a5cc2e6e3dd7e7d4b8d311f CSWmysql5.postinstall 60162ea667507a6a487027e7c389ca55 CSWmysql5.preinstall e691b0cf00a3925ac55c1844045d6e30 ChangeLog e42afb5ec1b1ab02d2ec3b46d0922636 README.CSW This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Fri Jan 8 12:02:14 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Fri, 08 Jan 2010 11:02:14 +0000 Subject: [csw-devel] SF.net SVN: gar:[7915] csw/mgar/gar/v2/bin/checkpkg.d Message-ID: Revision: 7915 http://gar.svn.sourceforge.net/gar/?rev=7915&view=rev Author: wahwah Date: 2010-01-08 11:02:13 +0000 (Fri, 08 Jan 2010) Log Message: ----------- mGAR v2: Rewrote part of output formatting to use a template Modified Paths: -------------- csw/mgar/gar/v2/bin/checkpkg.d/checkpkg.py csw/mgar/gar/v2/bin/checkpkg.d/checkpkg_test.py Modified: csw/mgar/gar/v2/bin/checkpkg.d/checkpkg.py =================================================================== --- csw/mgar/gar/v2/bin/checkpkg.d/checkpkg.py 2010-01-08 00:43:06 UTC (rev 7914) +++ csw/mgar/gar/v2/bin/checkpkg.d/checkpkg.py 2010-01-08 11:02:13 UTC (rev 7915) @@ -13,6 +13,7 @@ import sqlite3 import subprocess import StringIO +from Cheetah import Template SYSTEM_PKGMAP = "/var/sadm/install/contents" WS_RE = re.compile(r"\s+") @@ -28,6 +29,31 @@ # Solaris 8 on i386. It's okay if it's missing. ALLOWED_ORPHAN_SONAMES = set([u"libm.so.2"]) +REPORT_TMPL = u"""$pkgname: +#if $missing_deps +SUGGESTION: you may want to add some or all of the following as depends: + (Feel free to ignore SUNW or SPRO packages) +#for $pkg in $sorted($missing_deps) +> $pkg +#end for +#end if +#if $surplus_deps +The following packages might be unnecessary dependencies: +#for $pkg in $sorted($surplus_deps) +? $pkg +#end for +#end if +#if $orphan_sonames +The following sonames don't belong to any package: +#for $soname in $sorted($orphan_sonames) +! $soname +#end for +#end if +#if not $missing_deps and not $surplus_deps and not $orphan_sonames ++ Dependencies of $pkgname look good. +#end if +""" + class Error(Exception): pass @@ -115,29 +141,14 @@ def FormatDepsReport(self, missing_deps, surplus_deps, orphan_sonames): """A intermediate version in which StringIO is used.""" - s = StringIO.StringIO() - print >>s, "%s:" % self.pkgname - msg_printed = False - if missing_deps: - print >>s, "SUGGESTION: you may want to add some or all of the following as depends:" - print >>s, " (Feel free to ignore SUNW or SPRO packages)" - for dep_pkgname in sorted(missing_deps): - print >>s, ">", dep_pkgname - msg_printed = True - if surplus_deps: - print >>s, "The following packages might be unnecessary dependencies:" - for dep_pkgname in surplus_deps: - print >>s, "? ", dep_pkgname - msg_printed = True - if orphan_sonames: - print >>s, "The following sonames don't belong to any package:" - for soname in sorted(orphan_sonames): - print >>s, "! ", soname - msg_printed = True - if not msg_printed: - print >>s, "+ Dependencies of %s look good." % self.pkgname - s.seek(0) - return s.read() + namespace = { + "pkgname": self.pkgname, + "missing_deps": missing_deps, + "surplus_deps": surplus_deps, + "orphan_sonames": orphan_sonames, + } + t = Template.Template(REPORT_TMPL, searchList=[namespace]) + return unicode(t) class SystemPkgmap(object): Modified: csw/mgar/gar/v2/bin/checkpkg.d/checkpkg_test.py =================================================================== --- csw/mgar/gar/v2/bin/checkpkg.d/checkpkg_test.py 2010-01-08 00:43:06 UTC (rev 7914) +++ csw/mgar/gar/v2/bin/checkpkg.d/checkpkg_test.py 2010-01-08 11:02:13 UTC (rev 7915) @@ -441,10 +441,10 @@ difference = "\n".join(difflib.context_diff(text2.splitlines(), text1.splitlines())) self.assertEqual(text1, text2, difference) - def test_1(self): + def testAll(self): missing_deps = set([u'SUNWgss', u'*SUNWlxsl']) surplus_deps = set(['CSWsudo', 'CSWlibxslt']) - orphan_sonames = set([]) + orphan_sonames = set([u'libm.so.2']) testdata = (missing_deps, surplus_deps, orphan_sonames) checker = checkpkg.CheckpkgBase("/tmp/nonexistent", "CSWfoo") expected = u"""CSWfoo: @@ -453,12 +453,26 @@ > *SUNWlxsl > SUNWgss The following packages might be unnecessary dependencies: -? CSWsudo -? CSWlibxslt +? CSWlibxslt +? CSWsudo +The following sonames don't belong to any package: +! libm.so.2 """ result = checker.FormatDepsReport(*testdata) self.AssertTextEqual(result, expected) + def testNone(self): + missing_deps = set([]) + surplus_deps = set([]) + orphan_sonames = set([]) + testdata = (missing_deps, surplus_deps, orphan_sonames) + checker = checkpkg.CheckpkgBase("/tmp/nonexistent", "CSWfoo") + expected = u"""CSWfoo: ++ Dependencies of CSWfoo look good. +""" + result = checker.FormatDepsReport(*testdata) + self.AssertTextEqual(result, expected) + if __name__ == '__main__': unittest.main() This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Fri Jan 8 23:37:23 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Fri, 08 Jan 2010 22:37:23 +0000 Subject: [csw-devel] SF.net SVN: gar:[7916] csw/mgar/pkg Message-ID: Revision: 7916 http://gar.svn.sourceforge.net/gar/?rev=7916&view=rev Author: wahwah Date: 2010-01-08 22:37:07 +0000 (Fri, 08 Jan 2010) Log Message: ----------- rhythmbox: Initial commit, some preliminary work Modified Paths: -------------- csw/mgar/pkg/rhythmbox/trunk/Makefile csw/mgar/pkg/rhythmbox/trunk/checksums Added Paths: ----------- csw/mgar/pkg/rhythmbox/ csw/mgar/pkg/rhythmbox/trunk/files/0001-ggettext-for-intltool.patch csw/mgar/pkg/rhythmbox/trunk/files/0002-Adding-ACLOCAL_AMFLAGS-I-macros-to-Makefile.am.patch csw/mgar/pkg/rhythmbox/trunk/files/0003-autoreconf-results.patch Modified: csw/mgar/pkg/rhythmbox/trunk/Makefile =================================================================== --- csw/mgar/pkg/template/trunk/Makefile 2010-01-08 11:02:13 UTC (rev 7915) +++ csw/mgar/pkg/rhythmbox/trunk/Makefile 2010-01-08 22:37:07 UTC (rev 7916) @@ -2,184 +2,21 @@ # Distributed under the terms of the GNU General Public License v2 # $Id$ -## This file contains comments to guide you through various GAR settings. -## Please remove unnecessary comments before committing your code to the code -## repository. The comments to remove are marked with double hashes. -## If you want to remove them all in-place, use: -## gsed -i -e '/^##/d' Makefile -## -## For more information about GAR variables, please see: -## https://sourceforge.net/apps/trac/gar/wiki/GAR%20Variable%20Reference -## -GARNAME = mypkg -GARVERSION = 1.0 -## -## The category that your software fits in. This is not a descriptive field, but -## influences the build process. Depending on the CATEGORIES setting, different -## Makefiles are included from gar/categories/ in your trunk directory, which -## adjust the build settings for the respective category. -## -## Possible settings are: -## apps, cpan, devel, gnome, java, kde, lang, lib, meta, net, python, server, -## utils, x11, xfce, xorg, xtra -CATEGORIES = lib -## -## A one-line description of the package, which will appear in the pkginfo. -DESCRIPTION = -## -## A longer description of the package. This is only for descriptive purposes -## inside the Makefile and is not used elsewhere. +GARNAME = rhythmbox +GARVERSION = 0.12.6 +CATEGORIES = apps +DESCRIPTION = an integrated music management application define BLURB - endef -## -## Upstream URL that should show up in the VENDOR field as well as on -## http://opencsw.org/packages/. -SPKG_SOURCEURL = -## -## Whitespace-separated list of URLs to download the source package from. -## There are presets: $(SF_MIRRORS), $(GNU_MIRRORS) and $(GOOGLE_MIRROR). -MASTER_SITES = -## -## SF_PROJ is required if you set $(MASTER_SITES) to $(SF_MIRRORS) and the -## Sourceforge project name differs from $(GARNAME). Specifies the Sourceforge -## project name of the software you wish to download. -## SF_PROJ = -## -## A list of space separated patch filenames from files/ that are to be applied -## to the extracted software before the ./configure stage. Patches need to be -## included in the DISTFILES variable as well. -## PATCHFILES = -## -## Whitespace-separated list of files which comprise this build. mGAR will look -## for the files in the $(FILEDIR) (trunk/files) directory and on the -## $(MASTER_SITES). -DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz -## -## We define upstream file regex so we can be notifed of new upstream software release -UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz -## -## Catalog name is the name to be used with pkg{-get,util} -i . -## It is different from the system package name, which by convention is CSWpkgname. -## CATALOGNAME = -## -## Set to 1 to mark the package as architecture-independent. -## ARCHALL = 0 -## -## A list of files / patterns that should be excluded from the package. Amends -## the default list of excluded filenames $(MERGE_EXCLUDE_DEFAULT), which -## contains things like libtool .la files and files with a leading ~. -## EXTRA_MERGE_EXCLUDE_FILES = -## -## A list of space separated package names that should be marked as -## incompatible with the current package. This will go into the depend file. -## When a user has one of the incompatible packages installed and installs -## your package, he will be prompted that the incompatible package must be -## removed. He will however not be prevented to install your package without -## removing the conflicting package first. -## INCOMPATIBLE_PKGS = -## -## The name of the license file that should be included in your package. Defaults -## to COPYING. See http://sourceforge.net/apps/trac/gar/wiki/CopyRightfor details -## on including and displaying licenses. -## LICENSE = -## -## A list of space separated package names that should be produced from your -## Makefile. This is used when a software has different components that can be -## packaged and used individually (think runtime libraries, client tools, server -## files, development headers). You don't need to set this when you just want to -## produce one package. -## -## When you set this variable to include more than one package, you also need to -## set PKGFILES_CSWpkgname for each package (except for the first one in your -## $(PACKAGES) list) to define which files go into each package. The first -## package from $(PACKAGES) one will hold all files that are not matched by -## PKGFILES_ for other packages. -## PACKAGES = -## -## If specified, GAR feeds the almost-final package prototype file to -## $(PROTOTYPE_FILTER) and reads the final package prototype file from it. -## $(PROTOTYPE_FILTER) is usually a sed/awk/perl one-liner, which was mostly used -## to prepare the prototype file for use with cswclassutils (see -## $(SPKG_CLASSES)). Now that there are convenience variables for cswclassutils, -## you will rarely have to use this. A still valid use case would be to change -## the file permissions of a file to be set-UID. -## See http://wiki.opencsw.org/cswclassutils-package for common usage information -## PROTOTYPE_FILTER = -## -## cswclassutils settings -## -## A list of action classes. Possible values are: -## none cswpreserveconf cswcpsampleconf cswpycompile cswusergroup cswinitsmf -## cswinetd cswetcservices -## The class 'cswinitsmf' must be the last class listed. When you use cswclassutils, -## you need to add CSWcswclassutils to REQUIRED_PKGS. -## SPKG_CLASSES = none -## Simplified settings for classes: -## PRESERVECONF = -## SAMPLECONF = -## INITSMF = -## USERGROUP = -## ETCSERVICES = -## INETDCONF = -## A list of runtime package dependencies in the form of CSWfoo. -## REQUIRED_PKGS = -## -## A list of packages necessary to build this package -## PREREQUISITE_PKGS = $(REQUIRED_PKGS) -## -## When using non-empty $(PACKAGES): -## REQUIRED_PKGS_CSWpkgname = -## SPKG_DESC_CSWpkgname = -## PKGFILES_CSWpkgname = -## CATALOGNAME_CSWpkgname = -## -## A list of space separated directories where objects should be stripped in -## addition to the bin/ and sbin/ directories. -## STRIP_DIRS = -## -## Define a custom target for the configure phase. When you set this, the target -## that will be used instead of configure: target, is named -## configure-$(CONFIGURE_SCRIPTS) and you will need to define it in your Makefile -## after including gar/gar.include.mk. If you want to skip the configure phase -## completely (for example when your software doesn't need to be compiled) assign -## this variable an empty value. The procedure works for configure, build, -## install and test steps. -## CONFIGURE_SCRIPTS = -## BUILD_SCRIPTS = -## INSTALL_SCRIPTS = -## TEST_SCRIPTS = -## -## Compilation settings -## -## The build directory. -## WORKSRC = $(WORKDIR)/$(GARNAME)-$(GARVERSION) -## -## BUILD_ARGS is passed as an argument to gmake during the build phase. Use this -## for example, if you need to override Makefile variables. -## BUILD_ARGS = -## -## Arguments passed to the ./configure script. +SPKG_SOURCEURL = http://projects.gnome.org/rhythmbox/ +MASTER_SITES = http://ftp.gnome.org/pub/gnome/sources/rhythmbox/0.12/ +PATCHFILES = 0001-ggettext-for-intltool.patch +PATCHFILES += 0002-Adding-ACLOCAL_AMFLAGS-I-macros-to-Makefile.am.patch +PATCHFILES += 0003-autoreconf-results.patch +DISTFILES = $(GARNAME)-$(GARVERSION).tar.bz2 +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.bz2 CONFIGURE_ARGS = $(DIRPATHS) -## -## BUILD64 = -## CONFIGURE_ENV = -## EXTRA_CFLAGS = -## EXTRA_LDFLAGS = -## EXTRA_INC = -## EXTRA_LIB = -## GARFLAVOR = -## INSTALL_ARGS = -## OPT_FLAGS_SOS = -xO3 -## OPT_FLAGS_GCC = -O2 -pipe -## -## The compiler to use. Defaults to SOS11, can be also: SOS12, GCC3, GCC4. -## GARCOMPILER = SOS11 -## -# Remove the following rules and uncomment the -# include before building. -all: .DEFAULT -.DEFAULT: - @true -#include gar/category.mk +EXTRA_PKG_CONFIG_DIRS = /opt/csw/X11/lib + +include gar/category.mk Modified: csw/mgar/pkg/rhythmbox/trunk/checksums =================================================================== --- csw/mgar/pkg/template/trunk/checksums 2010-01-08 11:02:13 UTC (rev 7915) +++ csw/mgar/pkg/rhythmbox/trunk/checksums 2010-01-08 22:37:07 UTC (rev 7916) @@ -0,0 +1 @@ +c22ff476c956afeb7f694e5d1a59cfb9 rhythmbox-0.12.6.tar.bz2 Added: csw/mgar/pkg/rhythmbox/trunk/files/0001-ggettext-for-intltool.patch =================================================================== --- csw/mgar/pkg/rhythmbox/trunk/files/0001-ggettext-for-intltool.patch (rev 0) +++ csw/mgar/pkg/rhythmbox/trunk/files/0001-ggettext-for-intltool.patch 2010-01-08 22:37:07 UTC (rev 7916) @@ -0,0 +1,29 @@ +From df579a7309602f91fb62b338e31db413580139f3 Mon Sep 17 00:00:00 2001 +From: Maciej Blizinski +Date: Fri, 8 Jan 2010 23:32:53 +0100 +Subject: [PATCH 1/3] ggettext for intltool + +--- + macros/intltool.m4 | 6 +++--- + 1 files changed, 3 insertions(+), 3 deletions(-) + +diff --git a/macros/intltool.m4 b/macros/intltool.m4 +index 122d773..1b9d7af 100644 +--- a/macros/intltool.m4 ++++ b/macros/intltool.m4 +@@ -96,9 +96,9 @@ _IT_SUBST(INTLTOOL_SERVICE_RULE) + _IT_SUBST(INTLTOOL_POLICY_RULE) + + # Check the gettext tools to make sure they are GNU +-AC_PATH_PROG(XGETTEXT, xgettext) +-AC_PATH_PROG(MSGMERGE, msgmerge) +-AC_PATH_PROG(MSGFMT, msgfmt) ++AC_PATH_PROG(XGETTEXT, gxgettext) ++AC_PATH_PROG(MSGMERGE, gmsgmerge) ++AC_PATH_PROG(MSGFMT, gmsgfmt) + AC_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT) + if test -z "$XGETTEXT" -o -z "$MSGMERGE" -o -z "$MSGFMT"; then + AC_MSG_ERROR([GNU gettext tools not found; required for intltool]) +-- +1.6.6 + Added: csw/mgar/pkg/rhythmbox/trunk/files/0002-Adding-ACLOCAL_AMFLAGS-I-macros-to-Makefile.am.patch =================================================================== --- csw/mgar/pkg/rhythmbox/trunk/files/0002-Adding-ACLOCAL_AMFLAGS-I-macros-to-Makefile.am.patch (rev 0) +++ csw/mgar/pkg/rhythmbox/trunk/files/0002-Adding-ACLOCAL_AMFLAGS-I-macros-to-Makefile.am.patch 2010-01-08 22:37:07 UTC (rev 7916) @@ -0,0 +1,25 @@ +From caf9941527c6dccd00746778f8f115ba8fe6fe7c Mon Sep 17 00:00:00 2001 +From: Maciej Blizinski +Date: Sat, 9 Jan 2010 00:11:11 +0100 +Subject: [PATCH 2/3] Adding ACLOCAL_AMFLAGS = -I macros to Makefile.am + +--- + Makefile.am | 2 ++ + 1 files changed, 2 insertions(+), 0 deletions(-) + +diff --git a/Makefile.am b/Makefile.am +index c8fea86..63ac9a5 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -2,6 +2,8 @@ + + AUTOMAKE_OPTIONS = 1.7 + ++ACLOCAL_AMFLAGS = -I macros ++ + DISTCHECK_CONFIGURE_FLAGS = --disable-schemas-install --enable-gtk-doc --disable-scrollkeeper + distuninstallcheck_listfiles = find . -type f -print | grep -v '^\./var/scrollkeeper' + +-- +1.6.6 + Added: csw/mgar/pkg/rhythmbox/trunk/files/0003-autoreconf-results.patch =================================================================== --- csw/mgar/pkg/rhythmbox/trunk/files/0003-autoreconf-results.patch (rev 0) +++ csw/mgar/pkg/rhythmbox/trunk/files/0003-autoreconf-results.patch 2010-01-08 22:37:07 UTC (rev 7916) @@ -0,0 +1,4320 @@ +From 248d9e77494156217abdf698446163e09690ab8e Mon Sep 17 00:00:00 2001 +From: Maciej Blizinski +Date: Sat, 9 Jan 2010 00:12:02 +0100 +Subject: [PATCH 3/3] autoreconf results + +--- + INSTALL | 97 ++- + Makefile.in | 19 +- + aclocal.m4 | 65 +- + backends/Makefile.in | 6 +- + backends/gstreamer/Makefile.in | 2 +- + bindings/Makefile.in | 6 +- + bindings/python/Makefile.in | 2 +- + bindings/vala/Makefile.in | 2 +- + config.guess | 142 ++-- + config.sub | 30 +- + configure | 968 +++++++++++------------ + data/Makefile.in | 6 +- + data/icons/Makefile.in | 6 +- + data/icons/hicolor/16x16/Makefile.in | 6 +- + data/icons/hicolor/16x16/actions/Makefile.in | 2 +- + data/icons/hicolor/16x16/apps/Makefile.in | 2 +- + data/icons/hicolor/16x16/places/Makefile.in | 2 +- + data/icons/hicolor/16x16/status/Makefile.in | 2 +- + data/icons/hicolor/22x22/Makefile.in | 6 +- + data/icons/hicolor/22x22/actions/Makefile.in | 2 +- + data/icons/hicolor/22x22/apps/Makefile.in | 2 +- + data/icons/hicolor/22x22/places/Makefile.in | 2 +- + data/icons/hicolor/22x22/status/Makefile.in | 2 +- + data/icons/hicolor/24x24/Makefile.in | 6 +- + data/icons/hicolor/24x24/apps/Makefile.in | 2 +- + data/icons/hicolor/32x32/Makefile.in | 6 +- + data/icons/hicolor/32x32/actions/Makefile.in | 2 +- + data/icons/hicolor/32x32/apps/Makefile.in | 2 +- + data/icons/hicolor/32x32/places/Makefile.in | 2 +- + data/icons/hicolor/32x32/status/Makefile.in | 2 +- + data/icons/hicolor/48x48/Makefile.in | 6 +- + data/icons/hicolor/48x48/apps/Makefile.in | 2 +- + data/icons/hicolor/Makefile.in | 6 +- + data/icons/hicolor/scalable/Makefile.in | 6 +- + data/icons/hicolor/scalable/actions/Makefile.in | 2 +- + data/icons/hicolor/scalable/apps/Makefile.in | 2 +- + data/icons/hicolor/scalable/places/Makefile.in | 2 +- + data/icons/hicolor/scalable/status/Makefile.in | 2 +- + data/ui/Makefile.in | 2 +- + doc/Makefile.in | 6 +- + doc/reference/Makefile.in | 2 +- + help/Makefile.in | 2 +- + lib/Makefile.in | 6 +- + lib/libmediaplayerid/Makefile.in | 2 +- + ltmain.sh | 37 +- + macros/Makefile.in | 2 +- + macros/libtool.m4 | 27 +- + macros/ltversion.m4 | 10 +- + metadata/Makefile.in | 6 +- + plugins/Makefile.in | 6 +- + plugins/artdisplay/Makefile.in | 6 +- + plugins/artdisplay/artdisplay/Makefile.in | 2 +- + plugins/audiocd/Makefile.in | 2 +- + plugins/audioscrobbler/Makefile.in | 2 +- + plugins/brasero-disc-recorder/Makefile.in | 2 +- + plugins/cd-recorder/Makefile.in | 2 +- + plugins/coherence/Makefile.in | 6 +- + plugins/coherence/upnp_coherence/Makefile.in | 2 +- + plugins/context/Makefile.in | 6 +- + plugins/context/context/Makefile.in | 2 +- + plugins/daap/Makefile.in | 2 +- + plugins/fmradio/Makefile.in | 2 +- + plugins/generic-player/Makefile.in | 2 +- + plugins/im-status/Makefile.in | 2 +- + plugins/ipod/Makefile.in | 2 +- + plugins/iradio/Makefile.in | 2 +- + plugins/jamendo/Makefile.in | 6 +- + plugins/jamendo/jamendo/Makefile.in | 2 +- + plugins/lirc/Makefile.in | 2 +- + plugins/lyrics/Makefile.in | 6 +- + plugins/lyrics/lyrics/Makefile.in | 2 +- + plugins/magnatune/Makefile.in | 6 +- + plugins/magnatune/magnatune/Makefile.in | 2 +- + plugins/mmkeys/Makefile.in | 2 +- + plugins/mtpdevice/Makefile.in | 2 +- + plugins/power-manager/Makefile.in | 2 +- + plugins/pythonconsole/Makefile.in | 2 +- + plugins/rb/Makefile.in | 2 +- + plugins/sample-python/Makefile.in | 2 +- + plugins/sample-vala/Makefile.in | 2 +- + plugins/sample/Makefile.in | 2 +- + plugins/status-icon/Makefile.in | 2 +- + plugins/visualizer/Makefile.in | 2 +- + podcast/Makefile.in | 2 +- + remote/Makefile.in | 6 +- + remote/dbus/Makefile.in | 2 +- + rhythmdb/Makefile.in | 2 +- + shell/Makefile.in | 2 +- + sources/Makefile.in | 2 +- + tests/Makefile.in | 2 +- + widgets/Makefile.in | 6 +- + widgets/libsexy/Makefile.in | 2 +- + 92 files changed, 812 insertions(+), 841 deletions(-) + +diff --git a/INSTALL b/INSTALL +index 2550dab..7d1c323 100644 +--- a/INSTALL ++++ b/INSTALL +@@ -4,8 +4,10 @@ Installation Instructions + Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005, + 2006, 2007, 2008, 2009 Free Software Foundation, Inc. + +- This file is free documentation; the Free Software Foundation gives +-unlimited permission to copy, distribute and modify it. ++ Copying and distribution of this file, with or without modification, ++are permitted in any medium without royalty provided the copyright ++notice and this notice are preserved. This file is offered as-is, ++without warranty of any kind. + + Basic Installation + ================== +@@ -13,7 +15,11 @@ Basic Installation + Briefly, the shell commands `./configure; make; make install' should + configure, build, and install this package. The following + more-detailed instructions are generic; see the `README' file for +-instructions specific to this package. ++instructions specific to this package. Some packages provide this ++`INSTALL' file but do not implement all of the features documented ++below. The lack of an optional feature in a given package is not ++necessarily a bug. More recommendations for GNU packages can be found ++in *note Makefile Conventions: (standards)Makefile Conventions. + + The `configure' shell script attempts to guess correct values for + various system-dependent variables used during compilation. It uses +@@ -42,7 +48,7 @@ may remove or edit it. + you want to change it or regenerate `configure' using a newer version + of `autoconf'. + +-The simplest way to compile this package is: ++ The simplest way to compile this package is: + + 1. `cd' to the directory containing the package's source code and type + `./configure' to configure the package for your system. +@@ -53,12 +59,22 @@ The simplest way to compile this package is: + 2. Type `make' to compile the package. + + 3. Optionally, type `make check' to run any self-tests that come with +- the package. ++ the package, generally using the just-built uninstalled binaries. + + 4. Type `make install' to install the programs and any data files and +- documentation. +- +- 5. You can remove the program binaries and object files from the ++ documentation. When installing into a prefix owned by root, it is ++ recommended that the package be configured and built as a regular ++ user, and only the `make install' phase executed with root ++ privileges. ++ ++ 5. Optionally, type `make installcheck' to repeat any self-tests, but ++ this time using the binaries in their final installed location. ++ This target does not install anything. Running this target as a ++ regular user, particularly if the prior `make install' required ++ root privileges, verifies that the installation completed ++ correctly. ++ ++ 6. You can remove the program binaries and object files from the + source code directory by typing `make clean'. To also remove the + files that `configure' created (so you can compile the package for + a different kind of computer), type `make distclean'. There is +@@ -67,8 +83,15 @@ The simplest way to compile this package is: + all sorts of other programs in order to regenerate files that came + with the distribution. + +- 6. Often, you can also type `make uninstall' to remove the installed +- files again. ++ 7. Often, you can also type `make uninstall' to remove the installed ++ files again. In practice, not all packages have tested that ++ uninstallation works correctly, even though it is required by the ++ GNU Coding Standards. ++ ++ 8. Some packages, particularly those that use Automake, provide `make ++ distcheck', which can by used by developers to test that all other ++ targets like `make install' and `make uninstall' work correctly. ++ This target is generally not run by end users. + + Compilers and Options + ===================== +@@ -93,7 +116,8 @@ same time, by placing the object files for each architecture in their + own directory. To do this, you can use GNU `make'. `cd' to the + directory where you want the object files and executables to go and run + the `configure' script. `configure' automatically checks for the +-source code in the directory that `configure' is in and in `..'. ++source code in the directory that `configure' is in and in `..'. This ++is known as a "VPATH" build. + + With a non-GNU `make', it is safer to compile the package for one + architecture at a time in the source code directory. After you have +@@ -120,7 +144,8 @@ Installation Names + By default, `make install' installs the package's commands under + `/usr/local/bin', include files under `/usr/local/include', etc. You + can specify an installation prefix other than `/usr/local' by giving +-`configure' the option `--prefix=PREFIX'. ++`configure' the option `--prefix=PREFIX', where PREFIX must be an ++absolute file name. + + You can specify separate installation prefixes for + architecture-specific files and architecture-independent files. If you +@@ -131,15 +156,46 @@ Documentation and other data files still use the regular prefix. + In addition, if you use an unusual directory layout you can give + options like `--bindir=DIR' to specify different values for particular + kinds of files. Run `configure --help' for a list of the directories +-you can set and what kinds of files go in them. ++you can set and what kinds of files go in them. In general, the ++default for these options is expressed in terms of `${prefix}', so that ++specifying just `--prefix' will affect all of the other directory ++specifications that were not explicitly provided. ++ ++ The most portable way to affect installation locations is to pass the ++correct locations to `configure'; however, many packages provide one or ++both of the following shortcuts of passing variable assignments to the ++`make install' command line to change installation locations without ++having to reconfigure or recompile. ++ ++ The first method involves providing an override variable for each ++affected directory. For example, `make install ++prefix=/alternate/directory' will choose an alternate location for all ++directory configuration variables that were expressed in terms of ++`${prefix}'. Any directories that were specified during `configure', ++but not in terms of `${prefix}', must each be overridden at install ++time for the entire installation to be relocated. The approach of ++makefile variable overrides for each directory variable is required by ++the GNU Coding Standards, and ideally causes no recompilation. ++However, some platforms have known limitations with the semantics of ++shared libraries that end up requiring recompilation when using this ++method, particularly noticeable in packages that use GNU Libtool. ++ ++ The second method involves providing the `DESTDIR' variable. For ++example, `make install DESTDIR=/alternate/directory' will prepend ++`/alternate/directory' before all installation names. The approach of ++`DESTDIR' overrides is not required by the GNU Coding Standards, and ++does not work on platforms that have drive letters. On the other hand, ++it does better at avoiding recompilation issues, and works well even ++when some directory options were not specified in terms of `${prefix}' ++at `configure' time. ++ ++Optional Features ++================= + + If the package supports it, you can cause programs to be installed + with an extra prefix or suffix on their names by giving `configure' the + option `--program-prefix=PREFIX' or `--program-suffix=SUFFIX'. + +-Optional Features +-================= +- + Some packages pay attention to `--enable-FEATURE' options to + `configure', where FEATURE indicates an optional part of the package. + They may also pay attention to `--with-PACKAGE' options, where PACKAGE +@@ -152,6 +208,13 @@ find the X include and library files automatically, but if it doesn't, + you can use the `configure' options `--x-includes=DIR' and + `--x-libraries=DIR' to specify their locations. + ++ Some packages offer the ability to configure how verbose the ++execution of `make' will be. For these packages, running `./configure ++--enable-silent-rules' sets the default to minimal output, which can be ++overridden with `make V=1'; while running `./configure ++--disable-silent-rules' sets the default to verbose, which can be ++overridden with `make V=0'. ++ + Particular systems + ================== + +@@ -288,7 +351,7 @@ operates. + `configure' can determine that directory automatically. + + `--prefix=DIR' +- Use DIR as the installation prefix. *Note Installation Names:: ++ Use DIR as the installation prefix. *note Installation Names:: + for more details, including other options available for fine-tuning + the installation locations. + +diff --git a/Makefile.in b/Makefile.in +index 834112b..511d23a 100644 +--- a/Makefile.in ++++ b/Makefile.in +@@ -1,4 +1,4 @@ +-# Makefile.in generated by automake 1.11 from Makefile.am. ++# Makefile.in generated by automake 1.11.1 from Makefile.am. + # @configure_input@ + + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +@@ -115,7 +115,7 @@ GZIP_ENV = --best + DIST_ARCHIVES = $(distdir).tar.bz2 + distcleancheck_listfiles = find . -type f -print + ACLOCAL = @ACLOCAL@ +-ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@ ++ACLOCAL_AMFLAGS = -I macros + ALL_LINGUAS = @ALL_LINGUAS@ + AMTAR = @AMTAR@ + AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ +@@ -435,7 +435,7 @@ distclean-libtool: + # (which will cause the Makefiles to be regenerated when you run `make'); + # (2) otherwise, pass the desired values on the `make' command line. + $(RECURSIVE_TARGETS): +- @failcom='exit 1'; \ ++ @fail= failcom='exit 1'; \ + for f in x $$MAKEFLAGS; do \ + case $$f in \ + *=* | --[!k]*);; \ +@@ -460,7 +460,7 @@ $(RECURSIVE_TARGETS): + fi; test -z "$$fail" + + $(RECURSIVE_CLEAN_TARGETS): +- @failcom='exit 1'; \ ++ @fail= failcom='exit 1'; \ + for f in x $$MAKEFLAGS; do \ + case $$f in \ + *=* | --[!k]*);; \ +@@ -624,7 +624,8 @@ distdir: $(DISTFILES) + fi; \ + done + -test -n "$(am__skip_mode_fix)" \ +- || find "$(distdir)" -type d ! -perm -777 -exec chmod a+rwx {} \; -o \ ++ || find "$(distdir)" -type d ! -perm -755 \ ++ -exec chmod u+rwx,go+rx {} \; -o \ + ! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \ + ! -type d ! -perm -400 -exec chmod a+r {} \; -o \ + ! -type d ! -perm -444 -exec $(install_sh) -c -m a+r {} {} \; \ +@@ -667,17 +668,17 @@ dist dist-all: distdir + distcheck: dist + case '$(DIST_ARCHIVES)' in \ + *.tar.gz*) \ +- GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(am__untar) ;;\ ++ GZIP=$(GZIP_ENV) gzip -dc $(distdir).tar.gz | $(am__untar) ;;\ + *.tar.bz2*) \ +- bunzip2 -c $(distdir).tar.bz2 | $(am__untar) ;;\ ++ bzip2 -dc $(distdir).tar.bz2 | $(am__untar) ;;\ + *.tar.lzma*) \ +- unlzma -c $(distdir).tar.lzma | $(am__untar) ;;\ ++ lzma -dc $(distdir).tar.lzma | $(am__untar) ;;\ + *.tar.xz*) \ + xz -dc $(distdir).tar.xz | $(am__untar) ;;\ + *.tar.Z*) \ + uncompress -c $(distdir).tar.Z | $(am__untar) ;;\ + *.shar.gz*) \ +- GZIP=$(GZIP_ENV) gunzip -c $(distdir).shar.gz | unshar ;;\ ++ GZIP=$(GZIP_ENV) gzip -dc $(distdir).shar.gz | unshar ;;\ + *.zip*) \ + unzip $(distdir).zip ;;\ + esac +diff --git a/aclocal.m4 b/aclocal.m4 +index 5c6c2cb..85a1d8e 100644 +--- a/aclocal.m4 ++++ b/aclocal.m4 +@@ -1,4 +1,4 @@ +-# generated automatically by aclocal 1.11 -*- Autoconf -*- ++# generated automatically by aclocal 1.11.1 -*- Autoconf -*- + + # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, + # 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc. +@@ -13,8 +13,8 @@ + + m4_ifndef([AC_AUTOCONF_VERSION], + [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl +-m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.64],, +-[m4_warning([this file was generated for autoconf 2.64. ++m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.65],, ++[m4_warning([this file was generated for autoconf 2.65. + You have another version of autoconf. It may work, but is not guaranteed to. + If you have problems, you may need to regenerate the build system entirely. + To do so, use the procedure documented by the package, typically `autoreconf'.])]) +@@ -34,10 +34,8 @@ AC_DEFUN([AM_GCONF_SOURCE_2], + GCONF_SCHEMA_CONFIG_SOURCE=$GCONF_SCHEMA_INSTALL_SOURCE + fi + +- AC_ARG_WITH([gconf-source], +- AC_HELP_STRING([--with-gconf-source=sourceaddress], +- [Config database for installing schema files.]), +- [GCONF_SCHEMA_CONFIG_SOURCE="$withval"],) ++ AC_ARG_WITH(gconf-source, ++ [ --with-gconf-source=sourceaddress Config database for installing schema files.],GCONF_SCHEMA_CONFIG_SOURCE="$withval",) + + AC_SUBST(GCONF_SCHEMA_CONFIG_SOURCE) + AC_MSG_RESULT([Using config source $GCONF_SCHEMA_CONFIG_SOURCE for schema installation]) +@@ -46,20 +44,17 @@ AC_DEFUN([AM_GCONF_SOURCE_2], + GCONF_SCHEMA_FILE_DIR='$(sysconfdir)/gconf/schemas' + fi + +- AC_ARG_WITH([gconf-schema-file-dir], +- AC_HELP_STRING([--with-gconf-schema-file-dir=dir], +- [Directory for installing schema files.]), +- [GCONF_SCHEMA_FILE_DIR="$withval"],) ++ AC_ARG_WITH(gconf-schema-file-dir, ++ [ --with-gconf-schema-file-dir=dir Directory for installing schema files.],GCONF_SCHEMA_FILE_DIR="$withval",) + + AC_SUBST(GCONF_SCHEMA_FILE_DIR) + AC_MSG_RESULT([Using $GCONF_SCHEMA_FILE_DIR as install directory for schema files]) + + AC_ARG_ENABLE(schemas-install, +- AC_HELP_STRING([--disable-schemas-install], +- [Disable the schemas installation]), ++ [ --disable-schemas-install Disable the schemas installation], + [case ${enableval} in + yes|no) ;; +- *) AC_MSG_ERROR([bad value ${enableval} for --enable-schemas-install]) ;; ++ *) AC_MSG_ERROR(bad value ${enableval} for --enable-schemas-install) ;; + esac]) + AM_CONDITIONAL([GCONF_SCHEMAS_INSTALL], [test "$enable_schemas_install" != no]) + ]) +@@ -597,16 +592,14 @@ fi]) + # _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES]) + # --------------------------------------------- + m4_define([_PKG_CONFIG], +-[if test -n "$PKG_CONFIG"; then +- if test -n "$$1"; then +- pkg_cv_[]$1="$$1" +- else +- PKG_CHECK_EXISTS([$3], +- [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`], +- [pkg_failed=yes]) +- fi +-else +- pkg_failed=untried ++[if test -n "$$1"; then ++ pkg_cv_[]$1="$$1" ++ elif test -n "$PKG_CONFIG"; then ++ PKG_CHECK_EXISTS([$3], ++ [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`], ++ [pkg_failed=yes]) ++ else ++ pkg_failed=untried + fi[]dnl + ])# _PKG_CONFIG + +@@ -650,9 +643,9 @@ See the pkg-config man page for more details.]) + if test $pkg_failed = yes; then + _PKG_SHORT_ERRORS_SUPPORTED + if test $_pkg_short_errors_supported = yes; then +- $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "$2"` ++ $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "$2" 2>&1` + else +- $1[]_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$2"` ++ $1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors "$2" 2>&1` + fi + # Put the nasty error message in config.log where it belongs + echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD +@@ -702,7 +695,7 @@ AC_DEFUN([AM_AUTOMAKE_VERSION], + [am__api_version='1.11' + dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to + dnl require some minimum version. Point them to the right macro. +-m4_if([$1], [1.11], [], ++m4_if([$1], [1.11.1], [], + [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl + ]) + +@@ -718,7 +711,7 @@ m4_define([_AM_AUTOCONF_VERSION], []) + # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced. + # This function is AC_REQUIREd by AM_INIT_AUTOMAKE. + AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], +-[AM_AUTOMAKE_VERSION([1.11])dnl ++[AM_AUTOMAKE_VERSION([1.11.1])dnl + m4_ifndef([AC_AUTOCONF_VERSION], + [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl + _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))]) +@@ -1586,6 +1579,14 @@ python2.1 python2.0]) + am__strip_prefix=`echo "$am_py_prefix" | sed 's|.|.|g'` + am_cv_python_pythondir=`echo "$am_cv_python_pythondir" | sed "s,^$am__strip_prefix,$PYTHON_PREFIX,"` + ;; ++ *) ++ case $am_py_prefix in ++ /usr|/System*) ;; ++ *) ++ am_cv_python_pythondir=$PYTHON_PREFIX/lib/python$PYTHON_VERSION/site-packages ++ ;; ++ esac ++ ;; + esac + ]) + AC_SUBST([pythondir], [$am_cv_python_pythondir]) +@@ -1616,6 +1617,14 @@ python2.1 python2.0]) + am__strip_prefix=`echo "$am_py_exec_prefix" | sed 's|.|.|g'` + am_cv_python_pyexecdir=`echo "$am_cv_python_pyexecdir" | sed "s,^$am__strip_prefix,$PYTHON_EXEC_PREFIX,"` + ;; ++ *) ++ case $am_py_exec_prefix in ++ /usr|/System*) ;; ++ *) ++ am_cv_python_pyexecdir=$PYTHON_EXEC_PREFIX/lib/python$PYTHON_VERSION/site-packages ++ ;; ++ esac ++ ;; + esac + ]) + AC_SUBST([pyexecdir], [$am_cv_python_pyexecdir]) +diff --git a/backends/Makefile.in b/backends/Makefile.in +index 0f540b8..4d91f29 100644 +--- a/backends/Makefile.in ++++ b/backends/Makefile.in +@@ -1,4 +1,4 @@ +-# Makefile.in generated by automake 1.11 from Makefile.am. ++# Makefile.in generated by automake 1.11.1 from Makefile.am. + # @configure_input@ + + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +@@ -488,7 +488,7 @@ clean-libtool: + # (which will cause the Makefiles to be regenerated when you run `make'); + # (2) otherwise, pass the desired values on the `make' command line. + $(RECURSIVE_TARGETS): +- @failcom='exit 1'; \ ++ @fail= failcom='exit 1'; \ + for f in x $$MAKEFLAGS; do \ + case $$f in \ + *=* | --[!k]*);; \ +@@ -513,7 +513,7 @@ $(RECURSIVE_TARGETS): + fi; test -z "$$fail" + + $(RECURSIVE_CLEAN_TARGETS): +- @failcom='exit 1'; \ ++ @fail= failcom='exit 1'; \ + for f in x $$MAKEFLAGS; do \ + case $$f in \ + *=* | --[!k]*);; \ +diff --git a/backends/gstreamer/Makefile.in b/backends/gstreamer/Makefile.in +index be98d7f..434782b 100644 +--- a/backends/gstreamer/Makefile.in ++++ b/backends/gstreamer/Makefile.in +@@ -1,4 +1,4 @@ +-# Makefile.in generated by automake 1.11 from Makefile.am. ++# Makefile.in generated by automake 1.11.1 from Makefile.am. + # @configure_input@ + + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +diff --git a/bindings/Makefile.in b/bindings/Makefile.in +index 885d20f..84d232d 100644 +--- a/bindings/Makefile.in ++++ b/bindings/Makefile.in +@@ -1,4 +1,4 @@ +-# Makefile.in generated by automake 1.11 from Makefile.am. ++# Makefile.in generated by automake 1.11.1 from Makefile.am. + # @configure_input@ + + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +@@ -375,7 +375,7 @@ clean-libtool: + # (which will cause the Makefiles to be regenerated when you run `make'); + # (2) otherwise, pass the desired values on the `make' command line. + $(RECURSIVE_TARGETS): +- @failcom='exit 1'; \ ++ @fail= failcom='exit 1'; \ + for f in x $$MAKEFLAGS; do \ + case $$f in \ + *=* | --[!k]*);; \ +@@ -400,7 +400,7 @@ $(RECURSIVE_TARGETS): + fi; test -z "$$fail" + + $(RECURSIVE_CLEAN_TARGETS): +- @failcom='exit 1'; \ ++ @fail= failcom='exit 1'; \ + for f in x $$MAKEFLAGS; do \ + case $$f in \ + *=* | --[!k]*);; \ +diff --git a/bindings/python/Makefile.in b/bindings/python/Makefile.in +index 5301ded..2747295 100644 +--- a/bindings/python/Makefile.in ++++ b/bindings/python/Makefile.in +@@ -1,4 +1,4 @@ +-# Makefile.in generated by automake 1.11 from Makefile.am. ++# Makefile.in generated by automake 1.11.1 from Makefile.am. + # @configure_input@ + + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +diff --git a/bindings/vala/Makefile.in b/bindings/vala/Makefile.in +index 58595d5..7165e63 100644 +--- a/bindings/vala/Makefile.in ++++ b/bindings/vala/Makefile.in +@@ -1,4 +1,4 @@ +-# Makefile.in generated by automake 1.11 from Makefile.am. ++# Makefile.in generated by automake 1.11.1 from Makefile.am. + # @configure_input@ + + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +diff --git a/config.guess b/config.guess +index e3a2116..dc84c68 100755 +--- a/config.guess ++++ b/config.guess +@@ -4,7 +4,7 @@ + # 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 + # Free Software Foundation, Inc. + +-timestamp='2009-06-10' ++timestamp='2009-11-20' + + # This file is free software; you can redistribute it and/or modify it + # under the terms of the GNU General Public License as published by +@@ -27,16 +27,16 @@ timestamp='2009-06-10' + # the same distribution terms that you use for the rest of that program. + + +-# Originally written by Per Bothner . +-# Please send patches to . Submit a context +-# diff and a properly formatted ChangeLog entry. ++# Originally written by Per Bothner. Please send patches (context ++# diff format) to and include a ChangeLog ++# entry. + # + # This script attempts to guess a canonical system name similar to + # config.sub. If it succeeds, it prints the system name on stdout, and + # exits with 0. Otherwise, it exits with 1. + # +-# The plan is that this can be called by configure scripts if you +-# don't specify an explicit build system type. ++# You can get the latest version of this script from: ++# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD + + me=`echo "$0" | sed -e 's,.*/,,'` + +@@ -333,6 +333,9 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in + sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*) + echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` + exit ;; ++ i86pc:AuroraUX:5.*:* | i86xen:AuroraUX:5.*:*) ++ echo i386-pc-auroraux${UNAME_RELEASE} ++ exit ;; + i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*) + eval $set_cc_for_build + SUN_ARCH="i386" +@@ -807,12 +810,12 @@ EOF + i*:PW*:*) + echo ${UNAME_MACHINE}-pc-pw32 + exit ;; +- *:Interix*:[3456]*) ++ *:Interix*:*) + case ${UNAME_MACHINE} in + x86) + echo i586-pc-interix${UNAME_RELEASE} + exit ;; +- EM64T | authenticamd | genuineintel) ++ authenticamd | genuineintel | EM64T) + echo x86_64-unknown-interix${UNAME_RELEASE} + exit ;; + IA64) +@@ -854,6 +857,20 @@ EOF + i*86:Minix:*:*) + echo ${UNAME_MACHINE}-pc-minix + exit ;; ++ alpha:Linux:*:*) ++ case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in ++ EV5) UNAME_MACHINE=alphaev5 ;; ++ EV56) UNAME_MACHINE=alphaev56 ;; ++ PCA56) UNAME_MACHINE=alphapca56 ;; ++ PCA57) UNAME_MACHINE=alphapca56 ;; ++ EV6) UNAME_MACHINE=alphaev6 ;; ++ EV67) UNAME_MACHINE=alphaev67 ;; ++ EV68*) UNAME_MACHINE=alphaev68 ;; ++ esac ++ objdump --private-headers /bin/sh | grep -q ld.so.1 ++ if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi ++ echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC} ++ exit ;; + arm*:Linux:*:*) + eval $set_cc_for_build + if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \ +@@ -876,6 +893,17 @@ EOF + frv:Linux:*:*) + echo frv-unknown-linux-gnu + exit ;; ++ i*86:Linux:*:*) ++ LIBC=gnu ++ eval $set_cc_for_build ++ sed 's/^ //' << EOF >$dummy.c ++ #ifdef __dietlibc__ ++ LIBC=dietlibc ++ #endif ++EOF ++ eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC'` ++ echo "${UNAME_MACHINE}-pc-linux-${LIBC}" ++ exit ;; + ia64:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-gnu + exit ;; +@@ -901,39 +929,18 @@ EOF + #endif + #endif + EOF +- eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n ' +- /^CPU/{ +- s: ::g +- p +- }'`" ++ eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'` + test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; } + ;; + or32:Linux:*:*) + echo or32-unknown-linux-gnu + exit ;; +- ppc:Linux:*:*) +- echo powerpc-unknown-linux-gnu +- exit ;; +- ppc64:Linux:*:*) +- echo powerpc64-unknown-linux-gnu +- exit ;; +- alpha:Linux:*:*) +- case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in +- EV5) UNAME_MACHINE=alphaev5 ;; +- EV56) UNAME_MACHINE=alphaev56 ;; +- PCA56) UNAME_MACHINE=alphapca56 ;; +- PCA57) UNAME_MACHINE=alphapca56 ;; +- EV6) UNAME_MACHINE=alphaev6 ;; +- EV67) UNAME_MACHINE=alphaev67 ;; +- EV68*) UNAME_MACHINE=alphaev68 ;; +- esac +- objdump --private-headers /bin/sh | grep -q ld.so.1 +- if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi +- echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC} +- exit ;; + padre:Linux:*:*) + echo sparc-unknown-linux-gnu + exit ;; ++ parisc64:Linux:*:* | hppa64:Linux:*:*) ++ echo hppa64-unknown-linux-gnu ++ exit ;; + parisc:Linux:*:* | hppa:Linux:*:*) + # Look for CPU level + case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in +@@ -942,8 +949,11 @@ EOF + *) echo hppa-unknown-linux-gnu ;; + esac + exit ;; +- parisc64:Linux:*:* | hppa64:Linux:*:*) +- echo hppa64-unknown-linux-gnu ++ ppc64:Linux:*:*) ++ echo powerpc64-unknown-linux-gnu ++ exit ;; ++ ppc:Linux:*:*) ++ echo powerpc-unknown-linux-gnu + exit ;; + s390:Linux:*:* | s390x:Linux:*:*) + echo ${UNAME_MACHINE}-ibm-linux +@@ -966,58 +976,6 @@ EOF + xtensa*:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-gnu + exit ;; +- i*86:Linux:*:*) +- # The BFD linker knows what the default object file format is, so +- # first see if it will tell us. cd to the root directory to prevent +- # problems with other programs or directories called `ld' in the path. +- # Set LC_ALL=C to ensure ld outputs messages in English. +- ld_supported_targets=`cd /; LC_ALL=C ld --help 2>&1 \ +- | sed -ne '/supported targets:/!d +- s/[ ][ ]*/ /g +- s/.*supported targets: *// +- s/ .*// +- p'` +- case "$ld_supported_targets" in +- elf32-i386) +- TENTATIVE="${UNAME_MACHINE}-pc-linux-gnu" +- ;; +- esac +- # Determine whether the default compiler is a.out or elf +- eval $set_cc_for_build +- sed 's/^ //' << EOF >$dummy.c +- #include +- #ifdef __ELF__ +- # ifdef __GLIBC__ +- # if __GLIBC__ >= 2 +- LIBC=gnu +- # else +- LIBC=gnulibc1 +- # endif +- # else +- LIBC=gnulibc1 +- # endif +- #else +- #if defined(__INTEL_COMPILER) || defined(__PGI) || defined(__SUNPRO_C) || defined(__SUNPRO_CC) +- LIBC=gnu +- #else +- LIBC=gnuaout +- #endif +- #endif +- #ifdef __dietlibc__ +- LIBC=dietlibc +- #endif +-EOF +- eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n ' +- /^LIBC/{ +- s: ::g +- p +- }'`" +- test x"${LIBC}" != x && { +- echo "${UNAME_MACHINE}-pc-linux-${LIBC}" +- exit +- } +- test x"${TENTATIVE}" != x && { echo "${TENTATIVE}"; exit; } +- ;; + i*86:DYNIX/ptx:4*:*) + # ptx 4.0 does uname -s correctly, with DYNIX/ptx in there. + # earlier versions are messed up and put the nodename in both +@@ -1247,6 +1205,16 @@ EOF + *:Darwin:*:*) + UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown + case $UNAME_PROCESSOR in ++ i386) ++ eval $set_cc_for_build ++ if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then ++ if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \ ++ (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \ ++ grep IS_64BIT_ARCH >/dev/null ++ then ++ UNAME_PROCESSOR="x86_64" ++ fi ++ fi ;; + unknown) UNAME_PROCESSOR=powerpc ;; + esac + echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE} +diff --git a/config.sub b/config.sub +index eb0389a..2a55a50 100755 +--- a/config.sub ++++ b/config.sub +@@ -4,7 +4,7 @@ + # 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 + # Free Software Foundation, Inc. + +-timestamp='2009-06-11' ++timestamp='2009-11-20' + + # This file is (in principle) common to ALL GNU software. + # The presence of a machine in this file suggests that SOME GNU software +@@ -32,13 +32,16 @@ timestamp='2009-06-11' + + + # Please send patches to . Submit a context +-# diff and a properly formatted ChangeLog entry. ++# diff and a properly formatted GNU ChangeLog entry. + # + # Configuration subroutine to validate and canonicalize a configuration type. + # Supply the specified configuration type as an argument. + # If it is invalid, we print an error message on stderr and exit with code 1. + # Otherwise, we print the canonical config type on stdout and succeed. + ++# You can get the latest version of this script from: ++# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD ++ + # This file is supposed to be the same for all GNU packages + # and recognize all the CPU types, system types and aliases + # that are meaningful with *any* GNU software. +@@ -149,7 +152,7 @@ case $os in + -convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\ + -c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \ + -harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \ +- -apple | -axis | -knuth | -cray) ++ -apple | -axis | -knuth | -cray | -microblaze) + os= + basic_machine=$1 + ;; +@@ -284,6 +287,7 @@ case $basic_machine in + | pdp10 | pdp11 | pj | pjl \ + | powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \ + | pyramid \ ++ | rx \ + | score \ + | sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \ + | sh64 | sh64le \ +@@ -291,13 +295,14 @@ case $basic_machine in + | sparcv8 | sparcv9 | sparcv9b | sparcv9v \ + | spu | strongarm \ + | tahoe | thumb | tic4x | tic80 | tron \ ++ | ubicom32 \ + | v850 | v850e \ + | we32k \ + | x86 | xc16x | xscale | xscalee[bl] | xstormy16 | xtensa \ + | z8k | z80) + basic_machine=$basic_machine-unknown + ;; +- m6811 | m68hc11 | m6812 | m68hc12) ++ m6811 | m68hc11 | m6812 | m68hc12 | picochip) + # Motorola 68HC11/12. + basic_machine=$basic_machine-unknown + os=-none +@@ -340,7 +345,7 @@ case $basic_machine in + | lm32-* \ + | m32c-* | m32r-* | m32rle-* \ + | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \ +- | m88110-* | m88k-* | maxq-* | mcore-* | metag-* \ ++ | m88110-* | m88k-* | maxq-* | mcore-* | metag-* | microblaze-* \ + | mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \ + | mips16-* \ + | mips64-* | mips64el-* \ +@@ -368,7 +373,7 @@ case $basic_machine in + | pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \ + | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \ + | pyramid-* \ +- | romp-* | rs6000-* \ ++ | romp-* | rs6000-* | rx-* \ + | sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \ + | shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \ + | sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \ +@@ -377,6 +382,7 @@ case $basic_machine in + | tahoe-* | thumb-* \ + | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* | tile-* \ + | tron-* \ ++ | ubicom32-* \ + | v850-* | v850e-* | vax-* \ + | we32k-* \ + | x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \ +@@ -726,6 +732,9 @@ case $basic_machine in + basic_machine=ns32k-utek + os=-sysv + ;; ++ microblaze) ++ basic_machine=microblaze-xilinx ++ ;; + mingw32) + basic_machine=i386-pc + os=-mingw32 +@@ -1247,6 +1256,9 @@ case $os in + # First match some system type aliases + # that might get confused with valid system types. + # -solaris* is a basic system type, with this one exception. ++ -auroraux) ++ os=-auroraux ++ ;; + -solaris1 | -solaris1.*) + os=`echo $os | sed -e 's|solaris1|sunos4|'` + ;; +@@ -1268,8 +1280,8 @@ case $os in + # -sysv* is not here because it comes later, after sysvr4. + -gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \ + | -*vms* | -sco* | -esix* | -isc* | -aix* | -cnk* | -sunos | -sunos[34]*\ +- | -hpux* | -unos* | -osf* | -luna* | -dgux* | -solaris* | -sym* \ +- | -kopensolaris* \ ++ | -hpux* | -unos* | -osf* | -luna* | -dgux* | -auroraux* | -solaris* \ ++ | -sym* | -kopensolaris* \ + | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \ + | -aos* | -aros* \ + | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \ +@@ -1290,7 +1302,7 @@ case $os in + | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \ + | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \ + | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \ +- | -skyos* | -haiku* | -rdos* | -toppers* | -drops*) ++ | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es*) + # Remember, each alternative MUST END IN *, to match a version number. + ;; + -qnx*) +diff --git a/configure b/configure +index 5b20f98..8f4c200 100755 +--- a/configure ++++ b/configure +@@ -1,12 +1,14 @@ + #! /bin/sh + # Guess values for system-dependent variables and create Makefiles. +-# Generated by GNU Autoconf 2.64 for rhythmbox 0.12.6. ++# Generated by GNU Autoconf 2.65 for rhythmbox 0.12.6. + # + # Report bugs to . + # ++# + # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, +-# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software +-# Foundation, Inc. ++# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, ++# Inc. ++# + # + # This configure script is free software; the Free Software Foundation + # gives unlimited permission to copy, distribute and modify it. +@@ -677,7 +679,8 @@ fi + + + +-exec 7<&0 &1 ++test -n "$DJDIR" || exec 7<&0 &1 + + # Name of the host. + # hostname on some systems (SVR3.2, Linux) returns a bogus exit status, +@@ -1782,13 +1785,12 @@ Optional Features: + --disable-libnotify Disable libnotify support + --disable-musicbrainz don't build with MusicBrainz support + --disable-mmkeys don't build with Multimedia Keys support +- --disable-schemas-install +- Disable the schemas installation ++ --disable-schemas-install Disable the schemas installation + --enable-lirc enable lirc support + --enable-uninstalled-build + Search for files in build directory as well + --enable-more-warnings Maximum compiler warnings +- --enable-gtk-doc use gtk-doc to build documentation [default=no] ++ --enable-gtk-doc use gtk-doc to build documentation [[default=no]] + --disable-scrollkeeper do not make updates to the scrollkeeper database + --enable-python Enable python support + --enable-vala Enable Vala plugin support +@@ -1814,10 +1816,8 @@ Optional Packages: + --with-x use the X Window System + --with-libbrasero-media Build with libbrasero-media support + --with-libnautilus-burn Build with libnautilus-burn support +- --with-gconf-source=sourceaddress +- Config database for installing schema files. +- --with-gconf-schema-file-dir=dir +- Directory for installing schema files. ++ --with-gconf-source=sourceaddress Config database for installing schema files. ++ --with-gconf-schema-file-dir=dir Directory for installing schema files. + --with-internal-libsexy Build using internal libsexy library + --with-html-dir=PATH path to installed docs + --with-help-dir=DIR path to help docs +@@ -1831,7 +1831,7 @@ Some influential environment variables: + LDFLAGS linker flags, e.g. -L if you have libraries in a + nonstandard directory + LIBS libraries to pass to the linker, e.g. -l +- CPPFLAGS C/C++/Objective C preprocessor flags, e.g. -I if ++ CPPFLAGS (Objective) C/C++ preprocessor flags, e.g. -I if + you have headers in a nonstandard directory + CPP C preprocessor + PKG_CONFIG path to pkg-config utility +@@ -1975,7 +1975,7 @@ test -n "$ac_init_help" && exit $ac_status + if $ac_init_version; then + cat <<\_ACEOF + rhythmbox configure 0.12.6 +-generated by GNU Autoconf 2.64 ++generated by GNU Autoconf 2.65 + + Copyright (C) 2009 Free Software Foundation, Inc. + This configure script is free software; the Free Software Foundation +@@ -2022,7 +2022,7 @@ sed 's/^/| /' conftest.$ac_ext >&5 + ac_retval=1 + fi + eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} +- return $ac_retval ++ as_fn_set_status $ac_retval + + } # ac_fn_c_try_compile + +@@ -2068,7 +2068,7 @@ fi + # left behind by Apple's compiler. We do this before executing the actions. + rm -rf conftest.dSYM conftest_ipa8_conftest.oo + eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} +- return $ac_retval ++ as_fn_set_status $ac_retval + + } # ac_fn_c_try_link + +@@ -2172,7 +2172,7 @@ sed 's/^/| /' conftest.$ac_ext >&5 + ac_retval=1 + fi + eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} +- return $ac_retval ++ as_fn_set_status $ac_retval + + } # ac_fn_c_try_cpp + +@@ -2214,7 +2214,7 @@ sed 's/^/| /' conftest.$ac_ext >&5 + fi + rm -rf conftest.dSYM conftest_ipa8_conftest.oo + eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} +- return $ac_retval ++ as_fn_set_status $ac_retval + + } # ac_fn_c_try_run + +@@ -2423,7 +2423,7 @@ rm -f conftest.val + + fi + eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} +- return $ac_retval ++ as_fn_set_status $ac_retval + + } # ac_fn_c_compute_int + +@@ -2524,7 +2524,7 @@ This file contains any messages produced by compilers while + running configure, to aid debugging if configure makes a mistake. + + It was created by rhythmbox $as_me 0.12.6, which was +-generated by GNU Autoconf 2.64. Invocation command line was ++generated by GNU Autoconf 2.65. Invocation command line was + + $ $0 $@ + +@@ -2777,7 +2777,7 @@ fi + for ac_site_file in "$ac_site_file1" "$ac_site_file2" + do + test "x$ac_site_file" = xNONE && continue +- if test -r "$ac_site_file"; then ++ if test /dev/null != "$ac_site_file" && test -r "$ac_site_file"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: loading site script $ac_site_file" >&5 + $as_echo "$as_me: loading site script $ac_site_file" >&6;} + sed 's/^/| /' "$ac_site_file" >&5 +@@ -2786,9 +2786,9 @@ $as_echo "$as_me: loading site script $ac_site_file" >&6;} + done + + if test -r "$cache_file"; then +- # Some versions of bash will fail to source /dev/null (special +- # files actually), so we avoid doing that. +- if test -f "$cache_file"; then ++ # Some versions of bash will fail to source /dev/null (special files ++ # actually), so we avoid doing that. DJGPP emulates it as a regular file. ++ if test /dev/null != "$cache_file" && test -f "$cache_file"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: loading cache $cache_file" >&5 + $as_echo "$as_me: loading cache $cache_file" >&6;} + case $cache_file in +@@ -3210,6 +3210,7 @@ IFS=$as_save_IFS + + fi + ++ test -d ./--version && rmdir ./--version + if test "${ac_cv_path_mkdir+set}" = set; then + MKDIR_P="$ac_cv_path_mkdir -p" + else +@@ -3217,7 +3218,6 @@ fi + # value for MKDIR_P within a source directory, because that will + # break other packages using the cache if that directory is + # removed, or if the value is a relative name. +- test -d ./--version && rmdir ./--version + MKDIR_P="$ac_install_sh -d" + fi + fi +@@ -3816,32 +3816,30 @@ $as_echo "$ac_try_echo"; } >&5 + ... rest of stderr output deleted ... + 10q' conftest.err >conftest.er1 + cat conftest.er1 >&5 +- rm -f conftest.er1 conftest.err + fi ++ rm -f conftest.er1 conftest.err + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } + done + + cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ +-#include ++ + int + main () + { +-FILE *f = fopen ("conftest.out", "w"); +- return ferror (f) || fclose (f) != 0; + + ; + return 0; + } + _ACEOF + ac_clean_files_save=$ac_clean_files +-ac_clean_files="$ac_clean_files a.out a.out.dSYM a.exe b.out conftest.out" ++ac_clean_files="$ac_clean_files a.out a.out.dSYM a.exe b.out" + # Try to create an executable without -o first, disregard a.out. + # It will help us diagnose broken compilers, and finding out an intuition + # of exeext. +-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler default output file name" >&5 +-$as_echo_n "checking for C compiler default output file name... " >&6; } ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler works" >&5 ++$as_echo_n "checking whether the C compiler works... " >&6; } + ac_link_default=`$as_echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'` + + # The possible output files: +@@ -3903,10 +3901,10 @@ test "$ac_cv_exeext" = no && ac_cv_exeext= + else + ac_file='' + fi +-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_file" >&5 +-$as_echo "$ac_file" >&6; } + if test -z "$ac_file"; then : +- $as_echo "$as_me: failed program was:" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 ++$as_echo "no" >&6; } ++$as_echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +@@ -3914,51 +3912,18 @@ $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} + { as_fn_set_status 77 + as_fn_error "C compiler cannot create executables + See \`config.log' for more details." "$LINENO" 5; }; } ++else ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 ++$as_echo "yes" >&6; } + fi ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler default output file name" >&5 ++$as_echo_n "checking for C compiler default output file name... " >&6; } ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_file" >&5 ++$as_echo "$ac_file" >&6; } + ac_exeext=$ac_cv_exeext + +-# Check that the compiler produces executables we can run. If not, either +-# the compiler is broken, or we cross compile. +-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler works" >&5 +-$as_echo_n "checking whether the C compiler works... " >&6; } +-# If not cross compiling, check that we can run a simple program. +-if test "$cross_compiling" != yes; then +- if { ac_try='./$ac_file' +- { { case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +-$as_echo "$ac_try_echo"; } >&5 +- (eval "$ac_try") 2>&5 +- ac_status=$? +- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 +- test $ac_status = 0; }; }; then +- cross_compiling=no +- else +- if test "$cross_compiling" = maybe; then +- cross_compiling=yes +- else +- { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +-as_fn_error "cannot run C compiled programs. +-If you meant to cross compile, use \`--host'. +-See \`config.log' for more details." "$LINENO" 5; } +- fi +- fi +-fi +-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +-$as_echo "yes" >&6; } +- +-rm -f -r a.out a.out.dSYM a.exe conftest$ac_cv_exeext b.out conftest.out ++rm -f -r a.out a.out.dSYM a.exe conftest$ac_cv_exeext b.out + ac_clean_files=$ac_clean_files_save +-# Check that the compiler produces executables we can run. If not, either +-# the compiler is broken, or we cross compile. +-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are cross compiling" >&5 +-$as_echo_n "checking whether we are cross compiling... " >&6; } +-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $cross_compiling" >&5 +-$as_echo "$cross_compiling" >&6; } +- + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of executables" >&5 + $as_echo_n "checking for suffix of executables... " >&6; } + if { { ac_try="$ac_link" +@@ -3991,13 +3956,72 @@ $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} + as_fn_error "cannot compute suffix of executables: cannot compile and link + See \`config.log' for more details." "$LINENO" 5; } + fi +-rm -f conftest$ac_cv_exeext ++rm -f conftest conftest$ac_cv_exeext + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5 + $as_echo "$ac_cv_exeext" >&6; } + + rm -f conftest.$ac_ext + EXEEXT=$ac_cv_exeext + ac_exeext=$EXEEXT ++cat confdefs.h - <<_ACEOF >conftest.$ac_ext ++/* end confdefs.h. */ ++#include ++int ++main () ++{ ++FILE *f = fopen ("conftest.out", "w"); ++ return ferror (f) || fclose (f) != 0; ++ ++ ; ++ return 0; ++} ++_ACEOF ++ac_clean_files="$ac_clean_files conftest.out" ++# Check that the compiler produces executables we can run. If not, either ++# the compiler is broken, or we cross compile. ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are cross compiling" >&5 ++$as_echo_n "checking whether we are cross compiling... " >&6; } ++if test "$cross_compiling" != yes; then ++ { { ac_try="$ac_link" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" ++$as_echo "$ac_try_echo"; } >&5 ++ (eval "$ac_link") 2>&5 ++ ac_status=$? ++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 ++ test $ac_status = 0; } ++ if { ac_try='./conftest$ac_cv_exeext' ++ { { case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" ++$as_echo "$ac_try_echo"; } >&5 ++ (eval "$ac_try") 2>&5 ++ ac_status=$? ++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 ++ test $ac_status = 0; }; }; then ++ cross_compiling=no ++ else ++ if test "$cross_compiling" = maybe; then ++ cross_compiling=yes ++ else ++ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 ++$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} ++as_fn_error "cannot run C compiled programs. ++If you meant to cross compile, use \`--host'. ++See \`config.log' for more details." "$LINENO" 5; } ++ fi ++ fi ++fi ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $cross_compiling" >&5 ++$as_echo "$cross_compiling" >&6; } ++ ++rm -f conftest.$ac_ext conftest$ac_cv_exeext conftest.out ++ac_clean_files=$ac_clean_files_save + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of object files" >&5 + $as_echo_n "checking for suffix of object files... " >&6; } + if test "${ac_cv_objext+set}" = set; then : +@@ -4654,8 +4678,8 @@ INTLTOOL_SOUNDLIST_RULE='%.soundlist: %.soundlist.in $(INTLTOOL_MERGE) $(wildcar + + + # Check the gettext tools to make sure they are GNU +-# Extract the first word of "xgettext", so it can be a program name with args. +-set dummy xgettext; ac_word=$2 ++# Extract the first word of "gxgettext", so it can be a program name with args. ++set dummy gxgettext; ac_word=$2 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 + $as_echo_n "checking for $ac_word... " >&6; } + if test "${ac_cv_path_XGETTEXT+set}" = set; then : +@@ -4694,8 +4718,8 @@ $as_echo "no" >&6; } + fi + + +-# Extract the first word of "msgmerge", so it can be a program name with args. +-set dummy msgmerge; ac_word=$2 ++# Extract the first word of "gmsgmerge", so it can be a program name with args. ++set dummy gmsgmerge; ac_word=$2 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 + $as_echo_n "checking for $ac_word... " >&6; } + if test "${ac_cv_path_MSGMERGE+set}" = set; then : +@@ -4734,8 +4758,8 @@ $as_echo "no" >&6; } + fi + + +-# Extract the first word of "msgfmt", so it can be a program name with args. +-set dummy msgfmt; ac_word=$2 ++# Extract the first word of "gmsgfmt", so it can be a program name with args. ++set dummy gmsgfmt; ac_word=$2 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 + $as_echo_n "checking for $ac_word... " >&6; } + if test "${ac_cv_path_MSGFMT+set}" = set; then : +@@ -5312,8 +5336,8 @@ $as_echo "$ac_try_echo"; } >&5 + ... rest of stderr output deleted ... + 10q' conftest.err >conftest.er1 + cat conftest.er1 >&5 +- rm -f conftest.er1 conftest.err + fi ++ rm -f conftest.er1 conftest.err + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } + done +@@ -6045,8 +6069,8 @@ esac + + + +-macro_version='2.2.6' +-macro_revision='1.3012' ++macro_version='2.2.6b' ++macro_revision='1.3017' + + + +@@ -6587,13 +6611,13 @@ if test "${lt_cv_nm_interface+set}" = set; then : + else + lt_cv_nm_interface="BSD nm" + echo "int some_variable = 0;" > conftest.$ac_ext +- (eval echo "\"\$as_me:6590: $ac_compile\"" >&5) ++ (eval echo "\"\$as_me:6614: $ac_compile\"" >&5) + (eval "$ac_compile" 2>conftest.err) + cat conftest.err >&5 +- (eval echo "\"\$as_me:6593: $NM \\\"conftest.$ac_objext\\\"\"" >&5) ++ (eval echo "\"\$as_me:6617: $NM \\\"conftest.$ac_objext\\\"\"" >&5) + (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out) + cat conftest.err >&5 +- (eval echo "\"\$as_me:6596: output\"" >&5) ++ (eval echo "\"\$as_me:6620: output\"" >&5) + cat conftest.out >&5 + if $GREP 'External.*some_variable' conftest.out > /dev/null; then + lt_cv_nm_interface="MS dumpbin" +@@ -7063,7 +7087,7 @@ linux* | k*bsd*-gnu) + lt_cv_deplibs_check_method=pass_all + ;; + +-netbsd* | netbsdelf*-gnu) ++netbsd*) + if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then + lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$' + else +@@ -7798,7 +7822,7 @@ ia64-*-hpux*) + ;; + *-*-irix6*) + # Find out which ABI we are using. +- echo '#line 7801 "configure"' > conftest.$ac_ext ++ echo '#line 7825 "configure"' > conftest.$ac_ext + if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +@@ -9078,11 +9102,11 @@ else + -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ + -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ + -e 's:$: $lt_compiler_flag:'` +- (eval echo "\"\$as_me:9081: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:9105: $lt_compile\"" >&5) + (eval "$lt_compile" 2>conftest.err) + ac_status=$? + cat conftest.err >&5 +- echo "$as_me:9085: \$? = $ac_status" >&5 ++ echo "$as_me:9109: \$? = $ac_status" >&5 + if (exit $ac_status) && test -s "$ac_outfile"; then + # The compiler can only warn and ignore the option if not recognized + # So say no if there are warnings other than the usual output. +@@ -9417,11 +9441,11 @@ else + -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ + -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ + -e 's:$: $lt_compiler_flag:'` +- (eval echo "\"\$as_me:9420: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:9444: $lt_compile\"" >&5) + (eval "$lt_compile" 2>conftest.err) + ac_status=$? + cat conftest.err >&5 +- echo "$as_me:9424: \$? = $ac_status" >&5 ++ echo "$as_me:9448: \$? = $ac_status" >&5 + if (exit $ac_status) && test -s "$ac_outfile"; then + # The compiler can only warn and ignore the option if not recognized + # So say no if there are warnings other than the usual output. +@@ -9522,11 +9546,11 @@ else + -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ + -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ + -e 's:$: $lt_compiler_flag:'` +- (eval echo "\"\$as_me:9525: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:9549: $lt_compile\"" >&5) + (eval "$lt_compile" 2>out/conftest.err) + ac_status=$? + cat out/conftest.err >&5 +- echo "$as_me:9529: \$? = $ac_status" >&5 ++ echo "$as_me:9553: \$? = $ac_status" >&5 + if (exit $ac_status) && test -s out/conftest2.$ac_objext + then + # The compiler can only warn and ignore the option if not recognized +@@ -9577,11 +9601,11 @@ else + -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ + -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ + -e 's:$: $lt_compiler_flag:'` +- (eval echo "\"\$as_me:9580: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:9604: $lt_compile\"" >&5) + (eval "$lt_compile" 2>out/conftest.err) + ac_status=$? + cat out/conftest.err >&5 +- echo "$as_me:9584: \$? = $ac_status" >&5 ++ echo "$as_me:9608: \$? = $ac_status" >&5 + if (exit $ac_status) && test -s out/conftest2.$ac_objext + then + # The compiler can only warn and ignore the option if not recognized +@@ -9696,9 +9720,6 @@ $as_echo_n "checking whether the $compiler linker ($LD) supports shared librarie + openbsd*) + with_gnu_ld=no + ;; +- linux* | k*bsd*-gnu) +- link_all_deplibs=no +- ;; + esac + + ld_shlibs=yes +@@ -9881,7 +9902,7 @@ _LT_EOF + fi + ;; + +- netbsd* | netbsdelf*-gnu) ++ netbsd*) + if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then + archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' + wlarc= +@@ -10056,7 +10077,6 @@ _LT_EOF + if test "$aix_use_runtimelinking" = yes; then + shared_flag="$shared_flag "'${wl}-G' + fi +- link_all_deplibs=no + else + # not using gcc + if test "$host_cpu" = ia64; then +@@ -10383,7 +10403,7 @@ rm -f core conftest.err conftest.$ac_objext \ + link_all_deplibs=yes + ;; + +- netbsd* | netbsdelf*-gnu) ++ netbsd*) + if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then + archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out + else +@@ -11328,18 +11348,6 @@ rm -f core conftest.err conftest.$ac_objext \ + dynamic_linker='GNU/Linux ld.so' + ;; + +-netbsdelf*-gnu) +- version_type=linux +- need_lib_prefix=no +- need_version=no +- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' +- soname_spec='${libname}${release}${shared_ext}$major' +- shlibpath_var=LD_LIBRARY_PATH +- shlibpath_overrides_runpath=no +- hardcode_into_libs=yes +- dynamic_linker='NetBSD ld.elf_so' +- ;; +- + netbsd*) + version_type=sunos + need_lib_prefix=no +@@ -11960,7 +11968,7 @@ else + lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 + lt_status=$lt_dlunknown + cat > conftest.$ac_ext <<_LT_EOF +-#line 11963 "configure" ++#line 11971 "configure" + #include "confdefs.h" + + #if HAVE_DLFCN_H +@@ -12056,7 +12064,7 @@ else + lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 + lt_status=$lt_dlunknown + cat > conftest.$ac_ext <<_LT_EOF +-#line 12059 "configure" ++#line 12067 "configure" + #include "confdefs.h" + + #if HAVE_DLFCN_H +@@ -12696,7 +12704,7 @@ Report bugs to ." + + lt_cl_version="\ + rhythmbox config.lt 0.12.6 +-configured by $0, generated by GNU Autoconf 2.64. ++configured by $0, generated by GNU Autoconf 2.65. + + Copyright (C) 2008 Free Software Foundation, Inc. + This config.lt script is free software; the Free Software Foundation +@@ -14092,11 +14100,10 @@ pkg_failed=no + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for RB_CLIENT" >&5 + $as_echo_n "checking for RB_CLIENT... " >&6; } + +-if test -n "$PKG_CONFIG"; then +- if test -n "$RB_CLIENT_CFLAGS"; then +- pkg_cv_RB_CLIENT_CFLAGS="$RB_CLIENT_CFLAGS" +- else +- if test -n "$PKG_CONFIG" && \ ++if test -n "$RB_CLIENT_CFLAGS"; then ++ pkg_cv_RB_CLIENT_CFLAGS="$RB_CLIENT_CFLAGS" ++ elif test -n "$PKG_CONFIG"; then ++ if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= \$GLIB_REQS gio-2.0 >= \$GLIB_REQS\""; } >&5 + ($PKG_CONFIG --exists --print-errors "glib-2.0 >= $GLIB_REQS gio-2.0 >= $GLIB_REQS") 2>&5 + ac_status=$? +@@ -14106,15 +14113,13 @@ if test -n "$PKG_CONFIG"; then + else + pkg_failed=yes + fi +- fi +-else +- pkg_failed=untried ++ else ++ pkg_failed=untried + fi +-if test -n "$PKG_CONFIG"; then +- if test -n "$RB_CLIENT_LIBS"; then +- pkg_cv_RB_CLIENT_LIBS="$RB_CLIENT_LIBS" +- else +- if test -n "$PKG_CONFIG" && \ ++if test -n "$RB_CLIENT_LIBS"; then ++ pkg_cv_RB_CLIENT_LIBS="$RB_CLIENT_LIBS" ++ elif test -n "$PKG_CONFIG"; then ++ if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= \$GLIB_REQS gio-2.0 >= \$GLIB_REQS\""; } >&5 + ($PKG_CONFIG --exists --print-errors "glib-2.0 >= $GLIB_REQS gio-2.0 >= $GLIB_REQS") 2>&5 + ac_status=$? +@@ -14124,9 +14129,8 @@ if test -n "$PKG_CONFIG"; then + else + pkg_failed=yes + fi +- fi +-else +- pkg_failed=untried ++ else ++ pkg_failed=untried + fi + + +@@ -14139,9 +14143,9 @@ else + _pkg_short_errors_supported=no + fi + if test $_pkg_short_errors_supported = yes; then +- RB_CLIENT_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "glib-2.0 >= $GLIB_REQS gio-2.0 >= $GLIB_REQS"` ++ RB_CLIENT_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "glib-2.0 >= $GLIB_REQS gio-2.0 >= $GLIB_REQS" 2>&1` + else +- RB_CLIENT_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "glib-2.0 >= $GLIB_REQS gio-2.0 >= $GLIB_REQS"` ++ RB_CLIENT_PKG_ERRORS=`$PKG_CONFIG --print-errors "glib-2.0 >= $GLIB_REQS gio-2.0 >= $GLIB_REQS" 2>&1` + fi + # Put the nasty error message in config.log where it belongs + echo "$RB_CLIENT_PKG_ERRORS" >&5 +@@ -14221,11 +14225,10 @@ pkg_failed=no + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for RHYTHMBOX" >&5 + $as_echo_n "checking for RHYTHMBOX... " >&6; } + +-if test -n "$PKG_CONFIG"; then +- if test -n "$RHYTHMBOX_CFLAGS"; then +- pkg_cv_RHYTHMBOX_CFLAGS="$RHYTHMBOX_CFLAGS" +- else +- if test -n "$PKG_CONFIG" && \ ++if test -n "$RHYTHMBOX_CFLAGS"; then ++ pkg_cv_RHYTHMBOX_CFLAGS="$RHYTHMBOX_CFLAGS" ++ elif test -n "$PKG_CONFIG"; then ++ if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\\ + gtk+-2.0 >= \$GTK_REQS \\ + glib-2.0 >= \$GLIB_REQS \\ +@@ -14259,15 +14262,13 @@ if test -n "$PKG_CONFIG"; then + else + pkg_failed=yes + fi +- fi +-else +- pkg_failed=untried ++ else ++ pkg_failed=untried + fi +-if test -n "$PKG_CONFIG"; then +- if test -n "$RHYTHMBOX_LIBS"; then +- pkg_cv_RHYTHMBOX_LIBS="$RHYTHMBOX_LIBS" +- else +- if test -n "$PKG_CONFIG" && \ ++if test -n "$RHYTHMBOX_LIBS"; then ++ pkg_cv_RHYTHMBOX_LIBS="$RHYTHMBOX_LIBS" ++ elif test -n "$PKG_CONFIG"; then ++ if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\\ + gtk+-2.0 >= \$GTK_REQS \\ + glib-2.0 >= \$GLIB_REQS \\ +@@ -14301,9 +14302,8 @@ if test -n "$PKG_CONFIG"; then + else + pkg_failed=yes + fi +- fi +-else +- pkg_failed=untried ++ else ++ pkg_failed=untried + fi + + +@@ -14316,7 +14316,7 @@ else + _pkg_short_errors_supported=no + fi + if test $_pkg_short_errors_supported = yes; then +- RHYTHMBOX_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "\ ++ RHYTHMBOX_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "\ + gtk+-2.0 >= $GTK_REQS \ + glib-2.0 >= $GLIB_REQS \ + gio-2.0 >= $GLIB_REQS \ +@@ -14324,9 +14324,9 @@ fi + gnome-media-profiles >= $GNOME_MEDIA_PROFILES_REQS \ + libsoup-2.4 >= $LIBSOUP_REQS \ + libsoup-gnome-2.4 >= $LIBSOUP_REQS \ +- $LIBGNOME_REQS"` ++ $LIBGNOME_REQS" 2>&1` + else +- RHYTHMBOX_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "\ ++ RHYTHMBOX_PKG_ERRORS=`$PKG_CONFIG --print-errors "\ + gtk+-2.0 >= $GTK_REQS \ + glib-2.0 >= $GLIB_REQS \ + gio-2.0 >= $GLIB_REQS \ +@@ -14334,7 +14334,7 @@ fi + gnome-media-profiles >= $GNOME_MEDIA_PROFILES_REQS \ + libsoup-2.4 >= $LIBSOUP_REQS \ + libsoup-gnome-2.4 >= $LIBSOUP_REQS \ +- $LIBGNOME_REQS"` ++ $LIBGNOME_REQS" 2>&1` + fi + # Put the nasty error message in config.log where it belongs + echo "$RHYTHMBOX_PKG_ERRORS" >&5 +@@ -14384,11 +14384,10 @@ pkg_failed=no + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for TOTEM_PLPARSER" >&5 + $as_echo_n "checking for TOTEM_PLPARSER... " >&6; } + +-if test -n "$PKG_CONFIG"; then +- if test -n "$TOTEM_PLPARSER_CFLAGS"; then +- pkg_cv_TOTEM_PLPARSER_CFLAGS="$TOTEM_PLPARSER_CFLAGS" +- else +- if test -n "$PKG_CONFIG" && \ ++if test -n "$TOTEM_PLPARSER_CFLAGS"; then ++ pkg_cv_TOTEM_PLPARSER_CFLAGS="$TOTEM_PLPARSER_CFLAGS" ++ elif test -n "$PKG_CONFIG"; then ++ if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"totem-plparser >= \$TOTEM_PLPARSER_REQS\""; } >&5 + ($PKG_CONFIG --exists --print-errors "totem-plparser >= $TOTEM_PLPARSER_REQS") 2>&5 + ac_status=$? +@@ -14398,15 +14397,13 @@ if test -n "$PKG_CONFIG"; then + else + pkg_failed=yes + fi +- fi +-else +- pkg_failed=untried ++ else ++ pkg_failed=untried + fi +-if test -n "$PKG_CONFIG"; then +- if test -n "$TOTEM_PLPARSER_LIBS"; then +- pkg_cv_TOTEM_PLPARSER_LIBS="$TOTEM_PLPARSER_LIBS" +- else +- if test -n "$PKG_CONFIG" && \ ++if test -n "$TOTEM_PLPARSER_LIBS"; then ++ pkg_cv_TOTEM_PLPARSER_LIBS="$TOTEM_PLPARSER_LIBS" ++ elif test -n "$PKG_CONFIG"; then ++ if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"totem-plparser >= \$TOTEM_PLPARSER_REQS\""; } >&5 + ($PKG_CONFIG --exists --print-errors "totem-plparser >= $TOTEM_PLPARSER_REQS") 2>&5 + ac_status=$? +@@ -14416,9 +14413,8 @@ if test -n "$PKG_CONFIG"; then + else + pkg_failed=yes + fi +- fi +-else +- pkg_failed=untried ++ else ++ pkg_failed=untried + fi + + +@@ -14431,9 +14427,9 @@ else + _pkg_short_errors_supported=no + fi + if test $_pkg_short_errors_supported = yes; then +- TOTEM_PLPARSER_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "totem-plparser >= $TOTEM_PLPARSER_REQS"` ++ TOTEM_PLPARSER_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "totem-plparser >= $TOTEM_PLPARSER_REQS" 2>&1` + else +- TOTEM_PLPARSER_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "totem-plparser >= $TOTEM_PLPARSER_REQS"` ++ TOTEM_PLPARSER_PKG_ERRORS=`$PKG_CONFIG --print-errors "totem-plparser >= $TOTEM_PLPARSER_REQS" 2>&1` + fi + # Put the nasty error message in config.log where it belongs + echo "$TOTEM_PLPARSER_PKG_ERRORS" >&5 +@@ -14472,11 +14468,10 @@ pkg_failed=no + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GUDEV" >&5 + $as_echo_n "checking for GUDEV... " >&6; } + +-if test -n "$PKG_CONFIG"; then +- if test -n "$GUDEV_CFLAGS"; then +- pkg_cv_GUDEV_CFLAGS="$GUDEV_CFLAGS" +- else +- if test -n "$PKG_CONFIG" && \ ++if test -n "$GUDEV_CFLAGS"; then ++ pkg_cv_GUDEV_CFLAGS="$GUDEV_CFLAGS" ++ elif test -n "$PKG_CONFIG"; then ++ if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gudev-1.0 >= \$GUDEV_REQS\""; } >&5 + ($PKG_CONFIG --exists --print-errors "gudev-1.0 >= $GUDEV_REQS") 2>&5 + ac_status=$? +@@ -14486,15 +14481,13 @@ if test -n "$PKG_CONFIG"; then + else + pkg_failed=yes + fi +- fi +-else +- pkg_failed=untried ++ else ++ pkg_failed=untried + fi +-if test -n "$PKG_CONFIG"; then +- if test -n "$GUDEV_LIBS"; then +- pkg_cv_GUDEV_LIBS="$GUDEV_LIBS" +- else +- if test -n "$PKG_CONFIG" && \ ++if test -n "$GUDEV_LIBS"; then ++ pkg_cv_GUDEV_LIBS="$GUDEV_LIBS" ++ elif test -n "$PKG_CONFIG"; then ++ if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gudev-1.0 >= \$GUDEV_REQS\""; } >&5 + ($PKG_CONFIG --exists --print-errors "gudev-1.0 >= $GUDEV_REQS") 2>&5 + ac_status=$? +@@ -14504,9 +14497,8 @@ if test -n "$PKG_CONFIG"; then + else + pkg_failed=yes + fi +- fi +-else +- pkg_failed=untried ++ else ++ pkg_failed=untried + fi + + +@@ -14519,9 +14511,9 @@ else + _pkg_short_errors_supported=no + fi + if test $_pkg_short_errors_supported = yes; then +- GUDEV_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "gudev-1.0 >= $GUDEV_REQS"` ++ GUDEV_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "gudev-1.0 >= $GUDEV_REQS" 2>&1` + else +- GUDEV_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "gudev-1.0 >= $GUDEV_REQS"` ++ GUDEV_PKG_ERRORS=`$PKG_CONFIG --print-errors "gudev-1.0 >= $GUDEV_REQS" 2>&1` + fi + # Put the nasty error message in config.log where it belongs + echo "$GUDEV_PKG_ERRORS" >&5 +@@ -14575,11 +14567,10 @@ pkg_failed=no + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for HAL" >&5 + $as_echo_n "checking for HAL... " >&6; } + +-if test -n "$PKG_CONFIG"; then +- if test -n "$HAL_CFLAGS"; then +- pkg_cv_HAL_CFLAGS="$HAL_CFLAGS" +- else +- if test -n "$PKG_CONFIG" && \ ++if test -n "$HAL_CFLAGS"; then ++ pkg_cv_HAL_CFLAGS="$HAL_CFLAGS" ++ elif test -n "$PKG_CONFIG"; then ++ if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"hal >= 0.5 hal < 0.6\""; } >&5 + ($PKG_CONFIG --exists --print-errors "hal >= 0.5 hal < 0.6") 2>&5 + ac_status=$? +@@ -14589,15 +14580,13 @@ if test -n "$PKG_CONFIG"; then + else + pkg_failed=yes + fi +- fi +-else +- pkg_failed=untried ++ else ++ pkg_failed=untried + fi +-if test -n "$PKG_CONFIG"; then +- if test -n "$HAL_LIBS"; then +- pkg_cv_HAL_LIBS="$HAL_LIBS" +- else +- if test -n "$PKG_CONFIG" && \ ++if test -n "$HAL_LIBS"; then ++ pkg_cv_HAL_LIBS="$HAL_LIBS" ++ elif test -n "$PKG_CONFIG"; then ++ if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"hal >= 0.5 hal < 0.6\""; } >&5 + ($PKG_CONFIG --exists --print-errors "hal >= 0.5 hal < 0.6") 2>&5 + ac_status=$? +@@ -14607,9 +14596,8 @@ if test -n "$PKG_CONFIG"; then + else + pkg_failed=yes + fi +- fi +-else +- pkg_failed=untried ++ else ++ pkg_failed=untried + fi + + +@@ -14622,9 +14610,9 @@ else + _pkg_short_errors_supported=no + fi + if test $_pkg_short_errors_supported = yes; then +- HAL_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "hal >= 0.5 hal < 0.6"` ++ HAL_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "hal >= 0.5 hal < 0.6" 2>&1` + else +- HAL_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "hal >= 0.5 hal < 0.6"` ++ HAL_PKG_ERRORS=`$PKG_CONFIG --print-errors "hal >= 0.5 hal < 0.6" 2>&1` + fi + # Put the nasty error message in config.log where it belongs + echo "$HAL_PKG_ERRORS" >&5 +@@ -14677,11 +14665,10 @@ pkg_failed=no + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for IPOD" >&5 + $as_echo_n "checking for IPOD... " >&6; } + +-if test -n "$PKG_CONFIG"; then +- if test -n "$IPOD_CFLAGS"; then +- pkg_cv_IPOD_CFLAGS="$IPOD_CFLAGS" +- else +- if test -n "$PKG_CONFIG" && \ ++if test -n "$IPOD_CFLAGS"; then ++ pkg_cv_IPOD_CFLAGS="$IPOD_CFLAGS" ++ elif test -n "$PKG_CONFIG"; then ++ if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libgpod-1.0 >= \$LIBGPOD_REQS\""; } >&5 + ($PKG_CONFIG --exists --print-errors "libgpod-1.0 >= $LIBGPOD_REQS") 2>&5 + ac_status=$? +@@ -14691,15 +14678,13 @@ if test -n "$PKG_CONFIG"; then + else + pkg_failed=yes + fi +- fi +-else +- pkg_failed=untried ++ else ++ pkg_failed=untried + fi +-if test -n "$PKG_CONFIG"; then +- if test -n "$IPOD_LIBS"; then +- pkg_cv_IPOD_LIBS="$IPOD_LIBS" +- else +- if test -n "$PKG_CONFIG" && \ ++if test -n "$IPOD_LIBS"; then ++ pkg_cv_IPOD_LIBS="$IPOD_LIBS" ++ elif test -n "$PKG_CONFIG"; then ++ if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libgpod-1.0 >= \$LIBGPOD_REQS\""; } >&5 + ($PKG_CONFIG --exists --print-errors "libgpod-1.0 >= $LIBGPOD_REQS") 2>&5 + ac_status=$? +@@ -14709,9 +14694,8 @@ if test -n "$PKG_CONFIG"; then + else + pkg_failed=yes + fi +- fi +-else +- pkg_failed=untried ++ else ++ pkg_failed=untried + fi + + +@@ -14724,9 +14708,9 @@ else + _pkg_short_errors_supported=no + fi + if test $_pkg_short_errors_supported = yes; then +- IPOD_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "libgpod-1.0 >= $LIBGPOD_REQS"` ++ IPOD_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "libgpod-1.0 >= $LIBGPOD_REQS" 2>&1` + else +- IPOD_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libgpod-1.0 >= $LIBGPOD_REQS"` ++ IPOD_PKG_ERRORS=`$PKG_CONFIG --print-errors "libgpod-1.0 >= $LIBGPOD_REQS" 2>&1` + fi + # Put the nasty error message in config.log where it belongs + echo "$IPOD_PKG_ERRORS" >&5 +@@ -14780,11 +14764,10 @@ pkg_failed=no + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for MTP" >&5 + $as_echo_n "checking for MTP... " >&6; } + +-if test -n "$PKG_CONFIG"; then +- if test -n "$MTP_CFLAGS"; then +- pkg_cv_MTP_CFLAGS="$MTP_CFLAGS" +- else +- if test -n "$PKG_CONFIG" && \ ++if test -n "$MTP_CFLAGS"; then ++ pkg_cv_MTP_CFLAGS="$MTP_CFLAGS" ++ elif test -n "$PKG_CONFIG"; then ++ if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libmtp >= \$LIBMTP_REQS\""; } >&5 + ($PKG_CONFIG --exists --print-errors "libmtp >= $LIBMTP_REQS") 2>&5 + ac_status=$? +@@ -14794,15 +14777,13 @@ if test -n "$PKG_CONFIG"; then + else + pkg_failed=yes + fi +- fi +-else +- pkg_failed=untried ++ else ++ pkg_failed=untried + fi +-if test -n "$PKG_CONFIG"; then +- if test -n "$MTP_LIBS"; then +- pkg_cv_MTP_LIBS="$MTP_LIBS" +- else +- if test -n "$PKG_CONFIG" && \ ++if test -n "$MTP_LIBS"; then ++ pkg_cv_MTP_LIBS="$MTP_LIBS" ++ elif test -n "$PKG_CONFIG"; then ++ if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libmtp >= \$LIBMTP_REQS\""; } >&5 + ($PKG_CONFIG --exists --print-errors "libmtp >= $LIBMTP_REQS") 2>&5 + ac_status=$? +@@ -14812,9 +14793,8 @@ if test -n "$PKG_CONFIG"; then + else + pkg_failed=yes + fi +- fi +-else +- pkg_failed=untried ++ else ++ pkg_failed=untried + fi + + +@@ -14827,9 +14807,9 @@ else + _pkg_short_errors_supported=no + fi + if test $_pkg_short_errors_supported = yes; then +- MTP_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "libmtp >= $LIBMTP_REQS"` ++ MTP_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "libmtp >= $LIBMTP_REQS" 2>&1` + else +- MTP_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libmtp >= $LIBMTP_REQS"` ++ MTP_PKG_ERRORS=`$PKG_CONFIG --print-errors "libmtp >= $LIBMTP_REQS" 2>&1` + fi + # Put the nasty error message in config.log where it belongs + echo "$MTP_PKG_ERRORS" >&5 +@@ -14886,11 +14866,10 @@ pkg_failed=no + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNOME_KEYRING" >&5 + $as_echo_n "checking for GNOME_KEYRING... " >&6; } + +-if test -n "$PKG_CONFIG"; then +- if test -n "$GNOME_KEYRING_CFLAGS"; then +- pkg_cv_GNOME_KEYRING_CFLAGS="$GNOME_KEYRING_CFLAGS" +- else +- if test -n "$PKG_CONFIG" && \ ++if test -n "$GNOME_KEYRING_CFLAGS"; then ++ pkg_cv_GNOME_KEYRING_CFLAGS="$GNOME_KEYRING_CFLAGS" ++ elif test -n "$PKG_CONFIG"; then ++ if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gnome-keyring-1\""; } >&5 + ($PKG_CONFIG --exists --print-errors "gnome-keyring-1") 2>&5 + ac_status=$? +@@ -14900,15 +14879,13 @@ if test -n "$PKG_CONFIG"; then + else + pkg_failed=yes + fi +- fi +-else +- pkg_failed=untried ++ else ++ pkg_failed=untried + fi +-if test -n "$PKG_CONFIG"; then +- if test -n "$GNOME_KEYRING_LIBS"; then +- pkg_cv_GNOME_KEYRING_LIBS="$GNOME_KEYRING_LIBS" +- else +- if test -n "$PKG_CONFIG" && \ ++if test -n "$GNOME_KEYRING_LIBS"; then ++ pkg_cv_GNOME_KEYRING_LIBS="$GNOME_KEYRING_LIBS" ++ elif test -n "$PKG_CONFIG"; then ++ if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gnome-keyring-1\""; } >&5 + ($PKG_CONFIG --exists --print-errors "gnome-keyring-1") 2>&5 + ac_status=$? +@@ -14918,9 +14895,8 @@ if test -n "$PKG_CONFIG"; then + else + pkg_failed=yes + fi +- fi +-else +- pkg_failed=untried ++ else ++ pkg_failed=untried + fi + + +@@ -14933,9 +14909,9 @@ else + _pkg_short_errors_supported=no + fi + if test $_pkg_short_errors_supported = yes; then +- GNOME_KEYRING_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "gnome-keyring-1"` ++ GNOME_KEYRING_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "gnome-keyring-1" 2>&1` + else +- GNOME_KEYRING_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "gnome-keyring-1"` ++ GNOME_KEYRING_PKG_ERRORS=`$PKG_CONFIG --print-errors "gnome-keyring-1" 2>&1` + fi + # Put the nasty error message in config.log where it belongs + echo "$GNOME_KEYRING_PKG_ERRORS" >&5 +@@ -15022,11 +14998,10 @@ pkg_failed=no + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GSTREAMER_0_10" >&5 + $as_echo_n "checking for GSTREAMER_0_10... " >&6; } + +-if test -n "$PKG_CONFIG"; then +- if test -n "$GSTREAMER_0_10_CFLAGS"; then +- pkg_cv_GSTREAMER_0_10_CFLAGS="$GSTREAMER_0_10_CFLAGS" +- else +- if test -n "$PKG_CONFIG" && \ ++if test -n "$GSTREAMER_0_10_CFLAGS"; then ++ pkg_cv_GSTREAMER_0_10_CFLAGS="$GSTREAMER_0_10_CFLAGS" ++ elif test -n "$PKG_CONFIG"; then ++ if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\\ + gstreamer-0.10 >= \$GST_0_10_REQS + gstreamer-base-0.10 >= \$GST_0_10_REQS +@@ -15045,15 +15020,13 @@ if test -n "$PKG_CONFIG"; then + else + pkg_failed=yes + fi +- fi +-else +- pkg_failed=untried ++ else ++ pkg_failed=untried + fi +-if test -n "$PKG_CONFIG"; then +- if test -n "$GSTREAMER_0_10_LIBS"; then +- pkg_cv_GSTREAMER_0_10_LIBS="$GSTREAMER_0_10_LIBS" +- else +- if test -n "$PKG_CONFIG" && \ ++if test -n "$GSTREAMER_0_10_LIBS"; then ++ pkg_cv_GSTREAMER_0_10_LIBS="$GSTREAMER_0_10_LIBS" ++ elif test -n "$PKG_CONFIG"; then ++ if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\\ + gstreamer-0.10 >= \$GST_0_10_REQS + gstreamer-base-0.10 >= \$GST_0_10_REQS +@@ -15072,9 +15045,8 @@ if test -n "$PKG_CONFIG"; then + else + pkg_failed=yes + fi +- fi +-else +- pkg_failed=untried ++ else ++ pkg_failed=untried + fi + + +@@ -15087,15 +15059,15 @@ else + _pkg_short_errors_supported=no + fi + if test $_pkg_short_errors_supported = yes; then +- GSTREAMER_0_10_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "\ ++ GSTREAMER_0_10_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "\ + gstreamer-0.10 >= $GST_0_10_REQS + gstreamer-base-0.10 >= $GST_0_10_REQS +- gstreamer-plugins-base-0.10 >= $GST_0_10_REQS"` ++ gstreamer-plugins-base-0.10 >= $GST_0_10_REQS" 2>&1` + else +- GSTREAMER_0_10_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "\ ++ GSTREAMER_0_10_PKG_ERRORS=`$PKG_CONFIG --print-errors "\ + gstreamer-0.10 >= $GST_0_10_REQS + gstreamer-base-0.10 >= $GST_0_10_REQS +- gstreamer-plugins-base-0.10 >= $GST_0_10_REQS"` ++ gstreamer-plugins-base-0.10 >= $GST_0_10_REQS" 2>&1` + fi + # Put the nasty error message in config.log where it belongs + echo "$GSTREAMER_0_10_PKG_ERRORS" >&5 +@@ -15162,11 +15134,10 @@ pkg_failed=no + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for AVAHI" >&5 + $as_echo_n "checking for AVAHI... " >&6; } + +-if test -n "$PKG_CONFIG"; then +- if test -n "$AVAHI_CFLAGS"; then +- pkg_cv_AVAHI_CFLAGS="$AVAHI_CFLAGS" +- else +- if test -n "$PKG_CONFIG" && \ ++if test -n "$AVAHI_CFLAGS"; then ++ pkg_cv_AVAHI_CFLAGS="$AVAHI_CFLAGS" ++ elif test -n "$PKG_CONFIG"; then ++ if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"avahi-client >= \$AVAHI_REQS + avahi-glib >= \$AVAHI_REQS\""; } >&5 + ($PKG_CONFIG --exists --print-errors "avahi-client >= $AVAHI_REQS +@@ -15179,15 +15150,13 @@ if test -n "$PKG_CONFIG"; then + else + pkg_failed=yes + fi +- fi +-else +- pkg_failed=untried ++ else ++ pkg_failed=untried + fi +-if test -n "$PKG_CONFIG"; then +- if test -n "$AVAHI_LIBS"; then +- pkg_cv_AVAHI_LIBS="$AVAHI_LIBS" +- else +- if test -n "$PKG_CONFIG" && \ ++if test -n "$AVAHI_LIBS"; then ++ pkg_cv_AVAHI_LIBS="$AVAHI_LIBS" ++ elif test -n "$PKG_CONFIG"; then ++ if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"avahi-client >= \$AVAHI_REQS + avahi-glib >= \$AVAHI_REQS\""; } >&5 + ($PKG_CONFIG --exists --print-errors "avahi-client >= $AVAHI_REQS +@@ -15200,9 +15169,8 @@ if test -n "$PKG_CONFIG"; then + else + pkg_failed=yes + fi +- fi +-else +- pkg_failed=untried ++ else ++ pkg_failed=untried + fi + + +@@ -15215,11 +15183,11 @@ else + _pkg_short_errors_supported=no + fi + if test $_pkg_short_errors_supported = yes; then +- AVAHI_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "avahi-client >= $AVAHI_REQS +- avahi-glib >= $AVAHI_REQS"` ++ AVAHI_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "avahi-client >= $AVAHI_REQS ++ avahi-glib >= $AVAHI_REQS" 2>&1` + else +- AVAHI_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "avahi-client >= $AVAHI_REQS +- avahi-glib >= $AVAHI_REQS"` ++ AVAHI_PKG_ERRORS=`$PKG_CONFIG --print-errors "avahi-client >= $AVAHI_REQS ++ avahi-glib >= $AVAHI_REQS" 2>&1` + fi + # Put the nasty error message in config.log where it belongs + echo "$AVAHI_PKG_ERRORS" >&5 +@@ -15275,11 +15243,10 @@ pkg_failed=no + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for NOTIFY" >&5 + $as_echo_n "checking for NOTIFY... " >&6; } + +-if test -n "$PKG_CONFIG"; then +- if test -n "$NOTIFY_CFLAGS"; then +- pkg_cv_NOTIFY_CFLAGS="$NOTIFY_CFLAGS" +- else +- if test -n "$PKG_CONFIG" && \ ++if test -n "$NOTIFY_CFLAGS"; then ++ pkg_cv_NOTIFY_CFLAGS="$NOTIFY_CFLAGS" ++ elif test -n "$PKG_CONFIG"; then ++ if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\\ + libnotify >= \$LIBNOTIFY_REQS\""; } >&5 + ($PKG_CONFIG --exists --print-errors "\ +@@ -15292,15 +15259,13 @@ if test -n "$PKG_CONFIG"; then + else + pkg_failed=yes + fi +- fi +-else +- pkg_failed=untried ++ else ++ pkg_failed=untried + fi +-if test -n "$PKG_CONFIG"; then +- if test -n "$NOTIFY_LIBS"; then +- pkg_cv_NOTIFY_LIBS="$NOTIFY_LIBS" +- else +- if test -n "$PKG_CONFIG" && \ ++if test -n "$NOTIFY_LIBS"; then ++ pkg_cv_NOTIFY_LIBS="$NOTIFY_LIBS" ++ elif test -n "$PKG_CONFIG"; then ++ if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\\ + libnotify >= \$LIBNOTIFY_REQS\""; } >&5 + ($PKG_CONFIG --exists --print-errors "\ +@@ -15313,9 +15278,8 @@ if test -n "$PKG_CONFIG"; then + else + pkg_failed=yes + fi +- fi +-else +- pkg_failed=untried ++ else ++ pkg_failed=untried + fi + + +@@ -15328,11 +15292,11 @@ else + _pkg_short_errors_supported=no + fi + if test $_pkg_short_errors_supported = yes; then +- NOTIFY_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "\ +- libnotify >= $LIBNOTIFY_REQS"` ++ NOTIFY_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "\ ++ libnotify >= $LIBNOTIFY_REQS" 2>&1` + else +- NOTIFY_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "\ +- libnotify >= $LIBNOTIFY_REQS"` ++ NOTIFY_PKG_ERRORS=`$PKG_CONFIG --print-errors "\ ++ libnotify >= $LIBNOTIFY_REQS" 2>&1` + fi + # Put the nasty error message in config.log where it belongs + echo "$NOTIFY_PKG_ERRORS" >&5 +@@ -15466,11 +15430,10 @@ pkg_failed=no + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GSTCDDA" >&5 + $as_echo_n "checking for GSTCDDA... " >&6; } + +-if test -n "$PKG_CONFIG"; then +- if test -n "$GSTCDDA_CFLAGS"; then +- pkg_cv_GSTCDDA_CFLAGS="$GSTCDDA_CFLAGS" +- else +- if test -n "$PKG_CONFIG" && \ ++if test -n "$GSTCDDA_CFLAGS"; then ++ pkg_cv_GSTCDDA_CFLAGS="$GSTCDDA_CFLAGS" ++ elif test -n "$PKG_CONFIG"; then ++ if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gstreamer-cdda-0.10\""; } >&5 + ($PKG_CONFIG --exists --print-errors "gstreamer-cdda-0.10") 2>&5 + ac_status=$? +@@ -15480,15 +15443,13 @@ if test -n "$PKG_CONFIG"; then + else + pkg_failed=yes + fi +- fi +-else +- pkg_failed=untried ++ else ++ pkg_failed=untried + fi +-if test -n "$PKG_CONFIG"; then +- if test -n "$GSTCDDA_LIBS"; then +- pkg_cv_GSTCDDA_LIBS="$GSTCDDA_LIBS" +- else +- if test -n "$PKG_CONFIG" && \ ++if test -n "$GSTCDDA_LIBS"; then ++ pkg_cv_GSTCDDA_LIBS="$GSTCDDA_LIBS" ++ elif test -n "$PKG_CONFIG"; then ++ if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gstreamer-cdda-0.10\""; } >&5 + ($PKG_CONFIG --exists --print-errors "gstreamer-cdda-0.10") 2>&5 + ac_status=$? +@@ -15498,9 +15459,8 @@ if test -n "$PKG_CONFIG"; then + else + pkg_failed=yes + fi +- fi +-else +- pkg_failed=untried ++ else ++ pkg_failed=untried + fi + + +@@ -15513,9 +15473,9 @@ else + _pkg_short_errors_supported=no + fi + if test $_pkg_short_errors_supported = yes; then +- GSTCDDA_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "gstreamer-cdda-0.10"` ++ GSTCDDA_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "gstreamer-cdda-0.10" 2>&1` + else +- GSTCDDA_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "gstreamer-cdda-0.10"` ++ GSTCDDA_PKG_ERRORS=`$PKG_CONFIG --print-errors "gstreamer-cdda-0.10" 2>&1` + fi + # Put the nasty error message in config.log where it belongs + echo "$GSTCDDA_PKG_ERRORS" >&5 +@@ -15566,11 +15526,10 @@ pkg_failed=no + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for MUSICBRAINZ3" >&5 + $as_echo_n "checking for MUSICBRAINZ3... " >&6; } + +-if test -n "$PKG_CONFIG"; then +- if test -n "$MUSICBRAINZ3_CFLAGS"; then +- pkg_cv_MUSICBRAINZ3_CFLAGS="$MUSICBRAINZ3_CFLAGS" +- else +- if test -n "$PKG_CONFIG" && \ ++if test -n "$MUSICBRAINZ3_CFLAGS"; then ++ pkg_cv_MUSICBRAINZ3_CFLAGS="$MUSICBRAINZ3_CFLAGS" ++ elif test -n "$PKG_CONFIG"; then ++ if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libmusicbrainz3 >= \$MUSICBRAINZ3_REQS\""; } >&5 + ($PKG_CONFIG --exists --print-errors "libmusicbrainz3 >= $MUSICBRAINZ3_REQS") 2>&5 + ac_status=$? +@@ -15580,15 +15539,13 @@ if test -n "$PKG_CONFIG"; then + else + pkg_failed=yes + fi +- fi +-else +- pkg_failed=untried ++ else ++ pkg_failed=untried + fi +-if test -n "$PKG_CONFIG"; then +- if test -n "$MUSICBRAINZ3_LIBS"; then +- pkg_cv_MUSICBRAINZ3_LIBS="$MUSICBRAINZ3_LIBS" +- else +- if test -n "$PKG_CONFIG" && \ ++if test -n "$MUSICBRAINZ3_LIBS"; then ++ pkg_cv_MUSICBRAINZ3_LIBS="$MUSICBRAINZ3_LIBS" ++ elif test -n "$PKG_CONFIG"; then ++ if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libmusicbrainz3 >= \$MUSICBRAINZ3_REQS\""; } >&5 + ($PKG_CONFIG --exists --print-errors "libmusicbrainz3 >= $MUSICBRAINZ3_REQS") 2>&5 + ac_status=$? +@@ -15598,9 +15555,8 @@ if test -n "$PKG_CONFIG"; then + else + pkg_failed=yes + fi +- fi +-else +- pkg_failed=untried ++ else ++ pkg_failed=untried + fi + + @@ Diff output truncated at 100000 characters. @@ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From hson at users.sourceforge.net Sat Jan 9 01:21:59 2010 From: hson at users.sourceforge.net (hson at users.sourceforge.net) Date: Sat, 09 Jan 2010 00:21:59 +0000 Subject: [csw-devel] SF.net SVN: gar:[7917] csw/mgar/pkg Message-ID: Revision: 7917 http://gar.svn.sourceforge.net/gar/?rev=7917&view=rev Author: hson Date: 2010-01-09 00:21:59 +0000 (Sat, 09 Jan 2010) Log Message: ----------- djvulibre: Initial commit Added Paths: ----------- csw/mgar/pkg/djvulibre/ csw/mgar/pkg/djvulibre/Makefile csw/mgar/pkg/djvulibre/branches/ csw/mgar/pkg/djvulibre/tags/ csw/mgar/pkg/djvulibre/trunk/ csw/mgar/pkg/djvulibre/trunk/Makefile csw/mgar/pkg/djvulibre/trunk/files/ csw/mgar/pkg/djvulibre/trunk/files/ddjvu.cpp.patch Added: csw/mgar/pkg/djvulibre/Makefile =================================================================== --- csw/mgar/pkg/djvulibre/Makefile (rev 0) +++ csw/mgar/pkg/djvulibre/Makefile 2010-01-09 00:21:59 UTC (rev 7917) @@ -0,0 +1,15 @@ +# vim: ft=make ts=4 sw=4 noet + +default: + @echo "You are in the pkg/ directory." + +%: + $(MAKE) -C trunk $* + +paranoid-%: + $(MAKE) -C trunk $* || exit 2 + +export BUILDLOG ?= $(shell pwd)/buildlog.txt + +report-%: + $(MAKE) -C trunk $* || echo " *** make $* in $$i failed ***" >> $(BUILDLOG) Property changes on: csw/mgar/pkg/djvulibre/trunk ___________________________________________________________________ Added: svn:ignore + cookies download work Added: svn:externals + gar https://gar.svn.sf.net/svnroot/gar/csw/mgar/gar/v2 Added: csw/mgar/pkg/djvulibre/trunk/Makefile =================================================================== --- csw/mgar/pkg/djvulibre/trunk/Makefile (rev 0) +++ csw/mgar/pkg/djvulibre/trunk/Makefile 2010-01-09 00:21:59 UTC (rev 7917) @@ -0,0 +1,67 @@ +GARNAME = djvulibre +GARVERSION = 3.5.22 +CATEGORIES = apps + +DESCRIPTION = DjVu standalone viewer, browser plug-in, command line tools +define BLURB +endef + +SF_PROJ = djvu +MASTER_SITES = $(SF_MIRRORS)/DjVuLibre/$(GARVERSION)/ +DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz + +PACKAGES = CSWdjvulibre CSWdjvulibrert CSWdjvulibredevel +CATALOGNAME_CSWdjvulibre = djvulibre +CATALOGNAME_CSWdjvulibrert = djvulibre_rt +CATALOGNAME_CSWdjvulibredevel = djvulibre_devel + +SPKG_DESC_CSWdjvulibre += DjVu standalone viewer, browser plug-in, command linetools +SPKG_DESC_CSWdjvulibrert += DjVu standalone viewer, browser plug-in, command line tools - runtime package +SPKG_DESC_CSWdjvulibredevel += DjVu standalone viewer, browser plug-in, commandline tools - developer package + +REQUIRED_PKGS_CSWdjvulibre += CSWdjvulibrert +REQUIRED_PKGS_CSWdjvulibrert += +REQUIRED_PKGS_CSWdjvulibredevel += CSWdjvulibre + +PKGFILES_CSWdjvulibrert = $(PKGFILES_RT) +PKGFILES_CSWdjvulibredevel = $(PKGFILES_DEVEL) + +SPKG_SOURCEURL = http://djvu.sourceforge.net/ + +LICENSE = COPYING + +PATCHFILES += ddjvu.cpp.patch + +# We define upstream file regex so we can be notifed of new upstream software re +lease +UPSTREAM_MASTER_SITES = $(SF_PROJECT_SHOWFILE)=32953 +UPSTREAM_USE_SF = 1 +UFILES_REGEX = (\d+(?:\.\d+)*) + +OPTS='-DNDEBUG' +EXTRA_COMMON_EXPORTS += OPTS + +PTHREAD_LIBS = -lpthread +PTHREAD_CFLAGS = -D_REENTRANT +EXTRA_COMMON_EXPORTS += PTHREAD_LIBS +EXTRA_COMMON_EXPORTS += PTHREAD_CFLAGS + + +EXTRA_INC = $(prefix)/X11/include +EXTRA_LIB = $(prefix)/X11/lib +EXTRA_PKG_CONFIG_DIRS = $(prefix)/X11/lib + +X_CFLAGS = -I$(prefix)/X11/include +X_LIBS = -L$(prefix)/X11/lib -R$(prefix)/X11/lib +EXTRA_COMMON_EXPORTS += X_CFLAGS +EXTRA_COMMON_EXPORTS += X_LIBS + +CONFIGURE_ARGS = $(DIRPATHS) +CONFIGURE_ARGS += --with-extra-includes=$(prefix)/X11/include +CONFIGURE_ARGS += --with-extra-libraries=$(prefix)/X11/lib + +BUILD64 = 1 + +TEST_TARGET = + +include gar/category.mk Added: csw/mgar/pkg/djvulibre/trunk/files/ddjvu.cpp.patch =================================================================== --- csw/mgar/pkg/djvulibre/trunk/files/ddjvu.cpp.patch (rev 0) +++ csw/mgar/pkg/djvulibre/trunk/files/ddjvu.cpp.patch 2010-01-09 00:21:59 UTC (rev 7917) @@ -0,0 +1,13 @@ +--- djvulibre-3.5.22.orig/tools/ddjvu.cpp 2009-02-13 10:46:27.000000000 +0100 ++++ djvulibre-3.5.22/tools/ddjvu.cpp 2010-01-07 17:45:43.925544787 +0100 +@@ -66,6 +66,10 @@ + + #include + #include ++#if (defined(__SUNPRO_CC) && ( defined(__SunOS_5_8) || defined(__SunOS_5_9))) && !defined(__sparcv9) ++using std::__flsbuf; ++using std::__filbuf; ++#endif + #include + #include + #include This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From hson at users.sourceforge.net Sat Jan 9 01:47:24 2010 From: hson at users.sourceforge.net (hson at users.sourceforge.net) Date: Sat, 09 Jan 2010 00:47:24 +0000 Subject: [csw-devel] SF.net SVN: gar:[7918] csw/mgar/pkg/djvulibre/trunk/Makefile Message-ID: Revision: 7918 http://gar.svn.sourceforge.net/gar/?rev=7918&view=rev Author: hson Date: 2010-01-09 00:47:18 +0000 (Sat, 09 Jan 2010) Log Message: ----------- djvulibre: Copy paste error Modified Paths: -------------- csw/mgar/pkg/djvulibre/trunk/Makefile Modified: csw/mgar/pkg/djvulibre/trunk/Makefile =================================================================== --- csw/mgar/pkg/djvulibre/trunk/Makefile 2010-01-09 00:21:59 UTC (rev 7917) +++ csw/mgar/pkg/djvulibre/trunk/Makefile 2010-01-09 00:47:18 UTC (rev 7918) @@ -32,8 +32,6 @@ PATCHFILES += ddjvu.cpp.patch -# We define upstream file regex so we can be notifed of new upstream software re -lease UPSTREAM_MASTER_SITES = $(SF_PROJECT_SHOWFILE)=32953 UPSTREAM_USE_SF = 1 UFILES_REGEX = (\d+(?:\.\d+)*) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From hson at users.sourceforge.net Sat Jan 9 02:11:43 2010 From: hson at users.sourceforge.net (hson at users.sourceforge.net) Date: Sat, 09 Jan 2010 01:11:43 +0000 Subject: [csw-devel] SF.net SVN: gar:[7919] csw/mgar/pkg/djvulibre/trunk/Makefile Message-ID: Revision: 7919 http://gar.svn.sourceforge.net/gar/?rev=7919&view=rev Author: hson Date: 2010-01-09 01:11:43 +0000 (Sat, 09 Jan 2010) Log Message: ----------- djvulibre: Add some dependencies Modified Paths: -------------- csw/mgar/pkg/djvulibre/trunk/Makefile Modified: csw/mgar/pkg/djvulibre/trunk/Makefile =================================================================== --- csw/mgar/pkg/djvulibre/trunk/Makefile 2010-01-09 00:47:18 UTC (rev 7918) +++ csw/mgar/pkg/djvulibre/trunk/Makefile 2010-01-09 01:11:43 UTC (rev 7919) @@ -19,8 +19,8 @@ SPKG_DESC_CSWdjvulibrert += DjVu standalone viewer, browser plug-in, command line tools - runtime package SPKG_DESC_CSWdjvulibredevel += DjVu standalone viewer, browser plug-in, commandline tools - developer package -REQUIRED_PKGS_CSWdjvulibre += CSWdjvulibrert -REQUIRED_PKGS_CSWdjvulibrert += +REQUIRED_PKGS_CSWdjvulibre += CSWdjvulibrert CSWjpeg CSWtiff CSWzlib +REQUIRED_PKGS_CSWdjvulibrert += CSWjpeg REQUIRED_PKGS_CSWdjvulibredevel += CSWdjvulibre PKGFILES_CSWdjvulibrert = $(PKGFILES_RT) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From hson at users.sourceforge.net Sat Jan 9 02:23:42 2010 From: hson at users.sourceforge.net (hson at users.sourceforge.net) Date: Sat, 09 Jan 2010 01:23:42 +0000 Subject: [csw-devel] SF.net SVN: gar:[7920] csw/mgar/pkg Message-ID: Revision: 7920 http://gar.svn.sourceforge.net/gar/?rev=7920&view=rev Author: hson Date: 2010-01-09 01:23:42 +0000 (Sat, 09 Jan 2010) Log Message: ----------- ghostscript: Initial commit Added Paths: ----------- csw/mgar/pkg/ghostscript/ csw/mgar/pkg/ghostscript/Makefile csw/mgar/pkg/ghostscript/branches/ csw/mgar/pkg/ghostscript/tags/ csw/mgar/pkg/ghostscript/trunk/ csw/mgar/pkg/ghostscript/trunk/Makefile csw/mgar/pkg/ghostscript/trunk/checksums csw/mgar/pkg/ghostscript/trunk/files/ Added: csw/mgar/pkg/ghostscript/Makefile =================================================================== --- csw/mgar/pkg/ghostscript/Makefile (rev 0) +++ csw/mgar/pkg/ghostscript/Makefile 2010-01-09 01:23:42 UTC (rev 7920) @@ -0,0 +1,15 @@ +# vim: ft=make ts=4 sw=4 noet + +default: + @echo "You are in the pkg/ directory." + +%: + $(MAKE) -C trunk $* + +paranoid-%: + $(MAKE) -C trunk $* || exit 2 + +export BUILDLOG ?= $(shell pwd)/buildlog.txt + +report-%: + $(MAKE) -C trunk $* || echo " *** make $* in $$i failed ***" >> $(BUILDLOG) Property changes on: csw/mgar/pkg/ghostscript/trunk ___________________________________________________________________ Added: svn:ignore + cookies download work Added: svn:externals + gar https://gar.svn.sf.net/svnroot/gar/csw/mgar/gar/v2 Added: csw/mgar/pkg/ghostscript/trunk/Makefile =================================================================== --- csw/mgar/pkg/ghostscript/trunk/Makefile (rev 0) +++ csw/mgar/pkg/ghostscript/trunk/Makefile 2010-01-09 01:23:42 UTC (rev 7920) @@ -0,0 +1,27 @@ +GARNAME = ghostscript +GARVERSION = 8.70 +CATEGORIES = apps + +DESCRIPTION = EXIF Tag Parsing Library +define BLURB + libexif is a library for parsing, editing, and saving EXIF data. It is + intended to replace lots of redundant implementations in command-line + utilities and programs with GUIs. +endef + +MASTER_SITES = $(SF_MIRRORS) +DISTFILES = $(GARNAME)-$(GARVERSION).tar.bz2 + +SPKG_SOURCEURL = http://www.ghostscript.com + +LICENSE = COPYING + +REQUIRED_PKGS += + +UPSTREAM_MASTER_SITES = $(SF_PROJECT_SHOWFILE)= +UPSTREAM_USE_SF = 1 +UFILES_REGEX = (\d+(?:\.\d+)*) + +CONFIGURE_ARGS = $(DIRPATHS) + +include gar/category.mk Added: csw/mgar/pkg/ghostscript/trunk/checksums =================================================================== --- csw/mgar/pkg/ghostscript/trunk/checksums (rev 0) +++ csw/mgar/pkg/ghostscript/trunk/checksums 2010-01-09 01:23:42 UTC (rev 7920) @@ -0,0 +1 @@ +526366f8cb4fda0d3d293597cc5b984b ghostscript-8.70.tar.bz2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From hson at users.sourceforge.net Sat Jan 9 04:35:00 2010 From: hson at users.sourceforge.net (hson at users.sourceforge.net) Date: Sat, 09 Jan 2010 03:35:00 +0000 Subject: [csw-devel] SF.net SVN: gar:[7921] csw/mgar/pkg Message-ID: Revision: 7921 http://gar.svn.sourceforge.net/gar/?rev=7921&view=rev Author: hson Date: 2010-01-09 03:34:54 +0000 (Sat, 09 Jan 2010) Log Message: ----------- jpeg: Initial commit Added Paths: ----------- csw/mgar/pkg/jpeg/ csw/mgar/pkg/jpeg/branches/ csw/mgar/pkg/jpeg/tags/ csw/mgar/pkg/jpeg/trunk/ csw/mgar/pkg/jpeg/trunk/Makefile csw/mgar/pkg/jpeg/trunk/checksums csw/mgar/pkg/jpeg/trunk/files/ Property changes on: csw/mgar/pkg/jpeg/trunk ___________________________________________________________________ Added: svn:ignore + cookies download work Added: svn:externals + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 Added: csw/mgar/pkg/jpeg/trunk/Makefile =================================================================== --- csw/mgar/pkg/jpeg/trunk/Makefile (rev 0) +++ csw/mgar/pkg/jpeg/trunk/Makefile 2010-01-09 03:34:54 UTC (rev 7921) @@ -0,0 +1,23 @@ +GARNAME = jpeg +GARVERSION = 6 +CATEGORIES = lib + +DESCRIPTION = JPEG library and tools by the Independent JPEG Group +define BLURB + Long description +endef + +MASTER_SITES = http://www.ijg.org/files/ +DISTFILES = $(GARNAME)src.v$(GARVERSION).tar.gz + +CONFIGURE_ARGS = $(DIRPATHS) +CONFIGURE_ARGS += --enable-shared + +EXTRA_CC_FLAGS = -g -w +EXTRA_CXX_FLAGS = -g -w +EXTRA_LD_FLAGS = -g +OPT_FLAGS_SOS = + +STRIP_LIBTOOL = 1 + +include gar/category.mk Added: csw/mgar/pkg/jpeg/trunk/checksums =================================================================== --- csw/mgar/pkg/jpeg/trunk/checksums (rev 0) +++ csw/mgar/pkg/jpeg/trunk/checksums 2010-01-09 03:34:54 UTC (rev 7921) @@ -0,0 +1 @@ +382ef33b339c299b56baf1296cda9785 jpegsrc.v7.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From hson at users.sourceforge.net Sat Jan 9 05:43:32 2010 From: hson at users.sourceforge.net (hson at users.sourceforge.net) Date: Sat, 09 Jan 2010 04:43:32 +0000 Subject: [csw-devel] SF.net SVN: gar:[7922] csw/mgar/pkg Message-ID: Revision: 7922 http://gar.svn.sourceforge.net/gar/?rev=7922&view=rev Author: hson Date: 2010-01-09 04:43:32 +0000 (Sat, 09 Jan 2010) Log Message: ----------- libpaper: Initial commit Added Paths: ----------- csw/mgar/pkg/libpaper/ csw/mgar/pkg/libpaper/Makefile csw/mgar/pkg/libpaper/branches/ csw/mgar/pkg/libpaper/tags/ csw/mgar/pkg/libpaper/trunk/ csw/mgar/pkg/libpaper/trunk/Makefile csw/mgar/pkg/libpaper/trunk/checksums csw/mgar/pkg/libpaper/trunk/files/ Added: csw/mgar/pkg/libpaper/Makefile =================================================================== --- csw/mgar/pkg/libpaper/Makefile (rev 0) +++ csw/mgar/pkg/libpaper/Makefile 2010-01-09 04:43:32 UTC (rev 7922) @@ -0,0 +1,15 @@ +# vim: ft=make ts=4 sw=4 noet + +default: + @echo "You are in the pkg/ directory." + +%: + $(MAKE) -C trunk $* + +paranoid-%: + $(MAKE) -C trunk $* || exit 2 + +export BUILDLOG ?= $(shell pwd)/buildlog.txt + +report-%: + $(MAKE) -C trunk $* || echo " *** make $* in $$i failed ***" >> $(BUILDLOG) Property changes on: csw/mgar/pkg/libpaper/trunk ___________________________________________________________________ Added: svn:ignore + cookies download work Added: svn:externals + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 Added: csw/mgar/pkg/libpaper/trunk/Makefile =================================================================== --- csw/mgar/pkg/libpaper/trunk/Makefile (rev 0) +++ csw/mgar/pkg/libpaper/trunk/Makefile 2010-01-09 04:43:32 UTC (rev 7922) @@ -0,0 +1,36 @@ +GARNAME = libpaper +GARVERSION = 1.1.23 +GARSUBREV = nmu1 +CATEGORIES = lib + +DESCRIPTION = Library and tools for handling papersize +define BLURB + Long description +endef + +MASTER_SITES = http://ftp.us.debian.org/debian/pool/main/libp/libpaper/ +DISTFILES = $(GARNAME)_$(GARVERSION)+$(GARSUBREV).tar.gz +DISTNAME = $(GARNAME)-$(GARVERSION)+$(GARSUBREV) + +PACKAGES = CSWlibpaper CSWlibpaperdevel +CATALOGNAME_CSWlibpaper = libpaper +CATALOGNAME_CSWlibpaperdevel = libpaper_devel + +SPKG_DESC_CSWlibpaper += Library and tools for handling papersize +SPKG_DESC_CSWlibpaperdevel += Library and tools for handling papersize - developer package + +REQUIRED_PKGS_CSWlibpaper = +REQUIRED_PKGS_CSWlibpaperdevel += CSWlibpaper + +PKGFILES_CSWlibpaperdevel = $(PKGFILES_DEVEL) + +UFILES_REGEX = $(GARNAME)_(\d+(?:\.\d+)*).tar.gz +UPSTREAM_MASTER_SITES = $(MASTER_SITES) + +EXTRA_CFLAGS = -Xc + +CONFIGURE_ARGS = $(DIRPATHS) + +TEST_TARGET = check + +include gar/category.mk Added: csw/mgar/pkg/libpaper/trunk/checksums =================================================================== --- csw/mgar/pkg/libpaper/trunk/checksums (rev 0) +++ csw/mgar/pkg/libpaper/trunk/checksums 2010-01-09 04:43:32 UTC (rev 7922) @@ -0,0 +1 @@ +fb6c57fbad2e691b54210fad43745f4f libpaper_1.1.23+nmu1.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From hson at users.sourceforge.net Sat Jan 9 06:36:44 2010 From: hson at users.sourceforge.net (hson at users.sourceforge.net) Date: Sat, 09 Jan 2010 05:36:44 +0000 Subject: [csw-devel] SF.net SVN: gar:[7923] csw/mgar/pkg/ghostscript/trunk Message-ID: Revision: 7923 http://gar.svn.sourceforge.net/gar/?rev=7923&view=rev Author: hson Date: 2010-01-09 05:36:44 +0000 (Sat, 09 Jan 2010) Log Message: ----------- ghostscript: First attempt to get it to build properly Modified Paths: -------------- csw/mgar/pkg/ghostscript/trunk/Makefile csw/mgar/pkg/ghostscript/trunk/checksums Added Paths: ----------- csw/mgar/pkg/ghostscript/trunk/files/0001-Support-libjpeg7.patch csw/mgar/pkg/ghostscript/trunk/files/0002-Rearrange-compiler-flags.patch csw/mgar/pkg/ghostscript/trunk/files/0003-Change-gcc-flags-to-sun.patch Modified: csw/mgar/pkg/ghostscript/trunk/Makefile =================================================================== --- csw/mgar/pkg/ghostscript/trunk/Makefile 2010-01-09 04:43:32 UTC (rev 7922) +++ csw/mgar/pkg/ghostscript/trunk/Makefile 2010-01-09 05:36:44 UTC (rev 7923) @@ -2,11 +2,8 @@ GARVERSION = 8.70 CATEGORIES = apps -DESCRIPTION = EXIF Tag Parsing Library +DESCRIPTION = Ghostscript, a PostScript and PDF interpreter for previewing, conversion and printing define BLURB - libexif is a library for parsing, editing, and saving EXIF data. It is - intended to replace lots of redundant implementations in command-line - utilities and programs with GUIs. endef MASTER_SITES = $(SF_MIRRORS) @@ -22,6 +19,24 @@ UPSTREAM_USE_SF = 1 UFILES_REGEX = (\d+(?:\.\d+)*) -CONFIGURE_ARGS = $(DIRPATHS) +#PATCHFILES += 0001-Support-libjpeg7.patch +PATCHFILES += 0002-Rearrange-compiler-flags.patch +PATCHFILES += 0003-Change-gcc-flags-to-sun.patch +#BUILD64 = 1 + +EXTRA_INC = $(prefix)/X11/include +EXTRA_LIB = $(prefix)/X11/lib +EXTRA_PKG_CONFIG_DIRS = $(prefix)/X11/lib + +CONFIGURE_ARGS = $(DIRPATHS) +CONFIGURE_ARGS += --enable-dynamic +CONFIGURE_ARGS += --x-includes=$(prefix)/X11/include +CONFIGURE_ARGS += --x-libraries=$(prefix)/X11/lib + include gar/category.mk + +pre-configure-$(MODULATION): + @(echo "~~~ Removing bundled jpeglib ~~~") + @rm -rf $(WORKSRC)/jpeg +# @rm -rf $(WORKSRC)/jasper Modified: csw/mgar/pkg/ghostscript/trunk/checksums =================================================================== --- csw/mgar/pkg/ghostscript/trunk/checksums 2010-01-09 04:43:32 UTC (rev 7922) +++ csw/mgar/pkg/ghostscript/trunk/checksums 2010-01-09 05:36:44 UTC (rev 7923) @@ -1 +1,3 @@ +5ebe8476ccc2170e4f2d620fe284f875 0002-Rearrange-compiler-flags.patch +5c142b23f91c2b2f48ba1f354e26346f 0003-Change-gcc-flags-to-sun.patch 526366f8cb4fda0d3d293597cc5b984b ghostscript-8.70.tar.bz2 Added: csw/mgar/pkg/ghostscript/trunk/files/0001-Support-libjpeg7.patch =================================================================== --- csw/mgar/pkg/ghostscript/trunk/files/0001-Support-libjpeg7.patch (rev 0) +++ csw/mgar/pkg/ghostscript/trunk/files/0001-Support-libjpeg7.patch 2010-01-09 05:36:44 UTC (rev 7923) @@ -0,0 +1,14 @@ +--- ghostscript-8.70.orig/jpeg/jcinit.c 2010-01-09 03:15:02.698411311 +0100 ++++ ghostscript-8.70/jpeg/jcinit.c 2010-01-09 03:46:28.021317069 +0100 +@@ -42,7 +42,11 @@ + jinit_forward_dct(cinfo); + /* Entropy encoding: either Huffman or arithmetic coding. */ + if (cinfo->arith_code) { ++#ifdef JERR_ARITH_NOTIMPL + ERREXIT(cinfo, JERR_ARITH_NOTIMPL); ++#else ++ jinit_arith_encoder(cinfo); ++#endif + } else { + if (cinfo->progressive_mode) { + #ifdef C_PROGRESSIVE_SUPPORTED Added: csw/mgar/pkg/ghostscript/trunk/files/0002-Rearrange-compiler-flags.patch =================================================================== --- csw/mgar/pkg/ghostscript/trunk/files/0002-Rearrange-compiler-flags.patch (rev 0) +++ csw/mgar/pkg/ghostscript/trunk/files/0002-Rearrange-compiler-flags.patch 2010-01-09 05:36:44 UTC (rev 7923) @@ -0,0 +1,23 @@ +--- ghostscript-8.70.orig/base/jasper.mak 2008-04-11 00:08:20.000000000 +0200 ++++ ghostscript-8.70/base/jasper.mak 2010-01-09 06:04:15.251525415 +0100 +@@ -159,7 +159,8 @@ + $(D_)EXCLUDE_PNG_SUPPORT$(_D_)1$(_D) + + # define our specific compiler +-JAS_CC=$(CC_) $(I_)$(JASGEN) $(II)$(JPXI_)$(_I) $(JPXCF_) $(JAS_EXCF_) ++#JAS_CC=$(CC_) $(I_)$(JASGEN) $(II)$(JPXI_)$(_I) $(JPXCF_) $(JAS_EXCF_) ++JAS_CC=$(CC) $(I_)$(JASGEN) $(II)$(JPXI_)$(_I) $(JPXCF_) $(JAS_EXCF_) $(CFLAGS) + JASO_=$(O_)$(JASOBJ) + + # switch in the selected .dev +--- ghostscript-8.70.orig/base/lib.mak 2009-07-22 23:09:42.000000000 +0200 ++++ ghostscript-8.70/base/lib.mak 2010-01-09 06:15:47.023956040 +0100 +@@ -30,7 +30,7 @@ + GLJCC=$(CC_) $(I_)$(GLI_) $(II)$(JI_)$(_I) $(JCF_) $(GLF_) + GLZCC=$(CC_) $(I_)$(GLI_) $(II)$(ZI_)$(_I) $(ZCF_) $(GLF_) + GLJBIG2CC=$(CC_) $(I_)$(GLI_) $(II)$(JB2I_)$(_I) $(JB2CF_) $(GLF_) +-GLJASCC=$(CC_) $(I_)$(JPXI_) $(II)$(GLI_)$(_I) $(JPXCF_) $(GLF_) ++GLJASCC=$(CC) $(I_)$(JPXI_) $(II)$(GLI_)$(_I) $(JPXCF_) $(GLF_) $(CFLAGS) + GLLDFJB2CC=$(CC_) $(I_)$(LDF_JB2I_) $(II)$(GLI_)$(_I) $(JB2CF_) $(GLF_) + GLLWFJPXCC=$(CC_) $(I_)$(LWF_JPXI_) $(II)$(GLI_)$(_I) $(JPXCF_) $(GLF_) + GLCCSHARED=$(CC_SHARED) $(GLCCFLAGS) Added: csw/mgar/pkg/ghostscript/trunk/files/0003-Change-gcc-flags-to-sun.patch =================================================================== --- csw/mgar/pkg/ghostscript/trunk/files/0003-Change-gcc-flags-to-sun.patch (rev 0) +++ csw/mgar/pkg/ghostscript/trunk/files/0003-Change-gcc-flags-to-sun.patch 2010-01-09 05:36:44 UTC (rev 7923) @@ -0,0 +1,24 @@ +--- /home/hson/tmp/ghostscript-8.70/base/devs.mak 2009-02-14 01:46:58.000000000 +0100 ++++ ghostscript-8.70/base/devs.mak 2010-01-09 06:42:04.053689304 +0100 +@@ -418,10 +418,10 @@ + ### NON PORTABLE, ONLY UNIX WITH GCC SUPPORT + + $(GLOBJ)lvga256.so : $(lvga256_) +- $(CCLD) $(LDFLAGS) -shared -o $(GLOBJ)lvga256.so $(lvga256_) -lvga -lvgagl ++ $(CCLD) $(LDFLAGS) -G -o $(GLOBJ)lvga256.so $(lvga256_) -lvga -lvgagl + + $(GLOBJ)vgalib.so : $(vgalib_) +- $(CCLD) $(LDFLAGS) -shared -o $(GLOBJ)vgalib.so $(vgalib_) -lvga -lvgagl ++ $(CCLD) $(LDFLAGS) -G -o $(GLOBJ)vgalib.so $(vgalib_) -lvga -lvgagl + + ### -------------------------- The X11 device -------------------------- ### + +@@ -524,7 +524,7 @@ + ### NON PORTABLE, ONLY UNIX WITH GCC SUPPORT + + $(GLOBJ)X11.so : $(x11alt_) $(x11_) +- $(CCLD) $(LDFLAGS) -shared -o $(GLOBJ)X11.so $(x11alt_) $(x11_) -L/usr/X11R6/lib -lXt -lSM -lICE -lXext -lX11 $(XLIBDIRS) ++ $(CCLD) $(LDFLAGS) -G -o $(GLOBJ)X11.so $(x11alt_) $(x11_) -L/usr/X11R6/lib -lXt -lSM -lICE -lXext -lX11 $(XLIBDIRS) + + ###### --------------- Memory-buffered printer devices --------------- ###### + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From chninkel at users.sourceforge.net Sat Jan 9 13:49:27 2010 From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net) Date: Sat, 09 Jan 2010 12:49:27 +0000 Subject: [csw-devel] SF.net SVN: gar:[7924] csw/mgar/pkg/rlwrap/trunk Message-ID: Revision: 7924 http://gar.svn.sourceforge.net/gar/?rev=7924&view=rev Author: chninkel Date: 2010-01-09 12:49:27 +0000 (Sat, 09 Jan 2010) Log Message: ----------- rlwrap: updated to 0.35 Modified Paths: -------------- csw/mgar/pkg/rlwrap/trunk/Makefile csw/mgar/pkg/rlwrap/trunk/checksums csw/mgar/pkg/rlwrap/trunk/files/changelog.CSW Modified: csw/mgar/pkg/rlwrap/trunk/Makefile =================================================================== --- csw/mgar/pkg/rlwrap/trunk/Makefile 2010-01-09 05:36:44 UTC (rev 7923) +++ csw/mgar/pkg/rlwrap/trunk/Makefile 2010-01-09 12:49:27 UTC (rev 7924) @@ -13,7 +13,7 @@ ###### Package information ####### GARNAME = rlwrap -GARVERSION = 0.34 +GARVERSION = 0.35 CATEGORIES = utils DESCRIPTION = A readline wrapper Modified: csw/mgar/pkg/rlwrap/trunk/checksums =================================================================== --- csw/mgar/pkg/rlwrap/trunk/checksums 2010-01-09 05:36:44 UTC (rev 7923) +++ csw/mgar/pkg/rlwrap/trunk/checksums 2010-01-09 12:49:27 UTC (rev 7924) @@ -1,2 +1,2 @@ -4fc3209edf432acc97c2457887e525e4 changelog.CSW -c0972f1803db4d45a047da6301ad1633 rlwrap-0.34.tar.gz +055ee01142d68026506ec4cd991d65b4 changelog.CSW +d9459defe4dbfb191d9332386141952d rlwrap-0.35.tar.gz Modified: csw/mgar/pkg/rlwrap/trunk/files/changelog.CSW =================================================================== --- csw/mgar/pkg/rlwrap/trunk/files/changelog.CSW 2010-01-09 05:36:44 UTC (rev 7923) +++ csw/mgar/pkg/rlwrap/trunk/files/changelog.CSW 2010-01-09 12:49:27 UTC (rev 7924) @@ -1,3 +1,9 @@ +rlwrap (0.35,REV=2010.01.09) unstable + + * New upstream release. + + -- Yann Rouillard Sat, 09 Jan 2010 13:48:33 +0100 + rlwrap (0.34,REV=2009.12.29) unstable * New upstream release. This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Sat Jan 9 15:02:07 2010 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Sat, 09 Jan 2010 14:02:07 +0000 Subject: [csw-devel] SF.net SVN: gar:[7925] csw/mgar/pkg/coreutils/trunk Message-ID: Revision: 7925 http://gar.svn.sourceforge.net/gar/?rev=7925&view=rev Author: bdwalton Date: 2010-01-09 14:02:03 +0000 (Sat, 09 Jan 2010) Log Message: ----------- coreutils: bump to 8.3 Modified Paths: -------------- csw/mgar/pkg/coreutils/trunk/Makefile csw/mgar/pkg/coreutils/trunk/checksums Modified: csw/mgar/pkg/coreutils/trunk/Makefile =================================================================== --- csw/mgar/pkg/coreutils/trunk/Makefile 2010-01-09 12:49:27 UTC (rev 7924) +++ csw/mgar/pkg/coreutils/trunk/Makefile 2010-01-09 14:02:03 UTC (rev 7925) @@ -1,5 +1,5 @@ GARNAME = coreutils -GARVERSION = 8.2 +GARVERSION = 8.3 CATEGORIES = utils # seq has issues related to the handling of long double's with -O2. Modified: csw/mgar/pkg/coreutils/trunk/checksums =================================================================== --- csw/mgar/pkg/coreutils/trunk/checksums 2010-01-09 12:49:27 UTC (rev 7924) +++ csw/mgar/pkg/coreutils/trunk/checksums 2010-01-09 14:02:03 UTC (rev 7925) @@ -1,3 +1,2 @@ 0fde2b11f34c49995765566acf6cd5b4 0001-Fix-solaris-acl-support-breakage.patch -acbd08eef41092a7b348d03206dad625 0002-Add-lintl-to-xalloc-die-LDADD-flags.patch -dfb0d3dbc5f555386339f4f74621cda0 coreutils-8.2.tar.gz +3961aee7ac96434a1831580e0b7ad227 coreutils-8.3.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Sat Jan 9 16:03:59 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sat, 09 Jan 2010 15:03:59 +0000 Subject: [csw-devel] SF.net SVN: gar:[7926] csw/mgar/pkg/glib2/trunk Message-ID: Revision: 7926 http://gar.svn.sourceforge.net/gar/?rev=7926&view=rev Author: wahwah Date: 2010-01-09 15:03:58 +0000 (Sat, 09 Jan 2010) Log Message: ----------- glib2: Version bump to 2.23.1, unfortunately at least one test fails Modified Paths: -------------- csw/mgar/pkg/glib2/trunk/Makefile csw/mgar/pkg/glib2/trunk/checksums Added Paths: ----------- csw/mgar/pkg/glib2/trunk/files/CMSG_LEN.patch csw/mgar/pkg/glib2/trunk/files/FIXED_STR.patch csw/mgar/pkg/glib2/trunk/files/gconverter.patch Removed Paths: ------------- csw/mgar/pkg/glib2/trunk/files/checksum-test.patch Modified: csw/mgar/pkg/glib2/trunk/Makefile =================================================================== --- csw/mgar/pkg/glib2/trunk/Makefile 2010-01-09 14:02:03 UTC (rev 7925) +++ csw/mgar/pkg/glib2/trunk/Makefile 2010-01-09 15:03:58 UTC (rev 7926) @@ -1,5 +1,5 @@ GARNAME = glib -GARVERSION = 2.20.0 +GARVERSION = 2.23.1 CATEGORIES = lib DESCRIPTION = The GLib library of C routines. @@ -20,8 +20,10 @@ DISTFILES = $(GARNAME)-$(GARVERSION).tar.bz2 PATCHFILES = glib-typedetect.patch -PATCHFILES += checksum-test.patch +PATCHFILES += FIXED_STR.patch PATCHFILES += gsize.patch +PATCHFILES += gconverter.patch +PATCHFILES += CMSG_LEN.patch CONFIGURE_ARGS = $(DIRPATHS) CONFIGURE_ARGS += --with-libiconv=gnu @@ -32,10 +34,18 @@ BUILD64 = 1 NO_ISAEXEC = 1 -REQUIRED_PKGS_CSWglib2 = CSWggettextrt CSWiconv -REQUIRED_PKGS_CSWglib2devel = CSWglib2 CSWggettextrt CSWiconv +REQUIRED_PKGS_CSWglib2 += CSWggettextrt +REQUIRED_PKGS_CSWglib2 += CSWiconv +REQUIRED_PKGS_CSWglib2 += CSWzlib +REQUIRED_PKGS_CSWglib2devel += CSWfam +REQUIRED_PKGS_CSWglib2devel += CSWggettextrt +REQUIRED_PKGS_CSWglib2devel += CSWglib2 +REQUIRED_PKGS_CSWglib2devel += CSWiconv +REQUIRED_PKGS_CSWglib2devel += CSWpython +REQUIRED_PKGS_CSWglib2devel += CSWzlib TEST_TARGET = check +SKIPTEST ?= 0 #provided by iconv MERGE_EXCLUDE_FILES = .*/charset.alias @@ -43,4 +53,6 @@ PKGFILES_CSWglib2 = $(PKGFILES_RT) PKGFILES_CSWglib2 += /opt/csw/share/locale/.* +EXTRA_LDFLAGS = -lsocket + include gar/category.mk Modified: csw/mgar/pkg/glib2/trunk/checksums =================================================================== --- csw/mgar/pkg/glib2/trunk/checksums 2010-01-09 14:02:03 UTC (rev 7925) +++ csw/mgar/pkg/glib2/trunk/checksums 2010-01-09 15:03:58 UTC (rev 7926) @@ -1,4 +1,6 @@ -05188e560dbd8bddd568e24ce10dd003 download/glib-2.20.0.tar.bz2 -8f683820d9ecab1abd9dbe81997ab9eb download/glib-typedetect.patch -f1f3c182f64be06ab57d8b01016af074 download/checksum-test.patch -bb2fb8eef43c995fea6c08563487ace6 download/gsize.patch +9f66027a275eb34d80a68ec8927bf66e CMSG_LEN.patch +f1f3c182f64be06ab57d8b01016af074 FIXED_STR.patch +ed4a6616a70705b56babe709787431d4 gconverter.patch +fb637f6122690254097d0b6d470f6ed3 glib-2.23.1.tar.bz2 +8f683820d9ecab1abd9dbe81997ab9eb glib-typedetect.patch +bb2fb8eef43c995fea6c08563487ace6 gsize.patch Added: csw/mgar/pkg/glib2/trunk/files/CMSG_LEN.patch =================================================================== --- csw/mgar/pkg/glib2/trunk/files/CMSG_LEN.patch (rev 0) +++ csw/mgar/pkg/glib2/trunk/files/CMSG_LEN.patch 2010-01-09 15:03:58 UTC (rev 7926) @@ -0,0 +1,25 @@ +--- glib-2.23.1/gio/gio.h.orig 2010-01-09 15:33:51.097448405 +0100 ++++ glib-2.23.1/gio/gio.h 2010-01-09 15:34:37.201482946 +0100 +@@ -97,6 +97,22 @@ + #include + #include + ++#ifndef CMSG_ALIGN ++# ifdef __sun__ ++# define CMSG_ALIGN _CMSG_DATA_ALIGN ++# else ++# define CMSG_ALIGN(len) (((len)+sizeof(long)-1) & ~(sizeof(long)-1)) ++# endif ++#endif ++ ++#ifndef CMSG_SPACE ++# define CMSG_SPACE(len) (CMSG_ALIGN(sizeof(struct cmsghdr))+CMSG_ALIGN(len)) ++#endif ++ ++#ifndef CMSG_LEN ++# define CMSG_LEN(len) (CMSG_ALIGN(sizeof(struct cmsghdr))+(len)) ++#endif ++ + #undef __GIO_GIO_H_INSIDE__ + + #endif /* __G_IO_H__ */ Copied: csw/mgar/pkg/glib2/trunk/files/FIXED_STR.patch (from rev 7923, csw/mgar/pkg/glib2/trunk/files/checksum-test.patch) =================================================================== --- csw/mgar/pkg/glib2/trunk/files/FIXED_STR.patch (rev 0) +++ csw/mgar/pkg/glib2/trunk/files/FIXED_STR.patch 2010-01-09 15:03:58 UTC (rev 7926) @@ -0,0 +1,11 @@ +--- glib-2.18.4/tests/checksum-test.c.o 2009-02-04 19:53:27.782844898 -0600 ++++ glib-2.18.4/tests/checksum-test.c 2009-02-04 21:22:05.475677071 -0600 +@@ -18,7 +18,7 @@ + * string is intentionally more than twice that length. + */ + +-#define FIXED_STR "The quick brown fox jumps over the lazy dog. Jackdaws love my big sphinx of quartz. Pack my box with five dozen liquor jugs. How razorback-jumping frogs can level six piqued gymnasts!" ++const char FIXED_STR[] = {"The quick brown fox jumps over the lazy dog. Jackdaws love my big sphinx of quartz. Pack my box with five dozen liquor jugs. How razorback-jumping frogs can level six piqued gymnasts!"}; + #define FIXED_LEN (strlen (FIXED_STR)) + + const char *MD5_sums[] = { Deleted: csw/mgar/pkg/glib2/trunk/files/checksum-test.patch =================================================================== --- csw/mgar/pkg/glib2/trunk/files/checksum-test.patch 2010-01-09 14:02:03 UTC (rev 7925) +++ csw/mgar/pkg/glib2/trunk/files/checksum-test.patch 2010-01-09 15:03:58 UTC (rev 7926) @@ -1,11 +0,0 @@ ---- glib-2.18.4/tests/checksum-test.c.o 2009-02-04 19:53:27.782844898 -0600 -+++ glib-2.18.4/tests/checksum-test.c 2009-02-04 21:22:05.475677071 -0600 -@@ -18,7 +18,7 @@ - * string is intentionally more than twice that length. - */ - --#define FIXED_STR "The quick brown fox jumps over the lazy dog. Jackdaws love my big sphinx of quartz. Pack my box with five dozen liquor jugs. How razorback-jumping frogs can level six piqued gymnasts!" -+const char FIXED_STR[] = {"The quick brown fox jumps over the lazy dog. Jackdaws love my big sphinx of quartz. Pack my box with five dozen liquor jugs. How razorback-jumping frogs can level six piqued gymnasts!"}; - #define FIXED_LEN (strlen (FIXED_STR)) - - const char *MD5_sums[] = { Added: csw/mgar/pkg/glib2/trunk/files/gconverter.patch =================================================================== --- csw/mgar/pkg/glib2/trunk/files/gconverter.patch (rev 0) +++ csw/mgar/pkg/glib2/trunk/files/gconverter.patch 2010-01-09 15:03:58 UTC (rev 7926) @@ -0,0 +1,11 @@ +--- glib-2.23.1/gio/gconverter.c.orig 2010-01-09 14:52:05.980181068 +0100 ++++ glib-2.23.1/gio/gconverter.c 2010-01-09 14:52:36.590266103 +0100 +@@ -227,7 +227,7 @@ + + iface = G_CONVERTER_GET_IFACE (converter); + +- return (* iface->reset) (converter); ++ /* return (* iface->reset) (converter); */ + } + + #define __G_CONVERTER_C__ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From hson at users.sourceforge.net Sat Jan 9 18:03:46 2010 From: hson at users.sourceforge.net (hson at users.sourceforge.net) Date: Sat, 09 Jan 2010 17:03:46 +0000 Subject: [csw-devel] SF.net SVN: gar:[7927] csw/mgar/pkg/libcairo/trunk/Makefile Message-ID: Revision: 7927 http://gar.svn.sourceforge.net/gar/?rev=7927&view=rev Author: hson Date: 2010-01-09 17:03:45 +0000 (Sat, 09 Jan 2010) Log Message: ----------- libcairo: Fixes to get rid of dependency on /usr/openwin/lib/libX11.so.4 Modified Paths: -------------- csw/mgar/pkg/libcairo/trunk/Makefile Modified: csw/mgar/pkg/libcairo/trunk/Makefile =================================================================== --- csw/mgar/pkg/libcairo/trunk/Makefile 2010-01-09 15:03:58 UTC (rev 7926) +++ csw/mgar/pkg/libcairo/trunk/Makefile 2010-01-09 17:03:45 UTC (rev 7927) @@ -28,7 +28,7 @@ PKGFILES_CSWlibcairodoc = $(sharedstatedir)/gtk-doc.* PKGFILES_CSWlibcairodoc += $(docdir)/libcairo_doc/.* -PREREQUISITE_PKGS = CSWrenderdev +PREREQUISITE_PKGS = CSWlibxrenderdevel REQUIRED_PKGS_CSWlibcairo = CSWfconfig REQUIRED_PKGS_CSWlibcairo += CSWftype2 @@ -52,10 +52,20 @@ EXTRA_INC = $(prefix)/X11/include EXTRA_LIB = $(prefix)/X11/lib EXTRA_PKG_CONFIG_DIRS = $(prefix)/X11/lib +# We want libcairo to be linked with Xrender from $(prefix)/X11/lib not +# $(prefix)/lib since the latter is linked to /usr/openwin/lib/libX11.so.4 +EXTRA_SOS_LD_FLAGS = -L$(abspath $(prefix)/X11/lib/$(MM_LIBDIR)) +# imagediff in testsuite needs -lsocket +EXTRA_LDFLAGS = -lsocket -lnsl CONFIGURE_ARGS = $(DIRPATHS) CONFIGURE_ARGS += --disable-full-testing --enable-xlib=yes --enable-xlib-xrender=yes --enable-ft=yes --with-x CONFIGURE_ARGS += --enable-png=yes --enable-ps=yes --enable-pdf=yes --enable-svg=yes --enable-xcb=yes CONFIGURE_ARGS += --enable-gtk-doc --enable-test-surfaces=yes +CONFIGURE_ARGS += --x-includes=$(prefix)/X11/include +CONFIGURE_ARGS += --x-libraries=$(abspath $(prefix)/X11/lib/$(MM_LIBDIR)) include gar/category.mk + +# configure have problems with non-gnu utilities +PATH := /opt/csw/gnu:$(PATH) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From hson at users.sourceforge.net Sat Jan 9 18:33:54 2010 From: hson at users.sourceforge.net (hson at users.sourceforge.net) Date: Sat, 09 Jan 2010 17:33:54 +0000 Subject: [csw-devel] SF.net SVN: gar:[7928] csw/mgar/pkg/wmf/trunk/Makefile Message-ID: Revision: 7928 http://gar.svn.sourceforge.net/gar/?rev=7928&view=rev Author: hson Date: 2010-01-09 17:33:54 +0000 (Sat, 09 Jan 2010) Log Message: ----------- wmf: Split package, add 64-bit build Modified Paths: -------------- csw/mgar/pkg/wmf/trunk/Makefile Modified: csw/mgar/pkg/wmf/trunk/Makefile =================================================================== --- csw/mgar/pkg/wmf/trunk/Makefile 2010-01-09 17:03:45 UTC (rev 7927) +++ csw/mgar/pkg/wmf/trunk/Makefile 2010-01-09 17:33:54 UTC (rev 7928) @@ -13,16 +13,35 @@ SF_PROJ = wvware MASTER_SITES = $(SF_MIRRORS) DISTFILES = libwmf-$(GARVERSION).tar.gz - DISTNAME = libwmf-$(GARVERSION) SPKG_SOURCEURL = http://wvware.sourceforge.net -LICENSE = COPYING +PACKAGES = CSWwmf CSWwmfdevel CSWwmfdoc +CATALOGNAME_CSWwmf = wmf +CATALOGNAME_CSWwmfdevel = wmf_devel +CATALOGNAME_CSWwmfdoc = wmf_doc -REQUIRED_PKGS += CSWexpat CSWftype2 CSWggettextrt CSWglib2 CSWgtk2 CSWjpeg -REQUIRED_PKGS += CSWpng CSWzlib +SPKG_DESC_CSWwmf += Library and tools for manipulating Windows metafiles +SPKG_DESC_CSWwmfdevel += Library and tools for manipulating Windows metafiles - developer package +SPKG_DESC_CSWwmfdoc += Library and tools for manipulating Windows metafiles - documentation +REQUIRED_PKGS_CSWwmf += CSWexpat CSWftype2 CSWggettextrt CSWglib2 CSWgtk2 +REQUIRED_PKGS_CSWwmf += CSWjpeg CSWlibx11 CSWpng CSWzlib +REQUIRED_PKGS_CSWwmfdevel += CSWwmf +REQUIRED_PKGS_CSWwmfdoc += CSWwmf + +PKGFILES_CSWwmfdevel = $(PKGFILES_DEVEL) +PKGFILES_CSWwmfdoc = $(sharedstatedir)/doc/.* + +ARCHALL_CSWwmfdoc = 1 + +BUILD64 = 1 + +EXTRA_INC = $(prefix)/X11/include +EXTRA_LIB = $(prefix)/X11/lib +EXTRA_PKG_CONFIG_DIRS = $(prefix)/X11/lib + # We define upstream file regex so we can be notifed of new upstream software release UPSTREAM_MASTER_SITES = $(SF_PROJECT_SHOWFILE)=10501 UPSTREAM_USE_SF = 1 @@ -32,9 +51,7 @@ TEST_TARGET = check +STRIP_LIBTOOL = 1 + include gar/category.mk - -post-configure-modulated: - @(echo "~~~ Fixing Libtool ~~~") - @$(FILEDIR)/fixme.sh $(WORKSRC) - $(DONADA) +PATH := /opt/csw/gnu:$(PATH) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From skayser at users.sourceforge.net Sat Jan 9 19:05:43 2010 From: skayser at users.sourceforge.net (skayser at users.sourceforge.net) Date: Sat, 09 Jan 2010 18:05:43 +0000 Subject: [csw-devel] SF.net SVN: gar:[7929] csw/mgar/pkg/dante/trunk Message-ID: Revision: 7929 http://gar.svn.sourceforge.net/gar/?rev=7929&view=rev Author: skayser Date: 2010-01-09 18:05:41 +0000 (Sat, 09 Jan 2010) Log Message: ----------- dante: bump to 1.2.0, some remaining TODOs Modified Paths: -------------- csw/mgar/pkg/dante/trunk/Makefile csw/mgar/pkg/dante/trunk/checksums csw/mgar/pkg/dante/trunk/files/CSWdante.cswdante csw/mgar/pkg/dante/trunk/files/README.CSW csw/mgar/pkg/dante/trunk/files/changelog.CSW Removed Paths: ------------- csw/mgar/pkg/dante/trunk/files/man-conflocations.diff Modified: csw/mgar/pkg/dante/trunk/Makefile =================================================================== --- csw/mgar/pkg/dante/trunk/Makefile 2010-01-09 17:33:54 UTC (rev 7928) +++ csw/mgar/pkg/dante/trunk/Makefile 2010-01-09 18:05:41 UTC (rev 7929) @@ -1,7 +1,12 @@ -# Todo -# * Ponder about the SOCKS_CONF / issetguid() issue +# Known issue: +# - The libsocks build doesn't support $SOCKS_CONF. See README.CSW +# and INSTALL with its description of `--without-glibc-secure'. +# +# Todo: +# - Look into kerberos linking issues +# - Test sockd and its init script GARNAME = dante -GARVERSION = 1.1.19 +GARVERSION = 1.2.0 CATEGORIES = net DESCRIPTION = Dante SOCKS packages @@ -16,76 +21,62 @@ the server administrator. endef -MASTER_SITES = ftp://ftp.inet.no/pub/socks/ -MASTER_SITES += ftp://ftp.inet.no/pub/socks/old/ -DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz SPKG_SOURCEURL = http://www.inet.no/dante/ +MASTER_SITES = ftp://ftp.inet.no/pub/socks/ +MASTER_SITES += ftp://ftp.inet.no/pub/socks/old/ +DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + LICENSE = LICENSE PACKAGES = CSWlibsocks CSWdante SPKG_DESC_CSWlibsocks = Dante SOCKS runtime libraries (and socksify wrapper) SPKG_DESC_CSWdante = Dante SOCKS (v4 and v5) proxy daemon -SPKG_CLASSES_CSWdante = none cswinitsmf -# There is no pkg compiling against dante right now, just drop the .h file -EXTRA_MERGE_EXCLUDE_FILES = $(includedir)/socks.h +# There is no pkg compiling against dante right now, just drop the dev files +EXTRA_MERGE_EXCLUDE_FILES = $(includedir)/.* -PKGFILES_CSWlibsocks = $(PKGFILES_RT) .*socks.* +PKGFILES_CSWlibsocks = $(PKGFILES_RT) .*socks.* PKGFILES_CSWlibsocks += $(docdir)/libsocks/.* -PKGFILES_CSWdante = .*sockd.* /etc/opt/csw/init.d/cswdante -PKGFILES_CSWdante += $(docdir)/dante/.* +PKGFILES_CSWdante = .*sockd.* /etc/opt/csw/init.d/cswdante +PKGFILES_CSWdante += $(docdir)/dante/.* -REQUIRED_PKGS_CSWdante = CSWlibsocks CSWcswclassutils CSWtcpwrap +REQUIRED_PKGS_CSWdante = CSWtcpwrap -# CSWlibsocks not yet installed on the build farm -ENABLE_CHECK = 0 +TEST_SCRIPTS = -# We define upstream file regex so we can be notifed of new upstream software release -UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz +sysconfdir = /etc/opt/csw +localstatedir = /var/opt/csw -# Make the man pages reference our CSW locations instead of /etc/*.conf -PATCHFILES = man-conflocations.diff +# Don't bother about the "not found" modules after the ./configure run, +# they are commercial add-ons (http://www.inet.no/dante/module.html). +# +# Features disabled via --without will be also stated as "not found" +# in the summary messages that ./configure displays at the end -TEST_SCRIPTS = - CONFIGURE_ARGS = $(DIRPATHS) CONFIGURE_ARGS += --with-socks-conf=$(sysconfdir)/socks.conf CONFIGURE_ARGS += --with-sockd-conf=$(sysconfdir)/sockd.conf -CONFIGURE_ARGS += --with-pidfile=/var/opt/csw/dante/sockd.pid +CONFIGURE_ARGS += --with-pidfile=/var/run/cswsockd.pid +CONFIGURE_ARGS += --without-glibc-secure -# Don't bother about the "not found" modules after the ./configure run, -# they are commercial add-ons (http://www.inet.no/dante/module.html). +# Kerberos linking fails .. looks like it is missing -L/opt/csw/lib. +# Needs investigation. +CONFIGURE_ARGS += --without-gssapi -PROTOTYPE_FILTER = awk '\ - $$$$3 ~ /\/init.d\/cswdante$$$$/ { $$$$2 = "cswinitsmf" } \ - { print }' +# UPNP support requires miniupnp from http://miniupnp.free.fr/ +CONFIGURE_ARGS += --without-upnp -include gar/category.mk -# The SOCKS_CONF and issetugid() issue needs some thought. Are there any -# secure alternative to the simple get{ug}id below? Could ask upstream. -# -# Fix missing issetugid on Solaris 8, it is not nice, but the best i can -# come up with for now, ref. -# http://bugs.gentoo.org/attachment.cgi?id=180390 -# issetugid(2) on a Solaris 10 box (WRT to concerns) -# -# If at all this needs to be revamped into a patch for libscompat/issetugid.c -#post-extract-modulated: -# @perl -pi -e '\ -# s/int issetugid __P\(\(void\)\)/#define issetugid() (getuid() != geteuid()) || (getgid() != getegid())/' \ -# $(WORKSRC)/include/common.h -# @$(MAKECOOKIE) +INITSMF = /etc/opt/csw/init\.d/cswdante +include gar/category.mk post-configure-modulated: - # Get rid of -misalign which is meant for /usr/ucb/cc - @perl -pi -e 's|-misalign || if /^CFLAGS =/' $(WORKSRC)/*/Makefile ifneq ($(GARFLAVOR),DBG) - # Get rid of -g. - # configure wants to use -g even if --disable-debugging (default) - @perl -pi -e 's#-(g|xs|xO0) ##g if /^CFLAGS =/' $(WORKSRC)/*/Makefile + # Get rid of debugging flags which ./configure determines per default + perl -pi -e 's#-(g|xs|xO0) ##g if /^CFLAGS =/' $(WORKSRC)/*/Makefile endif @$(MAKECOOKIE) @@ -93,10 +84,10 @@ post-install-libsocks: DOCS = CREDITS NEWS SUPPORT post-install-libsocks: CSWDOCS = README.CSW changelog.CSW post-install-libsocks: - @ginstall -d $(DOCDEST)/examples - @cp $(WORKSRC)/example/socks*.conf $(DOCDEST)/examples - @$(foreach D,$(DOCS), cp $(WORKSRC)/$(D) $(DOCDEST);) - @$(foreach D,$(CSWDOCS), cp $(FILEDIR)/$(D) $(DOCDEST);) + ginstall -d $(DOCDEST)/examples + cp $(WORKSRC)/example/socks*.conf $(DOCDEST)/examples + cp $(addprefix $(WORKSRC)/,$(DOCS)) $(DOCDEST) + cp $(addprefix $(FILEDIR)/,$(CSWDOCS)) $(DOCDEST) @$(MAKECOOKIE) @@ -104,17 +95,27 @@ post-install-dante: DOCS = CREDITS NEWS SUPPORT post-install-dante: CSWDOCS = changelog.CSW post-install-dante: - @ginstall -d $(DESTDIR)/var/opt/csw/dante - @ginstall -d $(DOCDEST)/examples - @cp $(WORKSRC)/example/sockd*.conf $(DOCDEST)/examples - @$(foreach D,$(DOCS), cp $(WORKSRC)/$(D) $(DOCDEST);) - @$(foreach D,$(CSWDOCS), cp $(FILEDIR)/$(D) $(DOCDEST);) + ginstall -d $(DESTDIR)/var/opt/csw/dante + ginstall -d $(DOCDEST)/examples + cp $(WORKSRC)/example/sockd*.conf $(DOCDEST)/examples + cp $(addprefix $(WORKSRC)/,$(DOCS)) $(DOCDEST) + cp $(addprefix $(FILEDIR)/,$(CSWDOCS)) $(DOCDEST) - @ginstall -d $(DESTDIR)/etc/opt/csw/init.d - @ginstall -m 0755 $(FILEDIR)/CSWdante.cswdante \ + ginstall -d $(DESTDIR)/etc/opt/csw/init.d + ginstall -m 0755 $(FILEDIR)/CSWdante.cswdante \ $(DESTDIR)/etc/opt/csw/init.d/cswdante @$(MAKECOOKIE) +# Make the man pages reference our CSW locations instead of /etc/*.conf +fix-manpages: + gsed -i \ + -e 's,/etc/socks.conf,$(sysconfdir)/socks.conf,' \ + -e 's,/etc/sockd.conf,$(sysconfdir)/sockd.conf,' \ + $(DESTDIR)$(mandir)/man1/socksify.1 \ + $(DESTDIR)$(mandir)/man5/socks.conf.5 \ + $(DESTDIR)$(mandir)/man5/sockd.conf.5 \ + $(DESTDIR)$(mandir)/man8/sockd.8 + @$(MAKECOOKIE) -post-install-modulated: post-install-libsocks post-install-dante +post-install-modulated: post-install-libsocks post-install-dante fix-manpages @$(MAKECOOKIE) Modified: csw/mgar/pkg/dante/trunk/checksums =================================================================== --- csw/mgar/pkg/dante/trunk/checksums 2010-01-09 17:33:54 UTC (rev 7928) +++ csw/mgar/pkg/dante/trunk/checksums 2010-01-09 18:05:41 UTC (rev 7929) @@ -1,2 +1,2 @@ -58b56d1e964f3f0186f3eeed3d95d9a4 download/dante-1.1.19.tar.gz -a38ad03fa8cc40b0ee527cb15e41fa9c download/man-conflocations.diff +af00063243cc94e524497342982615cd dante-1.2.0.tar.gz +a38ad03fa8cc40b0ee527cb15e41fa9c man-conflocations.diff Modified: csw/mgar/pkg/dante/trunk/files/CSWdante.cswdante =================================================================== --- csw/mgar/pkg/dante/trunk/files/CSWdante.cswdante 2010-01-09 17:33:54 UTC (rev 7928) +++ csw/mgar/pkg/dante/trunk/files/CSWdante.cswdante 2010-01-09 18:05:41 UTC (rev 7929) @@ -5,12 +5,9 @@ PATH=/usr/bin:/opt/csw/bin:/usr/sbin -PIDFILE=/var/opt/csw/dante/sockd.pid -CONFIG=/opt/csw/etc/sockd.conf -CONFIG_LOCAL=/etc/opt/csw/etc/sockd.conf +PIDFILE=/var/run/cswsockd.pid +CONFIG=/etc/opt/csw/etc/sockd.conf -[ -r $CONFIG_LOCAL ] && CONFIG=$CONFIG_LOCAL - case $1 in 'start') printf "Starting SOCKS proxy: cswdante ... " Modified: csw/mgar/pkg/dante/trunk/files/README.CSW =================================================================== --- csw/mgar/pkg/dante/trunk/files/README.CSW 2010-01-09 17:33:54 UTC (rev 7928) +++ csw/mgar/pkg/dante/trunk/files/README.CSW 2010-01-09 18:05:41 UTC (rev 7929) @@ -1,12 +1,16 @@ -Known client issue: $SOCKS_CONF not used ----------------------------------------- +Known issue: libsocks does not support $SOCKS_CONF +-------------------------------------------------- -The Dante socks client libraries are supposed to evaluate the environment -variable $SOCKS_CONF that can be used to specify an alternative config -location. This is _not working_ with this version. +This build of the libsocks _does not_ support an alternate socks.conf +passed via the environment variable SOCKS_CONF. As a workaround you can +specify a SOCKS server via the environment variables pointed out in +socksify(1). -Dante employs SETUID/SETGID safety checks before evaluating $SOCKS_CONF -and Solaris 8 (our base build platform) does not offer the required system -calls. Dante hence deactivates looking for $SOCK_CONF. + SOCKS_SERVER, SOCKS4_SERVER, SOCKS5_SERVER -This might change in a future version of this package or Dante. +Background information: +libsocks employs a setuid/setgid safety check via issetugid(2) before +opening $SOCKS_CONF. Our base build platform (Solaris 8) does not offer +this system call, thus the libsocks build completely deactivates support +for $SOCK_CONF out of security reasons. This might change if we decide +to provide a Solaris 10 specific package of libsocks. Modified: csw/mgar/pkg/dante/trunk/files/changelog.CSW =================================================================== --- csw/mgar/pkg/dante/trunk/files/changelog.CSW 2010-01-09 17:33:54 UTC (rev 7928) +++ csw/mgar/pkg/dante/trunk/files/changelog.CSW 2010-01-09 18:05:41 UTC (rev 7929) @@ -1,5 +1,5 @@ -dante|libsocks (1.1.19,REV=2009.06.05) +dante (1.2.0,REV=2010.01.09) - * Adopted and updated to 1.1.19. + * Adopted and updated to 1.2.0 - -- Sebastian Kayser Fri, 5 Jun 2009 00:02:09 +0200 + -- Sebastian Kayser Sat, 9 Jan 2010 19:18:23 +0100 Deleted: csw/mgar/pkg/dante/trunk/files/man-conflocations.diff =================================================================== --- csw/mgar/pkg/dante/trunk/files/man-conflocations.diff 2010-01-09 17:33:54 UTC (rev 7928) +++ csw/mgar/pkg/dante/trunk/files/man-conflocations.diff 2010-01-09 18:05:41 UTC (rev 7929) @@ -1,40 +0,0 @@ -diff --speed-large-files --minimal -Nru dante-1.1.19.orig/doc/sockd.8 dante-1.1.19/doc/sockd.8 ---- dante-1.1.19.orig/doc/sockd.8 2005-01-24 11:24:20.000000000 +0100 -+++ dante-1.1.19/doc/sockd.8 2009-06-10 13:28:07.589216602 +0200 -@@ -112,7 +112,8 @@ - be set to a (local) filesystem with low latency. - .SH FILES - .TP --/etc/sockd.conf -+/opt/csw/etc/sockd.conf or /etc/opt/csw/sockd.conf -+.br - .B Dante - server configuration file. - .SH AUTHORS -diff --speed-large-files --minimal -Nru dante-1.1.19.orig/doc/sockd.conf.5 dante-1.1.19/doc/sockd.conf.5 ---- dante-1.1.19.orig/doc/sockd.conf.5 2006-01-20 14:13:55.000000000 +0100 -+++ dante-1.1.19/doc/sockd.conf.5 2009-06-10 13:27:47.748142347 +0200 -@@ -315,8 +315,9 @@ - See the example directory in the distribution. - .SH FILES - .nf --.ta \w 1 --/etc/sockd.conf \fBDante\fP server configuration file. -+/opt/csw/etc/sockd.conf or /etc/opt/csw/sockd.conf -+.br -+ \fBDante\fP server configuration file. - /etc/passwd file used when checking username/passwords. - .fi - .SH AUTHORS -diff --speed-large-files --minimal -Nru dante-1.1.19.orig/doc/socks.conf.5 dante-1.1.19/doc/socks.conf.5 ---- dante-1.1.19.orig/doc/socks.conf.5 2005-12-19 20:13:37.000000000 +0100 -+++ dante-1.1.19/doc/socks.conf.5 2009-06-10 13:23:37.252560424 +0200 -@@ -119,7 +119,7 @@ - authentication. Not recommended as other users on the system - might be able to see your password. - .SH FILES --.I /etc/socks.conf -+.I /opt/csw/etc/socks.conf - .SH AUTHORS - For Inferno Nettverk A/S, Norway: - Michael Shuldman : Design and implementation. This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From skayser at users.sourceforge.net Sat Jan 9 19:13:02 2010 From: skayser at users.sourceforge.net (skayser at users.sourceforge.net) Date: Sat, 09 Jan 2010 18:13:02 +0000 Subject: [csw-devel] SF.net SVN: gar:[7930] csw/mgar/pkg/screen/trunk Message-ID: Revision: 7930 http://gar.svn.sourceforge.net/gar/?rev=7930&view=rev Author: skayser Date: 2010-01-09 18:13:01 +0000 (Sat, 09 Jan 2010) Log Message: ----------- screen: NMU commit, bumped to 4.0.3, switched to GARv2 Modified Paths: -------------- csw/mgar/pkg/screen/trunk/Makefile csw/mgar/pkg/screen/trunk/checksums Removed Paths: ------------- csw/mgar/pkg/screen/trunk/files/CSWscrn.gspec csw/mgar/pkg/screen/trunk/files/CSWscrn.prototype Property Changed: ---------------- csw/mgar/pkg/screen/trunk/ Property changes on: csw/mgar/pkg/screen/trunk ___________________________________________________________________ Modified: svn:externals - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v1 + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 Modified: csw/mgar/pkg/screen/trunk/Makefile =================================================================== --- csw/mgar/pkg/screen/trunk/Makefile 2010-01-09 18:05:41 UTC (rev 7929) +++ csw/mgar/pkg/screen/trunk/Makefile 2010-01-09 18:13:01 UTC (rev 7930) @@ -1,5 +1,9 @@ +# TODO +# - This is a NMU (bumped to 4.0.3, switched to GAR v2) which fails to +# build. Yann needs to incorporate his current build script into this +# recipe once he is working on an updated version/revision. GARNAME = screen -GARVERSION = 4.0.1 +GARVERSION = 4.0.3 CATEGORIES = utils DESCRIPTION = A window manager that multiplexes a physical terminal. @@ -11,21 +15,20 @@ insert/delete line and support for multiple character sets). endef -MASTER_SITES = http://ftp.uni-erlangen.de/pub/utilities/screen/ - -# We define upstream file regex so we can be notifed of new upstream software release +VENDOR_URL = http://www.gnu.org/software/screen/ +MASTER_SITES = http://ftp.gnu.org/gnu/screen/ +DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz -DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz -DISTFILES += $(call admfiles,CSWscrn,prototype) +PACKAGES = CSWscrn +CATALOGNAME = screen -DISTFILES += changelog.CSW - -# this patch increases the maximum number of simultaneously allowed windows per screen session. +# this patch increases the maximum number of simultaneously allowed +# windows per screen session. PATCHFILES = screen-maxwin.patch -# patch used by the previous maintainer Derek Morr, I don't know exactly what it is supposed -# to do or fix but I keep it to no introduce any breakage +# patch used by the previous maintainer Derek Morr, I don't know exactly what +# it is supposed to do or fix but I keep it to no introduce any breakage PATCHFILES += screen-utmp.patch CONFIGURE_ARGS = $(DIRPATHS) @@ -36,3 +39,9 @@ TEST_TARGET = check include gar/category.mk + +post-install-modulated: DOCDEST=$(DESTDIR)$(docdir)/$(GARNAME) +post-install-modulated: + ginstall -d $(DOCDEST) + cp $(FILEDIR)/changelog.CSW $(DOCDEST) + @$(MAKECOOKIE) Modified: csw/mgar/pkg/screen/trunk/checksums =================================================================== --- csw/mgar/pkg/screen/trunk/checksums 2010-01-09 18:05:41 UTC (rev 7929) +++ csw/mgar/pkg/screen/trunk/checksums 2010-01-09 18:13:01 UTC (rev 7930) @@ -1,6 +1,3 @@ -8506fd205028a96c741e4037de6e3c42 download/screen-4.0.3.tar.gz -b983bef55fb5b056b178d7dff166b21f download/CSWscrn.gspec -c83f5d003bcacd6b2670e941664e7201 download/CSWscrn.prototype -a7026461bcda14338f2175ba958195cb download/changelog.CSW -ed83d7a9001fa159a367d699580c1dd2 download/screen-maxwin.patch -3f25f108225cea31321046da5b033f6a download/screen-utmp.patch +8506fd205028a96c741e4037de6e3c42 screen-4.0.3.tar.gz +ed83d7a9001fa159a367d699580c1dd2 screen-maxwin.patch +3f25f108225cea31321046da5b033f6a screen-utmp.patch Deleted: csw/mgar/pkg/screen/trunk/files/CSWscrn.gspec =================================================================== --- csw/mgar/pkg/screen/trunk/files/CSWscrn.gspec 2010-01-09 18:05:41 UTC (rev 7929) +++ csw/mgar/pkg/screen/trunk/files/CSWscrn.gspec 2010-01-09 18:13:01 UTC (rev 7930) @@ -1,4 +0,0 @@ -%var bitname screen -%var pkgname CSWscrn -%include url file://%{PKGLIB}/csw_dyndepend.gspec -%copyright url file://%{WORKSRC}/COPYING Deleted: csw/mgar/pkg/screen/trunk/files/CSWscrn.prototype =================================================================== --- csw/mgar/pkg/screen/trunk/files/CSWscrn.prototype 2010-01-09 18:05:41 UTC (rev 7929) +++ csw/mgar/pkg/screen/trunk/files/CSWscrn.prototype 2010-01-09 18:13:01 UTC (rev 7930) @@ -1,28 +0,0 @@ -s none /opt/csw/bin/screen=screen-4.0.3 -f none /opt/csw/bin/screen-4.0.3 0755 root bin -f none /opt/csw/share/info/screen.info 0644 root bin -f none /opt/csw/share/info/screen.info-1 0644 root bin -f none /opt/csw/share/info/screen.info-2 0644 root bin -f none /opt/csw/share/info/screen.info-3 0644 root bin -f none /opt/csw/share/info/screen.info-4 0644 root bin -f none /opt/csw/share/info/screen.info-5 0644 root bin -f none /opt/csw/share/man/man1/screen.1 0644 root bin -f none /opt/csw/share/screen/utf8encodings/01 0644 root bin -f none /opt/csw/share/screen/utf8encodings/02 0644 root bin -f none /opt/csw/share/screen/utf8encodings/03 0644 root bin -f none /opt/csw/share/screen/utf8encodings/04 0644 root bin -f none /opt/csw/share/screen/utf8encodings/18 0644 root bin -f none /opt/csw/share/screen/utf8encodings/19 0644 root bin -f none /opt/csw/share/screen/utf8encodings/a1 0644 root bin -f none /opt/csw/share/screen/utf8encodings/bf 0644 root bin -f none /opt/csw/share/screen/utf8encodings/c2 0644 root bin -f none /opt/csw/share/screen/utf8encodings/c3 0644 root bin -f none /opt/csw/share/screen/utf8encodings/c4 0644 root bin -f none /opt/csw/share/screen/utf8encodings/c6 0644 root bin -f none /opt/csw/share/screen/utf8encodings/c7 0644 root bin -f none /opt/csw/share/screen/utf8encodings/c8 0644 root bin -f none /opt/csw/share/screen/utf8encodings/cc 0644 root bin -f none /opt/csw/share/screen/utf8encodings/cd 0644 root bin -f none /opt/csw/share/screen/utf8encodings/d6 0644 root bin -d none /opt/csw/share/doc/screen 0755 root bin -f none /opt/csw/share/doc/screen/changelog.CSW=changelog.CSW 0644 root bin This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From chninkel at users.sourceforge.net Sun Jan 10 00:31:05 2010 From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net) Date: Sat, 09 Jan 2010 23:31:05 +0000 Subject: [csw-devel] SF.net SVN: gar:[7931] csw/mgar/pkg/screen/trunk Message-ID: Revision: 7931 http://gar.svn.sourceforge.net/gar/?rev=7931&view=rev Author: chninkel Date: 2010-01-09 23:31:05 +0000 (Sat, 09 Jan 2010) Log Message: ----------- screen: updated Makefile for garv2, added screenrc and changelog.CSW files Modified Paths: -------------- csw/mgar/pkg/screen/trunk/Makefile csw/mgar/pkg/screen/trunk/checksums Added Paths: ----------- csw/mgar/pkg/screen/trunk/files/screenrc Modified: csw/mgar/pkg/screen/trunk/Makefile =================================================================== --- csw/mgar/pkg/screen/trunk/Makefile 2010-01-09 18:13:01 UTC (rev 7930) +++ csw/mgar/pkg/screen/trunk/Makefile 2010-01-09 23:31:05 UTC (rev 7931) @@ -1,7 +1,3 @@ -# TODO -# - This is a NMU (bumped to 4.0.3, switched to GAR v2) which fails to -# build. Yann needs to incorporate his current build script into this -# recipe once he is working on an updated version/revision. GARNAME = screen GARVERSION = 4.0.3 CATEGORIES = utils @@ -20,6 +16,9 @@ DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz +DISTFILES += screenrc +DISTFILES += changelog.CSW + PACKAGES = CSWscrn CATALOGNAME = screen @@ -27,21 +26,21 @@ # windows per screen session. PATCHFILES = screen-maxwin.patch -# patch used by the previous maintainer Derek Morr, I don't know exactly what -# it is supposed to do or fix but I keep it to no introduce any breakage +# screen is not isntalled with setuid bit so we disable utmp update PATCHFILES += screen-utmp.patch CONFIGURE_ARGS = $(DIRPATHS) CONFIGURE_ARGS += --enable-pam CONFIGURE_ARGS += --enable-telnet CONFIGURE_ARGS += --enable-colors256 +CONFIGURE_ARGS += --sysconfdir=/etc/$(prefix)/ TEST_TARGET = check include gar/category.mk -post-install-modulated: DOCDEST=$(DESTDIR)$(docdir)/$(GARNAME) -post-install-modulated: - ginstall -d $(DOCDEST) - cp $(FILEDIR)/changelog.CSW $(DOCDEST) +post-merge: + ginstall -D $(WORKDIR_FIRSTMOD)/screenrc $(PKGROOT)/etc/$(prefix)/screenrc + ginstall -D $(WORKDIR_FIRSTMOD)/changelog.CSW $(PKGROOT)/$(docdir)/$(GARNAME)/changelog.CSW @$(MAKECOOKIE) + Modified: csw/mgar/pkg/screen/trunk/checksums =================================================================== --- csw/mgar/pkg/screen/trunk/checksums 2010-01-09 18:13:01 UTC (rev 7930) +++ csw/mgar/pkg/screen/trunk/checksums 2010-01-09 23:31:05 UTC (rev 7931) @@ -1,3 +1,5 @@ +a7026461bcda14338f2175ba958195cb changelog.CSW 8506fd205028a96c741e4037de6e3c42 screen-4.0.3.tar.gz ed83d7a9001fa159a367d699580c1dd2 screen-maxwin.patch 3f25f108225cea31321046da5b033f6a screen-utmp.patch +f6c675685f3cfa25a43a1827c264b3f0 screenrc Added: csw/mgar/pkg/screen/trunk/files/screenrc =================================================================== --- csw/mgar/pkg/screen/trunk/files/screenrc (rev 0) +++ csw/mgar/pkg/screen/trunk/files/screenrc 2010-01-09 23:31:05 UTC (rev 7931) @@ -0,0 +1,9 @@ +################################################### +# System-wide screenrc file +################################################### + +# Make sure programs used under screen use the +# csw terminfo database, this is necessary +# as solaris native on doesn't know TERM=screen +setenv TERMINFO /opt/csw/share/terminfo + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From chninkel at users.sourceforge.net Sun Jan 10 00:41:50 2010 From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net) Date: Sat, 09 Jan 2010 23:41:50 +0000 Subject: [csw-devel] SF.net SVN: gar:[7932] csw/mgar/pkg/screen/trunk/Makefile Message-ID: Revision: 7932 http://gar.svn.sourceforge.net/gar/?rev=7932&view=rev Author: chninkel Date: 2010-01-09 23:41:50 +0000 (Sat, 09 Jan 2010) Log Message: ----------- screen: fixed screenrc path Modified Paths: -------------- csw/mgar/pkg/screen/trunk/Makefile Modified: csw/mgar/pkg/screen/trunk/Makefile =================================================================== --- csw/mgar/pkg/screen/trunk/Makefile 2010-01-09 23:31:05 UTC (rev 7931) +++ csw/mgar/pkg/screen/trunk/Makefile 2010-01-09 23:41:50 UTC (rev 7932) @@ -33,7 +33,7 @@ CONFIGURE_ARGS += --enable-pam CONFIGURE_ARGS += --enable-telnet CONFIGURE_ARGS += --enable-colors256 -CONFIGURE_ARGS += --sysconfdir=/etc/$(prefix)/ +CONFIGURE_ARGS += --with-sys-screenrc=/etc$(prefix)/screenrc TEST_TARGET = check This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From chninkel at users.sourceforge.net Sun Jan 10 01:31:18 2010 From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net) Date: Sun, 10 Jan 2010 00:31:18 +0000 Subject: [csw-devel] SF.net SVN: gar:[7933] csw/mgar/pkg/screen/trunk Message-ID: Revision: 7933 http://gar.svn.sourceforge.net/gar/?rev=7933&view=rev Author: chninkel Date: 2010-01-10 00:31:17 +0000 (Sun, 10 Jan 2010) Log Message: ----------- screen: now linked with opencsw libncurses Modified Paths: -------------- csw/mgar/pkg/screen/trunk/Makefile csw/mgar/pkg/screen/trunk/checksums Added Paths: ----------- csw/mgar/pkg/screen/trunk/files/enable_ncurses.patch Modified: csw/mgar/pkg/screen/trunk/Makefile =================================================================== --- csw/mgar/pkg/screen/trunk/Makefile 2010-01-09 23:41:50 UTC (rev 7932) +++ csw/mgar/pkg/screen/trunk/Makefile 2010-01-10 00:31:17 UTC (rev 7933) @@ -22,11 +22,17 @@ PACKAGES = CSWscrn CATALOGNAME = screen +REQUIRED_PKGS = CSWncurses + +# we want to use opencsw libncurses and not solaris libcurses +# so we modify configure.in so ncurses is tried before curses +PATCHFILES += enable_ncurses.patch + # this patch increases the maximum number of simultaneously allowed # windows per screen session. -PATCHFILES = screen-maxwin.patch +PATCHFILES += screen-maxwin.patch -# screen is not isntalled with setuid bit so we disable utmp update +# screen is not installed with setuid bit so we disable utmp update PATCHFILES += screen-utmp.patch CONFIGURE_ARGS = $(DIRPATHS) @@ -39,6 +45,10 @@ include gar/category.mk +# we must recreate configure as we modified configure.in +pre-configure-modulated: + cd $(WORKSRC) && $(prefix)/bin/autoconf + post-merge: ginstall -D $(WORKDIR_FIRSTMOD)/screenrc $(PKGROOT)/etc/$(prefix)/screenrc ginstall -D $(WORKDIR_FIRSTMOD)/changelog.CSW $(PKGROOT)/$(docdir)/$(GARNAME)/changelog.CSW Modified: csw/mgar/pkg/screen/trunk/checksums =================================================================== --- csw/mgar/pkg/screen/trunk/checksums 2010-01-09 23:41:50 UTC (rev 7932) +++ csw/mgar/pkg/screen/trunk/checksums 2010-01-10 00:31:17 UTC (rev 7933) @@ -1,4 +1,5 @@ a7026461bcda14338f2175ba958195cb changelog.CSW +bc3ac54668be521328c598408cab2d60 enable_ncurses.patch 8506fd205028a96c741e4037de6e3c42 screen-4.0.3.tar.gz ed83d7a9001fa159a367d699580c1dd2 screen-maxwin.patch 3f25f108225cea31321046da5b033f6a screen-utmp.patch Added: csw/mgar/pkg/screen/trunk/files/enable_ncurses.patch =================================================================== --- csw/mgar/pkg/screen/trunk/files/enable_ncurses.patch (rev 0) +++ csw/mgar/pkg/screen/trunk/files/enable_ncurses.patch 2010-01-10 00:31:17 UTC (rev 7933) @@ -0,0 +1,23 @@ +diff -ur screen-4.0.3.orig/configure.in screen-4.0.3/configure.in +--- screen-4.0.3.orig/configure.in 2003-06-03 13:58:24.000000000 +0200 ++++ screen-4.0.3/configure.in 2010-01-10 01:58:58.248639453 +0100 +@@ -643,6 +643,9 @@ + AC_CHECKING(for tgetent) + AC_TRY_LINK(,tgetent((char *)0, (char *)0);,, + olibs="$LIBS" ++LIBS="-lncurses $olibs" ++AC_CHECKING(libncurses) ++AC_TRY_LINK(,tgetent((char *)0, (char *)0);,, + LIBS="-lcurses $olibs" + AC_CHECKING(libcurses) + AC_TRY_LINK(,[ +@@ -658,9 +661,6 @@ + LIBS="-ltermlib $olibs" + AC_CHECKING(libtermlib) + AC_TRY_LINK(,tgetent((char *)0, (char *)0);,, +-LIBS="-lncurses $olibs" +-AC_CHECKING(libncurses) +-AC_TRY_LINK(,tgetent((char *)0, (char *)0);,, + AC_MSG_ERROR(!!! no tgetent - no screen)))))) + + AC_TRY_RUN([ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From maciej at opencsw.org Sun Jan 10 01:35:15 2010 From: maciej at opencsw.org (Maciej (Matchek) Blizinski) Date: Sun, 10 Jan 2010 00:35:15 +0000 Subject: [csw-devel] SF.net SVN: gar:[7931] csw/mgar/pkg/screen/trunk In-Reply-To: References: Message-ID: On Sat, Jan 9, 2010 at 11:31 PM, wrote: > Added: csw/mgar/pkg/screen/trunk/files/screenrc > =================================================================== > --- csw/mgar/pkg/screen/trunk/files/screenrc ? ? ? ? ? ? ? ? ? ? ? ? ? ?(rev 0) > +++ csw/mgar/pkg/screen/trunk/files/screenrc ? ?2010-01-09 23:31:05 UTC (rev 7931) > @@ -0,0 +1,9 @@ > +################################################### > +# System-wide screenrc file > +################################################### > + > +# Make sure programs used under screen use the > +# csw terminfo database, this is necessary > +# as solaris native on doesn't know TERM=screen > +setenv TERMINFO /opt/csw/share/terminfo > + I'd suggest adding to the dependencies the package which provides /opt/csw/share/terminfo, so that screen can be sure the terminfo files can be accessed. From chninkel at users.sourceforge.net Sun Jan 10 01:59:00 2010 From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net) Date: Sun, 10 Jan 2010 00:59:00 +0000 Subject: [csw-devel] SF.net SVN: gar:[7934] csw/mgar/pkg/screen/trunk Message-ID: Revision: 7934 http://gar.svn.sourceforge.net/gar/?rev=7934&view=rev Author: chninkel Date: 2010-01-10 00:59:00 +0000 (Sun, 10 Jan 2010) Log Message: ----------- screen: fixed cswpreserveconf usage and updated changelog.CSW Modified Paths: -------------- csw/mgar/pkg/screen/trunk/Makefile csw/mgar/pkg/screen/trunk/files/changelog.CSW Modified: csw/mgar/pkg/screen/trunk/Makefile =================================================================== --- csw/mgar/pkg/screen/trunk/Makefile 2010-01-10 00:31:17 UTC (rev 7933) +++ csw/mgar/pkg/screen/trunk/Makefile 2010-01-10 00:59:00 UTC (rev 7934) @@ -24,6 +24,9 @@ REQUIRED_PKGS = CSWncurses +PRESERVECONF = /etc/opt/csw/screenrc +MIGRATE_FILES = screenrc + # we want to use opencsw libncurses and not solaris libcurses # so we modify configure.in so ncurses is tried before curses PATCHFILES += enable_ncurses.patch Modified: csw/mgar/pkg/screen/trunk/files/changelog.CSW =================================================================== --- csw/mgar/pkg/screen/trunk/files/changelog.CSW 2010-01-10 00:31:17 UTC (rev 7933) +++ csw/mgar/pkg/screen/trunk/files/changelog.CSW 2010-01-10 00:59:00 UTC (rev 7934) @@ -1,5 +1,14 @@ +screen (4.0.3,REV=2010.01.10) unstable + + * Now linked with opencsw libncurses. + * Added system-wide screenrc file. + * Moved configuration from /opt/csw/etc to /etc/opt/csw. + * Fixed terminfo problem (Closes: #4133). + + -- Yann Rouillard Sun, 10 Jan 2010 01:53:59 +0100 + screen (4.0.3) unstable - * New upstream version. + * New upstream version. -- Yann Rouillard Wed, 23 Apr 2008 22:25:50 +0200 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From chninkel at users.sourceforge.net Sun Jan 10 01:59:55 2010 From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net) Date: Sun, 10 Jan 2010 00:59:55 +0000 Subject: [csw-devel] SF.net SVN: gar:[7935] csw/mgar/pkg/screen/trunk/checksums Message-ID: Revision: 7935 http://gar.svn.sourceforge.net/gar/?rev=7935&view=rev Author: chninkel Date: 2010-01-10 00:59:55 +0000 (Sun, 10 Jan 2010) Log Message: ----------- screen: updated checksum Modified Paths: -------------- csw/mgar/pkg/screen/trunk/checksums Modified: csw/mgar/pkg/screen/trunk/checksums =================================================================== --- csw/mgar/pkg/screen/trunk/checksums 2010-01-10 00:59:00 UTC (rev 7934) +++ csw/mgar/pkg/screen/trunk/checksums 2010-01-10 00:59:55 UTC (rev 7935) @@ -1,4 +1,4 @@ -a7026461bcda14338f2175ba958195cb changelog.CSW +6c6640f9826245227fca18a26bcf92ad changelog.CSW bc3ac54668be521328c598408cab2d60 enable_ncurses.patch 8506fd205028a96c741e4037de6e3c42 screen-4.0.3.tar.gz ed83d7a9001fa159a367d699580c1dd2 screen-maxwin.patch This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From chninkel at users.sourceforge.net Sun Jan 10 02:11:10 2010 From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net) Date: Sun, 10 Jan 2010 01:11:10 +0000 Subject: [csw-devel] SF.net SVN: gar:[7936] csw/mgar/pkg/screen/trunk/Makefile Message-ID: Revision: 7936 http://gar.svn.sourceforge.net/gar/?rev=7936&view=rev Author: chninkel Date: 2010-01-10 01:11:10 +0000 (Sun, 10 Jan 2010) Log Message: ----------- screen: really fix cswpreserveconf usage Modified Paths: -------------- csw/mgar/pkg/screen/trunk/Makefile Modified: csw/mgar/pkg/screen/trunk/Makefile =================================================================== --- csw/mgar/pkg/screen/trunk/Makefile 2010-01-10 00:59:55 UTC (rev 7935) +++ csw/mgar/pkg/screen/trunk/Makefile 2010-01-10 01:11:10 UTC (rev 7936) @@ -53,7 +53,7 @@ cd $(WORKSRC) && $(prefix)/bin/autoconf post-merge: - ginstall -D $(WORKDIR_FIRSTMOD)/screenrc $(PKGROOT)/etc/$(prefix)/screenrc + ginstall -D $(WORKDIR_FIRSTMOD)/screenrc $(PKGROOT)/etc/$(prefix)/screenrc.CSW ginstall -D $(WORKDIR_FIRSTMOD)/changelog.CSW $(PKGROOT)/$(docdir)/$(GARNAME)/changelog.CSW @$(MAKECOOKIE) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From hson at users.sourceforge.net Sun Jan 10 05:10:36 2010 From: hson at users.sourceforge.net (hson at users.sourceforge.net) Date: Sun, 10 Jan 2010 04:10:36 +0000 Subject: [csw-devel] SF.net SVN: gar:[7937] csw/mgar/pkg Message-ID: Revision: 7937 http://gar.svn.sourceforge.net/gar/?rev=7937&view=rev Author: hson Date: 2010-01-10 04:10:36 +0000 (Sun, 10 Jan 2010) Log Message: ----------- Change from sf.net to sourceforge.net for gar Property Changed: ---------------- csw/mgar/pkg/djvulibre/trunk/ csw/mgar/pkg/evolution/trunk/ csw/mgar/pkg/evolution-ds/trunk/ csw/mgar/pkg/evolution-exchange/trunk/ csw/mgar/pkg/evolution-mapi/trunk/ csw/mgar/pkg/evolution-webcal/trunk/ csw/mgar/pkg/ghostscript/trunk/ csw/mgar/pkg/gnomedesktop/trunk/ csw/mgar/pkg/libfpx/trunk/ csw/mgar/pkg/liblcms/trunk/ csw/mgar/pkg/pxlib/trunk/ csw/mgar/pkg/tiff/trunk/ Property changes on: csw/mgar/pkg/djvulibre/trunk ___________________________________________________________________ Modified: svn:externals - gar https://gar.svn.sf.net/svnroot/gar/csw/mgar/gar/v2 + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 Property changes on: csw/mgar/pkg/evolution/trunk ___________________________________________________________________ Modified: svn:externals - gar https://gar.svn.sf.net/svnroot/gar/csw/mgar/gar/v2 + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 Property changes on: csw/mgar/pkg/evolution-ds/trunk ___________________________________________________________________ Modified: svn:externals - gar https://gar.svn.sf.net/svnroot/gar/csw/mgar/gar/v2 + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 Property changes on: csw/mgar/pkg/evolution-exchange/trunk ___________________________________________________________________ Modified: svn:externals - gar https://gar.svn.sf.net/svnroot/gar/csw/mgar/gar/v2 + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 Property changes on: csw/mgar/pkg/evolution-mapi/trunk ___________________________________________________________________ Modified: svn:externals - gar https://gar.svn.sf.net/svnroot/gar/csw/mgar/gar/v2 + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 Property changes on: csw/mgar/pkg/evolution-webcal/trunk ___________________________________________________________________ Modified: svn:externals - gar https://gar.svn.sf.net/svnroot/gar/csw/mgar/gar/v2 + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 Property changes on: csw/mgar/pkg/ghostscript/trunk ___________________________________________________________________ Modified: svn:externals - gar https://gar.svn.sf.net/svnroot/gar/csw/mgar/gar/v2 + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 Property changes on: csw/mgar/pkg/gnomedesktop/trunk ___________________________________________________________________ Modified: svn:externals - gar https://gar.svn.sf.net/svnroot/gar/csw/mgar/gar/v2 + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 Property changes on: csw/mgar/pkg/libfpx/trunk ___________________________________________________________________ Modified: svn:externals - gar https://gar.svn.sf.net/svnroot/gar/csw/mgar/gar/v2 + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 Property changes on: csw/mgar/pkg/liblcms/trunk ___________________________________________________________________ Modified: svn:externals - gar https://gar.svn.sf.net/svnroot/gar/csw/mgar/gar/v2 + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 Property changes on: csw/mgar/pkg/pxlib/trunk ___________________________________________________________________ Modified: svn:externals - gar https://gar.svn.sf.net/svnroot/gar/csw/mgar/gar/v2 + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 Property changes on: csw/mgar/pkg/tiff/trunk ___________________________________________________________________ Modified: svn:externals - gar https://gar.svn.sf.net/svnroot/gar/csw/mgar/gar/v2 + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From chninkel at users.sourceforge.net Sun Jan 10 13:01:56 2010 From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net) Date: Sun, 10 Jan 2010 12:01:56 +0000 Subject: [csw-devel] SF.net SVN: gar:[7938] csw/mgar/pkg/screen/trunk Message-ID: Revision: 7938 http://gar.svn.sourceforge.net/gar/?rev=7938&view=rev Author: chninkel Date: 2010-01-10 12:01:56 +0000 (Sun, 10 Jan 2010) Log Message: ----------- screen: added screen documentation files Modified Paths: -------------- csw/mgar/pkg/screen/trunk/Makefile csw/mgar/pkg/screen/trunk/checksums csw/mgar/pkg/screen/trunk/files/changelog.CSW Modified: csw/mgar/pkg/screen/trunk/Makefile =================================================================== --- csw/mgar/pkg/screen/trunk/Makefile 2010-01-10 04:10:36 UTC (rev 7937) +++ csw/mgar/pkg/screen/trunk/Makefile 2010-01-10 12:01:56 UTC (rev 7938) @@ -19,6 +19,8 @@ DISTFILES += screenrc DISTFILES += changelog.CSW +DOCFILES = FAQ INSTALL NEWS NEWS.3.5 NEWS.3.6 NEWS.3.7 NEWS.3.9 README TODO ChangeLog + PACKAGES = CSWscrn CATALOGNAME = screen @@ -53,6 +55,9 @@ cd $(WORKSRC) && $(prefix)/bin/autoconf post-merge: + for FILE in $(DOCFILES); do \ + ginstall -D $(WORKSRC_FIRSTMOD)/$$FILE $(PKGROOT)/$(docdir)/$(GARNAME)/$$FILE; \ + done ginstall -D $(WORKDIR_FIRSTMOD)/screenrc $(PKGROOT)/etc/$(prefix)/screenrc.CSW ginstall -D $(WORKDIR_FIRSTMOD)/changelog.CSW $(PKGROOT)/$(docdir)/$(GARNAME)/changelog.CSW @$(MAKECOOKIE) Modified: csw/mgar/pkg/screen/trunk/checksums =================================================================== --- csw/mgar/pkg/screen/trunk/checksums 2010-01-10 04:10:36 UTC (rev 7937) +++ csw/mgar/pkg/screen/trunk/checksums 2010-01-10 12:01:56 UTC (rev 7938) @@ -1,4 +1,4 @@ -6c6640f9826245227fca18a26bcf92ad changelog.CSW +18269762c8dbe1443730d1e23fddfd0c changelog.CSW bc3ac54668be521328c598408cab2d60 enable_ncurses.patch 8506fd205028a96c741e4037de6e3c42 screen-4.0.3.tar.gz ed83d7a9001fa159a367d699580c1dd2 screen-maxwin.patch Modified: csw/mgar/pkg/screen/trunk/files/changelog.CSW =================================================================== --- csw/mgar/pkg/screen/trunk/files/changelog.CSW 2010-01-10 04:10:36 UTC (rev 7937) +++ csw/mgar/pkg/screen/trunk/files/changelog.CSW 2010-01-10 12:01:56 UTC (rev 7938) @@ -4,6 +4,7 @@ * Added system-wide screenrc file. * Moved configuration from /opt/csw/etc to /etc/opt/csw. * Fixed terminfo problem (Closes: #4133). + * Added screen documentation files in the package. -- Yann Rouillard Sun, 10 Jan 2010 01:53:59 +0100 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From skayser at users.sourceforge.net Sun Jan 10 13:59:40 2010 From: skayser at users.sourceforge.net (skayser at users.sourceforge.net) Date: Sun, 10 Jan 2010 12:59:40 +0000 Subject: [csw-devel] SF.net SVN: gar:[7939] csw/mgar/pkg/dante/trunk Message-ID: Revision: 7939 http://gar.svn.sourceforge.net/gar/?rev=7939&view=rev Author: skayser Date: 2010-01-10 12:59:40 +0000 (Sun, 10 Jan 2010) Log Message: ----------- dante: add kerberos, tweaked init script, added sample config Modified Paths: -------------- csw/mgar/pkg/dante/trunk/Makefile Added Paths: ----------- csw/mgar/pkg/dante/trunk/files/cswdante csw/mgar/pkg/dante/trunk/files/sockd.conf.CSW Removed Paths: ------------- csw/mgar/pkg/dante/trunk/files/CSWdante.cswdante Modified: csw/mgar/pkg/dante/trunk/Makefile =================================================================== --- csw/mgar/pkg/dante/trunk/Makefile 2010-01-10 12:01:56 UTC (rev 7938) +++ csw/mgar/pkg/dante/trunk/Makefile 2010-01-10 12:59:40 UTC (rev 7939) @@ -1,10 +1,6 @@ -# Known issue: +# Known limitation: # - The libsocks build doesn't support $SOCKS_CONF. See README.CSW # and INSTALL with its description of `--without-glibc-secure'. -# -# Todo: -# - Look into kerberos linking issues -# - Test sockd and its init script GARNAME = dante GARVERSION = 1.2.0 CATEGORIES = net @@ -21,7 +17,7 @@ the server administrator. endef -SPKG_SOURCEURL = http://www.inet.no/dante/ +VENDOR_URL = http://www.inet.no/dante/ MASTER_SITES = ftp://ftp.inet.no/pub/socks/ MASTER_SITES += ftp://ftp.inet.no/pub/socks/old/ DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz @@ -29,21 +25,23 @@ LICENSE = LICENSE -PACKAGES = CSWlibsocks CSWdante +# See doc/README.usage: dante is stand-alone. libsocks can be used to +# compile or run-time link applications against the SOCKS library +PACKAGES = CSWdante CSWlibsocks -SPKG_DESC_CSWlibsocks = Dante SOCKS runtime libraries (and socksify wrapper) -SPKG_DESC_CSWdante = Dante SOCKS (v4 and v5) proxy daemon +SPKG_DESC_CSWdante = Dante SOCKS (v4 and v5) proxy daemon +SPKG_DESC_CSWlibsocks = Dante SOCKS library (and socksify wrapper) -# There is no pkg compiling against dante right now, just drop the dev files -EXTRA_MERGE_EXCLUDE_FILES = $(includedir)/.* - +PKGFILES_CSWdante = .*sockd.* /etc/opt/csw/init.d/cswdante +PKGFILES_CSWdante += $(docdir)/dante/.* PKGFILES_CSWlibsocks = $(PKGFILES_RT) .*socks.* PKGFILES_CSWlibsocks += $(docdir)/libsocks/.* -PKGFILES_CSWdante = .*sockd.* /etc/opt/csw/init.d/cswdante -PKGFILES_CSWdante += $(docdir)/dante/.* +PKGFILES_CSWlibsocks += $(PKGFILES_DEVEL) -REQUIRED_PKGS_CSWdante = CSWtcpwrap +REQUIRED_PKGS_CSWdante = CSWtcpwrap CSWkrb5lib +REQUIRED_PKGS_CSWlibsocks = CSWkrb5lib +# dante doesn't come with a test suite TEST_SCRIPTS = sysconfdir = /etc/opt/csw @@ -60,11 +58,6 @@ CONFIGURE_ARGS += --with-sockd-conf=$(sysconfdir)/sockd.conf CONFIGURE_ARGS += --with-pidfile=/var/run/cswsockd.pid CONFIGURE_ARGS += --without-glibc-secure - -# Kerberos linking fails .. looks like it is missing -L/opt/csw/lib. -# Needs investigation. -CONFIGURE_ARGS += --without-gssapi - # UPNP support requires miniupnp from http://miniupnp.free.fr/ CONFIGURE_ARGS += --without-upnp @@ -78,6 +71,11 @@ # Get rid of debugging flags which ./configure determines per default perl -pi -e 's#-(g|xs|xO0) ##g if /^CFLAGS =/' $(WORKSRC)/*/Makefile endif + # Kerberos linking fails with the shipped libtool, so make ./configure + # use /opt/csw/bin/libtool (similar to what Debian does). See + # http://article.gmane.org/gmane.os.solaris.opencsw.maintainers/5275 + gsed -ie 's,^LIBTOOL=.*,LIBTOOL=/opt/csw/bin/libtool,' \ + $(WORKSRC)/configure @$(MAKECOOKIE) post-install-libsocks: DOCDEST = $(DESTDIR)$(docdir)/libsocks @@ -102,8 +100,14 @@ cp $(addprefix $(FILEDIR)/,$(CSWDOCS)) $(DOCDEST) ginstall -d $(DESTDIR)/etc/opt/csw/init.d - ginstall -m 0755 $(FILEDIR)/CSWdante.cswdante \ + ginstall -m 0755 $(FILEDIR)/cswdante \ $(DESTDIR)/etc/opt/csw/init.d/cswdante + + ginstall -d $(DESTDIR)/etc/opt/csw + cp $(FILEDIR)/sockd.conf.CSW $(DESTDIR)/etc/opt/csw + + # This is where sockd.log goes, ref. $(FILEDIR)/sockd.conf.CSW + ginstall -d $(DESTDIR)$(localstatedir)/dante @$(MAKECOOKIE) # Make the man pages reference our CSW locations instead of /etc/*.conf Deleted: csw/mgar/pkg/dante/trunk/files/CSWdante.cswdante =================================================================== --- csw/mgar/pkg/dante/trunk/files/CSWdante.cswdante 2010-01-10 12:01:56 UTC (rev 7938) +++ csw/mgar/pkg/dante/trunk/files/CSWdante.cswdante 2010-01-10 12:59:40 UTC (rev 7939) @@ -1,55 +0,0 @@ -#!/sbin/sh -# Simple init script for dante. -# -#AUTOENABLE no - -PATH=/usr/bin:/opt/csw/bin:/usr/sbin - -PIDFILE=/var/run/cswsockd.pid -CONFIG=/etc/opt/csw/etc/sockd.conf - -case $1 in - 'start') - printf "Starting SOCKS proxy: cswdante ... " - if [ ! -f "$CONFIG" ]; then - echo "no configuration, not starting" - exit 96 - fi - /opt/csw/sbin/sockd -D -f $CONFIG; RC=$? - if [ $RC -ne 0 ]; then - echo "failed" - exit $RC - else - echo "ok" - fi - ;; - 'stop') - printf "Stopping SOCKS proxy: cswdante ... " - if [ -f "$PIDFILE" ]; then - /usr/bin/kill `/usr/bin/cat $PIDFILE` - echo "ok" - else - echo " no pid file, not running?" - fi - ;; - 'restart') - $0 stop - $0 start - ;; - 'reload') - # Make the parent process reload the config file, but leave - # child processes untouched. - printf "Reloading SOCKS proxy: cswdante ... " - if [ -f "$PIDFILE" ]; then - /usr/bin/kill -HUP `/usr/bin/cat $PIDFILE` - else - echo " no pid file, not running?" - fi - ;; - *) - echo "Usage: $0 { start | stop | restart | reload }" - exit 1 - ;; -esac - -exit 0 Copied: csw/mgar/pkg/dante/trunk/files/cswdante (from rev 7929, csw/mgar/pkg/dante/trunk/files/CSWdante.cswdante) =================================================================== --- csw/mgar/pkg/dante/trunk/files/cswdante (rev 0) +++ csw/mgar/pkg/dante/trunk/files/cswdante 2010-01-10 12:59:40 UTC (rev 7939) @@ -0,0 +1,64 @@ +#!/sbin/sh +# Simple init script for dante. +# +#AUTOENABLE no + +DAEMON=/opt/csw/sbin/sockd +CONFIG=/etc/opt/csw/sockd.conf +OUTPUT=/var/opt/csw/dante/sockd.log +# PIDFILE is not deleted upon stop by sockd, but simply emptied +PIDFILE=/var/run/cswsockd.pid + +case $1 in + 'start') + printf "Starting SOCKS proxy: cswdante ... " + if [ ! -f "$CONFIG" ]; then + echo "no configuration, not starting" + # exit code 96 translates to SMF_EXIT_ERR_CONFIG on Solaris 10 + exit 96 + fi + $DAEMON -D -f $CONFIG; RC=$? + if [ $RC -ne 0 ]; then + echo "failed (see $OUTPUT)" + exit $RC + else + echo "OK" + fi + ;; + 'stop') + printf "Stopping SOCKS proxy: cswdante ... " + if [ -s "$PIDFILE" ]; then + /usr/bin/kill `/usr/bin/cat $PIDFILE` + echo "OK" + else + echo " no PID found, not running?" + fi + ;; + 'restart') + if $DAEMON -V -f $CONFIG; then + $0 stop + $0 start + else + RC=$? + echo "Not restarting cswdante. Configuration verification failed." + echo "(see $OUTPUT)" + exit $RC + fi + ;; + 'reload') + # Make the parent process reload the config file, but leave + # child processes untouched. + printf "Reloading SOCKS proxy: cswdante ... " + if [ -s "$PIDFILE" ]; then + /usr/bin/kill -HUP `/usr/bin/cat $PIDFILE` + else + echo " no PID found, not running?" + fi + ;; + *) + echo "Usage: $0 { start | stop | restart | reload }" + exit 1 + ;; +esac + +exit 0 Added: csw/mgar/pkg/dante/trunk/files/sockd.conf.CSW =================================================================== --- csw/mgar/pkg/dante/trunk/files/sockd.conf.CSW (rev 0) +++ csw/mgar/pkg/dante/trunk/files/sockd.conf.CSW 2010-01-10 12:59:40 UTC (rev 7939) @@ -0,0 +1,78 @@ +## +## This configuration serves as a very basic example. It makes sockd listen +## on localhost and accepts PAM authenticated connection requestes to any +## target. All requested connections are logged to /var/opt/csw/dante/sockd.log. +## +## Please see sockd.conf(5) and /opt/csw/share/doc/dante/examples for +## guidance on how to configure sockd to your requirements. +## + +## Part #1: general server setttings + +# Write sockd output to a logfile +logoutput: /var/opt/csw/dante/sockd.log + +# sockd listens on localhost and uses interface pcn0:1 for outgoing connections. +# You will very likely need to adjust the external interface name. +internal: localhost port = 1080 +external: pcn0:1 + +# Globally enable authentication modules +method: pam +# PAM service name defaults to "sockd". If no PAM configuration for this service +# name can be found, the PAM libs will default to "other". +#pam.servicename: sockd + +user.privileged: root +user.unprivileged: nobody +user.libwrap: nobody + + +## Part #2: client access rules +## There are two sets of access rules and they work at different levels. Rules +## prefixed with client are checked first and are used to see if the client +## is allowed to connect to the Dante server. + +# Allow connections from localhost to our sockd listening on localhost. +client pass { + from: localhost to: localhost +} + +# To allow LAN connections for an example network of 192.168.0.0 +# you would need to un-comment the following and add another interface +# for sockd to listen to via the "internal" directive at the top. +# client pass { from: 192.168.0.0/24 to: 0.0.0.0/0 } + + +## Part #3: SOCKS request rules +## The other rules, are a level higher and are checked after the client +## connection has been accepted by the client-rules. The socks-rules are +## used to evaluate the socks request that the client sends. +## +## The format and content of the rules is identical, but +## client-rules may contain only a subset of the socks-rules. More +## concrete, they may not contain any keywords related to the socks +## protocol. + +# Block connections to localhost, or they will appear to come from the proxy. +block { + from: 0.0.0.0/0 to: localhost + log: connect +} + +# Block bind to ports lower than 1023 +block { + from: 0.0.0.0/0 to: 0.0.0.0/0 port le 1023 + command: bind + log: connect +} + +# Allow all other SOCKS requestes, but require them to be authenticated. +# Authentication is a SOCKS5 feature only, thus requires SOCKS5 clients. +pass { + from: 0.0.0.0/0 to: 0.0.0.0/0 + log: connect + method: pam +} + +# Fallthrough would be an implicit block This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From skayser at users.sourceforge.net Sun Jan 10 14:21:39 2010 From: skayser at users.sourceforge.net (skayser at users.sourceforge.net) Date: Sun, 10 Jan 2010 13:21:39 +0000 Subject: [csw-devel] SF.net SVN: gar:[7940] csw/mgar/pkg/dante/trunk Message-ID: Revision: 7940 http://gar.svn.sourceforge.net/gar/?rev=7940&view=rev Author: skayser Date: 2010-01-10 13:21:39 +0000 (Sun, 10 Jan 2010) Log Message: ----------- dante: add sample socks.conf, SAMPLECONF for socks.conf & sockd.conf Modified Paths: -------------- csw/mgar/pkg/dante/trunk/Makefile Added Paths: ----------- csw/mgar/pkg/dante/trunk/files/socks.conf.CSW Modified: csw/mgar/pkg/dante/trunk/Makefile =================================================================== --- csw/mgar/pkg/dante/trunk/Makefile 2010-01-10 12:59:40 UTC (rev 7939) +++ csw/mgar/pkg/dante/trunk/Makefile 2010-01-10 13:21:39 UTC (rev 7940) @@ -61,9 +61,10 @@ # UPNP support requires miniupnp from http://miniupnp.free.fr/ CONFIGURE_ARGS += --without-upnp +SAMPLECONF = $(sysconfdir)/socks.conf.CSW +SAMPLECONF += $(sysconfdir)/sockd.conf.CSW +INITSMF = /etc/opt/csw/init\.d/cswdante -INITSMF = /etc/opt/csw/init\.d/cswdante - include gar/category.mk post-configure-modulated: @@ -86,6 +87,9 @@ cp $(WORKSRC)/example/socks*.conf $(DOCDEST)/examples cp $(addprefix $(WORKSRC)/,$(DOCS)) $(DOCDEST) cp $(addprefix $(FILEDIR)/,$(CSWDOCS)) $(DOCDEST) + + ginstall -d $(DESTDIR)$(sysconfdir) + cp $(FILEDIR)/socks.conf.CSW $(DESTDIR)$(sysconfdir) @$(MAKECOOKIE) @@ -103,8 +107,8 @@ ginstall -m 0755 $(FILEDIR)/cswdante \ $(DESTDIR)/etc/opt/csw/init.d/cswdante - ginstall -d $(DESTDIR)/etc/opt/csw - cp $(FILEDIR)/sockd.conf.CSW $(DESTDIR)/etc/opt/csw + ginstall -d $(DESTDIR)$(sysconfdir) + cp $(FILEDIR)/sockd.conf.CSW $(DESTDIR)$(sysconfdir) # This is where sockd.log goes, ref. $(FILEDIR)/sockd.conf.CSW ginstall -d $(DESTDIR)$(localstatedir)/dante Added: csw/mgar/pkg/dante/trunk/files/socks.conf.CSW =================================================================== --- csw/mgar/pkg/dante/trunk/files/socks.conf.CSW (rev 0) +++ csw/mgar/pkg/dante/trunk/files/socks.conf.CSW 2010-01-10 13:21:39 UTC (rev 7940) @@ -0,0 +1,22 @@ +## +## A simple sample socks.conf for users with a local nameserver. +## +## Please see socks.conf(5) and /opt/csw/share/doc/libsocks/examples for +## guidance on how to configure libsocks to your requirements. Please +## also see /opt/csw/share/doc/libsocks/README.CSW as alternate configs +## specified via $SOCKS_CONF are not supported with this build. +## + +# Assuming de0 is on the lan-net, the below will make connections to it +# (and anything else on the lan), be direct, i.e. not go via the proxy. +#route { from: 0.0.0.0/0 to: de0 via: direct } + +# Clients going anywhere else go via the proxyserver listening at +# localhost, port 1080. Uncomment the line(s) corresponding to the +# proxyprotocols your proxyserver supports. +route { + from: 0.0.0.0/0 to: 0.0.0.0/0 via: 127.0.0.1 port = 1080 + proxyprotocol: socks_v5 # server supports socks v5. + proxyprotocol: socks_v4 # server supports socks v4 +# proxyprotocol: http_v1.0 # server supports http v1 +} This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From skayser at users.sourceforge.net Sun Jan 10 14:25:10 2010 From: skayser at users.sourceforge.net (skayser at users.sourceforge.net) Date: Sun, 10 Jan 2010 13:25:10 +0000 Subject: [csw-devel] SF.net SVN: gar:[7941] csw/mgar/pkg/dante/trunk Message-ID: Revision: 7941 http://gar.svn.sourceforge.net/gar/?rev=7941&view=rev Author: skayser Date: 2010-01-10 13:25:10 +0000 (Sun, 10 Jan 2010) Log Message: ----------- dante: updated changelog.CSW, renamed NEWS to changelog Modified Paths: -------------- csw/mgar/pkg/dante/trunk/Makefile csw/mgar/pkg/dante/trunk/files/changelog.CSW Modified: csw/mgar/pkg/dante/trunk/Makefile =================================================================== --- csw/mgar/pkg/dante/trunk/Makefile 2010-01-10 13:21:39 UTC (rev 7940) +++ csw/mgar/pkg/dante/trunk/Makefile 2010-01-10 13:25:10 UTC (rev 7941) @@ -65,6 +65,8 @@ SAMPLECONF += $(sysconfdir)/sockd.conf.CSW INITSMF = /etc/opt/csw/init\.d/cswdante +EXTRA_PAX_ARGS = '-s,NEWS$$,changelog,p' + include gar/category.mk post-configure-modulated: Modified: csw/mgar/pkg/dante/trunk/files/changelog.CSW =================================================================== --- csw/mgar/pkg/dante/trunk/files/changelog.CSW 2010-01-10 13:21:39 UTC (rev 7940) +++ csw/mgar/pkg/dante/trunk/files/changelog.CSW 2010-01-10 13:25:10 UTC (rev 7941) @@ -1,5 +1,5 @@ -dante (1.2.0,REV=2010.01.09) +dante (1.2.0,REV=2010.01.10) * Adopted and updated to 1.2.0 - -- Sebastian Kayser Sat, 9 Jan 2010 19:18:23 +0100 + -- Sebastian Kayser Sun, 10 Jan 2010 14:09:19 +0100 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From skayser at users.sourceforge.net Sun Jan 10 14:30:25 2010 From: skayser at users.sourceforge.net (skayser at users.sourceforge.net) Date: Sun, 10 Jan 2010 13:30:25 +0000 Subject: [csw-devel] SF.net SVN: gar:[7942] csw/mgar/pkg/dante/trunk/Makefile Message-ID: Revision: 7942 http://gar.svn.sourceforge.net/gar/?rev=7942&view=rev Author: skayser Date: 2010-01-10 13:30:25 +0000 (Sun, 10 Jan 2010) Log Message: ----------- dante: fix SAMPLECONF paths Modified Paths: -------------- csw/mgar/pkg/dante/trunk/Makefile Modified: csw/mgar/pkg/dante/trunk/Makefile =================================================================== --- csw/mgar/pkg/dante/trunk/Makefile 2010-01-10 13:25:10 UTC (rev 7941) +++ csw/mgar/pkg/dante/trunk/Makefile 2010-01-10 13:30:25 UTC (rev 7942) @@ -61,8 +61,8 @@ # UPNP support requires miniupnp from http://miniupnp.free.fr/ CONFIGURE_ARGS += --without-upnp -SAMPLECONF = $(sysconfdir)/socks.conf.CSW -SAMPLECONF += $(sysconfdir)/sockd.conf.CSW +SAMPLECONF = $(sysconfdir)/socks.conf +SAMPLECONF += $(sysconfdir)/sockd.conf INITSMF = /etc/opt/csw/init\.d/cswdante EXTRA_PAX_ARGS = '-s,NEWS$$,changelog,p' @@ -91,7 +91,7 @@ cp $(addprefix $(FILEDIR)/,$(CSWDOCS)) $(DOCDEST) ginstall -d $(DESTDIR)$(sysconfdir) - cp $(FILEDIR)/socks.conf.CSW $(DESTDIR)$(sysconfdir) + cp $(FILEDIR)/socks.conf.CSW $(DESTDIR)$(sysconfdir)/socks.conf @$(MAKECOOKIE) @@ -110,7 +110,7 @@ $(DESTDIR)/etc/opt/csw/init.d/cswdante ginstall -d $(DESTDIR)$(sysconfdir) - cp $(FILEDIR)/sockd.conf.CSW $(DESTDIR)$(sysconfdir) + cp $(FILEDIR)/sockd.conf.CSW $(DESTDIR)$(sysconfdir)/sockd.conf # This is where sockd.log goes, ref. $(FILEDIR)/sockd.conf.CSW ginstall -d $(DESTDIR)$(localstatedir)/dante This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From skayser at users.sourceforge.net Sun Jan 10 15:21:59 2010 From: skayser at users.sourceforge.net (skayser at users.sourceforge.net) Date: Sun, 10 Jan 2010 14:21:59 +0000 Subject: [csw-devel] SF.net SVN: gar:[7943] csw/mgar/pkg/dante/trunk Message-ID: Revision: 7943 http://gar.svn.sourceforge.net/gar/?rev=7943&view=rev Author: skayser Date: 2010-01-10 14:21:59 +0000 (Sun, 10 Jan 2010) Log Message: ----------- dante: tweaked sockd.conf, socksify core dumps Modified Paths: -------------- csw/mgar/pkg/dante/trunk/Makefile csw/mgar/pkg/dante/trunk/files/sockd.conf.CSW Modified: csw/mgar/pkg/dante/trunk/Makefile =================================================================== --- csw/mgar/pkg/dante/trunk/Makefile 2010-01-10 13:30:25 UTC (rev 7942) +++ csw/mgar/pkg/dante/trunk/Makefile 2010-01-10 14:21:59 UTC (rev 7943) @@ -1,6 +1,10 @@ # Known limitation: # - The libsocks build doesn't support $SOCKS_CONF. See README.CSW # and INSTALL with its description of `--without-glibc-secure'. +# +# TODO +# - socksify throws a core dump after the request is finished, +# to reproduce: /opt/csw/bin/socksify wget -qO http://google.com GARNAME = dante GARVERSION = 1.2.0 CATEGORIES = net Modified: csw/mgar/pkg/dante/trunk/files/sockd.conf.CSW =================================================================== --- csw/mgar/pkg/dante/trunk/files/sockd.conf.CSW 2010-01-10 13:30:25 UTC (rev 7942) +++ csw/mgar/pkg/dante/trunk/files/sockd.conf.CSW 2010-01-10 14:21:59 UTC (rev 7943) @@ -17,8 +17,8 @@ internal: localhost port = 1080 external: pcn0:1 -# Globally enable authentication modules -method: pam +# Which authentication methods should be advertised in the SOCKS5 negotiation +method: pam none # PAM service name defaults to "sockd". If no PAM configuration for this service # name can be found, the PAM libs will default to "other". #pam.servicename: sockd @@ -57,21 +57,21 @@ # Block connections to localhost, or they will appear to come from the proxy. block { from: 0.0.0.0/0 to: localhost - log: connect + log: connect error } # Block bind to ports lower than 1023 block { from: 0.0.0.0/0 to: 0.0.0.0/0 port le 1023 command: bind - log: connect + log: connect error } # Allow all other SOCKS requestes, but require them to be authenticated. # Authentication is a SOCKS5 feature only, thus requires SOCKS5 clients. pass { from: 0.0.0.0/0 to: 0.0.0.0/0 - log: connect + log: connect error method: pam } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From skayser at users.sourceforge.net Sun Jan 10 16:17:18 2010 From: skayser at users.sourceforge.net (skayser at users.sourceforge.net) Date: Sun, 10 Jan 2010 15:17:18 +0000 Subject: [csw-devel] SF.net SVN: gar:[7944] csw/mgar/pkg/dante/trunk/files/socks.conf.CSW Message-ID: Revision: 7944 http://gar.svn.sourceforge.net/gar/?rev=7944&view=rev Author: skayser Date: 2010-01-10 15:17:18 +0000 (Sun, 10 Jan 2010) Log Message: ----------- dante: add debug directives/instructions to socks.conf Modified Paths: -------------- csw/mgar/pkg/dante/trunk/files/socks.conf.CSW Modified: csw/mgar/pkg/dante/trunk/files/socks.conf.CSW =================================================================== --- csw/mgar/pkg/dante/trunk/files/socks.conf.CSW 2010-01-10 14:21:59 UTC (rev 7943) +++ csw/mgar/pkg/dante/trunk/files/socks.conf.CSW 2010-01-10 15:17:18 UTC (rev 7944) @@ -7,6 +7,10 @@ ## specified via $SOCKS_CONF are not supported with this build. ## +# Uncomment these if you are having troubles with libsocks +#debug: 1 +#logoutput: stderr + # Assuming de0 is on the lan-net, the below will make connections to it # (and anything else on the lan), be direct, i.e. not go via the proxy. #route { from: 0.0.0.0/0 to: de0 via: direct } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From skayser at users.sourceforge.net Sun Jan 10 16:22:49 2010 From: skayser at users.sourceforge.net (skayser at users.sourceforge.net) Date: Sun, 10 Jan 2010 15:22:49 +0000 Subject: [csw-devel] SF.net SVN: gar:[7945] csw/mgar/pkg/dante/trunk/Makefile Message-ID: Revision: 7945 http://gar.svn.sourceforge.net/gar/?rev=7945&view=rev Author: skayser Date: 2010-01-10 15:22:49 +0000 (Sun, 10 Jan 2010) Log Message: ----------- dante: build w/o kerberos to see whether it fixes socksify core dumps Modified Paths: -------------- csw/mgar/pkg/dante/trunk/Makefile Modified: csw/mgar/pkg/dante/trunk/Makefile =================================================================== --- csw/mgar/pkg/dante/trunk/Makefile 2010-01-10 15:17:18 UTC (rev 7944) +++ csw/mgar/pkg/dante/trunk/Makefile 2010-01-10 15:22:49 UTC (rev 7945) @@ -65,6 +65,8 @@ # UPNP support requires miniupnp from http://miniupnp.free.fr/ CONFIGURE_ARGS += --without-upnp +CONFIGURE_ARGS += --without-gssapi + SAMPLECONF = $(sysconfdir)/socks.conf SAMPLECONF += $(sysconfdir)/sockd.conf INITSMF = /etc/opt/csw/init\.d/cswdante @@ -81,8 +83,8 @@ # Kerberos linking fails with the shipped libtool, so make ./configure # use /opt/csw/bin/libtool (similar to what Debian does). See # http://article.gmane.org/gmane.os.solaris.opencsw.maintainers/5275 - gsed -ie 's,^LIBTOOL=.*,LIBTOOL=/opt/csw/bin/libtool,' \ - $(WORKSRC)/configure + #gsed -ie 's,^LIBTOOL=.*,LIBTOOL=/opt/csw/bin/libtool,' \ + # $(WORKSRC)/configure @$(MAKECOOKIE) post-install-libsocks: DOCDEST = $(DESTDIR)$(docdir)/libsocks This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From skayser at users.sourceforge.net Sun Jan 10 17:25:20 2010 From: skayser at users.sourceforge.net (skayser at users.sourceforge.net) Date: Sun, 10 Jan 2010 16:25:20 +0000 Subject: [csw-devel] SF.net SVN: gar:[7946] csw/mgar/pkg/dante/trunk/Makefile Message-ID: Revision: 7946 http://gar.svn.sourceforge.net/gar/?rev=7946&view=rev Author: skayser Date: 2010-01-10 16:25:20 +0000 (Sun, 10 Jan 2010) Log Message: ----------- dante: move LIBTOOL hack to pre-configure, further socksify core dump debugging Modified Paths: -------------- csw/mgar/pkg/dante/trunk/Makefile Modified: csw/mgar/pkg/dante/trunk/Makefile =================================================================== --- csw/mgar/pkg/dante/trunk/Makefile 2010-01-10 15:22:49 UTC (rev 7945) +++ csw/mgar/pkg/dante/trunk/Makefile 2010-01-10 16:25:20 UTC (rev 7946) @@ -1,10 +1,12 @@ # Known limitation: # - The libsocks build doesn't support $SOCKS_CONF. See README.CSW # and INSTALL with its description of `--without-glibc-secure'. -# -# TODO -# - socksify throws a core dump after the request is finished, -# to reproduce: /opt/csw/bin/socksify wget -qO http://google.com +# +# Known issues: +# - When compiled with GSSAPI/kerberos support, socksify core dumps +# at the end of the connection (when all data has been transmitted). +# To reproduce: /opt/csw/bin/socksify wget -qO http://google.com +# GARNAME = dante GARVERSION = 1.2.0 CATEGORIES = net @@ -64,9 +66,9 @@ CONFIGURE_ARGS += --without-glibc-secure # UPNP support requires miniupnp from http://miniupnp.free.fr/ CONFIGURE_ARGS += --without-upnp +# See "Known issues" at the top of this Makefile +#CONFIGURE_ARGS += --without-gssapi -CONFIGURE_ARGS += --without-gssapi - SAMPLECONF = $(sysconfdir)/socks.conf SAMPLECONF += $(sysconfdir)/sockd.conf INITSMF = /etc/opt/csw/init\.d/cswdante @@ -75,16 +77,19 @@ include gar/category.mk +pre-configure-modulated: + # Kerberos linking fails with the shipped libtool, so make ./configure + # use /opt/csw/bin/libtool (similar to what Debian does). See + # http://article.gmane.org/gmane.os.solaris.opencsw.maintainers/5275 + gsed -ie 's,^LIBTOOL=.*,LIBTOOL=/opt/csw/bin/libtool,' \ + $(WORKSRC)/configure + @$(MAKECOOKIE) + post-configure-modulated: ifneq ($(GARFLAVOR),DBG) # Get rid of debugging flags which ./configure determines per default perl -pi -e 's#-(g|xs|xO0) ##g if /^CFLAGS =/' $(WORKSRC)/*/Makefile endif - # Kerberos linking fails with the shipped libtool, so make ./configure - # use /opt/csw/bin/libtool (similar to what Debian does). See - # http://article.gmane.org/gmane.os.solaris.opencsw.maintainers/5275 - #gsed -ie 's,^LIBTOOL=.*,LIBTOOL=/opt/csw/bin/libtool,' \ - # $(WORKSRC)/configure @$(MAKECOOKIE) post-install-libsocks: DOCDEST = $(DESTDIR)$(docdir)/libsocks @@ -98,6 +103,9 @@ ginstall -d $(DESTDIR)$(sysconfdir) cp $(FILEDIR)/socks.conf.CSW $(DESTDIR)$(sysconfdir)/socks.conf + + # /bin/sh doesn't understand "if ! test", reported to dante-bugs at inet.no + gsed -ie 's,/bin/sh,/usr/bin/bash,' $(DESTDIR)$(bindir)/socksify @$(MAKECOOKIE) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From hson at users.sourceforge.net Sun Jan 10 17:50:42 2010 From: hson at users.sourceforge.net (hson at users.sourceforge.net) Date: Sun, 10 Jan 2010 16:50:42 +0000 Subject: [csw-devel] SF.net SVN: gar:[7947] csw/mgar/pkg/djvulibre/trunk/checksums Message-ID: Revision: 7947 http://gar.svn.sourceforge.net/gar/?rev=7947&view=rev Author: hson Date: 2010-01-10 16:50:42 +0000 (Sun, 10 Jan 2010) Log Message: ----------- djvulibre: Add missing file Added Paths: ----------- csw/mgar/pkg/djvulibre/trunk/checksums Added: csw/mgar/pkg/djvulibre/trunk/checksums =================================================================== --- csw/mgar/pkg/djvulibre/trunk/checksums (rev 0) +++ csw/mgar/pkg/djvulibre/trunk/checksums 2010-01-10 16:50:42 UTC (rev 7947) @@ -0,0 +1,2 @@ +23e0083aef7878b2c9527d2e5e7a8fa9 ddjvu.cpp.patch +d1513784ce0e4f37d71595dc34c95ec7 djvulibre-3.5.22.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From hson at users.sourceforge.net Sun Jan 10 17:59:27 2010 From: hson at users.sourceforge.net (hson at users.sourceforge.net) Date: Sun, 10 Jan 2010 16:59:27 +0000 Subject: [csw-devel] SF.net SVN: gar:[7948] csw/mgar/pkg/tiff/trunk/Makefile Message-ID: Revision: 7948 http://gar.svn.sourceforge.net/gar/?rev=7948&view=rev Author: hson Date: 2010-01-10 16:59:27 +0000 (Sun, 10 Jan 2010) Log Message: ----------- tiff: Add configure args to build C++ lib Modified Paths: -------------- csw/mgar/pkg/tiff/trunk/Makefile Modified: csw/mgar/pkg/tiff/trunk/Makefile =================================================================== --- csw/mgar/pkg/tiff/trunk/Makefile 2010-01-10 16:50:42 UTC (rev 7947) +++ csw/mgar/pkg/tiff/trunk/Makefile 2010-01-10 16:59:27 UTC (rev 7948) @@ -43,6 +43,7 @@ CONFIGURE_ARGS = $(DIRPATHS) CONFIGURE_ARGS += --with-docdir=/opt/csw/share/doc/tiff CONFIGURE_ARGS += --disable-static +CONFIGURE_ARGS += --enable-cxx CONFIGURE_ARGS += --with-zlib-include-dir=/opt/csw/include CONFIGURE_ARGS += --with-zlib-lib-dir=/opt/csw/lib CONFIGURE_ARGS += --with-jpeg-include-dir=/opt/csw/include This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From hson at users.sourceforge.net Sun Jan 10 18:01:05 2010 From: hson at users.sourceforge.net (hson at users.sourceforge.net) Date: Sun, 10 Jan 2010 17:01:05 +0000 Subject: [csw-devel] SF.net SVN: gar:[7949] csw/mgar/pkg/wmf/trunk/Makefile Message-ID: Revision: 7949 http://gar.svn.sourceforge.net/gar/?rev=7949&view=rev Author: hson Date: 2010-01-10 17:01:04 +0000 (Sun, 10 Jan 2010) Log Message: ----------- wmf: Add configure args for X11, add prerequisite package Modified Paths: -------------- csw/mgar/pkg/wmf/trunk/Makefile Modified: csw/mgar/pkg/wmf/trunk/Makefile =================================================================== --- csw/mgar/pkg/wmf/trunk/Makefile 2010-01-10 16:59:27 UTC (rev 7948) +++ csw/mgar/pkg/wmf/trunk/Makefile 2010-01-10 17:01:04 UTC (rev 7949) @@ -31,6 +31,8 @@ REQUIRED_PKGS_CSWwmfdevel += CSWwmf REQUIRED_PKGS_CSWwmfdoc += CSWwmf +PREREQUISITE_PKGS += CSWgtk2devel + PKGFILES_CSWwmfdevel = $(PKGFILES_DEVEL) PKGFILES_CSWwmfdoc = $(sharedstatedir)/doc/.* @@ -48,6 +50,8 @@ UFILES_REGEX = (\d+(?:\.\d+)*) CONFIGURE_ARGS = $(DIRPATHS) +CONFIGURE_ARGS += --x-includes=$(prefix)/X11/include +CONFIGURE_ARGS += --x-libraries=$(abspath $(prefix)/X11/lib/$(MM_LIBDIR)) TEST_TARGET = check This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From hson at users.sourceforge.net Sun Jan 10 18:02:37 2010 From: hson at users.sourceforge.net (hson at users.sourceforge.net) Date: Sun, 10 Jan 2010 17:02:37 +0000 Subject: [csw-devel] SF.net SVN: gar:[7950] csw/mgar/pkg/openexr/trunk/Makefile Message-ID: Revision: 7950 http://gar.svn.sourceforge.net/gar/?rev=7950&view=rev Author: hson Date: 2010-01-10 17:02:36 +0000 (Sun, 10 Jan 2010) Log Message: ----------- openexr: Add NO_ISAEXEC since no 64-binaries are built, set TEST_TARGET to NULL until 64-bit libraries are installed Modified Paths: -------------- csw/mgar/pkg/openexr/trunk/Makefile Modified: csw/mgar/pkg/openexr/trunk/Makefile =================================================================== --- csw/mgar/pkg/openexr/trunk/Makefile 2010-01-10 17:01:04 UTC (rev 7949) +++ csw/mgar/pkg/openexr/trunk/Makefile 2010-01-10 17:02:36 UTC (rev 7950) @@ -51,11 +51,12 @@ EXTRA_CXX_FLAGS += $(EXTRA_LD_FLAGS_$(MODULATION)) BUILD64 = 1 +NO_ISAEXEC = 1 # Check fails if library isn't installed /opt/csw/lib and until a 64-bit # lib is installed test has to be disabled -TEST_TARGET = check -#TEST_TARGET = +#TEST_TARGET = check +TEST_TARGET = STRIP_LIBTOOL = 1 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From skayser at users.sourceforge.net Sun Jan 10 18:15:53 2010 From: skayser at users.sourceforge.net (skayser at users.sourceforge.net) Date: Sun, 10 Jan 2010 17:15:53 +0000 Subject: [csw-devel] SF.net SVN: gar:[7951] csw/mgar/pkg/dante/trunk Message-ID: Revision: 7951 http://gar.svn.sourceforge.net/gar/?rev=7951&view=rev Author: skayser Date: 2010-01-10 17:15:52 +0000 (Sun, 10 Jan 2010) Log Message: ----------- dante: documented Kerberos-related core dumps, releasing w/o Kerberos support for now Modified Paths: -------------- csw/mgar/pkg/dante/trunk/Makefile csw/mgar/pkg/dante/trunk/files/README.CSW Modified: csw/mgar/pkg/dante/trunk/Makefile =================================================================== --- csw/mgar/pkg/dante/trunk/Makefile 2010-01-10 17:02:36 UTC (rev 7950) +++ csw/mgar/pkg/dante/trunk/Makefile 2010-01-10 17:15:52 UTC (rev 7951) @@ -3,9 +3,14 @@ # and INSTALL with its description of `--without-glibc-secure'. # # Known issues: -# - When compiled with GSSAPI/kerberos support, socksify core dumps +# - When compiled with GSSAPI/Kerberos support, socksify core dumps # at the end of the connection (when all data has been transmitted). # To reproduce: /opt/csw/bin/socksify wget -qO http://google.com +# Observed on Solaris 10 U7 x86 with CSWkrb5lib 1.4.4,REV=2006.12.27. +# Not investigated in depth. If anyone needs Kerberos support, feel +# free to tackle this. Might be bug in Dante, might have to do with +# the LIBTOOL hack (see pre-configure-modulated) or might also +# originate in our downrev Kerberos libs. # GARNAME = dante GARVERSION = 1.2.0 @@ -67,7 +72,7 @@ # UPNP support requires miniupnp from http://miniupnp.free.fr/ CONFIGURE_ARGS += --without-upnp # See "Known issues" at the top of this Makefile -#CONFIGURE_ARGS += --without-gssapi +CONFIGURE_ARGS += --without-gssapi SAMPLECONF = $(sysconfdir)/socks.conf SAMPLECONF += $(sysconfdir)/sockd.conf @@ -81,8 +86,8 @@ # Kerberos linking fails with the shipped libtool, so make ./configure # use /opt/csw/bin/libtool (similar to what Debian does). See # http://article.gmane.org/gmane.os.solaris.opencsw.maintainers/5275 - gsed -ie 's,^LIBTOOL=.*,LIBTOOL=/opt/csw/bin/libtool,' \ - $(WORKSRC)/configure + #gsed -ie 's,^LIBTOOL=.*,LIBTOOL=/opt/csw/bin/libtool,' \ + # $(WORKSRC)/configure @$(MAKECOOKIE) post-configure-modulated: @@ -111,7 +116,7 @@ post-install-dante: DOCDEST = $(DESTDIR)$(docdir)/dante post-install-dante: DOCS = CREDITS NEWS SUPPORT -post-install-dante: CSWDOCS = changelog.CSW +post-install-dante: CSWDOCS = README.CSW changelog.CSW post-install-dante: ginstall -d $(DESTDIR)/var/opt/csw/dante ginstall -d $(DOCDEST)/examples Modified: csw/mgar/pkg/dante/trunk/files/README.CSW =================================================================== --- csw/mgar/pkg/dante/trunk/files/README.CSW 2010-01-10 17:02:36 UTC (rev 7950) +++ csw/mgar/pkg/dante/trunk/files/README.CSW 2010-01-10 17:15:52 UTC (rev 7951) @@ -1,6 +1,16 @@ -Known issue: libsocks does not support $SOCKS_CONF --------------------------------------------------- +Known limitation: libsocks/sockd without Kerberos support +--------------------------------------------------------- +These builds of libsocks/sockd come without Kerberos support. If you +require Kerberos support and are willing to invest some time, feel +free to ping our maintainers mailing list and we will get you started +with our build system. If you can't help out, but still require +Kerberos support, please file a bug report so that we know about +your requirement. + +Known limitation: libsocks does not support $SOCKS_CONF +------------------------------------------------------- + This build of the libsocks _does not_ support an alternate socks.conf passed via the environment variable SOCKS_CONF. As a workaround you can specify a SOCKS server via the environment variables pointed out in This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From skayser at users.sourceforge.net Sun Jan 10 18:49:47 2010 From: skayser at users.sourceforge.net (skayser at users.sourceforge.net) Date: Sun, 10 Jan 2010 17:49:47 +0000 Subject: [csw-devel] SF.net SVN: gar:[7952] csw/mgar/pkg/dante/trunk/files/changelog.CSW Message-ID: Revision: 7952 http://gar.svn.sourceforge.net/gar/?rev=7952&view=rev Author: skayser Date: 2010-01-10 17:49:46 +0000 (Sun, 10 Jan 2010) Log Message: ----------- dante: mention $(sysconfdir) change in changelog.CSW Modified Paths: -------------- csw/mgar/pkg/dante/trunk/files/changelog.CSW Modified: csw/mgar/pkg/dante/trunk/files/changelog.CSW =================================================================== --- csw/mgar/pkg/dante/trunk/files/changelog.CSW 2010-01-10 17:15:52 UTC (rev 7951) +++ csw/mgar/pkg/dante/trunk/files/changelog.CSW 2010-01-10 17:49:46 UTC (rev 7952) @@ -1,5 +1,6 @@ dante (1.2.0,REV=2010.01.10) * Adopted and updated to 1.2.0 + * sockd/libsocks now look in /etc/opt/csw/ for their configuration files. -- Sebastian Kayser Sun, 10 Jan 2010 14:09:19 +0100 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From hson at users.sourceforge.net Sun Jan 10 19:26:01 2010 From: hson at users.sourceforge.net (hson at users.sourceforge.net) Date: Sun, 10 Jan 2010 18:26:01 +0000 Subject: [csw-devel] SF.net SVN: gar:[7953] csw/mgar/pkg/librsvg/trunk/Makefile Message-ID: Revision: 7953 http://gar.svn.sourceforge.net/gar/?rev=7953&view=rev Author: hson Date: 2010-01-10 18:26:01 +0000 (Sun, 10 Jan 2010) Log Message: ----------- librsvg: Add configure args for X11, build 64-bit Modified Paths: -------------- csw/mgar/pkg/librsvg/trunk/Makefile Modified: csw/mgar/pkg/librsvg/trunk/Makefile =================================================================== --- csw/mgar/pkg/librsvg/trunk/Makefile 2010-01-10 17:49:46 UTC (rev 7952) +++ csw/mgar/pkg/librsvg/trunk/Makefile 2010-01-10 18:26:01 UTC (rev 7953) @@ -45,11 +45,19 @@ LIBS=-lm EXTRA_COMMON_EXPORTS = LIBS + CONFIGURE_ARGS = $(DIRPATHS) CONFIGURE_ARGS += --enable-shared=yes --enable-static=no +CONFIGURE_ARGS += --x-includes=$(prefix)/X11/include +CONFIGURE_ARGS += --x-libraries=$(abspath $(prefix)/X11/lib/$(MM_LIBDIR)) + +EXTRA_INC = $(prefix)/X11/include +EXTRA_LIB = $(prefix)/X11/lib +EXTRA_PKG_CONFIG_DIRS = $(prefix)/X11/lib EXTRA_LD_OPTIONS = -R/opt/csw/X11/lib -EXTRA_PKG_CONFIG_DIRS = $(prefix)/X11/lib +BUILD64 = 1 + STRIP_LIBTOOL=1 TEST_TARGET = check This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From skayser at users.sourceforge.net Sun Jan 10 19:40:46 2010 From: skayser at users.sourceforge.net (skayser at users.sourceforge.net) Date: Sun, 10 Jan 2010 18:40:46 +0000 Subject: [csw-devel] SF.net SVN: gar:[7954] csw/mgar/pkg/dante/trunk/Makefile Message-ID: Revision: 7954 http://gar.svn.sourceforge.net/gar/?rev=7954&view=rev Author: skayser Date: 2010-01-10 18:40:44 +0000 (Sun, 10 Jan 2010) Log Message: ----------- dante: removed dep on krb5lib Modified Paths: -------------- csw/mgar/pkg/dante/trunk/Makefile Modified: csw/mgar/pkg/dante/trunk/Makefile =================================================================== --- csw/mgar/pkg/dante/trunk/Makefile 2010-01-10 18:26:01 UTC (rev 7953) +++ csw/mgar/pkg/dante/trunk/Makefile 2010-01-10 18:40:44 UTC (rev 7954) @@ -49,8 +49,7 @@ PKGFILES_CSWlibsocks += $(docdir)/libsocks/.* PKGFILES_CSWlibsocks += $(PKGFILES_DEVEL) -REQUIRED_PKGS_CSWdante = CSWtcpwrap CSWkrb5lib -REQUIRED_PKGS_CSWlibsocks = CSWkrb5lib +REQUIRED_PKGS_CSWdante = CSWtcpwrap # dante doesn't come with a test suite TEST_SCRIPTS = This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From skayser at users.sourceforge.net Sun Jan 10 20:11:29 2010 From: skayser at users.sourceforge.net (skayser at users.sourceforge.net) Date: Sun, 10 Jan 2010 19:11:29 +0000 Subject: [csw-devel] SF.net SVN: gar:[7955] csw/mgar/pkg/dante/trunk/files/changelog.CSW Message-ID: Revision: 7955 http://gar.svn.sourceforge.net/gar/?rev=7955&view=rev Author: skayser Date: 2010-01-10 19:11:28 +0000 (Sun, 10 Jan 2010) Log Message: ----------- dante: full description of changes in changelog.CSW Modified Paths: -------------- csw/mgar/pkg/dante/trunk/files/changelog.CSW Modified: csw/mgar/pkg/dante/trunk/files/changelog.CSW =================================================================== --- csw/mgar/pkg/dante/trunk/files/changelog.CSW 2010-01-10 18:40:44 UTC (rev 7954) +++ csw/mgar/pkg/dante/trunk/files/changelog.CSW 2010-01-10 19:11:28 UTC (rev 7955) @@ -2,5 +2,9 @@ * Adopted and updated to 1.2.0 * sockd/libsocks now look in /etc/opt/csw/ for their configuration files. + * Enhanced init script to verify configuration syntax on restart. + * Automatic rc.d and SMF setup now done by cswclassutils. + * Config file handling now done via cswclassutils (i.e. config files + will be preserved on update). -- Sebastian Kayser Sun, 10 Jan 2010 14:09:19 +0100 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From skayser at users.sourceforge.net Sun Jan 10 20:17:32 2010 From: skayser at users.sourceforge.net (skayser at users.sourceforge.net) Date: Sun, 10 Jan 2010 19:17:32 +0000 Subject: [csw-devel] SF.net SVN: gar:[7956] csw/mgar/pkg/dante/trunk/files/changelog.CSW Message-ID: Revision: 7956 http://gar.svn.sourceforge.net/gar/?rev=7956&view=rev Author: skayser Date: 2010-01-10 19:17:32 +0000 (Sun, 10 Jan 2010) Log Message: ----------- dante: full description of changes in changelog.CSW Modified Paths: -------------- csw/mgar/pkg/dante/trunk/files/changelog.CSW Modified: csw/mgar/pkg/dante/trunk/files/changelog.CSW =================================================================== --- csw/mgar/pkg/dante/trunk/files/changelog.CSW 2010-01-10 19:11:28 UTC (rev 7955) +++ csw/mgar/pkg/dante/trunk/files/changelog.CSW 2010-01-10 19:17:32 UTC (rev 7956) @@ -2,6 +2,7 @@ * Adopted and updated to 1.2.0 * sockd/libsocks now look in /etc/opt/csw/ for their configuration files. + * Removed dante dependency on libsocks (not required). * Enhanced init script to verify configuration syntax on restart. * Automatic rc.d and SMF setup now done by cswclassutils. * Config file handling now done via cswclassutils (i.e. config files This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From skayser at users.sourceforge.net Sun Jan 10 20:21:12 2010 From: skayser at users.sourceforge.net (skayser at users.sourceforge.net) Date: Sun, 10 Jan 2010 19:21:12 +0000 Subject: [csw-devel] SF.net SVN: gar:[7957] csw/mgar/pkg/dante/trunk/Makefile Message-ID: Revision: 7957 http://gar.svn.sourceforge.net/gar/?rev=7957&view=rev Author: skayser Date: 2010-01-10 19:21:12 +0000 (Sun, 10 Jan 2010) Log Message: ----------- dante: fix gsed invocation Modified Paths: -------------- csw/mgar/pkg/dante/trunk/Makefile Modified: csw/mgar/pkg/dante/trunk/Makefile =================================================================== --- csw/mgar/pkg/dante/trunk/Makefile 2010-01-10 19:17:32 UTC (rev 7956) +++ csw/mgar/pkg/dante/trunk/Makefile 2010-01-10 19:21:12 UTC (rev 7957) @@ -109,7 +109,7 @@ cp $(FILEDIR)/socks.conf.CSW $(DESTDIR)$(sysconfdir)/socks.conf # /bin/sh doesn't understand "if ! test", reported to dante-bugs at inet.no - gsed -ie 's,/bin/sh,/usr/bin/bash,' $(DESTDIR)$(bindir)/socksify + gsed -i -e 's,/bin/sh,/usr/bin/bash,' $(DESTDIR)$(bindir)/socksify @$(MAKECOOKIE) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From hson at users.sourceforge.net Mon Jan 11 00:26:09 2010 From: hson at users.sourceforge.net (hson at users.sourceforge.net) Date: Sun, 10 Jan 2010 23:26:09 +0000 Subject: [csw-devel] SF.net SVN: gar:[7958] csw/mgar/pkg/librsvg/trunk Message-ID: Revision: 7958 http://gar.svn.sourceforge.net/gar/?rev=7958&view=rev Author: hson Date: 2010-01-10 23:26:05 +0000 (Sun, 10 Jan 2010) Log Message: ----------- librsvg: Fix LD_FLAGS for libcairo problem, disable 64-bit until libgsf-1 has 64-bit support Modified Paths: -------------- csw/mgar/pkg/librsvg/trunk/Makefile csw/mgar/pkg/librsvg/trunk/checksums Modified: csw/mgar/pkg/librsvg/trunk/Makefile =================================================================== --- csw/mgar/pkg/librsvg/trunk/Makefile 2010-01-10 19:21:12 UTC (rev 7957) +++ csw/mgar/pkg/librsvg/trunk/Makefile 2010-01-10 23:26:05 UTC (rev 7958) @@ -54,10 +54,15 @@ EXTRA_INC = $(prefix)/X11/include EXTRA_LIB = $(prefix)/X11/lib EXTRA_PKG_CONFIG_DIRS = $(prefix)/X11/lib -EXTRA_LD_OPTIONS = -R/opt/csw/X11/lib -BUILD64 = 1 +# We want to be linked with Xrender from $(prefix)/X11/lib not +# $(prefix)/lib since the latter is linked to /usr/openwin/lib/libX11.so.4 +EXTRA_SOS_LD_FLAGS = -L$(abspath $(prefix)/X11/lib/$(MM_LIBDIR)) +#EXTRA_SOS_LD_OPTIONS = -R$(abspath $(prefix)/X11/lib/$(MM_LIBDIR)) +# Won't work until libgsf-1 is 64bit +#BUILD64 = 1 + STRIP_LIBTOOL=1 TEST_TARGET = check Modified: csw/mgar/pkg/librsvg/trunk/checksums =================================================================== --- csw/mgar/pkg/librsvg/trunk/checksums 2010-01-10 19:21:12 UTC (rev 7957) +++ csw/mgar/pkg/librsvg/trunk/checksums 2010-01-10 23:26:05 UTC (rev 7958) @@ -1,5 +1,5 @@ -5eddcc7be3ee182c94ee21691720c6aa download/doc_makefile.patch -65dbd726a514fe8b797d26254b8efc1e download/librsvg-2.26.0.tar.bz2 -5b0c0387946c3b7ca7feb913de436936 download/pdiff.patch -8a26f6d0d0cf1cfce1a1e0365c6624ce download/perceptualdiff.patch -803a5d10e3e9c9a561b397aade043024 download/test_makefiles.patch +5eddcc7be3ee182c94ee21691720c6aa doc_makefile.patch +65dbd726a514fe8b797d26254b8efc1e librsvg-2.26.0.tar.bz2 +5b0c0387946c3b7ca7feb913de436936 pdiff.patch +8a26f6d0d0cf1cfce1a1e0365c6624ce perceptualdiff.patch +803a5d10e3e9c9a561b397aade043024 test_makefiles.patch This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From hson at users.sourceforge.net Mon Jan 11 00:28:12 2010 From: hson at users.sourceforge.net (hson at users.sourceforge.net) Date: Sun, 10 Jan 2010 23:28:12 +0000 Subject: [csw-devel] SF.net SVN: gar:[7959] csw/mgar/pkg/libgsf/trunk Message-ID: Revision: 7959 http://gar.svn.sourceforge.net/gar/?rev=7959&view=rev Author: hson Date: 2010-01-10 23:28:12 +0000 (Sun, 10 Jan 2010) Log Message: ----------- libgsf: Some minor cleanup Modified Paths: -------------- csw/mgar/pkg/libgsf/trunk/Makefile csw/mgar/pkg/libgsf/trunk/checksums Modified: csw/mgar/pkg/libgsf/trunk/Makefile =================================================================== --- csw/mgar/pkg/libgsf/trunk/Makefile 2010-01-10 23:26:05 UTC (rev 7958) +++ csw/mgar/pkg/libgsf/trunk/Makefile 2010-01-10 23:28:12 UTC (rev 7959) @@ -18,9 +18,10 @@ REQUIRED_PKGS += CSWbonobo2 CSWbzip2 CSWgconf2 CSWggettextrt CSWglib2 REQUIRED_PKGS += CSWgnomevfs2 CSWlibxml2 CSWorbit2 CSWzlib CSWiconv -# We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz +EXTRA_LD_OPTIONS = -L../gsf/.libs -L../../gsf/.libs + CONFIGURE_ARGS = $(DIRPATHS) #CONFIGURE_ARGS = "PATH=$(NPATH)" $(DIRPATHS) #CONFIGURE_ARGS += --enable-gtk-doc=no @@ -28,26 +29,24 @@ TEST_TARGET = check -EXTRA_LD_OPTIONS = -L../gsf/.libs -L../../gsf/.libs +# Missing 64-bit libs: +# libgnomevfs-2.so libgconf-2.so libbonobo-2.so libbonobo-activation.so +#BUILD64 = 1 +STRIP_LIBTOOL = 1 + include gar/category.mk PATH := /opt/csw/gnu:$(PATH) -post-configure-$(MODULATION): - @(echo "~~~ Fixing Libtool ~~~") - @$(FILEDIR)/fixme.sh $(WORKSRC) -# @$(FILEDIR)/fixme2.sh $(WORKSRC) - $(DONADA) - post-install-isa-sparcv8: @cp -p $(FILEDIR)/libgsf-1.so.1.9.1.s $(INSTALLISADIR)$(libdir)/libgsf-1.so.1.9.1 @cp -p $(FILEDIR)/libgsf-gnome-1.so.1.9.1.s $(INSTALLISADIR)$(libdir)/libgsf-gnome-1.so.1.9.1 - @ln -s libgsf-1.so.1.9.1 $(INSTALLISADIR)$(libdir)/libgsf-1.so.1 - @ln -s libgsf-gnome-1.so.1.9.1 $(INSTALLISADIR)$(libdir)/libgsf-gnome-1.so.1 + @( if [ ! -r $(INSTALLISADIR)$(libdir)/libgsf-1.so.1 ] ; then ln -s libgsf-1.so.1.9.1 $(INSTALLISADIR)$(libdir)/libgsf-1.so.1 ; fi ) + @( if [ ! -r $(INSTALLISADIR)$(libdir)/libgsf-gnome-1.so.1 ] ; then ln -s libgsf-gnome-1.so.1.9.1 $(INSTALLISADIR)$(libdir)/libgsf-gnome-1.so.1 ; fi ) post-install-isa-i386: @cp -p $(FILEDIR)/libgsf-1.so.1.9.1.i $(INSTALLISADIR)$(libdir)/libgsf-1.so.1.9.1 @cp -p $(FILEDIR)/libgsf-gnome-1.so.1.9.1.i $(INSTALLISADIR)$(libdir)/libgsf-gnome-1.so.1.9.1 - @ln -s libgsf-1.so.1.9.1 $(INSTALLISADIR)$(libdir)/libgsf-1.so.1 - @ln -s libgsf-gnome-1.so.1.9.1 $(INSTALLISADIR)$(libdir)/libgsf-gnome-1.so.1 + @( if [ ! -r $(INSTALLISADIR)$(libdir)/libgsf-1.so.1 ] ; then ln -s libgsf-1.so.1.9.1 $(INSTALLISADIR)$(libdir)/libgsf-1.so.1 ; fi ) + @( if [ ! -r $(INSTALLISADIR)$(libdir)/libgsf-gnome-1.so.1 ] ; then ln -s libgsf-gnome-1.so.1.9.1 $(INSTALLISADIR)$(libdir)/libgsf-gnome-1.so.1 ; fi ) Modified: csw/mgar/pkg/libgsf/trunk/checksums =================================================================== --- csw/mgar/pkg/libgsf/trunk/checksums 2010-01-10 23:26:05 UTC (rev 7958) +++ csw/mgar/pkg/libgsf/trunk/checksums 2010-01-10 23:28:12 UTC (rev 7959) @@ -1,2 +1 @@ -7d6fa1c26ebb58dcf2128c3b9c7d1a2a download/libgsf-1.14.11.tar.gz -34f5b20f6caf282b2533784fbb1b4395 download/fixme.sh +7d6fa1c26ebb58dcf2128c3b9c7d1a2a libgsf-1.14.11.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From hson at users.sourceforge.net Mon Jan 11 00:36:44 2010 From: hson at users.sourceforge.net (hson at users.sourceforge.net) Date: Sun, 10 Jan 2010 23:36:44 +0000 Subject: [csw-devel] SF.net SVN: gar:[7960] csw/mgar/pkg/tiff/trunk/Makefile Message-ID: Revision: 7960 http://gar.svn.sourceforge.net/gar/?rev=7960&view=rev Author: hson Date: 2010-01-10 23:36:43 +0000 (Sun, 10 Jan 2010) Log Message: ----------- tiff: Change to dynamic path Modified Paths: -------------- csw/mgar/pkg/tiff/trunk/Makefile Modified: csw/mgar/pkg/tiff/trunk/Makefile =================================================================== --- csw/mgar/pkg/tiff/trunk/Makefile 2010-01-10 23:28:12 UTC (rev 7959) +++ csw/mgar/pkg/tiff/trunk/Makefile 2010-01-10 23:36:43 UTC (rev 7960) @@ -41,7 +41,7 @@ EXTRA_PKG_CONFIG_DIRS = $(prefix)/X11/lib CONFIGURE_ARGS = $(DIRPATHS) -CONFIGURE_ARGS += --with-docdir=/opt/csw/share/doc/tiff +CONFIGURE_ARGS += --with-docdir=$(docdir)/tiff CONFIGURE_ARGS += --disable-static CONFIGURE_ARGS += --enable-cxx CONFIGURE_ARGS += --with-zlib-include-dir=/opt/csw/include This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From hson at users.sourceforge.net Mon Jan 11 00:37:31 2010 From: hson at users.sourceforge.net (hson at users.sourceforge.net) Date: Sun, 10 Jan 2010 23:37:31 +0000 Subject: [csw-devel] SF.net SVN: gar:[7961] csw/mgar/pkg/libcairo/trunk/Makefile Message-ID: Revision: 7961 http://gar.svn.sourceforge.net/gar/?rev=7961&view=rev Author: hson Date: 2010-01-10 23:37:31 +0000 (Sun, 10 Jan 2010) Log Message: ----------- libcairo: Add X11/lib first to RUNPATH Modified Paths: -------------- csw/mgar/pkg/libcairo/trunk/Makefile Modified: csw/mgar/pkg/libcairo/trunk/Makefile =================================================================== --- csw/mgar/pkg/libcairo/trunk/Makefile 2010-01-10 23:36:43 UTC (rev 7960) +++ csw/mgar/pkg/libcairo/trunk/Makefile 2010-01-10 23:37:31 UTC (rev 7961) @@ -55,6 +55,7 @@ # We want libcairo to be linked with Xrender from $(prefix)/X11/lib not # $(prefix)/lib since the latter is linked to /usr/openwin/lib/libX11.so.4 EXTRA_SOS_LD_FLAGS = -L$(abspath $(prefix)/X11/lib/$(MM_LIBDIR)) +EXTRA_SOS_LD_OPTIONS = -R$(abspath $(prefix)/X11/lib/$(MM_LIBDIR)) # imagediff in testsuite needs -lsocket EXTRA_LDFLAGS = -lsocket -lnsl This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From hson at users.sourceforge.net Mon Jan 11 00:41:53 2010 From: hson at users.sourceforge.net (hson at users.sourceforge.net) Date: Sun, 10 Jan 2010 23:41:53 +0000 Subject: [csw-devel] SF.net SVN: gar:[7962] csw/mgar/pkg/djvulibre/trunk/Makefile Message-ID: Revision: 7962 http://gar.svn.sourceforge.net/gar/?rev=7962&view=rev Author: hson Date: 2010-01-10 23:41:52 +0000 (Sun, 10 Jan 2010) Log Message: ----------- djvulibre: Use proper configure flags for X11 Modified Paths: -------------- csw/mgar/pkg/djvulibre/trunk/Makefile Modified: csw/mgar/pkg/djvulibre/trunk/Makefile =================================================================== --- csw/mgar/pkg/djvulibre/trunk/Makefile 2010-01-10 23:37:31 UTC (rev 7961) +++ csw/mgar/pkg/djvulibre/trunk/Makefile 2010-01-10 23:41:52 UTC (rev 7962) @@ -44,7 +44,6 @@ EXTRA_COMMON_EXPORTS += PTHREAD_LIBS EXTRA_COMMON_EXPORTS += PTHREAD_CFLAGS - EXTRA_INC = $(prefix)/X11/include EXTRA_LIB = $(prefix)/X11/lib EXTRA_PKG_CONFIG_DIRS = $(prefix)/X11/lib @@ -55,8 +54,8 @@ EXTRA_COMMON_EXPORTS += X_LIBS CONFIGURE_ARGS = $(DIRPATHS) -CONFIGURE_ARGS += --with-extra-includes=$(prefix)/X11/include -CONFIGURE_ARGS += --with-extra-libraries=$(prefix)/X11/lib +CONFIGURE_ARGS += --x-includes=$(prefix)/X11/include +CONFIGURE_ARGS += --x-libraries=$(abspath $(prefix)/X11/lib/$(MM_LIBDIR)) BUILD64 = 1 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Mon Jan 11 01:09:00 2010 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Mon, 11 Jan 2010 00:09:00 +0000 Subject: [csw-devel] SF.net SVN: gar:[7963] csw/mgar/pkg/gitosis/trunk/Makefile Message-ID: Revision: 7963 http://gar.svn.sourceforge.net/gar/?rev=7963&view=rev Author: bdwalton Date: 2010-01-11 00:08:55 +0000 (Mon, 11 Jan 2010) Log Message: ----------- gitosis: correct vendor url in pkginfo file Modified Paths: -------------- csw/mgar/pkg/gitosis/trunk/Makefile Modified: csw/mgar/pkg/gitosis/trunk/Makefile =================================================================== --- csw/mgar/pkg/gitosis/trunk/Makefile 2010-01-10 23:41:52 UTC (rev 7962) +++ csw/mgar/pkg/gitosis/trunk/Makefile 2010-01-11 00:08:55 UTC (rev 7963) @@ -5,6 +5,8 @@ PATCHLEVEL = 73a03 CATEGORIES = python +VENDOR_URL = http://eagain.net/gitweb/?p=gitosis.git + DESCRIPTION = Software for hosting git repositories define BLURB Manage git repositories, provide access to them over SSH, with tight access control and not needing shell accounts. This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Mon Jan 11 04:28:03 2010 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Mon, 11 Jan 2010 03:28:03 +0000 Subject: [csw-devel] SF.net SVN: gar:[7964] csw/mgar/pkg/cswpkgloghooks/trunk/Makefile Message-ID: Revision: 7964 http://gar.svn.sourceforge.net/gar/?rev=7964&view=rev Author: bdwalton Date: 2010-01-11 03:28:02 +0000 (Mon, 11 Jan 2010) Log Message: ----------- cswpkgloghooks: add vendor url for pkginfo Modified Paths: -------------- csw/mgar/pkg/cswpkgloghooks/trunk/Makefile Modified: csw/mgar/pkg/cswpkgloghooks/trunk/Makefile =================================================================== --- csw/mgar/pkg/cswpkgloghooks/trunk/Makefile 2010-01-11 00:08:55 UTC (rev 7963) +++ csw/mgar/pkg/cswpkgloghooks/trunk/Makefile 2010-01-11 03:28:02 UTC (rev 7964) @@ -2,6 +2,8 @@ GARVERSION = 1.0 CATEGORIES = utils +VENDOR_URL = http://opencsw.org + DESCRIPTION = Hook scripts to log package maintenance actions define BLURB This set of hook scripts will log package maintenance actions to syslog. This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Mon Jan 11 04:35:42 2010 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Mon, 11 Jan 2010 03:35:42 +0000 Subject: [csw-devel] SF.net SVN: gar:[7965] csw/mgar/pkg/gardev/trunk/Makefile Message-ID: Revision: 7965 http://gar.svn.sourceforge.net/gar/?rev=7965&view=rev Author: bdwalton Date: 2010-01-11 03:35:42 +0000 (Mon, 11 Jan 2010) Log Message: ----------- gardev: add vendor url for pkginfo Modified Paths: -------------- csw/mgar/pkg/gardev/trunk/Makefile Modified: csw/mgar/pkg/gardev/trunk/Makefile =================================================================== --- csw/mgar/pkg/gardev/trunk/Makefile 2010-01-11 03:28:02 UTC (rev 7964) +++ csw/mgar/pkg/gardev/trunk/Makefile 2010-01-11 03:35:42 UTC (rev 7965) @@ -2,6 +2,8 @@ GARVERSION = 1.0 CATEGORIES = devel +VENDOR_URL = http://opencsw.org + DESCRIPTION = Ease setting up a GAR development environment define BLURB Pull in all packages required to get started developing OpenCSW packages This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Mon Jan 11 04:41:38 2010 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Mon, 11 Jan 2010 03:41:38 +0000 Subject: [csw-devel] SF.net SVN: gar:[7966] csw/mgar/pkg/git-subtree/trunk/Makefile Message-ID: Revision: 7966 http://gar.svn.sourceforge.net/gar/?rev=7966&view=rev Author: bdwalton Date: 2010-01-11 03:41:38 +0000 (Mon, 11 Jan 2010) Log Message: ----------- git-subtree: add vendor url for pkginfo Modified Paths: -------------- csw/mgar/pkg/git-subtree/trunk/Makefile Modified: csw/mgar/pkg/git-subtree/trunk/Makefile =================================================================== --- csw/mgar/pkg/git-subtree/trunk/Makefile 2010-01-11 03:35:42 UTC (rev 7965) +++ csw/mgar/pkg/git-subtree/trunk/Makefile 2010-01-11 03:41:38 UTC (rev 7966) @@ -3,6 +3,8 @@ PATCHLEVEL = d20ac CATEGORIES = devel +VENDOR_URL = http://github.com/apenwarr/git-subtree + DESCRIPTION = Subtree support for git define BLURB An experimental alternative to the git-submodule command. This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Mon Jan 11 15:01:40 2010 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Mon, 11 Jan 2010 14:01:40 +0000 Subject: [csw-devel] SF.net SVN: gar:[7967] csw/mgar/pkg/gnulinks/trunk/Makefile Message-ID: Revision: 7967 http://gar.svn.sourceforge.net/gar/?rev=7967&view=rev Author: bdwalton Date: 2010-01-11 14:01:40 +0000 (Mon, 11 Jan 2010) Log Message: ----------- gnulinks: update vendor url Modified Paths: -------------- csw/mgar/pkg/gnulinks/trunk/Makefile Modified: csw/mgar/pkg/gnulinks/trunk/Makefile =================================================================== --- csw/mgar/pkg/gnulinks/trunk/Makefile 2010-01-11 03:41:38 UTC (rev 7966) +++ csw/mgar/pkg/gnulinks/trunk/Makefile 2010-01-11 14:01:40 UTC (rev 7967) @@ -2,14 +2,14 @@ GARVERSION = 1.2 CATEGORIES = xtra +VENDOR_URL = http://opencsw.org + GLINKPKGS = CSWdiffutils CSWggettext CSWggettextrt CSWbison CSWbinutils GLINKPKGS += CSWggrep CSWgawk CSWgsed CSWggetopt CSWfindutils GLINKPKGS += CSWgmake CSWgpatch CSWgm4 CSWgwhois CSWgtar GLINKPKGS += CSWshutils CSWgfile CSWtextutils PREREQUISITE_PKGS = $(GLINKPKGS) CSWpkgutil -SPKG_SOURCEURL = No Source - DESCRIPTION = Creates native symlinks for GNU tools in /opt/csw/gnu define BLURB Installs links for GNU utilities with a 'g' prefix into This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Mon Jan 11 15:46:59 2010 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Mon, 11 Jan 2010 14:46:59 +0000 Subject: [csw-devel] SF.net SVN: gar:[7968] csw/mgar/pkg/gardev/trunk/Makefile Message-ID: Revision: 7968 http://gar.svn.sourceforge.net/gar/?rev=7968&view=rev Author: bdwalton Date: 2010-01-11 14:46:59 +0000 (Mon, 11 Jan 2010) Log Message: ----------- gardev: add CSWpython, CSWpy-cheetah as deps for checkpkg Modified Paths: -------------- csw/mgar/pkg/gardev/trunk/Makefile Modified: csw/mgar/pkg/gardev/trunk/Makefile =================================================================== --- csw/mgar/pkg/gardev/trunk/Makefile 2010-01-11 14:01:40 UTC (rev 7967) +++ csw/mgar/pkg/gardev/trunk/Makefile 2010-01-11 14:46:59 UTC (rev 7968) @@ -19,7 +19,7 @@ REQUIRED_PKGS_CSWgardevel = CSWgmake CSWgtar CSWggrep CSWdiffutils CSWgfile REQUIRED_PKGS_CSWgardevel += CSWtextutils CSWwget CSWfindutils CSWgsed REQUIRED_PKGS_CSWgardevel += CSWgawk CSWbzip2 CSWlftp CSWgit CSWnetcat -REQUIRED_PKGS_CSWgardevel += CSWsvn +REQUIRED_PKGS_CSWgardevel += CSWsvn CSWpython CSWpy-cheetah MASTER_SITES = This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Mon Jan 11 16:28:58 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Mon, 11 Jan 2010 15:28:58 +0000 Subject: [csw-devel] SF.net SVN: gar:[7969] csw/mgar/pkg Message-ID: Revision: 7969 http://gar.svn.sourceforge.net/gar/?rev=7969&view=rev Author: wahwah Date: 2010-01-11 15:28:58 +0000 (Mon, 11 Jan 2010) Log Message: ----------- moc: Initial commit, doesn't compile Modified Paths: -------------- csw/mgar/pkg/moc/trunk/Makefile csw/mgar/pkg/moc/trunk/checksums Added Paths: ----------- csw/mgar/pkg/moc/ Modified: csw/mgar/pkg/moc/trunk/Makefile =================================================================== --- csw/mgar/pkg/template/trunk/Makefile 2010-01-08 11:02:13 UTC (rev 7915) +++ csw/mgar/pkg/moc/trunk/Makefile 2010-01-11 15:28:58 UTC (rev 7969) @@ -2,184 +2,24 @@ # Distributed under the terms of the GNU General Public License v2 # $Id$ -## This file contains comments to guide you through various GAR settings. -## Please remove unnecessary comments before committing your code to the code -## repository. The comments to remove are marked with double hashes. -## If you want to remove them all in-place, use: -## gsed -i -e '/^##/d' Makefile -## -## For more information about GAR variables, please see: -## https://sourceforge.net/apps/trac/gar/wiki/GAR%20Variable%20Reference -## -GARNAME = mypkg -GARVERSION = 1.0 -## -## The category that your software fits in. This is not a descriptive field, but -## influences the build process. Depending on the CATEGORIES setting, different -## Makefiles are included from gar/categories/ in your trunk directory, which -## adjust the build settings for the respective category. -## -## Possible settings are: -## apps, cpan, devel, gnome, java, kde, lang, lib, meta, net, python, server, -## utils, x11, xfce, xorg, xtra +GARNAME = moc +GARVERSION = 2.4.4 CATEGORIES = lib -## -## A one-line description of the package, which will appear in the pkginfo. -DESCRIPTION = -## -## A longer description of the package. This is only for descriptive purposes -## inside the Makefile and is not used elsewhere. +DESCRIPTION = Music On Console define BLURB - endef -## -## Upstream URL that should show up in the VENDOR field as well as on -## http://opencsw.org/packages/. -SPKG_SOURCEURL = -## -## Whitespace-separated list of URLs to download the source package from. -## There are presets: $(SF_MIRRORS), $(GNU_MIRRORS) and $(GOOGLE_MIRROR). -MASTER_SITES = -## -## SF_PROJ is required if you set $(MASTER_SITES) to $(SF_MIRRORS) and the -## Sourceforge project name differs from $(GARNAME). Specifies the Sourceforge -## project name of the software you wish to download. -## SF_PROJ = -## -## A list of space separated patch filenames from files/ that are to be applied -## to the extracted software before the ./configure stage. Patches need to be -## included in the DISTFILES variable as well. -## PATCHFILES = -## -## Whitespace-separated list of files which comprise this build. mGAR will look -## for the files in the $(FILEDIR) (trunk/files) directory and on the -## $(MASTER_SITES). -DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz -## -## We define upstream file regex so we can be notifed of new upstream software release -UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz -## -## Catalog name is the name to be used with pkg{-get,util} -i . -## It is different from the system package name, which by convention is CSWpkgname. -## CATALOGNAME = -## -## Set to 1 to mark the package as architecture-independent. -## ARCHALL = 0 -## -## A list of files / patterns that should be excluded from the package. Amends -## the default list of excluded filenames $(MERGE_EXCLUDE_DEFAULT), which -## contains things like libtool .la files and files with a leading ~. -## EXTRA_MERGE_EXCLUDE_FILES = -## -## A list of space separated package names that should be marked as -## incompatible with the current package. This will go into the depend file. -## When a user has one of the incompatible packages installed and installs -## your package, he will be prompted that the incompatible package must be -## removed. He will however not be prevented to install your package without -## removing the conflicting package first. -## INCOMPATIBLE_PKGS = -## -## The name of the license file that should be included in your package. Defaults -## to COPYING. See http://sourceforge.net/apps/trac/gar/wiki/CopyRightfor details -## on including and displaying licenses. -## LICENSE = -## -## A list of space separated package names that should be produced from your -## Makefile. This is used when a software has different components that can be -## packaged and used individually (think runtime libraries, client tools, server -## files, development headers). You don't need to set this when you just want to -## produce one package. -## -## When you set this variable to include more than one package, you also need to -## set PKGFILES_CSWpkgname for each package (except for the first one in your -## $(PACKAGES) list) to define which files go into each package. The first -## package from $(PACKAGES) one will hold all files that are not matched by -## PKGFILES_ for other packages. -## PACKAGES = -## -## If specified, GAR feeds the almost-final package prototype file to -## $(PROTOTYPE_FILTER) and reads the final package prototype file from it. -## $(PROTOTYPE_FILTER) is usually a sed/awk/perl one-liner, which was mostly used -## to prepare the prototype file for use with cswclassutils (see -## $(SPKG_CLASSES)). Now that there are convenience variables for cswclassutils, -## you will rarely have to use this. A still valid use case would be to change -## the file permissions of a file to be set-UID. -## See http://wiki.opencsw.org/cswclassutils-package for common usage information -## PROTOTYPE_FILTER = -## -## cswclassutils settings -## -## A list of action classes. Possible values are: -## none cswpreserveconf cswcpsampleconf cswpycompile cswusergroup cswinitsmf -## cswinetd cswetcservices -## The class 'cswinitsmf' must be the last class listed. When you use cswclassutils, -## you need to add CSWcswclassutils to REQUIRED_PKGS. -## SPKG_CLASSES = none -## Simplified settings for classes: -## PRESERVECONF = -## SAMPLECONF = -## INITSMF = -## USERGROUP = -## ETCSERVICES = -## INETDCONF = -## A list of runtime package dependencies in the form of CSWfoo. -## REQUIRED_PKGS = -## -## A list of packages necessary to build this package -## PREREQUISITE_PKGS = $(REQUIRED_PKGS) -## -## When using non-empty $(PACKAGES): -## REQUIRED_PKGS_CSWpkgname = -## SPKG_DESC_CSWpkgname = -## PKGFILES_CSWpkgname = -## CATALOGNAME_CSWpkgname = -## -## A list of space separated directories where objects should be stripped in -## addition to the bin/ and sbin/ directories. -## STRIP_DIRS = -## -## Define a custom target for the configure phase. When you set this, the target -## that will be used instead of configure: target, is named -## configure-$(CONFIGURE_SCRIPTS) and you will need to define it in your Makefile -## after including gar/gar.include.mk. If you want to skip the configure phase -## completely (for example when your software doesn't need to be compiled) assign -## this variable an empty value. The procedure works for configure, build, -## install and test steps. -## CONFIGURE_SCRIPTS = -## BUILD_SCRIPTS = -## INSTALL_SCRIPTS = -## TEST_SCRIPTS = -## -## Compilation settings -## -## The build directory. -## WORKSRC = $(WORKDIR)/$(GARNAME)-$(GARVERSION) -## -## BUILD_ARGS is passed as an argument to gmake during the build phase. Use this -## for example, if you need to override Makefile variables. -## BUILD_ARGS = -## -## Arguments passed to the ./configure script. +SPKG_SOURCEURL = http://moc.daper.net/ +MASTER_SITES = ftp://ftp.daper.net/pub/soft/moc/stable/ +PATCHFILES = remove-export-dynamic.patch +DISTFILES = $(GARNAME)-$(GARVERSION).tar.bz2 +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.bz2 CONFIGURE_ARGS = $(DIRPATHS) -## -## BUILD64 = -## CONFIGURE_ENV = -## EXTRA_CFLAGS = -## EXTRA_LDFLAGS = -## EXTRA_INC = -## EXTRA_LIB = -## GARFLAVOR = -## INSTALL_ARGS = -## OPT_FLAGS_SOS = -xO3 -## OPT_FLAGS_GCC = -O2 -pipe -## -## The compiler to use. Defaults to SOS11, can be also: SOS12, GCC3, GCC4. -## GARCOMPILER = SOS11 -## -# Remove the following rules and uncomment the -# include before building. -all: .DEFAULT -.DEFAULT: - @true +EXTRA_LDFLAGS = -lsocket -#include gar/category.mk +# Doesn't compile yet. +# +# The current problem is that the configure script checks for soundcard.h and +# when it's not there, it concludes that there's no OSS. It might be explained +# by moc never having been built on Solaris yet. + +include gar/category.mk Modified: csw/mgar/pkg/moc/trunk/checksums =================================================================== --- csw/mgar/pkg/template/trunk/checksums 2010-01-08 11:02:13 UTC (rev 7915) +++ csw/mgar/pkg/moc/trunk/checksums 2010-01-11 15:28:58 UTC (rev 7969) @@ -0,0 +1,2 @@ +647c770a5542a4ae5437386807a89796 moc-2.4.4.tar.bz2 +f2500b397dd3e1944447da1f3ece14a0 remove-export-dynamic.patch This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From hson at users.sourceforge.net Mon Jan 11 16:53:57 2010 From: hson at users.sourceforge.net (hson at users.sourceforge.net) Date: Mon, 11 Jan 2010 15:53:57 +0000 Subject: [csw-devel] SF.net SVN: gar:[7970] csw/mgar/pkg/ImageMagick/trunk/Makefile Message-ID: Revision: 7970 http://gar.svn.sourceforge.net/gar/?rev=7970&view=rev Author: hson Date: 2010-01-11 15:53:57 +0000 (Mon, 11 Jan 2010) Log Message: ----------- imagemagick: Fixes for linking X11 libs Modified Paths: -------------- csw/mgar/pkg/ImageMagick/trunk/Makefile Modified: csw/mgar/pkg/ImageMagick/trunk/Makefile =================================================================== --- csw/mgar/pkg/ImageMagick/trunk/Makefile 2010-01-11 15:28:58 UTC (rev 7969) +++ csw/mgar/pkg/ImageMagick/trunk/Makefile 2010-01-11 15:53:57 UTC (rev 7970) @@ -20,23 +20,24 @@ LICENSE = LICENSE -REQUIRED_PKGS += CSWbzip2 CSWdjvulibre CSWfconfig CSWftype2 CSWggettextrt +REQUIRED_PKGS += CSWbzip2 CSWdjvulibrert CSWfconfig CSWftype2 CSWggettextrt REQUIRED_PKGS += CSWglib2 CSWgs CSWgtk2 CSWilmbase CSWjasper CSWjbigkit REQUIRED_PKGS += CSWjpeg CSWlcms CSWlibcairo CSWlibfpx CSWlibrsvg CSWlibxml2 REQUIRED_PKGS += CSWopenexr CSWperl CSWpng CSWsunmath CSWtiff CSWwmf CSWzlib -REQUIRED_PKGS += CSWlibtoolrt CSWlibice CSWlibsm CSWlibxext +REQUIRED_PKGS += CSWlibtoolrt CSWlibice CSWlibsm CSWlibxext CSWgraphviz +REQUIRED_PKGS += CSWlibx11 CSWlibxt # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = ImageMagick-((\d+(?:\.\d+)*)-(\d+)?).tar.bz2 -CPPFLAGS += -I/usr/openwin/include -I/usr/openwin/include/X11 +#CPPFLAGS += -I/usr/openwin/include -I/usr/openwin/include/X11 CONFIGURE_ARGS = $(DIRPATHS) CONFIGURE_ARGS += --with-perl=$(bindir)/perl CONFIGURE_ARGS += --enable-shared --disable-static CONFIGURE_ARGS += --with-dps=yes --with-gslib=yes -CONFIGURE_ARGS += --x-includes=/usr/openwin/include -CONFIGURE_ARGS += --x-libraries=/usr/openwin/lib +CONFIGURE_ARGS += --x-includes=/opt/csw/X11/include +CONFIGURE_ARGS += --x-libraries=/opt/csw/X11/lib CONFIGURE_ARGS += --disable-openmp PATCHFILES += Makefile.patch @@ -44,9 +45,17 @@ #PATCHFILES += djvu.c.diff # Test has to be run *after* install -TEST_SCRIPTS = +#TEST_TARGET = check +TEST_TARGET = +EXTRA_INC = $(prefix)/X11/include +EXTRA_LIB = $(prefix)/X11/lib +EXTRA_PKG_CONFIG_DIRS = $(prefix)/X11/lib EXTRA_LD_OPTIONS = -L./magick/.libs +# We want to be link with Xrender from $(prefix)/X11/lib not $(prefix)/lib +# since the latter is linked to /usr/openwin/lib/libX11.so.4 +EXTRA_SOS_LD_FLAGS = -L$(abspath $(prefix)/X11/lib/$(MM_LIBDIR)) + MERGE_EXCLUDE_LIBTOOL ?= $(libdir)/lib.*\.la EXTRA_MERGE_EXCLUDE_FILES = .*/perllocal.pod This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Mon Jan 11 18:03:34 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Mon, 11 Jan 2010 17:03:34 +0000 Subject: [csw-devel] SF.net SVN: gar:[7971] csw/mgar/pkg/keychain/trunk Message-ID: Revision: 7971 http://gar.svn.sourceforge.net/gar/?rev=7971&view=rev Author: wahwah Date: 2010-01-11 17:03:34 +0000 (Mon, 11 Jan 2010) Log Message: ----------- keychain: patching to use CSWbash Modified Paths: -------------- csw/mgar/pkg/keychain/trunk/Makefile csw/mgar/pkg/keychain/trunk/checksums Added Paths: ----------- csw/mgar/pkg/keychain/trunk/files/bash.patch Modified: csw/mgar/pkg/keychain/trunk/Makefile =================================================================== --- csw/mgar/pkg/keychain/trunk/Makefile 2010-01-11 15:53:57 UTC (rev 7970) +++ csw/mgar/pkg/keychain/trunk/Makefile 2010-01-11 17:03:34 UTC (rev 7971) @@ -20,7 +20,8 @@ MASTER_SITES = http://www.funtoo.org/archive/keychain/ DISTFILES = $(GARNAME)-$(GARVERSION).tar.bz2 -PATCHFILES = gsed.patch +PATCHFILES += bash.patch +PATCHFILES += gsed.patch UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.bz2 @@ -30,7 +31,8 @@ INSTALL_SCRIPTS = keychain TEST_SCRIPTS = -PREREQUISITE_PKGS = CSWperl +REQUIRED_PKGS = CSWbash +PREREQUISITE_PKGS = $(REQUIRED_PKGS) CSWperl include gar/category.mk Modified: csw/mgar/pkg/keychain/trunk/checksums =================================================================== --- csw/mgar/pkg/keychain/trunk/checksums 2010-01-11 15:53:57 UTC (rev 7970) +++ csw/mgar/pkg/keychain/trunk/checksums 2010-01-11 17:03:34 UTC (rev 7971) @@ -1,2 +1,3 @@ +6485201fc090ad73b72971357e018d52 bash.patch ad52a3ab14a63ccff22cac5076286bcb gsed.patch c5eecd36130d9e8617a77f96b746982d keychain-2.7.0.tar.bz2 Added: csw/mgar/pkg/keychain/trunk/files/bash.patch =================================================================== --- csw/mgar/pkg/keychain/trunk/files/bash.patch (rev 0) +++ csw/mgar/pkg/keychain/trunk/files/bash.patch 2010-01-11 17:03:34 UTC (rev 7971) @@ -0,0 +1,11 @@ +Looks like keychain is written in bash, but declares /bin/sh as the shell. +Let's fix it. + +--- keychain-2.7.0/keychain.sh.orig 2010-01-11 18:18:26.606373414 +0100 ++++ keychain-2.7.0/keychain.sh 2010-01-11 18:18:42.710377114 +0100 +@@ -1,4 +1,4 @@ +-#!/bin/sh ++#!/opt/csw/bin/bash + + # Copyright 1999-2005 Gentoo Foundation + # Copyright 2007 Aron Griffis This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Mon Jan 11 22:45:38 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Mon, 11 Jan 2010 21:45:38 +0000 Subject: [csw-devel] SF.net SVN: gar:[7972] csw/mgar/pkg/examples Message-ID: Revision: 7972 http://gar.svn.sourceforge.net/gar/?rev=7972&view=rev Author: wahwah Date: 2010-01-11 21:45:37 +0000 (Mon, 11 Jan 2010) Log Message: ----------- examples/multiple-versions: Initial commit of an example of supporting multiple software versions Modified Paths: -------------- csw/mgar/pkg/examples/multiple-versions/trunk/Makefile csw/mgar/pkg/examples/multiple-versions/trunk/checksums Added Paths: ----------- csw/mgar/pkg/examples/multiple-versions/ csw/mgar/pkg/examples/multiple-versions/trunk/files/hello-0.1.0.tar.gz Modified: csw/mgar/pkg/examples/multiple-versions/trunk/Makefile =================================================================== --- csw/mgar/pkg/template/trunk/Makefile 2010-01-11 17:03:34 UTC (rev 7971) +++ csw/mgar/pkg/examples/multiple-versions/trunk/Makefile 2010-01-11 21:45:37 UTC (rev 7972) @@ -2,184 +2,44 @@ # Distributed under the terms of the GNU General Public License v2 # $Id$ -## This file contains comments to guide you through various GAR settings. -## Please remove unnecessary comments before committing your code to the code -## repository. The comments to remove are marked with double hashes. -## If you want to remove them all in-place, use: -## gsed -i -e '/^##/d' Makefile -## -## For more information about GAR variables, please see: -## https://sourceforge.net/apps/trac/gar/wiki/GAR%20Variable%20Reference -## -GARNAME = mypkg -GARVERSION = 1.0 -## -## The category that your software fits in. This is not a descriptive field, but -## influences the build process. Depending on the CATEGORIES setting, different -## Makefiles are included from gar/categories/ in your trunk directory, which -## adjust the build settings for the respective category. -## -## Possible settings are: -## apps, cpan, devel, gnome, java, kde, lang, lib, meta, net, python, server, -## utils, x11, xfce, xorg, xtra -CATEGORIES = lib -## -## A one-line description of the package, which will appear in the pkginfo. -DESCRIPTION = -## -## A longer description of the package. This is only for descriptive purposes -## inside the Makefile and is not used elsewhere. +GARNAME = multiple-versions +BASE_VERSION = 0.1 +GARVERSION = $(BASE_VERSION).0 +CATEGORIES = apps +DESCRIPTION = Example layout that supports multiple versions of a program. define BLURB - + + This package description is an example of a layout supporting multiple + versions of the packaged software. It's been created for testing purposes. + endef -## -## Upstream URL that should show up in the VENDOR field as well as on -## http://opencsw.org/packages/. SPKG_SOURCEURL = -## -## Whitespace-separated list of URLs to download the source package from. -## There are presets: $(SF_MIRRORS), $(GNU_MIRRORS) and $(GOOGLE_MIRROR). + +version_dependent = /lib/$(GARNAME)/$(BASE_VERSION) +bindir_install = $(prefix)$(version_dependent)/bin +bindir = $(prefix)$(version_dependent)/bin +sbindir_install = $(prefix)$(version_dependent)/sbin +sbindir = $(prefix)$(version_dependent)/sbin +libdir_install = $(prefix)$(version_dependent)/lib +libdir = $(prefix)$(version_dependent)/lib +localstatedir = /var$(prefix)/$(GARNAME)/$(BASE_VERSION) +sysconfdir = /etc$(prefix)/$(GARNAME)/$(BASE_VERSION) +datadir = $(prefix)/share/$(GARNAME)/$(BASE_VERSION) +docdir = $(prefix)/share/doc/$(GARNAME)-$(BASE_VERSION) +includedir = $(prefix)/include/$(GARNAME)/$(BASE_VERSION) +infodir = $(datadir)/info +libexecdir_install = $(prefix)/libexec/$(GARNAME)/$(BASE_VERSION) +lispdir = $(datadir)/emacs/site-lisp +mandir = $(datadir)/man +sharedstatedir = $(prefix)/share/$(GARNAME)/$(BASE_VERSION) +sourcedir = $(prefix)/src/$(GARNAME)/$(BASE_VERSION) + MASTER_SITES = -## -## SF_PROJ is required if you set $(MASTER_SITES) to $(SF_MIRRORS) and the -## Sourceforge project name differs from $(GARNAME). Specifies the Sourceforge -## project name of the software you wish to download. -## SF_PROJ = -## -## A list of space separated patch filenames from files/ that are to be applied -## to the extracted software before the ./configure stage. Patches need to be -## included in the DISTFILES variable as well. -## PATCHFILES = -## -## Whitespace-separated list of files which comprise this build. mGAR will look -## for the files in the $(FILEDIR) (trunk/files) directory and on the -## $(MASTER_SITES). -DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz -## -## We define upstream file regex so we can be notifed of new upstream software release -UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz -## -## Catalog name is the name to be used with pkg{-get,util} -i . -## It is different from the system package name, which by convention is CSWpkgname. -## CATALOGNAME = -## -## Set to 1 to mark the package as architecture-independent. -## ARCHALL = 0 -## -## A list of files / patterns that should be excluded from the package. Amends -## the default list of excluded filenames $(MERGE_EXCLUDE_DEFAULT), which -## contains things like libtool .la files and files with a leading ~. -## EXTRA_MERGE_EXCLUDE_FILES = -## -## A list of space separated package names that should be marked as -## incompatible with the current package. This will go into the depend file. -## When a user has one of the incompatible packages installed and installs -## your package, he will be prompted that the incompatible package must be -## removed. He will however not be prevented to install your package without -## removing the conflicting package first. -## INCOMPATIBLE_PKGS = -## -## The name of the license file that should be included in your package. Defaults -## to COPYING. See http://sourceforge.net/apps/trac/gar/wiki/CopyRightfor details -## on including and displaying licenses. -## LICENSE = -## -## A list of space separated package names that should be produced from your -## Makefile. This is used when a software has different components that can be -## packaged and used individually (think runtime libraries, client tools, server -## files, development headers). You don't need to set this when you just want to -## produce one package. -## -## When you set this variable to include more than one package, you also need to -## set PKGFILES_CSWpkgname for each package (except for the first one in your -## $(PACKAGES) list) to define which files go into each package. The first -## package from $(PACKAGES) one will hold all files that are not matched by -## PKGFILES_ for other packages. -## PACKAGES = -## -## If specified, GAR feeds the almost-final package prototype file to -## $(PROTOTYPE_FILTER) and reads the final package prototype file from it. -## $(PROTOTYPE_FILTER) is usually a sed/awk/perl one-liner, which was mostly used -## to prepare the prototype file for use with cswclassutils (see -## $(SPKG_CLASSES)). Now that there are convenience variables for cswclassutils, -## you will rarely have to use this. A still valid use case would be to change -## the file permissions of a file to be set-UID. -## See http://wiki.opencsw.org/cswclassutils-package for common usage information -## PROTOTYPE_FILTER = -## -## cswclassutils settings -## -## A list of action classes. Possible values are: -## none cswpreserveconf cswcpsampleconf cswpycompile cswusergroup cswinitsmf -## cswinetd cswetcservices -## The class 'cswinitsmf' must be the last class listed. When you use cswclassutils, -## you need to add CSWcswclassutils to REQUIRED_PKGS. -## SPKG_CLASSES = none -## Simplified settings for classes: -## PRESERVECONF = -## SAMPLECONF = -## INITSMF = -## USERGROUP = -## ETCSERVICES = -## INETDCONF = -## A list of runtime package dependencies in the form of CSWfoo. -## REQUIRED_PKGS = -## -## A list of packages necessary to build this package -## PREREQUISITE_PKGS = $(REQUIRED_PKGS) -## -## When using non-empty $(PACKAGES): -## REQUIRED_PKGS_CSWpkgname = -## SPKG_DESC_CSWpkgname = -## PKGFILES_CSWpkgname = -## CATALOGNAME_CSWpkgname = -## -## A list of space separated directories where objects should be stripped in -## addition to the bin/ and sbin/ directories. -## STRIP_DIRS = -## -## Define a custom target for the configure phase. When you set this, the target -## that will be used instead of configure: target, is named -## configure-$(CONFIGURE_SCRIPTS) and you will need to define it in your Makefile -## after including gar/gar.include.mk. If you want to skip the configure phase -## completely (for example when your software doesn't need to be compiled) assign -## this variable an empty value. The procedure works for configure, build, -## install and test steps. -## CONFIGURE_SCRIPTS = -## BUILD_SCRIPTS = -## INSTALL_SCRIPTS = -## TEST_SCRIPTS = -## -## Compilation settings -## -## The build directory. -## WORKSRC = $(WORKDIR)/$(GARNAME)-$(GARVERSION) -## -## BUILD_ARGS is passed as an argument to gmake during the build phase. Use this -## for example, if you need to override Makefile variables. -## BUILD_ARGS = -## -## Arguments passed to the ./configure script. +DISTFILES = hello-$(GARVERSION).tar.gz +CATALOGNAME = multiple_versions +TEST_SCRIPTS = +WORKSRC = $(WORKDIR)/hello-$(GARVERSION) CONFIGURE_ARGS = $(DIRPATHS) -## -## BUILD64 = -## CONFIGURE_ENV = -## EXTRA_CFLAGS = -## EXTRA_LDFLAGS = -## EXTRA_INC = -## EXTRA_LIB = -## GARFLAVOR = -## INSTALL_ARGS = -## OPT_FLAGS_SOS = -xO3 -## OPT_FLAGS_GCC = -O2 -pipe -## -## The compiler to use. Defaults to SOS11, can be also: SOS12, GCC3, GCC4. -## GARCOMPILER = SOS11 -## -# Remove the following rules and uncomment the -# include before building. -all: .DEFAULT -.DEFAULT: - @true +BUILD64 = 1 -#include gar/category.mk +include gar/category.mk Modified: csw/mgar/pkg/examples/multiple-versions/trunk/checksums =================================================================== --- csw/mgar/pkg/template/trunk/checksums 2010-01-11 17:03:34 UTC (rev 7971) +++ csw/mgar/pkg/examples/multiple-versions/trunk/checksums 2010-01-11 21:45:37 UTC (rev 7972) @@ -0,0 +1 @@ +4f3e25ac55024d443aae34c088c3b520 hello-0.1.0.tar.gz Added: csw/mgar/pkg/examples/multiple-versions/trunk/files/hello-0.1.0.tar.gz =================================================================== (Binary files differ) Property changes on: csw/mgar/pkg/examples/multiple-versions/trunk/files/hello-0.1.0.tar.gz ___________________________________________________________________ Added: svn:mime-type + application/octet-stream This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From skayser at users.sourceforge.net Tue Jan 12 00:23:28 2010 From: skayser at users.sourceforge.net (skayser at users.sourceforge.net) Date: Mon, 11 Jan 2010 23:23:28 +0000 Subject: [csw-devel] SF.net SVN: gar:[7973] csw/mgar/pkg/mtr/trunk Message-ID: Revision: 7973 http://gar.svn.sourceforge.net/gar/?rev=7973&view=rev Author: skayser Date: 2010-01-11 23:23:27 +0000 (Mon, 11 Jan 2010) Log Message: ----------- mtr: build a base package w/o X11 (mtr) and one with X11 (mtr_gtk) Modified Paths: -------------- csw/mgar/pkg/mtr/trunk/Makefile csw/mgar/pkg/mtr/trunk/checksums csw/mgar/pkg/mtr/trunk/files/changelog.CSW Added Paths: ----------- csw/mgar/pkg/mtr/trunk/files/0001-Makefile.am-honor-program-prefix-suffix-transform-na.patch csw/mgar/pkg/mtr/trunk/files/0002-configure.in-check-socklen_t-via-sys-socket.h.patch Modified: csw/mgar/pkg/mtr/trunk/Makefile =================================================================== --- csw/mgar/pkg/mtr/trunk/Makefile 2010-01-11 21:45:37 UTC (rev 7972) +++ csw/mgar/pkg/mtr/trunk/Makefile 2010-01-11 23:23:27 UTC (rev 7973) @@ -1,6 +1,6 @@ # TODO # ---- -# * Revisit curses autoconf detection. Maybe have a chat with upstream +# - Revisit curses autoconf detection. Maybe have a chat with upstream # as the README says that there are known, yet unsolved Solaris autoconf # recipe problems # @@ -21,85 +21,98 @@ about each machine. endef -SPKG_SOURCEURL = http://www.bitwizard.nl/mtr/ +VENDOR_URL = http://www.bitwizard.nl/mtr/ MASTER_SITES = ftp://ftp.bitwizard.nl/mtr/ -DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz +DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz -PACKAGES = CSWmtr CSWmtrtiny +# Build the base package without X support and have an additional one that +# supports X. http://article.gmane.org/gmane.os.solaris.opencsw.maintainers/5090 +PACKAGES = CSWmtr CSWmtr-gtk -CATALOGNAME_CSWmtr = mtr -SPKG_DESC_CSWmtr = Combined traceroute and ping utility -REQUIRED_PKGS_CSWmtr = CSWgtk2 CSWlibatk CSWpango CSWlibcairo -REQUIRED_PKGS_CSWmtr += CSWggettextrt CSWglib2 CSWncurses -REQUIRED_PKGS_CSWmtr += CSWfconfig CSWftype2 CSWzlib -INCOMPATIBLE_PKGS_CSWmtr = CSWmtrtiny -EXTRA_PKGFILES_EXCLUDED_CSWmtr = $(sbindir)/mtr-nongui +# Just catch those files belonging to CSWmtr-gtk, all others will go to CSWmtr. +PKGFILES_CSWmtr-gtk = .*/mtr_gtk.* +PKGFILES_CSWmtr-gtk += .*/xmtr.* -CATALOGNAME_CSWmtrtiny = mtr_tiny -SPKG_DESC_CSWmtrtiny = Combined traceroute and ping utility (CLI only version) -REQUIRED_PKGS_CSWmtrtiny = CSWncurses -INCOMPATIBLE_PKGS_CSWmtrtiny = CSWmtr -EXTRA_PKGFILES_EXCLUDED_CSWmtrtiny = $(sbindir)/mtr-gui +CATALOGNAME_CSWmtr = mtr +SPKG_DESC_CSWmtr = Combined traceroute and ping utility (CLI only) +REQUIRED_PKGS_CSWmtr += CSWncurses +CATALOGNAME_CSWmtr-gtk = mtr_gtk +SPKG_DESC_CSWmtr-gtk = Combined traceroute and ping utility (GUI version) +REQUIRED_PKGS_CSWmtr-gtk = CSWgtk2 +REQUIRED_PKGS_CSWmtr-gtk += CSWfconfig +REQUIRED_PKGS_CSWmtr-gtk += CSWftype2 +REQUIRED_PKGS_CSWmtr-gtk += CSWggettextrt +REQUIRED_PKGS_CSWmtr-gtk += CSWglib2 +REQUIRED_PKGS_CSWmtr-gtk += CSWlibatk +REQUIRED_PKGS_CSWmtr-gtk += CSWlibcairo +REQUIRED_PKGS_CSWmtr-gtk += CSWncurses +REQUIRED_PKGS_CSWmtr-gtk += CSWpango + # 1) Check for socklen_t via sys/socket.h (not netinet/in.h) # 2) Don't cast sin_addr to (struct in_addr), cc bails out with invalid cast PATCHFILES = gar-base.diff +PATCHFILES += 0001-Makefile.am-honor-program-prefix-suffix-transform-na.patch +# Could be redone into a proper portable socklen_t check like the one from +# gnulib's socklen.m4 and submitted back upstream. +PATCHFILES += 0002-configure.in-check-socklen_t-via-sys-socket.h.patch TEST_SCRIPTS = - CONFIGURE_ARGS = $(DIRPATHS) -# ------------------ BEWARE: NASTY HACK AHEAD -------------------- -# # We employ modulations to produce two mtr binaries, one with X support -# the other one without (less dependencies). We need to transform the -# name on merge so that the binaries don't clash and fiddle the correct -# binary into the proper path again on package assembly (via prototype). +# the other one without (less dependencies). # EXTRA_MODULATORS = GUI MODULATIONS_GUI = disable enable - - CONFIGURE_ARGS_GUI-disable = --without-gtk -CONFIGURE_ARGS_GUI-enable = --disable-gtktest +CONFIGURE_ARGS_GUI-enable = --disable-gtktest +CONFIGURE_ARGS_GUI-enable += --program-prefix=x CONFIGURE_ARGS += $(CONFIGURE_ARGS_GUI-$(GUI)) -EXTRA_PKG_CONFIG_PATH_GUI-enable = /opt/csw/X11/lib/pkgconfig -EXTRA_PKG_CONFIG_PATH += $(EXTRA_PKG_CONFIG_PATH_GUI-$(GUI)) +ifeq ($(GUI),enable) +EXTRA_PKG_CONFIG_PATH = /opt/csw/X11/lib/pkgconfig +EXTRA_SOS_LD_FLAGS = -L$(abspath $(prefix)/X11/lib/$(MM_LIBDIR)) +endif -# Rename the modulated binaries so that we can distinguish them -# Could also be done via ./configure --program-suffix, but the -# install-exec-hook for mtr doesn't honor the transformed name -# and fails. -EXTRA_PAX_ARGS_isa-default-gui-enable = -s ",^.$(sbindir)/mtr$$,$(sbindir)/mtr-gui,p" -EXTRA_PAX_ARGS_isa-default-gui-disable = -s ",^.$(sbindir)/mtr$$,$(sbindir)/mtr-nongui,p" +# These two should work instead of the four ones below, but they don't. +# license is the only file that ends up in pkgroot/. +#MERGE_SCRIPTS_isa-default-gui-enable = copy-all +#MERGE_SCRIPTS_isa-default-gui-disable = copy-all -# Simply copy all files, EXTRA_PAX_ARGS above takes care not to overwrite the -# mtr binary on merging. -MERGE_SCRIPTS_isa-default-gui-enable = copy-all -MERGE_SCRIPTS_isa-default-gui-disable = copy-all +MERGE_SCRIPTS_isa-i386-gui-enable = copy-all +MERGE_SCRIPTS_isa-sparcv8-gui-enable = copy-all +MERGE_SCRIPTS_isa-i386-gui-disable = copy-all +MERGE_SCRIPTS_isa-sparcv8-gui-disable = copy-all # Make mtr setuid so that it can access raw sockets PROTOTYPE_MODIFIERS = makesuid -PROTOTYPE_FILES_makesuid = $(sbindir)/mtr-.* +PROTOTYPE_FILES_makesuid = $(sbindir)/x?mtr PROTOTYPE_PERMS_makesuid = 4755 -# ------------------ /BEWARE: NASTY HACK AHEAD -------------------- +# ---- end of modulations relevant settings include gar/category.mk +# Need to autoreconf as we patch configure.in and Makefile.am +pre-configure-modulated: + autoreconf -fi $(WORKSRC) + @$(MAKECOOKIE) + # curses detection is somehow broken, ncurses.h is included but no curses # lib is added to LIBS (according to comments in configure.in termcap is only # included to satisfy Solaris curses dependencies) post-configure-modulated: - @perl -pi -e 'if (/^LIBS =/) { s|-ltermcap|-lncurses| }' \ + perl -pi -e 'if (/^LIBS =/) { s|-ltermcap|-lncurses| }' \ $(WORKSRC)/Makefile @$(MAKECOOKIE) -post-install-modulated: - @ginstall -d $(DESTDIR)$(docdir)/$(CATALOGNAME) - @cp $(FILEDIR)/changelog.CSW $(DESTDIR)$(docdir)/$(CATALOGNAME) +post-merge: + ginstall -d $(PKGROOT)$(docdir)/mtr + ginstall -d $(PKGROOT)$(docdir)/mtr_gtk + cp $(FILEDIR)/changelog.CSW $(PKGROOT)$(docdir)/mtr/ + cp $(FILEDIR)/changelog.CSW $(PKGROOT)$(docdir)/mtr_gtk/ @$(MAKECOOKIE) Modified: csw/mgar/pkg/mtr/trunk/checksums =================================================================== --- csw/mgar/pkg/mtr/trunk/checksums 2010-01-11 21:45:37 UTC (rev 7972) +++ csw/mgar/pkg/mtr/trunk/checksums 2010-01-11 23:23:27 UTC (rev 7973) @@ -1,2 +1,4 @@ +46fbebe2240c1beeefd2b8df272c153a 0001-Makefile.am-honor-program-prefix-suffix-transform-na.patch +2574238ad108bd6f1737adf5fc50df5f 0002-configure.in-check-socklen_t-via-sys-socket.h.patch 4a3e6fef662eb4794e61e334f6c33722 gar-base.diff 23baca52d0922c2ecba7eba05317868c mtr-0.75.tar.gz Added: csw/mgar/pkg/mtr/trunk/files/0001-Makefile.am-honor-program-prefix-suffix-transform-na.patch =================================================================== --- csw/mgar/pkg/mtr/trunk/files/0001-Makefile.am-honor-program-prefix-suffix-transform-na.patch (rev 0) +++ csw/mgar/pkg/mtr/trunk/files/0001-Makefile.am-honor-program-prefix-suffix-transform-na.patch 2010-01-11 23:23:27 UTC (rev 7973) @@ -0,0 +1,28 @@ +From e237f1d4993f48be1cbbf283b0965426af195206 Mon Sep 17 00:00:00 2001 +From: Sebastian Kayser +Date: Mon, 11 Jan 2010 22:25:30 +0100 +Subject: [PATCH] Makefile.am: honor --program-{prefix,suffix,transform-name} + +--- + Makefile.am | 4 +++- + 1 files changed, 3 insertions(+), 1 deletions(-) + +diff --git a/Makefile.am b/Makefile.am +index 7ff9ddf..1702674 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -2,8 +2,10 @@ SUBDIRS = img + + sbin_PROGRAMS = mtr + man_MANS = mtr.8 ++actual_mtr = `echo mtr | sed '$(transform)'` ++ + install-exec-hook: +- chmod u+s $(DESTDIR)$(sbindir)/mtr ++ chmod u+s $(DESTDIR)$(sbindir)/$(actual_mtr) + + mtr_SOURCES = mtr.c \ + net.c net.h \ +-- +1.6.5.1 + Added: csw/mgar/pkg/mtr/trunk/files/0002-configure.in-check-socklen_t-via-sys-socket.h.patch =================================================================== --- csw/mgar/pkg/mtr/trunk/files/0002-configure.in-check-socklen_t-via-sys-socket.h.patch (rev 0) +++ csw/mgar/pkg/mtr/trunk/files/0002-configure.in-check-socklen_t-via-sys-socket.h.patch 2010-01-11 23:23:27 UTC (rev 7973) @@ -0,0 +1,25 @@ +From c1321af12b27e917b29a427b58d2539e89cc44b2 Mon Sep 17 00:00:00 2001 +From: Sebastian Kayser +Date: Mon, 11 Jan 2010 21:57:53 +0100 +Subject: [PATCH] configure.in: check socklen_t via sys/socket.h + +--- + configure.in | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/configure.in b/configure.in +index d73e994..1015f7b 100644 +--- a/configure.in ++++ b/configure.in +@@ -96,7 +96,7 @@ AC_CHECK_DECLS(errno, , , [[ + ]] ) + + AC_CHECK_TYPE(socklen_t, AC_DEFINE([HAVE_SOCKLEN_T], [], [Define if your system has socklen_t]) , , [[ +-#include ++#include + ]]) + + AC_CHECK_TYPE(struct in_addr, AC_DEFINE([HAVE_STRUCT_INADDR], [], [Define if you have struct in_addr]), , [[ +-- +1.6.5.1 + Modified: csw/mgar/pkg/mtr/trunk/files/changelog.CSW =================================================================== --- csw/mgar/pkg/mtr/trunk/files/changelog.CSW 2010-01-11 21:45:37 UTC (rev 7972) +++ csw/mgar/pkg/mtr/trunk/files/changelog.CSW 2010-01-11 23:23:27 UTC (rev 7973) @@ -1,5 +1,7 @@ mtr (0.75,REV=2009.06.19) * Adopted and updated to 0.75. (Closes #2557, #3278) + * Split off a separate mtr_gtk package for the GUI version. The mtr package + is now CLI only which equates to less dependencies. -- Sebastian Kayser Fri, 19 Jun 2009 00:26:08 +0200 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From skayser at users.sourceforge.net Tue Jan 12 00:26:21 2010 From: skayser at users.sourceforge.net (skayser at users.sourceforge.net) Date: Mon, 11 Jan 2010 23:26:21 +0000 Subject: [csw-devel] SF.net SVN: gar:[7974] csw/mgar/pkg/mtr/trunk/Makefile Message-ID: Revision: 7974 http://gar.svn.sourceforge.net/gar/?rev=7974&view=rev Author: skayser Date: 2010-01-11 23:26:20 +0000 (Mon, 11 Jan 2010) Log Message: ----------- mtr: rename mtr_gtk to mtr_x11 Modified Paths: -------------- csw/mgar/pkg/mtr/trunk/Makefile Modified: csw/mgar/pkg/mtr/trunk/Makefile =================================================================== --- csw/mgar/pkg/mtr/trunk/Makefile 2010-01-11 23:23:27 UTC (rev 7973) +++ csw/mgar/pkg/mtr/trunk/Makefile 2010-01-11 23:26:20 UTC (rev 7974) @@ -28,27 +28,27 @@ # Build the base package without X support and have an additional one that # supports X. http://article.gmane.org/gmane.os.solaris.opencsw.maintainers/5090 -PACKAGES = CSWmtr CSWmtr-gtk +PACKAGES = CSWmtr CSWmtr-x11 -# Just catch those files belonging to CSWmtr-gtk, all others will go to CSWmtr. -PKGFILES_CSWmtr-gtk = .*/mtr_gtk.* -PKGFILES_CSWmtr-gtk += .*/xmtr.* +# Just catch those files belonging to CSWmtr-x11, all others will go to CSWmtr. +PKGFILES_CSWmtr-x11 = .*/mtr_x11.* +PKGFILES_CSWmtr-x11 += .*/xmtr.* CATALOGNAME_CSWmtr = mtr SPKG_DESC_CSWmtr = Combined traceroute and ping utility (CLI only) REQUIRED_PKGS_CSWmtr += CSWncurses -CATALOGNAME_CSWmtr-gtk = mtr_gtk -SPKG_DESC_CSWmtr-gtk = Combined traceroute and ping utility (GUI version) -REQUIRED_PKGS_CSWmtr-gtk = CSWgtk2 -REQUIRED_PKGS_CSWmtr-gtk += CSWfconfig -REQUIRED_PKGS_CSWmtr-gtk += CSWftype2 -REQUIRED_PKGS_CSWmtr-gtk += CSWggettextrt -REQUIRED_PKGS_CSWmtr-gtk += CSWglib2 -REQUIRED_PKGS_CSWmtr-gtk += CSWlibatk -REQUIRED_PKGS_CSWmtr-gtk += CSWlibcairo -REQUIRED_PKGS_CSWmtr-gtk += CSWncurses -REQUIRED_PKGS_CSWmtr-gtk += CSWpango +CATALOGNAME_CSWmtr-x11 = mtr_x11 +SPKG_DESC_CSWmtr-x11 = Combined traceroute and ping utility (GUI version) +REQUIRED_PKGS_CSWmtr-x11 = CSWgtk2 +REQUIRED_PKGS_CSWmtr-x11 += CSWfconfig +REQUIRED_PKGS_CSWmtr-x11 += CSWftype2 +REQUIRED_PKGS_CSWmtr-x11 += CSWggettextrt +REQUIRED_PKGS_CSWmtr-x11 += CSWglib2 +REQUIRED_PKGS_CSWmtr-x11 += CSWlibatk +REQUIRED_PKGS_CSWmtr-x11 += CSWlibcairo +REQUIRED_PKGS_CSWmtr-x11 += CSWncurses +REQUIRED_PKGS_CSWmtr-x11 += CSWpango # 1) Check for socklen_t via sys/socket.h (not netinet/in.h) # 2) Don't cast sin_addr to (struct in_addr), cc bails out with invalid cast @@ -112,7 +112,7 @@ post-merge: ginstall -d $(PKGROOT)$(docdir)/mtr - ginstall -d $(PKGROOT)$(docdir)/mtr_gtk + ginstall -d $(PKGROOT)$(docdir)/mtr_x11 cp $(FILEDIR)/changelog.CSW $(PKGROOT)$(docdir)/mtr/ - cp $(FILEDIR)/changelog.CSW $(PKGROOT)$(docdir)/mtr_gtk/ + cp $(FILEDIR)/changelog.CSW $(PKGROOT)$(docdir)/mtr_x11/ @$(MAKECOOKIE) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From skayser at users.sourceforge.net Tue Jan 12 00:27:56 2010 From: skayser at users.sourceforge.net (skayser at users.sourceforge.net) Date: Mon, 11 Jan 2010 23:27:56 +0000 Subject: [csw-devel] SF.net SVN: gar:[7975] csw/mgar/pkg/mtr/trunk/files/changelog.CSW Message-ID: Revision: 7975 http://gar.svn.sourceforge.net/gar/?rev=7975&view=rev Author: skayser Date: 2010-01-11 23:27:56 +0000 (Mon, 11 Jan 2010) Log Message: ----------- mtr: updated changelog.CSW Modified Paths: -------------- csw/mgar/pkg/mtr/trunk/files/changelog.CSW Modified: csw/mgar/pkg/mtr/trunk/files/changelog.CSW =================================================================== --- csw/mgar/pkg/mtr/trunk/files/changelog.CSW 2010-01-11 23:26:20 UTC (rev 7974) +++ csw/mgar/pkg/mtr/trunk/files/changelog.CSW 2010-01-11 23:27:56 UTC (rev 7975) @@ -1,7 +1,7 @@ -mtr (0.75,REV=2009.06.19) +mtr (0.75,REV=2010.01.12) * Adopted and updated to 0.75. (Closes #2557, #3278) - * Split off a separate mtr_gtk package for the GUI version. The mtr package + * Split off a separate mtr_x11 package for the GUI version. The mtr package is now CLI only which equates to less dependencies. - -- Sebastian Kayser Fri, 19 Jun 2009 00:26:08 +0200 + -- Sebastian Kayser Tue, 12 Jan 2010 00:14:32 +0100 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From skayser at users.sourceforge.net Tue Jan 12 01:52:05 2010 From: skayser at users.sourceforge.net (skayser at users.sourceforge.net) Date: Tue, 12 Jan 2010 00:52:05 +0000 Subject: [csw-devel] SF.net SVN: gar:[7976] csw/mgar/pkg/httping/trunk Message-ID: Revision: 7976 http://gar.svn.sourceforge.net/gar/?rev=7976&view=rev Author: skayser Date: 2010-01-12 00:52:04 +0000 (Tue, 12 Jan 2010) Log Message: ----------- httping: update to 1.4.1 Modified Paths: -------------- csw/mgar/pkg/httping/trunk/Makefile csw/mgar/pkg/httping/trunk/checksums csw/mgar/pkg/httping/trunk/files/changelog.CSW Added Paths: ----------- csw/mgar/pkg/httping/trunk/files/0001-Makefile-make-options-and-tools-configurable.patch Modified: csw/mgar/pkg/httping/trunk/Makefile =================================================================== --- csw/mgar/pkg/httping/trunk/Makefile 2010-01-11 23:27:56 UTC (rev 7975) +++ csw/mgar/pkg/httping/trunk/Makefile 2010-01-12 00:52:04 UTC (rev 7976) @@ -1,5 +1,8 @@ +# TODO (release-critical prefixed with !, non release-critical with *) +# * Submit 0001-* patch upstream +# * -6 not documented in man page (any others?), feedback to upstream GARNAME = httping -GARVERSION = 1.3.0 +GARVERSION = 1.4.1 CATEGORIES = net DESCRIPTION = Httping is like 'ping' but for http-requests. @@ -11,25 +14,34 @@ endef MASTER_SITES = http://www.vanheusden.com/httping/ -DISTFILES = $(GARNAME)-$(GARVERSION).tgz +DISTFILES = $(GARNAME)-$(GARVERSION).tgz +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tgz REQUIRED_PKGS = CSWosslrt -# We define upstream file regex so we can be notifed of new upstream software release -UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tgz +# Makefile comes pre-set with gcc defaults and hardcoded tools +PATCHFILES = 0001-Makefile-make-options-and-tools-configurable.patch -PATCHFILES = gar-base.diff - CONFIGURE_SCRIPTS = TEST_SCRIPTS = -CONFIGURE_ARGS = $(DIRPATHS) +# Build options (see $(WORKSRC)/Makefile) +EXTRA_LD_FLAGS = -lsocket -lnsl +EXTRA_BUILD_EXPORTS = WFLAGS OFLAGS +WFLAGS = +OFLAGS = +# Install options (see $(WORKSRC)/Makefile) +INSTALL_EXPORTS = PREFIX INSTALL STRIP +PREFIX = $(prefix) +INSTALL = ginstall +STRIP = /usr/ccs/bin/strip + LICENSE = license.txt include gar/category.mk post-install-modulated: - @ginstall -d $(DESTDIR)$(docdir)/$(GARNAME) - @cp $(FILEDIR)/changelog.CSW $(DESTDIR)$(docdir)/$(GARNAME) + ginstall -d $(DESTDIR)$(docdir)/$(GARNAME) + cp $(FILEDIR)/changelog.CSW $(DESTDIR)$(docdir)/$(GARNAME) @$(MAKECOOKIE) Modified: csw/mgar/pkg/httping/trunk/checksums =================================================================== --- csw/mgar/pkg/httping/trunk/checksums 2010-01-11 23:27:56 UTC (rev 7975) +++ csw/mgar/pkg/httping/trunk/checksums 2010-01-12 00:52:04 UTC (rev 7976) @@ -1,2 +1,2 @@ -9f75ad45daa91e67c6677c9959165f89 download/gar-base.diff -41c912a9ecc904e51d7260053fc2195c download/httping-1.3.0.tgz +828d966da2d49e3300a0914e8d6f7b16 0001-Makefile-make-options-and-tools-configurable.patch +bde1ff3c01343d2371d8f34fbf8a1d9a httping-1.4.1.tgz Added: csw/mgar/pkg/httping/trunk/files/0001-Makefile-make-options-and-tools-configurable.patch =================================================================== --- csw/mgar/pkg/httping/trunk/files/0001-Makefile-make-options-and-tools-configurable.patch (rev 0) +++ csw/mgar/pkg/httping/trunk/files/0001-Makefile-make-options-and-tools-configurable.patch 2010-01-12 00:52:04 UTC (rev 7976) @@ -0,0 +1,52 @@ +From f252b0a2a7f87d34dbcdf8bcccde9e6069ac9729 Mon Sep 17 00:00:00 2001 +From: Sebastian Kayser +Date: Tue, 12 Jan 2010 01:10:31 +0100 +Subject: [PATCH] Makefile: make options and tools configurable + +--- + Makefile | 18 +++++++++--------- + 1 files changed, 9 insertions(+), 9 deletions(-) + +diff --git a/Makefile b/Makefile +index 873c57e..0133741 100644 +--- a/Makefile ++++ b/Makefile +@@ -16,26 +16,26 @@ include version + + TARGET=httping + +-WFLAGS=-Wall -W +-OFLAGS=-O2 ++WFLAGS?=-Wall -W ++OFLAGS?=-O2 + CFLAGS+=$(WFLAGS) $(OFLAGS) -DVERSION=\"$(VERSION)\" + + PACKAGE=$(TARGET)-$(VERSION) +-PREFIX=/usr ++PREFIX?=/usr + BINDIR=$(PREFIX)/bin + MANDIR=$(PREFIX)/share/man + DOCDIR=$(PREFIX)/share/doc/$(TARGET) + +-INSTALL=install ++INSTALL?=install + INSTALLDIR=$(INSTALL) -m 0755 -d + INSTALLBIN=$(INSTALL) -m 0755 + INSTALLMAN=$(INSTALL) -m 0644 + INSTALLDOC=$(INSTALL) -m 0644 +-STRIP=/usr/bin/strip +-RMDIR=/bin/rm -rf +-MKDIR=/bin/mkdir +-ARCHIVE=/bin/tar cf - +-COMPRESS=/bin/gzip -9 ++STRIP?=/usr/bin/strip ++RMDIR?=/bin/rm -rf ++MKDIR?=/bin/mkdir ++ARCHIVE?=/bin/tar cf - ++COMPRESS?=/bin/gzip -9 + + OBJS=mem.o http.o io.o str.o error.o utils.o main.o tcp.o res.o + +-- +1.6.5.1 + Modified: csw/mgar/pkg/httping/trunk/files/changelog.CSW =================================================================== --- csw/mgar/pkg/httping/trunk/files/changelog.CSW 2010-01-11 23:27:56 UTC (rev 7975) +++ csw/mgar/pkg/httping/trunk/files/changelog.CSW 2010-01-12 00:52:04 UTC (rev 7976) @@ -1,3 +1,9 @@ +httping (1.4.1,REV=2010.01.12) + + * Updated to 1.4.1 + + -- Sebastian Kayser Tue, 12 Jan 2010 02:08:40 +0100 + httping (1.3.0,REV=2009.05.31) * Adopted and updated to 1.3.0 (Closes: #3458, #2391). This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From skayser at users.sourceforge.net Tue Jan 12 01:52:37 2010 From: skayser at users.sourceforge.net (skayser at users.sourceforge.net) Date: Tue, 12 Jan 2010 00:52:37 +0000 Subject: [csw-devel] SF.net SVN: gar:[7977] csw/mgar/pkg/httping/trunk/files/gar-base.diff Message-ID: Revision: 7977 http://gar.svn.sourceforge.net/gar/?rev=7977&view=rev Author: skayser Date: 2010-01-12 00:52:37 +0000 (Tue, 12 Jan 2010) Log Message: ----------- httping: delete obsolete gar-base.diff Removed Paths: ------------- csw/mgar/pkg/httping/trunk/files/gar-base.diff Deleted: csw/mgar/pkg/httping/trunk/files/gar-base.diff =================================================================== --- csw/mgar/pkg/httping/trunk/files/gar-base.diff 2010-01-12 00:52:04 UTC (rev 7976) +++ csw/mgar/pkg/httping/trunk/files/gar-base.diff 2010-01-12 00:52:37 UTC (rev 7977) @@ -1,33 +0,0 @@ -diff --speed-large-files --minimal -Nru httping-1.3.0.orig/Makefile httping-1.3.0/Makefile ---- httping-1.3.0.orig/Makefile 2009-02-18 16:32:43.000000000 +0100 -+++ httping-1.3.0/Makefile 2009-05-21 12:43:55.083896462 +0200 -@@ -14,22 +14,23 @@ - - include version - --DEBUG=-g # -D_DEBUG --LDFLAGS+=-lssl -lcrypto $(DEBUG) --CFLAGS+=-O2 -Wall -DVERSION=\"$(VERSION)\" $(DEBUG) -+LDFLAGS+=-lssl -lcrypto -lsocket -lnsl -lresolv -+CFLAGS+=-DVERSION=\"$(VERSION)\" - - OBJS=mem.o http.o io.o str.o error.o utils.o main.o tcp.o mssl.o res.o - - all: httping - - httping: $(OBJS) -- $(CC) -Wall -W $(OBJS) $(LDFLAGS) -o httping -+ $(CC) $(CFLAGS) $(OBJS) $(LDFLAGS) -o httping - # - # Oh, blatant plug: http://keetweej.vanheusden.com/wishlist.html - - install: httping -- cp httping $(DESTDIR)/usr/bin -- cp httping.1 $(DESTDIR)/usr/share/man/man1/ -+ ginstall -d $(DESTDIR)$(bindir) -+ ginstall -d $(DESTDIR)$(mandir)/man1 -+ cp httping $(DESTDIR)$(bindir) -+ cp httping.1 $(DESTDIR)$(mandir)/man1 - - clean: - rm -f $(OBJS) core httping This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From janholzh at users.sourceforge.net Tue Jan 12 11:43:11 2010 From: janholzh at users.sourceforge.net (janholzh at users.sourceforge.net) Date: Tue, 12 Jan 2010 10:43:11 +0000 Subject: [csw-devel] SF.net SVN: gar:[7978] csw/mgar/pkg/libsoup2/trunk Message-ID: Revision: 7978 http://gar.svn.sourceforge.net/gar/?rev=7978&view=rev Author: janholzh Date: 2010-01-12 10:43:07 +0000 (Tue, 12 Jan 2010) Log Message: ----------- libsoup2: Initial gar Makefile, some preliminary work Added Paths: ----------- csw/mgar/pkg/libsoup2/trunk/Makefile csw/mgar/pkg/libsoup2/trunk/checksums csw/mgar/pkg/libsoup2/trunk/files/ Property Changed: ---------------- csw/mgar/pkg/libsoup2/trunk/ Property changes on: csw/mgar/pkg/libsoup2/trunk ___________________________________________________________________ Added: svn:externals + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 Added: csw/mgar/pkg/libsoup2/trunk/Makefile =================================================================== --- csw/mgar/pkg/libsoup2/trunk/Makefile (rev 0) +++ csw/mgar/pkg/libsoup2/trunk/Makefile 2010-01-12 10:43:07 UTC (rev 7978) @@ -0,0 +1,27 @@ +GARNAME = libsoup +GARVERSION = 2.26.3 +CATEGORIES = lib + + +DESCRIPTION = HTTP client/server library for GNOME +define BLURB +endef +MASTER_SITES = $(GNOME_MIRROR) +DISTFILES = $(GARNAME)-$(GARVERSION).tar.bz2 + + +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = -(\d+(?:\.\d+)*).tar.bz2 + +PACKAGES = CSWlibsoup2 + + +EXTRA_INC = /opt/csw/X11/include +EXTRA_LIB = /opt/csw/X11/lib +EXTRA_PKG_CONFIG_DIRS = $(prefix)/X11/lib + +CONFIGURE_ARGS = $(DIRPATHS) + +TEST_TARGET = check + +include gar/category.mk Added: csw/mgar/pkg/libsoup2/trunk/checksums =================================================================== --- csw/mgar/pkg/libsoup2/trunk/checksums (rev 0) +++ csw/mgar/pkg/libsoup2/trunk/checksums 2010-01-12 10:43:07 UTC (rev 7978) @@ -0,0 +1 @@ +19f15636380a9a08a0f071cc53069b80 libsoup-2.26.3.tar.bz2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Tue Jan 12 15:24:24 2010 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Tue, 12 Jan 2010 14:24:24 +0000 Subject: [csw-devel] SF.net SVN: gar:[7979] csw/mgar/pkg/tig/trunk/Makefile Message-ID: Revision: 7979 http://gar.svn.sourceforge.net/gar/?rev=7979&view=rev Author: bdwalton Date: 2010-01-12 14:24:19 +0000 (Tue, 12 Jan 2010) Log Message: ----------- tig: add vendor url Modified Paths: -------------- csw/mgar/pkg/tig/trunk/Makefile Modified: csw/mgar/pkg/tig/trunk/Makefile =================================================================== --- csw/mgar/pkg/tig/trunk/Makefile 2010-01-12 10:43:07 UTC (rev 7978) +++ csw/mgar/pkg/tig/trunk/Makefile 2010-01-12 14:24:19 UTC (rev 7979) @@ -3,6 +3,8 @@ CATEGORIES = utils PATCHLEVEL = 1e69632 +VENDOR_URL = http://jonas.nitro.dk/tig/ + DESCRIPTION = A git repository browser define BLURB Tig is a git repository browser that additionally can act as a pager This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From d_pocock at users.sourceforge.net Tue Jan 12 16:53:53 2010 From: d_pocock at users.sourceforge.net (d_pocock at users.sourceforge.net) Date: Tue, 12 Jan 2010 15:53:53 +0000 Subject: [csw-devel] SF.net SVN: gar:[7980] csw/mgar/pkg/ganglia/branches Message-ID: Revision: 7980 http://gar.svn.sourceforge.net/gar/?rev=7980&view=rev Author: d_pocock Date: 2010-01-12 15:53:51 +0000 (Tue, 12 Jan 2010) Log Message: ----------- Start preparing for the 3.1.6 release Modified Paths: -------------- csw/mgar/pkg/ganglia/branches/ganglia-3.1.6-rc/checksums Added Paths: ----------- csw/mgar/pkg/ganglia/branches/ganglia-3.1.6-rc/ csw/mgar/pkg/ganglia/branches/ganglia-3.1.6-rc/Makefile Removed Paths: ------------- csw/mgar/pkg/ganglia/branches/ganglia-3.1.6-rc/Makefile Deleted: csw/mgar/pkg/ganglia/branches/ganglia-3.1.6-rc/Makefile =================================================================== --- csw/mgar/pkg/ganglia/branches/ganglia-3.1.4-rc/Makefile 2009-10-26 14:51:49 UTC (rev 6977) +++ csw/mgar/pkg/ganglia/branches/ganglia-3.1.6-rc/Makefile 2010-01-12 15:53:51 UTC (rev 7980) @@ -1,161 +0,0 @@ -GARNAME = ganglia -GARVERSION = 3.1.4 -CATEGORIES = utils - -# How should we set this? -# There is a release number in configure.in, maybe use that? -# RELVER = - -USER_GMOND = nobody -# nobody shouldn't really be allowed to own any files -# maybe we should add a ganglia user to own the RRD files? -USER_GMETAD = nobody - -DESCRIPTION = A scalable distributed monitoring system -define BLURB - Ganglia is a scalable distributed monitoring system for high-performance computing - systems such as clusters and Grids. It is based on a hierarchical design targeted - at federations of clusters. -endef - -SF_PROJ = ganglia -MASTER_SITES = $(SF_MIRRORS) -DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz -DISTFILES += CSWgangliaweb.postinstall CSWgangliaweb.preremove -DISTFILES += httpd-ganglia.conf.CSW cswgmond cswgmetad - -PACKAGES = CSWgangliart CSWgangliaagent CSWgangliadevel CSWgangliagmetad CSWgangliaweb CSWgangliamodpython - -CATALOGNAME_CSWganglia = ganglia -CATALOGNAME_CSWgangliart = ganglia_rt -CATALOGNAME_CSWgangliaagent = ganglia_agent -CATALOGNAME_CSWgangliamodpython = ganglia_modpython -CATALOGNAME_CSWgangliadevel = ganglia_devel -CATALOGNAME_CSWgangliagmetad = ganglia_gmetad -CATALOGNAME_CSWgangliaweb = ganglia_web - -SPKG_DESC_CSWganglia = Dummy package -SPKG_DESC_CSWgangliart = Ganglia runtime libraries -SPKG_DESC_CSWgangliaagent = Ganglia performance monitoring agent gmond -SPKG_DESC_CSWgangliamodpython = Ganglia agent module for Python metrics -SPKG_DESC_CSWgangliadevel = Ganglia headers for metric module development -SPKG_DESC_CSWgangliagmetad = Ganglia gmetad -SPKG_DESC_CSWgangliaweb = Ganglia web - -PREREQUISITE_PKGS = CSWexpat CSWlibconfuse CSWapache2rt CSWapache2-devel CSWrrd - -REQUIRED_PKGS_CSWgangliart = CSWexpat CSWlibconfuse CSWapache2rt -REQUIRED_PKGS_CSWgangliaagent = CSWexpat CSWlibconfuse CSWapache2rt -REQUIRED_PKGS_CSWgangliaagent += CSWgangliart -REQUIRED_PKGS_CSWgangliamodpython = CSWlibconfuse CSWapache2rt CSWgangliart -REQUIRED_PKGS_CSWgangliamodpython += CSWgangliaagent -REQUIRED_PKGS_CSWgangliadevel = CSWexpat CSWlibconfuse CSWapache2rt -REQUIRED_PKGS_CSWgangliagmetad = CSWexpat CSWlibconfuse CSWapache2rt -REQUIRED_PKGS_CSWgangliagmetad += CSWgangliart CSWgangliaagent CSWrrd -REQUIRED_PKGS_CSWgangliaweb = CSWgangliagmetad -REQUIRED_PKGS_CSWgangliaweb += CSWapache2 CSWphp5 CSWap2modphp5 CSWrrd - -# We define upstream file regex so we can be notifed of new upstream software release -UPSTREAM_MASTER_SITES = $(SF_PROJECT_SHOWFILE)=43021 -UPSTREAM_USE_SF = 1 -UFILES_REGEX = (\d+(?:\.\d+)*) - -# This is attachment #45 from Ganglia bug -# http://bugzilla.ganglia.info/cgi-bin/bugzilla/show_bug.cgi?id=77 -#PATCHFILES = $(GARNAME)-$(GARVERSION)-solaris-cc.patch - -CONFIGURE_ARGS = $(DIRPATHS) - -# Don't build gmetad (not tested yet on Solaris, more deps required to build) -#CONFIGURE_ARGS += --without-gmetad -CONFIGURE_ARGS += --with-gmetad - -# Reduce dependencies, no gettext: -CONFIGURE_ARGS += --disable-nls - -# Use apr from CSWapache2rt -CONFIGURE_ARGS += --with-libapr=/opt/csw/apache2/bin/apr-1-config - -# Include the status module -CONFIGURE_ARGS += --with-status - -# When we enable this, modpython will have to go in a separate package, -# otherwise CSWgangliaagent will have lots of dependencies -# TODO: define a CSWgangliamodpython package -# Depends: some issues exist getting the Python support working on Solaris, -# Ganglia's configure.in needs to be further enhanced for this to work -CONFIGURE_ARGS += --disable-python -#CONFIGURE_ARGS += --with-python=/opt/csw - -# For Ganglia 3.1.2, the test suite doesn't compile cleanly on Solaris, -# so we skip it. This should be re-assessed with each new release -# from upstream. Proposed fixes for the test suite to be submitted -# upstream. -ifeq ($(GARVERSION),3.1.3) -TEST_SCRIPTS = -endif - -INSTALL_SCRIPTS = $(WORKSRC)/Makefile custom - -WWWROOT = /opt/csw/share/www -WWWGANGLIA = $(WWWROOT)/ganglia -sysconfdir = /etc/opt/csw/ganglia -ETCGANGLIA = $(sysconfdir) - -PKGFILES_CSWganglia = -PKGFILES_CSWgangliart = $(libdir)/libganglia.* -PKGFILES_CSWgangliamodpython = .*python.* -PKGFILES_CSWgangliadevel = .*/include/.*.h .*/bin/ganglia-config -PKGFILES_CSWgangliagmetad = .*/gmetad.* /opt/csw/var/ganglia/rrds /etc/opt/csw/init.d/cswgmetad -PKGFILES_CSWgangliaweb = $(WWWGANGLIA)/.* /opt/csw/apache2/etc/extra/.* - -PRESERVECONF = /opt/csw/apache2/etc/extra/httpd-ganglia.conf.CSW - -# For gmond -INITSMF = /etc/opt/csw/init.d/cswgmond -# For gmetad -INITSMF += /etc/opt/csw/init.d/cswgmetad - -PROTOTYPE_FILTER_CSWgangliagmetad = awk '\ -$$$$3 ~ /\/opt\/csw\/var\/ganglia\/rrds/ { $$$$5 = "nobody"; $$$$6 = "nogroup" } \ -{ print }' - - -#ARCHALL_CSWgangliadevel = 1 -#ARCHALL_CSWgangliaweb = 1 - -include gar/category.mk - -install-custom: - @ginstall -D $(DOWNLOADDIR)/cswgmond \ - $(PKGROOT)/etc/opt/csw/init.d/cswgmond - @ginstall -D $(DOWNLOADDIR)/cswgmetad \ - $(PKGROOT)/etc/opt/csw/init.d/cswgmetad - @ginstall -d $(DESTDIR)$(WWWGANGLIA) - @cd $(WORKSRC)/web; \ - cp -R * $(DESTDIR)$(WWWGANGLIA) - @ginstall -D $(FILEDIR)/conf.php \ - $(DESTDIR)$(WWWGANGLIA)/conf.php - @rm -rf $(DESTDIR)$(WWWGANGLIA)/*.in - @ginstall -D $(FILEDIR)/httpd-ganglia.conf.CSW \ - $(DESTDIR)/opt/csw/apache2/etc/extra/httpd-ganglia.conf.CSW - @ginstall -d $(DESTDIR)$(ETCGANGLIA)/conf.d - @$(WORKSRC)/gmond/gmond -t | grep -v "^include" \ - > $(DESTDIR)$(ETCGANGLIA)/gmond.conf - @echo "include ('/etc/opt/csw/ganglia/conf.d/*.conf')" \ - >> $(DESTDIR)$(ETCGANGLIA)/gmond.conf -# @ginstall -D $(FILEDIR)/gmond.conf \ -# $(DESTDIR)$(ETCGANGLIA)/gmond.conf - @ginstall -D $(FILEDIR)/gmetad.conf \ - $(DESTDIR)$(ETCGANGLIA)/gmetad.conf - @cd $(WORKSRC)/gmond/modules/conf.d; \ - cp -R *.conf $(DESTDIR)$(ETCGANGLIA)/conf.d - @rm -rf $(DESTDIR)$(ETCGANGLIA)/conf.d/example.conf \ - $(DESTDIR)$(ETCGANGLIA)/conf.d/multicpu.conf -ifeq ($(GARVERSION),3.1.2) - @rm -rf $(DESTDIR)$(ETCGANGLIA)/conf.d/modgstatus.conf -endif - @ginstall -d $(DESTDIR)/opt/csw/var/ganglia/rrds - - - Copied: csw/mgar/pkg/ganglia/branches/ganglia-3.1.6-rc/Makefile (from rev 6980, csw/mgar/pkg/ganglia/branches/ganglia-3.1.4-rc/Makefile) =================================================================== --- csw/mgar/pkg/ganglia/branches/ganglia-3.1.6-rc/Makefile (rev 0) +++ csw/mgar/pkg/ganglia/branches/ganglia-3.1.6-rc/Makefile 2010-01-12 15:53:51 UTC (rev 7980) @@ -0,0 +1,180 @@ +GARNAME = ganglia +GARVERSION = 3.1.5.2215 +CATEGORIES = utils + +# How should we set this? +# There is a release number in configure.in, maybe use that? +# RELVER = + +USER_GMOND = nobody +# nobody shouldn't really be allowed to own any files +# maybe we should add a ganglia user to own the RRD files? +USER_GMETAD = nobody + +DESCRIPTION = A scalable distributed monitoring system +define BLURB + Ganglia is a scalable distributed monitoring system for high-performance computing + systems such as clusters and Grids. It is based on a hierarchical design targeted + at federations of clusters. +endef + +SF_PROJ = ganglia +MASTER_SITES = $(SF_MIRRORS) +DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz +DISTFILES += CSWgangliaweb.postinstall CSWgangliaweb.preremove +DISTFILES += httpd-ganglia.conf.CSW cswgmond cswgmetad + +PACKAGES = CSWgangliart CSWgangliaagent CSWgangliadevel CSWgangliagmetad CSWgangliaweb CSWgangliamodpython + +CATALOGNAME_CSWganglia = ganglia +CATALOGNAME_CSWgangliart = ganglia_rt +CATALOGNAME_CSWgangliaagent = ganglia_agent +CATALOGNAME_CSWgangliamodpython = ganglia_modpython +CATALOGNAME_CSWgangliadevel = ganglia_devel +CATALOGNAME_CSWgangliagmetad = ganglia_gmetad +CATALOGNAME_CSWgangliaweb = ganglia_web + +SPKG_DESC_CSWganglia = Dummy package +SPKG_DESC_CSWgangliart = Ganglia runtime libraries +SPKG_DESC_CSWgangliaagent = Ganglia performance monitoring agent gmond +SPKG_DESC_CSWgangliamodpython = Ganglia agent module for Python metrics +SPKG_DESC_CSWgangliadevel = Ganglia headers for metric module development +SPKG_DESC_CSWgangliagmetad = Ganglia gmetad +SPKG_DESC_CSWgangliaweb = Ganglia web + +PREREQUISITE_PKGS = CSWexpat CSWlibconfuse CSWapache2rt CSWapache2-devel CSWrrd CSWpcre + +REQUIRED_PKGS_CSWgangliart = CSWexpat CSWlibconfuse CSWapache2rt +REQUIRED_PKGS_CSWgangliaagent = CSWexpat CSWlibconfuse CSWapache2rt +REQUIRED_PKGS_CSWgangliaagent += CSWgangliart CSWpcrert +REQUIRED_PKGS_CSWgangliamodpython = CSWlibconfuse CSWapache2rt CSWgangliart +REQUIRED_PKGS_CSWgangliamodpython += CSWgangliaagent +REQUIRED_PKGS_CSWgangliadevel = CSWexpat CSWlibconfuse CSWapache2rt +REQUIRED_PKGS_CSWgangliagmetad = CSWexpat CSWlibconfuse CSWapache2rt +REQUIRED_PKGS_CSWgangliagmetad += CSWgangliart CSWgangliaagent CSWrrd +REQUIRED_PKGS_CSWgangliaweb = CSWgangliagmetad +REQUIRED_PKGS_CSWgangliaweb += CSWapache2 CSWphp5 CSWap2modphp5 CSWrrd + +# We define upstream file regex so we can be notifed of new upstream software release +UPSTREAM_MASTER_SITES = $(SF_PROJECT_SHOWFILE)=43021 +UPSTREAM_USE_SF = 1 +UFILES_REGEX = (\d+(?:\.\d+)*) + +# This is attachment #45 from Ganglia bug +# http://bugzilla.ganglia.info/cgi-bin/bugzilla/show_bug.cgi?id=77 +#PATCHFILES = $(GARNAME)-$(GARVERSION)-solaris-cc.patch + +# Uncomment this if we want to build both 32 bit and 64 bit binaries +# By default, only 32 bit binaries are built +#BUILD64 = 1 + +CONFIGURE_ARGS = $(DIRPATHS) + +# Don't build gmetad (not tested yet on Solaris, more deps required to build) +#CONFIGURE_ARGS += --without-gmetad +CONFIGURE_ARGS += --with-gmetad + +# Reduce dependencies, no gettext: +CONFIGURE_ARGS += --disable-nls + +# Use apr from CSWapache2rt +CONFIGURE_ARGS += --with-libapr=/opt/csw/apache2/bin/apr-1-config + +# Include the status module +CONFIGURE_ARGS += --with-status + +# When we enable this, modpython will have to go in a separate package, +# otherwise CSWgangliaagent will have lots of dependencies +# TODO: define a CSWgangliamodpython package +# Depends: some issues exist getting the Python support working on Solaris, +# Ganglia's configure.in needs to be further enhanced for this to work +CONFIGURE_ARGS += --disable-python +#CONFIGURE_ARGS += --with-python=/opt/csw + +# For Ganglia 3.1.2, the test suite doesn't compile cleanly on Solaris, +# so we skip it. This should be re-assessed with each new release +# from upstream. Proposed fixes for the test suite to be submitted +# upstream. +ifeq ($(GARVERSION),3.1.3) +TEST_SCRIPTS = +endif +ifeq ($(GARVERSION),3.1.4) +TEST_SCRIPTS = +endif +ifeq ($(GARVERSION),3.1.5.2215) +TEST_SCRIPTS = +endif +ifeq ($(GARVERSION),3.1.6) +TEST_SCRIPTS = +endif + +INSTALL_SCRIPTS = $(WORKSRC)/Makefile custom + +WWWROOT = /opt/csw/share/www +WWWGANGLIA = $(WWWROOT)/ganglia +sysconfdir = /etc/opt/csw/ganglia +ETCGANGLIA = $(sysconfdir) + +PKGFILES_CSWganglia = +PKGFILES_CSWgangliart = $(libdir)/libganglia.* +PKGFILES_CSWgangliamodpython = .*python.* +PKGFILES_CSWgangliadevel = .*/include/.*.h .*/bin/ganglia-config +PKGFILES_CSWgangliagmetad = .*/gmetad.* /opt/csw/var/ganglia/rrds /etc/opt/csw/init.d/cswgmetad +PKGFILES_CSWgangliaweb = $(WWWGANGLIA)/.* /opt/csw/apache2/etc/extra/.* + +PRESERVECONF = /opt/csw/apache2/etc/extra/httpd-ganglia.conf.CSW +PRESERVECONF += /etc/opt/csw/ganglia/gmond.conf.CSW +PRESERVECONF += /etc/opt/csw/ganglia/gmetad.conf.CSW +PRESERVECONF += /etc/opt/csw/ganglia/conf.d/modgstatus.conf.CSW +PRESERVECONF += /etc/opt/csw/ganglia/conf.d/modpython.conf.CSW +PRESERVECONF += $(WWWGANGLIA)/conf.php + +# For gmond +INITSMF = /etc/opt/csw/init.d/cswgmond +# For gmetad +INITSMF += /etc/opt/csw/init.d/cswgmetad + +PROTOTYPE_FILTER_CSWgangliagmetad = awk '\ +$$$$3 ~ /\/opt\/csw\/var\/ganglia\/rrds/ { $$$$5 = "nobody"; $$$$6 = "nogroup" } \ +{ print }' + + +#ARCHALL_CSWgangliadevel = 1 +#ARCHALL_CSWgangliaweb = 1 + +include gar/category.mk + +install-custom: + @ginstall -D $(DOWNLOADDIR)/cswgmond \ + $(PKGROOT)/etc/opt/csw/init.d/cswgmond + @ginstall -D $(DOWNLOADDIR)/cswgmetad \ + $(PKGROOT)/etc/opt/csw/init.d/cswgmetad + @ginstall -d $(DESTDIR)$(WWWGANGLIA) + @cd $(WORKSRC)/web; \ + cp -R * $(DESTDIR)$(WWWGANGLIA) + @ginstall -D $(FILEDIR)/conf.php \ + $(DESTDIR)$(WWWGANGLIA)/conf.php.CSW + @rm -rf $(DESTDIR)$(WWWGANGLIA)/*.in + @ginstall -D $(FILEDIR)/httpd-ganglia.conf.CSW \ + $(DESTDIR)/opt/csw/apache2/etc/extra/httpd-ganglia.conf.CSW + @ginstall -d $(DESTDIR)$(ETCGANGLIA)/conf.d + @$(WORKSRC)/gmond/gmond -t | grep -v "^include" \ + > $(DESTDIR)$(ETCGANGLIA)/gmond.conf.CSW + @echo "include ('/etc/opt/csw/ganglia/conf.d/*.conf')" \ + >> $(DESTDIR)$(ETCGANGLIA)/gmond.conf.CSW +# @ginstall -D $(FILEDIR)/gmond.conf \ +# $(DESTDIR)$(ETCGANGLIA)/gmond.conf + @ginstall -D $(FILEDIR)/gmetad.conf \ + $(DESTDIR)$(ETCGANGLIA)/gmetad.conf.CSW + @cd $(WORKSRC)/gmond/modules/conf.d; \ + for CONF_FILE in *.conf ; \ + do cp -R "$${CONF_FILE}" $(DESTDIR)$(ETCGANGLIA)/conf.d/"$${CONF_FILE}.CSW" ; done + @rm -rf $(DESTDIR)$(ETCGANGLIA)/conf.d/example.conf.CSW \ + $(DESTDIR)$(ETCGANGLIA)/conf.d/multicpu.conf.CSW +ifeq ($(GARVERSION),3.1.2) + @rm -rf $(DESTDIR)$(ETCGANGLIA)/conf.d/modgstatus.conf.CSW +endif + @ginstall -d $(DESTDIR)/opt/csw/var/ganglia/rrds + + + Modified: csw/mgar/pkg/ganglia/branches/ganglia-3.1.6-rc/checksums =================================================================== --- csw/mgar/pkg/ganglia/branches/ganglia-3.1.4-rc/checksums 2009-10-26 14:51:49 UTC (rev 6977) +++ csw/mgar/pkg/ganglia/branches/ganglia-3.1.6-rc/checksums 2010-01-12 15:53:51 UTC (rev 7980) @@ -2,5 +2,5 @@ c4c333a46db391464e372ad8ede4993c download/CSWgangliaweb.preremove 25d302948e25837bf17757d5e23e4955 download/cswgmetad c6bb96c949dbb989d06ebb36b6af885d download/cswgmond -b040c8b8efe3fd3973e4b1e5f687133a download/ganglia-3.1.4.tar.gz +9d6af1b71352c78f04cd2202f06a9db6 download/ganglia-3.1.5.2215.tar.gz 2ff504ecb546aca2cdd6ee09af9a417e download/httpd-ganglia.conf.CSW This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From skayser at users.sourceforge.net Tue Jan 12 19:20:10 2010 From: skayser at users.sourceforge.net (skayser at users.sourceforge.net) Date: Tue, 12 Jan 2010 18:20:10 +0000 Subject: [csw-devel] SF.net SVN: gar:[7981] csw/mgar/pkg/dante/trunk/Makefile Message-ID: Revision: 7981 http://gar.svn.sourceforge.net/gar/?rev=7981&view=rev Author: skayser Date: 2010-01-12 18:20:07 +0000 (Tue, 12 Jan 2010) Log Message: ----------- dante: clarify libsocks description Modified Paths: -------------- csw/mgar/pkg/dante/trunk/Makefile Modified: csw/mgar/pkg/dante/trunk/Makefile =================================================================== --- csw/mgar/pkg/dante/trunk/Makefile 2010-01-12 15:53:51 UTC (rev 7980) +++ csw/mgar/pkg/dante/trunk/Makefile 2010-01-12 18:20:07 UTC (rev 7981) @@ -41,7 +41,7 @@ PACKAGES = CSWdante CSWlibsocks SPKG_DESC_CSWdante = Dante SOCKS (v4 and v5) proxy daemon -SPKG_DESC_CSWlibsocks = Dante SOCKS library (and socksify wrapper) +SPKG_DESC_CSWlibsocks = Dante SOCKS library (and socksify wrapper) to socksify applications PKGFILES_CSWdante = .*sockd.* /etc/opt/csw/init.d/cswdante PKGFILES_CSWdante += $(docdir)/dante/.* @@ -109,6 +109,7 @@ cp $(FILEDIR)/socks.conf.CSW $(DESTDIR)$(sysconfdir)/socks.conf # /bin/sh doesn't understand "if ! test", reported to dante-bugs at inet.no + # Should be fixed in the next release, so upon version bump, verify and drop gsed -i -e 's,/bin/sh,/usr/bin/bash,' $(DESTDIR)$(bindir)/socksify @$(MAKECOOKIE) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From skayser at users.sourceforge.net Tue Jan 12 19:22:46 2010 From: skayser at users.sourceforge.net (skayser at users.sourceforge.net) Date: Tue, 12 Jan 2010 18:22:46 +0000 Subject: [csw-devel] SF.net SVN: gar:[7982] csw/mgar/pkg/dante/trunk/files/changelog.CSW Message-ID: Revision: 7982 http://gar.svn.sourceforge.net/gar/?rev=7982&view=rev Author: skayser Date: 2010-01-12 18:22:46 +0000 (Tue, 12 Jan 2010) Log Message: ----------- dante: clarify libsocks description Modified Paths: -------------- csw/mgar/pkg/dante/trunk/files/changelog.CSW Modified: csw/mgar/pkg/dante/trunk/files/changelog.CSW =================================================================== --- csw/mgar/pkg/dante/trunk/files/changelog.CSW 2010-01-12 18:20:07 UTC (rev 7981) +++ csw/mgar/pkg/dante/trunk/files/changelog.CSW 2010-01-12 18:22:46 UTC (rev 7982) @@ -1,3 +1,9 @@ +dante (1.2.0,REV=2010.01.12) + + * Updated libsocks package description + + -- Sebastian Kayser Tue, 12 Jan 2010 19:21:47 +0100 + dante (1.2.0,REV=2010.01.10) * Adopted and updated to 1.2.0 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From harpchad at users.sourceforge.net Tue Jan 12 21:18:27 2010 From: harpchad at users.sourceforge.net (harpchad at users.sourceforge.net) Date: Tue, 12 Jan 2010 20:18:27 +0000 Subject: [csw-devel] SF.net SVN: gar:[7983] csw/mgar/pkg/pidgin/trunk Message-ID: Revision: 7983 http://gar.svn.sourceforge.net/gar/?rev=7983&view=rev Author: harpchad Date: 2010-01-12 20:18:26 +0000 (Tue, 12 Jan 2010) Log Message: ----------- Bump version to 2.6.5 Modified Paths: -------------- csw/mgar/pkg/pidgin/trunk/Makefile csw/mgar/pkg/pidgin/trunk/checksums Modified: csw/mgar/pkg/pidgin/trunk/Makefile =================================================================== --- csw/mgar/pkg/pidgin/trunk/Makefile 2010-01-12 18:22:46 UTC (rev 7982) +++ csw/mgar/pkg/pidgin/trunk/Makefile 2010-01-12 20:18:26 UTC (rev 7983) @@ -1,7 +1,7 @@ # $Id$ GARNAME = pidgin -GARVERSION = 2.6.4 +GARVERSION = 2.6.5 CATEGORIES = apps DESCRIPTION = Multi-protocol IM client Modified: csw/mgar/pkg/pidgin/trunk/checksums =================================================================== --- csw/mgar/pkg/pidgin/trunk/checksums 2010-01-12 18:22:46 UTC (rev 7982) +++ csw/mgar/pkg/pidgin/trunk/checksums 2010-01-12 20:18:26 UTC (rev 7983) @@ -1 +1 @@ -81acb7d7e4a5d21ba83b5b00cfb60ac5 download/pidgin-2.6.4.tar.gz +93306b1eff371fc28af580a2dc9679e6 download/pidgin-2.6.5.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Wed Jan 13 11:13:50 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Wed, 13 Jan 2010 10:13:50 +0000 Subject: [csw-devel] SF.net SVN: gar:[7984] csw/mgar/gar/v2/bin/checkpkg Message-ID: Revision: 7984 http://gar.svn.sourceforge.net/gar/?rev=7984&view=rev Author: wahwah Date: 2010-01-13 10:13:50 +0000 (Wed, 13 Jan 2010) Log Message: ----------- mGAR v2: checkpkg: added a check for the file name arch matching the actual package arch Modified Paths: -------------- csw/mgar/gar/v2/bin/checkpkg Modified: csw/mgar/gar/v2/bin/checkpkg =================================================================== --- csw/mgar/gar/v2/bin/checkpkg 2010-01-12 20:18:26 UTC (rev 7983) +++ csw/mgar/gar/v2/bin/checkpkg 2010-01-13 10:13:50 UTC (rev 7984) @@ -295,6 +295,17 @@ exit 1 esac +case $f in + *${pkgarch}*) + print "f: $f, pkgarch: $pkgarch" + ;; + *) + print "The file name is '$f'." + print "The pkgarch is '$pkgarch'." + errmsg "ERROR: package file name and pkgarch don't match." + ;; +esac + goodarch=yes case $f in *${LOCAL_ARCH}*) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Wed Jan 13 12:31:57 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Wed, 13 Jan 2010 11:31:57 +0000 Subject: [csw-devel] SF.net SVN: gar:[7985] csw/mgar/pkg Message-ID: Revision: 7985 http://gar.svn.sourceforge.net/gar/?rev=7985&view=rev Author: wahwah Date: 2010-01-13 11:31:57 +0000 (Wed, 13 Jan 2010) Log Message: ----------- hachoir-core: Initial commit Modified Paths: -------------- csw/mgar/pkg/hachoir-core/trunk/Makefile csw/mgar/pkg/hachoir-core/trunk/checksums Added Paths: ----------- csw/mgar/pkg/hachoir-core/ Modified: csw/mgar/pkg/hachoir-core/trunk/Makefile =================================================================== --- csw/mgar/pkg/template/trunk/Makefile 2010-01-13 10:13:50 UTC (rev 7984) +++ csw/mgar/pkg/hachoir-core/trunk/Makefile 2010-01-13 11:31:57 UTC (rev 7985) @@ -2,184 +2,21 @@ # Distributed under the terms of the GNU General Public License v2 # $Id$ -## This file contains comments to guide you through various GAR settings. -## Please remove unnecessary comments before committing your code to the code -## repository. The comments to remove are marked with double hashes. -## If you want to remove them all in-place, use: -## gsed -i -e '/^##/d' Makefile -## -## For more information about GAR variables, please see: -## https://sourceforge.net/apps/trac/gar/wiki/GAR%20Variable%20Reference -## -GARNAME = mypkg -GARVERSION = 1.0 -## -## The category that your software fits in. This is not a descriptive field, but -## influences the build process. Depending on the CATEGORIES setting, different -## Makefiles are included from gar/categories/ in your trunk directory, which -## adjust the build settings for the respective category. -## -## Possible settings are: -## apps, cpan, devel, gnome, java, kde, lang, lib, meta, net, python, server, -## utils, x11, xfce, xorg, xtra -CATEGORIES = lib -## -## A one-line description of the package, which will appear in the pkginfo. -DESCRIPTION = -## -## A longer description of the package. This is only for descriptive purposes -## inside the Makefile and is not used elsewhere. +GARNAME = hachoir-core +GARVERSION = 1.2.1 +CATEGORIES = python +DESCRIPTION = allows to view and edit a binary stream field by field (core) define BLURB - + Hachoir is a Python library that allows to view and edit a binary stream + field by field. In other words, Hachoir allows you to "browse" any binary + stream just like you browse directories and files. A file is split in a tree + of fields, where the smallest field is just one bit. endef -## -## Upstream URL that should show up in the VENDOR field as well as on -## http://opencsw.org/packages/. -SPKG_SOURCEURL = -## -## Whitespace-separated list of URLs to download the source package from. -## There are presets: $(SF_MIRRORS), $(GNU_MIRRORS) and $(GOOGLE_MIRROR). -MASTER_SITES = -## -## SF_PROJ is required if you set $(MASTER_SITES) to $(SF_MIRRORS) and the -## Sourceforge project name differs from $(GARNAME). Specifies the Sourceforge -## project name of the software you wish to download. -## SF_PROJ = -## -## A list of space separated patch filenames from files/ that are to be applied -## to the extracted software before the ./configure stage. Patches need to be -## included in the DISTFILES variable as well. -## PATCHFILES = -## -## Whitespace-separated list of files which comprise this build. mGAR will look -## for the files in the $(FILEDIR) (trunk/files) directory and on the -## $(MASTER_SITES). +SPKG_SOURCEURL = http://bitbucket.org/haypo/hachoir/wiki/Home +MASTER_SITES = http://cheeseshop.python.org/packages/source/h/$(GARNAME)/ DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz -## -## We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz -## -## Catalog name is the name to be used with pkg{-get,util} -i . -## It is different from the system package name, which by convention is CSWpkgname. -## CATALOGNAME = -## -## Set to 1 to mark the package as architecture-independent. -## ARCHALL = 0 -## -## A list of files / patterns that should be excluded from the package. Amends -## the default list of excluded filenames $(MERGE_EXCLUDE_DEFAULT), which -## contains things like libtool .la files and files with a leading ~. -## EXTRA_MERGE_EXCLUDE_FILES = -## -## A list of space separated package names that should be marked as -## incompatible with the current package. This will go into the depend file. -## When a user has one of the incompatible packages installed and installs -## your package, he will be prompted that the incompatible package must be -## removed. He will however not be prevented to install your package without -## removing the conflicting package first. -## INCOMPATIBLE_PKGS = -## -## The name of the license file that should be included in your package. Defaults -## to COPYING. See http://sourceforge.net/apps/trac/gar/wiki/CopyRightfor details -## on including and displaying licenses. -## LICENSE = -## -## A list of space separated package names that should be produced from your -## Makefile. This is used when a software has different components that can be -## packaged and used individually (think runtime libraries, client tools, server -## files, development headers). You don't need to set this when you just want to -## produce one package. -## -## When you set this variable to include more than one package, you also need to -## set PKGFILES_CSWpkgname for each package (except for the first one in your -## $(PACKAGES) list) to define which files go into each package. The first -## package from $(PACKAGES) one will hold all files that are not matched by -## PKGFILES_ for other packages. -## PACKAGES = -## -## If specified, GAR feeds the almost-final package prototype file to -## $(PROTOTYPE_FILTER) and reads the final package prototype file from it. -## $(PROTOTYPE_FILTER) is usually a sed/awk/perl one-liner, which was mostly used -## to prepare the prototype file for use with cswclassutils (see -## $(SPKG_CLASSES)). Now that there are convenience variables for cswclassutils, -## you will rarely have to use this. A still valid use case would be to change -## the file permissions of a file to be set-UID. -## See http://wiki.opencsw.org/cswclassutils-package for common usage information -## PROTOTYPE_FILTER = -## -## cswclassutils settings -## -## A list of action classes. Possible values are: -## none cswpreserveconf cswcpsampleconf cswpycompile cswusergroup cswinitsmf -## cswinetd cswetcservices -## The class 'cswinitsmf' must be the last class listed. When you use cswclassutils, -## you need to add CSWcswclassutils to REQUIRED_PKGS. -## SPKG_CLASSES = none -## Simplified settings for classes: -## PRESERVECONF = -## SAMPLECONF = -## INITSMF = -## USERGROUP = -## ETCSERVICES = -## INETDCONF = -## A list of runtime package dependencies in the form of CSWfoo. -## REQUIRED_PKGS = -## -## A list of packages necessary to build this package -## PREREQUISITE_PKGS = $(REQUIRED_PKGS) -## -## When using non-empty $(PACKAGES): -## REQUIRED_PKGS_CSWpkgname = -## SPKG_DESC_CSWpkgname = -## PKGFILES_CSWpkgname = -## CATALOGNAME_CSWpkgname = -## -## A list of space separated directories where objects should be stripped in -## addition to the bin/ and sbin/ directories. -## STRIP_DIRS = -## -## Define a custom target for the configure phase. When you set this, the target -## that will be used instead of configure: target, is named -## configure-$(CONFIGURE_SCRIPTS) and you will need to define it in your Makefile -## after including gar/gar.include.mk. If you want to skip the configure phase -## completely (for example when your software doesn't need to be compiled) assign -## this variable an empty value. The procedure works for configure, build, -## install and test steps. -## CONFIGURE_SCRIPTS = -## BUILD_SCRIPTS = -## INSTALL_SCRIPTS = -## TEST_SCRIPTS = -## -## Compilation settings -## -## The build directory. -## WORKSRC = $(WORKDIR)/$(GARNAME)-$(GARVERSION) -## -## BUILD_ARGS is passed as an argument to gmake during the build phase. Use this -## for example, if you need to override Makefile variables. -## BUILD_ARGS = -## -## Arguments passed to the ./configure script. -CONFIGURE_ARGS = $(DIRPATHS) -## -## BUILD64 = -## CONFIGURE_ENV = -## EXTRA_CFLAGS = -## EXTRA_LDFLAGS = -## EXTRA_INC = -## EXTRA_LIB = -## GARFLAVOR = -## INSTALL_ARGS = -## OPT_FLAGS_SOS = -xO3 -## OPT_FLAGS_GCC = -O2 -pipe -## -## The compiler to use. Defaults to SOS11, can be also: SOS12, GCC3, GCC4. -## GARCOMPILER = SOS11 -## -# Remove the following rules and uncomment the -# include before building. -all: .DEFAULT -.DEFAULT: - @true - -#include gar/category.mk +CATALOGNAME = hachoir_core +ARCHALL = 1 +TEST_SCRIPTS = +include gar/category.mk Modified: csw/mgar/pkg/hachoir-core/trunk/checksums =================================================================== --- csw/mgar/pkg/template/trunk/checksums 2010-01-13 10:13:50 UTC (rev 7984) +++ csw/mgar/pkg/hachoir-core/trunk/checksums 2010-01-13 11:31:57 UTC (rev 7985) @@ -0,0 +1 @@ +d7227f9d1bcf62f2a5c8f3e6da4f2aee hachoir-core-1.2.1.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Wed Jan 13 15:42:48 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 13 Jan 2010 14:42:48 +0000 Subject: [csw-devel] SF.net SVN: gar:[7986] csw/mgar/pkg/neon/trunk Message-ID: Revision: 7986 http://gar.svn.sourceforge.net/gar/?rev=7986&view=rev Author: dmichelsen Date: 2010-01-13 14:42:48 +0000 (Wed, 13 Jan 2010) Log Message: ----------- libneon: Update to 0.29.3 Modified Paths: -------------- csw/mgar/pkg/neon/trunk/Makefile csw/mgar/pkg/neon/trunk/checksums Modified: csw/mgar/pkg/neon/trunk/Makefile =================================================================== --- csw/mgar/pkg/neon/trunk/Makefile 2010-01-13 11:31:57 UTC (rev 7985) +++ csw/mgar/pkg/neon/trunk/Makefile 2010-01-13 14:42:48 UTC (rev 7986) @@ -1,9 +1,9 @@ GARNAME = neon -GARVERSION = 0.29.2 +GARVERSION = 0.29.3 CATEGORIES = lib EXTRA_MODULATORS = GARVERSION -MODULATIONS_GARVERSION = 0.26.4 0.29.2 +MODULATIONS_GARVERSION = 0.26.4 0.29.3 DESCRIPTION = Neon HTTP and WebDAV client library define BLURB @@ -51,9 +51,9 @@ MERGE_SCRIPTS_isa-default64-garversion-0.26.4 = copy-relocated-only MERGE_DIRS_isa-default64-garversion-0.26.4 = $(libdir) -MERGE_SCRIPTS_isa-default-garversion-0.29.2 = copy-all -MERGE_SCRIPTS_isa-default64-garversion-0.29.2 = copy-relocated-only -MERGE_DIRS_isa-default64-garversion-0.29.2 = $(bindir) $(sbindir) $(libexecdir) $(libdir) +MERGE_SCRIPTS_isa-default-garversion-0.29.3 = copy-all +MERGE_SCRIPTS_isa-default64-garversion-0.29.3 = copy-relocated-only +MERGE_DIRS_isa-default64-garversion-0.29.3 = $(bindir) $(sbindir) $(libexecdir) $(libdir) PKGFILES_CSWneon-devel = $(PKGFILES_DEVEL) PKGFILES_CSWneon-devel += $(docdir)/.* Modified: csw/mgar/pkg/neon/trunk/checksums =================================================================== --- csw/mgar/pkg/neon/trunk/checksums 2010-01-13 11:31:57 UTC (rev 7985) +++ csw/mgar/pkg/neon/trunk/checksums 2010-01-13 14:42:48 UTC (rev 7986) @@ -1,3 +1,3 @@ 4ef5552e8930ef82b1f56c2712f8ed1e COPYING 2d11fff51ffa856fc6b5d4bd801d6cc4 neon-0.26.4.tar.gz -bf475710d1116cece210e8b1ae708d69 neon-0.29.2.tar.gz +ba1015b59c112d44d7797b62fe7bee51 neon-0.29.3.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Wed Jan 13 16:08:11 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 13 Jan 2010 15:08:11 +0000 Subject: [csw-devel] SF.net SVN: gar:[7987] csw/mgar/pkg/mpg123/trunk/Makefile Message-ID: Revision: 7987 http://gar.svn.sourceforge.net/gar/?rev=7987&view=rev Author: dmichelsen Date: 2010-01-13 15:08:11 +0000 (Wed, 13 Jan 2010) Log Message: ----------- mpg123: Include libtool .la-files in plugin dir Modified Paths: -------------- csw/mgar/pkg/mpg123/trunk/Makefile Modified: csw/mgar/pkg/mpg123/trunk/Makefile =================================================================== --- csw/mgar/pkg/mpg123/trunk/Makefile 2010-01-13 14:42:48 UTC (rev 7986) +++ csw/mgar/pkg/mpg123/trunk/Makefile 2010-01-13 15:08:11 UTC (rev 7987) @@ -31,6 +31,11 @@ TEST_TARGET = check +# Looks like we do need libtool files for plugins: +# http://www.opencsw.org/mantis/view.php?id=4145 +# Skip for libmpg123, though. +MERGE_EXCLUDE_LIBTOOL = $(libdir)/[^/]*\.la + MERGE_DIRS_isa-extra = $(libdir) include gar/category.mk This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Wed Jan 13 16:34:55 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 13 Jan 2010 15:34:55 +0000 Subject: [csw-devel] SF.net SVN: gar:[7988] csw/mgar/pkg/cpan/BerkeleyDB/trunk Message-ID: Revision: 7988 http://gar.svn.sourceforge.net/gar/?rev=7988&view=rev Author: dmichelsen Date: 2010-01-13 15:34:55 +0000 (Wed, 13 Jan 2010) Log Message: ----------- cpan/BerkeleyDB: Update to 0.41 and move dependency to CSWbdb47 Modified Paths: -------------- csw/mgar/pkg/cpan/BerkeleyDB/trunk/Makefile csw/mgar/pkg/cpan/BerkeleyDB/trunk/checksums csw/mgar/pkg/cpan/BerkeleyDB/trunk/files/CSWpmberkeleydb.config.in.diff Modified: csw/mgar/pkg/cpan/BerkeleyDB/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/BerkeleyDB/trunk/Makefile 2010-01-13 15:08:11 UTC (rev 7987) +++ csw/mgar/pkg/cpan/BerkeleyDB/trunk/Makefile 2010-01-13 15:34:55 UTC (rev 7988) @@ -1,5 +1,5 @@ GARNAME = BerkeleyDB -GARVERSION = 0.39 +GARVERSION = 0.41 CATEGORIES = cpan AUTHOR = PMQS @@ -11,10 +11,11 @@ PACKAGES = CSWpmberkeleydb CATALOGNAME = pm_berkeleydb -DISTFILES += CSWpmberkeleydb.config.in.diff - PATCHFILES = CSWpmberkeleydb.config.in.diff -REQUIRED_PKGS += CSWbdb +NOISALIST = 1 +EXTRA_LIB = /opt/csw/bdb47/lib +REQUIRED_PKGS = CSWbdb47 + include gar/category.mk Modified: csw/mgar/pkg/cpan/BerkeleyDB/trunk/checksums =================================================================== --- csw/mgar/pkg/cpan/BerkeleyDB/trunk/checksums 2010-01-13 15:08:11 UTC (rev 7987) +++ csw/mgar/pkg/cpan/BerkeleyDB/trunk/checksums 2010-01-13 15:34:55 UTC (rev 7988) @@ -1,2 +1,2 @@ -da4cff937216a147162a6df76cae8096 download/BerkeleyDB-0.39.tar.gz -bd611cd1c09f11bde779fc0b3e5adf97 download/CSWpmberkeleydb.config.in.diff +5941c90783a55ca4280c2963bbe1ac83 BerkeleyDB-0.41.tar.gz +2061f2f285714a1b6a014c5254e69b92 CSWpmberkeleydb.config.in.diff Modified: csw/mgar/pkg/cpan/BerkeleyDB/trunk/files/CSWpmberkeleydb.config.in.diff =================================================================== --- csw/mgar/pkg/cpan/BerkeleyDB/trunk/files/CSWpmberkeleydb.config.in.diff 2010-01-13 15:08:11 UTC (rev 7987) +++ csw/mgar/pkg/cpan/BerkeleyDB/trunk/files/CSWpmberkeleydb.config.in.diff 2010-01-13 15:34:55 UTC (rev 7988) @@ -6,7 +6,7 @@ #INCLUDE = /usr/local/include #INCLUDE = ../.. -INCLUDE = /usr/local/BerkeleyDB/include -+INCLUDE = /opt/csw/include ++INCLUDE = /opt/csw/bdb47/include # 2. Where is libdb? # @@ -15,7 +15,7 @@ #LIB = /usr/local/lib #LIB = ../.. -LIB = /usr/local/BerkeleyDB/lib -+LIB = /opt/csw/lib ++LIB = /opt/csw/bdb47/lib # 3. Is the library called libdb? # This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Wed Jan 13 17:13:54 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 13 Jan 2010 16:13:54 +0000 Subject: [csw-devel] SF.net SVN: gar:[7989] csw/mgar/gar/v2/gar.mk Message-ID: Revision: 7989 http://gar.svn.sourceforge.net/gar/?rev=7989&view=rev Author: dmichelsen Date: 2010-01-13 16:13:54 +0000 (Wed, 13 Jan 2010) Log Message: ----------- mGAR v2: Make sure default merge rules work also when only one ISA is requested Modified Paths: -------------- csw/mgar/gar/v2/gar.mk Modified: csw/mgar/gar/v2/gar.mk =================================================================== --- csw/mgar/gar/v2/gar.mk 2010-01-13 15:34:55 UTC (rev 7988) +++ csw/mgar/gar/v2/gar.mk 2010-01-13 16:13:54 UTC (rev 7989) @@ -594,7 +594,9 @@ endif ifeq ($(NEEDED_ISAS),$(ISA_DEFAULT)) -MERGE_SCRIPTS_isa-$(ISA_DEFAULT) ?= copy-all $(EXTRA_MERGE_SCRIPTS_$(ISA_DEFAULT)) $(EXTRA_MERGE_SCRIPTS) +MERGE_SCRIPTS_isa-default ?= copy-all $(EXTRA_MERGE_SCRIPTS_$(ISA_DEFAULT)) $(EXTRA_MERGE_SCRIPTS) +MERGE_SCRIPTS_isa-$(ISA_DEFAULT) ?= $(MERGE_SCRIPTS_isa-default) +MERGE_SCRIPTS_$(MODULATION) ?= $(MERGE_SCRIPTS_$(MODULATION_ISACOLLAPSED)) else ISAEXEC_DIRS ?= $(if $(NO_ISAEXEC),,$(bindir) $(sbindir) $(libexecdir)) MERGE_DIRS_isa-default ?= $(EXTRA_MERGE_DIRS) $(EXTRA_MERGE_DIRS_isa-$(ISA_DEFAULT)) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Wed Jan 13 17:15:59 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 13 Jan 2010 16:15:59 +0000 Subject: [csw-devel] SF.net SVN: gar:[7990] csw/mgar/pkg/mtr/trunk/Makefile Message-ID: Revision: 7990 http://gar.svn.sourceforge.net/gar/?rev=7990&view=rev Author: dmichelsen Date: 2010-01-13 16:15:59 +0000 (Wed, 13 Jan 2010) Log Message: ----------- mtr: Use collapsed merge rule Modified Paths: -------------- csw/mgar/pkg/mtr/trunk/Makefile Modified: csw/mgar/pkg/mtr/trunk/Makefile =================================================================== --- csw/mgar/pkg/mtr/trunk/Makefile 2010-01-13 16:13:54 UTC (rev 7989) +++ csw/mgar/pkg/mtr/trunk/Makefile 2010-01-13 16:15:59 UTC (rev 7990) @@ -78,16 +78,9 @@ EXTRA_SOS_LD_FLAGS = -L$(abspath $(prefix)/X11/lib/$(MM_LIBDIR)) endif -# These two should work instead of the four ones below, but they don't. -# license is the only file that ends up in pkgroot/. -#MERGE_SCRIPTS_isa-default-gui-enable = copy-all -#MERGE_SCRIPTS_isa-default-gui-disable = copy-all +MERGE_SCRIPTS_isa-default-gui-enable = copy-all +MERGE_SCRIPTS_isa-default-gui-disable = copy-all -MERGE_SCRIPTS_isa-i386-gui-enable = copy-all -MERGE_SCRIPTS_isa-sparcv8-gui-enable = copy-all -MERGE_SCRIPTS_isa-i386-gui-disable = copy-all -MERGE_SCRIPTS_isa-sparcv8-gui-disable = copy-all - # Make mtr setuid so that it can access raw sockets PROTOTYPE_MODIFIERS = makesuid PROTOTYPE_FILES_makesuid = $(sbindir)/x?mtr This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bonivart at users.sourceforge.net Wed Jan 13 19:21:10 2010 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Wed, 13 Jan 2010 18:21:10 +0000 Subject: [csw-devel] SF.net SVN: gar:[7991] csw/mgar/pkg Message-ID: Revision: 7991 http://gar.svn.sourceforge.net/gar/?rev=7991&view=rev Author: bonivart Date: 2010-01-13 18:21:10 +0000 (Wed, 13 Jan 2010) Log Message: ----------- dnstop: initial commit Added Paths: ----------- csw/mgar/pkg/dnstop/ csw/mgar/pkg/dnstop/branches/ csw/mgar/pkg/dnstop/tags/ csw/mgar/pkg/dnstop/trunk/ csw/mgar/pkg/dnstop/trunk/Makefile csw/mgar/pkg/dnstop/trunk/checksums csw/mgar/pkg/dnstop/trunk/files/ csw/mgar/pkg/dnstop/trunk/files/Makefile.p Property changes on: csw/mgar/pkg/dnstop/trunk ___________________________________________________________________ Added: svn:ignore + cookies download work Added: svn:externals + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 Added: csw/mgar/pkg/dnstop/trunk/Makefile =================================================================== --- csw/mgar/pkg/dnstop/trunk/Makefile (rev 0) +++ csw/mgar/pkg/dnstop/trunk/Makefile 2010-01-13 18:21:10 UTC (rev 7991) @@ -0,0 +1,40 @@ +GARNAME = dnstop +GARVERSION = 20090128 +CATEGORIES = net + +DESCRIPTION = Displays various tables of DNS traffic +define BLURB + Displays various tables of DNS traffic +endef + +MASTER_SITES = http://dns.measurement-factory.com/tools/dnstop/src/ +DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz + +LICENSE = LICENSE + +REQUIRED_PKGS = CSWlibpcap + +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + +TEST_SCRIPTS = +INSTALL_SCRIPTS = custom + +CONFIGURE_ARGS = $(DIRPATHS) + +include gar/category.mk + +pre-build-modulated: + @echo " ==> Pre-build $(GARNAME) (custom)" + @( cd $(WORKSRC) ; \ + gpatch < ../../../../$(FILEDIR)/Makefile.p ) + @$(MAKECOOKIE) + +install-custom: + @echo " ==> Installing $(GARNAME) (custom)" + @ginstall -m 755 -d $(DESTDIR)$(bindir) + @ginstall -m 755 $(WORKSRC)/dnstop $(DESTDIR)$(bindir) + @ginstall -m 755 -d $(DESTDIR)$(mandir)/man8 + @ginstall -m 444 $(WORKSRC)/dnstop.8 $(DESTDIR)$(mandir)/man8 + @ginstall -m 755 -d $(DESTDIR)$(docdir)/$(GARNAME) + @ginstall -m 444 $(WORKSRC)/CHANGES $(DESTDIR)$(docdir)/$(GARNAME) + @$(MAKECOOKIE) Added: csw/mgar/pkg/dnstop/trunk/checksums =================================================================== --- csw/mgar/pkg/dnstop/trunk/checksums (rev 0) +++ csw/mgar/pkg/dnstop/trunk/checksums 2010-01-13 18:21:10 UTC (rev 7991) @@ -0,0 +1,2 @@ +c3b095c7ed3f2d43624d3278a697d89d Makefile.p +827a0d2020b157b925411dd30b6feff3 dnstop-20090128.tar.gz Added: csw/mgar/pkg/dnstop/trunk/files/Makefile.p =================================================================== --- csw/mgar/pkg/dnstop/trunk/files/Makefile.p (rev 0) +++ csw/mgar/pkg/dnstop/trunk/files/Makefile.p 2010-01-13 18:21:10 UTC (rev 7991) @@ -0,0 +1,12 @@ +--- Makefile 2010-01-13 17:55:54.574796795 +0100 ++++ Makefile 2010-01-13 18:00:42.582082173 +0100 +@@ -2,7 +2,7 @@ + + CC=/opt/studio/SOS11/SUNWspro/bin/cc +-CFLAGS=-xO3 -xarch=386 +-LIBS=-lresolv -lnsl -lsocket -lcurses ++CFLAGS=-xO3 -xarch=386 -I/opt/csw/include ++LIBS=-lresolv -lnsl -lsocket -lcurses -lpcap + OPTFLAGS= -DUSE_IPV6=1 + + prefix=/opt/csw This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bonivart at users.sourceforge.net Wed Jan 13 19:47:33 2010 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Wed, 13 Jan 2010 18:47:33 +0000 Subject: [csw-devel] SF.net SVN: gar:[7992] csw/mgar/pkg/dnstop/trunk Message-ID: Revision: 7992 http://gar.svn.sourceforge.net/gar/?rev=7992&view=rev Author: bonivart Date: 2010-01-13 18:47:33 +0000 (Wed, 13 Jan 2010) Log Message: ----------- dnstop: fix arch patch issues Modified Paths: -------------- csw/mgar/pkg/dnstop/trunk/Makefile Added Paths: ----------- csw/mgar/pkg/dnstop/trunk/files/Makefile.i386.p csw/mgar/pkg/dnstop/trunk/files/Makefile.sparc.p Removed Paths: ------------- csw/mgar/pkg/dnstop/trunk/files/Makefile.p Modified: csw/mgar/pkg/dnstop/trunk/Makefile =================================================================== --- csw/mgar/pkg/dnstop/trunk/Makefile 2010-01-13 18:21:10 UTC (rev 7991) +++ csw/mgar/pkg/dnstop/trunk/Makefile 2010-01-13 18:47:33 UTC (rev 7992) @@ -23,10 +23,16 @@ include gar/category.mk +ifeq ($(shell uname -p), sparc) + PATCHFILE = Makefile.sparc.p +else + PATCHFILE = Makefile.i386.p +endif + pre-build-modulated: @echo " ==> Pre-build $(GARNAME) (custom)" @( cd $(WORKSRC) ; \ - gpatch < ../../../../$(FILEDIR)/Makefile.p ) + gpatch < ../../../../$(FILEDIR)/$(PATCHFILE) ) @$(MAKECOOKIE) install-custom: Added: csw/mgar/pkg/dnstop/trunk/files/Makefile.i386.p =================================================================== --- csw/mgar/pkg/dnstop/trunk/files/Makefile.i386.p (rev 0) +++ csw/mgar/pkg/dnstop/trunk/files/Makefile.i386.p 2010-01-13 18:47:33 UTC (rev 7992) @@ -0,0 +1,13 @@ +--- Makefile 2010-01-13 17:55:54.574796795 +0100 ++++ Makefile 2010-01-13 18:00:42.582082173 +0100 +@@ -2,8 +2,8 @@ + DATE != date +%Y%m%d + + CC=/opt/studio/SOS11/SUNWspro/bin/cc +-CFLAGS=-xO3 -xarch=386 +-LIBS=-lresolv -lnsl -lsocket -lcurses ++CFLAGS=-xO3 -xarch=386 -I/opt/csw/include ++LIBS=-lresolv -lnsl -lsocket -lcurses -lpcap + OPTFLAGS= -DUSE_IPV6=1 + + prefix=/opt/csw Deleted: csw/mgar/pkg/dnstop/trunk/files/Makefile.p =================================================================== --- csw/mgar/pkg/dnstop/trunk/files/Makefile.p 2010-01-13 18:21:10 UTC (rev 7991) +++ csw/mgar/pkg/dnstop/trunk/files/Makefile.p 2010-01-13 18:47:33 UTC (rev 7992) @@ -1,12 +0,0 @@ ---- Makefile 2010-01-13 17:55:54.574796795 +0100 -+++ Makefile 2010-01-13 18:00:42.582082173 +0100 -@@ -2,7 +2,7 @@ - - CC=/opt/studio/SOS11/SUNWspro/bin/cc --CFLAGS=-xO3 -xarch=386 --LIBS=-lresolv -lnsl -lsocket -lcurses -+CFLAGS=-xO3 -xarch=386 -I/opt/csw/include -+LIBS=-lresolv -lnsl -lsocket -lcurses -lpcap - OPTFLAGS= -DUSE_IPV6=1 - - prefix=/opt/csw Added: csw/mgar/pkg/dnstop/trunk/files/Makefile.sparc.p =================================================================== --- csw/mgar/pkg/dnstop/trunk/files/Makefile.sparc.p (rev 0) +++ csw/mgar/pkg/dnstop/trunk/files/Makefile.sparc.p 2010-01-13 18:47:33 UTC (rev 7992) @@ -0,0 +1,13 @@ +--- Makefile 2010-01-13 19:25:50.435317055 +0100 ++++ Makefile 2010-01-13 19:24:07.075661494 +0100 +@@ -2,9 +2,9 @@ + DATE != date +%Y%m%d + + CC=/opt/studio/SOS11/SUNWspro/bin/cc +-CFLAGS=-xO3 -xarch=v8 +-LIBS=-lresolv -lnsl -lsocket -lcurses ++CFLAGS=-xO3 -xarch=v8 -I/opt/csw/include ++LIBS=-lresolv -lnsl -lsocket -lcurses -lpcap + OPTFLAGS= -DUSE_IPV6=1 + + prefix=/opt/csw This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Wed Jan 13 21:07:02 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Wed, 13 Jan 2010 20:07:02 +0000 Subject: [csw-devel] SF.net SVN: gar:[7993] csw/mgar/pkg Message-ID: Revision: 7993 http://gar.svn.sourceforge.net/gar/?rev=7993&view=rev Author: wahwah Date: 2010-01-13 20:06:59 +0000 (Wed, 13 Jan 2010) Log Message: ----------- hachore-parser: Initial commit Modified Paths: -------------- csw/mgar/pkg/hachoir-parser/trunk/Makefile csw/mgar/pkg/hachoir-parser/trunk/checksums Added Paths: ----------- csw/mgar/pkg/hachoir-parser/ Modified: csw/mgar/pkg/hachoir-parser/trunk/Makefile =================================================================== --- csw/mgar/pkg/hachoir-core/trunk/Makefile 2010-01-13 11:31:57 UTC (rev 7985) +++ csw/mgar/pkg/hachoir-parser/trunk/Makefile 2010-01-13 20:06:59 UTC (rev 7993) @@ -2,7 +2,7 @@ # Distributed under the terms of the GNU General Public License v2 # $Id$ -GARNAME = hachoir-core +GARNAME = hachoir-parser GARVERSION = 1.2.1 CATEGORIES = python DESCRIPTION = allows to view and edit a binary stream field by field (core) @@ -16,7 +16,7 @@ MASTER_SITES = http://cheeseshop.python.org/packages/source/h/$(GARNAME)/ DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz -CATALOGNAME = hachoir_core +CATALOGNAME = hachoir_parser ARCHALL = 1 TEST_SCRIPTS = include gar/category.mk Modified: csw/mgar/pkg/hachoir-parser/trunk/checksums =================================================================== --- csw/mgar/pkg/hachoir-core/trunk/checksums 2010-01-13 11:31:57 UTC (rev 7985) +++ csw/mgar/pkg/hachoir-parser/trunk/checksums 2010-01-13 20:06:59 UTC (rev 7993) @@ -1 +1 @@ -d7227f9d1bcf62f2a5c8f3e6da4f2aee hachoir-core-1.2.1.tar.gz +8308920290165f73955043ea21666264 hachoir-parser-1.2.1.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Wed Jan 13 21:40:56 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Wed, 13 Jan 2010 20:40:56 +0000 Subject: [csw-devel] SF.net SVN: gar:[7994] csw/mgar/pkg/hachoir-parser/trunk/Makefile Message-ID: Revision: 7994 http://gar.svn.sourceforge.net/gar/?rev=7994&view=rev Author: wahwah Date: 2010-01-13 20:40:54 +0000 (Wed, 13 Jan 2010) Log Message: ----------- hachoir-parser: Adding hachoir-core as a dependency Modified Paths: -------------- csw/mgar/pkg/hachoir-parser/trunk/Makefile Modified: csw/mgar/pkg/hachoir-parser/trunk/Makefile =================================================================== --- csw/mgar/pkg/hachoir-parser/trunk/Makefile 2010-01-13 20:06:59 UTC (rev 7993) +++ csw/mgar/pkg/hachoir-parser/trunk/Makefile 2010-01-13 20:40:54 UTC (rev 7994) @@ -18,5 +18,6 @@ UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz CATALOGNAME = hachoir_parser ARCHALL = 1 +REQUIRED_PKGS = CSWhachoir-core TEST_SCRIPTS = include gar/category.mk This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From skayser at users.sourceforge.net Thu Jan 14 01:00:53 2010 From: skayser at users.sourceforge.net (skayser at users.sourceforge.net) Date: Thu, 14 Jan 2010 00:00:53 +0000 Subject: [csw-devel] SF.net SVN: gar:[7995] csw/mgar/pkg/postfix/branches/postfix-2.6 Message-ID: Revision: 7995 http://gar.svn.sourceforge.net/gar/?rev=7995&view=rev Author: skayser Date: 2010-01-14 00:00:53 +0000 (Thu, 14 Jan 2010) Log Message: ----------- postfix: on the way towards a 2.6.x package Modified Paths: -------------- csw/mgar/pkg/postfix/branches/postfix-2.6/Makefile csw/mgar/pkg/postfix/branches/postfix-2.6/files/upgrade Added Paths: ----------- csw/mgar/pkg/postfix/branches/postfix-2.6/files/CSWpostfix.checkinstall csw/mgar/pkg/postfix/branches/postfix-2.6/files/changelog.CSW csw/mgar/pkg/postfix/branches/postfix-2.6/files/cswusergroup Removed Paths: ------------- csw/mgar/pkg/postfix/branches/postfix-2.6/files/CSWpostfix.cswusergroup csw/mgar/pkg/postfix/branches/postfix-2.6/files/CSWpostfix.depends csw/mgar/pkg/postfix/branches/postfix-2.6/files/CSWpostfix.gspec csw/mgar/pkg/postfix/branches/postfix-2.6/files/CSWpostfix.postinstall csw/mgar/pkg/postfix/branches/postfix-2.6/files/CSWpostfix.postremove csw/mgar/pkg/postfix/branches/postfix-2.6/files/cswpostfix.xml csw/mgar/pkg/postfix/branches/postfix-2.6/files/fix_main.cf.sed Modified: csw/mgar/pkg/postfix/branches/postfix-2.6/Makefile =================================================================== --- csw/mgar/pkg/postfix/branches/postfix-2.6/Makefile 2010-01-13 20:40:54 UTC (rev 7994) +++ csw/mgar/pkg/postfix/branches/postfix-2.6/Makefile 2010-01-14 00:00:53 UTC (rev 7995) @@ -1,27 +1,19 @@ -# Status -# - Build with all activated features completes, packaging completes -# - Beware: uses a modified GARv2 for USERGROUP= -# http://lists.opencsw.org/pipermail/maintainers/2009-July/003143.html -# - Fixed bugs: -# #3580 Not sun4m compatible -# $(CFLAGS) are now incorporated into $(CCARGS) -# #3063 /opt/csw/libexec/postfix not stripped, takes ~30MB -# $(STRIP_DIRS) added to build description -# #3017 Please depend against CSWpcrert instead of CSWpcre -# #2843 No cyrus-sasl support -# Added cyrus SASL support, link postfix against the same -# bdb version that CSWsasl uses. -# - Moved queue and data dirs to /var/opt/csw (see DDEFs) as per standard -# - Integrated CSWcswclassutils for user/group creation, configuration -# file handling, and SMF / init script support -# -# TODO -# - Check remaining open bugs -# - Check sed main.cf script functionality -# - Check update script functionality, add handling for spool location change -# - Do we need to take care of file ownerships? -# - Does the currently available package preserve configuration files on +# TODO (release-critical prefixed with !, non release-critical with *) +# ! Obsolete postinstall scripts: +# #3060 http://www.opencsw.org/bugtrack/view.php?id=3060 +# #2964 http://www.opencsw.org/bugtrack/view.php?id=2964 +# #1943 http://www.opencsw.org/bugtrack/view.php?id=1943 +# ! Handle spool location change (bail out and force user interaction?) +# ! Handle system integration (refer to README.CSW or alike), see +# http://article.gmane.org/gmane.os.solaris.opencsw.maintainers/5313 +# ! Does the currently available package preserve configuration files on # removal? +# ! Update to most recent postfix version (2.6.5 as of 13th Jan 2010) +# ! Verify CONFIG_FILES list (can this be generated on the fly?) +# ! Ship simple default configuration +# ! Build, install and test package (works? spool permissions ok?) +# WRT to permissions, run "postfix set-permissions" and compare +# GARNAME = postfix GARVERSION = 2.6.2 CATEGORIES = server @@ -37,34 +29,63 @@ completely different. endef +VENDOR_URL = http://www.postfix.org MASTER_SITES = ftp://ftp.porcupine.org/mirrors/postfix-release/official/ -DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz +DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz -SPKG_SOURCEURL = http://www.postfix.org -# Conflicting files (bin/mailq and bin/sendmail) in sendmail -INCOMPATIBLE_PKGS = CSWsendmail +DISTFILES += CSWpostfix.checkinstall -DISTFILES += CSWpostfix.cswusergroup -DISTFILES += CSWpostfix.postinstall -DISTFILES += CSWpostfix.postremove +# Tag configuration files for handling via cswclassutils +CONFIG_BASE = /etc/opt/csw/postfix/ +CONFIG_FILES = access +CONFIG_FILES += aliases +CONFIG_FILES += canonical +CONFIG_FILES += generic +CONFIG_FILES += header_checks +CONFIG_FILES += main.cf +CONFIG_FILES += master.cf +CONFIG_FILES += relocated +CONFIG_FILES += transport +CONFIG_FILES += virtual +SAMPLECONF = $(addprefix $(CONFIG_BASE), $(CONFIG_FILES)) -# Tag files for cswclassutils -CONFIG_BASE = /etc/opt/csw/postfix/ -CONFIG_FILES = access aliases canonical generic header_checks -CONFIG_FILES += main.cf master.cf relocated transport virtual - -SAMPLECONF = $(addprefix $(CONFIG_BASE), $(CONFIG_FILES)) INITSMF = /etc/opt/csw/init.d/cswpostfix USERGROUP = $(sysconfdir)/pkg/CSWpostfix/cswusergroup +# Make postdrop setgid so that it can deliver to $(DEF_QUEUE_DIR)/maildrop +PROTOTYPE_MODIFIERS = makesgid +PROTOTYPE_FILES_makesgid = $(sbindir)/postdrop +PROTOTYPE_PERMS_makesgid = 2755 + +# Make $(DEF_QUEUE_DIR) subdirs accessible/writable to postfix only +PROTOTYPE_MODIFIERS += spooldir +PROTOTYPE_FILES_spooldir = $(DEF_QUEUE_DIR)/* +PROTOTYPE_USER_spooldir = postfix +PROTOTYPE_PERMS_spooldir = 0700 +PROTOTYPE_CLASS_spooldir = ugfiles + +# Make $(DEF_QUEUE_DIR)/maildrop accessible by postdrop group +PROTOTYPE_MODIFIERS += maildrop +PROTOTYPE_FILES_maildrop = $(DEF_QUEUE_DIR)/maildrop +PROTOTYPE_GROUP_maildrop = postdrop +PROTOTYPE_PERMS_maildrop = 0730 +PROTOTYPE_CLASS_maildrop = ugfiles + +# IMPORTANT! Make $(DEF_QUEUE_DIR)/pid accessible by root only +# http://www.openwall.com/lists/oss-security/2009/09/18/6 +PROTOTYPE_MODIFIERS += pid +PROTOTYPE_FILES_pid = $(DEF_QUEUE_DIR)/pid +PROTOTYPE_USER_pid = root +PROTOTYPE_GROUP_pid = bin +PROTOTYPE_PERMS_pid = 0755 +PROTOTYPE_CLASS_pid = ugfiles + EXTRA_MERGE_EXCLUDE_FILES = /etc/opt/csw/postfix/LICENSE -EXTRA_MERGE_EXCLUDE_FILES += /etc/opt/csw/postfix/TLS_LICENSE EXTRA_MERGE_EXCLUDE_FILES += /etc/opt/csw/postfix/makedefs.out STRIP_DIRS = $(DESTDIR)$(libexecdir)/postfix - CONFIGURE_SCRIPTS = custom TEST_SCRIPTS = INSTALL_SCRIPTS = custom @@ -188,20 +209,9 @@ readme_directory=$(DEF_README_DIR) \ html_directory=$(DEF_HTML_DIR) - # XXX: Needs to be checked/revised for current version - sed -f $(FILEDIR)/fix_main.cf.sed $(DESTDIR)/etc/opt/csw/postfix/main.cf > $(WORKDIR)/main.cf - cp $(WORKDIR)/main.cf $(DESTDIR)/etc/opt/csw/postfix/main.cf - - # Script to handle the sysconfdir location change /opt -> /etc - # XXX: Needs to be checked and amended with /opt -> /var changes - ginstall -D -m 755 $(FILEDIR)/upgrade \ - $(DESTDIR)/opt/csw/share/postfix/upgrade - # Files for cswinitsmf and cswusergroup ginstall -Dm 755 $(FILEDIR)/cswpostfix \ $(DESTDIR)/etc/opt/csw/init.d/cswpostfix - ginstall -D $(FILEDIR)/cswpostfix.xml \ - $(DESTDIR)/var/opt/csw/svc/manifest/network/cswpostfix.xml" - ginstall -D $(FILEDIR)/CSWpostfix.cswusergroup \ + ginstall -D $(FILEDIR)/cswusergroup \ $(DESTDIR)$(sysconfdir)/pkg/CSWpostfix/cswusergroup @$(MAKECOOKIE) Added: csw/mgar/pkg/postfix/branches/postfix-2.6/files/CSWpostfix.checkinstall =================================================================== --- csw/mgar/pkg/postfix/branches/postfix-2.6/files/CSWpostfix.checkinstall (rev 0) +++ csw/mgar/pkg/postfix/branches/postfix-2.6/files/CSWpostfix.checkinstall 2010-01-14 00:00:53 UTC (rev 7995) @@ -0,0 +1,46 @@ +#!/bin/sh +# Copied from the CSWcupsd.preinstall script (obsolete_dir_file_name adjusted) +# https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/pkg/cups/trunk/files/CSWcupsd.preinstall +# +# $Id$ +# + +set -u + +PKG_INSTALL_ROOT="${PKG_INSTALL_ROOT:-}" +readonly PKG_INSTALL_ROOT + +obsolete_directories="/opt/csw/etc/postfix:/etc/opt/csw/postfix" + +obsolete_dir_information=" +This directory is obsolete. Files in this directory are going to be ignored. +Please move your data to the new location. + +Feel free to remove this file afterwards. +" +obsolete_dir_file_name="README.THIS_DIRECTORY_IS_OBSOLETE" + +for dirpair in ${obsolete_directories}; do + obsolete_dir=`echo ${dirpair} | cut -d: -f1` + new_dir=`echo ${dirpair} | cut -d: -f2` + if [ -d "${PKG_INSTALL_ROOT}/${obsolete_dir}" ]; then + echo + echo "*******************************************************************" + echo "* The old configuration directory ${obsolete_dir} still exists. " + echo "* Please move your configuration to ${new_dir}. " + echo "* " + echo "* Installation will continue in 10 seconds. " + echo "* Press CTRL+C if you want to stop now. " + echo "*******************************************************************" + echo + sleep 10 + + # Leaving a note for the sysadmin if the they proceed with the installation. + fn="${PKG_INSTALL_ROOT}/${obsolete_dir}/${obsolete_dir_file_name}" + if touch "${fn}" 2>/dev/null; then + echo "${obsolete_dir_information}" > "${fn}" + fi + fi +done + +exit 0 Deleted: csw/mgar/pkg/postfix/branches/postfix-2.6/files/CSWpostfix.cswusergroup =================================================================== --- csw/mgar/pkg/postfix/branches/postfix-2.6/files/CSWpostfix.cswusergroup 2010-01-13 20:40:54 UTC (rev 7994) +++ csw/mgar/pkg/postfix/branches/postfix-2.6/files/CSWpostfix.cswusergroup 2010-01-14 00:00:53 UTC (rev 7995) @@ -1,2 +0,0 @@ -:postdrop::::: -postfix:postfix:Postfix Daemon:/var/opt/csw/spool/postfix:/usr/bin/pfsh:: Deleted: csw/mgar/pkg/postfix/branches/postfix-2.6/files/CSWpostfix.depends =================================================================== --- csw/mgar/pkg/postfix/branches/postfix-2.6/files/CSWpostfix.depends 2010-01-13 20:40:54 UTC (rev 7994) +++ csw/mgar/pkg/postfix/branches/postfix-2.6/files/CSWpostfix.depends 2010-01-14 00:00:53 UTC (rev 7995) @@ -1,9 +0,0 @@ -CSWbdb3 berkeleydb3 - file based pseudo-database library -CSWcommon common - common files and dirs for CSW packages -CSWlibpq libpq - libraries needed by postgresql server and clients -CSWmysql4rt mysql4rt - run-time libraries for mysql4 -CSWoldaprt openldap_rt - OpenLDAP runtime libraries (oldaprt) -CSWosslrt openssl_rt - Openssl runtime libraries -CSWpcre pcre - Perl-compatible regular expression library -CSWsasl sasl - Simple Authentication and Security Layer -CSWzlib zlib - Zlib Data Compression Library Deleted: csw/mgar/pkg/postfix/branches/postfix-2.6/files/CSWpostfix.gspec =================================================================== --- csw/mgar/pkg/postfix/branches/postfix-2.6/files/CSWpostfix.gspec 2010-01-13 20:40:54 UTC (rev 7994) +++ csw/mgar/pkg/postfix/branches/postfix-2.6/files/CSWpostfix.gspec 2010-01-14 00:00:53 UTC (rev 7995) @@ -1,7 +0,0 @@ -%var bitname postfix -%var pkgname CSWpostfix -%include url file://%{PKGLIB}/csw_dyndepend.gspec -%copyright url file://%{WORKSRC}/LICENSE -%include url file://%{PKGLIB}/csw_class_conf/gspec -%include url file://%{PKGLIB}/csw_usrgrp.gspec -%include url file://%{PKGLIB}/smf_enabled.gspec Deleted: csw/mgar/pkg/postfix/branches/postfix-2.6/files/CSWpostfix.postinstall =================================================================== --- csw/mgar/pkg/postfix/branches/postfix-2.6/files/CSWpostfix.postinstall 2010-01-13 20:40:54 UTC (rev 7994) +++ csw/mgar/pkg/postfix/branches/postfix-2.6/files/CSWpostfix.postinstall 2010-01-14 00:00:53 UTC (rev 7995) @@ -1,48 +0,0 @@ -#!/bin/sh -# -# do we replace /usr/lib/sendmail, /usr/bin/newaliases, and /usr/bin/mailq? -# this depends on whether the .OFF files exist. if the .OFF does NOT exist -# then we replace, but if both exist then it's likely that either CSWsendmail -# CSWexim or CSWpostfix are installed, in which case we don't replace. -# - -if [ "$PKG_ROOT_DIR" = "" ] ; then PKG_ROOT_DIR="/" ; fi - -PF_ACTION=replace - -if [ -f /usr/lib/sendmail ]; then - if [ -f /usr/lib/sendmail.OFF ]; then - printf "It would appear that /usr/lib/sendmail.OFF already exists!\n" - printf "CSWpostfix will NOT configure itself as the default MTA.\n" - PF_ACTION=leave - else - printf "CSWpostfix is renaming /usr/lib/sendmail, /usr/bin/newaliases\n" - printf "and /usr/bin/mailq to *.OFF.\n" - PF_ACTION=replace - fi -else - PF_ACTION=leave -fi - -if [ $PF_ACTION = "replace" ]; then -# printf "Stopping sendmail\n" -# /usr/sbin/chroot $PKG_ROOT_DIR /etc/init.d/sendmail stop - - printf "Turning off /usr/lib/sendmail to enable the Postfix version\n" - /usr/sbin/chroot $PKG_ROOT_DIR /usr/bin/mv /usr/lib/sendmail /usr/lib/sendmail.OFF - - printf "Turning off /usr/bin/newaliases to enable the Postfix version\n" - /usr/sbin/chroot $PKG_ROOT_DIR /usr/bin/mv /usr/bin/newaliases /usr/bin/newaliases.OFF - - printf "Turning off /usr/bin/mailq to enable the Postfix version\n" - /usr/sbin/chroot $PKG_ROOT_DIR /usr/bin/mv /usr/bin/mailq /usr/bin/mailq.OFF - - printf "Linking /usr/lib/sendmail to /opt/csw/sbin/postfix\n" - /usr/sbin/chroot $PKG_ROOT_DIR /usr/bin/ln -s /opt/csw/sbin/sendmail /usr/lib/sendmail - - printf "Linking /usr/bin/newaliases to /opt/csw/bin/newaliases\n" - /usr/sbin/chroot $PKG_ROOT_DIR /usr/bin/ln -s /opt/csw/bin/newaliases /usr/bin/newaliases - - printf "Linking /usr/bin/mailq to /opt/csw/bin/mailq\n" - /usr/sbin/chroot $PKG_ROOT_DIR /usr/bin/ln -s /opt/csw/bin/mailq /usr/bin/mailq -fi Deleted: csw/mgar/pkg/postfix/branches/postfix-2.6/files/CSWpostfix.postremove =================================================================== --- csw/mgar/pkg/postfix/branches/postfix-2.6/files/CSWpostfix.postremove 2010-01-13 20:40:54 UTC (rev 7994) +++ csw/mgar/pkg/postfix/branches/postfix-2.6/files/CSWpostfix.postremove 2010-01-14 00:00:53 UTC (rev 7995) @@ -1,20 +0,0 @@ -#!/bin/sh -# -# but back sendmail, newaliases, and mailq - -if [ "$PKG_ROOT_DIR" = "" ] ; then PKG_ROOT_DIR="/" ; fi - -if [ -f /usr/lib/sendmail.OFF ]; then - printf "Reinstalling original /usr/lib/sendmail\n" - /usr/sbin/chroot $PKG_ROOT_DIR /usr/bin/mv /usr/lib/sendmail.OFF /usr/lib/sendmail -fi - -if [ -f /usr/bin/newaliases.OFF ]; then - printf "Reinstalling original /usr/bin/newaliases\n" - /usr/sbin/chroot $PKG_ROOT_DIR /usr/bin/mv /usr/bin/newaliases.OFF /usr/bin/newaliases -fi - -if [ -f /usr/bin/mailq.OFF ]; then - printf "Reinstalling original /usr/bin/mailq\n" - /usr/sbin/chroot $PKG_ROOT_DIR /usr/bin/mv /usr/bin/mailq.OFF /usr/bin/mailq -fi Added: csw/mgar/pkg/postfix/branches/postfix-2.6/files/changelog.CSW =================================================================== --- csw/mgar/pkg/postfix/branches/postfix-2.6/files/changelog.CSW (rev 0) +++ csw/mgar/pkg/postfix/branches/postfix-2.6/files/changelog.CSW 2010-01-14 00:00:53 UTC (rev 7995) @@ -0,0 +1,11 @@ +postfix (2.6.2,REV=2010.01.13) + + * Updated to 2.6.2. (Closes #3580, #3700, #3970) + * Moved spool directory to /var/opt/csw/spool/postfix. (Closes #3946) + * Added Cyrus SASL support. (Closes #2843) + * Added hash table support via bdb. (Closes #2097) + * Init / SMF handling now done with cswclassutils. (Closes #3946) + * Now depends on pcre_rt instead of pcre. (Closes #3017) + * Binaries in /opt/csw/libexec/postfix are now stripped. (Closes #3063) + + -- Sebastian Kayser Wed, 13 Jan 2010 22:01:36 +0100 Deleted: csw/mgar/pkg/postfix/branches/postfix-2.6/files/cswpostfix.xml =================================================================== --- csw/mgar/pkg/postfix/branches/postfix-2.6/files/cswpostfix.xml 2010-01-13 20:40:54 UTC (rev 7994) +++ csw/mgar/pkg/postfix/branches/postfix-2.6/files/cswpostfix.xml 2010-01-14 00:00:53 UTC (rev 7995) @@ -1,76 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Copied: csw/mgar/pkg/postfix/branches/postfix-2.6/files/cswusergroup (from rev 7993, csw/mgar/pkg/postfix/branches/postfix-2.6/files/CSWpostfix.cswusergroup) =================================================================== --- csw/mgar/pkg/postfix/branches/postfix-2.6/files/cswusergroup (rev 0) +++ csw/mgar/pkg/postfix/branches/postfix-2.6/files/cswusergroup 2010-01-14 00:00:53 UTC (rev 7995) @@ -0,0 +1,2 @@ +:postdrop::::: +postfix:postfix:Postfix daemon user:/var/opt/csw/spool/postfix:/usr/bin/pfsh:: Deleted: csw/mgar/pkg/postfix/branches/postfix-2.6/files/fix_main.cf.sed =================================================================== --- csw/mgar/pkg/postfix/branches/postfix-2.6/files/fix_main.cf.sed 2010-01-13 20:40:54 UTC (rev 7994) +++ csw/mgar/pkg/postfix/branches/postfix-2.6/files/fix_main.cf.sed 2010-01-14 00:00:53 UTC (rev 7995) @@ -1,10 +0,0 @@ -# Remove 'fix' from previous runs to prevent duplicates -/^alias_maps =/d -/^alias_database =/d - -# These will work as long as the template configuration file doesn't change too much -/alias_maps = netinfo:.aliases/ a\ -alias_maps = dbm:/etc/opt/csw/postfix/aliases - -/alias_database = .*hash:.opt.majordomo.aliases$/ a\ -alias_database = dbm:/etc/opt/csw/postfix/aliases Modified: csw/mgar/pkg/postfix/branches/postfix-2.6/files/upgrade =================================================================== --- csw/mgar/pkg/postfix/branches/postfix-2.6/files/upgrade 2010-01-13 20:40:54 UTC (rev 7994) +++ csw/mgar/pkg/postfix/branches/postfix-2.6/files/upgrade 2010-01-14 00:00:53 UTC (rev 7995) @@ -1,21 +1,46 @@ #!/bin/sh +# Copied from the CSWcupsd.preinstall script (obsolete_dir_file_name adjusted) +# https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/pkg/cups/trunk/files/CSWcupsd.preinstall +# +# $Id$ +# -old=/opt/csw/etc/postfix -new=/etc/opt/csw/postfix +set -u -if [ ! -d $old ] -then - echo "No old configuration exist: $old" > /dev/stderr - exit 1 -fi +PKG_INSTALL_ROOT="${PKG_INSTALL_ROOT:-}" +readonly PKG_INSTALL_ROOT -echo "Copying current configuration files from $old to new location $new" - -( cd $old; find . -type f ) | grep -v CSW$ | while read f; do - # Create the parent directory - dir=`dirname $f` - [ ! -d $new/$dir ] && mkdir -p $new/$dir +obsolete_directories="/opt/csw/etc/postfix:/etc/opt/csw/postfix" - # Copy over the new file - cp -p $old/$f $new/$f +obsolete_dir_information=" +This directory is obsolete. Files in this directory are going to be ignored. +Please move your data to the new location. + +Feel free to remove this file afterwards. +" +obsolete_dir_file_name="README.THIS_DIRECTORY_IS_OBSOLETE" + +for dirpair in ${obsolete_directories}; do + obsolete_dir=`echo ${dirpair} | cut -d: -f1` + new_dir=`echo ${dirpair} | cut -d: -f2` + if [ -d "${PKG_INSTALL_ROOT}/${obsolete_dir}" ]; then + echo + echo "*******************************************************************" + echo "* The old configuration directory ${obsolete_dir} still exists. " + echo "* Please move your configuration to ${new_dir}. " + echo "* " + echo "* Installation will continue in 10 seconds. " + echo "* Press CTRL+C if you want to stop now. " + echo "*******************************************************************" + echo + sleep 10 + + # Leaving a note for the sysadmin if the they proceed with the installation. + fn="${PKG_INSTALL_ROOT}/${obsolete_dir}/${obsolete_dir_file_name}" + if touch "${fn}" 2>/dev/null; then + echo "${obsolete_dir_information}" > "${fn}" + fi + fi done + +exit 0 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From skayser at users.sourceforge.net Thu Jan 14 02:30:15 2010 From: skayser at users.sourceforge.net (skayser at users.sourceforge.net) Date: Thu, 14 Jan 2010 01:30:15 +0000 Subject: [csw-devel] SF.net SVN: gar:[7996] csw/mgar/pkg/postfix/branches/postfix-2.6 Message-ID: Revision: 7996 http://gar.svn.sourceforge.net/gar/?rev=7996&view=rev Author: skayser Date: 2010-01-14 01:30:15 +0000 (Thu, 14 Jan 2010) Log Message: ----------- postfix: 2.6 branch, checkinstall bail out on potential mail spool files Modified Paths: -------------- csw/mgar/pkg/postfix/branches/postfix-2.6/Makefile csw/mgar/pkg/postfix/branches/postfix-2.6/checksums csw/mgar/pkg/postfix/branches/postfix-2.6/files/CSWpostfix.checkinstall csw/mgar/pkg/postfix/branches/postfix-2.6/files/changelog.CSW Modified: csw/mgar/pkg/postfix/branches/postfix-2.6/Makefile =================================================================== --- csw/mgar/pkg/postfix/branches/postfix-2.6/Makefile 2010-01-14 00:00:53 UTC (rev 7995) +++ csw/mgar/pkg/postfix/branches/postfix-2.6/Makefile 2010-01-14 01:30:15 UTC (rev 7996) @@ -1,19 +1,17 @@ # TODO (release-critical prefixed with !, non release-critical with *) -# ! Obsolete postinstall scripts: -# #3060 http://www.opencsw.org/bugtrack/view.php?id=3060 -# #2964 http://www.opencsw.org/bugtrack/view.php?id=2964 -# #1943 http://www.opencsw.org/bugtrack/view.php?id=1943 -# ! Handle spool location change (bail out and force user interaction?) # ! Handle system integration (refer to README.CSW or alike), see # http://article.gmane.org/gmane.os.solaris.opencsw.maintainers/5313 -# ! Does the currently available package preserve configuration files on -# removal? # ! Update to most recent postfix version (2.6.5 as of 13th Jan 2010) # ! Verify CONFIG_FILES list (can this be generated on the fly?) # ! Ship simple default configuration -# ! Build, install and test package (works? spool permissions ok?) +# ! Build, install and test package (bails out on existing spool files? +# works? spool permissions ok?) # WRT to permissions, run "postfix set-permissions" and compare # +# NICE TO KNOW +# - 2.4.6,REV=2008.05.28 preserves modified configuration files via +# package-shipped CAS class csw_conf. +# GARNAME = postfix GARVERSION = 2.6.2 CATEGORIES = server Modified: csw/mgar/pkg/postfix/branches/postfix-2.6/checksums =================================================================== --- csw/mgar/pkg/postfix/branches/postfix-2.6/checksums 2010-01-14 00:00:53 UTC (rev 7995) +++ csw/mgar/pkg/postfix/branches/postfix-2.6/checksums 2010-01-14 01:30:15 UTC (rev 7996) @@ -1,4 +1,2 @@ -63ac43075e092255cb266e5270ce5364 download/CSWpostfix.cswusergroup -76e992eb49e5d2d8c51305be8891566f download/CSWpostfix.postinstall -980c70abf5ea711adec41f3dd4e37141 download/CSWpostfix.postremove -1f0edbd521d2b0473626f4d61e8bb4eb download/postfix-2.6.2.tar.gz +64dadd7a3737c6a82211b301e380a31a CSWpostfix.checkinstall +1f0edbd521d2b0473626f4d61e8bb4eb postfix-2.6.2.tar.gz Modified: csw/mgar/pkg/postfix/branches/postfix-2.6/files/CSWpostfix.checkinstall =================================================================== --- csw/mgar/pkg/postfix/branches/postfix-2.6/files/CSWpostfix.checkinstall 2010-01-14 00:00:53 UTC (rev 7995) +++ csw/mgar/pkg/postfix/branches/postfix-2.6/files/CSWpostfix.checkinstall 2010-01-14 01:30:15 UTC (rev 7996) @@ -43,4 +43,29 @@ fi done +# Verify that there are no possibly important files in the old spool location +# (where old <= 2.4.6,REV=2008.05.28). Bail out otherwise and instruct user to +# manually migrate. Skips named pipes as well as all files in pid/. +old_spooldir="/opt/csw/var/spool/postfix/" +new_spooldir="/var/opt/csw/ +old_spoolfiles=`find ${PKG_INSTALL_ROOT}/opt/csw/var/spool/postfix/ \ + -name pid -prune -o ! -type d ! -type p | grep -v '/pid$'` +if [ "${old_spoolfiles}" != "" ]; then + echo + echo "*******************************************************************" + echo "* The old spool directory ${old_spooldir} still contains files. " + echo "* Please migrate these as needed to ${new_spooldir}. " + echo "* " + echo "* Installation will now terminate. Please restart the installation " + echo "* once the files have been migrated or removed. " + echo "*******************************************************************" + echo + echo "*******************************************************************" + echo "* This is the list of affected files: " + echo ${old_spoolfiles} + echo + + exit 1 +fi + exit 0 Modified: csw/mgar/pkg/postfix/branches/postfix-2.6/files/changelog.CSW =================================================================== --- csw/mgar/pkg/postfix/branches/postfix-2.6/files/changelog.CSW 2010-01-14 00:00:53 UTC (rev 7995) +++ csw/mgar/pkg/postfix/branches/postfix-2.6/files/changelog.CSW 2010-01-14 01:30:15 UTC (rev 7996) @@ -1,11 +1,13 @@ postfix (2.6.2,REV=2010.01.13) - * Updated to 2.6.2. (Closes #3580, #3700, #3970) + * Adopted and updated to 2.6.2. (Closes #3580, #3700, #3970) * Moved spool directory to /var/opt/csw/spool/postfix. (Closes #3946) * Added Cyrus SASL support. (Closes #2843) * Added hash table support via bdb. (Closes #2097) * Init / SMF handling now done with cswclassutils. (Closes #3946) * Now depends on pcre_rt instead of pcre. (Closes #3017) * Binaries in /opt/csw/libexec/postfix are now stripped. (Closes #3063) + * Doesn't automatically substitute system sendmail binaries any more. + Please refer to README.CSW instead. (Closes #1943, #2964, #3060) -- Sebastian Kayser Wed, 13 Jan 2010 22:01:36 +0100 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Thu Jan 14 10:22:26 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Thu, 14 Jan 2010 09:22:26 +0000 Subject: [csw-devel] SF.net SVN: gar:[7997] csw/mgar/gar/v2/bin/checkpkg.d/checkpkg-libs.py Message-ID: Revision: 7997 http://gar.svn.sourceforge.net/gar/?rev=7997&view=rev Author: wahwah Date: 2010-01-14 09:22:25 +0000 (Thu, 14 Jan 2010) Log Message: ----------- mGAR v2: a bugfix for checkpkg-libs.py Modified Paths: -------------- csw/mgar/gar/v2/bin/checkpkg.d/checkpkg-libs.py Modified: csw/mgar/gar/v2/bin/checkpkg.d/checkpkg-libs.py =================================================================== --- csw/mgar/gar/v2/bin/checkpkg.d/checkpkg-libs.py 2010-01-14 01:30:15 UTC (rev 7996) +++ csw/mgar/gar/v2/bin/checkpkg.d/checkpkg-libs.py 2010-01-14 09:22:25 UTC (rev 7997) @@ -192,7 +192,7 @@ for soname in orphan_sonames: errors.append(checkpkg.Error("The following soname does't belong to " - "any package: %s" % checker.soname)) + "any package: %s" % soname)) if errors: for error in errors: This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From skayser at users.sourceforge.net Thu Jan 14 10:27:46 2010 From: skayser at users.sourceforge.net (skayser at users.sourceforge.net) Date: Thu, 14 Jan 2010 09:27:46 +0000 Subject: [csw-devel] SF.net SVN: gar:[7998] csw/mgar/pkg/postfix/branches/postfix-2.6 Message-ID: Revision: 7998 http://gar.svn.sourceforge.net/gar/?rev=7998&view=rev Author: skayser Date: 2010-01-14 09:27:45 +0000 (Thu, 14 Jan 2010) Log Message: ----------- postfix: 2.6 branch, tweak CC args and switch to bdb42 Modified Paths: -------------- csw/mgar/pkg/postfix/branches/postfix-2.6/Makefile csw/mgar/pkg/postfix/branches/postfix-2.6/checksums Modified: csw/mgar/pkg/postfix/branches/postfix-2.6/Makefile =================================================================== --- csw/mgar/pkg/postfix/branches/postfix-2.6/Makefile 2010-01-14 09:22:25 UTC (rev 7997) +++ csw/mgar/pkg/postfix/branches/postfix-2.6/Makefile 2010-01-14 09:27:45 UTC (rev 7998) @@ -132,10 +132,10 @@ # Activate support for hash and btree lookup tables # http://www.postfix.org/DB_README.html FEATURES += -DHAS_DB -INCLUDES += -I/opt/csw/bdb4/include -AUXLIBS += -L/opt/csw/bdb4/lib -R/opt/csw/bdb4/lib -ldb-4 -PREREQUISITE_PKGS += CSWbdb4 -REQUIRED_PKGS += CSWbdb4 +INCLUDES += -I/opt/csw/bdb42/include +AUXLIBS += -L/opt/csw/bdb42/lib -R/opt/csw/bdb42/lib -ldb-4.2 +PREREQUISITE_PKGS += CSWbdb42devel +REQUIRED_PKGS += CSWbdb42 # Activate support for SSL/TLS # http://www.postfix.org/TLS_README.html @@ -179,7 +179,7 @@ # Make sure to include $(CFLAGS) so that we get sane defaults via GAR -CCARGS=$(CFLAGS) $(FEATURES) $(DEFAULTS) $(INCLUDES) +CCARGS=$(CPPFLAGS) $(INCLUDES) $(FEATURES) $(DEFAULTS) $(CFLAGS) # We zero makedef's DEBUG and OPT, the relevant flags are set via GAR & CFLAGS configure-custom: Modified: csw/mgar/pkg/postfix/branches/postfix-2.6/checksums =================================================================== --- csw/mgar/pkg/postfix/branches/postfix-2.6/checksums 2010-01-14 09:22:25 UTC (rev 7997) +++ csw/mgar/pkg/postfix/branches/postfix-2.6/checksums 2010-01-14 09:27:45 UTC (rev 7998) @@ -1,2 +1,2 @@ -64dadd7a3737c6a82211b301e380a31a CSWpostfix.checkinstall +a5247da640e70b66144632e724a8d895 CSWpostfix.checkinstall 1f0edbd521d2b0473626f4d61e8bb4eb postfix-2.6.2.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Thu Jan 14 12:01:22 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Thu, 14 Jan 2010 11:01:22 +0000 Subject: [csw-devel] SF.net SVN: gar:[7999] csw/mgar/gar/v2/bin/checkpkg.d Message-ID: Revision: 7999 http://gar.svn.sourceforge.net/gar/?rev=7999&view=rev Author: wahwah Date: 2010-01-14 11:01:22 +0000 (Thu, 14 Jan 2010) Log Message: ----------- mGAR v2: checkpkg-libs.py: Better handling of symlinks, added the bdb4 -> bdb42 symlink, handling double slases and trailing slashes in RPATH Modified Paths: -------------- csw/mgar/gar/v2/bin/checkpkg.d/checkpkg.py csw/mgar/gar/v2/bin/checkpkg.d/checkpkg_test.py Added Paths: ----------- csw/mgar/gar/v2/bin/checkpkg.d/testdata/checkpkg_test_data_CSWpostfix.py Modified: csw/mgar/gar/v2/bin/checkpkg.d/checkpkg.py =================================================================== --- csw/mgar/gar/v2/bin/checkpkg.d/checkpkg.py 2010-01-14 09:27:45 UTC (rev 7998) +++ csw/mgar/gar/v2/bin/checkpkg.d/checkpkg.py 2010-01-14 11:01:22 UTC (rev 7999) @@ -275,7 +275,7 @@ c.execute(sql, [CONFIG_MTIME]) row = c.fetchone() if not row: - # raise ConfigurationError("Could not find the mtime setting") + # raise ConfigurationError("Could not find the mtime setting") self.cache_mtime = 1 else: self.cache_mtime = row[0] @@ -443,16 +443,34 @@ Since we don't know the architecture, we'll adding both amd64 and sparcv9. It should be safe. """ + symlinks = ( + ("/opt/csw/bdb4", ["/opt/csw/bdb42"]), + ("/64", ["/amd64", "/sparcv9"]), + ) symlinked_list = [] for runpath in runpath_list: - if "/64" in runpath: - symlinked_list.append(runpath.replace("/64", "/amd64")) - symlinked_list.append(runpath.replace("/64", "/sparcv9")) - else: - symlinked_list.append(runpath) + for symlink, expansion_list in symlinks: + symlink_re = re.compile(r"%s(/|$)" % symlink) + if re.search(symlink_re, runpath): + for expansion in expansion_list: + symlinked_list.append(runpath.replace(symlink, expansion)) + else: + symlinked_list.append(runpath) return symlinked_list +def SanitizeRunpath(runpath): + ok = False + while True: + if runpath.endswith("/"): + runpath = runpath[:-1] + elif "//" in runpath: + runpath = runpath.replace("//", "/") + else: + break + return runpath + + def GetLinesBySoname(pkgmap, needed_sonames, runpath_by_needed_soname, isalist): """Works out which system pkgmap lines correspond to given sonames.""" lines_by_soname = {} @@ -461,6 +479,7 @@ # runpath and finds the first matching one. runpath_found = False for runpath in runpath_by_needed_soname[soname]: + runpath = SanitizeRunpath(runpath) runpath_list = ExpandRunpath(runpath, isalist) runpath_list = Emulate64BitSymlinks(runpath_list) soname_runpath_data = pkgmap.GetPkgmapLineByBasename(soname) Modified: csw/mgar/gar/v2/bin/checkpkg.d/checkpkg_test.py =================================================================== --- csw/mgar/gar/v2/bin/checkpkg.d/checkpkg_test.py 2010-01-14 09:27:45 UTC (rev 7998) +++ csw/mgar/gar/v2/bin/checkpkg.d/checkpkg_test.py 2010-01-14 11:01:22 UTC (rev 7999) @@ -11,6 +11,7 @@ import testdata.checkpkg_test_data_CSWmysql51devel as d4 import testdata.checkpkg_test_data_CSWlibpq_84 as d5 import testdata.checkpkg_test_data_CSWmysql5client_8x as d6 +import testdata.checkpkg_test_data_CSWpostfix as d7 import testdata.dump_output_1 as dump_1 import testdata.dump_output_2 as dump_2 @@ -179,6 +180,32 @@ self.assertEquals(expected, self.missing_deps) +class DependenciesUnitTest_7(unittest.TestCase): + + def setUp(self): + (self.missing_deps, + self.surplus_deps, + self.orphan_sonames) = checkpkg.AnalyzeDependencies( + d7.DATA_PKGNAME, + d7.DATA_DECLARED_DEPENDENCIES, + d7.DATA_BINARIES_BY_PKGNAME, + d7.DATA_NEEDED_SONAMES_BY_BINARY, + d7.DATA_PKGS_BY_FILENAME, + d7.DATA_FILENAMES_BY_SONAME, + d7.DATA_PKG_BY_ANY_FILENAME, + ) + + def testSurplusDeps(self): + self.assertEquals(set([]), self.surplus_deps) + + def testOrphanSonames(self): + self.assertEquals(set([]), self.orphan_sonames) + + def testMissingDeps(self): + expected = set([u'SUNWcslx']) + self.assertEquals(expected, self.missing_deps) + + class GuessDepsUnitTest(unittest.TestCase): def testGuessDepsByFilename1(self): @@ -277,6 +304,26 @@ result = checkpkg.Emulate64BitSymlinks(runpath_list) self.assertTrue(expected in result, "%s not in %s" % (expected, result)) + def testEmulate64BitSymlinks_3(self): + runpath_list = ["/opt/csw/mysql5/lib/64/mysql/foo"] + expected = "/opt/csw/mysql5/lib/sparcv9/mysql/foo" + result = checkpkg.Emulate64BitSymlinks(runpath_list) + self.assertTrue(expected in result, "%s not in %s" % (expected, result)) + + def testEmulateSymlinks_3(self): + runpath_list = ["/opt/csw/bdb4"] + expected = "/opt/csw/bdb42" + result = checkpkg.Emulate64BitSymlinks(runpath_list) + self.assertTrue(expected in result, "%s not in %s" % (expected, result)) + + def testEmulateSymlinks_4(self): + runpath_list = ["/opt/csw/bdb42"] + expected = "/opt/csw/bdb42" + not_expected = "/opt/csw/bdb422" + result = checkpkg.Emulate64BitSymlinks(runpath_list) + self.assertTrue(expected in result, "%s not in %s" % (expected, result)) + self.assertFalse(not_expected in result, "%s is in %s" % (not_expected, result)) + def testGetLinesBySoname(self): expected = {'foo.so.1': '/opt/csw/lib/isa-value-1/foo.so.1 foo'} pkgmap = self.pkgmap_mocker.CreateMock(checkpkg.SystemPkgmap) @@ -401,7 +448,30 @@ d6.DATA_ISALIST) self.assertEqual(expected, result) + def testGetLinesBySoname_8(self): + expected = {'foo.so.1': '/opt/csw/postgresql/lib/foo.so.1 foo'} + pkgmap = self.pkgmap_mocker.CreateMock(checkpkg.SystemPkgmap) + pkgmap.GetPkgmapLineByBasename("foo") + lines1 = {"/opt/csw/lib/postgresql": "/opt/csw/lib/postgresql/foo.so.1 foo"} + pkgmap.GetPkgmapLineByBasename("foo.so.1").AndReturn(lines1) + pkgmap.GetPkgmapLineByBasename("foo.so.1").AndReturn(lines1) + self.pkgmap_mocker.ReplayAll() + pkgmap.GetPkgmapLineByBasename("foo") + needed_sonames = set(["foo.so.1"]) + runpath_by_needed_soname = {"foo.so.1": ["/opt/csw/postgresql/lib/", "/usr/lib"]} + isalist = ["isa-value-1", "isa-value-2"] + result = checkpkg.GetLinesBySoname(pkgmap, needed_sonames, runpath_by_needed_soname, isalist) + self.pkgmap_mocker.VerifyAll() + self.assertEqual(expected, result) + def testSanitizeRunpath_1(self): + self.assertEqual("/opt/csw/lib", checkpkg.SanitizeRunpath("/opt/csw/lib/")) + + def testSanitizeRunpath_2(self): + self.assertEqual("/opt/csw/lib", checkpkg.SanitizeRunpath("/opt//csw////lib/")) + + + class ParseDumpOutputUnitTest(unittest.TestCase): def test_1(self): Added: csw/mgar/gar/v2/bin/checkpkg.d/testdata/checkpkg_test_data_CSWpostfix.py =================================================================== --- csw/mgar/gar/v2/bin/checkpkg.d/testdata/checkpkg_test_data_CSWpostfix.py (rev 0) +++ csw/mgar/gar/v2/bin/checkpkg.d/testdata/checkpkg_test_data_CSWpostfix.py 2010-01-14 11:01:22 UTC (rev 7999) @@ -0,0 +1,13 @@ +# Testing data for CSWpostfix +# $Id: checkpkg-libs.py 7997 2010-01-14 09:22:25Z wahwah $ +DATA_PKGNAME = 'CSWpostfix' +DATA_DECLARED_DEPENDENCIES = {'CSWcswclassutils': 'CSWcswclassutils cswclassutils - CSW class action utilities ', 'CSWpcrert': 'CSWpcrert pcre_rt - Perl-compatible regular expression runtime libraries ', 'CSWmysql5rt': 'CSWmysql5rt mysql5rt - MySQL 5 runtime files ', 'CSWbdb4': 'CSWbdb4 berkeleydb4 - Stub package as contents moved to CSWbdb42 ', 'CSWlibpq': 'CSWlibpq libpq - libraries needed by postgresql server and clients ', 'CSWsasl': 'CSWsasl sasl - Simple Authentication and Security Layer ', 'CSWcommon': 'CSWcommon common - common files and dirs for CSW packages ', 'CSWoldaprt': 'CSWoldaprt openldap_rt - OpenLDAP runtime libraries (oldaprt) ', 'CSWosslrt': 'CSWosslrt openssl_rt - Openssl runtime libraries '} +DATA_BINARIES_BY_PKGNAME = {'CSWpostfix': ['anvil', 'spawn', 'nqmgr', 'tlsmgr', 'scache', 'discard', 'pickup', 'oqmgr', 'proxymap', 'flush', 'verify', 'pipe', 'master', 'bounce', 'error', 'qmqpd', 'virtual', 'smtpd', 'lmtp', 'trivial-rewrite', 'showq', 'cleanup', 'local', 'postmap', 'postlog', 'postmulti', 'postalias', 'postsuper', 'postconf', 'postlock', 'postcat', 'sendmail', 'postqueue', 'postkick', 'postfix', 'postdrop']} +DATA_NEEDED_SONAMES_BY_BINARY = {'postmulti': {'soname': 'postmulti', 'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/bdb4/lib', '/opt/csw/mysql5/lib/mysql', '/opt/csw/postgresql/lib/', '/usr/lib/$ISALIST', '/usr/lib', '/lib/$ISALIST', '/lib'], 'needed sonames': ['libpcre.so.0', 'libdb-4.2.so', 'libssl.so.0.9.8', 'libcrypto.so.0.9.8', 'libsasl2.so.2', 'libldap-2.3.so.0', 'liblber-2.3.so.0', 'libmysqlclient.so.15', 'libpq.so.5', 'libresolv.so.2', 'libsocket.so.1', 'libnsl.so.1', 'libc.so.1']}, 'spawn': {'soname': 'spawn', 'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/bdb4/lib', '/opt/csw/mysql5/lib/mysql', '/opt/csw/postgresql/lib/', '/usr/lib/$ISALIST', '/usr/lib', '/lib/$ISALIST', '/lib'], 'needed sonames': ['libpcre.so.0', 'libdb-4.2.so', 'libssl.so.0.9.8', 'libcrypto.so.0.9.8', 'libsasl2.so.2', 'libldap-2.3.so.0', 'liblber-2.3.so.0', 'libmysqlclient.so.15', 'libpq.so.5', 'libresolv.so.2', 'libsocket.so.1', 'libnsl.so.1', 'libc.so.1']}, 'pos tkick': {'soname': 'postkick', 'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/bdb4/lib', '/opt/csw/mysql5/lib/mysql', '/opt/csw/postgresql/lib/', '/usr/lib/$ISALIST', '/usr/lib', '/lib/$ISALIST', '/lib'], 'needed sonames': ['libpcre.so.0', 'libdb-4.2.so', 'libssl.so.0.9.8', 'libcrypto.so.0.9.8', 'libsasl2.so.2', 'libldap-2.3.so.0', 'liblber-2.3.so.0', 'libmysqlclient.so.15', 'libpq.so.5', 'libresolv.so.2', 'libsocket.so.1', 'libnsl.so.1', 'libc.so.1']}, 'postlog': {'soname': 'postlog', 'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/bdb4/lib', '/opt/csw/mysql5/lib/mysql', '/opt/csw/postgresql/lib/', '/usr/lib/$ISALIST', '/usr/lib', '/lib/$ISALIST', '/lib'], 'needed sonames': ['libpcre.so.0', 'libdb-4.2.so', 'libssl.so.0.9.8', 'libcrypto.so.0.9.8', 'libsasl2.so.2', 'libldap-2.3.so.0', 'liblber-2.3.so.0', 'libmysqlclient.so.15', 'libpq.so.5', 'libresolv.so.2', 'libsocket.so.1', 'libnsl.so.1', 'libc.so.1']}, 'postconf': {'soname': 'postconf', 'run path': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/bdb4/lib', '/opt/csw/mysql5/lib/mysql', '/opt/csw/postgresql/lib/', '/usr/lib/$ISALIST', '/usr/lib', '/lib/$ISALIST', '/lib'], 'needed sonames': ['libpcre.so.0', 'libdb-4.2.so', 'libssl.so.0.9.8', 'libcrypto.so.0.9.8', 'libsasl2.so.2', 'libldap-2.3.so.0', 'liblber-2.3.so.0', 'libmysqlclient.so.15', 'libpq.so.5', 'libresolv.so.2', 'libsocket.so.1', 'libnsl.so.1', 'libc.so.1']}, 'bounce': {'soname': 'bounce', 'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/bdb4/lib', '/opt/csw/mysql5/lib/mysql', '/opt/csw/postgresql/lib/', '/usr/lib/$ISALIST', '/usr/lib', '/lib/$ISALIST', '/lib'], 'needed sonames': ['libpcre.so.0', 'libdb-4.2.so', 'libssl.so.0.9.8', 'libcrypto.so.0.9.8', 'libsasl2.so.2', 'libldap-2.3.so.0', 'liblber-2.3.so.0', 'libmysqlclient.so.15', 'libpq.so.5', 'libresolv.so.2', 'libsocket.so.1', 'libnsl.so.1', 'libc.so.1']}, 'qmqpd': {'soname': 'qmqpd', 'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/ lib', '/opt/csw/bdb4/lib', '/opt/csw/mysql5/lib/mysql', '/opt/csw/postgresql/lib/', '/usr/lib/$ISALIST', '/usr/lib', '/lib/$ISALIST', '/lib'], 'needed sonames': ['libpcre.so.0', 'libdb-4.2.so', 'libssl.so.0.9.8', 'libcrypto.so.0.9.8', 'libsasl2.so.2', 'libldap-2.3.so.0', 'liblber-2.3.so.0', 'libmysqlclient.so.15', 'libpq.so.5', 'libresolv.so.2', 'libsocket.so.1', 'libnsl.so.1', 'libc.so.1']}, 'nqmgr': {'soname': 'nqmgr', 'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/bdb4/lib', '/opt/csw/mysql5/lib/mysql', '/opt/csw/postgresql/lib/', '/usr/lib/$ISALIST', '/usr/lib', '/lib/$ISALIST', '/lib'], 'needed sonames': ['libpcre.so.0', 'libdb-4.2.so', 'libssl.so.0.9.8', 'libcrypto.so.0.9.8', 'libsasl2.so.2', 'libldap-2.3.so.0', 'liblber-2.3.so.0', 'libmysqlclient.so.15', 'libpq.so.5', 'libresolv.so.2', 'libsocket.so.1', 'libnsl.so.1', 'libc.so.1']}, 'flush': {'soname': 'flush', 'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/bdb4/lib', '/opt/csw/mysql5/l ib/mysql', '/opt/csw/postgresql/lib/', '/usr/lib/$ISALIST', '/usr/lib', '/lib/$ISALIST', '/lib'], 'needed sonames': ['libpcre.so.0', 'libdb-4.2.so', 'libssl.so.0.9.8', 'libcrypto.so.0.9.8', 'libsasl2.so.2', 'libldap-2.3.so.0', 'liblber-2.3.so.0', 'libmysqlclient.so.15', 'libpq.so.5', 'libresolv.so.2', 'libsocket.so.1', 'libnsl.so.1', 'libc.so.1']}, 'proxymap': {'soname': 'proxymap', 'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/bdb4/lib', '/opt/csw/mysql5/lib/mysql', '/opt/csw/postgresql/lib/', '/usr/lib/$ISALIST', '/usr/lib', '/lib/$ISALIST', '/lib'], 'needed sonames': ['libpcre.so.0', 'libdb-4.2.so', 'libssl.so.0.9.8', 'libcrypto.so.0.9.8', 'libsasl2.so.2', 'libldap-2.3.so.0', 'liblber-2.3.so.0', 'libmysqlclient.so.15', 'libpq.so.5', 'libresolv.so.2', 'libsocket.so.1', 'libnsl.so.1', 'libc.so.1']}, 'scache': {'soname': 'scache', 'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/bdb4/lib', '/opt/csw/mysql5/lib/mysql', '/opt/csw/postgresql/lib/' , '/usr/lib/$ISALIST', '/usr/lib', '/lib/$ISALIST', '/lib'], 'needed sonames': ['libpcre.so.0', 'libdb-4.2.so', 'libssl.so.0.9.8', 'libcrypto.so.0.9.8', 'libsasl2.so.2', 'libldap-2.3.so.0', 'liblber-2.3.so.0', 'libmysqlclient.so.15', 'libpq.so.5', 'libresolv.so.2', 'libsocket.so.1', 'libnsl.so.1', 'libc.so.1']}, 'anvil': {'soname': 'anvil', 'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/bdb4/lib', '/opt/csw/mysql5/lib/mysql', '/opt/csw/postgresql/lib/', '/usr/lib/$ISALIST', '/usr/lib', '/lib/$ISALIST', '/lib'], 'needed sonames': ['libpcre.so.0', 'libdb-4.2.so', 'libssl.so.0.9.8', 'libcrypto.so.0.9.8', 'libsasl2.so.2', 'libldap-2.3.so.0', 'liblber-2.3.so.0', 'libmysqlclient.so.15', 'libpq.so.5', 'libresolv.so.2', 'libsocket.so.1', 'libnsl.so.1', 'libc.so.1']}, 'verify': {'soname': 'verify', 'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/bdb4/lib', '/opt/csw/mysql5/lib/mysql', '/opt/csw/postgresql/lib/', '/usr/lib/$ISALIST', '/usr/lib', '/lib/$I SALIST', '/lib'], 'needed sonames': ['libpcre.so.0', 'libdb-4.2.so', 'libssl.so.0.9.8', 'libcrypto.so.0.9.8', 'libsasl2.so.2', 'libldap-2.3.so.0', 'liblber-2.3.so.0', 'libmysqlclient.so.15', 'libpq.so.5', 'libresolv.so.2', 'libsocket.so.1', 'libnsl.so.1', 'libc.so.1']}, 'postalias': {'soname': 'postalias', 'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/bdb4/lib', '/opt/csw/mysql5/lib/mysql', '/opt/csw/postgresql/lib/', '/usr/lib/$ISALIST', '/usr/lib', '/lib/$ISALIST', '/lib'], 'needed sonames': ['libpcre.so.0', 'libdb-4.2.so', 'libssl.so.0.9.8', 'libcrypto.so.0.9.8', 'libsasl2.so.2', 'libldap-2.3.so.0', 'liblber-2.3.so.0', 'libmysqlclient.so.15', 'libpq.so.5', 'libresolv.so.2', 'libsocket.so.1', 'libnsl.so.1', 'libc.so.1']}, 'postcat': {'soname': 'postcat', 'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/bdb4/lib', '/opt/csw/mysql5/lib/mysql', '/opt/csw/postgresql/lib/', '/usr/lib/$ISALIST', '/usr/lib', '/lib/$ISALIST', '/lib'], 'needed sonames ': ['libpcre.so.0', 'libdb-4.2.so', 'libssl.so.0.9.8', 'libcrypto.so.0.9.8', 'libsasl2.so.2', 'libldap-2.3.so.0', 'liblber-2.3.so.0', 'libmysqlclient.so.15', 'libpq.so.5', 'libresolv.so.2', 'libsocket.so.1', 'libnsl.so.1', 'libc.so.1']}, 'virtual': {'soname': 'virtual', 'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/bdb4/lib', '/opt/csw/mysql5/lib/mysql', '/opt/csw/postgresql/lib/', '/usr/lib/$ISALIST', '/usr/lib', '/lib/$ISALIST', '/lib'], 'needed sonames': ['libpcre.so.0', 'libdb-4.2.so', 'libssl.so.0.9.8', 'libcrypto.so.0.9.8', 'libsasl2.so.2', 'libldap-2.3.so.0', 'liblber-2.3.so.0', 'libmysqlclient.so.15', 'libpq.so.5', 'libresolv.so.2', 'libsocket.so.1', 'libnsl.so.1', 'libc.so.1']}, 'pickup': {'soname': 'pickup', 'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/bdb4/lib', '/opt/csw/mysql5/lib/mysql', '/opt/csw/postgresql/lib/', '/usr/lib/$ISALIST', '/usr/lib', '/lib/$ISALIST', '/lib'], 'needed sonames': ['libpcre.so.0', 'libdb-4.2.so', 'li bssl.so.0.9.8', 'libcrypto.so.0.9.8', 'libsasl2.so.2', 'libldap-2.3.so.0', 'liblber-2.3.so.0', 'libmysqlclient.so.15', 'libpq.so.5', 'libresolv.so.2', 'libsocket.so.1', 'libnsl.so.1', 'libc.so.1']}, 'oqmgr': {'soname': 'oqmgr', 'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/bdb4/lib', '/opt/csw/mysql5/lib/mysql', '/opt/csw/postgresql/lib/', '/usr/lib/$ISALIST', '/usr/lib', '/lib/$ISALIST', '/lib'], 'needed sonames': ['libpcre.so.0', 'libdb-4.2.so', 'libssl.so.0.9.8', 'libcrypto.so.0.9.8', 'libsasl2.so.2', 'libldap-2.3.so.0', 'liblber-2.3.so.0', 'libmysqlclient.so.15', 'libpq.so.5', 'libresolv.so.2', 'libsocket.so.1', 'libnsl.so.1', 'libc.so.1']}, 'master': {'soname': 'master', 'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/bdb4/lib', '/opt/csw/mysql5/lib/mysql', '/opt/csw/postgresql/lib/', '/usr/lib/$ISALIST', '/usr/lib', '/lib/$ISALIST', '/lib'], 'needed sonames': ['libpcre.so.0', 'libdb-4.2.so', 'libssl.so.0.9.8', 'libcrypto.so.0.9.8', 'libs asl2.so.2', 'libldap-2.3.so.0', 'liblber-2.3.so.0', 'libmysqlclient.so.15', 'libpq.so.5', 'libresolv.so.2', 'libsocket.so.1', 'libnsl.so.1', 'libc.so.1']}, 'postqueue': {'soname': 'postqueue', 'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/bdb4/lib', '/opt/csw/mysql5/lib/mysql', '/opt/csw/postgresql/lib/', '/usr/lib/$ISALIST', '/usr/lib', '/lib/$ISALIST', '/lib'], 'needed sonames': ['libpcre.so.0', 'libdb-4.2.so', 'libssl.so.0.9.8', 'libcrypto.so.0.9.8', 'libsasl2.so.2', 'libldap-2.3.so.0', 'liblber-2.3.so.0', 'libmysqlclient.so.15', 'libpq.so.5', 'libresolv.so.2', 'libsocket.so.1', 'libnsl.so.1', 'libc.so.1']}, 'postmap': {'soname': 'postmap', 'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/bdb4/lib', '/opt/csw/mysql5/lib/mysql', '/opt/csw/postgresql/lib/', '/usr/lib/$ISALIST', '/usr/lib', '/lib/$ISALIST', '/lib'], 'needed sonames': ['libpcre.so.0', 'libdb-4.2.so', 'libssl.so.0.9.8', 'libcrypto.so.0.9.8', 'libsasl2.so.2', 'libldap-2.3.so.0', ' liblber-2.3.so.0', 'libmysqlclient.so.15', 'libpq.so.5', 'libresolv.so.2', 'libsocket.so.1', 'libnsl.so.1', 'libc.so.1']}, 'local': {'soname': 'local', 'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/bdb4/lib', '/opt/csw/mysql5/lib/mysql', '/opt/csw/postgresql/lib/', '/usr/lib/$ISALIST', '/usr/lib', '/lib/$ISALIST', '/lib'], 'needed sonames': ['libpcre.so.0', 'libdb-4.2.so', 'libssl.so.0.9.8', 'libcrypto.so.0.9.8', 'libsasl2.so.2', 'libldap-2.3.so.0', 'liblber-2.3.so.0', 'libmysqlclient.so.15', 'libpq.so.5', 'libresolv.so.2', 'libsocket.so.1', 'libnsl.so.1', 'libc.so.1']}, 'showq': {'soname': 'showq', 'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/bdb4/lib', '/opt/csw/mysql5/lib/mysql', '/opt/csw/postgresql/lib/', '/usr/lib/$ISALIST', '/usr/lib', '/lib/$ISALIST', '/lib'], 'needed sonames': ['libpcre.so.0', 'libdb-4.2.so', 'libssl.so.0.9.8', 'libcrypto.so.0.9.8', 'libsasl2.so.2', 'libldap-2.3.so.0', 'liblber-2.3.so.0', 'libmysqlclient.so.15', 'l ibpq.so.5', 'libresolv.so.2', 'libsocket.so.1', 'libnsl.so.1', 'libc.so.1']}, 'sendmail': {'soname': 'sendmail', 'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/bdb4/lib', '/opt/csw/mysql5/lib/mysql', '/opt/csw/postgresql/lib/', '/usr/lib/$ISALIST', '/usr/lib', '/lib/$ISALIST', '/lib'], 'needed sonames': ['libpcre.so.0', 'libdb-4.2.so', 'libssl.so.0.9.8', 'libcrypto.so.0.9.8', 'libsasl2.so.2', 'libldap-2.3.so.0', 'liblber-2.3.so.0', 'libmysqlclient.so.15', 'libpq.so.5', 'libresolv.so.2', 'libsocket.so.1', 'libnsl.so.1', 'libc.so.1']}, 'smtpd': {'soname': 'smtpd', 'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/bdb4/lib', '/opt/csw/mysql5/lib/mysql', '/opt/csw/postgresql/lib/', '/usr/lib/$ISALIST', '/usr/lib', '/lib/$ISALIST', '/lib'], 'needed sonames': ['libpcre.so.0', 'libdb-4.2.so', 'libssl.so.0.9.8', 'libcrypto.so.0.9.8', 'libsasl2.so.2', 'libldap-2.3.so.0', 'liblber-2.3.so.0', 'libmysqlclient.so.15', 'libpq.so.5', 'libresolv.so.2', 'libsocke t.so.1', 'libnsl.so.1', 'libc.so.1']}, 'lmtp': {'soname': 'lmtp', 'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/bdb4/lib', '/opt/csw/mysql5/lib/mysql', '/opt/csw/postgresql/lib/', '/usr/lib/$ISALIST', '/usr/lib', '/lib/$ISALIST', '/lib'], 'needed sonames': ['libpcre.so.0', 'libdb-4.2.so', 'libssl.so.0.9.8', 'libcrypto.so.0.9.8', 'libsasl2.so.2', 'libldap-2.3.so.0', 'liblber-2.3.so.0', 'libmysqlclient.so.15', 'libpq.so.5', 'libresolv.so.2', 'libsocket.so.1', 'libnsl.so.1', 'libc.so.1']}, 'postdrop': {'soname': 'postdrop', 'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/bdb4/lib', '/opt/csw/mysql5/lib/mysql', '/opt/csw/postgresql/lib/', '/usr/lib/$ISALIST', '/usr/lib', '/lib/$ISALIST', '/lib'], 'needed sonames': ['libpcre.so.0', 'libdb-4.2.so', 'libssl.so.0.9.8', 'libcrypto.so.0.9.8', 'libsasl2.so.2', 'libldap-2.3.so.0', 'liblber-2.3.so.0', 'libmysqlclient.so.15', 'libpq.so.5', 'libresolv.so.2', 'libsocket.so.1', 'libnsl.so.1', 'libc.so.1']}, 't rivial-rewrite': {'soname': 'trivial-rewrite', 'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/bdb4/lib', '/opt/csw/mysql5/lib/mysql', '/opt/csw/postgresql/lib/', '/usr/lib/$ISALIST', '/usr/lib', '/lib/$ISALIST', '/lib'], 'needed sonames': ['libpcre.so.0', 'libdb-4.2.so', 'libssl.so.0.9.8', 'libcrypto.so.0.9.8', 'libsasl2.so.2', 'libldap-2.3.so.0', 'liblber-2.3.so.0', 'libmysqlclient.so.15', 'libpq.so.5', 'libresolv.so.2', 'libsocket.so.1', 'libnsl.so.1', 'libc.so.1']}, 'postfix': {'soname': 'postfix', 'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/bdb4/lib', '/opt/csw/mysql5/lib/mysql', '/opt/csw/postgresql/lib/', '/usr/lib/$ISALIST', '/usr/lib', '/lib/$ISALIST', '/lib'], 'needed sonames': ['libpcre.so.0', 'libdb-4.2.so', 'libssl.so.0.9.8', 'libcrypto.so.0.9.8', 'libsasl2.so.2', 'libldap-2.3.so.0', 'liblber-2.3.so.0', 'libmysqlclient.so.15', 'libpq.so.5', 'libresolv.so.2', 'libsocket.so.1', 'libnsl.so.1', 'libc.so.1']}, 'postlock': {'soname': 'postlock', 'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/bdb4/lib', '/opt/csw/mysql5/lib/mysql', '/opt/csw/postgresql/lib/', '/usr/lib/$ISALIST', '/usr/lib', '/lib/$ISALIST', '/lib'], 'needed sonames': ['libpcre.so.0', 'libdb-4.2.so', 'libssl.so.0.9.8', 'libcrypto.so.0.9.8', 'libsasl2.so.2', 'libldap-2.3.so.0', 'liblber-2.3.so.0', 'libmysqlclient.so.15', 'libpq.so.5', 'libresolv.so.2', 'libsocket.so.1', 'libnsl.so.1', 'libc.so.1']}, 'pipe': {'soname': 'pipe', 'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/bdb4/lib', '/opt/csw/mysql5/lib/mysql', '/opt/csw/postgresql/lib/', '/usr/lib/$ISALIST', '/usr/lib', '/lib/$ISALIST', '/lib'], 'needed sonames': ['libpcre.so.0', 'libdb-4.2.so', 'libssl.so.0.9.8', 'libcrypto.so.0.9.8', 'libsasl2.so.2', 'libldap-2.3.so.0', 'liblber-2.3.so.0', 'libmysqlclient.so.15', 'libpq.so.5', 'libresolv.so.2', 'libsocket.so.1', 'libnsl.so.1', 'libc.so.1']}, 'tlsmgr': {'soname': 'tlsmgr', 'runpath': ['/opt/csw/lib/$ISALIS T', '/opt/csw/lib', '/opt/csw/bdb4/lib', '/opt/csw/mysql5/lib/mysql', '/opt/csw/postgresql/lib/', '/usr/lib/$ISALIST', '/usr/lib', '/lib/$ISALIST', '/lib'], 'needed sonames': ['libpcre.so.0', 'libdb-4.2.so', 'libssl.so.0.9.8', 'libcrypto.so.0.9.8', 'libsasl2.so.2', 'libldap-2.3.so.0', 'liblber-2.3.so.0', 'libmysqlclient.so.15', 'libpq.so.5', 'libresolv.so.2', 'libsocket.so.1', 'libnsl.so.1', 'libc.so.1']}, 'error': {'soname': 'error', 'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/bdb4/lib', '/opt/csw/mysql5/lib/mysql', '/opt/csw/postgresql/lib/', '/usr/lib/$ISALIST', '/usr/lib', '/lib/$ISALIST', '/lib'], 'needed sonames': ['libpcre.so.0', 'libdb-4.2.so', 'libssl.so.0.9.8', 'libcrypto.so.0.9.8', 'libsasl2.so.2', 'libldap-2.3.so.0', 'liblber-2.3.so.0', 'libmysqlclient.so.15', 'libpq.so.5', 'libresolv.so.2', 'libsocket.so.1', 'libnsl.so.1', 'libc.so.1']}, 'discard': {'soname': 'discard', 'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/bdb4/lib', '/opt/csw/mysql5/lib/mysql', '/opt/csw/postgresql/lib/', '/usr/lib/$ISALIST', '/usr/lib', '/lib/$ISALIST', '/lib'], 'needed sonames': ['libpcre.so.0', 'libdb-4.2.so', 'libssl.so.0.9.8', 'libcrypto.so.0.9.8', 'libsasl2.so.2', 'libldap-2.3.so.0', 'liblber-2.3.so.0', 'libmysqlclient.so.15', 'libpq.so.5', 'libresolv.so.2', 'libsocket.so.1', 'libnsl.so.1', 'libc.so.1']}, 'postsuper': {'soname': 'postsuper', 'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/bdb4/lib', '/opt/csw/mysql5/lib/mysql', '/opt/csw/postgresql/lib/', '/usr/lib/$ISALIST', '/usr/lib', '/lib/$ISALIST', '/lib'], 'needed sonames': ['libpcre.so.0', 'libdb-4.2.so', 'libssl.so.0.9.8', 'libcrypto.so.0.9.8', 'libsasl2.so.2', 'libldap-2.3.so.0', 'liblber-2.3.so.0', 'libmysqlclient.so.15', 'libpq.so.5', 'libresolv.so.2', 'libsocket.so.1', 'libnsl.so.1', 'libc.so.1']}, 'cleanup': {'soname': 'cleanup', 'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/bdb4/lib', '/opt/csw/mysql5/lib/mysql', '/op t/csw/postgresql/lib/', '/usr/lib/$ISALIST', '/usr/lib', '/lib/$ISALIST', '/lib'], 'needed sonames': ['libpcre.so.0', 'libdb-4.2.so', 'libssl.so.0.9.8', 'libcrypto.so.0.9.8', 'libsasl2.so.2', 'libldap-2.3.so.0', 'liblber-2.3.so.0', 'libmysqlclient.so.15', 'libpq.so.5', 'libresolv.so.2', 'libsocket.so.1', 'libnsl.so.1', 'libc.so.1']}} +DATA_PKGS_BY_FILENAME = {'libresolv.so.2': u'SUNWcslx', 'libnsl.so.1': u'SUNWcslx', 'libsasl2.so.2': u'CSWsasl', 'libmysqlclient.so.15': u'CSWmysql5rt', 'libpcre.so.0': u'CSWpcrert', 'libssl.so.0.9.8': u'CSWosslrt', 'libldap-2.3.so.0': u'CSWoldaprt', 'libcrypto.so.0.9.8': u'CSWosslrt', 'libsocket.so.1': u'SUNWcslx', 'liblber-2.3.so.0': u'CSWoldaprt', 'libc.so.1': u'SUNWcslx'} +DATA_FILENAMES_BY_SONAME = {'postmulti': 'postmulti', 'spawn': 'spawn', 'postkick': 'postkick', 'postlog': 'postlog', 'postconf': 'postconf', 'bounce': 'bounce', 'qmqpd': 'qmqpd', 'nqmgr': 'nqmgr', 'flush': 'flush', 'proxymap': 'proxymap', 'scache': 'scache', 'anvil': 'anvil', 'verify': 'verify', 'postalias': 'postalias', 'postcat': 'postcat', 'virtual': 'virtual', 'pickup': 'pickup', 'oqmgr': 'oqmgr', 'master': 'master', 'postqueue': 'postqueue', 'postmap': 'postmap', 'local': 'local', 'showq': 'showq', 'sendmail': 'sendmail', 'smtpd': 'smtpd', 'lmtp': 'lmtp', 'postdrop': 'postdrop', 'trivial-rewrite': 'trivial-rewrite', 'postfix': 'postfix', 'postlock': 'postlock', 'pipe': 'pipe', 'tlsmgr': 'tlsmgr', 'error': 'error', 'discard': 'discard', 'postsuper': 'postsuper', 'cleanup': 'cleanup'} +DATA_PKG_BY_ANY_FILENAME = {'BASIC_CONFIGURATION_README': 'CSWpostfix', 'postlock.1': 'CSWpostfix', 'newaliases.1.html': 'CSWpostfix', 'CDB_README': 'CSWpostfix', 'MULTI_INSTANCE_README': 'CSWpostfix', 'CONTENT_INSPECTION_README.html': 'CSWpostfix', 'trace.8': 'CSWpostfix', 'SASL_README.html': 'CSWpostfix', 'postsuper': 'CSWpostfix', 'showq.8': 'CSWpostfix', 'qmqpd': 'CSWpostfix', 'cidr_table.5.html': 'CSWpostfix', 'virtual': 'CSWpostfix', 'verify.8': 'CSWpostfix', 'ETRN_README.html': 'CSWpostfix', 'pgsql_table.5.html': 'CSWpostfix', 'generic.CSW': 'CSWpostfix', 'FILTER_README.html': 'CSWpostfix', 'cswusergroup': 'CSWpostfix', 'CONNECTION_CACHE_README': 'CSWpostfix', 'STRESS_README.html': 'CSWpostfix', 'pickup.8': 'CSWpostfix', 'postconf.1': 'CSWpostfix', 'OVERVIEW': 'CSWpostfix', 'showq.8.html': 'CSWpostfix', 'XFORWARD_README.html': 'CSWpostfix', 'pickup.8.html': 'CSWpostfix', 'master.5.html': 'CSWpostfix', 'smtpd.8': 'CSWpostfix', 'ADDRESS_VERIFICATION_README': 'CSWpo stfix', 'discard.8': 'CSWpostfix', 'IPV6_README': 'CSWpostfix', 'local': 'CSWpostfix', 'qmgr.8': 'CSWpostfix', 'local.8.html': 'CSWpostfix', 'newaliases.1': 'CSWpostfix', 'PACKAGE_README': 'CSWpostfix', 'header_checks.CSW': 'CSWpostfix', 'PACKAGE_README.html': 'CSWpostfix', 'postmap.1.html': 'CSWpostfix', 'regexp_table.5': 'CSWpostfix', 'VIRTUAL_README.html': 'CSWpostfix', 'virtual.8': 'CSWpostfix', 'postlock.1.html': 'CSWpostfix', 'postfix-wrapper': 'CSWpostfix', 'tlsmgr.8': 'CSWpostfix', 'lmtp': 'CSWpostfix', 'verify': 'CSWpostfix', 'trivial-rewrite': 'CSWpostfix', 'scache': 'CSWpostfix', 'CONNECTION_CACHE_README.html': 'CSWpostfix', 'postlog.1.html': 'CSWpostfix', 'postconf.1.html': 'CSWpostfix', 'postfix-files': 'CSWpostfix', 'VIRTUAL_README': 'CSWpostfix', 'TLS_LEGACY_README.html': 'CSWpostfix', 'LOCAL_RECIPIENT_README': 'CSWpostfix', 'TUNING_README': 'CSWpostfix', 'main.cf': 'CSWpostfix', 'postfix-wrapper.5.html': 'CSWpostfix', 'cidr_table.5': 'CSWpostfix', 'NFS_README ': 'CSWpostfix', 'flush.8': 'CSWpostfix', 'postkick.1.html': 'CSWpostfix', 'postalias': 'CSWpostfix', 'STANDARD_CONFIGURATION_README': 'CSWpostfix', 'postmulti': 'CSWpostfix', 'postqueue.1': 'CSWpostfix', 'MAILDROP_README': 'CSWpostfix', 'postqueue.1.html': 'CSWpostfix', 'postlog': 'CSWpostfix', 'postconf': 'CSWpostfix', 'nisplus_table.5.html': 'CSWpostfix', 'scache.8': 'CSWpostfix', 'aliases.5': 'CSWpostfix', 'bounce.8': 'CSWpostfix', 'ldap_table.5.html': 'CSWpostfix', 'master.5': 'CSWpostfix', 'flush': 'CSWpostfix', 'master.8': 'CSWpostfix', 'postmulti.1.html': 'CSWpostfix', 'STANDARD_CONFIGURATION_README.html': 'CSWpostfix', 'bounce.5': 'CSWpostfix', 'smtp-source.1.html': 'CSWpostfix', 'smtpd': 'CSWpostfix', 'proxymap.8.html': 'CSWpostfix', 'oqmgr.8': 'CSWpostfix', 'postkick.1': 'CSWpostfix', 'BACKSCATTER_README.html': 'CSWpostfix', 'tcp_table.5': 'CSWpostfix', 'pkginfo': 'CSWpostfix', 'postfix.1.html': 'CSWpostfix', 'post-install': 'CSWpostfix', 'access.CSW': 'CSWpostfix ', 'CONTENT_INSPECTION_README': 'CSWpostfix', 'SMTPD_POLICY_README': 'CSWpostfix', 'TLS_README.html': 'CSWpostfix', 'postconf.5': 'CSWpostfix', 'smtpd.8.html': 'CSWpostfix', 'MILTER_README': 'CSWpostfix', 'LINUX_README': 'CSWpostfix', 'SMTPD_PROXY_README.html': 'CSWpostfix', 'showq': 'CSWpostfix', 'tlsmgr': 'CSWpostfix', 'INSTALL.html': 'CSWpostfix', 'access.5.html': 'CSWpostfix', 'relocated.CSW': 'CSWpostfix', 'ULTRIX_README': 'CSWpostfix', 'sendmail': 'CSWpostfix', 'error': 'CSWpostfix', 'ETRN_README': 'CSWpostfix', 'AAAREADME': 'CSWpostfix', 'master.cf.CSW': 'CSWpostfix', 'pgsql_table.5': 'CSWpostfix', 'error.8': 'CSWpostfix', 'depend': 'CSWpostfix', 'LDAP_README': 'CSWpostfix', 'canonical.5': 'CSWpostfix', 'postmulti.1': 'CSWpostfix', 'MYSQL_README.html': 'CSWpostfix', 'qmgr.8.html': 'CSWpostfix', 'smtp.8': 'CSWpostfix', 'pipe.8.html': 'CSWpostfix', 'oqmgr': 'CSWpostfix', 'anvil': 'CSWpostfix', 'main.cf.CSW': 'CSWpostfix', 'postlock': 'CSWpostfix', 'postfix.1': 'CSWpostf ix', 'ADDRESS_CLASS_README': 'CSWpostfix', 'OVERVIEW.html': 'CSWpostfix', 'QSHAPE_README': 'CSWpostfix', 'NFS_README.html': 'CSWpostfix', 'discard': 'CSWpostfix', 'FILTER_README': 'CSWpostfix', 'lmtp.8.html': 'CSWpostfix', 'body_checks.5': 'CSWpostfix', 'generic.5.html': 'CSWpostfix', 'postdrop.1.html': 'CSWpostfix', 'error.8.html': 'CSWpostfix', 'verify.8.html': 'CSWpostfix', 'TLS_LICENSE': 'CSWpostfix', 'discard.8.html': 'CSWpostfix', 'tcp_table.5.html': 'CSWpostfix', 'header_checks.5': 'CSWpostfix', 'PGSQL_README': 'CSWpostfix', 'XFORWARD_README': 'CSWpostfix', 'postmap': 'CSWpostfix', 'proxymap': 'CSWpostfix', 'RESTRICTION_CLASS_README': 'CSWpostfix', 'LDAP_README.html': 'CSWpostfix', 'defer.8.html': 'CSWpostfix', 'flush.8.html': 'CSWpostfix', 'VERP_README': 'CSWpostfix', 'cleanup.8': 'CSWpostfix', 'XCLIENT_README.html': 'CSWpostfix', 'virtual.CSW': 'CSWpostfix', 'qmqpd.8.html': 'CSWpostfix', 'cleanup.8.html': 'CSWpostfix', 'postdrop': 'CSWpostfix', 'qshape.1.html': 'CSW postfix', 'VERP_README.html': 'CSWpostfix', 'SCHEDULER_README.html': 'CSWpostfix', 'trivial-rewrite.8.html': 'CSWpostfix', 'postqueue': 'CSWpostfix', 'master': 'CSWpostfix', 'oqmgr.8.html': 'CSWpostfix', 'trivial-rewrite.8': 'CSWpostfix', 'master.8.html': 'CSWpostfix', 'PGSQL_README.html': 'CSWpostfix', 'STRESS_README': 'CSWpostfix', 'header_checks.5.html': 'CSWpostfix', 'canonical.CSW': 'CSWpostfix', 'relocated.5.html': 'CSWpostfix', 'TLS_README': 'CSWpostfix', 'BACKSCATTER_README': 'CSWpostfix', 'pcre_table.5': 'CSWpostfix', 'postfix-script': 'CSWpostfix', 'qmqp-source.1.html': 'CSWpostfix', 'postcat': 'CSWpostfix', 'transport.5': 'CSWpostfix', 'defer.8': 'CSWpostfix', 'bounce': 'CSWpostfix', 'postsuper.1': 'CSWpostfix', 'LINUX_README.html': 'CSWpostfix', 'index.html': 'CSWpostfix', 'postdrop.1': 'CSWpostfix', 'transport.CSW': 'CSWpostfix', 'ADDRESS_REWRITING_README.html': 'CSWpostfix', 'pipe.8': 'CSWpostfix', 'proxymap.8': 'CSWpostfix', 'DB_README.html': 'CSWpostfix', 'LO CAL_RECIPIENT_README.html': 'CSWpostfix', 'UUCP_README': 'CSWpostfix', 'postcat.1.html': 'CSWpostfix', 'ldap_table.5': 'CSWpostfix', 'pkgmap': 'CSWpostfix', 'postmulti-script': 'CSWpostfix', 'BUILTIN_FILTER_README.html': 'CSWpostfix', 'SMTPD_POLICY_README.html': 'CSWpostfix', 'main.cf.default': 'CSWpostfix', 'postfix-wrapper.5': 'CSWpostfix', 'IPV6_README.html': 'CSWpostfix', 'qmqpd.8': 'CSWpostfix', 'spawn': 'CSWpostfix', 'mailq.1': 'CSWpostfix', 'DB_README': 'CSWpostfix', 'pickup': 'CSWpostfix', 'BASIC_CONFIGURATION_README.html': 'CSWpostfix', 'postsuper.1.html': 'CSWpostfix', 'cswpostfix': 'CSWpostfix', 'postconf.5.html': 'CSWpostfix', 'CDB_README.html': 'CSWpostfix', 'BUILTIN_FILTER_README': 'CSWpostfix', 'SMTPD_ACCESS_README': 'CSWpostfix', 'TLS_LEGACY_README': 'CSWpostfix', 'virtual.8.html': 'CSWpostfix', 'DATABASE_README': 'CSWpostfix', 'lmtp.8': 'CSWpostfix', 'spawn.8.html': 'CSWpostfix', 'access.5': 'CSWpostfix', 'ADDRESS_REWRITING_README': 'CSWpostfix', 'aliases.CS W': 'CSWpostfix', 'SASL_README': 'CSWpostfix', 'pcre_table.5.html': 'CSWpostfix', 'MYSQL_README': 'CSWpostfix', 'ADDRESS_VERIFICATION_README.html': 'CSWpostfix', 'mysql_table.5': 'CSWpostfix', 'DSN_README.html': 'CSWpostfix', 'DATABASE_README.html': 'CSWpostfix', 'postfix-manuals.html': 'CSWpostfix', 'SCHEDULER_README': 'CSWpostfix', 'SMTPD_ACCESS_README.html': 'CSWpostfix', 'postlog.1': 'CSWpostfix', 'nqmgr': 'CSWpostfix', 'nisplus_table.5': 'CSWpostfix', 'local.8': 'CSWpostfix', 'smtp-sink.1.html': 'CSWpostfix', 'ADDRESS_CLASS_README.html': 'CSWpostfix', 'cleanup': 'CSWpostfix', 'QSHAPE_README.html': 'CSWpostfix', 'virtual.5.html': 'CSWpostfix', 'XCLIENT_README': 'CSWpostfix', 'UUCP_README.html': 'CSWpostfix', 'relocated.5': 'CSWpostfix', 'RELEASE_NOTES': 'CSWpostfix', 'canonical.5.html': 'CSWpostfix', 'checkinstall': 'CSWpostfix', 'INSTALL': 'CSWpostfix', 'PCRE_README': 'CSWpostfix', 'postalias.1.html': 'CSWpostfix', 'postcat.1': 'CSWpostfix', 'sendmail.1': 'CSWpostfix', 'bounce.cf.default': 'CSWpostfix', 'postfix-logo.jpg': 'CSWpostfix', 'TUNING_README.html': 'CSWpostfix', 'anvil.8.html': 'CSWpostfix', 'mysql_table.5.html': 'CSWpostfix', 'RESTRICTION_CLASS_README.html': 'CSWpostfix', 'master.cf': 'CSWpostfix', 'postkick': 'CSWpostfix', 'MULTI_INSTANCE_README.html': 'CSWpostfix', 'spawn.8': 'CSWpostfix', 'DEBUG_README': 'CSWpostfix', 'postalias.1': 'CSWpostfix', 'PCRE_README.html': 'CSWpostfix', 'postfix': 'CSWpostfix', 'DEBUG_README.html': 'CSWpostfix', 'MILTER_README.html': 'CSWpostfix', 'MAILDROP_README.html': 'CSWpostfix', 'aliases.5.html': 'CSWpostfix', 'pipe': 'CSWpostfix', 'SMTPD_PROXY_README': 'CSWpostfix', 'regexp_table.5.html': 'CSWpostfix', 'postmap.1': 'CSWpostfix', 'transport.5.html': 'CSWpostfix', 'qmqp-sink.1.html': 'CSWpostfix', 'DSN_README': 'CSWpostfix', 'anvil.8': 'CSWpostfix', 'virtual.5': 'CSWpostfix', 'generic.5': 'CSWpostfix'} +DATA_LINES_BY_SONAME = {'libresolv.so.2': u'/usr/lib/sparcv9/libresolv.so.2 f none 0755 root bin 448048 5947 1234567885 SUNWcslx', 'libnsl.so.1': u'/usr/lib/sparcv9/libnsl.so.1 f none 0755 root bin 1099248 7581 1217954364 SUNWcslx', 'libsasl2.so.2': u'/opt/csw/lib/libsasl2.so.2=libsasl2.so.2.0.22 s none CSWsasl', 'libmysqlclient.so.15': u'/opt/csw/mysql5/lib/mysql/libmysqlclient.so.15=libmysqlclient.so.15.0.0 s none CSWmysql5rt', 'libpcre.so.0': u'/opt/csw/lib/sparcv9/libpcre.so.0=libpcre.so.0.0.1 s none CSWpcrert', 'libssl.so.0.9.8': u'/opt/csw/lib/sparcv9/libssl.so.0.9.8 f none 0755 root bin 427792 46460 1261308405 CSWosslrt', 'libldap-2.3.so.0': u'/opt/csw/lib/sparcv9/libldap-2.3.so.0=libldap-2.3.so.0.2.27 s none CSWoldaprt', 'libcrypto.so.0.9.8': u'/opt/csw/lib/sparcv9/libcrypto.so.0.9.8 f none 0755 root bin 2520480 3820 1261308405 CSWosslrt', 'libsocket.so.1': u'/usr/lib/sparcv9/libsocket.so.1 f none 0755 root bin 96448 3175 1210705279 SUNWcslx', 'libc.so.1': u '/usr/lib/sparcv9/libc.so.1 f none 0755 root bin 1271000 23501 1217954364 SUNWcslx', 'liblber-2.3.so.0': u'/opt/csw/lib/sparcv9/liblber-2.3.so.0=liblber-2.3.so.0.2.27 s none CSWoldaprt'} +DATA_PKGMAP_CACHE = {'libresolv.so.2': {u'/usr/lib/sparcv9': u'/usr/lib/sparcv9/libresolv.so.2 f none 0755 root bin 448048 5947 1234567885 SUNWcslx', u'/usr/lib': u'/usr/lib/libresolv.so.2 f none 0755 root bin 392904 57407 1234567884 SUNWcsl'}, 'libdb-4.2.so': {u'/opt/csw/bdb42/lib': u'/opt/csw/bdb42/lib/libdb-4.2.so f none 0755 root bin 1327544 49309 1254747864 CSWbdb42', u'/opt/csw/bdb42/lib/sparcv9': u'/opt/csw/bdb42/lib/sparcv9/libdb-4.2.so f none 0755 root bin 1450608 31012 1254748763 CSWbdb42'}, 'libsasl2.so.2': {u'/opt/csw/lib': u'/opt/csw/lib/libsasl2.so.2=libsasl2.so.2.0.22 s none CSWsasl'}, 'libmysqlclient.so.15': {u'/opt/csw/mysql5/lib/mysql': u'/opt/csw/mysql5/lib/mysql/libmysqlclient.so.15=libmysqlclient.so.15.0.0 s none CSWmysql5rt', u'/opt/csw/mysql5/lib/sparcv9/mysql': u'/opt/csw/mysql5/lib/sparcv9/mysql/libmysqlclient.so.15=libmysqlclient.so.15.0.0 s none CSWmysql5rt'}, 'libpcre.so.0': {u'/opt/csw/lib': u'/opt/csw/lib/libpcre.so.0=libpcre.so.0.0. 1 s none CSWpcrert', u'/opt/csw/lib/sparcv9': u'/opt/csw/lib/sparcv9/libpcre.so.0=libpcre.so.0.0.1 s none CSWpcrert'}, 'libssl.so.0.9.8': {u'/opt/csw/lib/sparcv8plus+vis': u'/opt/csw/lib/sparcv8plus+vis/libssl.so.0.9.8 f none 0755 root bin 375532 23572 1261306582 CSWosslrt', u'/opt/csw/lib': u'/opt/csw/lib/libssl.so.0.9.8 f none 0555 root bin 372000 63313 1261304839 CSWosslrt', u'/opt/csw/lib/sparcv9': u'/opt/csw/lib/sparcv9/libssl.so.0.9.8 f none 0755 root bin 427792 46460 1261308405 CSWosslrt'}, 'libldap-2.3.so.0': {u'/opt/csw/lib': u'/opt/csw/lib/libldap-2.3.so.0=libldap-2.3.so.0.2.27 s none CSWoldaprt', u'/opt/csw/lib/sparcv9': u'/opt/csw/lib/sparcv9/libldap-2.3.so.0=libldap-2.3.so.0.2.27 s none CSWoldaprt'}, 'libnsl.so.1': {u'/usr/lib/sparcv9': u'/usr/lib/sparcv9/libnsl.so.1 f none 0755 root bin 1099248 7581 1217954364 SUNWcslx', u'/usr/lib': u'/usr/lib/libnsl.so.1 f none 0755 root bin 920500 29766 1217954358 SUNWcsl'}, 'libcrypto.so.0.9.8': {u'/opt/csw/lib/sparcv8plus+ vis': u'/opt/csw/lib/sparcv8plus+vis/libcrypto.so.0.9.8 f none 0755 root bin 2194440 48878 1261306582 CSWosslrt', u'/opt/csw/lib': u'/opt/csw/lib/libcrypto.so.0.9.8 f none 0555 root bin 2166696 48180 1261304839 CSWosslrt', u'/opt/csw/lib/sparcv9': u'/opt/csw/lib/sparcv9/libcrypto.so.0.9.8 f none 0755 root bin 2520480 3820 1261308405 CSWosslrt'}, 'libsocket.so.1': {u'/usr/lib/sparcv9': u'/usr/lib/sparcv9/libsocket.so.1 f none 0755 root bin 96448 3175 1210705279 SUNWcslx', u'/usr/lib': u'/usr/lib/libsocket.so.1 f none 0755 root bin 70860 28509 1210705279 SUNWcsl'}, 'libc.so.1': {u'/usr/lib/libp/sparcv9': u'/usr/lib/libp/sparcv9/libc.so.1 f none 0755 root bin 1395296 13745 1217954372 SUNWdplx', u'/usr/lib/sparcv9': u'/usr/lib/sparcv9/libc.so.1 f none 0755 root bin 1271000 23501 1217954364 SUNWcslx', u'/usr/lib': u'/usr/lib/libc.so.1 f none 0755 root bin 1157948 58901 1217954358 SUNWcsl'}, 'liblber-2.3.so.0': {u'/opt/csw/lib': u'/opt/csw/lib/liblber-2.3.so.0=liblber-2.3.so.0.2.2 7 s none CSWoldaprt', u'/opt/csw/lib/sparcv9': u'/opt/csw/lib/sparcv9/liblber-2.3.so.0=liblber-2.3.so.0.2.27 s none CSWoldaprt'}, 'libpq.so.5': {u'/opt/csw/postgresql/lib': u'/opt/csw/postgresql/lib/libpq.so.5=libpq.so.5.1 s none CSWlibpq', u'/opt/csw/postgresql/lib/sparcv9': u'/opt/csw/postgresql/lib/sparcv9/libpq.so.5=libpq.so.5.1 s none CSWlibpq'}} +DATA_BINARIES_BY_SONAME = {'libresolv.so.2': set(['postmulti', 'spawn', 'postkick', 'postlog', 'postconf', 'bounce', 'qmqpd', 'virtual', 'flush', 'proxymap', 'scache', 'anvil', 'verify', 'postalias', 'postcat', 'nqmgr', 'pickup', 'oqmgr', 'master', 'postqueue', 'postmap', 'local', 'showq', 'sendmail', 'discard', 'lmtp', 'postdrop', 'trivial-rewrite', 'postfix', 'postlock', 'pipe', 'tlsmgr', 'error', 'smtpd', 'postsuper', 'cleanup']), 'libdb-4.2.so': set(['postmulti', 'spawn', 'postkick', 'postlog', 'postconf', 'bounce', 'qmqpd', 'virtual', 'flush', 'proxymap', 'scache', 'anvil', 'verify', 'postalias', 'postcat', 'nqmgr', 'pickup', 'oqmgr', 'master', 'postqueue', 'postmap', 'local', 'showq', 'sendmail', 'discard', 'lmtp', 'postdrop', 'trivial-rewrite', 'postfix', 'postlock', 'pipe', 'tlsmgr', 'error', 'smtpd', 'postsuper', 'cleanup']), 'libsasl2.so.2': set(['postmulti', 'spawn', 'postkick', 'postlog', 'postconf', 'bounce', 'qmqpd', 'virtual', 'flush', 'proxymap', 'scach e', 'anvil', 'verify', 'postalias', 'postcat', 'nqmgr', 'pickup', 'oqmgr', 'master', 'postqueue', 'postmap', 'local', 'showq', 'sendmail', 'discard', 'lmtp', 'postdrop', 'trivial-rewrite', 'postfix', 'postlock', 'pipe', 'tlsmgr', 'error', 'smtpd', 'postsuper', 'cleanup']), 'libmysqlclient.so.15': set(['postmulti', 'spawn', 'postkick', 'postlog', 'postconf', 'bounce', 'qmqpd', 'virtual', 'flush', 'proxymap', 'scache', 'anvil', 'verify', 'postalias', 'postcat', 'nqmgr', 'pickup', 'oqmgr', 'master', 'postqueue', 'postmap', 'local', 'showq', 'sendmail', 'discard', 'lmtp', 'postdrop', 'trivial-rewrite', 'postfix', 'postlock', 'pipe', 'tlsmgr', 'error', 'smtpd', 'postsuper', 'cleanup']), 'libpcre.so.0': set(['postmulti', 'spawn', 'postkick', 'postlog', 'postconf', 'bounce', 'qmqpd', 'virtual', 'flush', 'proxymap', 'scache', 'anvil', 'verify', 'postalias', 'postcat', 'nqmgr', 'pickup', 'oqmgr', 'master', 'postqueue', 'postmap', 'local', 'showq', 'sendmail', 'discard', 'lmtp', 'post drop', 'trivial-rewrite', 'postfix', 'postlock', 'pipe', 'tlsmgr', 'error', 'smtpd', 'postsuper', 'cleanup']), 'libssl.so.0.9.8': set(['postmulti', 'spawn', 'postkick', 'postlog', 'postconf', 'bounce', 'qmqpd', 'virtual', 'flush', 'proxymap', 'scache', 'anvil', 'verify', 'postalias', 'postcat', 'nqmgr', 'pickup', 'oqmgr', 'master', 'postqueue', 'postmap', 'local', 'showq', 'sendmail', 'discard', 'lmtp', 'postdrop', 'trivial-rewrite', 'postfix', 'postlock', 'pipe', 'tlsmgr', 'error', 'smtpd', 'postsuper', 'cleanup']), 'libldap-2.3.so.0': set(['postmulti', 'spawn', 'postkick', 'postlog', 'postconf', 'bounce', 'qmqpd', 'virtual', 'flush', 'proxymap', 'scache', 'anvil', 'verify', 'postalias', 'postcat', 'nqmgr', 'pickup', 'oqmgr', 'master', 'postqueue', 'postmap', 'local', 'showq', 'sendmail', 'discard', 'lmtp', 'postdrop', 'trivial-rewrite', 'postfix', 'postlock', 'pipe', 'tlsmgr', 'error', 'smtpd', 'postsuper', 'cleanup']), 'libnsl.so.1': set(['postmulti', 'spawn', 'postkick', 'postlog', 'postconf', 'bounce', 'qmqpd', 'virtual', 'flush', 'proxymap', 'scache', 'anvil', 'verify', 'postalias', 'postcat', 'nqmgr', 'pickup', 'oqmgr', 'master', 'postqueue', 'postmap', 'local', 'showq', 'sendmail', 'discard', 'lmtp', 'postdrop', 'trivial-rewrite', 'postfix', 'postlock', 'pipe', 'tlsmgr', 'error', 'smtpd', 'postsuper', 'cleanup']), 'libcrypto.so.0.9.8': set(['postmulti', 'spawn', 'postkick', 'postlog', 'postconf', 'bounce', 'qmqpd', 'virtual', 'flush', 'proxymap', 'scache', 'anvil', 'verify', 'postalias', 'postcat', 'nqmgr', 'pickup', 'oqmgr', 'master', 'postqueue', 'postmap', 'local', 'showq', 'sendmail', 'discard', 'lmtp', 'postdrop', 'trivial-rewrite', 'postfix', 'postlock', 'pipe', 'tlsmgr', 'error', 'smtpd', 'postsuper', 'cleanup']), 'libc.so.1': set(['postmulti', 'spawn', 'postkick', 'postlog', 'postconf', 'bounce', 'qmqpd', 'virtual', 'flush', 'proxymap', 'scache', 'anvil', 'verify', 'postalias', 'postcat', 'nqmgr', 'pickup', 'oqmgr', 'master', 'p ostqueue', 'postmap', 'local', 'showq', 'sendmail', 'discard', 'lmtp', 'postdrop', 'trivial-rewrite', 'postfix', 'postlock', 'pipe', 'tlsmgr', 'error', 'smtpd', 'postsuper', 'cleanup']), 'libsocket.so.1': set(['postmulti', 'spawn', 'postkick', 'postlog', 'postconf', 'bounce', 'qmqpd', 'virtual', 'flush', 'proxymap', 'scache', 'anvil', 'verify', 'postalias', 'postcat', 'nqmgr', 'pickup', 'oqmgr', 'master', 'postqueue', 'postmap', 'local', 'showq', 'sendmail', 'discard', 'lmtp', 'postdrop', 'trivial-rewrite', 'postfix', 'postlock', 'pipe', 'tlsmgr', 'error', 'smtpd', 'postsuper', 'cleanup']), 'liblber-2.3.so.0': set(['postmulti', 'spawn', 'postkick', 'postlog', 'postconf', 'bounce', 'qmqpd', 'virtual', 'flush', 'proxymap', 'scache', 'anvil', 'verify', 'postalias', 'postcat', 'nqmgr', 'pickup', 'oqmgr', 'master', 'postqueue', 'postmap', 'local', 'showq', 'sendmail', 'discard', 'lmtp', 'postdrop', 'trivial-rewrite', 'postfix', 'postlock', 'pipe', 'tlsmgr', 'error', 'smtpd', 'pos tsuper', 'cleanup']), 'libpq.so.5': set(['postmulti', 'spawn', 'postkick', 'postlog', 'postconf', 'bounce', 'qmqpd', 'virtual', 'flush', 'proxymap', 'scache', 'anvil', 'verify', 'postalias', 'postcat', 'nqmgr', 'pickup', 'oqmgr', 'master', 'postqueue', 'postmap', 'local', 'showq', 'sendmail', 'discard', 'lmtp', 'postdrop', 'trivial-rewrite', 'postfix', 'postlock', 'pipe', 'tlsmgr', 'error', 'smtpd', 'postsuper', 'cleanup'])} +DATA_ISALIST = ['sparcv9+vis2', 'sparcv9+vis', 'sparcv9', 'sparcv8plus+vis2', 'sparcv8plus+vis', 'sparcv8plus', 'sparcv8', 'sparcv8-fsmuld', 'sparcv7', 'sparc'] This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Thu Jan 14 23:25:38 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 14 Jan 2010 22:25:38 +0000 Subject: [csw-devel] SF.net SVN: gar:[8000] csw/mgar/pkg/libidn/tags/libidn-1.15, REV=2009.06.10/ Message-ID: Revision: 8000 http://gar.svn.sourceforge.net/gar/?rev=8000&view=rev Author: dmichelsen Date: 2010-01-14 22:25:38 +0000 (Thu, 14 Jan 2010) Log Message: ----------- libidn: Tag libidn-1.15,REV=2009.06.10 Added Paths: ----------- csw/mgar/pkg/libidn/tags/libidn-1.15,REV=2009.06.10/ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Thu Jan 14 23:29:34 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 14 Jan 2010 22:29:34 +0000 Subject: [csw-devel] SF.net SVN: gar:[8001] csw/mgar/pkg/libidn/trunk Message-ID: Revision: 8001 http://gar.svn.sourceforge.net/gar/?rev=8001&view=rev Author: dmichelsen Date: 2010-01-14 22:29:34 +0000 (Thu, 14 Jan 2010) Log Message: ----------- libidn: Re-add check Modified Paths: -------------- csw/mgar/pkg/libidn/trunk/Makefile csw/mgar/pkg/libidn/trunk/checksums Modified: csw/mgar/pkg/libidn/trunk/Makefile =================================================================== --- csw/mgar/pkg/libidn/trunk/Makefile 2010-01-14 22:25:38 UTC (rev 8000) +++ csw/mgar/pkg/libidn/trunk/Makefile 2010-01-14 22:29:34 UTC (rev 8001) @@ -1,5 +1,5 @@ GARNAME = libidn -GARVERSION = 1.15 +GARVERSION = 1.16 CATEGORIES = lib DESCRIPTION = GNU IDN Library @@ -25,8 +25,6 @@ CONFIGURE_ARGS = $(DIRPATHS) -# The failing test is due to a bug in libiconv. This is fixed in libiconv 0.13 -#TEST_TARGET = check -TEST_TARGET = +TEST_TARGET = check include gar/category.mk Modified: csw/mgar/pkg/libidn/trunk/checksums =================================================================== --- csw/mgar/pkg/libidn/trunk/checksums 2010-01-14 22:25:38 UTC (rev 8000) +++ csw/mgar/pkg/libidn/trunk/checksums 2010-01-14 22:29:34 UTC (rev 8001) @@ -1 +1 @@ -482a25b7b223e52f967fafd284a1a992 download/libidn-1.15.tar.gz +a6af62602fa71bc1b90ce246dd208bd6 libidn-1.16.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Thu Jan 14 23:36:58 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 14 Jan 2010 22:36:58 +0000 Subject: [csw-devel] SF.net SVN: gar:[8002] csw/mgar/pkg/libidn/trunk/Makefile Message-ID: Revision: 8002 http://gar.svn.sourceforge.net/gar/?rev=8002&view=rev Author: dmichelsen Date: 2010-01-14 22:36:58 +0000 (Thu, 14 Jan 2010) Log Message: ----------- libidn: Do not set LD_OPTIONS or test breaks. This is known behaviour from Simon Joseffsons packages Modified Paths: -------------- csw/mgar/pkg/libidn/trunk/Makefile Modified: csw/mgar/pkg/libidn/trunk/Makefile =================================================================== --- csw/mgar/pkg/libidn/trunk/Makefile 2010-01-14 22:29:34 UTC (rev 8001) +++ csw/mgar/pkg/libidn/trunk/Makefile 2010-01-14 22:36:58 UTC (rev 8002) @@ -18,10 +18,13 @@ UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz +REQUIRED_PKGS = CSWggettextrt CSWiconv + BUILD64 = 1 NO_ISAEXEC = 1 -REQUIRED_PKGS = CSWggettextrt CSWiconv +# We don't need it and if defined the test breaks +LD_OPTIONS = CONFIGURE_ARGS = $(DIRPATHS) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Thu Jan 14 23:55:54 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 14 Jan 2010 22:55:54 +0000 Subject: [csw-devel] SF.net SVN: gar:[8003] csw/mgar/pkg/libidn/trunk/Makefile Message-ID: Revision: 8003 http://gar.svn.sourceforge.net/gar/?rev=8003&view=rev Author: dmichelsen Date: 2010-01-14 22:55:54 +0000 (Thu, 14 Jan 2010) Log Message: ----------- libidn: Move in runtime flags over different variable Modified Paths: -------------- csw/mgar/pkg/libidn/trunk/Makefile Modified: csw/mgar/pkg/libidn/trunk/Makefile =================================================================== --- csw/mgar/pkg/libidn/trunk/Makefile 2010-01-14 22:36:58 UTC (rev 8002) +++ csw/mgar/pkg/libidn/trunk/Makefile 2010-01-14 22:55:54 UTC (rev 8003) @@ -25,6 +25,7 @@ # We don't need it and if defined the test breaks LD_OPTIONS = +EXTRA_LINKER_FLAGS = $(RUNPATH_LINKER_FLAGS) CONFIGURE_ARGS = $(DIRPATHS) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Fri Jan 15 02:09:57 2010 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Fri, 15 Jan 2010 01:09:57 +0000 Subject: [csw-devel] SF.net SVN: gar:[8004] csw/mgar/pkg/coreutils/trunk Message-ID: Revision: 8004 http://gar.svn.sourceforge.net/gar/?rev=8004&view=rev Author: bdwalton Date: 2010-01-15 01:09:57 +0000 (Fri, 15 Jan 2010) Log Message: ----------- coreutils: bump to 8.4 Modified Paths: -------------- csw/mgar/pkg/coreutils/trunk/Makefile csw/mgar/pkg/coreutils/trunk/checksums Modified: csw/mgar/pkg/coreutils/trunk/Makefile =================================================================== --- csw/mgar/pkg/coreutils/trunk/Makefile 2010-01-14 22:55:54 UTC (rev 8003) +++ csw/mgar/pkg/coreutils/trunk/Makefile 2010-01-15 01:09:57 UTC (rev 8004) @@ -1,5 +1,5 @@ GARNAME = coreutils -GARVERSION = 8.3 +GARVERSION = 8.4 CATEGORIES = utils # seq has issues related to the handling of long double's with -O2. Modified: csw/mgar/pkg/coreutils/trunk/checksums =================================================================== --- csw/mgar/pkg/coreutils/trunk/checksums 2010-01-14 22:55:54 UTC (rev 8003) +++ csw/mgar/pkg/coreutils/trunk/checksums 2010-01-15 01:09:57 UTC (rev 8004) @@ -1,2 +1,2 @@ 0fde2b11f34c49995765566acf6cd5b4 0001-Fix-solaris-acl-support-breakage.patch -3961aee7ac96434a1831580e0b7ad227 coreutils-8.3.tar.gz +56f549854d723d9dcebb77919019df55 coreutils-8.4.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From skayser at users.sourceforge.net Fri Jan 15 03:07:20 2010 From: skayser at users.sourceforge.net (skayser at users.sourceforge.net) Date: Fri, 15 Jan 2010 02:07:20 +0000 Subject: [csw-devel] SF.net SVN: gar:[8005] csw/mgar/pkg/httping/trunk Message-ID: Revision: 8005 http://gar.svn.sourceforge.net/gar/?rev=8005&view=rev Author: skayser Date: 2010-01-15 02:07:19 +0000 (Fri, 15 Jan 2010) Log Message: ----------- httping: tweaked Makefile patch, updated changelog.CSW Modified Paths: -------------- csw/mgar/pkg/httping/trunk/Makefile csw/mgar/pkg/httping/trunk/checksums csw/mgar/pkg/httping/trunk/files/0001-Makefile-make-options-and-tools-configurable.patch csw/mgar/pkg/httping/trunk/files/changelog.CSW Modified: csw/mgar/pkg/httping/trunk/Makefile =================================================================== --- csw/mgar/pkg/httping/trunk/Makefile 2010-01-15 01:09:57 UTC (rev 8004) +++ csw/mgar/pkg/httping/trunk/Makefile 2010-01-15 02:07:19 UTC (rev 8005) @@ -1,6 +1,7 @@ -# TODO (release-critical prefixed with !, non release-critical with *) -# * Submit 0001-* patch upstream -# * -6 not documented in man page (any others?), feedback to upstream +# Known issue: +# - Options -C, -6, and -y not documented in man page. Reported upstream, +# feedback pending. +# GARNAME = httping GARVERSION = 1.4.1 CATEGORIES = net @@ -20,6 +21,7 @@ REQUIRED_PKGS = CSWosslrt # Makefile comes pre-set with gcc defaults and hardcoded tools +# Already submitted upstream, feedback pending. PATCHFILES = 0001-Makefile-make-options-and-tools-configurable.patch CONFIGURE_SCRIPTS = Modified: csw/mgar/pkg/httping/trunk/checksums =================================================================== --- csw/mgar/pkg/httping/trunk/checksums 2010-01-15 01:09:57 UTC (rev 8004) +++ csw/mgar/pkg/httping/trunk/checksums 2010-01-15 02:07:19 UTC (rev 8005) @@ -1,2 +1,2 @@ -828d966da2d49e3300a0914e8d6f7b16 0001-Makefile-make-options-and-tools-configurable.patch +5ddf24edea5117b38507259359c27631 0001-Makefile-make-options-and-tools-configurable.patch bde1ff3c01343d2371d8f34fbf8a1d9a httping-1.4.1.tgz Modified: csw/mgar/pkg/httping/trunk/files/0001-Makefile-make-options-and-tools-configurable.patch =================================================================== --- csw/mgar/pkg/httping/trunk/files/0001-Makefile-make-options-and-tools-configurable.patch 2010-01-15 01:09:57 UTC (rev 8004) +++ csw/mgar/pkg/httping/trunk/files/0001-Makefile-make-options-and-tools-configurable.patch 2010-01-15 02:07:19 UTC (rev 8005) @@ -1,14 +1,14 @@ -From f252b0a2a7f87d34dbcdf8bcccde9e6069ac9729 Mon Sep 17 00:00:00 2001 +From 4d95ec1e711a77139cb3f9e53463d2b01aa1fcdb Mon Sep 17 00:00:00 2001 From: Sebastian Kayser -Date: Tue, 12 Jan 2010 01:10:31 +0100 +Date: Fri, 15 Jan 2010 02:39:30 +0100 Subject: [PATCH] Makefile: make options and tools configurable --- - Makefile | 18 +++++++++--------- - 1 files changed, 9 insertions(+), 9 deletions(-) + Makefile | 20 ++++++++++---------- + 1 files changed, 10 insertions(+), 10 deletions(-) diff --git a/Makefile b/Makefile -index 873c57e..0133741 100644 +index c27bf22..0133741 100644 --- a/Makefile +++ b/Makefile @@ -16,26 +16,26 @@ include version @@ -47,6 +47,15 @@ OBJS=mem.o http.o io.o str.o error.o utils.o main.o tcp.o res.o +@@ -62,7 +62,7 @@ endif + all: $(TARGET) + + $(TARGET): $(OBJS) +- $(CC) $(WFLAGS) $(OBJS) $(LDFLAGS) -o $(TARGET) ++ $(CC) $(CFLAGS) $(OBJS) $(LDFLAGS) -o $(TARGET) + # + # Oh, blatant plug: http://keetweej.vanheusden.com/wishlist.html + -- -1.6.5.1 +1.6.6 Modified: csw/mgar/pkg/httping/trunk/files/changelog.CSW =================================================================== --- csw/mgar/pkg/httping/trunk/files/changelog.CSW 2010-01-15 01:09:57 UTC (rev 8004) +++ csw/mgar/pkg/httping/trunk/files/changelog.CSW 2010-01-15 02:07:19 UTC (rev 8005) @@ -1,11 +1,11 @@ -httping (1.4.1,REV=2010.01.12) +httping (1.4.1,REV=2010.01.15) - * Updated to 1.4.1 + * Updated to 1.4.1 (Closes #4157) - -- Sebastian Kayser Tue, 12 Jan 2010 02:08:40 +0100 + -- Sebastian Kayser Fri, 15 Jan 2010 03:01:27 +0100 httping (1.3.0,REV=2009.05.31) - * Adopted and updated to 1.3.0 (Closes: #3458, #2391). + * Adopted and updated to 1.3.0 (Closes: #3458, #2391) -- Sebastian Kayser Sun, 31 May 2009 18:35:11 +0200 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From hson at users.sourceforge.net Fri Jan 15 03:35:56 2010 From: hson at users.sourceforge.net (hson at users.sourceforge.net) Date: Fri, 15 Jan 2010 02:35:56 +0000 Subject: [csw-devel] SF.net SVN: gar:[8006] csw/mgar/pkg/libproxy Message-ID: Revision: 8006 http://gar.svn.sourceforge.net/gar/?rev=8006&view=rev Author: hson Date: 2010-01-15 02:35:56 +0000 (Fri, 15 Jan 2010) Log Message: ----------- libproxy: Fixes for Solaris 8 compatibility Modified Paths: -------------- csw/mgar/pkg/libproxy/trunk/Makefile csw/mgar/pkg/libproxy/trunk/checksums Added Paths: ----------- csw/mgar/pkg/libproxy/Makefile csw/mgar/pkg/libproxy/trunk/files/Solaris8-have-no-stdc99-flag.patch csw/mgar/pkg/libproxy/trunk/files/SunStudio-have-no-stdc99-flag.patch csw/mgar/pkg/libproxy/trunk/files/proxy.c.patch csw/mgar/pkg/libproxy/trunk/files/stdfiles.patch Added: csw/mgar/pkg/libproxy/Makefile =================================================================== --- csw/mgar/pkg/libproxy/Makefile (rev 0) +++ csw/mgar/pkg/libproxy/Makefile 2010-01-15 02:35:56 UTC (rev 8006) @@ -0,0 +1,15 @@ +# vim: ft=make ts=4 sw=4 noet + +default: + @echo "You are in the pkg/ directory." + +%: + $(MAKE) -C trunk $* + +paranoid-%: + $(MAKE) -C trunk $* || exit 2 + +export BUILDLOG ?= $(shell pwd)/buildlog.txt + +report-%: + $(MAKE) -C trunk $* || echo " *** make $* in $$i failed ***" >> $(BUILDLOG) Modified: csw/mgar/pkg/libproxy/trunk/Makefile =================================================================== --- csw/mgar/pkg/libproxy/trunk/Makefile 2010-01-15 02:07:19 UTC (rev 8005) +++ csw/mgar/pkg/libproxy/trunk/Makefile 2010-01-15 02:35:56 UTC (rev 8006) @@ -13,21 +13,65 @@ MASTER_SITES = http://libproxy.googlecode.com/files/ DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz -PATCHFILES = 0001-Use-xc99-for-Sun-Studio-compiler.patch +#PATCHFILES = 0001-Use-xc99-for-Sun-Studio-compiler.patch PATCHFILES += 0002-Dont-preset-CFLAGS.patch +# For Solaris 10 targets +#PATCHFILES_isa-amd64 += SunStudio-have-no-stdc99-flag.patch +#PATCHFILES_isa-sparcv8 += SunStudio-have-no-stdc99-flag.patch +#PATCHFILES_isa-sparcv9 += SunStudio-have-no-stdc99-flag.patch +#PATCHFILES_isa-i386 += SunStudio-have-no-stdc99-flag.patch +#For Solaris 8 targets +PATCHFILES_isa-amd64 += SunStudio-have-no-stdc99-flag.patch +PATCHFILES_isa-sparcv8 += Solaris8-have-no-stdc99-flag.patch +PATCHFILES_isa-sparcv8 += stdfiles.patch +PATCHFILES_isa-sparcv8 += proxy.c.patch +PATCHFILES_isa-sparcv9 += Solaris8-have-no-stdc99-flag.patch +PATCHFILES_isa-sparcv9 += stdfiles.patch +PATCHFILES_isa-sparcv9 += proxy.c.patch +PATCHFILES_isa-i386 += Solaris8-have-no-stdc99-flag.patch +PATCHFILES_isa-i386 += stdfiles.patch +PATCHFILES_isa-i386 += proxy.c.patch -# We define upstream file regex so we can be notifed of new upstream software release +PREREQUISITE_PKGS += CSWlibx11devel CSWlibxmudevel CSWlibdbusdev +#Disable Mozilla plugin until there is a 64-bit version +#PREREQUISITE_PKGS += CSWmozilla CSWseamonkey + +REQUIRED_PKGS += CSWlibice CSWlibsm CSWlibx11 CSWlibxmu CSWlibxt + UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz PACKAGING_PLATFORMS = solaris10-sparc solaris10-i386 EXTRA_LINKER_FLAGS = -lnsl BUILD64 = 1 + +EXTRA_INC = $(prefix)/X11/include +EXTRA_LIB = $(prefix)/X11/lib +EXTRA_PKG_CONFIG_DIRS = $(prefix)/X11/lib +EXTRA_PKG_CONFIG_DIRS += $(prefix)/mozilla/lib +EXTRA_PKG_CONFIG_DIRS += $(prefix)/mozilla/seamonkey/lib + + CONFIGURE_ARGS = $(DIRPATHS) +#Disable Mozilla plugin until there is a 64-bit version +CONFIGURE_ARGS += --without-mozjs +CONFIGURE_ARGS += --with-python +CONFIGURE_ARGS += --disable-silent-rules TEST_TARGET = check include gar/category.mk +#pre-configure-modulated: +# @echo " ==> Regenerating build tools..." +# @(cd $(WORKSRC) ; \ +# aclocal && \ +# autoconf && \ +# libtoolize --automake --force && \ +# aclocal && \ +# automake -a ) +# @$(MAKECOOKIE) + + # There is actually the cpp executable in /usr/lib PATH := $(PATH):/usr/lib Modified: csw/mgar/pkg/libproxy/trunk/checksums =================================================================== --- csw/mgar/pkg/libproxy/trunk/checksums 2010-01-15 02:07:19 UTC (rev 8005) +++ csw/mgar/pkg/libproxy/trunk/checksums 2010-01-15 02:35:56 UTC (rev 8006) @@ -1,3 +1,6 @@ -ce2d836df293fa8183265176459cf87e 0001-Use-xc99-for-Sun-Studio-compiler.patch acd3e61f107ff188722fb1335e0ed37c 0002-Dont-preset-CFLAGS.patch +dd08c0fd4795084e5970d59f8de149dd Solaris8-have-no-stdc99-flag.patch +95c2645311c9e840c0ed81c7a9aefadb SunStudio-have-no-stdc99-flag.patch 6ded75a6c6aef53be657ece207cc26c4 libproxy-0.3.0.tar.gz +647cefd3bb414eb269cb59aace9eb35b proxy.c.patch +7dd25dd1f615fe7a3c2a1d9c9a179e74 stdfiles.patch Added: csw/mgar/pkg/libproxy/trunk/files/Solaris8-have-no-stdc99-flag.patch =================================================================== --- csw/mgar/pkg/libproxy/trunk/files/Solaris8-have-no-stdc99-flag.patch (rev 0) +++ csw/mgar/pkg/libproxy/trunk/files/Solaris8-have-no-stdc99-flag.patch 2010-01-15 02:35:56 UTC (rev 8006) @@ -0,0 +1,134 @@ +diff -Nru libproxy-0.3.0.orig/src/bin/Makefile.am libproxy-0.3.0/src/bin/Makefile.am +--- libproxy-0.3.0.orig/src/bin/Makefile.am 2009-08-14 21:00:32.000000000 +0200 ++++ libproxy-0.3.0/src/bin/Makefile.am 2010-01-07 12:16:16.608932753 +0100 +@@ -2,5 +2,5 @@ + + # Command line interface to libproxy + proxy_SOURCES = proxy.c +-proxy_CPPFLAGS = -I$(top_srcdir)/src/lib -std=c99 ++proxy_CPPFLAGS = -I$(top_srcdir)/src/lib + proxy_LDADD = ../lib/libproxy.la +diff -Nru libproxy-0.3.0.orig/src/lib/Makefile.am libproxy-0.3.0/src/lib/Makefile.am +--- libproxy-0.3.0.orig/src/lib/Makefile.am 2009-08-14 21:00:32.000000000 +0200 ++++ libproxy-0.3.0/src/lib/Makefile.am 2010-01-07 12:17:37.568266736 +0100 +@@ -10,8 +10,8 @@ + strdict.c strdict.h \ + url.c url.h + +-libproxy_la_CFLAGS = -DMODULEDIR=\"@MODULEDIR@@DIR_SEPARATOR@\" -DSYSCONFDIR=\"@SYSCONFDIR@@DIR_SEPARATOR@\" -std=c99 -D_POSIX_C_SOURCE=200112L ++libproxy_la_CFLAGS = -DMODULEDIR=\"@MODULEDIR@@DIR_SEPARATOR@\" -DSYSCONFDIR=\"@SYSCONFDIR@@DIR_SEPARATOR@\" + libproxy_la_LDFLAGS = -lpthread -lm -no-undefined + + include_HEADERS = proxy.h + +diff -Nru libproxy-0.3.0.orig/src/lib/Makefile.in libproxy-0.3.0/src/lib/Makefile.in +--- libproxy-0.3.0.orig/src/lib/Makefile.in 2009-08-14 21:05:15.000000000 +0200 ++++ libproxy-0.3.0/src/lib/Makefile.in 2010-01-07 11:58:19.284179024 +0100 +@@ -277,7 +277,7 @@ + strdict.c strdict.h \ + url.c url.h + +-libproxy_la_CFLAGS = -DMODULEDIR=\"@MODULEDIR@@DIR_SEPARATOR@\" -DSYSCONFDIR=\"@SYSCONFDIR@@DIR_SEPARATOR@\" -std=c99 -D_POSIX_C_SOURCE=200112L ++libproxy_la_CFLAGS = -DMODULEDIR=\"@MODULEDIR@@DIR_SEPARATOR@\" -DSYSCONFDIR=\"@SYSCONFDIR@@DIR_SEPARATOR@\" + libproxy_la_LDFLAGS = -lpthread -lm -no-undefined + include_HEADERS = proxy.h + all: all-am +diff -Nru libproxy-0.3.0.orig/src/modules/Makefile.am libproxy-0.3.0/src/modules/Makefile.am +--- libproxy-0.3.0.orig/src/modules/Makefile.am 2009-08-14 21:06:30.000000000 +0200 ++++ libproxy-0.3.0/src/modules/Makefile.am 2010-01-07 12:18:24.020865842 +0100 +@@ -1,5 +1,5 @@ + moduledir = @MODULEDIR@ +-AM_CFLAGS = -std=c99 ++AM_CFLAGS = + AM_LDFLAGS = -module -avoid-version -no-undefined + + +@@ -50,7 +50,7 @@ + + # GConf/GNOME Config Module + config_gnome_la_SOURCES = config_gnome.c xhasclient.c +-config_gnome_la_CPPFLAGS = -I$(top_srcdir)/src/lib -D_POSIX_C_SOURCE=200112L -DGCONFTOOLBIN='"@GCONFTOOLBIN@"' @GNOME_CFLAGS@ ++config_gnome_la_CPPFLAGS = -I$(top_srcdir)/src/lib -DGCONFTOOLBIN='"@GCONFTOOLBIN@"' @GNOME_CFLAGS@ + config_gnome_la_LIBADD = ../lib/libproxy.la + config_gnome_la_LDFLAGS = $(AM_LDFLAGS) @GNOME_LIBS@ + +@@ -77,12 +77,12 @@ + + # IP Ignore Module + ignore_ip_la_SOURCES = ignore_ip.c +-ignore_ip_la_CPPFLAGS = -I$(top_srcdir)/src/lib -D_POSIX_C_SOURCE=200112L ++ignore_ip_la_CPPFLAGS = -I$(top_srcdir)/src/lib + ignore_ip_la_LIBADD = ../lib/libproxy.la + + # WebKit (JavaScriptCore) based PAC runner + pacrunner_webkit_la_SOURCES = pacrunner_webkit.c +-pacrunner_webkit_la_CPPFLAGS = -I$(top_srcdir)/src/lib @WEBKIT_CFLAGS@ -D_POSIX_C_SOURCE=200112L ++pacrunner_webkit_la_CPPFLAGS = -I$(top_srcdir)/src/lib @WEBKIT_CFLAGS@ + pacrunner_webkit_la_LIBADD = ../lib/libproxy.la + if MINGW32 + pacrunner_webkit_la_LIBADD += ../platform/win32/libwinutils.la +@@ -92,7 +92,7 @@ + + # Mozilla (Spidermonkey) based PAC runner + pacrunner_mozjs_la_SOURCES = pacrunner_mozjs.c +-pacrunner_mozjs_la_CPPFLAGS = -I$(top_srcdir)/src/lib @MOZJS_CFLAGS@ -D_POSIX_C_SOURCE=200112L ++pacrunner_mozjs_la_CPPFLAGS = -I$(top_srcdir)/src/lib @MOZJS_CFLAGS@ + pacrunner_mozjs_la_LIBADD = ../lib/libproxy.la + pacrunner_mozjs_la_LDFLAGS = $(AM_LDFLAGS) @MOZJS_LIBS@ + nodist_pacrunner_mozjs_la_SOURCES = pacutils.h +diff -Nru libproxy-0.3.0.orig/src/modules/Makefile.in libproxy-0.3.0/src/modules/Makefile.in +--- libproxy-0.3.0.orig/src/modules/Makefile.in 2009-08-14 21:07:00.000000000 +0200 ++++ libproxy-0.3.0/src/modules/Makefile.in 2010-01-14 18:03:41.850944638 +0100 +@@ -359,7 +359,7 @@ + xmu_CFLAGS = @xmu_CFLAGS@ + xmu_LIBS = @xmu_LIBS@ + moduledir = @MODULEDIR@ +-AM_CFLAGS = -std=c99 ++AM_CFLAGS = + AM_LDFLAGS = -module -avoid-version -no-undefined + + # Which modules to build +@@ -385,7 +385,7 @@ + + # GConf/GNOME Config Module + config_gnome_la_SOURCES = config_gnome.c xhasclient.c +-config_gnome_la_CPPFLAGS = -I$(top_srcdir)/src/lib -D_POSIX_C_SOURCE=200112L -DGCONFTOOLBIN='"@GCONFTOOLBIN@"' @GNOME_CFLAGS@ ++config_gnome_la_CPPFLAGS = -I$(top_srcdir)/src/lib -DGCONFTOOLBIN='"@GCONFTOOLBIN@"' @GNOME_CFLAGS@ + config_gnome_la_LIBADD = ../lib/libproxy.la + config_gnome_la_LDFLAGS = $(AM_LDFLAGS) @GNOME_LIBS@ + +@@ -412,19 +412,19 @@ + + # IP Ignore Module + ignore_ip_la_SOURCES = ignore_ip.c +-ignore_ip_la_CPPFLAGS = -I$(top_srcdir)/src/lib -D_POSIX_C_SOURCE=200112L ++ignore_ip_la_CPPFLAGS = -I$(top_srcdir)/src/lib + ignore_ip_la_LIBADD = ../lib/libproxy.la + + # WebKit (JavaScriptCore) based PAC runner + pacrunner_webkit_la_SOURCES = pacrunner_webkit.c +-pacrunner_webkit_la_CPPFLAGS = -I$(top_srcdir)/src/lib @WEBKIT_CFLAGS@ -D_POSIX_C_SOURCE=200112L ++pacrunner_webkit_la_CPPFLAGS = -I$(top_srcdir)/src/lib @WEBKIT_CFLAGS@ + pacrunner_webkit_la_LIBADD = ../lib/libproxy.la $(am__append_10) + pacrunner_webkit_la_LDFLAGS = $(AM_LDFLAGS) @WEBKIT_LIBS@ + nodist_pacrunner_webkit_la_SOURCES = pacutils.h + + # Mozilla (Spidermonkey) based PAC runner + pacrunner_mozjs_la_SOURCES = pacrunner_mozjs.c +-pacrunner_mozjs_la_CPPFLAGS = -I$(top_srcdir)/src/lib @MOZJS_CFLAGS@ -D_POSIX_C_SOURCE=200112L ++pacrunner_mozjs_la_CPPFLAGS = -I$(top_srcdir)/src/lib @MOZJS_CFLAGS@ + pacrunner_mozjs_la_LIBADD = ../lib/libproxy.la + pacrunner_mozjs_la_LDFLAGS = $(AM_LDFLAGS) @MOZJS_LIBS@ + nodist_pacrunner_mozjs_la_SOURCES = pacutils.h +diff -Nru libproxy-0.3.0.orig/src/bin/Makefile.in libproxy-0.3.0/src/bin/Makefile.in +--- libproxy-0.3.0.orig/src/bin/Makefile.in 2009-08-14 21:05:15.000000000 +0200 ++++ libproxy-0.3.0/src/bin/Makefile.in 2010-01-14 18:04:24.531275033 +0100 +@@ -239,7 +239,7 @@ + + # Command line interface to libproxy + proxy_SOURCES = proxy.c +-proxy_CPPFLAGS = -I$(top_srcdir)/src/lib -std=c99 ++proxy_CPPFLAGS = -I$(top_srcdir)/src/lib + proxy_LDADD = ../lib/libproxy.la + all: all-am + Added: csw/mgar/pkg/libproxy/trunk/files/SunStudio-have-no-stdc99-flag.patch =================================================================== --- csw/mgar/pkg/libproxy/trunk/files/SunStudio-have-no-stdc99-flag.patch (rev 0) +++ csw/mgar/pkg/libproxy/trunk/files/SunStudio-have-no-stdc99-flag.patch 2010-01-15 02:35:56 UTC (rev 8006) @@ -0,0 +1,69 @@ +diff -Nru libproxy-0.3.0.orig/src/bin/Makefile.am libproxy-0.3.0/src/bin/Makefile.am +--- libproxy-0.3.0.orig/src/bin/Makefile.am 2009-08-14 21:00:32.000000000 +0200 ++++ libproxy-0.3.0/src/bin/Makefile.am 2010-01-07 12:16:16.608932753 +0100 +@@ -2,5 +2,5 @@ + + # Command line interface to libproxy + proxy_SOURCES = proxy.c +-proxy_CPPFLAGS = -I$(top_srcdir)/src/lib -std=c99 ++proxy_CPPFLAGS = -I$(top_srcdir)/src/lib -xc99 + proxy_LDADD = ../lib/libproxy.la +diff -Nru libproxy-0.3.0.orig/src/lib/Makefile.am libproxy-0.3.0/src/lib/Makefile.am +--- libproxy-0.3.0.orig/src/lib/Makefile.am 2009-08-14 21:00:32.000000000 +0200 ++++ libproxy-0.3.0/src/lib/Makefile.am 2010-01-07 12:17:37.568266736 +0100 +@@ -10,8 +10,8 @@ + strdict.c strdict.h \ + url.c url.h + +-libproxy_la_CFLAGS = -DMODULEDIR=\"@MODULEDIR@@DIR_SEPARATOR@\" -DSYSCONFDIR=\"@SYSCONFDIR@@DIR_SEPARATOR@\" -std=c99 -D_POSIX_C_SOURCE=200112L ++libproxy_la_CFLAGS = -DMODULEDIR=\"@MODULEDIR@@DIR_SEPARATOR@\" -DSYSCONFDIR=\"@SYSCONFDIR@@DIR_SEPARATOR@\" -xc99 -D_POSIX_C_SOURCE=200112L + libproxy_la_LDFLAGS = -lpthread -lm -no-undefined + + include_HEADERS = proxy.h + +diff -Nru libproxy-0.3.0.orig/src/lib/Makefile.in libproxy-0.3.0/src/lib/Makefile.in +--- libproxy-0.3.0.orig/src/lib/Makefile.in 2009-08-14 21:05:15.000000000 +0200 ++++ libproxy-0.3.0/src/lib/Makefile.in 2010-01-07 11:58:19.284179024 +0100 +@@ -277,7 +277,7 @@ + strdict.c strdict.h \ + url.c url.h + +-libproxy_la_CFLAGS = -DMODULEDIR=\"@MODULEDIR@@DIR_SEPARATOR@\" -DSYSCONFDIR=\"@SYSCONFDIR@@DIR_SEPARATOR@\" -std=c99 -D_POSIX_C_SOURCE=200112L ++libproxy_la_CFLAGS = -DMODULEDIR=\"@MODULEDIR@@DIR_SEPARATOR@\" -DSYSCONFDIR=\"@SYSCONFDIR@@DIR_SEPARATOR@\" -xc99 -D_POSIX_C_SOURCE=200112L + libproxy_la_LDFLAGS = -lpthread -lm -no-undefined + include_HEADERS = proxy.h + all: all-am +diff -Nru libproxy-0.3.0.orig/src/modules/Makefile.am libproxy-0.3.0/src/modules/Makefile.am +--- libproxy-0.3.0.orig/src/modules/Makefile.am 2009-08-14 21:06:30.000000000 +0200 ++++ libproxy-0.3.0/src/modules/Makefile.am 2010-01-07 12:18:24.020865842 +0100 +@@ -1,5 +1,5 @@ + moduledir = @MODULEDIR@ +-AM_CFLAGS = -std=c99 ++AM_CFLAGS = -xc99 + AM_LDFLAGS = -module -avoid-version -no-undefined + + +diff -Nru libproxy-0.3.0.orig/src/modules/Makefile.in libproxy-0.3.0/src/modules/Makefile.in +--- libproxy-0.3.0.orig/src/modules/Makefile.in 2009-08-14 21:07:00.000000000 +0200 ++++ libproxy-0.3.0/src/modules/Makefile.in 2010-01-14 18:03:41.850944638 +0100 +@@ -359,7 +359,7 @@ + xmu_CFLAGS = @xmu_CFLAGS@ + xmu_LIBS = @xmu_LIBS@ + moduledir = @MODULEDIR@ +-AM_CFLAGS = -std=c99 ++AM_CFLAGS = -xc99 + AM_LDFLAGS = -module -avoid-version -no-undefined + + # Which modules to build +diff -Nru libproxy-0.3.0.orig/src/bin/Makefile.in libproxy-0.3.0/src/bin/Makefile.in +--- libproxy-0.3.0.orig/src/bin/Makefile.in 2009-08-14 21:05:15.000000000 +0200 ++++ libproxy-0.3.0/src/bin/Makefile.in 2010-01-14 18:04:24.531275033 +0100 +@@ -239,7 +239,7 @@ + + # Command line interface to libproxy + proxy_SOURCES = proxy.c +-proxy_CPPFLAGS = -I$(top_srcdir)/src/lib -std=c99 ++proxy_CPPFLAGS = -I$(top_srcdir)/src/lib -xc99 + proxy_LDADD = ../lib/libproxy.la + all: all-am + Added: csw/mgar/pkg/libproxy/trunk/files/proxy.c.patch =================================================================== --- csw/mgar/pkg/libproxy/trunk/files/proxy.c.patch (rev 0) +++ csw/mgar/pkg/libproxy/trunk/files/proxy.c.patch 2010-01-15 02:35:56 UTC (rev 8006) @@ -0,0 +1,40 @@ +diff -Nru libproxy-0.3.0.orig/src/lib/proxy.c libproxy-0.3.0/src/lib/proxy.c +--- libproxy-0.3.0.orig/src/lib/proxy.c 2009-08-14 21:00:32.000000000 +0200 ++++ libproxy-0.3.0/src/lib/proxy.c 2010-01-07 11:57:19.188739832 +0100 +@@ -162,17 +162,37 @@ + if (!px_module_manager_register_type(self->mm, pxWPADModule, _px_wpad_module_cmp, false)) goto error; + + /* If we have a config file, load the config order from it */ ++#if (defined(__SUNPRO_C) && ( defined(__SunOS_5_8) || defined(__SunOS_5_9))) ++ char *envp; ++ envp = px_malloc0(strlen("_PX_CONFIG_ORDER")+3); ++ sprintf(envp,"_PX_CONFIG_ORDER="); ++ putenv(envp); ++#else + setenv("_PX_CONFIG_ORDER", "", 1); ++#endif + pxConfigFile *cf = px_config_file_new(SYSCONFDIR "proxy.conf"); + if (cf) + { + char *tmp = px_config_file_get_value(cf, PX_CONFIG_FILE_DEFAULT_SECTION, "config_order"); + px_config_file_free(cf); ++#if (defined(__SUNPRO_C) && ( defined(__SunOS_5_8) || defined(__SunOS_5_9))) ++ if (tmp) { ++ int retval; ++ envp = px_malloc0(strlen("_PX_CONFIG_ORDER")+strlen(tmp)+2); ++ sprintf(envp,"_PX_CONFIG_ORDER=%s",tmp); ++ retval = putenv(envp); ++ if(retval) { ++ px_free(tmp); ++ goto error; ++ } ++ } ++#else + if (tmp && setenv("_PX_CONFIG_ORDER", tmp, 1)) + { + px_free(tmp); + goto error; + } ++#endif + px_free(tmp); + } Added: csw/mgar/pkg/libproxy/trunk/files/stdfiles.patch =================================================================== --- csw/mgar/pkg/libproxy/trunk/files/stdfiles.patch (rev 0) +++ csw/mgar/pkg/libproxy/trunk/files/stdfiles.patch 2010-01-15 02:35:56 UTC (rev 8006) @@ -0,0 +1,34 @@ +diff -Nru libproxy-0.3.0.orig/src/lib/stdbool.h libproxy-0.3.0/src/lib/stdbool.h +--- libproxy-0.3.0.orig/src/lib/stdbool.h 1970-01-01 01:00:00.000000000 +0100 ++++ libproxy-0.3.0/src/lib/stdbool.h 2010-01-15 00:49:51.930719445 +0100 +@@ -0,0 +1,17 @@ ++#ifndef _STDBOOL_H ++#ifndef _MY_STDBOOL_H ++#define _MY_STDBOOL_H ++ ++#if !defined(__GNUG__) && (defined(__SUNPRO_C) && ( defined(__SunOS_5_8) || defined(__SunOS_5_9))) ++ ++#ifndef bool ++#define bool int ++#define false 0 ++#define true 1 ++#endif /* bool */ ++ ++#endif /* Compiler has bool */ ++ ++ ++#endif /* _MY_BOOL_H_*/ ++#endif /* _STDBOOL_H_*/ +diff -Nru libproxy-0.3.0.orig/src/lib/stdint.h libproxy-0.3.0/src/lib/stdint.h +--- libproxy-0.3.0.orig/src/lib/stdint.h 1970-01-01 01:00:00.000000000 +0100 ++++ libproxy-0.3.0/src/lib/stdint.h 2010-01-15 01:00:57.971084112 +0100 +@@ -0,0 +1,9 @@ ++#ifndef _STDINT_H ++#ifndef _MY_STDINT_H ++#define _MY_STDINT_H ++ ++#if !defined(__GNUG__) && (defined(__SUNPRO_C) && ( defined(__SunOS_5_8) || defined(__SunOS_5_9))) ++#include ++#endif /* Compiler has stdint.h */ ++#endif /* _MY_STDINT_H */ ++#endif /* _STDINT_H */ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Fri Jan 15 03:54:14 2010 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Fri, 15 Jan 2010 02:54:14 +0000 Subject: [csw-devel] SF.net SVN: gar:[8007] csw/mgar/pkg/coreutils/trunk Message-ID: Revision: 8007 http://gar.svn.sourceforge.net/gar/?rev=8007&view=rev Author: bdwalton Date: 2010-01-15 02:54:14 +0000 (Fri, 15 Jan 2010) Log Message: ----------- coreutils: update patch for new version Modified Paths: -------------- csw/mgar/pkg/coreutils/trunk/checksums csw/mgar/pkg/coreutils/trunk/files/0001-Fix-solaris-acl-support-breakage.patch Modified: csw/mgar/pkg/coreutils/trunk/checksums =================================================================== --- csw/mgar/pkg/coreutils/trunk/checksums 2010-01-15 02:35:56 UTC (rev 8006) +++ csw/mgar/pkg/coreutils/trunk/checksums 2010-01-15 02:54:14 UTC (rev 8007) @@ -1,2 +1,2 @@ -0fde2b11f34c49995765566acf6cd5b4 0001-Fix-solaris-acl-support-breakage.patch +2d8837f7ca6d422837bcdb2be4ab28bb 0001-Fix-solaris-acl-support-breakage.patch 56f549854d723d9dcebb77919019df55 coreutils-8.4.tar.gz Modified: csw/mgar/pkg/coreutils/trunk/files/0001-Fix-solaris-acl-support-breakage.patch =================================================================== --- csw/mgar/pkg/coreutils/trunk/files/0001-Fix-solaris-acl-support-breakage.patch 2010-01-15 02:35:56 UTC (rev 8006) +++ csw/mgar/pkg/coreutils/trunk/files/0001-Fix-solaris-acl-support-breakage.patch 2010-01-15 02:54:14 UTC (rev 8007) @@ -1,7 +1,7 @@ -From bd8c66a7789d05bee45a162adf3f6f488fde75bf Mon Sep 17 00:00:00 2001 -From: Ben Walton -Date: Wed, 25 Nov 2009 04:59:51 +0100 -Subject: [PATCH 1/2] Fix solaris acl support breakage +From 8d4aa48bc66f346db116dd2fe4aa524e1362897f Mon Sep 17 00:00:00 2001 +From: Ben Walton +Date: Fri, 15 Jan 2010 03:43:16 +0100 +Subject: [PATCH] Fix solaris acl support breakage Solaris has support for ACL's on NFS, but only in certain combinations of client and server. When ACL operations are attempted in @@ -9,46 +9,46 @@ This patch allows utilities that work with ACL's to handle the difference properly. -Signed-off-by: Ben Walton +Signed-off-by: Ben Walton --- lib/copy-acl.c | 4 ++-- lib/set-mode-acl.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/copy-acl.c b/lib/copy-acl.c -index af85a08..bfacf20 100644 +index 1e82240..6a21aeb 100644 --- a/lib/copy-acl.c +++ b/lib/copy-acl.c @@ -294,7 +294,7 @@ qcopy_acl (const char *src_name, int source_desc, const char *dst_name, if (count < 0) - { -- if (errno == ENOSYS || errno == ENOTSUP) -+ if (errno == ENOSYS || errno == EOPNOTSUPP || errno == ENOTSUP) - { - count = 0; - entries = NULL; + { +- if (errno == ENOSYS || errno == ENOTSUP) ++ if (errno == ENOSYS || errno == EOPNOTSUPP || errno == ENOTSUP) + { + count = 0; + entries = NULL; @@ -358,7 +358,7 @@ qcopy_acl (const char *src_name, int source_desc, const char *dst_name, if (ret < 0 && saved_errno == 0) - { - saved_errno = errno; -- if (errno == ENOSYS && !acl_nontrivial (count, entries)) -+ if ((errno == ENOSYS || errno == EOPNOTSUPP) && !acl_nontrivial (count, entries)) - saved_errno = 0; - } + { + saved_errno = errno; +- if (errno == ENOSYS && !acl_nontrivial (count, entries)) ++ if ((errno == ENOSYS || errno == EOPNOTSUPP) && !acl_nontrivial (count, entries)) + saved_errno = 0; + } else diff --git a/lib/set-mode-acl.c b/lib/set-mode-acl.c -index ddac4df..fdc74f2 100644 +index c5b4726..2cd2c75 100644 --- a/lib/set-mode-acl.c +++ b/lib/set-mode-acl.c @@ -387,7 +387,7 @@ qset_acl (char const *name, int desc, mode_t mode) ret = acl (name, SETACL, sizeof (entries) / sizeof (aclent_t), entries); if (ret < 0) { -- if (errno == ENOSYS) -+ if (errno == ENOSYS || errno == EOPNOTSUPP) - return chmod_or_fchmod (name, desc, mode); - return -1; +- if (errno == ENOSYS) ++ if (errno == ENOSYS || errno == EOPNOTSUPP) + return chmod_or_fchmod (name, desc, mode); + return -1; } -- 1.6.5.1 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Fri Jan 15 04:36:37 2010 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Fri, 15 Jan 2010 03:36:37 +0000 Subject: [csw-devel] SF.net SVN: gar:[8008] csw/mgar/gar/v2/gar.mk Message-ID: Revision: 8008 http://gar.svn.sourceforge.net/gar/?rev=8008&view=rev Author: bdwalton Date: 2010-01-15 03:36:37 +0000 (Fri, 15 Jan 2010) Log Message: ----------- gar: prevent dynamic adm scripts from being garchived. Modified Paths: -------------- csw/mgar/gar/v2/gar.mk Modified: csw/mgar/gar/v2/gar.mk =================================================================== --- csw/mgar/gar/v2/gar.mk 2010-01-15 02:54:14 UTC (rev 8007) +++ csw/mgar/gar/v2/gar.mk 2010-01-15 03:36:37 UTC (rev 8008) @@ -368,7 +368,7 @@ # I am always typing this by mistake makesums: makesum -GARCHIVE_TARGETS = $(addprefix $(GARCHIVEDIR)/,$(ALLFILES)) +GARCHIVE_TARGETS = $(addprefix $(GARCHIVEDIR)/,$(filter-out $(ALLFILES_DYNSCRIPTS), $(ALLFILES))) garchive: checksum $(GARCHIVE_TARGETS) ; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Fri Jan 15 10:04:38 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Fri, 15 Jan 2010 09:04:38 +0000 Subject: [csw-devel] SF.net SVN: gar:[8009] csw/mgar/pkg/cswclassutils/trunk Message-ID: Revision: 8009 http://gar.svn.sourceforge.net/gar/?rev=8009&view=rev Author: wahwah Date: 2010-01-15 09:04:37 +0000 (Fri, 15 Jan 2010) Log Message: ----------- cswclassutils: migrateconf: Print out the warning only when actually migrating files. Modified Paths: -------------- csw/mgar/pkg/cswclassutils/trunk/Makefile csw/mgar/pkg/cswclassutils/trunk/checksums csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.i.cswmigrateconf Modified: csw/mgar/pkg/cswclassutils/trunk/Makefile =================================================================== --- csw/mgar/pkg/cswclassutils/trunk/Makefile 2010-01-15 03:36:37 UTC (rev 8008) +++ csw/mgar/pkg/cswclassutils/trunk/Makefile 2010-01-15 09:04:37 UTC (rev 8009) @@ -1,7 +1,7 @@ # $Id$ GARNAME = cswclassutils -GARVERSION = 1.30 +GARVERSION = 1.31 CATEGORIES = utils DESCRIPTION = CSW class action utilities Modified: csw/mgar/pkg/cswclassutils/trunk/checksums =================================================================== --- csw/mgar/pkg/cswclassutils/trunk/checksums 2010-01-15 03:36:37 UTC (rev 8008) +++ csw/mgar/pkg/cswclassutils/trunk/checksums 2010-01-15 09:04:37 UTC (rev 8009) @@ -4,7 +4,7 @@ 56900bb1fc9f40f7c227877eca32b1f8 CSWcswclassutils.i.cswetcservices 4f2e9de463cb4b17ba6e1b3dfdf18913 CSWcswclassutils.i.cswinetd fa318ca696e80a9a9f2efbf35cb69080 CSWcswclassutils.i.cswinitsmf -42668b41c7c886091a8ca44992b90806 CSWcswclassutils.i.cswmigrateconf +5049a5d77ddcc3359d1c991d387446f1 CSWcswclassutils.i.cswmigrateconf c875d62c8ddaad0de2e18fff7946e1e8 CSWcswclassutils.i.cswpreserveconf 9018419febe06c12e89d66cc76e7261f CSWcswclassutils.i.cswpycompile 1282bef941c49d98a061b3701a1fda7c CSWcswclassutils.i.cswtexinfo Modified: csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.i.cswmigrateconf =================================================================== --- csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.i.cswmigrateconf 2010-01-15 03:36:37 UTC (rev 8008) +++ csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.i.cswmigrateconf 2010-01-15 09:04:37 UTC (rev 8009) @@ -43,6 +43,12 @@ fi give_a_chance_to_stop() { + if [ "${chance_to_stop_given}" -ne 0 ]; then + return + fi + echo "----8<---- migration configuration start ----8<----" + cat "${confdst}" + echo "----8<---- migration configuration end ----8<----" echo echo "*******************************************************************" echo "* Configuration files are going to be migrated from the deprecated " @@ -57,6 +63,7 @@ sleep 1 done echo "0." + chance_to_stop_given=1 } files_are_identical() { @@ -139,15 +146,11 @@ } run_already=0 +chance_to_stop_given=0 while read confsrc confdst ; do # We're not sure if the files to be migrated have already been copied or not. - cp "$confsrc" "$confdst" - - cat "${confdst}" - give_a_chance_to_stop - # Sourcing the file, it should contain the configuration. if [ -r "$confsrc" ]; then debug "Sourcing ${confsrc}" @@ -217,6 +220,7 @@ # moved already. if [ -r "${srcpath}" ] then + give_a_chance_to_stop place_signpost_for "${srcpath}" debug "Moving '${srcpath}' to '${archpath}'" mv "${srcpath}" "${archpath}" This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Fri Jan 15 10:05:09 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Fri, 15 Jan 2010 09:05:09 +0000 Subject: [csw-devel] SF.net SVN: gar:[8010] csw/mgar/pkg/cswclassutils/trunk/checksums Message-ID: Revision: 8010 http://gar.svn.sourceforge.net/gar/?rev=8010&view=rev Author: wahwah Date: 2010-01-15 09:05:08 +0000 (Fri, 15 Jan 2010) Log Message: ----------- cswclassutils: Updating checksums for files with the Id tag Modified Paths: -------------- csw/mgar/pkg/cswclassutils/trunk/checksums Modified: csw/mgar/pkg/cswclassutils/trunk/checksums =================================================================== --- csw/mgar/pkg/cswclassutils/trunk/checksums 2010-01-15 09:04:37 UTC (rev 8009) +++ csw/mgar/pkg/cswclassutils/trunk/checksums 2010-01-15 09:05:08 UTC (rev 8010) @@ -4,7 +4,7 @@ 56900bb1fc9f40f7c227877eca32b1f8 CSWcswclassutils.i.cswetcservices 4f2e9de463cb4b17ba6e1b3dfdf18913 CSWcswclassutils.i.cswinetd fa318ca696e80a9a9f2efbf35cb69080 CSWcswclassutils.i.cswinitsmf -5049a5d77ddcc3359d1c991d387446f1 CSWcswclassutils.i.cswmigrateconf +9b47f2ac9b8ddbdd3aa30ad59a808af6 CSWcswclassutils.i.cswmigrateconf c875d62c8ddaad0de2e18fff7946e1e8 CSWcswclassutils.i.cswpreserveconf 9018419febe06c12e89d66cc76e7261f CSWcswclassutils.i.cswpycompile 1282bef941c49d98a061b3701a1fda7c CSWcswclassutils.i.cswtexinfo This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Fri Jan 15 12:12:33 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Fri, 15 Jan 2010 11:12:33 +0000 Subject: [csw-devel] SF.net SVN: gar:[8011] csw/mgar/pkg Message-ID: Revision: 8011 http://gar.svn.sourceforge.net/gar/?rev=8011&view=rev Author: wahwah Date: 2010-01-15 11:12:31 +0000 (Fri, 15 Jan 2010) Log Message: ----------- hachoir-*: Using the 'py' prefix in package names' Modified Paths: -------------- csw/mgar/pkg/hachoir-core/trunk/Makefile csw/mgar/pkg/hachoir-parser/trunk/Makefile Modified: csw/mgar/pkg/hachoir-core/trunk/Makefile =================================================================== --- csw/mgar/pkg/hachoir-core/trunk/Makefile 2010-01-15 09:05:08 UTC (rev 8010) +++ csw/mgar/pkg/hachoir-core/trunk/Makefile 2010-01-15 11:12:31 UTC (rev 8011) @@ -16,7 +16,8 @@ MASTER_SITES = http://cheeseshop.python.org/packages/source/h/$(GARNAME)/ DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz -CATALOGNAME = hachoir_core +CATALOGNAME = py_hachoir_core +PACKAGES = CSWpy-hachoir-core ARCHALL = 1 TEST_SCRIPTS = include gar/category.mk Modified: csw/mgar/pkg/hachoir-parser/trunk/Makefile =================================================================== --- csw/mgar/pkg/hachoir-parser/trunk/Makefile 2010-01-15 09:05:08 UTC (rev 8010) +++ csw/mgar/pkg/hachoir-parser/trunk/Makefile 2010-01-15 11:12:31 UTC (rev 8011) @@ -16,8 +16,8 @@ MASTER_SITES = http://cheeseshop.python.org/packages/source/h/$(GARNAME)/ DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz -CATALOGNAME = hachoir_parser +CATALOGNAME = py_hachoir_parser ARCHALL = 1 -REQUIRED_PKGS = CSWhachoir-core +REQUIRED_PKGS = CSWpy-hachoir-core TEST_SCRIPTS = include gar/category.mk This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bonivart at users.sourceforge.net Fri Jan 15 14:36:48 2010 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Fri, 15 Jan 2010 13:36:48 +0000 Subject: [csw-devel] SF.net SVN: gar:[8012] csw/mgar/pkg/cpan/DBD-SQLite/trunk Message-ID: Revision: 8012 http://gar.svn.sourceforge.net/gar/?rev=8012&view=rev Author: bonivart Date: 2010-01-15 13:36:48 +0000 (Fri, 15 Jan 2010) Log Message: ----------- dbd-sqlite: update to 1.29 Modified Paths: -------------- csw/mgar/pkg/cpan/DBD-SQLite/trunk/Makefile csw/mgar/pkg/cpan/DBD-SQLite/trunk/checksums Property Changed: ---------------- csw/mgar/pkg/cpan/DBD-SQLite/trunk/ Property changes on: csw/mgar/pkg/cpan/DBD-SQLite/trunk ___________________________________________________________________ Modified: svn:externals - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v1 + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 Modified: csw/mgar/pkg/cpan/DBD-SQLite/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/DBD-SQLite/trunk/Makefile 2010-01-15 11:12:31 UTC (rev 8011) +++ csw/mgar/pkg/cpan/DBD-SQLite/trunk/Makefile 2010-01-15 13:36:48 UTC (rev 8012) @@ -1,17 +1,26 @@ GARNAME = DBD-SQLite -GARVERSION = 1.14 +GARVERSION = 1.29 CATEGORIES = cpan -AUTHOR = MSERGEANT +AUTHOR = ADAMK DESCRIPTION = self contained RDBMS in a DBI driver define BLURB - SQLite is a public domain RDBMS database engine that you can find at - http://www.hwaci.com/sw/sqlite/. + DBD::SQLite is a Perl DBI driver for SQLite, that includes the entire + thing in the distribution. So in order to get a fast transaction capable + RDBMS working for your perl project you simply have to install this + module, and nothing else. endef -DISTFILES += CSWpmdbdsqlite.gspec +PACKAGES = CSWpmdbdsqlite +CATALOGNAME = pm_dbdsqlite +REQUIRED_PKGS = CSWpmdbi -# Use Perl's Config{optimize} instead of -O6 -PATCHFILES = optimize.diff +LICENSE = LICENSE include gar/category.mk + +post-install-modulated: + @echo "Post-Install (custom)" + @ginstall -d -m 755 $(DESTDIR)$(docdir)/pm_dbdsqlite + @ginstall -m 444 $(WORKSRC)/README $(DESTDIR)$(docdir)/pm_dbdsqlite + @$(MAKECOOKIE) Modified: csw/mgar/pkg/cpan/DBD-SQLite/trunk/checksums =================================================================== --- csw/mgar/pkg/cpan/DBD-SQLite/trunk/checksums 2010-01-15 11:12:31 UTC (rev 8011) +++ csw/mgar/pkg/cpan/DBD-SQLite/trunk/checksums 2010-01-15 13:36:48 UTC (rev 8012) @@ -1,3 +1,2 @@ -ea1d42acc6bf060e607c1ba5e3d05754 download/CSWpmdbdsqlite.gspec -d33e584f435d464a55946f58d4d4b9e2 download/DBD-SQLite-1.13.tar.gz +2a47cea6ecff62508775d90151a8030f download/DBD-SQLite-1.29.tar.gz 065e7791e4b06c234d9052ed81de6095 download/optimize.diff This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bonivart at users.sourceforge.net Fri Jan 15 14:46:45 2010 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Fri, 15 Jan 2010 13:46:45 +0000 Subject: [csw-devel] SF.net SVN: gar:[8013] csw/mgar/pkg/cpan/DBD-SQLite/trunk/files Message-ID: Revision: 8013 http://gar.svn.sourceforge.net/gar/?rev=8013&view=rev Author: bonivart Date: 2010-01-15 13:46:45 +0000 (Fri, 15 Jan 2010) Log Message: ----------- dbd-sqlite: remove unused files Removed Paths: ------------- csw/mgar/pkg/cpan/DBD-SQLite/trunk/files/CSWpmdbdsqlite.gspec csw/mgar/pkg/cpan/DBD-SQLite/trunk/files/optimize.diff Deleted: csw/mgar/pkg/cpan/DBD-SQLite/trunk/files/CSWpmdbdsqlite.gspec =================================================================== --- csw/mgar/pkg/cpan/DBD-SQLite/trunk/files/CSWpmdbdsqlite.gspec 2010-01-15 13:36:48 UTC (rev 8012) +++ csw/mgar/pkg/cpan/DBD-SQLite/trunk/files/CSWpmdbdsqlite.gspec 2010-01-15 13:46:45 UTC (rev 8013) @@ -1,8 +0,0 @@ -%var bitname pm_dbdsqlite -%var pkgname CSWpmdbdsqlite -%include url file://%{PKGLIB}/csw_cpan.gspec -%copyright -This module is distributed under the same terms as Perl itself, and -is copyright Matt Sergeant, 2002. - -The underlying SQLite database engine is copyright free. Deleted: csw/mgar/pkg/cpan/DBD-SQLite/trunk/files/optimize.diff =================================================================== --- csw/mgar/pkg/cpan/DBD-SQLite/trunk/files/optimize.diff 2010-01-15 13:36:48 UTC (rev 8012) +++ csw/mgar/pkg/cpan/DBD-SQLite/trunk/files/optimize.diff 2010-01-15 13:46:45 UTC (rev 8013) @@ -1,12 +0,0 @@ -diff --speed-large-files --minimal -Nru DBD-SQLite-1.07.orig/Makefile.PL DBD-SQLite-1.07/Makefile.PL ---- DBD-SQLite-1.07.orig/Makefile.PL 2004-10-12 02:03:50.000000000 -0700 -+++ DBD-SQLite-1.07/Makefile.PL 2005-02-11 11:17:37.100010000 -0800 -@@ -44,7 +44,7 @@ - 'PREREQ_PM' => {DBI => 1.21}, # e.g., Module::Name => 1.1 - 'OBJECT' => '$(O_FILES)', - 'INC' => '-I. -I$(DBI_INSTARCH_DIR)', -- 'OPTIMIZE' => "-O2", -+ 'OPTIMIZE' => "$Config{optimize}" - 'DEFINE' => "-DNDEBUG=1 -DSQLITE_PTR_SZ=$Config{ptrsize}" . - ($Config{d_usleep} ? " -DHAVE_USLEEP=1" : "") . - ($DBI::VERSION > 1.42 ? '' : ' -Dno_last_insert_id'), This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bonivart at users.sourceforge.net Fri Jan 15 15:08:59 2010 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Fri, 15 Jan 2010 14:08:59 +0000 Subject: [csw-devel] SF.net SVN: gar:[8014] csw/mgar/pkg/cpan/DBI/trunk Message-ID: Revision: 8014 http://gar.svn.sourceforge.net/gar/?rev=8014&view=rev Author: bonivart Date: 2010-01-15 14:08:59 +0000 (Fri, 15 Jan 2010) Log Message: ----------- pm_dbi: update to 1.609 Modified Paths: -------------- csw/mgar/pkg/cpan/DBI/trunk/Makefile csw/mgar/pkg/cpan/DBI/trunk/checksums Modified: csw/mgar/pkg/cpan/DBI/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/DBI/trunk/Makefile 2010-01-15 13:46:45 UTC (rev 8013) +++ csw/mgar/pkg/cpan/DBI/trunk/Makefile 2010-01-15 14:08:59 UTC (rev 8014) @@ -1,5 +1,5 @@ GARNAME = DBI -GARVERSION = 1.607 +GARVERSION = 1.609 CATEGORIES = cpan AUTHOR = TIMB @@ -13,12 +13,11 @@ DISTFILES = COPYING -# We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz PACKAGES = CSWpmdbi CATALOGNAME = pm_dbi -REQUIRED_PKGS = CSWpmplrpc +#REQUIRED_PKGS = CSWpmplrpc include gar/category.mk Modified: csw/mgar/pkg/cpan/DBI/trunk/checksums =================================================================== --- csw/mgar/pkg/cpan/DBI/trunk/checksums 2010-01-15 13:46:45 UTC (rev 8013) +++ csw/mgar/pkg/cpan/DBI/trunk/checksums 2010-01-15 14:08:59 UTC (rev 8014) @@ -1,2 +1,2 @@ -e8ddfc437b943ae538b777d472060191 download/COPYING -bd5785b39675213948a61dea1b400012 download/DBI-1.607.tar.gz +e8ddfc437b943ae538b777d472060191 COPYING +e4689870b3f7ce503022a076c53284ed DBI-1.609.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Fri Jan 15 15:52:02 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 15 Jan 2010 14:52:02 +0000 Subject: [csw-devel] SF.net SVN: gar:[8015] csw/mgar/pkg/cpan/Unicode-Map/trunk/Makefile Message-ID: Revision: 8015 http://gar.svn.sourceforge.net/gar/?rev=8015&view=rev Author: dmichelsen Date: 2010-01-15 14:52:01 +0000 (Fri, 15 Jan 2010) Log Message: ----------- cpan/Unicode-Map: Add dependency to CSWpmlibwww Modified Paths: -------------- csw/mgar/pkg/cpan/Unicode-Map/trunk/Makefile Modified: csw/mgar/pkg/cpan/Unicode-Map/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/Unicode-Map/trunk/Makefile 2010-01-15 14:08:59 UTC (rev 8014) +++ csw/mgar/pkg/cpan/Unicode-Map/trunk/Makefile 2010-01-15 14:52:01 UTC (rev 8015) @@ -13,4 +13,8 @@ PACKAGES = CSWpmunicodemap CATALOGNAME = pm_unicodemap +# This is needed for mirrorMappings: +# http://www.opencsw.org/mantis/view.php?id=2710 +REQUIRED_PKGS = CSWpmlibwww + include gar/category.mk This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Fri Jan 15 15:55:02 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 15 Jan 2010 14:55:02 +0000 Subject: [csw-devel] SF.net SVN: gar:[8016] csw/mgar/pkg/cpan/Spiffy/trunk/Makefile Message-ID: Revision: 8016 http://gar.svn.sourceforge.net/gar/?rev=8016&view=rev Author: dmichelsen Date: 2010-01-15 14:54:59 +0000 (Fri, 15 Jan 2010) Log Message: ----------- cpan/Spiffy: Add required package CSWpmyaml Modified Paths: -------------- csw/mgar/pkg/cpan/Spiffy/trunk/Makefile Modified: csw/mgar/pkg/cpan/Spiffy/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/Spiffy/trunk/Makefile 2010-01-15 14:52:01 UTC (rev 8015) +++ csw/mgar/pkg/cpan/Spiffy/trunk/Makefile 2010-01-15 14:54:59 UTC (rev 8016) @@ -15,6 +15,10 @@ PACKAGES = CSWpmspiffy CATALOGNAME = pm_spiffy +# Add required module due to bug report: +# http://www.opencsw.org/mantis/view.php?id=2711 +REQUIRED_PKGS = CSWpmyaml + ARCHALL = 1 include gar/category.mk This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Fri Jan 15 16:06:04 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 15 Jan 2010 15:06:04 +0000 Subject: [csw-devel] SF.net SVN: gar:[8017] csw/mgar/pkg/curl/trunk/Makefile Message-ID: Revision: 8017 http://gar.svn.sourceforge.net/gar/?rev=8017&view=rev Author: dmichelsen Date: 2010-01-15 15:06:04 +0000 (Fri, 15 Jan 2010) Log Message: ----------- curl: Adjust catalog name from curlrt to curl_rt and curldevel to curl_devel Modified Paths: -------------- csw/mgar/pkg/curl/trunk/Makefile Modified: csw/mgar/pkg/curl/trunk/Makefile =================================================================== --- csw/mgar/pkg/curl/trunk/Makefile 2010-01-15 14:54:59 UTC (rev 8016) +++ csw/mgar/pkg/curl/trunk/Makefile 2010-01-15 15:06:04 UTC (rev 8017) @@ -23,8 +23,8 @@ PACKAGES = CSWcurl CSWcurlrt CSWcurldevel CATALOGNAME_CSWcurl = curl -CATALOGNAME_CSWcurlrt = curlrt -CATALOGNAME_CSWcurldevel = curldevel +CATALOGNAME_CSWcurlrt = curl_rt +CATALOGNAME_CSWcurldevel = curl_devel SPKG_DESC_CSWcurl = A command line tool and library for client-side URL transfers SPKG_DESC_CSWcurlrt = Curl Runtime Libraries This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bonivart at users.sourceforge.net Fri Jan 15 16:15:45 2010 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Fri, 15 Jan 2010 15:15:45 +0000 Subject: [csw-devel] SF.net SVN: gar:[8018] csw/mgar/pkg/spamassassin/trunk Message-ID: Revision: 8018 http://gar.svn.sourceforge.net/gar/?rev=8018&view=rev Author: bonivart Date: 2010-01-15 15:15:24 +0000 (Fri, 15 Jan 2010) Log Message: ----------- spamassassin: update to 3.3rc3 Modified Paths: -------------- csw/mgar/pkg/spamassassin/trunk/Makefile csw/mgar/pkg/spamassassin/trunk/checksums Modified: csw/mgar/pkg/spamassassin/trunk/Makefile =================================================================== --- csw/mgar/pkg/spamassassin/trunk/Makefile 2010-01-15 15:06:04 UTC (rev 8017) +++ csw/mgar/pkg/spamassassin/trunk/Makefile 2010-01-15 15:15:24 UTC (rev 8018) @@ -11,18 +11,17 @@ endef #MASTER_SITES = http://apache.jumper.nu/spamassassin/source/ -MASTER_SITES = http://people.apache.org/~wtogami/devel/3.3.0-rc1/ +MASTER_SITES = http://people.apache.org/~wtogami/devel/3.3.0-rc3.unofficial/ #DISTFILES = $(SPKG_NAME)-$(GARVERSION).tar.gz -DISTFILES = $(SPKG_NAME)-$(GARVERSION)-rc1.tar.gz +DISTFILES = $(SPKG_NAME)-$(GARVERSION)-rc3.tar.gz DISTFILES += COPYING -REQUIRED_PKGS = CSWosslrt CSWperl CSWpmarchivetar CSWpmdbi CSWpmdigestsha1 +REQUIRED_PKGS = CSWosslrt CSWperl CSWpmarchivetar CSWpmdbi CSWpmdigestsha REQUIRED_PKGS += CSWpmiosocketinet6 CSWpmiosocketssl CSWpmiozlib REQUIRED_PKGS += CSWpmipcountry CSWpmldap CSWpmlibwww CSWpmmaildkim -REQUIRED_PKGS += CSWpmmailspf CSWpmmailtools CSWpmmimebase64 CSWpmnetdns +REQUIRED_PKGS += CSWpmmailspf CSWpmmailtools CSWpmmimebase64 CSWpmnetaddrip CSWpmnetdns REQUIRED_PKGS += CSWpmuri CSWpmhtmlparser CSWzlib -# We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(SPKG_NAME)-(\d+(?:\.\d+)*).tar.gz SAMPLECONF = /opt/csw/etc/spamassassin/.+\.pre\.CSW Modified: csw/mgar/pkg/spamassassin/trunk/checksums =================================================================== --- csw/mgar/pkg/spamassassin/trunk/checksums 2010-01-15 15:06:04 UTC (rev 8017) +++ csw/mgar/pkg/spamassassin/trunk/checksums 2010-01-15 15:15:24 UTC (rev 8018) @@ -1,2 +1,2 @@ 3b83ef96387f14655fc854ddc3c6bd57 COPYING -e5f1498a02b79ead743504e1f4f0fa89 Mail-SpamAssassin-3.3.0-rc1.tar.gz +98ad221b18c6c881f609d1a35bb800a0 Mail-SpamAssassin-3.3.0-rc3.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Fri Jan 15 16:50:41 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 15 Jan 2010 15:50:41 +0000 Subject: [csw-devel] SF.net SVN: gar:[8019] csw/mgar/pkg Message-ID: Revision: 8019 http://gar.svn.sourceforge.net/gar/?rev=8019&view=rev Author: dmichelsen Date: 2010-01-15 15:50:40 +0000 (Fri, 15 Jan 2010) Log Message: ----------- slang: Initial commit Added Paths: ----------- csw/mgar/pkg/slang/ csw/mgar/pkg/slang/branches/ csw/mgar/pkg/slang/tags/ csw/mgar/pkg/slang/trunk/ csw/mgar/pkg/slang/trunk/Makefile csw/mgar/pkg/slang/trunk/checksums csw/mgar/pkg/slang/trunk/files/ Property changes on: csw/mgar/pkg/slang/trunk ___________________________________________________________________ Added: svn:ignore + cookies download work Added: svn:externals + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 Added: csw/mgar/pkg/slang/trunk/Makefile =================================================================== --- csw/mgar/pkg/slang/trunk/Makefile (rev 0) +++ csw/mgar/pkg/slang/trunk/Makefile 2010-01-15 15:50:40 UTC (rev 8019) @@ -0,0 +1,23 @@ +GARNAME = slang +GARVERSION = 2.2.2 +CATEGORIES = lib + +DESCRIPTION = Library primarily to provide an alternative to libcurses +define BLURB +endef + +MASTER_SITES = ftp://space.mit.edu/pub/davis/slang/v2.2/ +MASTER_SITES += ftp://ftp.fu-berlin.de/pub/unix/misc/slang/v2.2/ +MASTER_SITES += ftp://ftp.ntua.gr/pub/lang/slang/slang/v2.2/ + +DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz + +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + +SPKG_SOURCEURL = http://www.s-lang.org/ + +BUILD64 = 1 +CONFIGURE_ARGS = $(DIRPATHS) + +include gar/category.mk Added: csw/mgar/pkg/slang/trunk/checksums =================================================================== --- csw/mgar/pkg/slang/trunk/checksums (rev 0) +++ csw/mgar/pkg/slang/trunk/checksums 2010-01-15 15:50:40 UTC (rev 8019) @@ -0,0 +1 @@ +e7183d0acab9cc35fae12849f8b848e2 slang-2.2.2.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From hson at users.sourceforge.net Fri Jan 15 17:20:22 2010 From: hson at users.sourceforge.net (hson at users.sourceforge.net) Date: Fri, 15 Jan 2010 16:20:22 +0000 Subject: [csw-devel] SF.net SVN: gar:[8020] csw/mgar/pkg/libproxy/trunk/Makefile Message-ID: Revision: 8020 http://gar.svn.sourceforge.net/gar/?rev=8020&view=rev Author: hson Date: 2010-01-15 16:20:21 +0000 (Fri, 15 Jan 2010) Log Message: ----------- libproxy: Split package Modified Paths: -------------- csw/mgar/pkg/libproxy/trunk/Makefile Modified: csw/mgar/pkg/libproxy/trunk/Makefile =================================================================== --- csw/mgar/pkg/libproxy/trunk/Makefile 2010-01-15 15:50:40 UTC (rev 8019) +++ csw/mgar/pkg/libproxy/trunk/Makefile 2010-01-15 16:20:21 UTC (rev 8020) @@ -32,15 +32,27 @@ PATCHFILES_isa-i386 += stdfiles.patch PATCHFILES_isa-i386 += proxy.c.patch +PACKAGES = CSWlibproxy CSWlibproxydevel CSWpy-libproxy +CATALOGNAME_CSWlibproxy = libproxy +CATALOGNAME_CSWlibproxydevel = libproxy_devel +CATALOGNAME_CSWpy-libproxy = py_libproxy +SPKG_DESC_CSWlibproxy = A library that provides automatic proxy configuration management +SPKG_DESC_CSWlibproxydevel = A library that provides automatic proxy configuration management - development files +SPKG_DESC_CSWpy-libproxy = A library that provides automatic proxy configuration management - Python bindings + +REQUIRED_PKGS_CSWlibproxy += CSWlibice CSWlibsm CSWlibx11 CSWlibxmu CSWlibxt +REQUIRED_PKGS_CSWlibproxydevel += CSWlibproxy +REQUIRED_PKGS_CSWpy-libproxy += CSWpython CSWlibproxy PREREQUISITE_PKGS += CSWlibx11devel CSWlibxmudevel CSWlibdbusdev -#Disable Mozilla plugin until there is a 64-bit version -#PREREQUISITE_PKGS += CSWmozilla CSWseamonkey +#Disable Mozilla/Firefox/Seamonkey plugin until there is a 64-bit version +#PREREQUISITE_PKGS += CSWmozilla CSWseamonkey CSWfirefox -REQUIRED_PKGS += CSWlibice CSWlibsm CSWlibx11 CSWlibxmu CSWlibxt +PKGFILES_CSWlibproxydevel = $(PKGFILES_DEVEL) +PKGFILES_CSWpy-libproxy = $(libdir).*/python/site-packages/.* UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz -PACKAGING_PLATFORMS = solaris10-sparc solaris10-i386 +#PACKAGING_PLATFORMS = solaris10-sparc solaris10-i386 EXTRA_LINKER_FLAGS = -lnsl BUILD64 = 1 @@ -48,12 +60,14 @@ EXTRA_INC = $(prefix)/X11/include EXTRA_LIB = $(prefix)/X11/lib EXTRA_PKG_CONFIG_DIRS = $(prefix)/X11/lib -EXTRA_PKG_CONFIG_DIRS += $(prefix)/mozilla/lib -EXTRA_PKG_CONFIG_DIRS += $(prefix)/mozilla/seamonkey/lib +#Disable Mozilla/Firefox/Seamonkey plugin until there is a 64-bit version +#EXTRA_PKG_CONFIG_DIRS += $(prefix)/mozilla/lib +#EXTRA_PKG_CONFIG_DIRS += $(prefix)/mozilla/firefox/lib +#EXTRA_PKG_CONFIG_DIRS += $(prefix)/mozilla/seamonkey/lib CONFIGURE_ARGS = $(DIRPATHS) -#Disable Mozilla plugin until there is a 64-bit version +#Disable Mozilla/Firefox/Seamonkey plugin until there is a 64-bit version CONFIGURE_ARGS += --without-mozjs CONFIGURE_ARGS += --with-python CONFIGURE_ARGS += --disable-silent-rules This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From hson at users.sourceforge.net Fri Jan 15 17:41:01 2010 From: hson at users.sourceforge.net (hson at users.sourceforge.net) Date: Fri, 15 Jan 2010 16:41:01 +0000 Subject: [csw-devel] SF.net SVN: gar:[8021] csw/mgar/pkg/libproxy/trunk/Makefile Message-ID: Revision: 8021 http://gar.svn.sourceforge.net/gar/?rev=8021&view=rev Author: hson Date: 2010-01-15 16:41:00 +0000 (Fri, 15 Jan 2010) Log Message: ----------- libproxy: Make python package ARCHALL Modified Paths: -------------- csw/mgar/pkg/libproxy/trunk/Makefile Modified: csw/mgar/pkg/libproxy/trunk/Makefile =================================================================== --- csw/mgar/pkg/libproxy/trunk/Makefile 2010-01-15 16:20:21 UTC (rev 8020) +++ csw/mgar/pkg/libproxy/trunk/Makefile 2010-01-15 16:41:00 UTC (rev 8021) @@ -50,6 +50,8 @@ PKGFILES_CSWlibproxydevel = $(PKGFILES_DEVEL) PKGFILES_CSWpy-libproxy = $(libdir).*/python/site-packages/.* +ARCHALL_CSWpy-libproxy = 1 + UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz #PACKAGING_PLATFORMS = solaris10-sparc solaris10-i386 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Fri Jan 15 17:48:14 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 15 Jan 2010 16:48:14 +0000 Subject: [csw-devel] SF.net SVN: gar:[8022] csw/mgar/pkg/pca/trunk Message-ID: Revision: 8022 http://gar.svn.sourceforge.net/gar/?rev=8022&view=rev Author: dmichelsen Date: 2010-01-15 16:48:13 +0000 (Fri, 15 Jan 2010) Log Message: ----------- pca: Add /etc/opt/csw as default location and add sample config file Modified Paths: -------------- csw/mgar/pkg/pca/trunk/Makefile csw/mgar/pkg/pca/trunk/checksums Added Paths: ----------- csw/mgar/pkg/pca/trunk/files/0002-Add-etc-opt-csw-as-config-location.patch Modified: csw/mgar/pkg/pca/trunk/Makefile =================================================================== --- csw/mgar/pkg/pca/trunk/Makefile 2010-01-15 16:41:00 UTC (rev 8021) +++ csw/mgar/pkg/pca/trunk/Makefile 2010-01-15 16:48:13 UTC (rev 8022) @@ -18,7 +18,9 @@ DISTFILES += COPYING DISTFILES += pca.conf -PATCHFILES = 0001-prefer-opencsw-perl.diff +PATCHFILES = 0001-prefer-opencsw-perl.diff +PATCHFILES += 0002-Add-etc-opt-csw-as-config-location.patch + #PATCHDIRLEVEL = 0 # We define upstream file regex so we can be notifed of new upstream software release @@ -34,17 +36,21 @@ SPKG_SOURCEURL = http://www.par.univie.ac.at/solaris/pca/ SPKG_VERSION = $(shell echo $(GARVERSION) | sed -e 's/-/./g') +SAMPLECONF = /etc/opt/csw/pca.conf + ARCHALL = 1 include gar/category.mk post-extract-modulated: - @mv $(WORKSRC)/$(DISTNAME) $(WORKSRC)/pca + mv $(WORKSRC)/$(DISTNAME) $(WORKSRC)/pca @$(MAKECOOKIE) install-custom: - @ginstall -d $(DESTDIR)$(bindir) - @ginstall $(WORKSRC)/pca $(DESTDIR)$(bindir)/pca - @ginstall -d $(DESTDIR)$(mandir)/man8 - @pod2man --section=8 $(WORKSRC)/pca > $(DESTDIR)$(mandir)/man8/pca.8 + ginstall -d $(DESTDIR)$(bindir) + ginstall $(WORKSRC)/pca $(DESTDIR)$(bindir)/pca + ginstall -d $(DESTDIR)/etc/opt/csw + ginstall $(WORKSRC)/pca.conf $(DESTDIR)/etc/opt/csw + ginstall -d $(DESTDIR)$(mandir)/man8 + pod2man --section=8 $(WORKSRC)/pca > $(DESTDIR)$(mandir)/man8/pca.8 @$(MAKECOOKIE) Modified: csw/mgar/pkg/pca/trunk/checksums =================================================================== --- csw/mgar/pkg/pca/trunk/checksums 2010-01-15 16:41:00 UTC (rev 8021) +++ csw/mgar/pkg/pca/trunk/checksums 2010-01-15 16:48:13 UTC (rev 8022) @@ -1,4 +1,5 @@ 4376789925fa9002d0567d739f717748 0001-prefer-opencsw-perl.diff +78c76967d20b4c9c69acacd7417527e1 0002-Add-etc-opt-csw-as-config-location.patch 6f2f2376eba0a788795dd43d68ad32d1 COPYING 7236327edeb969fd2a223cd5b60c0b57 pca-20091216-02 12de68ff8f67b4bb8b095e5646402208 pca.conf Added: csw/mgar/pkg/pca/trunk/files/0002-Add-etc-opt-csw-as-config-location.patch =================================================================== --- csw/mgar/pkg/pca/trunk/files/0002-Add-etc-opt-csw-as-config-location.patch (rev 0) +++ csw/mgar/pkg/pca/trunk/files/0002-Add-etc-opt-csw-as-config-location.patch 2010-01-15 16:48:13 UTC (rev 8022) @@ -0,0 +1,30 @@ +From 00323f9c9023a24b559f59938bc5258caf74501e Mon Sep 17 00:00:00 2001 +From: Dagobert Michelsen +Date: Fri, 15 Jan 2010 17:41:19 +0100 +Subject: [PATCH] Add /etc/opt/csw as config location + +--- + pca | 2 ++ + 1 files changed, 2 insertions(+), 0 deletions(-) + +diff --git a/pca b/pca +index b0206f9..45140f1 100644 +--- a/pca ++++ b/pca +@@ -2394,11 +2394,13 @@ sub parse_args { + if ($o{proxy}) { + push (@conf, dirname($0)."/../etc/pca-proxy.conf"); + push (@conf, "/etc/pca-proxy.conf"); ++ push (@conf, "/etc/opt/csw/pca-proxy.conf"); + push (@conf, "pca-proxy.conf"); + } else { + push (@conf, dirname($0)."/pca.conf"); + push (@conf, dirname($0)."/../etc/pca.conf"); + push (@conf, "/etc/pca.conf"); ++ push (@conf, "/etc/opt/csw/pca.conf"); + $ENV{HOME} && push (@conf, $ENV{HOME}."/.pca"); + push (@conf, "pca.conf"); + } +-- +1.6.6 + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From hson at users.sourceforge.net Fri Jan 15 18:28:24 2010 From: hson at users.sourceforge.net (hson at users.sourceforge.net) Date: Fri, 15 Jan 2010 17:28:24 +0000 Subject: [csw-devel] SF.net SVN: gar:[8023] csw/mgar/pkg/libproxy/tags Message-ID: Revision: 8023 http://gar.svn.sourceforge.net/gar/?rev=8023&view=rev Author: hson Date: 2010-01-15 17:28:21 +0000 (Fri, 15 Jan 2010) Log Message: ----------- libproxy: Package released Added Paths: ----------- csw/mgar/pkg/libproxy/tags/libproxy-0.3.0REV=2010.01.15/ csw/mgar/pkg/libproxy/tags/libproxy-0.3.0REV=2010.01.15/Makefile csw/mgar/pkg/libproxy/tags/libproxy-0.3.0REV=2010.01.15/checksums csw/mgar/pkg/libproxy/tags/libproxy-0.3.0REV=2010.01.15/files/0001-Use-xc99-for-Sun-Studio-compiler.patch csw/mgar/pkg/libproxy/tags/libproxy-0.3.0REV=2010.01.15/files/Solaris8-have-no-stdc99-flag.patch csw/mgar/pkg/libproxy/tags/libproxy-0.3.0REV=2010.01.15/files/SunStudio-have-no-stdc99-flag.patch csw/mgar/pkg/libproxy/tags/libproxy-0.3.0REV=2010.01.15/files/proxy.c.patch csw/mgar/pkg/libproxy/tags/libproxy-0.3.0REV=2010.01.15/files/stdfiles.patch Removed Paths: ------------- csw/mgar/pkg/libproxy/tags/libproxy-0.3.0REV=2010.01.15/Makefile csw/mgar/pkg/libproxy/tags/libproxy-0.3.0REV=2010.01.15/checksums csw/mgar/pkg/libproxy/tags/libproxy-0.3.0REV=2010.01.15/files/0001-Use-xc99-for-Sun-Studio-compiler.patch Deleted: csw/mgar/pkg/libproxy/tags/libproxy-0.3.0REV=2010.01.15/Makefile =================================================================== --- csw/mgar/pkg/libproxy/trunk/Makefile 2010-01-11 15:28:58 UTC (rev 7969) +++ csw/mgar/pkg/libproxy/tags/libproxy-0.3.0REV=2010.01.15/Makefile 2010-01-15 17:28:21 UTC (rev 8023) @@ -1,33 +0,0 @@ -GARNAME = libproxy -GARVERSION = 0.3.0 -CATEGORIES = lib - -DESCRIPTION = A library that provides automatic proxy configuration management -define BLURB - libproxy exists to answer the question: Given a network resource, how do I - reach it? It handles all the details, enabling you to get back to programming. - GNOME? KDE? Command line? WPAD? PAC? Network changed? It doesn't matter! Just - ask libproxy what proxy to use: you get simple code and your users get correct, - consistant behavior and broad infrastructure compatibility. -endef - -MASTER_SITES = http://libproxy.googlecode.com/files/ -DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz -PATCHFILES = 0001-Use-xc99-for-Sun-Studio-compiler.patch -PATCHFILES += 0002-Dont-preset-CFLAGS.patch - -# We define upstream file regex so we can be notifed of new upstream software release -UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz - -PACKAGING_PLATFORMS = solaris10-sparc solaris10-i386 - -EXTRA_LINKER_FLAGS = -lnsl -BUILD64 = 1 -CONFIGURE_ARGS = $(DIRPATHS) - -TEST_TARGET = check - -include gar/category.mk - -# There is actually the cpp executable in /usr/lib -PATH := $(PATH):/usr/lib Copied: csw/mgar/pkg/libproxy/tags/libproxy-0.3.0REV=2010.01.15/Makefile (from rev 8021, csw/mgar/pkg/libproxy/trunk/Makefile) =================================================================== --- csw/mgar/pkg/libproxy/tags/libproxy-0.3.0REV=2010.01.15/Makefile (rev 0) +++ csw/mgar/pkg/libproxy/tags/libproxy-0.3.0REV=2010.01.15/Makefile 2010-01-15 17:28:21 UTC (rev 8023) @@ -0,0 +1,93 @@ +GARNAME = libproxy +GARVERSION = 0.3.0 +CATEGORIES = lib + +DESCRIPTION = A library that provides automatic proxy configuration management +define BLURB + libproxy exists to answer the question: Given a network resource, how do I + reach it? It handles all the details, enabling you to get back to programming. + GNOME? KDE? Command line? WPAD? PAC? Network changed? It doesn't matter! Just + ask libproxy what proxy to use: you get simple code and your users get correct, + consistant behavior and broad infrastructure compatibility. +endef + +MASTER_SITES = http://libproxy.googlecode.com/files/ +DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz +#PATCHFILES = 0001-Use-xc99-for-Sun-Studio-compiler.patch +PATCHFILES += 0002-Dont-preset-CFLAGS.patch +# For Solaris 10 targets +#PATCHFILES_isa-amd64 += SunStudio-have-no-stdc99-flag.patch +#PATCHFILES_isa-sparcv8 += SunStudio-have-no-stdc99-flag.patch +#PATCHFILES_isa-sparcv9 += SunStudio-have-no-stdc99-flag.patch +#PATCHFILES_isa-i386 += SunStudio-have-no-stdc99-flag.patch +#For Solaris 8 targets +PATCHFILES_isa-amd64 += SunStudio-have-no-stdc99-flag.patch +PATCHFILES_isa-sparcv8 += Solaris8-have-no-stdc99-flag.patch +PATCHFILES_isa-sparcv8 += stdfiles.patch +PATCHFILES_isa-sparcv8 += proxy.c.patch +PATCHFILES_isa-sparcv9 += Solaris8-have-no-stdc99-flag.patch +PATCHFILES_isa-sparcv9 += stdfiles.patch +PATCHFILES_isa-sparcv9 += proxy.c.patch +PATCHFILES_isa-i386 += Solaris8-have-no-stdc99-flag.patch +PATCHFILES_isa-i386 += stdfiles.patch +PATCHFILES_isa-i386 += proxy.c.patch + +PACKAGES = CSWlibproxy CSWlibproxydevel CSWpy-libproxy +CATALOGNAME_CSWlibproxy = libproxy +CATALOGNAME_CSWlibproxydevel = libproxy_devel +CATALOGNAME_CSWpy-libproxy = py_libproxy +SPKG_DESC_CSWlibproxy = A library that provides automatic proxy configuration management +SPKG_DESC_CSWlibproxydevel = A library that provides automatic proxy configuration management - development files +SPKG_DESC_CSWpy-libproxy = A library that provides automatic proxy configuration management - Python bindings + +REQUIRED_PKGS_CSWlibproxy += CSWlibice CSWlibsm CSWlibx11 CSWlibxmu CSWlibxt +REQUIRED_PKGS_CSWlibproxydevel += CSWlibproxy +REQUIRED_PKGS_CSWpy-libproxy += CSWpython CSWlibproxy +PREREQUISITE_PKGS += CSWlibx11devel CSWlibxmudevel CSWlibdbusdev +#Disable Mozilla/Firefox/Seamonkey plugin until there is a 64-bit version +#PREREQUISITE_PKGS += CSWmozilla CSWseamonkey CSWfirefox + +PKGFILES_CSWlibproxydevel = $(PKGFILES_DEVEL) +PKGFILES_CSWpy-libproxy = $(libdir).*/python/site-packages/.* + +ARCHALL_CSWpy-libproxy = 1 + +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + +#PACKAGING_PLATFORMS = solaris10-sparc solaris10-i386 + +EXTRA_LINKER_FLAGS = -lnsl +BUILD64 = 1 + +EXTRA_INC = $(prefix)/X11/include +EXTRA_LIB = $(prefix)/X11/lib +EXTRA_PKG_CONFIG_DIRS = $(prefix)/X11/lib +#Disable Mozilla/Firefox/Seamonkey plugin until there is a 64-bit version +#EXTRA_PKG_CONFIG_DIRS += $(prefix)/mozilla/lib +#EXTRA_PKG_CONFIG_DIRS += $(prefix)/mozilla/firefox/lib +#EXTRA_PKG_CONFIG_DIRS += $(prefix)/mozilla/seamonkey/lib + + +CONFIGURE_ARGS = $(DIRPATHS) +#Disable Mozilla/Firefox/Seamonkey plugin until there is a 64-bit version +CONFIGURE_ARGS += --without-mozjs +CONFIGURE_ARGS += --with-python +CONFIGURE_ARGS += --disable-silent-rules + +TEST_TARGET = check + +include gar/category.mk + +#pre-configure-modulated: +# @echo " ==> Regenerating build tools..." +# @(cd $(WORKSRC) ; \ +# aclocal && \ +# autoconf && \ +# libtoolize --automake --force && \ +# aclocal && \ +# automake -a ) +# @$(MAKECOOKIE) + + +# There is actually the cpp executable in /usr/lib +PATH := $(PATH):/usr/lib Deleted: csw/mgar/pkg/libproxy/tags/libproxy-0.3.0REV=2010.01.15/checksums =================================================================== --- csw/mgar/pkg/libproxy/trunk/checksums 2010-01-11 15:28:58 UTC (rev 7969) +++ csw/mgar/pkg/libproxy/tags/libproxy-0.3.0REV=2010.01.15/checksums 2010-01-15 17:28:21 UTC (rev 8023) @@ -1,3 +0,0 @@ -ce2d836df293fa8183265176459cf87e 0001-Use-xc99-for-Sun-Studio-compiler.patch -acd3e61f107ff188722fb1335e0ed37c 0002-Dont-preset-CFLAGS.patch -6ded75a6c6aef53be657ece207cc26c4 libproxy-0.3.0.tar.gz Copied: csw/mgar/pkg/libproxy/tags/libproxy-0.3.0REV=2010.01.15/checksums (from rev 8006, csw/mgar/pkg/libproxy/trunk/checksums) =================================================================== --- csw/mgar/pkg/libproxy/tags/libproxy-0.3.0REV=2010.01.15/checksums (rev 0) +++ csw/mgar/pkg/libproxy/tags/libproxy-0.3.0REV=2010.01.15/checksums 2010-01-15 17:28:21 UTC (rev 8023) @@ -0,0 +1,6 @@ +acd3e61f107ff188722fb1335e0ed37c 0002-Dont-preset-CFLAGS.patch +dd08c0fd4795084e5970d59f8de149dd Solaris8-have-no-stdc99-flag.patch +95c2645311c9e840c0ed81c7a9aefadb SunStudio-have-no-stdc99-flag.patch +6ded75a6c6aef53be657ece207cc26c4 libproxy-0.3.0.tar.gz +647cefd3bb414eb269cb59aace9eb35b proxy.c.patch +7dd25dd1f615fe7a3c2a1d9c9a179e74 stdfiles.patch Deleted: csw/mgar/pkg/libproxy/tags/libproxy-0.3.0REV=2010.01.15/files/0001-Use-xc99-for-Sun-Studio-compiler.patch =================================================================== --- csw/mgar/pkg/libproxy/trunk/files/0001-Use-xc99-for-Sun-Studio-compiler.patch 2010-01-11 15:28:58 UTC (rev 7969) +++ csw/mgar/pkg/libproxy/tags/libproxy-0.3.0REV=2010.01.15/files/0001-Use-xc99-for-Sun-Studio-compiler.patch 2010-01-15 17:28:21 UTC (rev 8023) @@ -1,56 +0,0 @@ -From 3ea26b980c8929de2f92a33de49a09dc12f63a68 Mon Sep 17 00:00:00 2001 -From: Dagobert Michelsen -Date: Tue, 5 Jan 2010 15:29:01 +0100 -Subject: [PATCH] Use xc99 for Sun Studio compiler - ---- - src/bin/Makefile.am | 2 +- - src/bin/Makefile.in | 2 +- - src/lib/Makefile.am | 2 +- - src/lib/Makefile.in | 2 +- - src/modules/Makefile.am | 2 +- - src/modules/Makefile.in | 2 +- - 6 files changed, 6 insertions(+), 6 deletions(-) - -diff --git a/src/bin/Makefile.in b/src/bin/Makefile.in -index 625fbb3..ed8cd56 100644 ---- a/src/bin/Makefile.in -+++ b/src/bin/Makefile.in -@@ -239,7 +239,7 @@ xmu_LIBS = @xmu_LIBS@ - - # Command line interface to libproxy - proxy_SOURCES = proxy.c --proxy_CPPFLAGS = -I$(top_srcdir)/src/lib -std=c99 -+proxy_CPPFLAGS = -I$(top_srcdir)/src/lib -xc99 - proxy_LDADD = ../lib/libproxy.la - all: all-am - -diff --git a/src/lib/Makefile.in b/src/lib/Makefile.in -index 77bb2da..73e087c 100644 ---- a/src/lib/Makefile.in -+++ b/src/lib/Makefile.in -@@ -277,7 +277,7 @@ libproxy_la_SOURCES = \ - strdict.c strdict.h \ - url.c url.h - --libproxy_la_CFLAGS = -DMODULEDIR=\"@MODULEDIR@@DIR_SEPARATOR@\" -DSYSCONFDIR=\"@SYSCONFDIR@@DIR_SEPARATOR@\" -std=c99 -D_POSIX_C_SOURCE=200112L -+libproxy_la_CFLAGS = -DMODULEDIR=\"@MODULEDIR@@DIR_SEPARATOR@\" -DSYSCONFDIR=\"@SYSCONFDIR@@DIR_SEPARATOR@\" -xc99 -D_POSIX_C_SOURCE=200112L - libproxy_la_LDFLAGS = -lpthread -lm -no-undefined - include_HEADERS = proxy.h - all: all-am -diff --git a/src/modules/Makefile.in b/src/modules/Makefile.in -index 6965056..45c9c57 100644 ---- a/src/modules/Makefile.in -+++ b/src/modules/Makefile.in -@@ -359,7 +359,7 @@ x11_LIBS = @x11_LIBS@ - xmu_CFLAGS = @xmu_CFLAGS@ - xmu_LIBS = @xmu_LIBS@ - moduledir = @MODULEDIR@ --AM_CFLAGS = -std=c99 -+AM_CFLAGS = -xc99 - AM_LDFLAGS = -module -avoid-version -no-undefined - - # Which modules to build --- -1.6.6 - Copied: csw/mgar/pkg/libproxy/tags/libproxy-0.3.0REV=2010.01.15/files/0001-Use-xc99-for-Sun-Studio-compiler.patch (from rev 8005, csw/mgar/pkg/libproxy/trunk/files/0001-Use-xc99-for-Sun-Studio-compiler.patch) =================================================================== --- csw/mgar/pkg/libproxy/tags/libproxy-0.3.0REV=2010.01.15/files/0001-Use-xc99-for-Sun-Studio-compiler.patch (rev 0) +++ csw/mgar/pkg/libproxy/tags/libproxy-0.3.0REV=2010.01.15/files/0001-Use-xc99-for-Sun-Studio-compiler.patch 2010-01-15 17:28:21 UTC (rev 8023) @@ -0,0 +1,56 @@ +From 3ea26b980c8929de2f92a33de49a09dc12f63a68 Mon Sep 17 00:00:00 2001 +From: Dagobert Michelsen +Date: Tue, 5 Jan 2010 15:29:01 +0100 +Subject: [PATCH] Use xc99 for Sun Studio compiler + +--- + src/bin/Makefile.am | 2 +- + src/bin/Makefile.in | 2 +- + src/lib/Makefile.am | 2 +- + src/lib/Makefile.in | 2 +- + src/modules/Makefile.am | 2 +- + src/modules/Makefile.in | 2 +- + 6 files changed, 6 insertions(+), 6 deletions(-) + +diff --git a/src/bin/Makefile.in b/src/bin/Makefile.in +index 625fbb3..ed8cd56 100644 +--- a/src/bin/Makefile.in ++++ b/src/bin/Makefile.in +@@ -239,7 +239,7 @@ xmu_LIBS = @xmu_LIBS@ + + # Command line interface to libproxy + proxy_SOURCES = proxy.c +-proxy_CPPFLAGS = -I$(top_srcdir)/src/lib -std=c99 ++proxy_CPPFLAGS = -I$(top_srcdir)/src/lib -xc99 + proxy_LDADD = ../lib/libproxy.la + all: all-am + +diff --git a/src/lib/Makefile.in b/src/lib/Makefile.in +index 77bb2da..73e087c 100644 +--- a/src/lib/Makefile.in ++++ b/src/lib/Makefile.in +@@ -277,7 +277,7 @@ libproxy_la_SOURCES = \ + strdict.c strdict.h \ + url.c url.h + +-libproxy_la_CFLAGS = -DMODULEDIR=\"@MODULEDIR@@DIR_SEPARATOR@\" -DSYSCONFDIR=\"@SYSCONFDIR@@DIR_SEPARATOR@\" -std=c99 -D_POSIX_C_SOURCE=200112L ++libproxy_la_CFLAGS = -DMODULEDIR=\"@MODULEDIR@@DIR_SEPARATOR@\" -DSYSCONFDIR=\"@SYSCONFDIR@@DIR_SEPARATOR@\" -xc99 -D_POSIX_C_SOURCE=200112L + libproxy_la_LDFLAGS = -lpthread -lm -no-undefined + include_HEADERS = proxy.h + all: all-am +diff --git a/src/modules/Makefile.in b/src/modules/Makefile.in +index 6965056..45c9c57 100644 +--- a/src/modules/Makefile.in ++++ b/src/modules/Makefile.in +@@ -359,7 +359,7 @@ x11_LIBS = @x11_LIBS@ + xmu_CFLAGS = @xmu_CFLAGS@ + xmu_LIBS = @xmu_LIBS@ + moduledir = @MODULEDIR@ +-AM_CFLAGS = -std=c99 ++AM_CFLAGS = -xc99 + AM_LDFLAGS = -module -avoid-version -no-undefined + + # Which modules to build +-- +1.6.6 + Copied: csw/mgar/pkg/libproxy/tags/libproxy-0.3.0REV=2010.01.15/files/Solaris8-have-no-stdc99-flag.patch (from rev 8006, csw/mgar/pkg/libproxy/trunk/files/Solaris8-have-no-stdc99-flag.patch) =================================================================== --- csw/mgar/pkg/libproxy/tags/libproxy-0.3.0REV=2010.01.15/files/Solaris8-have-no-stdc99-flag.patch (rev 0) +++ csw/mgar/pkg/libproxy/tags/libproxy-0.3.0REV=2010.01.15/files/Solaris8-have-no-stdc99-flag.patch 2010-01-15 17:28:21 UTC (rev 8023) @@ -0,0 +1,134 @@ +diff -Nru libproxy-0.3.0.orig/src/bin/Makefile.am libproxy-0.3.0/src/bin/Makefile.am +--- libproxy-0.3.0.orig/src/bin/Makefile.am 2009-08-14 21:00:32.000000000 +0200 ++++ libproxy-0.3.0/src/bin/Makefile.am 2010-01-07 12:16:16.608932753 +0100 +@@ -2,5 +2,5 @@ + + # Command line interface to libproxy + proxy_SOURCES = proxy.c +-proxy_CPPFLAGS = -I$(top_srcdir)/src/lib -std=c99 ++proxy_CPPFLAGS = -I$(top_srcdir)/src/lib + proxy_LDADD = ../lib/libproxy.la +diff -Nru libproxy-0.3.0.orig/src/lib/Makefile.am libproxy-0.3.0/src/lib/Makefile.am +--- libproxy-0.3.0.orig/src/lib/Makefile.am 2009-08-14 21:00:32.000000000 +0200 ++++ libproxy-0.3.0/src/lib/Makefile.am 2010-01-07 12:17:37.568266736 +0100 +@@ -10,8 +10,8 @@ + strdict.c strdict.h \ + url.c url.h + +-libproxy_la_CFLAGS = -DMODULEDIR=\"@MODULEDIR@@DIR_SEPARATOR@\" -DSYSCONFDIR=\"@SYSCONFDIR@@DIR_SEPARATOR@\" -std=c99 -D_POSIX_C_SOURCE=200112L ++libproxy_la_CFLAGS = -DMODULEDIR=\"@MODULEDIR@@DIR_SEPARATOR@\" -DSYSCONFDIR=\"@SYSCONFDIR@@DIR_SEPARATOR@\" + libproxy_la_LDFLAGS = -lpthread -lm -no-undefined + + include_HEADERS = proxy.h + +diff -Nru libproxy-0.3.0.orig/src/lib/Makefile.in libproxy-0.3.0/src/lib/Makefile.in +--- libproxy-0.3.0.orig/src/lib/Makefile.in 2009-08-14 21:05:15.000000000 +0200 ++++ libproxy-0.3.0/src/lib/Makefile.in 2010-01-07 11:58:19.284179024 +0100 +@@ -277,7 +277,7 @@ + strdict.c strdict.h \ + url.c url.h + +-libproxy_la_CFLAGS = -DMODULEDIR=\"@MODULEDIR@@DIR_SEPARATOR@\" -DSYSCONFDIR=\"@SYSCONFDIR@@DIR_SEPARATOR@\" -std=c99 -D_POSIX_C_SOURCE=200112L ++libproxy_la_CFLAGS = -DMODULEDIR=\"@MODULEDIR@@DIR_SEPARATOR@\" -DSYSCONFDIR=\"@SYSCONFDIR@@DIR_SEPARATOR@\" + libproxy_la_LDFLAGS = -lpthread -lm -no-undefined + include_HEADERS = proxy.h + all: all-am +diff -Nru libproxy-0.3.0.orig/src/modules/Makefile.am libproxy-0.3.0/src/modules/Makefile.am +--- libproxy-0.3.0.orig/src/modules/Makefile.am 2009-08-14 21:06:30.000000000 +0200 ++++ libproxy-0.3.0/src/modules/Makefile.am 2010-01-07 12:18:24.020865842 +0100 +@@ -1,5 +1,5 @@ + moduledir = @MODULEDIR@ +-AM_CFLAGS = -std=c99 ++AM_CFLAGS = + AM_LDFLAGS = -module -avoid-version -no-undefined + + +@@ -50,7 +50,7 @@ + + # GConf/GNOME Config Module + config_gnome_la_SOURCES = config_gnome.c xhasclient.c +-config_gnome_la_CPPFLAGS = -I$(top_srcdir)/src/lib -D_POSIX_C_SOURCE=200112L -DGCONFTOOLBIN='"@GCONFTOOLBIN@"' @GNOME_CFLAGS@ ++config_gnome_la_CPPFLAGS = -I$(top_srcdir)/src/lib -DGCONFTOOLBIN='"@GCONFTOOLBIN@"' @GNOME_CFLAGS@ + config_gnome_la_LIBADD = ../lib/libproxy.la + config_gnome_la_LDFLAGS = $(AM_LDFLAGS) @GNOME_LIBS@ + +@@ -77,12 +77,12 @@ + + # IP Ignore Module + ignore_ip_la_SOURCES = ignore_ip.c +-ignore_ip_la_CPPFLAGS = -I$(top_srcdir)/src/lib -D_POSIX_C_SOURCE=200112L ++ignore_ip_la_CPPFLAGS = -I$(top_srcdir)/src/lib + ignore_ip_la_LIBADD = ../lib/libproxy.la + + # WebKit (JavaScriptCore) based PAC runner + pacrunner_webkit_la_SOURCES = pacrunner_webkit.c +-pacrunner_webkit_la_CPPFLAGS = -I$(top_srcdir)/src/lib @WEBKIT_CFLAGS@ -D_POSIX_C_SOURCE=200112L ++pacrunner_webkit_la_CPPFLAGS = -I$(top_srcdir)/src/lib @WEBKIT_CFLAGS@ + pacrunner_webkit_la_LIBADD = ../lib/libproxy.la + if MINGW32 + pacrunner_webkit_la_LIBADD += ../platform/win32/libwinutils.la +@@ -92,7 +92,7 @@ + + # Mozilla (Spidermonkey) based PAC runner + pacrunner_mozjs_la_SOURCES = pacrunner_mozjs.c +-pacrunner_mozjs_la_CPPFLAGS = -I$(top_srcdir)/src/lib @MOZJS_CFLAGS@ -D_POSIX_C_SOURCE=200112L ++pacrunner_mozjs_la_CPPFLAGS = -I$(top_srcdir)/src/lib @MOZJS_CFLAGS@ + pacrunner_mozjs_la_LIBADD = ../lib/libproxy.la + pacrunner_mozjs_la_LDFLAGS = $(AM_LDFLAGS) @MOZJS_LIBS@ + nodist_pacrunner_mozjs_la_SOURCES = pacutils.h +diff -Nru libproxy-0.3.0.orig/src/modules/Makefile.in libproxy-0.3.0/src/modules/Makefile.in +--- libproxy-0.3.0.orig/src/modules/Makefile.in 2009-08-14 21:07:00.000000000 +0200 ++++ libproxy-0.3.0/src/modules/Makefile.in 2010-01-14 18:03:41.850944638 +0100 +@@ -359,7 +359,7 @@ + xmu_CFLAGS = @xmu_CFLAGS@ + xmu_LIBS = @xmu_LIBS@ + moduledir = @MODULEDIR@ +-AM_CFLAGS = -std=c99 ++AM_CFLAGS = + AM_LDFLAGS = -module -avoid-version -no-undefined + + # Which modules to build +@@ -385,7 +385,7 @@ + + # GConf/GNOME Config Module + config_gnome_la_SOURCES = config_gnome.c xhasclient.c +-config_gnome_la_CPPFLAGS = -I$(top_srcdir)/src/lib -D_POSIX_C_SOURCE=200112L -DGCONFTOOLBIN='"@GCONFTOOLBIN@"' @GNOME_CFLAGS@ ++config_gnome_la_CPPFLAGS = -I$(top_srcdir)/src/lib -DGCONFTOOLBIN='"@GCONFTOOLBIN@"' @GNOME_CFLAGS@ + config_gnome_la_LIBADD = ../lib/libproxy.la + config_gnome_la_LDFLAGS = $(AM_LDFLAGS) @GNOME_LIBS@ + +@@ -412,19 +412,19 @@ + + # IP Ignore Module + ignore_ip_la_SOURCES = ignore_ip.c +-ignore_ip_la_CPPFLAGS = -I$(top_srcdir)/src/lib -D_POSIX_C_SOURCE=200112L ++ignore_ip_la_CPPFLAGS = -I$(top_srcdir)/src/lib + ignore_ip_la_LIBADD = ../lib/libproxy.la + + # WebKit (JavaScriptCore) based PAC runner + pacrunner_webkit_la_SOURCES = pacrunner_webkit.c +-pacrunner_webkit_la_CPPFLAGS = -I$(top_srcdir)/src/lib @WEBKIT_CFLAGS@ -D_POSIX_C_SOURCE=200112L ++pacrunner_webkit_la_CPPFLAGS = -I$(top_srcdir)/src/lib @WEBKIT_CFLAGS@ + pacrunner_webkit_la_LIBADD = ../lib/libproxy.la $(am__append_10) + pacrunner_webkit_la_LDFLAGS = $(AM_LDFLAGS) @WEBKIT_LIBS@ + nodist_pacrunner_webkit_la_SOURCES = pacutils.h + + # Mozilla (Spidermonkey) based PAC runner + pacrunner_mozjs_la_SOURCES = pacrunner_mozjs.c +-pacrunner_mozjs_la_CPPFLAGS = -I$(top_srcdir)/src/lib @MOZJS_CFLAGS@ -D_POSIX_C_SOURCE=200112L ++pacrunner_mozjs_la_CPPFLAGS = -I$(top_srcdir)/src/lib @MOZJS_CFLAGS@ + pacrunner_mozjs_la_LIBADD = ../lib/libproxy.la + pacrunner_mozjs_la_LDFLAGS = $(AM_LDFLAGS) @MOZJS_LIBS@ + nodist_pacrunner_mozjs_la_SOURCES = pacutils.h +diff -Nru libproxy-0.3.0.orig/src/bin/Makefile.in libproxy-0.3.0/src/bin/Makefile.in +--- libproxy-0.3.0.orig/src/bin/Makefile.in 2009-08-14 21:05:15.000000000 +0200 ++++ libproxy-0.3.0/src/bin/Makefile.in 2010-01-14 18:04:24.531275033 +0100 +@@ -239,7 +239,7 @@ + + # Command line interface to libproxy + proxy_SOURCES = proxy.c +-proxy_CPPFLAGS = -I$(top_srcdir)/src/lib -std=c99 ++proxy_CPPFLAGS = -I$(top_srcdir)/src/lib + proxy_LDADD = ../lib/libproxy.la + all: all-am + Copied: csw/mgar/pkg/libproxy/tags/libproxy-0.3.0REV=2010.01.15/files/SunStudio-have-no-stdc99-flag.patch (from rev 8006, csw/mgar/pkg/libproxy/trunk/files/SunStudio-have-no-stdc99-flag.patch) =================================================================== --- csw/mgar/pkg/libproxy/tags/libproxy-0.3.0REV=2010.01.15/files/SunStudio-have-no-stdc99-flag.patch (rev 0) +++ csw/mgar/pkg/libproxy/tags/libproxy-0.3.0REV=2010.01.15/files/SunStudio-have-no-stdc99-flag.patch 2010-01-15 17:28:21 UTC (rev 8023) @@ -0,0 +1,69 @@ +diff -Nru libproxy-0.3.0.orig/src/bin/Makefile.am libproxy-0.3.0/src/bin/Makefile.am +--- libproxy-0.3.0.orig/src/bin/Makefile.am 2009-08-14 21:00:32.000000000 +0200 ++++ libproxy-0.3.0/src/bin/Makefile.am 2010-01-07 12:16:16.608932753 +0100 +@@ -2,5 +2,5 @@ + + # Command line interface to libproxy + proxy_SOURCES = proxy.c +-proxy_CPPFLAGS = -I$(top_srcdir)/src/lib -std=c99 ++proxy_CPPFLAGS = -I$(top_srcdir)/src/lib -xc99 + proxy_LDADD = ../lib/libproxy.la +diff -Nru libproxy-0.3.0.orig/src/lib/Makefile.am libproxy-0.3.0/src/lib/Makefile.am +--- libproxy-0.3.0.orig/src/lib/Makefile.am 2009-08-14 21:00:32.000000000 +0200 ++++ libproxy-0.3.0/src/lib/Makefile.am 2010-01-07 12:17:37.568266736 +0100 +@@ -10,8 +10,8 @@ + strdict.c strdict.h \ + url.c url.h + +-libproxy_la_CFLAGS = -DMODULEDIR=\"@MODULEDIR@@DIR_SEPARATOR@\" -DSYSCONFDIR=\"@SYSCONFDIR@@DIR_SEPARATOR@\" -std=c99 -D_POSIX_C_SOURCE=200112L ++libproxy_la_CFLAGS = -DMODULEDIR=\"@MODULEDIR@@DIR_SEPARATOR@\" -DSYSCONFDIR=\"@SYSCONFDIR@@DIR_SEPARATOR@\" -xc99 -D_POSIX_C_SOURCE=200112L + libproxy_la_LDFLAGS = -lpthread -lm -no-undefined + + include_HEADERS = proxy.h + +diff -Nru libproxy-0.3.0.orig/src/lib/Makefile.in libproxy-0.3.0/src/lib/Makefile.in +--- libproxy-0.3.0.orig/src/lib/Makefile.in 2009-08-14 21:05:15.000000000 +0200 ++++ libproxy-0.3.0/src/lib/Makefile.in 2010-01-07 11:58:19.284179024 +0100 +@@ -277,7 +277,7 @@ + strdict.c strdict.h \ + url.c url.h + +-libproxy_la_CFLAGS = -DMODULEDIR=\"@MODULEDIR@@DIR_SEPARATOR@\" -DSYSCONFDIR=\"@SYSCONFDIR@@DIR_SEPARATOR@\" -std=c99 -D_POSIX_C_SOURCE=200112L ++libproxy_la_CFLAGS = -DMODULEDIR=\"@MODULEDIR@@DIR_SEPARATOR@\" -DSYSCONFDIR=\"@SYSCONFDIR@@DIR_SEPARATOR@\" -xc99 -D_POSIX_C_SOURCE=200112L + libproxy_la_LDFLAGS = -lpthread -lm -no-undefined + include_HEADERS = proxy.h + all: all-am +diff -Nru libproxy-0.3.0.orig/src/modules/Makefile.am libproxy-0.3.0/src/modules/Makefile.am +--- libproxy-0.3.0.orig/src/modules/Makefile.am 2009-08-14 21:06:30.000000000 +0200 ++++ libproxy-0.3.0/src/modules/Makefile.am 2010-01-07 12:18:24.020865842 +0100 +@@ -1,5 +1,5 @@ + moduledir = @MODULEDIR@ +-AM_CFLAGS = -std=c99 ++AM_CFLAGS = -xc99 + AM_LDFLAGS = -module -avoid-version -no-undefined + + +diff -Nru libproxy-0.3.0.orig/src/modules/Makefile.in libproxy-0.3.0/src/modules/Makefile.in +--- libproxy-0.3.0.orig/src/modules/Makefile.in 2009-08-14 21:07:00.000000000 +0200 ++++ libproxy-0.3.0/src/modules/Makefile.in 2010-01-14 18:03:41.850944638 +0100 +@@ -359,7 +359,7 @@ + xmu_CFLAGS = @xmu_CFLAGS@ + xmu_LIBS = @xmu_LIBS@ + moduledir = @MODULEDIR@ +-AM_CFLAGS = -std=c99 ++AM_CFLAGS = -xc99 + AM_LDFLAGS = -module -avoid-version -no-undefined + + # Which modules to build +diff -Nru libproxy-0.3.0.orig/src/bin/Makefile.in libproxy-0.3.0/src/bin/Makefile.in +--- libproxy-0.3.0.orig/src/bin/Makefile.in 2009-08-14 21:05:15.000000000 +0200 ++++ libproxy-0.3.0/src/bin/Makefile.in 2010-01-14 18:04:24.531275033 +0100 +@@ -239,7 +239,7 @@ + + # Command line interface to libproxy + proxy_SOURCES = proxy.c +-proxy_CPPFLAGS = -I$(top_srcdir)/src/lib -std=c99 ++proxy_CPPFLAGS = -I$(top_srcdir)/src/lib -xc99 + proxy_LDADD = ../lib/libproxy.la + all: all-am + Copied: csw/mgar/pkg/libproxy/tags/libproxy-0.3.0REV=2010.01.15/files/proxy.c.patch (from rev 8006, csw/mgar/pkg/libproxy/trunk/files/proxy.c.patch) =================================================================== --- csw/mgar/pkg/libproxy/tags/libproxy-0.3.0REV=2010.01.15/files/proxy.c.patch (rev 0) +++ csw/mgar/pkg/libproxy/tags/libproxy-0.3.0REV=2010.01.15/files/proxy.c.patch 2010-01-15 17:28:21 UTC (rev 8023) @@ -0,0 +1,40 @@ +diff -Nru libproxy-0.3.0.orig/src/lib/proxy.c libproxy-0.3.0/src/lib/proxy.c +--- libproxy-0.3.0.orig/src/lib/proxy.c 2009-08-14 21:00:32.000000000 +0200 ++++ libproxy-0.3.0/src/lib/proxy.c 2010-01-07 11:57:19.188739832 +0100 +@@ -162,17 +162,37 @@ + if (!px_module_manager_register_type(self->mm, pxWPADModule, _px_wpad_module_cmp, false)) goto error; + + /* If we have a config file, load the config order from it */ ++#if (defined(__SUNPRO_C) && ( defined(__SunOS_5_8) || defined(__SunOS_5_9))) ++ char *envp; ++ envp = px_malloc0(strlen("_PX_CONFIG_ORDER")+3); ++ sprintf(envp,"_PX_CONFIG_ORDER="); ++ putenv(envp); ++#else + setenv("_PX_CONFIG_ORDER", "", 1); ++#endif + pxConfigFile *cf = px_config_file_new(SYSCONFDIR "proxy.conf"); + if (cf) + { + char *tmp = px_config_file_get_value(cf, PX_CONFIG_FILE_DEFAULT_SECTION, "config_order"); + px_config_file_free(cf); ++#if (defined(__SUNPRO_C) && ( defined(__SunOS_5_8) || defined(__SunOS_5_9))) ++ if (tmp) { ++ int retval; ++ envp = px_malloc0(strlen("_PX_CONFIG_ORDER")+strlen(tmp)+2); ++ sprintf(envp,"_PX_CONFIG_ORDER=%s",tmp); ++ retval = putenv(envp); ++ if(retval) { ++ px_free(tmp); ++ goto error; ++ } ++ } ++#else + if (tmp && setenv("_PX_CONFIG_ORDER", tmp, 1)) + { + px_free(tmp); + goto error; + } ++#endif + px_free(tmp); + } Copied: csw/mgar/pkg/libproxy/tags/libproxy-0.3.0REV=2010.01.15/files/stdfiles.patch (from rev 8006, csw/mgar/pkg/libproxy/trunk/files/stdfiles.patch) =================================================================== --- csw/mgar/pkg/libproxy/tags/libproxy-0.3.0REV=2010.01.15/files/stdfiles.patch (rev 0) +++ csw/mgar/pkg/libproxy/tags/libproxy-0.3.0REV=2010.01.15/files/stdfiles.patch 2010-01-15 17:28:21 UTC (rev 8023) @@ -0,0 +1,34 @@ +diff -Nru libproxy-0.3.0.orig/src/lib/stdbool.h libproxy-0.3.0/src/lib/stdbool.h +--- libproxy-0.3.0.orig/src/lib/stdbool.h 1970-01-01 01:00:00.000000000 +0100 ++++ libproxy-0.3.0/src/lib/stdbool.h 2010-01-15 00:49:51.930719445 +0100 +@@ -0,0 +1,17 @@ ++#ifndef _STDBOOL_H ++#ifndef _MY_STDBOOL_H ++#define _MY_STDBOOL_H ++ ++#if !defined(__GNUG__) && (defined(__SUNPRO_C) && ( defined(__SunOS_5_8) || defined(__SunOS_5_9))) ++ ++#ifndef bool ++#define bool int ++#define false 0 ++#define true 1 ++#endif /* bool */ ++ ++#endif /* Compiler has bool */ ++ ++ ++#endif /* _MY_BOOL_H_*/ ++#endif /* _STDBOOL_H_*/ +diff -Nru libproxy-0.3.0.orig/src/lib/stdint.h libproxy-0.3.0/src/lib/stdint.h +--- libproxy-0.3.0.orig/src/lib/stdint.h 1970-01-01 01:00:00.000000000 +0100 ++++ libproxy-0.3.0/src/lib/stdint.h 2010-01-15 01:00:57.971084112 +0100 +@@ -0,0 +1,9 @@ ++#ifndef _STDINT_H ++#ifndef _MY_STDINT_H ++#define _MY_STDINT_H ++ ++#if !defined(__GNUG__) && (defined(__SUNPRO_C) && ( defined(__SunOS_5_8) || defined(__SunOS_5_9))) ++#include ++#endif /* Compiler has stdint.h */ ++#endif /* _MY_STDINT_H */ ++#endif /* _STDINT_H */ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Fri Jan 15 23:20:49 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 15 Jan 2010 22:20:49 +0000 Subject: [csw-devel] SF.net SVN: gar:[8024] csw/mgar/pkg Message-ID: Revision: 8024 http://gar.svn.sourceforge.net/gar/?rev=8024&view=rev Author: dmichelsen Date: 2010-01-15 22:20:48 +0000 (Fri, 15 Jan 2010) Log Message: ----------- mtx: Initial commit Added Paths: ----------- csw/mgar/pkg/mtx/ csw/mgar/pkg/mtx/branches/ csw/mgar/pkg/mtx/tags/ csw/mgar/pkg/mtx/trunk/ csw/mgar/pkg/mtx/trunk/Makefile csw/mgar/pkg/mtx/trunk/checksums csw/mgar/pkg/mtx/trunk/files/ Property changes on: csw/mgar/pkg/mtx/trunk ___________________________________________________________________ Added: svn:ignore + cookies download work Added: svn:externals + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 Added: csw/mgar/pkg/mtx/trunk/Makefile =================================================================== --- csw/mgar/pkg/mtx/trunk/Makefile (rev 0) +++ csw/mgar/pkg/mtx/trunk/Makefile 2010-01-15 22:20:48 UTC (rev 8024) @@ -0,0 +1,19 @@ +GARNAME = mtx +GARVERSION = 1.3.12 +CATEGORIES = utils + +DESCRIPTION = Control tape autoloaders +define BLURB +endef + +MASTER_SITES = $(SF_MIRRORS) +DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz + +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + +SPKG_SOURCEURL = http://mtx.opensource-sw.net/ + +CONFIGURE_ARGS = $(DIRPATHS) + +include gar/category.mk Added: csw/mgar/pkg/mtx/trunk/checksums =================================================================== --- csw/mgar/pkg/mtx/trunk/checksums (rev 0) +++ csw/mgar/pkg/mtx/trunk/checksums 2010-01-15 22:20:48 UTC (rev 8024) @@ -0,0 +1 @@ +ce8f0e44671fb0c7d9ec30bb0bfa8b5c mtx-1.3.12.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Fri Jan 15 23:34:04 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 15 Jan 2010 22:34:04 +0000 Subject: [csw-devel] SF.net SVN: gar:[8025] csw/mgar/pkg/mtx/trunk/Makefile Message-ID: Revision: 8025 http://gar.svn.sourceforge.net/gar/?rev=8025&view=rev Author: dmichelsen Date: 2010-01-15 22:34:04 +0000 (Fri, 15 Jan 2010) Log Message: ----------- mtx: Fix installation Modified Paths: -------------- csw/mgar/pkg/mtx/trunk/Makefile Modified: csw/mgar/pkg/mtx/trunk/Makefile =================================================================== --- csw/mgar/pkg/mtx/trunk/Makefile 2010-01-15 22:20:48 UTC (rev 8024) +++ csw/mgar/pkg/mtx/trunk/Makefile 2010-01-15 22:34:04 UTC (rev 8025) @@ -4,11 +4,24 @@ DESCRIPTION = Control tape autoloaders define BLURB + mtx is a set of low level driver programs to control features of SCSI backup + related devices such as autoloaders, tape changers, media jukeboxes, and tape drives. + It can also report much data, including serial numbers, maximum block sizes, and + TapeAlert messages that most modern tape drives implement (to tell you the exact + reason why a backup or restore failed), as well as do raw SCSI READ and WRITE commands + to tape drives (not important on Linux, but important on Solaris due to the fact that + the Solaris tape driver supports none of the additional features of tape drives invented + after 1988). mtx is designed to be a low level driver in a larger scripted backup solution, + such as Bacula or Amanda. mtx is not supposed to itself be a high level interface to the + SCSI devices that it controls. endef MASTER_SITES = $(SF_MIRRORS) DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz +# TODO: +# - Add stuff from contrib + # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz @@ -16,4 +29,8 @@ CONFIGURE_ARGS = $(DIRPATHS) +TEST_TARGET = + +INSTALL_OVERRIDE_DIRS = sbindir mandir + include gar/category.mk This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Fri Jan 15 23:41:19 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 15 Jan 2010 22:41:19 +0000 Subject: [csw-devel] SF.net SVN: gar:[8026] csw/mgar/pkg/mtx/trunk/Makefile Message-ID: Revision: 8026 http://gar.svn.sourceforge.net/gar/?rev=8026&view=rev Author: dmichelsen Date: 2010-01-15 22:41:19 +0000 (Fri, 15 Jan 2010) Log Message: ----------- mtx: Add contrib Solaris config script Modified Paths: -------------- csw/mgar/pkg/mtx/trunk/Makefile Modified: csw/mgar/pkg/mtx/trunk/Makefile =================================================================== --- csw/mgar/pkg/mtx/trunk/Makefile 2010-01-15 22:34:04 UTC (rev 8025) +++ csw/mgar/pkg/mtx/trunk/Makefile 2010-01-15 22:41:19 UTC (rev 8026) @@ -34,3 +34,7 @@ INSTALL_OVERRIDE_DIRS = sbindir mandir include gar/category.mk + +post-install-modulated: + ginstall $(WORKSRC)/contrib/config_sgen_solaris.sh $(DESTDIR)$(sbindir) + @$(MAKECOOKIE) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Fri Jan 15 23:54:05 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 15 Jan 2010 22:54:05 +0000 Subject: [csw-devel] SF.net SVN: gar:[8027] csw/mgar/pkg/mutt/trunk Message-ID: Revision: 8027 http://gar.svn.sourceforge.net/gar/?rev=8027&view=rev Author: dmichelsen Date: 2010-01-15 22:54:04 +0000 (Fri, 15 Jan 2010) Log Message: ----------- mutt: Update to 1.5.20, modulate over slang-support. Merge and split into curses/slang pkg still missing Modified Paths: -------------- csw/mgar/pkg/mutt/trunk/Makefile csw/mgar/pkg/mutt/trunk/checksums Modified: csw/mgar/pkg/mutt/trunk/Makefile =================================================================== --- csw/mgar/pkg/mutt/trunk/Makefile 2010-01-15 22:41:19 UTC (rev 8026) +++ csw/mgar/pkg/mutt/trunk/Makefile 2010-01-15 22:54:04 UTC (rev 8027) @@ -1,8 +1,11 @@ GARNAME = mutt -GARVERSION = 1.5.19 +GARVERSION = 1.5.20 CATEGORIES = apps -DESCRIPTION = A text-based mail client for Unix operating systems. +EXTRA_MODULATORS = SLANG +MODULATIONS_SLANG = no yes + +DESCRIPTION = A text-based mail client for Unix operating systems define BLURB endef @@ -12,9 +15,24 @@ # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz -REQUIRED_PKGS_CSWmutt = CSWggettextrt CSWiconv CSWlibidn CSWncurses +REQUIRED_PKGS = CSWggettextrt CSWiconv CSWlibidn CSWncurses +# Raise optimizer level unless this bug has been fixed: +# http://dev.mutt.org/trac/ticket/3347 +OPT_FLAGS_SOS = -xO4 + +sysconfdir = /etc/opt/csw + CONFIGURE_ARGS = $(DIRPATHS) +CONFIGURE_ARGS_SLANG-no = +CONFIGURE_ARGS_SLANG-yes = --with-slang=$(prefix) +CONFIGURE_ARGS += $(CONFIGURE_ARGS_SLANG-$(SLANG)) + TEST_SCRIPTS = +PRESERVECONF = $(sysconfdir)/mime.types +PRESERVECONF += $(sysconfdir)/Muttrc + +MIGRATE_FILES = mime.types Muttrc + include gar/category.mk Modified: csw/mgar/pkg/mutt/trunk/checksums =================================================================== --- csw/mgar/pkg/mutt/trunk/checksums 2010-01-15 22:41:19 UTC (rev 8026) +++ csw/mgar/pkg/mutt/trunk/checksums 2010-01-15 22:54:04 UTC (rev 8027) @@ -1 +1 @@ -73b3747bc7f7c805921e8d24ebac693f download/mutt-1.5.19.tar.gz +027cdd9959203de0c3c64149a7ee351c mutt-1.5.20.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Fri Jan 15 23:54:38 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 15 Jan 2010 22:54:38 +0000 Subject: [csw-devel] SF.net SVN: gar:[8028] csw/mgar/pkg/slang/trunk Message-ID: Revision: 8028 http://gar.svn.sourceforge.net/gar/?rev=8028&view=rev Author: dmichelsen Date: 2010-01-15 22:54:38 +0000 (Fri, 15 Jan 2010) Log Message: ----------- slang: Add version modulation for legacy 1.4.9 Modified Paths: -------------- csw/mgar/pkg/slang/trunk/Makefile csw/mgar/pkg/slang/trunk/checksums Modified: csw/mgar/pkg/slang/trunk/Makefile =================================================================== --- csw/mgar/pkg/slang/trunk/Makefile 2010-01-15 22:54:04 UTC (rev 8027) +++ csw/mgar/pkg/slang/trunk/Makefile 2010-01-15 22:54:38 UTC (rev 8028) @@ -2,22 +2,48 @@ GARVERSION = 2.2.2 CATEGORIES = lib +EXTRA_MODULATORS = GARVERSION +MODULATIONS_GARVERSION = 1.4.9 2.2.2 + DESCRIPTION = Library primarily to provide an alternative to libcurses define BLURB endef -MASTER_SITES = ftp://space.mit.edu/pub/davis/slang/v2.2/ -MASTER_SITES += ftp://ftp.fu-berlin.de/pub/unix/misc/slang/v2.2/ -MASTER_SITES += ftp://ftp.ntua.gr/pub/lang/slang/slang/v2.2/ +MASTER_SITES = $(foreach V,$(MODULATIONS_GARVERSION),ftp://space.mit.edu/pub/davis/slang/v$(shell echo $V | perl -ne 'print /(\d+\.\d+)/')/) +SOURCEFILES = $(foreach VERSION,$(MODULATIONS_GARVERSION), $(GARNAME)-$(VERSION).tar.gz) +DISTFILES = $(SOURCEFILES) +NOEXTRACT = $(filter-out $(GARNAME)-$(GARVERSION).tar.gz,$(SOURCEFILES)) -DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz - # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz +REQUIRED_PKGS = CSWiconv CSWpcrert CSWpng CSWzlib + SPKG_SOURCEURL = http://www.s-lang.org/ +# Setting -L$(libdir) before the newly built lib confuses function +# definitions if the installed lib is older than the newly built one. +LINKER_FLAGS = + BUILD64 = 1 CONFIGURE_ARGS = $(DIRPATHS) +TEST_TARGET_GARVERSION-1.4.9 = +TEST_TARGET_GARVERSION-2.2.2 = check +TEST_TARGET = $(TEST_TARGET_GARVERSION-$(GARVERSION)) + +INSTALL_ARGS_GARVERSION-1.4.9 = install-elf install-links +INSTALL_ARGS = $(INSTALL_ARGS_GARVERSION-$(GARVERSION)) + +MERGE_SCRIPTS_isa-default-garversion-1.4.9 = copy-only +MERGE_DIRS_isa-default-garversion-1.4.9 = $(libdir) +MERGE_SCRIPTS_isa-default64-garversion-1.4.9 = copy-relocated-only +MERGE_DIRS_isa-default64-garversion-1.4.9 = $(libdir) + +MERGE_SCRIPTS_isa-default-garversion-2.2.2 = copy-all +MERGE_SCRIPTS_isa-default64-garversion-2.2.2 = copy-relocated-only +MERGE_DIRS_isa-default64-garversion-2.2.2 = $(bindir) $(sbindir) $(libexecdir) $(libdir) + + include gar/category.mk + Modified: csw/mgar/pkg/slang/trunk/checksums =================================================================== --- csw/mgar/pkg/slang/trunk/checksums 2010-01-15 22:54:04 UTC (rev 8027) +++ csw/mgar/pkg/slang/trunk/checksums 2010-01-15 22:54:38 UTC (rev 8028) @@ -1 +1,2 @@ +c73aa62b2d1b215ca55a7337daa3f543 slang-1.4.9.tar.gz e7183d0acab9cc35fae12849f8b848e2 slang-2.2.2.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Sat Jan 16 09:14:46 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sat, 16 Jan 2010 08:14:46 +0000 Subject: [csw-devel] SF.net SVN: gar:[8029] csw/mgar/pkg Message-ID: Revision: 8029 http://gar.svn.sourceforge.net/gar/?rev=8029&view=rev Author: wahwah Date: 2010-01-16 08:14:46 +0000 (Sat, 16 Jan 2010) Log Message: ----------- iotop: Initial commit (DTrace? What DTrace?) Modified Paths: -------------- csw/mgar/pkg/iotop/trunk/Makefile csw/mgar/pkg/iotop/trunk/checksums Added Paths: ----------- csw/mgar/pkg/iotop/ Modified: csw/mgar/pkg/iotop/trunk/Makefile =================================================================== --- csw/mgar/pkg/template/trunk/Makefile 2010-01-15 22:54:38 UTC (rev 8028) +++ csw/mgar/pkg/iotop/trunk/Makefile 2010-01-16 08:14:46 UTC (rev 8029) @@ -11,8 +11,8 @@ ## For more information about GAR variables, please see: ## https://sourceforge.net/apps/trac/gar/wiki/GAR%20Variable%20Reference ## -GARNAME = mypkg -GARVERSION = 1.0 +GARNAME = iotop +GARVERSION = 0.4 ## ## The category that your software fits in. This is not a descriptive field, but ## influences the build process. Depending on the CATEGORIES setting, different @@ -22,10 +22,10 @@ ## Possible settings are: ## apps, cpan, devel, gnome, java, kde, lang, lib, meta, net, python, server, ## utils, x11, xfce, xorg, xtra -CATEGORIES = lib +CATEGORIES = python ## ## A one-line description of the package, which will appear in the pkginfo. -DESCRIPTION = +DESCRIPTION = shows of behalf of which process is the I/O going on ## ## A longer description of the package. This is only for descriptive purposes ## inside the Makefile and is not used elsewhere. @@ -39,7 +39,7 @@ ## ## Whitespace-separated list of URLs to download the source package from. ## There are presets: $(SF_MIRRORS), $(GNU_MIRRORS) and $(GOOGLE_MIRROR). -MASTER_SITES = +MASTER_SITES = http://guichaz.free.fr/iotop/files/ ## ## SF_PROJ is required if you set $(MASTER_SITES) to $(SF_MIRRORS) and the ## Sourceforge project name differs from $(GARNAME). Specifies the Sourceforge @@ -54,10 +54,10 @@ ## Whitespace-separated list of files which comprise this build. mGAR will look ## for the files in the $(FILEDIR) (trunk/files) directory and on the ## $(MASTER_SITES). -DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz +DISTFILES = $(GARNAME)-$(GARVERSION).tar.bz2 ## ## We define upstream file regex so we can be notifed of new upstream software release -UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.bz2 ## ## Catalog name is the name to be used with pkg{-get,util} -i . ## It is different from the system package name, which by convention is CSWpkgname. @@ -148,7 +148,7 @@ ## CONFIGURE_SCRIPTS = ## BUILD_SCRIPTS = ## INSTALL_SCRIPTS = -## TEST_SCRIPTS = +TEST_SCRIPTS = ## ## Compilation settings ## @@ -160,7 +160,7 @@ ## BUILD_ARGS = ## ## Arguments passed to the ./configure script. -CONFIGURE_ARGS = $(DIRPATHS) +## CONFIGURE_ARGS = $(DIRPATHS) ## ## BUILD64 = ## CONFIGURE_ENV = @@ -176,10 +176,4 @@ ## The compiler to use. Defaults to SOS11, can be also: SOS12, GCC3, GCC4. ## GARCOMPILER = SOS11 ## -# Remove the following rules and uncomment the -# include before building. -all: .DEFAULT -.DEFAULT: - @true - -#include gar/category.mk +include gar/category.mk Modified: csw/mgar/pkg/iotop/trunk/checksums =================================================================== --- csw/mgar/pkg/template/trunk/checksums 2010-01-15 22:54:38 UTC (rev 8028) +++ csw/mgar/pkg/iotop/trunk/checksums 2010-01-16 08:14:46 UTC (rev 8029) @@ -0,0 +1 @@ +3607f8b77ed6686efd9a4a7e6c135ceb iotop-0.4.tar.bz2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Sat Jan 16 09:18:47 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sat, 16 Jan 2010 08:18:47 +0000 Subject: [csw-devel] SF.net SVN: gar:[8030] csw/mgar/pkg/iotop/trunk/Makefile Message-ID: Revision: 8030 http://gar.svn.sourceforge.net/gar/?rev=8030&view=rev Author: wahwah Date: 2010-01-16 08:18:47 +0000 (Sat, 16 Jan 2010) Log Message: ----------- iotop: ARCHALL = 1, removed boilerplate docs Modified Paths: -------------- csw/mgar/pkg/iotop/trunk/Makefile Modified: csw/mgar/pkg/iotop/trunk/Makefile =================================================================== --- csw/mgar/pkg/iotop/trunk/Makefile 2010-01-16 08:14:46 UTC (rev 8029) +++ csw/mgar/pkg/iotop/trunk/Makefile 2010-01-16 08:18:47 UTC (rev 8030) @@ -2,178 +2,16 @@ # Distributed under the terms of the GNU General Public License v2 # $Id$ -## This file contains comments to guide you through various GAR settings. -## Please remove unnecessary comments before committing your code to the code -## repository. The comments to remove are marked with double hashes. -## If you want to remove them all in-place, use: -## gsed -i -e '/^##/d' Makefile -## -## For more information about GAR variables, please see: -## https://sourceforge.net/apps/trac/gar/wiki/GAR%20Variable%20Reference -## GARNAME = iotop GARVERSION = 0.4 -## -## The category that your software fits in. This is not a descriptive field, but -## influences the build process. Depending on the CATEGORIES setting, different -## Makefiles are included from gar/categories/ in your trunk directory, which -## adjust the build settings for the respective category. -## -## Possible settings are: -## apps, cpan, devel, gnome, java, kde, lang, lib, meta, net, python, server, -## utils, x11, xfce, xorg, xtra CATEGORIES = python -## -## A one-line description of the package, which will appear in the pkginfo. DESCRIPTION = shows of behalf of which process is the I/O going on -## -## A longer description of the package. This is only for descriptive purposes -## inside the Makefile and is not used elsewhere. define BLURB - endef -## -## Upstream URL that should show up in the VENDOR field as well as on -## http://opencsw.org/packages/. -SPKG_SOURCEURL = -## -## Whitespace-separated list of URLs to download the source package from. -## There are presets: $(SF_MIRRORS), $(GNU_MIRRORS) and $(GOOGLE_MIRROR). +SPKG_SOURCEURL = http://guichaz.free.fr/iotop/ MASTER_SITES = http://guichaz.free.fr/iotop/files/ -## -## SF_PROJ is required if you set $(MASTER_SITES) to $(SF_MIRRORS) and the -## Sourceforge project name differs from $(GARNAME). Specifies the Sourceforge -## project name of the software you wish to download. -## SF_PROJ = -## -## A list of space separated patch filenames from files/ that are to be applied -## to the extracted software before the ./configure stage. Patches need to be -## included in the DISTFILES variable as well. -## PATCHFILES = -## -## Whitespace-separated list of files which comprise this build. mGAR will look -## for the files in the $(FILEDIR) (trunk/files) directory and on the -## $(MASTER_SITES). DISTFILES = $(GARNAME)-$(GARVERSION).tar.bz2 -## -## We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.bz2 -## -## Catalog name is the name to be used with pkg{-get,util} -i . -## It is different from the system package name, which by convention is CSWpkgname. -## CATALOGNAME = -## -## Set to 1 to mark the package as architecture-independent. -## ARCHALL = 0 -## -## A list of files / patterns that should be excluded from the package. Amends -## the default list of excluded filenames $(MERGE_EXCLUDE_DEFAULT), which -## contains things like libtool .la files and files with a leading ~. -## EXTRA_MERGE_EXCLUDE_FILES = -## -## A list of space separated package names that should be marked as -## incompatible with the current package. This will go into the depend file. -## When a user has one of the incompatible packages installed and installs -## your package, he will be prompted that the incompatible package must be -## removed. He will however not be prevented to install your package without -## removing the conflicting package first. -## INCOMPATIBLE_PKGS = -## -## The name of the license file that should be included in your package. Defaults -## to COPYING. See http://sourceforge.net/apps/trac/gar/wiki/CopyRightfor details -## on including and displaying licenses. -## LICENSE = -## -## A list of space separated package names that should be produced from your -## Makefile. This is used when a software has different components that can be -## packaged and used individually (think runtime libraries, client tools, server -## files, development headers). You don't need to set this when you just want to -## produce one package. -## -## When you set this variable to include more than one package, you also need to -## set PKGFILES_CSWpkgname for each package (except for the first one in your -## $(PACKAGES) list) to define which files go into each package. The first -## package from $(PACKAGES) one will hold all files that are not matched by -## PKGFILES_ for other packages. -## PACKAGES = -## -## If specified, GAR feeds the almost-final package prototype file to -## $(PROTOTYPE_FILTER) and reads the final package prototype file from it. -## $(PROTOTYPE_FILTER) is usually a sed/awk/perl one-liner, which was mostly used -## to prepare the prototype file for use with cswclassutils (see -## $(SPKG_CLASSES)). Now that there are convenience variables for cswclassutils, -## you will rarely have to use this. A still valid use case would be to change -## the file permissions of a file to be set-UID. -## See http://wiki.opencsw.org/cswclassutils-package for common usage information -## PROTOTYPE_FILTER = -## -## cswclassutils settings -## -## A list of action classes. Possible values are: -## none cswpreserveconf cswcpsampleconf cswpycompile cswusergroup cswinitsmf -## cswinetd cswetcservices -## The class 'cswinitsmf' must be the last class listed. When you use cswclassutils, -## you need to add CSWcswclassutils to REQUIRED_PKGS. -## SPKG_CLASSES = none -## Simplified settings for classes: -## PRESERVECONF = -## SAMPLECONF = -## INITSMF = -## USERGROUP = -## ETCSERVICES = -## INETDCONF = -## A list of runtime package dependencies in the form of CSWfoo. -## REQUIRED_PKGS = -## -## A list of packages necessary to build this package -## PREREQUISITE_PKGS = $(REQUIRED_PKGS) -## -## When using non-empty $(PACKAGES): -## REQUIRED_PKGS_CSWpkgname = -## SPKG_DESC_CSWpkgname = -## PKGFILES_CSWpkgname = -## CATALOGNAME_CSWpkgname = -## -## A list of space separated directories where objects should be stripped in -## addition to the bin/ and sbin/ directories. -## STRIP_DIRS = -## -## Define a custom target for the configure phase. When you set this, the target -## that will be used instead of configure: target, is named -## configure-$(CONFIGURE_SCRIPTS) and you will need to define it in your Makefile -## after including gar/gar.include.mk. If you want to skip the configure phase -## completely (for example when your software doesn't need to be compiled) assign -## this variable an empty value. The procedure works for configure, build, -## install and test steps. -## CONFIGURE_SCRIPTS = -## BUILD_SCRIPTS = -## INSTALL_SCRIPTS = TEST_SCRIPTS = -## -## Compilation settings -## -## The build directory. -## WORKSRC = $(WORKDIR)/$(GARNAME)-$(GARVERSION) -## -## BUILD_ARGS is passed as an argument to gmake during the build phase. Use this -## for example, if you need to override Makefile variables. -## BUILD_ARGS = -## -## Arguments passed to the ./configure script. -## CONFIGURE_ARGS = $(DIRPATHS) -## -## BUILD64 = -## CONFIGURE_ENV = -## EXTRA_CFLAGS = -## EXTRA_LDFLAGS = -## EXTRA_INC = -## EXTRA_LIB = -## GARFLAVOR = -## INSTALL_ARGS = -## OPT_FLAGS_SOS = -xO3 -## OPT_FLAGS_GCC = -O2 -pipe -## -## The compiler to use. Defaults to SOS11, can be also: SOS12, GCC3, GCC4. -## GARCOMPILER = SOS11 -## +ARCHALL = 1 include gar/category.mk This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Sat Jan 16 16:22:11 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Sat, 16 Jan 2010 15:22:11 +0000 Subject: [csw-devel] SF.net SVN: gar:[8031] csw/mgar/pkg/slang/trunk/Makefile Message-ID: Revision: 8031 http://gar.svn.sourceforge.net/gar/?rev=8031&view=rev Author: dmichelsen Date: 2010-01-16 15:22:11 +0000 (Sat, 16 Jan 2010) Log Message: ----------- slang: Skip 64 bit executable and move config to /etc/opt/csw Modified Paths: -------------- csw/mgar/pkg/slang/trunk/Makefile Modified: csw/mgar/pkg/slang/trunk/Makefile =================================================================== --- csw/mgar/pkg/slang/trunk/Makefile 2010-01-16 08:18:47 UTC (rev 8030) +++ csw/mgar/pkg/slang/trunk/Makefile 2010-01-16 15:22:11 UTC (rev 8031) @@ -25,6 +25,8 @@ # definitions if the installed lib is older than the newly built one. LINKER_FLAGS = +sysconfdir = /etc/opt/csw + BUILD64 = 1 CONFIGURE_ARGS = $(DIRPATHS) @@ -42,8 +44,7 @@ MERGE_SCRIPTS_isa-default-garversion-2.2.2 = copy-all MERGE_SCRIPTS_isa-default64-garversion-2.2.2 = copy-relocated-only -MERGE_DIRS_isa-default64-garversion-2.2.2 = $(bindir) $(sbindir) $(libexecdir) $(libdir) +MERGE_DIRS_isa-default64-garversion-2.2.2 = $(libdir) - include gar/category.mk This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Sat Jan 16 16:23:32 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Sat, 16 Jan 2010 15:23:32 +0000 Subject: [csw-devel] SF.net SVN: gar:[8032] csw/mgar/pkg/slang/trunk/Makefile Message-ID: Revision: 8032 http://gar.svn.sourceforge.net/gar/?rev=8032&view=rev Author: dmichelsen Date: 2010-01-16 15:23:32 +0000 (Sat, 16 Jan 2010) Log Message: ----------- slang: Do not isaexec Modified Paths: -------------- csw/mgar/pkg/slang/trunk/Makefile Modified: csw/mgar/pkg/slang/trunk/Makefile =================================================================== --- csw/mgar/pkg/slang/trunk/Makefile 2010-01-16 15:22:11 UTC (rev 8031) +++ csw/mgar/pkg/slang/trunk/Makefile 2010-01-16 15:23:32 UTC (rev 8032) @@ -27,6 +27,7 @@ sysconfdir = /etc/opt/csw +NO_ISAEXEC = 1 BUILD64 = 1 CONFIGURE_ARGS = $(DIRPATHS) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Sat Jan 16 20:32:02 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Sat, 16 Jan 2010 19:32:02 +0000 Subject: [csw-devel] SF.net SVN: gar:[8033] csw/mgar/pkg/mutt/trunk/Makefile Message-ID: Revision: 8033 http://gar.svn.sourceforge.net/gar/?rev=8033&view=rev Author: dmichelsen Date: 2010-01-16 19:32:02 +0000 (Sat, 16 Jan 2010) Log Message: ----------- mutt: Add custom merge rules and split into different packages Modified Paths: -------------- csw/mgar/pkg/mutt/trunk/Makefile Modified: csw/mgar/pkg/mutt/trunk/Makefile =================================================================== --- csw/mgar/pkg/mutt/trunk/Makefile 2010-01-16 15:23:32 UTC (rev 8032) +++ csw/mgar/pkg/mutt/trunk/Makefile 2010-01-16 19:32:02 UTC (rev 8033) @@ -15,8 +15,22 @@ # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz -REQUIRED_PKGS = CSWggettextrt CSWiconv CSWlibidn CSWncurses +LICENSE = COPYRIGHT +PACKAGES = CSWmutt-base CSWmutt-ncurses CSWmutt-slang + +REQUIRED_PKGS_CSWmutt-base = CSWggettextrt CSWiconv CSWlibidn +REQUIRED_PKGS_CSWmutt-ncurses = CSWmutt-base CSWncurses CSWggettextrt CSWiconv CSWlibidn +REQUIRED_PKGS_CSWmutt-slang = CSWmutt-base CSWslang CSWggettextrt CSWiconv CSWlibidn + +CATALOGNAME_CSWmutt-base = mutt_base +CATALOGNAME_CSWmutt-ncurses = mutt_ncurses +CATALOGNAME_CSWmutt-slang = mutt_slang + +SPKG_DESC_CSWmutt-base = $(DESCRIPTION) +SPKG_DESC_CSWmutt-ncurses = Mutt mail client with ncurses interface +SPKG_DESC_CSWmutt-slang = Mutt mail client with slang interface + # Raise optimizer level unless this bug has been fixed: # http://dev.mutt.org/trac/ticket/3347 OPT_FLAGS_SOS = -xO4 @@ -33,6 +47,19 @@ PRESERVECONF = $(sysconfdir)/mime.types PRESERVECONF += $(sysconfdir)/Muttrc -MIGRATE_FILES = mime.types Muttrc +EXTRA_MERGE_EXCLUDE_FILES = .*\.dist +MIGRATE_FILES_CSWmutt-base = mime.types Muttrc + +MERGE_SCRIPTS_isa-default-slang-no = copy-all +MERGE_SCRIPTS_isa-default-slang-yes = copy-mutt-only + +PKGFILES_CSWmutt-ncurses = $(bindir)/mutt +PKGFILES_CSWmutt-slang = $(bindir)/mutt-slang + include gar/category.mk + +merge-copy-mutt-only: $(PKGROOT) + ginstall -d $(PKGROOT)$(bindir) + ginstall $(INSTALLISADIR)$(bindir)/mutt $(PKGROOT)$(bindir)/mutt-slang + @$(MAKECOOKIE) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From skayser at users.sourceforge.net Sat Jan 16 22:29:59 2010 From: skayser at users.sourceforge.net (skayser at users.sourceforge.net) Date: Sat, 16 Jan 2010 21:29:59 +0000 Subject: [csw-devel] SF.net SVN: gar:[8034] csw/mgar/pkg/subversion/trunk/Makefile Message-ID: Revision: 8034 http://gar.svn.sourceforge.net/gar/?rev=8034&view=rev Author: skayser Date: 2010-01-16 21:29:58 +0000 (Sat, 16 Jan 2010) Log Message: ----------- subversion: restrict cswpycompile usage to $(libdir)/python, fixes #4156 Modified Paths: -------------- csw/mgar/pkg/subversion/trunk/Makefile Modified: csw/mgar/pkg/subversion/trunk/Makefile =================================================================== --- csw/mgar/pkg/subversion/trunk/Makefile 2010-01-16 19:32:02 UTC (rev 8033) +++ csw/mgar/pkg/subversion/trunk/Makefile 2010-01-16 21:29:58 UTC (rev 8034) @@ -95,8 +95,9 @@ export LDFLAGS EXTRA_MERGE_EXCLUDE_FILES = .*\.pyo .*\.pyc -PROTOTYPE_FILTER = awk '$$$$3 ~/.*\.py$$$$/ { $$$$2 = "cswpycompile" } { print }' -SPKG_CLASSES_CSWpythonsvn = none cswpycompile +PROTOTYPE_MODIFIERS += cswpycompile +PROTOTYPE_FILES_cswpycompile = $(libdir)/python/.*\.py +PROTOTYPE_CLASS_cswpycompile = cswpycompile CONFIGURE_ARGS = $(DIRPATHS) --libdir=$(SVNLIB) --libexecdir=$(SVNLIB) CONFIGURE_ARGS += --disable-mod-activation This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From trygvis at users.sourceforge.net Sat Jan 16 23:08:21 2010 From: trygvis at users.sourceforge.net (trygvis at users.sourceforge.net) Date: Sat, 16 Jan 2010 22:08:21 +0000 Subject: [csw-devel] SF.net SVN: gar:[8035] csw/mgar/pkg/pcb/trunk Message-ID: Revision: 8035 http://gar.svn.sourceforge.net/gar/?rev=8035&view=rev Author: trygvis Date: 2010-01-16 22:08:21 +0000 (Sat, 16 Jan 2010) Log Message: ----------- o Adding a couple of patches to prevent a coredump. Modified Paths: -------------- csw/mgar/pkg/pcb/trunk/Makefile csw/mgar/pkg/pcb/trunk/checksums Added Paths: ----------- csw/mgar/pkg/pcb/trunk/files/0001-Fix-off-by-one-error-in-the-GTK-HID-s-netlist-window.patch csw/mgar/pkg/pcb/trunk/files/0001-Regenerate-rats-r-tree-when-re-allocating-a-bigger-r.patch Modified: csw/mgar/pkg/pcb/trunk/Makefile =================================================================== --- csw/mgar/pkg/pcb/trunk/Makefile 2010-01-16 21:29:58 UTC (rev 8034) +++ csw/mgar/pkg/pcb/trunk/Makefile 2010-01-16 22:08:21 UTC (rev 8035) @@ -55,8 +55,11 @@ # uncomment the next line. Otherwise it is set by default to the value of MASTER_SITES # UPSTREAM_MASTER_SITES = -# Patch submitted to upstream, pending new release -#PATCHFILES = iptc-dataset.patch +# See [1] and [2]. [1] seems to fix the problem, but [2] is included too. - trygvis +# [1]: http://www.mail-archive.com/geda-user at moria.seul.org/msg14911.html +# [2]: http://www.mail-archive.com/geda-user at moria.seul.org/msg14914.html +PATCHFILES = 0001-Fix-off-by-one-error-in-the-GTK-HID-s-netlist-window.patch +PATCHFILES += 0001-Regenerate-rats-r-tree-when-re-allocating-a-bigger-r.patch EXTRA_PKG_CONFIG_DIRS = $(prefix)/X11/lib CONFIGURE_ARGS = $(DIRPATHS) Modified: csw/mgar/pkg/pcb/trunk/checksums =================================================================== --- csw/mgar/pkg/pcb/trunk/checksums 2010-01-16 21:29:58 UTC (rev 8034) +++ csw/mgar/pkg/pcb/trunk/checksums 2010-01-16 22:08:21 UTC (rev 8035) @@ -1 +1,3 @@ -e192ee993b04749f82dd3e8b529d40c0 download/pcb-20081128.tar.gz +509826c8a9184b46055258861228b555 0001-Fix-off-by-one-error-in-the-GTK-HID-s-netlist-window.patch +00fd904d4439493a998100f40891fffd 0001-Regenerate-rats-r-tree-when-re-allocating-a-bigger-r.patch +e192ee993b04749f82dd3e8b529d40c0 pcb-20081128.tar.gz Added: csw/mgar/pkg/pcb/trunk/files/0001-Fix-off-by-one-error-in-the-GTK-HID-s-netlist-window.patch =================================================================== --- csw/mgar/pkg/pcb/trunk/files/0001-Fix-off-by-one-error-in-the-GTK-HID-s-netlist-window.patch (rev 0) +++ csw/mgar/pkg/pcb/trunk/files/0001-Fix-off-by-one-error-in-the-GTK-HID-s-netlist-window.patch 2010-01-16 22:08:21 UTC (rev 8035) @@ -0,0 +1,28 @@ +From d053b4e41da10fd033429cb4b88c6e3b52769eb7 Mon Sep 17 00:00:00 2001 +From: Peter Clifton +Date: Wed, 24 Dec 2008 03:07:02 +0000 +Subject: [PATCH] Fix off-by one error in the GTK HID's netlist window model generation + +Broken when I added support for a hierarchical view of nets. The bug +caused invalid memory to be read, possibly leading to a crash, as the +last (and missing) element from g_new0 was supposed to be a terminator. +--- + src/hid/gtk/gui-netlist-window.c | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/src/hid/gtk/gui-netlist-window.c b/src/hid/gtk/gui-netlist-window.c +index 8dc2299..848fb7e 100644 +--- a/src/hid/gtk/gui-netlist-window.c ++++ b/src/hid/gtk/gui-netlist-window.c +@@ -385,7 +385,7 @@ net_model_create (void) + parent_iter = new_iter; + parent_ptr = &parent_iter; + +- join_array = g_new0 (char *, try_depth + 1); ++ join_array = g_new0 (char *, try_depth + 2); + memcpy (join_array, path_segments, sizeof (char *) * (try_depth + 1)); + + hash_string = g_strjoinv (NET_HIERARCHY_SEPARATOR, join_array); +-- +1.5.6.5 + Added: csw/mgar/pkg/pcb/trunk/files/0001-Regenerate-rats-r-tree-when-re-allocating-a-bigger-r.patch =================================================================== --- csw/mgar/pkg/pcb/trunk/files/0001-Regenerate-rats-r-tree-when-re-allocating-a-bigger-r.patch (rev 0) +++ csw/mgar/pkg/pcb/trunk/files/0001-Regenerate-rats-r-tree-when-re-allocating-a-bigger-r.patch 2010-01-16 22:08:21 UTC (rev 8035) @@ -0,0 +1,37 @@ +From 40347a55413e152c7b5fc2bac074c75c7687b766 Mon Sep 17 00:00:00 2001 +From: Peter Clifton +Date: Wed, 24 Dec 2008 13:14:27 +0000 +Subject: [PATCH] Regenerate rats r-tree when re-allocating a bigger rats array. + +Shuould fix crashes observed on a board with a large number of rats. +--- + src/mymem.c | 9 +++++++++ + 1 files changed, 9 insertions(+), 0 deletions(-) + +diff --git a/src/mymem.c b/src/mymem.c +index 57eca2d..36b13d5 100644 +--- a/src/mymem.c ++++ b/src/mymem.c +@@ -305,10 +305,19 @@ GetRatMemory (DataTypePtr Data) + if (Data->RatN >= Data->RatMax) + { + Data->RatMax += STEP_RAT; ++ /* all of the pointers move, so rebuild the whole tree */ ++ if (Data->rat_tree) ++ r_destroy_tree (&Data->rat_tree); + rat = MyRealloc (rat, Data->RatMax * sizeof (RatType), + "GetRatMemory()"); + Data->Rat = rat; + memset (rat + Data->RatN, 0, STEP_RAT * sizeof (RatType)); ++ Data->rat_tree = r_create_tree (NULL, 0, 0); ++ RAT_LOOP (Data); ++ { ++ r_insert_entry (Data->rat_tree, (BoxTypePtr) line, 0); ++ } ++ END_LOOP; + } + return (rat + Data->RatN++); + } +-- +1.5.6.5 + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From trygvis at users.sourceforge.net Sat Jan 16 23:15:24 2010 From: trygvis at users.sourceforge.net (trygvis at users.sourceforge.net) Date: Sat, 16 Jan 2010 22:15:24 +0000 Subject: [csw-devel] SF.net SVN: gar:[8036] csw/mgar/pkg/pcb/trunk/Makefile Message-ID: Revision: 8036 http://gar.svn.sourceforge.net/gar/?rev=8036&view=rev Author: trygvis Date: 2010-01-16 22:15:24 +0000 (Sat, 16 Jan 2010) Log Message: ----------- o Removing extra directory. Modified Paths: -------------- csw/mgar/pkg/pcb/trunk/Makefile Modified: csw/mgar/pkg/pcb/trunk/Makefile =================================================================== --- csw/mgar/pkg/pcb/trunk/Makefile 2010-01-16 22:08:21 UTC (rev 8035) +++ csw/mgar/pkg/pcb/trunk/Makefile 2010-01-16 22:15:24 UTC (rev 8036) @@ -77,3 +77,6 @@ do \ mv "$$f" `echo $$f | tr " " _`; \ done + +post-install-modulated: + @rmdir $(DESTDIR)/opt/csw/share/pcb-20081128 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From skayser at users.sourceforge.net Sun Jan 17 02:59:18 2010 From: skayser at users.sourceforge.net (skayser at users.sourceforge.net) Date: Sun, 17 Jan 2010 01:59:18 +0000 Subject: [csw-devel] SF.net SVN: gar:[8037] csw/mgar/pkg/subversion/trunk Message-ID: Revision: 8037 http://gar.svn.sourceforge.net/gar/?rev=8037&view=rev Author: skayser Date: 2010-01-17 01:59:18 +0000 (Sun, 17 Jan 2010) Log Message: ----------- subversion: tidied up and commented Makefile, removed obsolete deps, also fixes #4096 Modified Paths: -------------- csw/mgar/pkg/subversion/trunk/Makefile Added Paths: ----------- csw/mgar/pkg/subversion/trunk/files/changelog.CSW Modified: csw/mgar/pkg/subversion/trunk/Makefile =================================================================== --- csw/mgar/pkg/subversion/trunk/Makefile 2010-01-16 22:15:24 UTC (rev 8036) +++ csw/mgar/pkg/subversion/trunk/Makefile 2010-01-17 01:59:18 UTC (rev 8037) @@ -1,6 +1,14 @@ +# TODO (release-critical prefixed with !, non release-critical with *) +# +# * How about shipping a changelog.CSW (example in files/)? +# * The language binding packages all have a whole stack of dependencies +# (mostly the same libs that the main svn package has). Are those really +# required? The shared objects generated by SWIG have them in their NEEDED +# list, but they also link against the main libsvn_client-1.so which in +# turn pulls in the rest. Can this be tweaked? +# GARNAME = subversion -DISTVERSION = 1.6.6 -GARVERSION = $(subst -,,$(DISTVERSION)) +GARVERSION = 1.6.6 CATEGORIES = utils DESCRIPTION = Version control rethought @@ -9,66 +17,94 @@ that is a compelling replacement for CVS in the open source community. endef -# Vendor site -SPKG_SOURCEURL = http://subversion.tigris.org/ - -# Release site +VENDOR_URL = http://subversion.tigris.org/ MASTER_SITES = http://subversion.tigris.org/downloads/ - -DISTFILES = $(GARNAME)-$(DISTVERSION).tar.bz2 - -# We define upstream file regex so we can be notifed of -# new upstream software release +DISTFILES = $(GARNAME)-$(GARVERSION).tar.bz2 UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.bz2 -EXTRA_LIB = $(SVNLIB) $(prefix)/apache2/lib -EXTRA_INC = $(prefix)/apache2/include - -WORKSRC = $(WORKDIR)/$(GARNAME)-$(DISTVERSION) - PACKAGES = CSWsvn CSWsvn-devel CSWap2svn CSWpmsvn PACKAGES += CSWpythonsvn CSWrbsvn CSWjavasvn -ARCHALL_CSWsvn-devel = 1 SPKG_DESC_CSWsvn = Version control rethought CATALOGNAME_CSWsvn = subversion -REQUIRED_PKGS_CSWsvn = CSWapache2rt CSWbdb47 CSWexpat CSWggettextrt -REQUIRED_PKGS_CSWsvn += CSWiconv CSWkrb5lib CSWlibnet CSWneon CSWoldaprt -REQUIRED_PKGS_CSWsvn += CSWosslrt CSWsasl CSWzlib CSWsqlite3rt +REQUIRED_PKGS_CSWsvn = CSWapache2rt +REQUIRED_PKGS_CSWsvn += CSWbdb47 +REQUIRED_PKGS_CSWsvn += CSWexpat +REQUIRED_PKGS_CSWsvn += CSWggettextrt +REQUIRED_PKGS_CSWsvn += CSWiconv +REQUIRED_PKGS_CSWsvn += CSWneon +REQUIRED_PKGS_CSWsvn += CSWoldaprt +REQUIRED_PKGS_CSWsvn += CSWsasl +REQUIRED_PKGS_CSWsvn += CSWsqlite3rt +REQUIRED_PKGS_CSWsvn += CSWzlib +# There are additional requirements for $(docdir)/subversion/tools/ which +# also contains the stack of hook-scripts. Should we add those? +#REQUIRED_PKGS_CSWsvn += CSWperl +#REQUIRED_PKGS_CSWsvn += CSWpython +#REQUIRED_PKGS_CSWsvn += CSWruby + SPKG_DESC_CSWsvn-devel = Subversion Development Support CATALOGNAME_CSWsvn-devel = subversion_devel REQUIRED_PKGS_CSWsvn-devel = CSWsvn +ARCHALL_CSWsvn-devel = 1 +PKGFILES_CSWsvn-devel = $(PKGFILES_DEVEL) + SPKG_DESC_CSWap2svn = Subversion Modules for Apache 2.2 CATALOGNAME_CSWap2svn = ap2_subversion -REQUIRED_PKGS_CSWap2svn = CSWsvn CSWggettextrt CSWiconv +REQUIRED_PKGS_CSWap2svn = CSWsvn +REQUIRED_PKGS_CSWap2svn += CSWggettextrt +REQUIRED_PKGS_CSWap2svn += CSWiconv +PKGFILES_CSWap2svn = $(prefix)/apache2.* + SPKG_DESC_CSWjavasvn = Subversion Java Language Binding CATALOGNAME_CSWjavasvn = javasvn -REQUIRED_PKGS_CSWjavasvn = CSWsvn CSWapache2rt CSWneon CSWoldaprt -REQUIRED_PKGS_CSWjavasvn += CSWbdb47 CSWexpat CSWggettextrt CSWiconv +REQUIRED_PKGS_CSWjavasvn = CSWsvn +REQUIRED_PKGS_CSWjavasvn += CSWapache2rt +REQUIRED_PKGS_CSWjavasvn += CSWexpat +REQUIRED_PKGS_CSWjavasvn += CSWggettextrt +REQUIRED_PKGS_CSWjavasvn += CSWiconv +REQUIRED_PKGS_CSWjavasvn += CSWneon +REQUIRED_PKGS_CSWjavasvn += CSWoldaprt +PKGFILES_CSWjavasvn = $(SVNLIB)/.*java.* + SPKG_DESC_CSWpmsvn = Subversion Perl Language Binding CATALOGNAME_CSWpmsvn = pm_subversion -REQUIRED_PKGS_CSWpmsvn = CSWsvn CSWperl CSWapache2rt CSWbdb47 CSWexpat -REQUIRED_PKGS_CSWpmsvn += CSWggettextrt CSWiconv CSWoldaprt -SPKG_DESC_CSWpythonsvn = Subversion Python Language Binding -CATALOGNAME_CSWpythonsvn = pythonsvn -REQUIRED_PKGS_CSWpythonsvn = CSWsvn CSWpython CSWapache2rt CSWbdb47 CSWexpat -REQUIRED_PKGS_CSWpythonsvn += CSWggettextrt CSWiconv CSWoldaprt +REQUIRED_PKGS_CSWpmsvn = CSWsvn +REQUIRED_PKGS_CSWpmsvn += CSWperl +REQUIRED_PKGS_CSWpmsvn += CSWapache2rt +REQUIRED_PKGS_CSWpmsvn += CSWexpat +REQUIRED_PKGS_CSWpmsvn += CSWggettextrt +REQUIRED_PKGS_CSWpmsvn += CSWiconv +REQUIRED_PKGS_CSWpmsvn += CSWoldaprt +PKGFILES_CSWpmsvn = $(libdir)/perl.* +PKGFILES_CSWpmsvn += $(SVNLIB)/.*perl.* +PKGFILES_CSWpmsvn += $(mandir)/.*swig_perl.* + SPKG_DESC_CSWrbsvn = Subversion Ruby Language Binding CATALOGNAME_CSWrbsvn = rbsvn -REQUIRED_PKGS_CSWrbsvn = CSWsvn CSWruby CSWiconv CSWoldaprt -REQUIRED_PKGS_CSWrbsvn += CSWapache2rt CSWbdb47 CSWexpat CSWggettextrt +REQUIRED_PKGS_CSWrbsvn = CSWsvn +REQUIRED_PKGS_CSWrbsvn += CSWruby +REQUIRED_PKGS_CSWrbsvn += CSWapache2rt +REQUIRED_PKGS_CSWrbsvn += CSWexpat +REQUIRED_PKGS_CSWrbsvn += CSWggettextrt +REQUIRED_PKGS_CSWrbsvn += CSWiconv +REQUIRED_PKGS_CSWrbsvn += CSWoldaprt +PKGFILES_CSWrbsvn = $(libdir)/ruby.* +PKGFILES_CSWrbsvn += $(SVNLIB)/.*swig_ruby.* -PKGFILES_CSWsvn-devel = $(PKGFILES_DEVEL) -PKGFILES_CSWap2svn = $(prefix)/apache2.* -PKGFILES_CSWjavasvn = $(SVNLIB)/.*java.* -PKGFILES_CSWpmsvn = $(libdir)/perl.* -PKGFILES_CSWpmsvn += $(SVNLIB)/.*perl.* -PKGFILES_CSWpmsvn += $(mandir)/.*swig_perl.* -PKGFILES_CSWpythonsvn = $(libdir)/python.* -PKGFILES_CSWpythonsvn += $(SVNLIB)/.*swig_py.* -PKGFILES_CSWrbsvn = $(libdir)/ruby.* -PKGFILES_CSWrbsvn += $(SVNLIB)/.*swig_ruby.* +SPKG_DESC_CSWpythonsvn = Subversion Python Language Binding +CATALOGNAME_CSWpythonsvn = pythonsvn +REQUIRED_PKGS_CSWpythonsvn = CSWsvn +REQUIRED_PKGS_CSWpythonsvn += CSWpython +REQUIRED_PKGS_CSWpythonsvn += CSWapache2rt +REQUIRED_PKGS_CSWpythonsvn += CSWexpat +REQUIRED_PKGS_CSWpythonsvn += CSWggettextrt +REQUIRED_PKGS_CSWpythonsvn += CSWiconv +REQUIRED_PKGS_CSWpythonsvn += CSWoldaprt +PKGFILES_CSWpythonsvn = $(libdir)/python.* +PKGFILES_CSWpythonsvn += $(SVNLIB)/.*swig_py.* + DISTFILES += CSWsvn.checkinstall DISTFILES += CSWap2svn.postinstall CSWap2svn.preremove DISTFILES += httpd-svn.conf.CSW svn_access.conf.CSW @@ -80,10 +116,9 @@ PATCHFILES += subversion161.diff PATCHFILES += 0001-make-subversion-sysconfigdir-as-it-should-be-for-csw.patch -DEPENDS = server/apache2 -DEPENDS = lib/neon +EXTRA_LIB = $(SVNLIB) $(prefix)/apache2/lib +EXTRA_INC = $(prefix)/apache2/include -NODIRPATHS = --libdir --libexecdir JDK = /usr/jdk1.5.0_15 EXTRA_INC += $(JDK)/include SVNLIB = $(prefix)/lib/svn @@ -94,11 +129,18 @@ LDFLAGS += -R/opt/csw/bdb47/lib -L/opt/csw/bdb47/lib export LDFLAGS -EXTRA_MERGE_EXCLUDE_FILES = .*\.pyo .*\.pyc +EXTRA_MERGE_EXCLUDE_FILES += .*\.pyo .*\.pyc PROTOTYPE_MODIFIERS += cswpycompile PROTOTYPE_FILES_cswpycompile = $(libdir)/python/.*\.py PROTOTYPE_CLASS_cswpycompile = cswpycompile +# All of the perl modules go to $(libdir)/perl/site_perl. We are not interested +# in the version specific perl directory which only contains a perllocal.pod. +# Can this be re-done as a version agnostic regex? Couldn't get this to work :/ +# EXTRA_MERGE_EXCLUDE_FILES += $(libdir)/perl/(?!site_perl\/) +EXTRA_MERGE_EXCLUDE_FILES += $(libdir)/perl/5.8.8.* + +NODIRPATHS = --libdir --libexecdir CONFIGURE_ARGS = $(DIRPATHS) --libdir=$(SVNLIB) --libexecdir=$(SVNLIB) CONFIGURE_ARGS += --disable-mod-activation CONFIGURE_ARGS += --disable-static @@ -113,53 +155,55 @@ CONFIGURE_ARGS += --with-zlib=$(prefix) CONFIGURE_ARGS += --with-serf=$(prefix) -TEST_TARGET = check # Tests take *forever* -TEST_SCRIPTS = skip +#TEST_TARGET = check +TEST_TARGET = -test-skip: - @$(MAKECOOKIE) - include gar/category.mk BINDING_LANGS = java perl python ruby -BINDING_TARGETS = $(foreach LANG,$(BINDING_LANGS),svn-$(LANG)) +BINDING_TARGETS = $(addprefix svn-,$(BINDING_LANGS)) -PI_DEPENDS = install-extras -PI_DEPENDS += fix-ra_dav +PI_DEPENDS += copy-apache-templates +PI_DEPENDS += create-ra_dav-symlinks +PI_DEPENDS += install-extras PI_DEPENDS += $(BINDING_TARGETS) -PI_DEPENDS += copy-templates -PI_DEPENDS += fix-install post-install-modulated: $(PI_DEPENDS) $(MAKECOOKIE) +# The whole subversion build is done with Sun's cc. Ruby language bindings +# need to be built with gcc. Hack (!) together Makefile.gcc/libtool.gcc which +# are then used in the "svn-ruby" target. +# See http://lists.opencsw.org/pipermail/maintainers/2009-May/002325.html post-configure-modulated: @echo "~~~ Fixing Libtool ~~~" - @$(DOWNLOADDIR)/fixme.sh $(WORKSRC) - @echo "~~~ Creating GCC Makefile and libtool for javahl and ruby ~~~" - @gcp $(WORKSRC)/Makefile $(WORKSRC)/Makefile.gcc - @gcp $(WORKSRC)/libtool $(WORKSRC)/libtool.gcc - @perl -i -pe 's/-mt\|*//' $(WORKSRC)/*.gcc - @perl -i -pe 's|-xO3|-pipe -O2|' $(WORKSRC)/*.gcc - @perl -i -pe 's|/opt/studio/SOS11/SUNWspro/bin/cc|/opt/csw/gcc4/bin/gcc|' \ - $(WORKSRC)/*.gcc - @perl -i -pe 's|/opt/studio/SOS11/SUNWspro/bin/CC|/opt/csw/gcc4/bin/g++|' \ - $(WORKSRC)/*.gcc - @perl -i -pe 's|libtool|libtool.gcc|' $(WORKSRC)/Makefile.gcc - @perl -i -pe 's|KPIC|fPIC|' $(WORKSRC)/libtool.gcc - @perl -i -pe 's|postdeps=.*|postdeps=""|' $(WORKSRC)/libtool.gcc - @( if [ "`uname -p`" = "sparc" ]; then \ - perl -i -pe 's|-xarch=v8|-mcpu=v8|' $(WORKSRC)/*.gcc; \ + $(DOWNLOADDIR)/fixme.sh $(WORKSRC) + @echo "~~~ Creating GCC Makefile and libtool for ruby ~~~" + + gcp $(WORKSRC)/Makefile $(WORKSRC)/Makefile.gcc + gcp $(WORKSRC)/libtool $(WORKSRC)/libtool.gcc + + @# -mt\|* effectively strips any occasion of -mt or -mt| out of + @# libtool.gcc, but what for? -mt is recognized by both Sun's cc + @# and gcc and is responsible for adding multi-threading support. + gsed -i \ + -e 's,-mt|*,,' \ + -e 's,-xO3,-pipe -O2,' \ + -e 's,KPIC,fPIC,' \ + -e 's,/opt/studio/SOS11/SUNWspro/bin/cc,/opt/csw/gcc4/bin/gcc,' \ + -e 's,/opt/studio/SOS11/SUNWspro/bin/CC,/opt/csw/gcc4/bin/g++,' \ + $(WORKSRC)/*.gcc + gsed -i -e 's,libtool,libtool.gcc,' $(WORKSRC)/Makefile.gcc + gsed -i -e 's,postdeps=.*,postdeps="",' $(WORKSRC)/libtool.gcc + ( if [ "$(GARCH)" = "sparc" ]; then \ + perl -i -pe 's,-xarch=v8,-mcpu=v8,' $(WORKSRC)/*.gcc; \ else \ - perl -i -pe 's|-xarch=386|-march=i386|' $(WORKSRC)/*.gcc; \ + perl -i -pe 's,-xarch=386,-march=i386,' $(WORKSRC)/*.gcc; \ fi ) - $(MAKECOOKIE) + @$(MAKECOOKIE) -fix-install: - @(grm -fr $(DESTDIR)$(prefix)/lib/perl/5.8.8) - -copy-templates: +copy-apache-templates: ginstall -d $(DESTDIR)$(prefix)/apache2/etc/extra ginstall -m 0644 \ $(WORKDIR)/httpd-svn.conf.CSW \ @@ -167,53 +211,53 @@ ginstall -m 0644 \ $(WORKDIR)/svn_access.conf.CSW \ $(DESTDIR)$(prefix)/apache2/etc - $(MAKECOOKIE) + @$(MAKECOOKIE) -fix-ra_dav: - @# libsvn_ra_dav-1* has been renamed to libsvn_ra_neon-1* - @# in the new versions of subversion, - @# we need to link for backward compatability - @(gln -s libsvn_ra_neon-1.so.0.0.0 $(DESTDIR)$(SVNLIB)/libsvn_ra_dav-1.so.0) - @(gln -s libsvn_ra_neon-1.so.0.0.0 $(DESTDIR)$(SVNLIB)/libsvn_ra_dav-1.so) +# libsvn_ra_dav-1* has been renamed to libsvn_ra_neon-1* in the new versions +# of subversion (starting with?), we need to link for backward compatability +create-ra_dav-symlinks: + ( cd $(DESTDIR)$(SVNLIB); \ + ln -s libsvn_ra_neon-1.so.0.0.0 libsvn_ra_dav-1.so.0; \ + ln -s libsvn_ra_neon-1.so.0.0.0 libsvn_ra_dav-1.so; ) @$(MAKECOOKIE) install-extras: - @(ginstall -d $(DESTDIR)$(docdir)/subversion/tools) - @(ginstall -d $(DESTDIR)$(docdir)/subversion/contrib) - @(gcp -R $(WORKSRC)/tools/* $(DESTDIR)$(docdir)/subversion/tools/) - @(gcp -R $(WORKSRC)/contrib/* $(DESTDIR)$(docdir)/subversion/contrib/) - @$(BUILD_ENV) $(INSTALL_ENV) gmake -C $(WORKSRC) install-tools - @$(BUILD_ENV) $(INSTALL_ENV) gmake -C $(WORKSRC) install-contrib + ginstall -d $(DESTDIR)$(docdir)/subversion/tools + ginstall -d $(DESTDIR)$(docdir)/subversion/contrib + gcp -R $(WORKSRC)/tools/* $(DESTDIR)$(docdir)/subversion/tools/ + gcp -R $(WORKSRC)/contrib/* $(DESTDIR)$(docdir)/subversion/contrib/ + $(BUILD_ENV) $(INSTALL_ENV) gmake -C $(WORKSRC) install-tools + $(BUILD_ENV) $(INSTALL_ENV) gmake -C $(WORKSRC) install-contrib @$(MAKECOOKIE) svn-python: @echo " ==> Building Python bindings" - @touch \ + touch \ $(WORKSRC)/subversion/bindings/swig/python/*.c \ $(WORKSRC)/subversion/bindings/swig/python/*.py - @$(BUILD_ENV) gmake -C $(WORKSRC) swig-py - @$(INSTALL_ENV) gmake -C $(WORKSRC) install-swig-py - $(MAKECOOKIE) + $(BUILD_ENV) gmake -C $(WORKSRC) swig-py + $(INSTALL_ENV) gmake -C $(WORKSRC) install-swig-py + @$(MAKECOOKIE) svn-perl: @echo " ==> Building Perl bindings" - @touch \ + touch \ $(WORKSRC)/subversion/bindings/swig/perl/native/*.c \ $(WORKSRC)/subversion/bindings/swig/perl/native/*.pm - @$(BUILD_ENV) gmake -C $(WORKSRC) swig-pl - @$(INSTALL_ENV) gmake DESTDIR=$(DESTDIR) -C $(WORKSRC) install-swig-pl - $(MAKECOOKIE) + $(BUILD_ENV) gmake -C $(WORKSRC) swig-pl + $(INSTALL_ENV) gmake DESTDIR=$(DESTDIR) -C $(WORKSRC) install-swig-pl + @$(MAKECOOKIE) svn-ruby: @echo " ==> Building Ruby bindings" - @touch $(WORKSRC)/subversion/bindings/swig/ruby/*.c + touch $(WORKSRC)/subversion/bindings/swig/ruby/*.c $(BUILD_ENV) gmake -f Makefile.gcc -C $(WORKSRC) swig-rb - @$(INSTALL_ENV) gmake -f Makefile.gcc -C $(WORKSRC) install-swig-rb - $(MAKECOOKIE) + $(INSTALL_ENV) gmake -f Makefile.gcc -C $(WORKSRC) install-swig-rb + @$(MAKECOOKIE) svn-java: @echo " ==> Building Java bindings" - @touch $(WORKSRC)/subversion/bindings/javahl/native/*.c + touch $(WORKSRC)/subversion/bindings/javahl/native/*.c $(BUILD_ENV) gmake -C $(WORKSRC) javahl; $(INSTALL_ENV) gmake -C $(WORKSRC) install-javahl; - $(MAKECOOKIE) + @$(MAKECOOKIE) Added: csw/mgar/pkg/subversion/trunk/files/changelog.CSW =================================================================== --- csw/mgar/pkg/subversion/trunk/files/changelog.CSW (rev 0) +++ csw/mgar/pkg/subversion/trunk/files/changelog.CSW 2010-01-17 01:59:18 UTC (rev 8037) @@ -0,0 +1,9 @@ +subversion (1.6.6,REV=2010.01.17) + + * Restricted cswpycompile usage to python modules. (Closes #4156) + * Corrected libsvn_ra_dav-1.so.0 symlinks. (Closes #4096) + * Dropped openssl_rt dependency (neon with SSL support is built separately). + * Dropped kerberos dependency (neon comes with Kerberos support). + * Dropped libnet dependency (not required). + + -- Sebastian Kayser Sun, 17 Jan 2010 02:39:59 +0100 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From trygvis at users.sourceforge.net Sun Jan 17 11:40:28 2010 From: trygvis at users.sourceforge.net (trygvis at users.sourceforge.net) Date: Sun, 17 Jan 2010 10:40:28 +0000 Subject: [csw-devel] SF.net SVN: gar:[8038] csw/mgar/pkg/pcb/trunk/Makefile Message-ID: Revision: 8038 http://gar.svn.sourceforge.net/gar/?rev=8038&view=rev Author: trygvis Date: 2010-01-17 10:40:28 +0000 (Sun, 17 Jan 2010) Log Message: ----------- wip Modified Paths: -------------- csw/mgar/pkg/pcb/trunk/Makefile Modified: csw/mgar/pkg/pcb/trunk/Makefile =================================================================== --- csw/mgar/pkg/pcb/trunk/Makefile 2010-01-17 01:59:18 UTC (rev 8037) +++ csw/mgar/pkg/pcb/trunk/Makefile 2010-01-17 10:40:28 UTC (rev 8038) @@ -70,13 +70,16 @@ include gar/category.mk -post-extract-modulated: - @echo " ==> Renaming files (' ' => '_')" - @find $(WORKSRC)/lib/pcblib-newlib -name \*\ \* | \ - while read f; \ - do \ - mv "$$f" `echo $$f | tr " " _`; \ - done +post-install-modulated: + @echo " ==> Packaging up lib/" + @echo " DESTDIR=" $(DESTDIR) + false + mkdir -p $(DESTDIR)/var/opt/csw/pcb/ + gtar cf - -C $(DESTDIR)/lib . | gzip -c - > $(DESTDIR)/var/opt/csw/pcb/lib.tar.gz + rm -rf $(DESTDIR)/opt/csw/share/pcb/lib + false + @$(MAKECOOKIE) post-install-modulated: @rmdir $(DESTDIR)/opt/csw/share/pcb-20081128 + @$(MAKECOOKIE) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From skayser at users.sourceforge.net Sun Jan 17 11:48:50 2010 From: skayser at users.sourceforge.net (skayser at users.sourceforge.net) Date: Sun, 17 Jan 2010 10:48:50 +0000 Subject: [csw-devel] SF.net SVN: gar:[8039] csw/mgar/gar/v2/gar.pkg.mk Message-ID: Revision: 8039 http://gar.svn.sourceforge.net/gar/?rev=8039&view=rev Author: skayser Date: 2010-01-17 10:48:50 +0000 (Sun, 17 Jan 2010) Log Message: ----------- gar/v2: added some bits of information on pathfilter Modified Paths: -------------- csw/mgar/gar/v2/gar.pkg.mk Modified: csw/mgar/gar/v2/gar.pkg.mk =================================================================== --- csw/mgar/gar/v2/gar.pkg.mk 2010-01-17 10:40:28 UTC (rev 8038) +++ csw/mgar/gar/v2/gar.pkg.mk 2010-01-17 10:48:50 UTC (rev 8039) @@ -366,7 +366,8 @@ $(PROTOTYPE): $(WORKDIR) merge $(_DBG)cswproto -c $(GARDIR)/etc/commondirs-$(GARCH) -r $(PKGROOT) $(PKGROOT)=/ >$@ -# The pathfilter rules are as follows: +# pathfilter lives in bin/pathfilter and takes care of including/excluding paths from +# a prototype (see "perldoc bin/pathfilter"). We employ it here to: # - include license for current package # - exclude licenses for all other packages # - if other includes are given, only include these files This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From hson at users.sourceforge.net Sun Jan 17 13:00:34 2010 From: hson at users.sourceforge.net (hson at users.sourceforge.net) Date: Sun, 17 Jan 2010 12:00:34 +0000 Subject: [csw-devel] SF.net SVN: gar:[8040] csw/mgar/pkg/djvulibre/trunk/Makefile Message-ID: Revision: 8040 http://gar.svn.sourceforge.net/gar/?rev=8040&view=rev Author: hson Date: 2010-01-17 12:00:34 +0000 (Sun, 17 Jan 2010) Log Message: ----------- djvulibre: Dependency update Modified Paths: -------------- csw/mgar/pkg/djvulibre/trunk/Makefile Modified: csw/mgar/pkg/djvulibre/trunk/Makefile =================================================================== --- csw/mgar/pkg/djvulibre/trunk/Makefile 2010-01-17 10:48:50 UTC (rev 8039) +++ csw/mgar/pkg/djvulibre/trunk/Makefile 2010-01-17 12:00:34 UTC (rev 8040) @@ -21,7 +21,7 @@ REQUIRED_PKGS_CSWdjvulibre += CSWdjvulibrert CSWjpeg CSWtiff CSWzlib REQUIRED_PKGS_CSWdjvulibrert += CSWjpeg -REQUIRED_PKGS_CSWdjvulibredevel += CSWdjvulibre +REQUIRED_PKGS_CSWdjvulibredevel += CSWdjvulibrert PKGFILES_CSWdjvulibrert = $(PKGFILES_RT) PKGFILES_CSWdjvulibredevel = $(PKGFILES_DEVEL) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Sun Jan 17 14:31:38 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sun, 17 Jan 2010 13:31:38 +0000 Subject: [csw-devel] SF.net SVN: gar:[8041] csw/mgar/gar/v2/bin Message-ID: Revision: 8041 http://gar.svn.sourceforge.net/gar/?rev=8041&view=rev Author: wahwah Date: 2010-01-17 13:31:38 +0000 (Sun, 17 Jan 2010) Log Message: ----------- mGAR v2: checkpkg - displaying the information about building the cache Modified Paths: -------------- csw/mgar/gar/v2/bin/checkpkg Added Paths: ----------- csw/mgar/gar/v2/bin/checkpkg.d/update_contents_cache.py Modified: csw/mgar/gar/v2/bin/checkpkg =================================================================== --- csw/mgar/gar/v2/bin/checkpkg 2010-01-17 12:00:34 UTC (rev 8040) +++ csw/mgar/gar/v2/bin/checkpkg 2010-01-17 13:31:38 UTC (rev 8041) @@ -552,15 +552,17 @@ # All packages have been extracted. -# Now running all the plugin checks - set_variables_for_individual_package_check "$f" -echo "Running the experimental plugin infrastructure." +echo "Running modular tests" test_suite_ok=1 checkpkg_scriptname=`basename $0` checkpkg_basedir=${0%/${checkpkg_scriptname}} plugindir=${checkpkg_basedir}/checkpkg.d + +# /var/sadm/install/contents cache update +${plugindir}/update_contents_cache.py + if [[ "${DEBUG}" != "" ]]; then extra_options="--debug" fi @@ -603,7 +605,7 @@ echo if [[ ${test_suite_ok} -ne 1 ]]; then - errmsg "One or more tests have failed." + errmsg "One or more modular tests have failed." else print "All tests were successful." fi Added: csw/mgar/gar/v2/bin/checkpkg.d/update_contents_cache.py =================================================================== --- csw/mgar/gar/v2/bin/checkpkg.d/update_contents_cache.py (rev 0) +++ csw/mgar/gar/v2/bin/checkpkg.d/update_contents_cache.py 2010-01-17 13:31:38 UTC (rev 8041) @@ -0,0 +1,10 @@ +#!/opt/csw/bin/python2.6 + +import checkpkg + +def main(): + test_pkgmap = checkpkg.SystemPkgmap() + + +if __name__ == '__main__': + main() Property changes on: csw/mgar/gar/v2/bin/checkpkg.d/update_contents_cache.py ___________________________________________________________________ Added: svn:executable + * This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From trygvis at users.sourceforge.net Sun Jan 17 15:25:35 2010 From: trygvis at users.sourceforge.net (trygvis at users.sourceforge.net) Date: Sun, 17 Jan 2010 14:25:35 +0000 Subject: [csw-devel] SF.net SVN: gar:[8042] csw/mgar/pkg/pcb/trunk Message-ID: Revision: 8042 http://gar.svn.sourceforge.net/gar/?rev=8042&view=rev Author: trygvis Date: 2010-01-17 14:25:35 +0000 (Sun, 17 Jan 2010) Log Message: ----------- pcb: Adding pre and post scripts to properly handle the footprint library. Modified Paths: -------------- csw/mgar/pkg/pcb/trunk/Makefile csw/mgar/pkg/pcb/trunk/checksums Added Paths: ----------- csw/mgar/pkg/pcb/trunk/files/CSWpcb.postinstall csw/mgar/pkg/pcb/trunk/files/CSWpcb.preremove Modified: csw/mgar/pkg/pcb/trunk/Makefile =================================================================== --- csw/mgar/pkg/pcb/trunk/Makefile 2010-01-17 13:31:38 UTC (rev 8041) +++ csw/mgar/pkg/pcb/trunk/Makefile 2010-01-17 14:25:35 UTC (rev 8042) @@ -15,6 +15,8 @@ SF_PROJ = $(GARNAME) MASTER_SITES = $(SF_MIRRORS) DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz +DISTFILES += CSW$(GARNAME).postinstall +DISTFILES += CSW$(GARNAME).preremove SPKG_SOURCEURL = http://pcb.gpleda.org @@ -70,16 +72,15 @@ include gar/category.mk +PACKAGED_DIRECTORIES = newlib pcblib pcblib-newlib + post-install-modulated: @echo " ==> Packaging up lib/" @echo " DESTDIR=" $(DESTDIR) - false - mkdir -p $(DESTDIR)/var/opt/csw/pcb/ - gtar cf - -C $(DESTDIR)/lib . | gzip -c - > $(DESTDIR)/var/opt/csw/pcb/lib.tar.gz - rm -rf $(DESTDIR)/opt/csw/share/pcb/lib - false - @$(MAKECOOKIE) - -post-install-modulated: + @echo " PKGROOT=" $(PKGROOT) + gtar zcf $(DESTDIR)/opt/csw/share/pcb/lib.tar.gz \ + -C $(DESTDIR)/opt/csw/share/pcb \ + $(PACKAGED_DIRECTORIES) + (cd $(DESTDIR)/opt/csw/share/pcb; rm -rf $(PACKAGED_DIRECTORIES)) @rmdir $(DESTDIR)/opt/csw/share/pcb-20081128 @$(MAKECOOKIE) Modified: csw/mgar/pkg/pcb/trunk/checksums =================================================================== --- csw/mgar/pkg/pcb/trunk/checksums 2010-01-17 13:31:38 UTC (rev 8041) +++ csw/mgar/pkg/pcb/trunk/checksums 2010-01-17 14:25:35 UTC (rev 8042) @@ -1,3 +1,5 @@ 509826c8a9184b46055258861228b555 0001-Fix-off-by-one-error-in-the-GTK-HID-s-netlist-window.patch 00fd904d4439493a998100f40891fffd 0001-Regenerate-rats-r-tree-when-re-allocating-a-bigger-r.patch +19b4f08dc4fedfaf1388727463a4d344 CSWpcb.postinstall +e4bcdb905fc698d3fdbf7449b495c774 CSWpcb.preremove e192ee993b04749f82dd3e8b529d40c0 pcb-20081128.tar.gz Added: csw/mgar/pkg/pcb/trunk/files/CSWpcb.postinstall =================================================================== --- csw/mgar/pkg/pcb/trunk/files/CSWpcb.postinstall (rev 0) +++ csw/mgar/pkg/pcb/trunk/files/CSWpcb.postinstall 2010-01-17 14:25:35 UTC (rev 8042) @@ -0,0 +1,14 @@ +#!/bin/sh + +set -e + +PATH=/sbin:/usr/sbin:/opt/csw/sbin:/bin:/usr/bin:/opt/csw/bin + +if [ "$PKG_INSTALL_ROOT" = "" ] +then + PKG_INSTALL_ROOT="/" +fi + +echo "Installing footprint library..." +cd $PKG_INSTALL_ROOT/opt/csw/share/pcb +gzcat $PKG_INSTALL_ROOT/opt/csw/share/pcb/lib.tar.gz | tar xf - Added: csw/mgar/pkg/pcb/trunk/files/CSWpcb.preremove =================================================================== --- csw/mgar/pkg/pcb/trunk/files/CSWpcb.preremove (rev 0) +++ csw/mgar/pkg/pcb/trunk/files/CSWpcb.preremove 2010-01-17 14:25:35 UTC (rev 8042) @@ -0,0 +1,23 @@ +#!/bin/sh +set -e + +PATH=/sbin:/usr/sbin:/opt/csw/sbin:/bin:/usr/bin:/opt/csw/bin + +if [ "$PKG_INSTALL_ROOT" = "" ] +then + PKG_INSTALL_ROOT="/" +fi + +echo "Removing footprint library..." + +cd $PKG_INSTALL_ROOT/opt/csw/share/pcb +gzcat $PKG_INSTALL_ROOT/opt/csw/share/pcb/lib.tar.gz | tar tf - | grep -v /$ | while read f +do + rm "$PKG_INSTALL_ROOT/opt/csw/share/pcb/$f" +done + +# Remove all directories in the tar file +gzcat $PKG_INSTALL_ROOT/opt/csw/share/pcb/lib.tar.gz | tar tf - | grep /$ | sort -r | while read d +do + rmdir "$d" +done This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From trygvis at users.sourceforge.net Sun Jan 17 15:32:10 2010 From: trygvis at users.sourceforge.net (trygvis at users.sourceforge.net) Date: Sun, 17 Jan 2010 14:32:10 +0000 Subject: [csw-devel] SF.net SVN: gar:[8043] csw/mgar/pkg/pcb/trunk/checksums Message-ID: Revision: 8043 http://gar.svn.sourceforge.net/gar/?rev=8043&view=rev Author: trygvis Date: 2010-01-17 14:32:10 +0000 (Sun, 17 Jan 2010) Log Message: ----------- pcb: checksum.. Modified Paths: -------------- csw/mgar/pkg/pcb/trunk/checksums Modified: csw/mgar/pkg/pcb/trunk/checksums =================================================================== --- csw/mgar/pkg/pcb/trunk/checksums 2010-01-17 14:25:35 UTC (rev 8042) +++ csw/mgar/pkg/pcb/trunk/checksums 2010-01-17 14:32:10 UTC (rev 8043) @@ -1,5 +1,5 @@ 509826c8a9184b46055258861228b555 0001-Fix-off-by-one-error-in-the-GTK-HID-s-netlist-window.patch 00fd904d4439493a998100f40891fffd 0001-Regenerate-rats-r-tree-when-re-allocating-a-bigger-r.patch -19b4f08dc4fedfaf1388727463a4d344 CSWpcb.postinstall -e4bcdb905fc698d3fdbf7449b495c774 CSWpcb.preremove +c2a305c3c331a3653beb075d5a9aa814 CSWpcb.postinstall +4c73a3c19563d53790dfed011d8fd287 CSWpcb.preremove e192ee993b04749f82dd3e8b529d40c0 pcb-20081128.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Sun Jan 17 17:39:58 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Sun, 17 Jan 2010 16:39:58 +0000 Subject: [csw-devel] SF.net SVN: gar:[8044] csw/mgar/pkg/mutt/trunk/Makefile Message-ID: Revision: 8044 http://gar.svn.sourceforge.net/gar/?rev=8044&view=rev Author: dmichelsen Date: 2010-01-17 16:39:57 +0000 (Sun, 17 Jan 2010) Log Message: ----------- mutt: Add more options to configure Modified Paths: -------------- csw/mgar/pkg/mutt/trunk/Makefile Modified: csw/mgar/pkg/mutt/trunk/Makefile =================================================================== --- csw/mgar/pkg/mutt/trunk/Makefile 2010-01-17 14:32:10 UTC (rev 8043) +++ csw/mgar/pkg/mutt/trunk/Makefile 2010-01-17 16:39:57 UTC (rev 8044) @@ -20,8 +20,8 @@ PACKAGES = CSWmutt-base CSWmutt-ncurses CSWmutt-slang REQUIRED_PKGS_CSWmutt-base = CSWggettextrt CSWiconv CSWlibidn -REQUIRED_PKGS_CSWmutt-ncurses = CSWmutt-base CSWncurses CSWggettextrt CSWiconv CSWlibidn -REQUIRED_PKGS_CSWmutt-slang = CSWmutt-base CSWslang CSWggettextrt CSWiconv CSWlibidn +REQUIRED_PKGS_CSWmutt-ncurses = CSWmutt-base CSWncurses CSWggettextrt CSWiconv CSWlibidn CSWgdbm CSWsasl +REQUIRED_PKGS_CSWmutt-slang = CSWmutt-base CSWslang CSWggettextrt CSWiconv CSWlibidn CSWgdbm CSWsasl CATALOGNAME_CSWmutt-base = mutt_base CATALOGNAME_CSWmutt-ncurses = mutt_ncurses @@ -38,6 +38,13 @@ sysconfdir = /etc/opt/csw CONFIGURE_ARGS = $(DIRPATHS) + +# Add requested header fields requested in this bug: +# http://www.opencsw.org/mantis/view.php?id=3726 +CONFIGURE_ARGS += --with-sasl --enable-hcache +# This required POP and/or IMAP +CONFIGURE_ARGS += --enable-pop --enable-imap + CONFIGURE_ARGS_SLANG-no = CONFIGURE_ARGS_SLANG-yes = --with-slang=$(prefix) CONFIGURE_ARGS += $(CONFIGURE_ARGS_SLANG-$(SLANG)) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From idogan23 at users.sourceforge.net Sun Jan 17 17:49:06 2010 From: idogan23 at users.sourceforge.net (idogan23 at users.sourceforge.net) Date: Sun, 17 Jan 2010 16:49:06 +0000 Subject: [csw-devel] SF.net SVN: gar:[8045] csw/mgar/pkg/amavisd-new/trunk Message-ID: Revision: 8045 http://gar.svn.sourceforge.net/gar/?rev=8045&view=rev Author: idogan23 Date: 2010-01-17 16:49:06 +0000 (Sun, 17 Jan 2010) Log Message: ----------- amavisd-new: fixed postinstall script bug 4138, fixed dependancy bug 4137 Modified Paths: -------------- csw/mgar/pkg/amavisd-new/trunk/Makefile csw/mgar/pkg/amavisd-new/trunk/checksums csw/mgar/pkg/amavisd-new/trunk/files/CSWamavisdnew.postinstall Added Paths: ----------- csw/mgar/pkg/amavisd-new/trunk/files/CSWamavisdnew.cswusergroup Removed Paths: ------------- csw/mgar/pkg/amavisd-new/trunk/files/CSWamavisdnew.prototype Modified: csw/mgar/pkg/amavisd-new/trunk/Makefile =================================================================== --- csw/mgar/pkg/amavisd-new/trunk/Makefile 2010-01-17 16:39:57 UTC (rev 8044) +++ csw/mgar/pkg/amavisd-new/trunk/Makefile 2010-01-17 16:49:06 UTC (rev 8045) @@ -13,15 +13,14 @@ MASTER_SITES = http://www.ijs.si/software/amavisd/#download DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz +DISTFILES += CSWamavisdnew.cswusergroup DISTFILES += CSWamavisdnew.postinstall DISTFILES += CSWamavisdnew.preinstall -DISTFILES += CSWamavisdnew.prototype -#DISTFILES += $(call admfiles,CSWamavisdnew, postinstall preinstall prototype) - # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz +REQUIRED_PKGS += CSWbdb47 REQUIRED_PKGS += CSWperl REQUIRED_PKGS += CSWcswclassutils REQUIRED_PKGS += CSWpmiostringy @@ -46,20 +45,27 @@ PATCHFILES += p0f-analyzer.pl.diff SPKG_CLASSES = none cswinitsmf +PROTOTYPE_FILTER = awk ' \ + $$$$3 ~ /\/init.d\/cswamavisdnew$$$$/ { $$$$2 = "cswinitsmf" } \ + $$$$3 ~ /\/csw\/amavisd-new.conf$$$$/ { $$$$2 = "cswcpsampleconf" } \ + { print }' CONFIGURE_SCRIPTS = BUILD_SCRIPTS = TEST_SCRIPTS = INSTALL_SCRIPTS = custom -AMAVISBIN=amavisd-agent amavisd-nanny amavisd-release p0f-analyzer.pl +PCONFDIR = $(DESTDIR)/etc/opt/csw +PVARDIR = $(DESTDIR)/var/opt/csw/$(GARNAME) + +AMAVISBIN = amavisd-agent amavisd-nanny amavisd-release p0f-analyzer.pl AMAVISBIN += amavisd-nanny AMAVISBIN += amavisd-release AMAVISBIN += p0f-analyzer.pl -AMAVISSBIN=amavisd-new +AMAVISSBIN = amavisd-new -AMAVISDOC=LDAP.schema +AMAVISDOC = LDAP.schema AMAVISDOC += README_FILES AMAVISDOC += RELEASE_NOTES AMAVISDOC += AAAREADME.first @@ -81,6 +87,7 @@ cp -r $(AMAVISDOC) $(DESTDIR)$(prefix)/share/doc/amavisd-new ginstall -d $(DESTDIR)/etc/opt/csw/init.d ginstall -m 755 files/cswamavisdnew $(DESTDIR)/etc/opt/csw/init.d/cswamavisdnew + ginstall -m 644 files/CSWamavisdnew.cswusergroup $(DESTDIR)/etc/opt/csw/pkg/CSWamavisdnew/cswusergroup $(MAKECOOKIE) include gar/category.mk Modified: csw/mgar/pkg/amavisd-new/trunk/checksums =================================================================== --- csw/mgar/pkg/amavisd-new/trunk/checksums 2010-01-17 16:39:57 UTC (rev 8044) +++ csw/mgar/pkg/amavisd-new/trunk/checksums 2010-01-17 16:49:06 UTC (rev 8045) @@ -1,10 +1,10 @@ -2df80947353821e6e94fcad09a1bb3da download/CSWamavisdnew.postinstall -171767585ab6662c0cbedae26e9baa2c download/CSWamavisdnew.preinstall -631e33b02eb813b9f3f13db03b5c12eb download/CSWamavisdnew.prototype -b9cafe6715bc2703ac9411f24f248cd3 download/amavisd-agent.diff -3e81998c8b933129870e3cab68d40261 download/amavisd-nanny.diff -02b0bd38b40258841c60479603dc6842 download/amavisd-new-2.6.3.tar.gz -f218d10e5280940268a3ffaa125a00ae download/amavisd-release.diff -9c3d4118cf3837e559a6026d6b89b377 download/amavisd.conf.diff -071af9fb79ee5e9d045905043fea2b96 download/amavisd.diff -befafc9594d5e1c1c8710b7d4d129d0b download/p0f-analyzer.pl.diff +b1af7a961c5f3111efeb72d83b21a0fd CSWamavisdnew.cswusergroup +b12bd6b3223756e47e95347fc177bd7b CSWamavisdnew.postinstall +171767585ab6662c0cbedae26e9baa2c CSWamavisdnew.preinstall +b9cafe6715bc2703ac9411f24f248cd3 amavisd-agent.diff +3e81998c8b933129870e3cab68d40261 amavisd-nanny.diff +02b0bd38b40258841c60479603dc6842 amavisd-new-2.6.3.tar.gz +f218d10e5280940268a3ffaa125a00ae amavisd-release.diff +9c3d4118cf3837e559a6026d6b89b377 amavisd.conf.diff +071af9fb79ee5e9d045905043fea2b96 amavisd.diff +befafc9594d5e1c1c8710b7d4d129d0b p0f-analyzer.pl.diff Added: csw/mgar/pkg/amavisd-new/trunk/files/CSWamavisdnew.cswusergroup =================================================================== --- csw/mgar/pkg/amavisd-new/trunk/files/CSWamavisdnew.cswusergroup (rev 0) +++ csw/mgar/pkg/amavisd-new/trunk/files/CSWamavisdnew.cswusergroup 2010-01-17 16:49:06 UTC (rev 8045) @@ -0,0 +1 @@ +amavisn:amavisn:amavisd-new pseudo user:/:/bin/false:: Modified: csw/mgar/pkg/amavisd-new/trunk/files/CSWamavisdnew.postinstall =================================================================== --- csw/mgar/pkg/amavisd-new/trunk/files/CSWamavisdnew.postinstall 2010-01-17 16:39:57 UTC (rev 8044) +++ csw/mgar/pkg/amavisd-new/trunk/files/CSWamavisdnew.postinstall 2010-01-17 16:49:06 UTC (rev 8045) @@ -17,25 +17,25 @@ echo "Running db_verify (before upgrade) on $DB_HOME" >>$installlog for each_db in `ls *.db` do - ${BASEDIR}/opt/csw/bin/db_verify -h $DB_HOME -o $each_db >>$installlog 2>&1 + ${BASEDIR}/opt/csw/bdb47/bin/db_verify -h $DB_HOME -o $each_db >>$installlog 2>&1 done # Update the database environment to the new value echo "Running db_recover on $DB_HOME" >>$installlog - ${BASEDIR}/opt/csw/bin/db_recover -h $DB_HOME >>$installlog 2>&1 + ${BASEDIR}/opt/csw/bdb47/bin/db_recover -h $DB_HOME >>$installlog 2>&1 # Upgrade each file. This does nothing if no upgrade is needed. echo "Running db_upgrade on $DB_HOME" >>$installlog for each_db in `ls *.db` do - ${BASEDIR}/opt/csw/bin/db_upgrade -h $DB_HOME $each_db >>$installlog 2>&1 + ${BASEDIR}/opt/csw/bdb47/bin/db_upgrade -h $DB_HOME $each_db >>$installlog 2>&1 done # Verify each file echo "Running db_verify (after upgrade) on $DB_HOME" >>$installlog for each_db in `ls *.db` do - ${BASEDIR}/opt/csw/bin/db_verify -h $DB_HOME -o $each_db >>$installlog 2>&1 + ${BASEDIR}/opt/csw/bdb47/bin/db_verify -h $DB_HOME -o $each_db >>$installlog 2>&1 done fi Deleted: csw/mgar/pkg/amavisd-new/trunk/files/CSWamavisdnew.prototype =================================================================== --- csw/mgar/pkg/amavisd-new/trunk/files/CSWamavisdnew.prototype 2010-01-17 16:39:57 UTC (rev 8044) +++ csw/mgar/pkg/amavisd-new/trunk/files/CSWamavisdnew.prototype 2010-01-17 16:49:06 UTC (rev 8045) @@ -1,74 +0,0 @@ -d none /opt/csw/bin 0755 root bin -f none /opt/csw/bin/amavisd-agent 0755 root bin -f none /opt/csw/bin/amavisd-nanny 0755 root bin -f none /opt/csw/bin/amavisd-release 0755 root bin -f none /opt/csw/bin/p0f-analyzer.pl 0755 root bin -d none /opt/csw/etc 0755 root bin -f none /opt/csw/etc/amavisd-new.conf.CSW 0644 root bin -d none /opt/csw/sbin 0755 root bin -f none /opt/csw/sbin/amavisd-new 0755 root bin -d none /opt/csw/share/doc/amavisd-new 0755 root bin -f none /opt/csw/share/doc/amavisd-new/AAAREADME.first 0644 root bin -f none /opt/csw/share/doc/amavisd-new/LDAP.schema 0644 root bin -f none /opt/csw/share/doc/amavisd-new/README_FILES/README.banned 0644 root bin -f none /opt/csw/share/doc/amavisd-new/README_FILES/README.chroot 0644 root bin -f none /opt/csw/share/doc/amavisd-new/README_FILES/README.contributed 0644 root bin -f none /opt/csw/share/doc/amavisd-new/README_FILES/README.courier 0644 root bin -f none /opt/csw/share/doc/amavisd-new/README_FILES/README.courier-old 0644 root bin -f none /opt/csw/share/doc/amavisd-new/README_FILES/README.customize 0644 root bin -f none /opt/csw/share/doc/amavisd-new/README_FILES/README.exim_v3 0644 root bin -f none /opt/csw/share/doc/amavisd-new/README_FILES/README.exim_v3_app 0644 root bin -f none /opt/csw/share/doc/amavisd-new/README_FILES/README.exim_v4 0644 root bin -f none /opt/csw/share/doc/amavisd-new/README_FILES/README.exim_v4_app 0644 root bin -f none /opt/csw/share/doc/amavisd-new/README_FILES/README.exim_v4_app2 0644 root bin -f none /opt/csw/share/doc/amavisd-new/README_FILES/README.ldap 0644 root bin -f none /opt/csw/share/doc/amavisd-new/README_FILES/README.lookups 0644 root bin -f none /opt/csw/share/doc/amavisd-new/README_FILES/README.milter 0644 root bin -f none /opt/csw/share/doc/amavisd-new/README_FILES/README.old.scanners 0644 root bin -f none /opt/csw/share/doc/amavisd-new/README_FILES/README.performance 0644 root bin -f none /opt/csw/share/doc/amavisd-new/README_FILES/README.policy-on-notifications 0644 root bin -f none /opt/csw/share/doc/amavisd-new/README_FILES/README.postfix 0644 root bin -f none /opt/csw/share/doc/amavisd-new/README_FILES/README.postfix.html 0644 root bin -f none /opt/csw/share/doc/amavisd-new/README_FILES/README.protocol 0644 root bin -f none /opt/csw/share/doc/amavisd-new/README_FILES/README.sendmail 0644 root bin -f none /opt/csw/share/doc/amavisd-new/README_FILES/README.sendmail-dual 0644 root bin -f none /opt/csw/share/doc/amavisd-new/README_FILES/README.sendmail-dual.old 0644 root bin -f none /opt/csw/share/doc/amavisd-new/README_FILES/README.sql 0644 root bin -f none /opt/csw/share/doc/amavisd-new/README_FILES/README.sql-mysql 0644 root bin -f none /opt/csw/share/doc/amavisd-new/README_FILES/README.sql-pg 0644 root bin -f none /opt/csw/share/doc/amavisd-new/README_FILES/TODO-SNMP-AGENT 0644 root bin -f none /opt/csw/share/doc/amavisd-new/README_FILES/amavisd-new-docs.html 0644 root bin -f none /opt/csw/share/doc/amavisd-new/README_FILES/images/blank.png 0644 root bin -f none /opt/csw/share/doc/amavisd-new/README_FILES/images/callouts/1.png 0644 root bin -f none /opt/csw/share/doc/amavisd-new/README_FILES/images/callouts/10.png 0644 root bin -f none /opt/csw/share/doc/amavisd-new/README_FILES/images/callouts/11.png 0644 root bin -f none /opt/csw/share/doc/amavisd-new/README_FILES/images/callouts/12.png 0644 root bin -f none /opt/csw/share/doc/amavisd-new/README_FILES/images/callouts/13.png 0644 root bin -f none /opt/csw/share/doc/amavisd-new/README_FILES/images/callouts/14.png 0644 root bin -f none /opt/csw/share/doc/amavisd-new/README_FILES/images/callouts/15.png 0644 root bin -f none /opt/csw/share/doc/amavisd-new/README_FILES/images/callouts/2.png 0644 root bin -f none /opt/csw/share/doc/amavisd-new/README_FILES/images/callouts/3.png 0644 root bin -f none /opt/csw/share/doc/amavisd-new/README_FILES/images/callouts/4.png 0644 root bin -f none /opt/csw/share/doc/amavisd-new/README_FILES/images/callouts/5.png 0644 root bin -f none /opt/csw/share/doc/amavisd-new/README_FILES/images/callouts/6.png 0644 root bin -f none /opt/csw/share/doc/amavisd-new/README_FILES/images/callouts/7.png 0644 root bin -f none /opt/csw/share/doc/amavisd-new/README_FILES/images/callouts/8.png 0644 root bin -f none /opt/csw/share/doc/amavisd-new/README_FILES/images/callouts/9.png 0644 root bin -f none /opt/csw/share/doc/amavisd-new/README_FILES/images/caution.png 0644 root bin -f none /opt/csw/share/doc/amavisd-new/README_FILES/images/draft.png 0644 root bin -f none /opt/csw/share/doc/amavisd-new/README_FILES/images/home.png 0644 root bin -f none /opt/csw/share/doc/amavisd-new/README_FILES/images/important.png 0644 root bin -f none /opt/csw/share/doc/amavisd-new/README_FILES/images/next.png 0644 root bin -f none /opt/csw/share/doc/amavisd-new/README_FILES/images/note.png 0644 root bin -f none /opt/csw/share/doc/amavisd-new/README_FILES/images/prev.png 0644 root bin -f none /opt/csw/share/doc/amavisd-new/README_FILES/images/tip.png 0644 root bin -f none /opt/csw/share/doc/amavisd-new/README_FILES/images/toc-blank.png 0644 root bin -f none /opt/csw/share/doc/amavisd-new/README_FILES/images/toc-minus.png 0644 root bin -f none /opt/csw/share/doc/amavisd-new/README_FILES/images/toc-plus.png 0644 root bin -f none /opt/csw/share/doc/amavisd-new/README_FILES/images/up.png 0644 root bin -f none /opt/csw/share/doc/amavisd-new/README_FILES/images/warning.png 0644 root bin -f none /opt/csw/share/doc/amavisd-new/README_FILES/screen.css 0644 root bin -f none /opt/csw/share/doc/amavisd-new/RELEASE_NOTES 0644 root bin -f none /opt/csw/share/doc/amavisd-new/amavisd.conf-default 0644 root bin -f none /opt/csw/share/doc/amavisd-new/amavisd.conf-sample 0644 root bin -f cswinitsmf /etc/opt/csw/init.d/cswamavisdnew 0755 root bin This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From trygvis at users.sourceforge.net Sun Jan 17 18:32:30 2010 From: trygvis at users.sourceforge.net (trygvis at users.sourceforge.net) Date: Sun, 17 Jan 2010 17:32:30 +0000 Subject: [csw-devel] SF.net SVN: gar:[8046] csw/mgar/pkg/gtkwave/trunk/Makefile Message-ID: Revision: 8046 http://gar.svn.sourceforge.net/gar/?rev=8046&view=rev Author: trygvis Date: 2010-01-17 17:32:30 +0000 (Sun, 17 Jan 2010) Log Message: ----------- gtkwave: Getting at least ./configure to pass on solaris8. Modified Paths: -------------- csw/mgar/pkg/gtkwave/trunk/Makefile Modified: csw/mgar/pkg/gtkwave/trunk/Makefile =================================================================== --- csw/mgar/pkg/gtkwave/trunk/Makefile 2010-01-17 16:49:06 UTC (rev 8045) +++ csw/mgar/pkg/gtkwave/trunk/Makefile 2010-01-17 17:32:30 UTC (rev 8046) @@ -22,9 +22,12 @@ GARCOMPILER = GNU -CONFIGURE_ARGS = $(DIRPATHS) LDFLAGS=-lintl +CONFIGURE_ARGS = $(DIRPATHS) +CONFIGURE_ARGS += LDFLAGS=-lintl -pre-build-modulated: +CONFIGURE_ENV = PKG_CONFIG_PATH=/opt/csw/X11/lib/pkgconfig + +post-extract-modulated: find $(WORKSRC) -type f | xargs -I _ /opt/csw/bin/dos2unix _ _ @$(MAKECOOKIE) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From trygvis at users.sourceforge.net Sun Jan 17 20:19:06 2010 From: trygvis at users.sourceforge.net (trygvis at users.sourceforge.net) Date: Sun, 17 Jan 2010 19:19:06 +0000 Subject: [csw-devel] SF.net SVN: gar:[8047] csw/mgar/pkg/gtkwave/trunk Message-ID: Revision: 8047 http://gar.svn.sourceforge.net/gar/?rev=8047&view=rev Author: trygvis Date: 2010-01-17 19:19:06 +0000 (Sun, 17 Jan 2010) Log Message: ----------- gtkwave: Getting to work on build8s. Modified Paths: -------------- csw/mgar/pkg/gtkwave/trunk/Makefile csw/mgar/pkg/gtkwave/trunk/checksums Added Paths: ----------- csw/mgar/pkg/gtkwave/trunk/files/removing-stdint.h-include.patch Modified: csw/mgar/pkg/gtkwave/trunk/Makefile =================================================================== --- csw/mgar/pkg/gtkwave/trunk/Makefile 2010-01-17 17:32:30 UTC (rev 8046) +++ csw/mgar/pkg/gtkwave/trunk/Makefile 2010-01-17 19:19:06 UTC (rev 8047) @@ -11,26 +11,40 @@ MASTER_SITES = $(SF_MIRRORS) DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz -# We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz -# If the url used to check for software update is different of MASTER_SITES, then -# uncomment the next line. Otherwise it is set by default to the value of MASTER_SITES -# UPSTREAM_MASTER_SITES = - PREREQUISITE_BASE_PKGS = CSWtofrodos GARCOMPILER = GNU +REQUIRED_PKGS = CSWfconfig +REQUIRED_PKGS += CSWftype2 +REQUIRED_PKGS += CSWggettextrt +REQUIRED_PKGS += CSWglib2 +REQUIRED_PKGS += CSWgtk2 +REQUIRED_PKGS += CSWlibatk +REQUIRED_PKGS += CSWlibcairo +REQUIRED_PKGS += CSWpango +REQUIRED_PKGS += CSWtcl +REQUIRED_PKGS += CSWzlib + +PATCHFILES = removing-stdint.h-include.patch + CONFIGURE_ARGS = $(DIRPATHS) -CONFIGURE_ARGS += LDFLAGS=-lintl +CONFIGURE_ARGS += LDFLAGS="-lintl /usr/openwin/lib/libXext.so" CONFIGURE_ENV = PKG_CONFIG_PATH=/opt/csw/X11/lib/pkgconfig post-extract-modulated: + @echo WORKSRC=$(WORKSRC) + @echo post-extract-modulated find $(WORKSRC) -type f | xargs -I _ /opt/csw/bin/dos2unix _ _ @$(MAKECOOKIE) +#post-extract: +# @echo WORKSRC=$(WORKSRC) +# @echo post-extract + TEST_SCRIPTS = include gar/category.mk Modified: csw/mgar/pkg/gtkwave/trunk/checksums =================================================================== --- csw/mgar/pkg/gtkwave/trunk/checksums 2010-01-17 17:32:30 UTC (rev 8046) +++ csw/mgar/pkg/gtkwave/trunk/checksums 2010-01-17 19:19:06 UTC (rev 8047) @@ -1 +1,2 @@ dcc427903a8f5e958c099f108958dce8 gtkwave-3.2.3.tar.gz +d61b452193329d7d7311c7f806d89c87 removing-stdint.h-include.patch Added: csw/mgar/pkg/gtkwave/trunk/files/removing-stdint.h-include.patch =================================================================== --- csw/mgar/pkg/gtkwave/trunk/files/removing-stdint.h-include.patch (rev 0) +++ csw/mgar/pkg/gtkwave/trunk/files/removing-stdint.h-include.patch 2010-01-17 19:19:06 UTC (rev 8047) @@ -0,0 +1,10 @@ +--- gtkwave-3.2.3-orig/src/debug.h 2010-01-17 19:44:25.000307971 +0100 ++++ gtkwave-3.2.3/src/debug.h 2010-01-17 19:46:01.519814776 +0100 +@@ -17,7 +17,6 @@ + + #ifndef _MSC_VER + #ifndef __MINGW32__ +-#include + #else + #include + #endif This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From trygvis at users.sourceforge.net Sun Jan 17 20:22:37 2010 From: trygvis at users.sourceforge.net (trygvis at users.sourceforge.net) Date: Sun, 17 Jan 2010 19:22:37 +0000 Subject: [csw-devel] SF.net SVN: gar:[8048] csw/mgar/pkg/gtkwave/trunk/checksums Message-ID: Revision: 8048 http://gar.svn.sourceforge.net/gar/?rev=8048&view=rev Author: trygvis Date: 2010-01-17 19:22:37 +0000 (Sun, 17 Jan 2010) Log Message: ----------- gtkwave: checksum... Modified Paths: -------------- csw/mgar/pkg/gtkwave/trunk/checksums Modified: csw/mgar/pkg/gtkwave/trunk/checksums =================================================================== --- csw/mgar/pkg/gtkwave/trunk/checksums 2010-01-17 19:19:06 UTC (rev 8047) +++ csw/mgar/pkg/gtkwave/trunk/checksums 2010-01-17 19:22:37 UTC (rev 8048) @@ -1,2 +1,2 @@ dcc427903a8f5e958c099f108958dce8 gtkwave-3.2.3.tar.gz -d61b452193329d7d7311c7f806d89c87 removing-stdint.h-include.patch +572e089ffbf926c940bb0fad3d1aac8a removing-stdint.h-include.patch This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Sun Jan 17 20:50:22 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Sun, 17 Jan 2010 19:50:22 +0000 Subject: [csw-devel] SF.net SVN: gar:[8049] csw/mgar/pkg Message-ID: Revision: 8049 http://gar.svn.sourceforge.net/gar/?rev=8049&view=rev Author: dmichelsen Date: 2010-01-17 19:50:12 +0000 (Sun, 17 Jan 2010) Log Message: ----------- file: Initial commit Added Paths: ----------- csw/mgar/pkg/file/ csw/mgar/pkg/file/branches/ csw/mgar/pkg/file/tags/ csw/mgar/pkg/file/trunk/ csw/mgar/pkg/file/trunk/Makefile csw/mgar/pkg/file/trunk/checksums csw/mgar/pkg/file/trunk/files/ Property changes on: csw/mgar/pkg/file/trunk ___________________________________________________________________ Added: svn:ignore + cookies download work Added: svn:externals + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 Added: csw/mgar/pkg/file/trunk/Makefile =================================================================== --- csw/mgar/pkg/file/trunk/Makefile (rev 0) +++ csw/mgar/pkg/file/trunk/Makefile 2010-01-17 19:50:12 UTC (rev 8049) @@ -0,0 +1,29 @@ +GARNAME = file +GARVERSION = 5.03 +CATEGORIES = utils + +DESCRIPTION = A file type guesser +define BLURB + The file command is "a file type guesser", that is, a command-line tool that + tells you in words what kind of data a file contains. Unlike most GUI systems, + command-line UNIX systems - with this program leading the charge - don't rely + on filename extentions to tell you the type of a file, but look at the file's + actual contents. This is, of course, more reliable, but requires a bit of I/O. +endef + +MASTER_SITES = ftp://ftp.astron.com/pub/file/ +DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz + +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + +SPKG_SOURCEURL = http://www.darwinsys.com/file/ + +CONFIGURE_ARGS = $(DIRPATHS) + +# These flags are not understood by Sun Studio +CONFIGURE_ARGS += --disable-warnings + +TEST_TARGET = check + +include gar/category.mk Added: csw/mgar/pkg/file/trunk/checksums =================================================================== --- csw/mgar/pkg/file/trunk/checksums (rev 0) +++ csw/mgar/pkg/file/trunk/checksums 2010-01-17 19:50:12 UTC (rev 8049) @@ -0,0 +1 @@ +d05f08a53e5c2f51f8ee6a4758c0cc53 file-5.03.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Sun Jan 17 21:11:55 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sun, 17 Jan 2010 20:11:55 +0000 Subject: [csw-devel] SF.net SVN: gar:[8050] csw/mgar/gar/v2/bin/checkpkg.d/checkpkg_test.py Message-ID: Revision: 8050 http://gar.svn.sourceforge.net/gar/?rev=8050&view=rev Author: wahwah Date: 2010-01-17 20:11:53 +0000 (Sun, 17 Jan 2010) Log Message: ----------- mGAR v2: checkpkg, fix for one unit test, two more to go Modified Paths: -------------- csw/mgar/gar/v2/bin/checkpkg.d/checkpkg_test.py Modified: csw/mgar/gar/v2/bin/checkpkg.d/checkpkg_test.py =================================================================== --- csw/mgar/gar/v2/bin/checkpkg.d/checkpkg_test.py 2010-01-17 19:50:12 UTC (rev 8049) +++ csw/mgar/gar/v2/bin/checkpkg.d/checkpkg_test.py 2010-01-17 20:11:53 UTC (rev 8050) @@ -450,13 +450,10 @@ def testGetLinesBySoname_8(self): expected = {'foo.so.1': '/opt/csw/postgresql/lib/foo.so.1 foo'} + lines1 = {"/opt/csw/postgresql/lib": "/opt/csw/postgresql/lib/foo.so.1 foo"} pkgmap = self.pkgmap_mocker.CreateMock(checkpkg.SystemPkgmap) - pkgmap.GetPkgmapLineByBasename("foo") - lines1 = {"/opt/csw/lib/postgresql": "/opt/csw/lib/postgresql/foo.so.1 foo"} pkgmap.GetPkgmapLineByBasename("foo.so.1").AndReturn(lines1) - pkgmap.GetPkgmapLineByBasename("foo.so.1").AndReturn(lines1) self.pkgmap_mocker.ReplayAll() - pkgmap.GetPkgmapLineByBasename("foo") needed_sonames = set(["foo.so.1"]) runpath_by_needed_soname = {"foo.so.1": ["/opt/csw/postgresql/lib/", "/usr/lib"]} isalist = ["isa-value-1", "isa-value-2"] This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Sun Jan 17 21:22:11 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Sun, 17 Jan 2010 20:22:11 +0000 Subject: [csw-devel] SF.net SVN: gar:[8051] csw/mgar/pkg/file/trunk/Makefile Message-ID: Revision: 8051 http://gar.svn.sourceforge.net/gar/?rev=8051&view=rev Author: dmichelsen Date: 2010-01-17 20:22:01 +0000 (Sun, 17 Jan 2010) Log Message: ----------- file: Minor fixes Modified Paths: -------------- csw/mgar/pkg/file/trunk/Makefile Modified: csw/mgar/pkg/file/trunk/Makefile =================================================================== --- csw/mgar/pkg/file/trunk/Makefile 2010-01-17 20:11:53 UTC (rev 8050) +++ csw/mgar/pkg/file/trunk/Makefile 2010-01-17 20:22:01 UTC (rev 8051) @@ -19,6 +19,8 @@ SPKG_SOURCEURL = http://www.darwinsys.com/file/ +REQUIRED_PKGS = CSWzlib + CONFIGURE_ARGS = $(DIRPATHS) # These flags are not understood by Sun Studio @@ -26,4 +28,9 @@ TEST_TARGET = check +# The "file" util is used during stripbin. As the newly build binary +# requires libmagic which is not installed yet we must not use the +# newly built "file". +IGNORE_DESTDIR = 1 + include gar/category.mk This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Sun Jan 17 22:19:32 2010 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Sun, 17 Jan 2010 21:19:32 +0000 Subject: [csw-devel] SF.net SVN: gar:[8052] csw/mgar/pkg/logwatch/trunk Message-ID: Revision: 8052 http://gar.svn.sourceforge.net/gar/?rev=8052&view=rev Author: bdwalton Date: 2010-01-17 21:19:32 +0000 (Sun, 17 Jan 2010) Log Message: ----------- logwatch: add patch to correct paths in manpage Modified Paths: -------------- csw/mgar/pkg/logwatch/trunk/Makefile csw/mgar/pkg/logwatch/trunk/checksums Added Paths: ----------- csw/mgar/pkg/logwatch/trunk/files/fix-manpage-paths.patch Modified: csw/mgar/pkg/logwatch/trunk/Makefile =================================================================== --- csw/mgar/pkg/logwatch/trunk/Makefile 2010-01-17 20:22:01 UTC (rev 8051) +++ csw/mgar/pkg/logwatch/trunk/Makefile 2010-01-17 21:19:32 UTC (rev 8052) @@ -14,6 +14,7 @@ MASTER_SITES = ftp://ftp.kaybee.org/pub/linux/ DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz +PATCHFILES = fix-manpage-paths.patch # We define upstream file regex so we can be notifed of new upstream # software release Modified: csw/mgar/pkg/logwatch/trunk/checksums =================================================================== --- csw/mgar/pkg/logwatch/trunk/checksums 2010-01-17 20:22:01 UTC (rev 8051) +++ csw/mgar/pkg/logwatch/trunk/checksums 2010-01-17 21:19:32 UTC (rev 8052) @@ -1 +1,2 @@ +b3ce78d9ef4de268826de3d03d2d5e81 fix-manpage-paths.patch 937d982006b2a76a83edfcfd2e5a9d7d logwatch-7.3.6.tar.gz Added: csw/mgar/pkg/logwatch/trunk/files/fix-manpage-paths.patch =================================================================== --- csw/mgar/pkg/logwatch/trunk/files/fix-manpage-paths.patch (rev 0) +++ csw/mgar/pkg/logwatch/trunk/files/fix-manpage-paths.patch 2010-01-17 21:19:32 UTC (rev 8052) @@ -0,0 +1,27 @@ +diff -u -r logwatch-7.3.6.orig/logwatch.8 logwatch-7.3.6/logwatch.8 +--- logwatch-7.3.6.orig/logwatch.8 2010-01-17 22:15:53.115085073 +0100 ++++ logwatch-7.3.6/logwatch.8 2010-01-17 22:17:10.483671625 +0100 +@@ -105,12 +105,12 @@ + .IP "\fB--help\fR" + same as --usage. + .SH FILES +-.IP /usr/share/logwatch/ ++.IP /opt/csw/share/logwatch/ + .RS + This directory contains all the perl executables and + configuration files shipped with the logwatch distribution. + .RE +-.IP /etc/logwatch ++.IP /etc/opt/csw/logwatch + .RS + This directory contains local configuration files that override + the default configuration. See \fBMORE INFORMATION\fR below for more +@@ -127,7 +127,7 @@ + This will print out login information for the previous day... + .RE + .SH MORE INFORMATION +-The directory /usr/share/doc/logwatch-* contains several files with additional ++The directory /opt/csw//share/doc/logwatch contains several files with additional + documentation: + .RE + .I HOWTO-Customize-LogWatch This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Sun Jan 17 22:21:48 2010 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Sun, 17 Jan 2010 21:21:48 +0000 Subject: [csw-devel] SF.net SVN: gar:[8053] csw/mgar/pkg/logwatch/trunk/Makefile Message-ID: Revision: 8053 http://gar.svn.sourceforge.net/gar/?rev=8053&view=rev Author: bdwalton Date: 2010-01-17 21:21:48 +0000 (Sun, 17 Jan 2010) Log Message: ----------- logwatch: correct path of classutils crontab file Modified Paths: -------------- csw/mgar/pkg/logwatch/trunk/Makefile Modified: csw/mgar/pkg/logwatch/trunk/Makefile =================================================================== --- csw/mgar/pkg/logwatch/trunk/Makefile 2010-01-17 21:19:32 UTC (rev 8052) +++ csw/mgar/pkg/logwatch/trunk/Makefile 2010-01-17 21:21:48 UTC (rev 8053) @@ -34,7 +34,7 @@ include gar/category.mk sysconfdir = /etc/opt/csw -CRONDIR = $(sysconfdir)/CSW$(GARNAME)/crontabs +CRONDIR = $(sysconfdir)/pkg/CSW$(GARNAME)/crontabs CRONTABS = $(CRONDIR)/root INSTALL = /opt/csw/bin/ginstall This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From trygvis at users.sourceforge.net Sun Jan 17 22:24:00 2010 From: trygvis at users.sourceforge.net (trygvis at users.sourceforge.net) Date: Sun, 17 Jan 2010 21:24:00 +0000 Subject: [csw-devel] SF.net SVN: gar:[8054] csw/mgar/pkg/freehdl/trunk Message-ID: Revision: 8054 http://gar.svn.sourceforge.net/gar/?rev=8054&view=rev Author: trygvis Date: 2010-01-17 21:24:00 +0000 (Sun, 17 Jan 2010) Log Message: ----------- freehdl: wip. Modified Paths: -------------- csw/mgar/pkg/freehdl/trunk/Makefile csw/mgar/pkg/freehdl/trunk/checksums csw/mgar/pkg/freehdl/trunk/files/0001-Use-OpenCSW-pkg-config.patch Added Paths: ----------- csw/mgar/pkg/freehdl/trunk/files/fix_seg_fault_2-1.patch Modified: csw/mgar/pkg/freehdl/trunk/Makefile =================================================================== --- csw/mgar/pkg/freehdl/trunk/Makefile 2010-01-17 21:21:48 UTC (rev 8053) +++ csw/mgar/pkg/freehdl/trunk/Makefile 2010-01-17 21:24:00 UTC (rev 8054) @@ -1,3 +1,6 @@ +# +# TODO: Consider adding this patch: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=549484 + GARNAME = freehdl GARVERSION = 0.0.7 CATEGORIES = devel @@ -2,3 +5,3 @@ -DESCRIPTION = A project to develop a free, open source, GPL'ed VHDL simulator for Linux! +DESCRIPTION = A free, open source, GPL'ed VHDL simulator define BLURB @@ -16,6 +19,7 @@ DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz PATCHFILES = 0000-Mirring-strings.h-include.patch PATCHFILES += 0001-Use-OpenCSW-pkg-config.patch +PATCHFILES += fix_seg_fault_2-1.patch # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz @@ -26,11 +30,17 @@ GARCOMPILER = GNU -CONFIGURE_ARGS = $(DIRPATHS) +#GARFLAVOR = DBG +CONFIGURE_ARGS = $(DIRPATHS) +CONFIGURE_ARGS += $(CONFIGURE_ARGS_$(GARFLAVOR)) +CONFIGURE_ARGS_DBG = --enable-trace --enable-warnings TEST_SCRIPTS = -REQUIRED_PKGS = CSWgcc4corert CSWgcc4g++ CSWgcc4g++rt CSWpkgconfig +REQUIRED_PKGS = CSWlibtool CSWgcc4corert CSWgcc4g++ CSWgcc4g++rt CSWpkgconfig #CSWgcc3core CSWgcc3corert CSWgcc3g++ CSWgcc3g++rt include gar/category.mk + +# We want the .la files, freehdl is based around those +MERGE_EXCLUDE_LIBTOOL = Modified: csw/mgar/pkg/freehdl/trunk/checksums =================================================================== --- csw/mgar/pkg/freehdl/trunk/checksums 2010-01-17 21:21:48 UTC (rev 8053) +++ csw/mgar/pkg/freehdl/trunk/checksums 2010-01-17 21:24:00 UTC (rev 8054) @@ -1,3 +1,4 @@ 75dd38573b84d23a93a10c028051305d 0000-Mirring-strings.h-include.patch -2950515cac5a87c43c97b264195ff5f7 0001-Use-OpenCSW-pkg-config.patch +6a6e16025feda49ecfc4b5b22e0ad70d 0001-Use-OpenCSW-pkg-config.patch +4193d606cf4445811e78a79865d9485e fix_seg_fault_2-1.patch 6d702aa188fb2c62f8cfca5a2f66d956 freehdl-0.0.7.tar.gz Modified: csw/mgar/pkg/freehdl/trunk/files/0001-Use-OpenCSW-pkg-config.patch =================================================================== --- csw/mgar/pkg/freehdl/trunk/files/0001-Use-OpenCSW-pkg-config.patch 2010-01-17 21:21:48 UTC (rev 8053) +++ csw/mgar/pkg/freehdl/trunk/files/0001-Use-OpenCSW-pkg-config.patch 2010-01-17 21:24:00 UTC (rev 8054) @@ -19,7 +19,7 @@ +version=`/opt/csw/bin/pkg-config --modversion freehdl` +cxxflags=`/opt/csw/bin/pkg-config --variable cxxflags freehdl` +cxx=`/opt/csw/bin/pkg-config --variable cxx freehdl` -+linker=`/opt/csw/bin/pkg-config --variable libtool freehdl` ++linker=/opt/csw/bin/libtool case "$option" in Added: csw/mgar/pkg/freehdl/trunk/files/fix_seg_fault_2-1.patch =================================================================== --- csw/mgar/pkg/freehdl/trunk/files/fix_seg_fault_2-1.patch (rev 0) +++ csw/mgar/pkg/freehdl/trunk/files/fix_seg_fault_2-1.patch 2010-01-17 21:24:00 UTC (rev 8054) @@ -0,0 +1,39 @@ +diff -rupN freehdl-0.0.6.old/v2cc/v2cc-decl.cc freehdl-0.0.6/v2cc/v2cc-decl.cc +--- freehdl-0.0.6.old/v2cc/v2cc-decl.cc 2007-10-23 22:14:26.000000000 +0200 ++++ freehdl-0.0.6/v2cc/v2cc-decl.cc 2009-10-04 12:41:50.000000000 +0200 +@@ -865,7 +865,8 @@ m_emit_hdr (pIIR_ArchitectureDeclaration + emit_decls (extended_declarations(a), str, rstack, 2); // emit signal decls + str += "};\n"; + +- emit_hdr(a->architecture_statement_part, str, rstack, 2); // emit process hdrs ++ if (a->architecture_statement_part != NULL) ++ emit_hdr(a->architecture_statement_part, str, rstack, 2); // emit process hdrs + } + + void // ConcStat headers +diff -rupN freehdl-0.0.6.old/v2cc/v2cc-explore.cc freehdl-0.0.6/v2cc/v2cc-explore.cc +--- freehdl-0.0.6.old/v2cc/v2cc-explore.cc 2008-02-15 19:12:30.000000000 +0100 ++++ freehdl-0.0.6/v2cc/v2cc-explore.cc 2009-10-04 12:28:28.000000000 +0200 +@@ -1108,7 +1108,8 @@ m_explore_and_check (pIIR_ArchitectureDe + } + + // Explore concurrent statements of entity +- error_count += explore_and_check(a->architecture_statement_part, rstack, collect_access_info); ++ if(a->architecture_statement_part != NULL) ++ error_count += explore_and_check(a->architecture_statement_part, rstack, collect_access_info); + + // Collect all external declarations into + merge (external_decls_list, a->external_decls, rstack); +diff -rupN freehdl-0.0.6.old/v2cc/v2cc-impl.cc freehdl-0.0.6/v2cc/v2cc-impl.cc +--- freehdl-0.0.6.old/v2cc/v2cc-impl.cc 2007-10-23 22:23:22.000000000 +0200 ++++ freehdl-0.0.6/v2cc/v2cc-impl.cc 2009-10-04 12:39:48.000000000 +0200 +@@ -1134,7 +1134,8 @@ emit_handle (pIIR_ArchitectureDeclaratio + void + m_emit_impl (pIIR_ArchitectureDeclaration a, string &str, RegionStack &rstack, int l) + { +- emit_impl (a->architecture_statement_part, str, rstack, 2); // process impls ++ if (a->architecture_statement_part != NULL) ++ emit_impl (a->architecture_statement_part, str, rstack, 2); // process impls + emit_handle (a, str, rstack); // handle for sim + emit_constructor(a, str, rstack); // arch constructor + } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Sun Jan 17 22:35:59 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Sun, 17 Jan 2010 21:35:59 +0000 Subject: [csw-devel] SF.net SVN: gar:[8055] csw/mgar/gar/v2/gar.lib.mk Message-ID: Revision: 8055 http://gar.svn.sourceforge.net/gar/?rev=8055&view=rev Author: dmichelsen Date: 2010-01-17 21:35:59 +0000 (Sun, 17 Jan 2010) Log Message: ----------- mGAR v2: Introduce variable overriding for Make destinations similar to install Modified Paths: -------------- csw/mgar/gar/v2/gar.lib.mk Modified: csw/mgar/gar/v2/gar.lib.mk =================================================================== --- csw/mgar/gar/v2/gar.lib.mk 2010-01-17 21:24:00 UTC (rev 8054) +++ csw/mgar/gar/v2/gar.lib.mk 2010-01-17 21:35:59 UTC (rev 8055) @@ -509,17 +509,17 @@ # build from a standard gnu-style makefile's default rule. build-%/Makefile: @echo " ==> Running make in $*" - @$(BUILD_ENV) $(MAKE) $(PARALLELMFLAGS) $(foreach TTT,$(BUILD_OVERRIDE_DIRS),$(TTT)="$($(TTT))") -C $* $(BUILD_ARGS) + @$(BUILD_ENV) $(MAKE) $(PARALLELMFLAGS) $(foreach TTT,$(BUILD_OVERRIDE_VARS),$(TTT)="$(BUILD_OVERRIDE_VAR_$(TTT))") $(foreach TTT,$(BUILD_OVERRIDE_DIRS),$(TTT)="$($(TTT))") -C $* $(BUILD_ARGS) @$(MAKECOOKIE) build-%/makefile: @echo " ==> Running make in $*" - @$(BUILD_ENV) $(MAKE) $(PARALLELMFLAGS) $(foreach TTT,$(BUILD_OVERRIDE_DIRS),$(TTT)="$($(TTT))") -C $* $(BUILD_ARGS) + @$(BUILD_ENV) $(MAKE) $(PARALLELMFLAGS) $(foreach TTT,$(BUILD_OVERRIDE_VARS),$(TTT)="$(BUILD_OVERRIDE_VAR_$(TTT))") $(foreach TTT,$(BUILD_OVERRIDE_DIRS),$(TTT)="$($(TTT))") -C $* $(BUILD_ARGS) @$(MAKECOOKIE) build-%/GNUmakefile: @echo " ==> Running make in $*" - @$(BUILD_ENV) $(MAKE) $(PARALLELMFLAGS) $(foreach TTT,$(BUILD_OVERRIDE_DIRS),$(TTT)="$($(TTT))") -C $* $(BUILD_ARGS) + @$(BUILD_ENV) $(MAKE) $(PARALLELMFLAGS) $(foreach TTT,$(BUILD_OVERRIDE_VARS),$(TTT)="$(BUILD_OVERRIDE_VAR_$(TTT))") $(foreach TTT,$(BUILD_OVERRIDE_DIRS),$(TTT)="$($(TTT))") -C $* $(BUILD_ARGS) @$(MAKECOOKIE) build-%/Jamfile: @@ -564,17 +564,17 @@ # Run tests on pre-built sources test-%/Makefile: @echo " ==> Running make $(TEST_TARGET) in $*" - @$(TEST_ENV) $(MAKE) $(foreach TTT,$(TEST_OVERRIDE_DIRS),$(TTT)="$($(TTT))") -C $* $(TEST_ARGS) $(TEST_TARGET) + @$(TEST_ENV) $(MAKE) $(foreach TTT,$(foreach TTT,$(TEST_OVERRIDE_VARS),$(TTT)="$(TEST_OVERRIDE_VAR_$(TTT))") $(TEST_OVERRIDE_DIRS),$(TTT)="$($(TTT))") -C $* $(TEST_ARGS) $(TEST_TARGET) @$(MAKECOOKIE) test-%/makefile: @echo " ==> Running make $(TEST_TARGET) in $*" - @$(TEST_ENV) $(MAKE) $(foreach TTT,$(TEST_OVERRIDE_DIRS),$(TTT)="$($(TTT))") -C $* $(TEST_ARGS) $(TEST_TARGET) + @$(TEST_ENV) $(MAKE) $(foreach TTT,$(foreach TTT,$(TEST_OVERRIDE_VARS),$(TTT)="$(TEST_OVERRIDE_VAR_$(TTT))") $(TEST_OVERRIDE_DIRS),$(TTT)="$($(TTT))") -C $* $(TEST_ARGS) $(TEST_TARGET) @$(MAKECOOKIE) test-%/GNUmakefile: @echo " ==> Running make $(TEST_TARGET) in $*" - @$(TEST_ENV) $(MAKE) $(foreach TTT,$(TEST_OVERRIDE_DIRS),$(TTT)="$($(TTT))") -C $* $(TEST_ARGS) $(TEST_TARGET) + @$(TEST_ENV) $(MAKE) $(foreach TTT,$(TEST_OVERRIDE_VARS),$(TTT)="$(TEST_OVERRIDE_VAR_$(TTT))") $(foreach TTT,$(TEST_OVERRIDE_DIRS),$(TTT)="$($(TTT))") -C $* $(TEST_ARGS) $(TEST_TARGET) @$(MAKECOOKIE) # Ruby makefiles This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Sun Jan 17 23:00:16 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Sun, 17 Jan 2010 22:00:16 +0000 Subject: [csw-devel] SF.net SVN: gar:[8057] csw/mgar/pkg Message-ID: Revision: 8057 http://gar.svn.sourceforge.net/gar/?rev=8057&view=rev Author: dmichelsen Date: 2010-01-17 22:00:16 +0000 (Sun, 17 Jan 2010) Log Message: ----------- oniguruma: Initial commit Added Paths: ----------- csw/mgar/pkg/oniguruma/ csw/mgar/pkg/oniguruma/branches/ csw/mgar/pkg/oniguruma/tags/ csw/mgar/pkg/oniguruma/trunk/ csw/mgar/pkg/oniguruma/trunk/Makefile csw/mgar/pkg/oniguruma/trunk/checksums csw/mgar/pkg/oniguruma/trunk/files/ Property changes on: csw/mgar/pkg/oniguruma/trunk ___________________________________________________________________ Added: svn:ignore + cookies download work Added: svn:externals + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 Added: csw/mgar/pkg/oniguruma/trunk/Makefile =================================================================== --- csw/mgar/pkg/oniguruma/trunk/Makefile (rev 0) +++ csw/mgar/pkg/oniguruma/trunk/Makefile 2010-01-17 22:00:16 UTC (rev 8057) @@ -0,0 +1,25 @@ +GARNAME = oniguruma +GARVERSION = 5.9.2 +CATEGORIES = lib + +DESCRIPTION = A regular expression library +define BLURB + Oniguruma is a regular expressions library. + The characteristics of this library is that different character encoding + for every regular expression object can be specified. + (supported APIs: GNU regex, POSIX and Oniguruma native) +endef + +MASTER_SITES = http://www.geocities.jp/kosako3/oniguruma/archive/ +DISTNAME = onig-$(GARVERSION) +DISTFILES = $(DISTNAME).tar.gz + +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + +BUILD64 = 1 +CONFIGURE_ARGS = $(DIRPATHS) + +TEST_TARGET = check + +include gar/category.mk Added: csw/mgar/pkg/oniguruma/trunk/checksums =================================================================== --- csw/mgar/pkg/oniguruma/trunk/checksums (rev 0) +++ csw/mgar/pkg/oniguruma/trunk/checksums 2010-01-17 22:00:16 UTC (rev 8057) @@ -0,0 +1 @@ +0f4ad1b100a5f9a91623e04111707b84 onig-5.9.2.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Sun Jan 17 22:50:51 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Sun, 17 Jan 2010 21:50:51 +0000 Subject: [csw-devel] SF.net SVN: gar:[8056] csw/mgar/pkg/slang/trunk/Makefile Message-ID: Revision: 8056 http://gar.svn.sourceforge.net/gar/?rev=8056&view=rev Author: dmichelsen Date: 2010-01-17 21:50:50 +0000 (Sun, 17 Jan 2010) Log Message: ----------- slang: Do not build legacy 1.4.9 in 64 bit and make sure CFLAGS are passed correctly Modified Paths: -------------- csw/mgar/pkg/slang/trunk/Makefile Modified: csw/mgar/pkg/slang/trunk/Makefile =================================================================== --- csw/mgar/pkg/slang/trunk/Makefile 2010-01-17 21:35:59 UTC (rev 8055) +++ csw/mgar/pkg/slang/trunk/Makefile 2010-01-17 21:50:50 UTC (rev 8056) @@ -5,6 +5,10 @@ EXTRA_MODULATORS = GARVERSION MODULATIONS_GARVERSION = 1.4.9 2.2.2 +# The old package didn't contain 64 bit, so don't bother building it for compat +SKIP_MODULATIONS = isa-sparcv9-garversion-1.4.9 +SKIP_MODULATIONS += isa-amd64-garversion-1.4.9 + DESCRIPTION = Library primarily to provide an alternative to libcurses define BLURB endef @@ -38,6 +42,13 @@ INSTALL_ARGS_GARVERSION-1.4.9 = install-elf install-links INSTALL_ARGS = $(INSTALL_ARGS_GARVERSION-$(GARVERSION)) +BUILD_ARGS_GARVERSION-1.4.9 = elf +BUILD_ARGS = $(BUILD_ARGS_GARVERSION-$(GARVERSION)) + +BUILD_OVERRIDE_VARS_GARVERSION-1.4.9 = ELF_CFLAGS +BUILD_OVERRIDE_VARS = $(BUILD_OVERRIDE_VARS_GARVERSION-$(GARVERSION)) +BUILD_OVERRIDE_VAR_ELF_CFLAGS = -K pic $(CFLAGS) + MERGE_SCRIPTS_isa-default-garversion-1.4.9 = copy-only MERGE_DIRS_isa-default-garversion-1.4.9 = $(libdir) MERGE_SCRIPTS_isa-default64-garversion-1.4.9 = copy-relocated-only This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Sun Jan 17 23:11:27 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Sun, 17 Jan 2010 22:11:27 +0000 Subject: [csw-devel] SF.net SVN: gar:[8058] csw/mgar/pkg/oniguruma/trunk/Makefile Message-ID: Revision: 8058 http://gar.svn.sourceforge.net/gar/?rev=8058&view=rev Author: dmichelsen Date: 2010-01-17 22:11:26 +0000 (Sun, 17 Jan 2010) Log Message: ----------- oniguruma: Add SOURCEURL Modified Paths: -------------- csw/mgar/pkg/oniguruma/trunk/Makefile Modified: csw/mgar/pkg/oniguruma/trunk/Makefile =================================================================== --- csw/mgar/pkg/oniguruma/trunk/Makefile 2010-01-17 22:00:16 UTC (rev 8057) +++ csw/mgar/pkg/oniguruma/trunk/Makefile 2010-01-17 22:11:26 UTC (rev 8058) @@ -17,6 +17,8 @@ # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz +SPKG_SOURCEURL = http://www.geocities.jp/kosako3/oniguruma/ + BUILD64 = 1 CONFIGURE_ARGS = $(DIRPATHS) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From skayser at users.sourceforge.net Sun Jan 17 23:42:37 2010 From: skayser at users.sourceforge.net (skayser at users.sourceforge.net) Date: Sun, 17 Jan 2010 22:42:37 +0000 Subject: [csw-devel] SF.net SVN: gar:[8059] csw/mgar/pkg/subversion/trunk Message-ID: Revision: 8059 http://gar.svn.sourceforge.net/gar/?rev=8059&view=rev Author: skayser Date: 2010-01-17 22:42:37 +0000 (Sun, 17 Jan 2010) Log Message: ----------- subversion: dropped explicit LDFLAGS in favor of EXTRA_LIB and EXTRA_LINKER_FLAGS, added $ISALIST, updated changelog.CSW Modified Paths: -------------- csw/mgar/pkg/subversion/trunk/Makefile csw/mgar/pkg/subversion/trunk/files/changelog.CSW Modified: csw/mgar/pkg/subversion/trunk/Makefile =================================================================== --- csw/mgar/pkg/subversion/trunk/Makefile 2010-01-17 22:11:26 UTC (rev 8058) +++ csw/mgar/pkg/subversion/trunk/Makefile 2010-01-17 22:42:37 UTC (rev 8059) @@ -7,6 +7,13 @@ # list, but they also link against the main libsvn_client-1.so which in # turn pulls in the rest. Can this be tweaked? # +# Known build issues/facts: +# +# * Build takes about 50 mins on build8x/build8s +# * checkpkg suggests CSWbdb over CSWbdb47, because it picks up the +# libdb-4.7.so symlink in $(libdir) which belongs to the stub CSWbdb. As +# the lib itself belongs to CSWbdb47, the CSWbdb47 dep is completely fine. +# GARNAME = subversion GARVERSION = 1.6.6 CATEGORIES = utils @@ -116,19 +123,22 @@ PATCHFILES += subversion161.diff PATCHFILES += 0001-make-subversion-sysconfigdir-as-it-should-be-for-csw.patch -EXTRA_LIB = $(SVNLIB) $(prefix)/apache2/lib -EXTRA_INC = $(prefix)/apache2/include +SVNLIB = $(prefix)/lib/svn +JDK = /usr/jdk1.5.0_15 -JDK = /usr/jdk1.5.0_15 -EXTRA_INC += $(JDK)/include -SVNLIB = $(prefix)/lib/svn +EXTRA_INC = $(JDK)/include +EXTRA_INC += $(prefix)/apache2/include -NOISALIST = 1 -LDFLAGS = -R/opt/csw/lib -L/opt/csw/lib -R/opt/csw/apache2/lib -LDFLAGS += -L/opt/csw/apache2/lib -L$(SVNLIB) -lintl -liconv -LDFLAGS += -R/opt/csw/bdb47/lib -L/opt/csw/bdb47/lib -export LDFLAGS +EXTRA_LIB = /opt/csw/bdb47/lib +EXTRA_LIB += /opt/csw/apache2/lib +EXTRA_LIB += $(SVNLIB) +EXTRA_LINKER_FLAGS = -lintl -liconv +# Only add $ISALIST to dirs which ship optimized versions (done by explicitly +# excluding those lib dirs which are known not to ship optimized versions). +RUNPATH_ISALIST = $(libdir) +RUNPATH_ISALIST += $(filter-out /opt/csw/apache2/lib $(SVNLIB),$(EXTRA_LIB)) + EXTRA_MERGE_EXCLUDE_FILES += .*\.pyo .*\.pyc PROTOTYPE_MODIFIERS += cswpycompile PROTOTYPE_FILES_cswpycompile = $(libdir)/python/.*\.py Modified: csw/mgar/pkg/subversion/trunk/files/changelog.CSW =================================================================== --- csw/mgar/pkg/subversion/trunk/files/changelog.CSW 2010-01-17 22:11:26 UTC (rev 8058) +++ csw/mgar/pkg/subversion/trunk/files/changelog.CSW 2010-01-17 22:42:37 UTC (rev 8059) @@ -5,5 +5,6 @@ * Dropped openssl_rt dependency (neon with SSL support is built separately). * Dropped kerberos dependency (neon comes with Kerberos support). * Dropped libnet dependency (not required). + * Re-ordered RUNPATH and introduced $ISALIB for /opt/csw/lib/, /opt/csw/bdb47. -- Sebastian Kayser Sun, 17 Jan 2010 02:39:59 +0100 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Mon Jan 18 00:12:00 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sun, 17 Jan 2010 23:12:00 +0000 Subject: [csw-devel] SF.net SVN: gar:[8060] csw/mgar/gar/v2/bin/checkpkg.d/checkpkg.py Message-ID: Revision: 8060 http://gar.svn.sourceforge.net/gar/?rev=8060&view=rev Author: wahwah Date: 2010-01-17 23:12:00 +0000 (Sun, 17 Jan 2010) Log Message: ----------- mGAR v2: checkpkg, recognizing .pm files as Perl Modified Paths: -------------- csw/mgar/gar/v2/bin/checkpkg.d/checkpkg.py Modified: csw/mgar/gar/v2/bin/checkpkg.d/checkpkg.py =================================================================== --- csw/mgar/gar/v2/bin/checkpkg.d/checkpkg.py 2010-01-17 22:42:37 UTC (rev 8059) +++ csw/mgar/gar/v2/bin/checkpkg.d/checkpkg.py 2010-01-17 23:12:00 UTC (rev 8060) @@ -28,6 +28,12 @@ # This shared library is present on Solaris 10 on amd64, but it's missing on # Solaris 8 on i386. It's okay if it's missing. ALLOWED_ORPHAN_SONAMES = set([u"libm.so.2"]) +DEPENDENCY_FILENAME_REGEXES = ( + (r".*\.pl", u"CSWperl"), + (r".*\.pm", u"CSWperl"), + (r".*\.py", u"CSWpython"), + (r".*\.rb", u"CSWruby"), +) REPORT_TMPL = u"""$pkgname: #if $missing_deps @@ -337,12 +343,7 @@ def GuessDepsByFilename(pkgname, pkg_by_any_filename): """Guesses dependencies based on filename regexes.""" guessed_deps = set() - patterns = ( - (r".*\.py", u"CSWpython"), - (r".*\.pl", u"CSWperl"), - (r".*\.rb", u"CSWruby"), - ) - for pattern, dep_pkgname in patterns: + for pattern, dep_pkgname in DEPENDENCY_FILENAME_REGEXES: # If any file name matches, add the dep, go to the next pattern/pkg # combination. pattern_re = re.compile("^%s$" % pattern) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Mon Jan 18 08:49:09 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Mon, 18 Jan 2010 07:49:09 +0000 Subject: [csw-devel] SF.net SVN: gar:[8061] csw/mgar/pkg/subversion Message-ID: Revision: 8061 http://gar.svn.sourceforge.net/gar/?rev=8061&view=rev Author: dmichelsen Date: 2010-01-18 07:49:09 +0000 (Mon, 18 Jan 2010) Log Message: ----------- subversion: Move legacy build to tags/ Added Paths: ----------- csw/mgar/pkg/subversion/tags/legacy/ Removed Paths: ------------- csw/mgar/pkg/subversion/trunk/legacy/ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Mon Jan 18 08:50:23 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Mon, 18 Jan 2010 07:50:23 +0000 Subject: [csw-devel] SF.net SVN: gar:[8062] csw/mgar/pkg/bashdb/trunk Message-ID: Revision: 8062 http://gar.svn.sourceforge.net/gar/?rev=8062&view=rev Author: dmichelsen Date: 2010-01-18 07:50:23 +0000 (Mon, 18 Jan 2010) Log Message: ----------- bashdb: Commit patched form upstream Modified Paths: -------------- csw/mgar/pkg/bashdb/trunk/Makefile csw/mgar/pkg/bashdb/trunk/checksums Added Paths: ----------- csw/mgar/pkg/bashdb/trunk/files/0001-sf-Piwik-analytics.patch csw/mgar/pkg/bashdb/trunk/files/0002-Tolerance-for-Solaris-and-older-sed-sh-and-whatnot.patch csw/mgar/pkg/bashdb/trunk/files/0003-Tolerance-for-Solaris-and-older-sed-sh-and-whatnot.patch csw/mgar/pkg/bashdb/trunk/files/0004-Looks-like-sig-line-fixes-back-ported-to-bash-4.0.-N.patch csw/mgar/pkg/bashdb/trunk/files/0005-Administrivia.patch csw/mgar/pkg/bashdb/trunk/files/0006-sig-SunOS.right-is-same-as-sig-41.right.patch Modified: csw/mgar/pkg/bashdb/trunk/Makefile =================================================================== --- csw/mgar/pkg/bashdb/trunk/Makefile 2010-01-18 07:49:09 UTC (rev 8061) +++ csw/mgar/pkg/bashdb/trunk/Makefile 2010-01-18 07:50:23 UTC (rev 8062) @@ -1,5 +1,5 @@ GARNAME = bashdb -GARVERSION = 0_gitcurrent +GARVERSION = 4.0-0.4 # PATCHLEVEL = 75eadce CATEGORIES = utils @@ -9,14 +9,22 @@ endef # MASTER_SITES = http://cloud.github.com/downloads/rocky/bashdb/ -GIT_REPOS = git://bashdb.git.sourceforge.net/gitroot/bashdb/bashdb -GIT_USE_PROXY = 1 +# GIT_REPOS = git://bashdb.git.sourceforge.net/gitroot/bashdb/bashdb/ +# GIT_USE_PROXY = 1 # GIT_TREEISH_zshdb.git = $(PATCHLEVEL) -# DISTFILES = $(DISTNAME).tar.gz +MASTER_SITES = $(SF_MIRRORS) +DISTFILES = $(DISTNAME).tar.bz2 +# PATCHFILES = $(notdir $(wildcard $(FILEDIR)/*.patch)) +# PATCHFILES = 0001-sf-Piwik-analytics.patch +PATCHFILES += 0002-Tolerance-for-Solaris-and-older-sed-sh-and-whatnot.patch +PATCHFILES += 0003-Tolerance-for-Solaris-and-older-sed-sh-and-whatnot.patch +PATCHFILES += 0004-Looks-like-sig-line-fixes-back-ported-to-bash-4.0.-N.patch +# PATCHFILES += 0005-Administrivia.patch +PATCHFILES += 0006-sig-SunOS.right-is-same-as-sig-41.right.patch # We define upstream file regex so we can be notifed of new upstream software release -UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.bz2 REQUIRED_PKGS = CSWbash @@ -28,6 +36,6 @@ include gar/category.mk -post-extract-isa-sparcv8: - cd $(WORKSRC) && ./autogen.sh --with-bash=/opt/csw/bin/bash - @$(MAKECOOKIE) +#post-extract-isa-sparcv8: +# cd $(WORKSRC) && ./autogen.sh --with-bash=/opt/csw/bin/bash +# @$(MAKECOOKIE) Modified: csw/mgar/pkg/bashdb/trunk/checksums =================================================================== --- csw/mgar/pkg/bashdb/trunk/checksums 2010-01-18 07:49:09 UTC (rev 8061) +++ csw/mgar/pkg/bashdb/trunk/checksums 2010-01-18 07:50:23 UTC (rev 8062) @@ -1 +1,6 @@ -faab06bdb35626033fd795d9c1ccfd41 zshdb-0.04.tar.gz +ff1262d4ab1f61ac1223cb21c7887b88 0002-Tolerance-for-Solaris-and-older-sed-sh-and-whatnot.patch +028815125c41c1b37a77c38c3ca684f3 0003-Tolerance-for-Solaris-and-older-sed-sh-and-whatnot.patch +4b47af8460ffdfec3101aac858296373 0004-Looks-like-sig-line-fixes-back-ported-to-bash-4.0.-N.patch +79335104890385a5b0d8f0f47a7261b3 0005-Administrivia.patch +4d2b0f7d3999219d4aa29968d08e3eef 0006-sig-SunOS.right-is-same-as-sig-41.right.patch +eb411b64d27ccbd0093789e9e945a589 bashdb-4.0-0.4.tar.bz2 Added: csw/mgar/pkg/bashdb/trunk/files/0001-sf-Piwik-analytics.patch =================================================================== --- csw/mgar/pkg/bashdb/trunk/files/0001-sf-Piwik-analytics.patch (rev 0) +++ csw/mgar/pkg/bashdb/trunk/files/0001-sf-Piwik-analytics.patch 2010-01-18 07:50:23 UTC (rev 8062) @@ -0,0 +1,86 @@ +From 5079f62fe84e27158aca58e6850cadd4b1b859ca Mon Sep 17 00:00:00 2001 +From: rocky +Date: Tue, 27 Oct 2009 04:29:43 +0000 +Subject: [PATCH 1/6] sf Piwik analytics. + +--- + ChangeLog | 4 ++++ + htdocs/index.html | 39 +++++++++++++++++++++++++-------------- + 2 files changed, 29 insertions(+), 14 deletions(-) + +diff --git a/ChangeLog b/ChangeLog +index fa08646..85754af 100644 +--- a/ChangeLog ++++ b/ChangeLog +@@ -1,5 +1,9 @@ + 2009-10-27 rocky + ++ * ChangeLog, NEWS: See previous ++ ++2009-10-27 rocky ++ + * ChangeLog, NEWS: One more change noted + + 2009-10-27 rocky +diff --git a/htdocs/index.html b/htdocs/index.html +index da63b85..dd30324 100644 +--- a/htdocs/index.html ++++ b/htdocs/index.html +@@ -129,6 +129,18 @@ tt + + ++ ++ ++ ++ +
+

BASH Debugger

+ +@@ -196,22 +208,21 @@ repository + +

+ +-

$Id: index.html,v 1.2 2009/03/02 02:52:28 rockyb Exp $

+-

+- ++

++ + Valid HTML 4.01 Transitional +- ++ src="http://www.w3.org/Icons/valid-html401-blue" ++ alt="Valid HTML 4.01 Transitional" height="31" width="88"> ++ + Valid CSS! +- +- +- SourceForge Logo +- +-

++ src="http://jigsaw.w3.org/css-validator/images/vcss-blue" ++ alt="Valid CSS!"> ++ ++ ++ SourceForge Logo ++ ++

+
+ + +-- +1.6.2.1 + Added: csw/mgar/pkg/bashdb/trunk/files/0002-Tolerance-for-Solaris-and-older-sed-sh-and-whatnot.patch =================================================================== --- csw/mgar/pkg/bashdb/trunk/files/0002-Tolerance-for-Solaris-and-older-sed-sh-and-whatnot.patch (rev 0) +++ csw/mgar/pkg/bashdb/trunk/files/0002-Tolerance-for-Solaris-and-older-sed-sh-and-whatnot.patch 2010-01-18 07:50:23 UTC (rev 8062) @@ -0,0 +1,350 @@ +From 146bf13599cb835e8efdb8a4402286ac46ffe8c7 Mon Sep 17 00:00:00 2001 +From: rocky +Date: Sun, 20 Dec 2009 18:25:07 +0100 +Subject: [PATCH 2/6] Tolerance for Solaris and older sed, sh and whatnot + +--- + configure.ac | 4 ++ + test/data/sig-SunOS.right | 63 +++++++++++++++++++++++++++++++++++ + test/integration/check-common.sh.in | 2 +- + test/integration/settrace.tests | 4 +- + test/integration/test-interrupt | 7 +++- + test/integration/test-misc | 6 ++-- + test/integration/test-misc.in | 35 +++++++++++++++++++ + test/integration/test-multi | 2 +- + test/integration/test-parm | 2 +- + test/integration/test-setshow | 6 ++-- + test/integration/test-setshow.in | 26 ++++++++++++++ + test/integration/test-settrace | 2 +- + test/integration/test-sig | 2 + + test/integration/test-subshell | 2 +- + test/integration/test-tbreak | 2 +- + test/integration/test-trace | 2 +- + 16 files changed, 151 insertions(+), 16 deletions(-) + create mode 100644 test/data/sig-SunOS.right + create mode 100755 test/integration/test-misc.in + create mode 100755 test/integration/test-setshow.in + +diff --git a/configure.ac b/configure.ac +index 15ddaf5..fa151e7 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -242,6 +242,10 @@ AC_CONFIG_FILES([test/unit/test-save-restore.sh], + AC_CONFIG_FILES([test/unit/test-set0.sh], [chmod +x test/unit/test-set0.sh]) + AC_CONFIG_FILES([test/unit/test-sort.sh], + [chmod +x test/unit/test-sort.sh]) ++AC_CONFIG_FILES([test/integration/test-misc], ++ [chmod +x test/integration/test-misc]) ++AC_CONFIG_FILES([test/integration/test-setshow], ++ [chmod +x test/integration/test-setshow]) + + AC_CONFIG_FILES([ \ + bashdb-main.inc \ +diff --git a/test/data/sig-SunOS.right b/test/data/sig-SunOS.right +new file mode 100644 +index 0000000..4656d84 +--- /dev/null ++++ b/test/data/sig-SunOS.right +@@ -0,0 +1,63 @@ ++(sig.sh:7): ++7: if [[ "$1"x != x ]] ; then +++# Test that debugged program's signals are saved and restored across +++# debug calls. +++### Testing that we have our signal set up... +++info signals ++Signal Stop Print Stack Value ++EXIT stop noprint nostack trap -- '_Dbg_exit_handler "$BASH_COMMAND"' EXIT ++EXIT stop noprint nostack trap -- '_Dbg_exit_handler "$BASH_COMMAND"' EXIT ++SIGINT stop print showstack trap -- '_Dbg_sig_handler 2 "$BASH_COMMAND" "$@"' SIGINT ++SIGQUIT stop print showstack trap -- '_Dbg_sig_handler 3 "$BASH_COMMAND" "$@"' SIGQUIT ++SIGILL stop print showstack trap -- '_Dbg_sig_handler 4 "$BASH_COMMAND" "$@"' SIGILL ++SIGTRAP stop print showstack trap -- '_Dbg_sig_handler 5 "$BASH_COMMAND" "$@"' SIGTRAP ++SIGTERM stop print showstack trap -- '_Dbg_sig_handler 15 "$BASH_COMMAND" "$@"' SIGTERM +++### Testing handle command... +++handle TERM nostack +++handle foo ++Bad signal name: foo +++handle 1000 ++Bad signal number: 1000 +++handle TERM bogus ++Need to give a command: stop, nostop, stack, nostack, print, noprint +++eval kill -TERM $$ ++Program received signal SIGTERM (15)... +++### Should not have printed a stack trace above... +++handle TERM noprint +++handle TERM stack +++handle INT nostop +++eval kill -TERM $$ +++info signals ++Signal Stop Print Stack Value ++EXIT stop noprint nostack trap -- '_Dbg_exit_handler "$BASH_COMMAND"' EXIT ++EXIT stop noprint nostack trap -- '_Dbg_exit_handler "$BASH_COMMAND"' EXIT ++SIGINT nostop print showstack trap -- '_Dbg_sig_handler 2 "$BASH_COMMAND" "$@"' SIGINT ++SIGQUIT stop print showstack trap -- '_Dbg_sig_handler 3 "$BASH_COMMAND" "$@"' SIGQUIT ++SIGILL stop print showstack trap -- '_Dbg_sig_handler 4 "$BASH_COMMAND" "$@"' SIGILL ++SIGTRAP stop print showstack trap -- '_Dbg_sig_handler 5 "$BASH_COMMAND" "$@"' SIGTRAP ++SIGTERM stop noprint showstack trap -- '_Dbg_sig_handler 15 "$BASH_COMMAND" "$@"' SIGTERM +++continue ++Program received signal SIGTERM (15)... ++->0 in file `eval.sh' at line 1 ++##1 _Dbg_do_eval("kill", "-TERM", "$$") called from file `processor.sh' at line 402 ++##2 _Dbg_onecmd("eval", "kill -TERM $$") called from file `processor.sh' at line 167 ++##3 _Dbg_process_commands() called from file `hook.sh' at line 188 ++##4 _Dbg_debug_trap_handler("0", "[[ "$1"x != x ]]") called from file `sig.sh' at line 7 ++##5 source("sig.sh") called from file `bashdb' at line 157 ++##6 main() called from file `bashdb' at line 0 +++### Should have printed a stack trace above... +++continue +++where 1 ++->0 in file `sig.sh' at line 1 +++continue ++Program received signal SIGINT (2)... ++->0 in file `sig.sh' at line 1 ++##1 source("sig.sh") called from file `bashdb' at line 157 ++##2 main() called from file `bashdb' at line 0 ++Program received signal SIGINT (2)... ++->0 in file `sig.sh' at line 1 ++##1 source("sig.sh") called from file `bashdb' at line 157 ++##2 main() called from file `bashdb' at line 0 ++Debugged program terminated normally. Use q to quit or R to restart. +++kill ++sig.tests: line 12: 28364 Killed $SH ${top_builddir}/bashdb -B -q -L $top_builddir -x $cmdfile $debugged_script +diff --git a/test/integration/check-common.sh.in b/test/integration/check-common.sh.in +index c5d8053..c5c1532 100644 +--- a/test/integration/check-common.sh.in ++++ b/test/integration/check-common.sh.in +@@ -3,7 +3,7 @@ + + srcdir=@srcdir@ + builddir=@builddir@ +-[ -z "$SH" ] && SH=@SH_PROG@ ++[ -z "$SH" ] && export SH=@SH_PROG@ + + export top_builddir=@abs_top_builddir@ + export top_srcdir=@abs_top_srcdir@ +diff --git a/test/integration/settrace.tests b/test/integration/settrace.tests +index 2f741cc..8c25943 100755 +--- a/test/integration/settrace.tests ++++ b/test/integration/settrace.tests +@@ -1,10 +1,10 @@ +-#!/bin/sh ++#!/usr/bin/env bash + # -*- shell-script -*- + #$Id: settrace.tests,v 1.1 2008/08/22 19:25:06 rockyb Exp $ + + [ -z "$srcdir" ] && export srcdir=$PWD + [ -z "$builddir" ] && export builddir=$PWD +-[ -z "$top_builddir" ] && export top_builddir=$builddir/.. ++[ -z "$top_builddir" ] && export top_builddir=$builddir/../.. + + cmdfile=${top_builddir}/test/data/settrace.cmd + debugged_script="$top_builddir/test/example/settrace.sh" +diff --git a/test/integration/test-interrupt b/test/integration/test-interrupt +index 9977a68..2a6f63d 100755 +--- a/test/integration/test-interrupt ++++ b/test/integration/test-interrupt +@@ -5,7 +5,12 @@ + + . ${builddir}/check-common.sh + +-[[ $host_os == cygwin ]] || [[ $host_os = darwin* ]] && exit 77 ++case $host_os in ++ cygwin | darwin* | solaris* ) ++ exit ;; ++ * ) ++ break ;; ++esac + + TEST_NAME=interrupt + TEST_FILE="$builddir/${TEST_NAME}.check" +diff --git a/test/integration/test-misc b/test/integration/test-misc +index 818f56d..80f387a 100755 +--- a/test/integration/test-misc ++++ b/test/integration/test-misc +@@ -1,4 +1,4 @@ +-#!/usr/bin/env bash ++#!/opt/csw/bin/bash + # -*- shell-script -*- + #$Id: test-misc,v 1.3 2008/08/23 17:09:36 rockyb Exp $ + +@@ -16,8 +16,8 @@ debugged_script="$top_builddir/test/example/dbg-test2.sh" + + # Different OS's handle ARGV differently, and "info args" may come out + # differently depending on that. +-cat ${TEST_FILE} | sed -e "s:1 = .*/dbg-test2.sh:1 = ./example/dbg-test2.sh:" \ +-| sed -e 's:record the command history is .*:record the command history is: ' \ ++cat ${TEST_FILE} | /opt/csw/bin/gsed -e "s:1 = .*/dbg-test2.sh:1 = ./example/dbg-test2.sh:" \ ++| /opt/csw/bin/gsed -e 's:record the command history is .*:record the command history is: ' \ + > ${TEST_FILTERED_FILE} + + if (( BASH_VERSINFO[0] > 4 || \ +diff --git a/test/integration/test-misc.in b/test/integration/test-misc.in +new file mode 100755 +index 0000000..84ad349 +--- /dev/null ++++ b/test/integration/test-misc.in +@@ -0,0 +1,35 @@ ++#!@SH_PROG@ ++# -*- shell-script -*- ++#$Id: test-misc,v 1.3 2008/08/23 17:09:36 rockyb Exp $ ++ ++[ -z "$srcdir" ] && export srcdir=$PWD ++[ -z "$builddir" ] && export builddir=$PWD ++[ -z "$top_builddir" ] && export top_builddir=$builddir/../.. ++ ++TEST_NAME='misc' ++ ++. ${top_builddir}/test/integration/check-common.sh ++ ++debugged_script="$top_builddir/test/example/dbg-test2.sh" ++ ++(cd $srcdir && run_debugger $debugged_script 2>&1 >$TEST_FILE ${TEST_FILTERED_FILE} ++ ++if (( BASH_VERSINFO[0] > 4 || \ ++ (BASH_VERSINFO[0] == 4 && BASH_VERSINFO[1] >= 1) )) ; then ++ RIGHT_FILE="${top_srcdir}/test/data/${TEST_NAME}-output-41.right" ++fi ++ ++check_output $TEST_FILTERED_FILE $RIGHT_FILE ++rc=$? ++ ++((0 != rc)) && exit $rc ++rm -f $TEST_FILE ++ ++# Return code tells testing mechanism whether passed or not. ++exit 0 +diff --git a/test/integration/test-multi b/test/integration/test-multi +index c9469e7..6443b66 100755 +--- a/test/integration/test-multi ++++ b/test/integration/test-multi +@@ -1,4 +1,4 @@ +-#!/bin/sh ++#!/usr/bin/env bash + # -*- shell-script -*- + #$Id: test-multi,v 1.2 2008/08/23 16:56:21 rockyb Exp $ + +diff --git a/test/integration/test-parm b/test/integration/test-parm +index c330c64..15d988e 100755 +--- a/test/integration/test-parm ++++ b/test/integration/test-parm +@@ -1,4 +1,4 @@ +-#!/bin/sh ++#!/usr/bin/env bash + # -*- shell-script -*- + #$Id: test-parm,v 1.2 2008/08/23 16:56:21 rockyb Exp $ + +diff --git a/test/integration/test-setshow b/test/integration/test-setshow +index 612a03b..deeb3ba 100755 +--- a/test/integration/test-setshow ++++ b/test/integration/test-setshow +@@ -1,4 +1,4 @@ +-#!/bin/bash -f ++#!/opt/csw/bin/bash -f + # -*- shell-script -*- + #$Id: test-setshow,v 1.3 2008/08/23 17:09:36 rockyb Exp $ + +@@ -12,8 +12,8 @@ TEST_NAME='setshow' + + (cd $srcdir && $SH ${srcdir}/${TEST_NAME}.tests > $TEST_FILE 2>&1 < /dev/null) + +-cat ${TEST_FILE} | sed -e "s:-L .* -x .*/data/setshow\.cmd .*/example/dbg-test2.sh:-L .. -x data/setshow.cmd example/dbg-test2.sh:" \ +-| sed -e 's:record the command history is .*:record the command history is: ' \ ++cat ${TEST_FILE} | /opt/csw/bin/gsed -e "s:-L .* -x .*/data/setshow\.cmd .*/example/dbg-test2.sh:-L .. -x data/setshow.cmd example/dbg-test2.sh:" \ ++| /opt/csw/bin/gsed -e 's:record the command history is .*:record the command history is: ' \ + > ${TEST_FILTERED_FILE} + + check_output $TEST_FILTERED_FILE $RIGHT_FILE +diff --git a/test/integration/test-setshow.in b/test/integration/test-setshow.in +new file mode 100755 +index 0000000..8be8546 +--- /dev/null ++++ b/test/integration/test-setshow.in +@@ -0,0 +1,26 @@ ++#!@SH_PROG@ -f ++# -*- shell-script -*- ++#$Id: test-setshow,v 1.3 2008/08/23 17:09:36 rockyb Exp $ ++ ++[ -z "$srcdir" ] && export srcdir=$PWD ++[ -z "$builddir" ] && export builddir=$PWD ++[ -z "$top_builddir" ] && export top_builddir=$builddir/../.. ++ ++TEST_NAME='setshow' ++ ++. ${top_builddir}/test/integration/check-common.sh ++ ++(cd $srcdir && $SH ${srcdir}/${TEST_NAME}.tests > $TEST_FILE 2>&1 < /dev/null) ++ ++cat ${TEST_FILE} | @SED@ -e "s:-L .* -x .*/data/setshow\.cmd .*/example/dbg-test2.sh:-L .. -x data/setshow.cmd example/dbg-test2.sh:" \ ++| @SED@ -e 's:record the command history is .*:record the command history is: ' \ ++> ${TEST_FILTERED_FILE} ++ ++check_output $TEST_FILTERED_FILE $RIGHT_FILE ++rc=$? ++ ++((0 != rc)) && exit $rc ++rm -f $TEST_FILE ++ ++# Return code tells testing mechanism whether passed or not. ++exit 0 +diff --git a/test/integration/test-settrace b/test/integration/test-settrace +index a176850..f6b66f7 100755 +--- a/test/integration/test-settrace ++++ b/test/integration/test-settrace +@@ -1,4 +1,4 @@ +-#!/bin/sh ++#!/usr/bin/env bash + # -*- shell-script -*- + #$Id: test-settrace,v 1.2 2008/08/23 16:56:21 rockyb Exp $ + +diff --git a/test/integration/test-sig b/test/integration/test-sig +index f968e03..98b2359 100755 +--- a/test/integration/test-sig ++++ b/test/integration/test-sig +@@ -15,6 +15,8 @@ if (( BASH_VERSINFO[0] > 4 || \ + RIGHT_FILE="${top_srcdir}/test/data/${TEST_NAME}-41.right" + elif [[ $(uname -s) == 'Darwin' ]] ; then + RIGHT_FILE="${top_srcdir}/test/data/${TEST_NAME}-Darwin.right" ++elif [[ $(uname -s) == 'SunOS' ]] ; then ++ RIGHT_FILE="${top_srcdir}/test/data/${TEST_NAME}-SunOS.right" + fi + FILTERED_TEST_FILE="/tmp/${TEST_NAME}-filtered.check" + FILTERED_RIGHT_FILE="/tmp/${TEST_NAME}-filtered.right" +diff --git a/test/integration/test-subshell b/test/integration/test-subshell +index 7144b20..7c92aa8 100755 +--- a/test/integration/test-subshell ++++ b/test/integration/test-subshell +@@ -1,4 +1,4 @@ +-#!/bin/sh ++#!/usr/bin/env bash + # -*- shell-script -*- + #$Id: test-subshell,v 1.3 2008/08/29 02:55:44 rockyb Exp $ + +diff --git a/test/integration/test-tbreak b/test/integration/test-tbreak +index f078829..7891c83 100755 +--- a/test/integration/test-tbreak ++++ b/test/integration/test-tbreak +@@ -1,4 +1,4 @@ +-#!/bin/sh ++#!/usr/bin/env bash + # -*- shell-script -*- + #$Id: test-tbreak,v 1.2 2008/08/23 16:56:21 rockyb Exp $ + +diff --git a/test/integration/test-trace b/test/integration/test-trace +index 409f597..85c8340 100755 +--- a/test/integration/test-trace ++++ b/test/integration/test-trace +@@ -1,4 +1,4 @@ +-#!/bin/sh ++#!/usr/bin/env bash + # -*- shell-script -*- + #$Id: test-trace,v 1.2 2008/08/23 16:56:21 rockyb Exp $ + +-- +1.6.2.1 + Added: csw/mgar/pkg/bashdb/trunk/files/0003-Tolerance-for-Solaris-and-older-sed-sh-and-whatnot.patch =================================================================== --- csw/mgar/pkg/bashdb/trunk/files/0003-Tolerance-for-Solaris-and-older-sed-sh-and-whatnot.patch (rev 0) +++ csw/mgar/pkg/bashdb/trunk/files/0003-Tolerance-for-Solaris-and-older-sed-sh-and-whatnot.patch 2010-01-18 07:50:23 UTC (rev 8062) @@ -0,0 +1,38 @@ +From 92da4be05ec48c9c07b19527fa26cad088e6ec3c Mon Sep 17 00:00:00 2001 +From: rocky +Date: Sun, 20 Dec 2009 18:27:17 +0100 +Subject: [PATCH 3/6] Tolerance for Solaris and older sed, sh and whatnot - forgot to add new files to distro + +--- + test/data/Makefile.am | 1 + + test/integration/Makefile.am | 2 ++ + 2 files changed, 3 insertions(+), 0 deletions(-) + +diff --git a/test/data/Makefile.am b/test/data/Makefile.am +index f44b617..071aaf1 100644 +--- a/test/data/Makefile.am ++++ b/test/data/Makefile.am +@@ -69,6 +69,7 @@ check_DATA = \ + sig.right \ + sig-41.right \ + sig-Darwin.right \ ++ sig-SunOS.right \ + skip.cmd \ + skip.right \ + sopts.right \ +diff --git a/test/integration/Makefile.am b/test/integration/Makefile.am +index f64ab30..0708330 100644 +--- a/test/integration/Makefile.am ++++ b/test/integration/Makefile.am +@@ -16,6 +16,8 @@ check_DATA = \ + subshell2.tests \ + subshell3.tests \ + subshell4.tests \ ++ test-misc.in \ ++ test-setshow.in \ + trace.tests \ + trace2.tests + +-- +1.6.2.1 + Added: csw/mgar/pkg/bashdb/trunk/files/0004-Looks-like-sig-line-fixes-back-ported-to-bash-4.0.-N.patch =================================================================== --- csw/mgar/pkg/bashdb/trunk/files/0004-Looks-like-sig-line-fixes-back-ported-to-bash-4.0.-N.patch (rev 0) +++ csw/mgar/pkg/bashdb/trunk/files/0004-Looks-like-sig-line-fixes-back-ported-to-bash-4.0.-N.patch 2010-01-18 07:50:23 UTC (rev 8062) @@ -0,0 +1,177 @@ +From d2c95b0e62f91e3d47e8fd7e1300a00d332bd9a2 Mon Sep 17 00:00:00 2001 +From: rocky +Date: Sun, 20 Dec 2009 12:53:32 -0500 +Subject: [PATCH 4/6] Looks like sig line fixes back ported to bash 4.0. No need for a SunOS-specific file. + +test-misc and test-setshow are derived from .in files. +--- + test/data/sig-SunOS.right | 63 ----------------------------------------- + test/integration/test-misc | 35 ---------------------- + test/integration/test-setshow | 26 ----------------- + test/integration/test-sig | 4 +-- + 4 files changed, 1 insertions(+), 127 deletions(-) + delete mode 100644 test/data/sig-SunOS.right + delete mode 100755 test/integration/test-misc + delete mode 100755 test/integration/test-setshow + +diff --git a/test/data/sig-SunOS.right b/test/data/sig-SunOS.right +deleted file mode 100644 +index 4656d84..0000000 +--- a/test/data/sig-SunOS.right ++++ /dev/null +@@ -1,63 +0,0 @@ +-(sig.sh:7): +-7: if [[ "$1"x != x ]] ; then +-+# Test that debugged program's signals are saved and restored across +-+# debug calls. +-+### Testing that we have our signal set up... +-+info signals +-Signal Stop Print Stack Value +-EXIT stop noprint nostack trap -- '_Dbg_exit_handler "$BASH_COMMAND"' EXIT +-EXIT stop noprint nostack trap -- '_Dbg_exit_handler "$BASH_COMMAND"' EXIT +-SIGINT stop print showstack trap -- '_Dbg_sig_handler 2 "$BASH_COMMAND" "$@"' SIGINT +-SIGQUIT stop print showstack trap -- '_Dbg_sig_handler 3 "$BASH_COMMAND" "$@"' SIGQUIT +-SIGILL stop print showstack trap -- '_Dbg_sig_handler 4 "$BASH_COMMAND" "$@"' SIGILL +-SIGTRAP stop print showstack trap -- '_Dbg_sig_handler 5 "$BASH_COMMAND" "$@"' SIGTRAP +-SIGTERM stop print showstack trap -- '_Dbg_sig_handler 15 "$BASH_COMMAND" "$@"' SIGTERM +-+### Testing handle command... +-+handle TERM nostack +-+handle foo +-Bad signal name: foo +-+handle 1000 +-Bad signal number: 1000 +-+handle TERM bogus +-Need to give a command: stop, nostop, stack, nostack, print, noprint +-+eval kill -TERM $$ +-Program received signal SIGTERM (15)... +-+### Should not have printed a stack trace above... +-+handle TERM noprint +-+handle TERM stack +-+handle INT nostop +-+eval kill -TERM $$ +-+info signals +-Signal Stop Print Stack Value +-EXIT stop noprint nostack trap -- '_Dbg_exit_handler "$BASH_COMMAND"' EXIT +-EXIT stop noprint nostack trap -- '_Dbg_exit_handler "$BASH_COMMAND"' EXIT +-SIGINT nostop print showstack trap -- '_Dbg_sig_handler 2 "$BASH_COMMAND" "$@"' SIGINT +-SIGQUIT stop print showstack trap -- '_Dbg_sig_handler 3 "$BASH_COMMAND" "$@"' SIGQUIT +-SIGILL stop print showstack trap -- '_Dbg_sig_handler 4 "$BASH_COMMAND" "$@"' SIGILL +-SIGTRAP stop print showstack trap -- '_Dbg_sig_handler 5 "$BASH_COMMAND" "$@"' SIGTRAP +-SIGTERM stop noprint showstack trap -- '_Dbg_sig_handler 15 "$BASH_COMMAND" "$@"' SIGTERM +-+continue +-Program received signal SIGTERM (15)... +-->0 in file `eval.sh' at line 1 +-##1 _Dbg_do_eval("kill", "-TERM", "$$") called from file `processor.sh' at line 402 +-##2 _Dbg_onecmd("eval", "kill -TERM $$") called from file `processor.sh' at line 167 +-##3 _Dbg_process_commands() called from file `hook.sh' at line 188 +-##4 _Dbg_debug_trap_handler("0", "[[ "$1"x != x ]]") called from file `sig.sh' at line 7 +-##5 source("sig.sh") called from file `bashdb' at line 157 +-##6 main() called from file `bashdb' at line 0 +-+### Should have printed a stack trace above... +-+continue +-+where 1 +-->0 in file `sig.sh' at line 1 +-+continue +-Program received signal SIGINT (2)... +-->0 in file `sig.sh' at line 1 +-##1 source("sig.sh") called from file `bashdb' at line 157 +-##2 main() called from file `bashdb' at line 0 +-Program received signal SIGINT (2)... +-->0 in file `sig.sh' at line 1 +-##1 source("sig.sh") called from file `bashdb' at line 157 +-##2 main() called from file `bashdb' at line 0 +-Debugged program terminated normally. Use q to quit or R to restart. +-+kill +-sig.tests: line 12: 28364 Killed $SH ${top_builddir}/bashdb -B -q -L $top_builddir -x $cmdfile $debugged_script +diff --git a/test/integration/test-misc b/test/integration/test-misc +deleted file mode 100755 +index 80f387a..0000000 +--- a/test/integration/test-misc ++++ /dev/null +@@ -1,35 +0,0 @@ +-#!/opt/csw/bin/bash +-# -*- shell-script -*- +-#$Id: test-misc,v 1.3 2008/08/23 17:09:36 rockyb Exp $ +- +-[ -z "$srcdir" ] && export srcdir=$PWD +-[ -z "$builddir" ] && export builddir=$PWD +-[ -z "$top_builddir" ] && export top_builddir=$builddir/../.. +- +-TEST_NAME='misc' +- +-. ${top_builddir}/test/integration/check-common.sh +- +-debugged_script="$top_builddir/test/example/dbg-test2.sh" +- +-(cd $srcdir && run_debugger $debugged_script 2>&1 >$TEST_FILE ${TEST_FILTERED_FILE} +- +-if (( BASH_VERSINFO[0] > 4 || \ +- (BASH_VERSINFO[0] == 4 && BASH_VERSINFO[1] >= 1) )) ; then +- RIGHT_FILE="${top_srcdir}/test/data/${TEST_NAME}-output-41.right" +-fi +- +-check_output $TEST_FILTERED_FILE $RIGHT_FILE +-rc=$? +- +-((0 != rc)) && exit $rc +-rm -f $TEST_FILE +- +-# Return code tells testing mechanism whether passed or not. +-exit 0 +diff --git a/test/integration/test-setshow b/test/integration/test-setshow +deleted file mode 100755 +index deeb3ba..0000000 +--- a/test/integration/test-setshow ++++ /dev/null +@@ -1,26 +0,0 @@ +-#!/opt/csw/bin/bash -f +-# -*- shell-script -*- +-#$Id: test-setshow,v 1.3 2008/08/23 17:09:36 rockyb Exp $ +- +-[ -z "$srcdir" ] && export srcdir=$PWD +-[ -z "$builddir" ] && export builddir=$PWD +-[ -z "$top_builddir" ] && export top_builddir=$builddir/../.. +- +-TEST_NAME='setshow' +- +-. ${top_builddir}/test/integration/check-common.sh +- +-(cd $srcdir && $SH ${srcdir}/${TEST_NAME}.tests > $TEST_FILE 2>&1 < /dev/null) +- +-cat ${TEST_FILE} | /opt/csw/bin/gsed -e "s:-L .* -x .*/data/setshow\.cmd .*/example/dbg-test2.sh:-L .. -x data/setshow.cmd example/dbg-test2.sh:" \ +-| /opt/csw/bin/gsed -e 's:record the command history is .*:record the command history is: ' \ +-> ${TEST_FILTERED_FILE} +- +-check_output $TEST_FILTERED_FILE $RIGHT_FILE +-rc=$? +- +-((0 != rc)) && exit $rc +-rm -f $TEST_FILE +- +-# Return code tells testing mechanism whether passed or not. +-exit 0 +diff --git a/test/integration/test-sig b/test/integration/test-sig +index 98b2359..1a69609 100755 +--- a/test/integration/test-sig ++++ b/test/integration/test-sig +@@ -11,10 +11,8 @@ TEST_NAME='sig' + . ${top_builddir}/test/integration/check-common.sh + + if (( BASH_VERSINFO[0] > 4 || \ +- (BASH_VERSINFO[0] == 4 && BASH_VERSINFO[1] >= 1) )) ; then ++ (BASH_VERSINFO[0] == 4 && BASH_VERSINFO[1] >= 0) )) ; then + RIGHT_FILE="${top_srcdir}/test/data/${TEST_NAME}-41.right" +-elif [[ $(uname -s) == 'Darwin' ]] ; then +- RIGHT_FILE="${top_srcdir}/test/data/${TEST_NAME}-Darwin.right" + elif [[ $(uname -s) == 'SunOS' ]] ; then + RIGHT_FILE="${top_srcdir}/test/data/${TEST_NAME}-SunOS.right" + fi +-- +1.6.2.1 + Added: csw/mgar/pkg/bashdb/trunk/files/0005-Administrivia.patch =================================================================== --- csw/mgar/pkg/bashdb/trunk/files/0005-Administrivia.patch (rev 0) +++ csw/mgar/pkg/bashdb/trunk/files/0005-Administrivia.patch 2010-01-18 07:50:23 UTC (rev 8062) @@ -0,0 +1,48 @@ +From af51c5aba3ecd33b36423ddfc524f621e29a3a87 Mon Sep 17 00:00:00 2001 +From: rocky +Date: Sun, 20 Dec 2009 12:57:11 -0500 +Subject: [PATCH 5/6] Administrivia + +--- + .gitignore | 4 +++- + test/integration/.gitignore | 6 ++++-- + 2 files changed, 7 insertions(+), 3 deletions(-) + +diff --git a/.gitignore b/.gitignore +index a91f589..8b0b39f 100644 +--- a/.gitignore ++++ b/.gitignore +@@ -1,8 +1,11 @@ ++/*~ + /Makefile + /Makefile.in + /aclocal.m4 + /autom4te.cache + /bashdb ++/bashdb-4.*tar.gz ++/bashdb-4.*tar.bz2 + /bashdb-main.inc + /bashdb-trace + /compile +@@ -20,4 +23,3 @@ + /libtool + /missing + /stamp-h1 +-/*~ +diff --git a/test/integration/.gitignore b/test/integration/.gitignore +index ff80915..45f7bb3 100644 +--- a/test/integration/.gitignore ++++ b/test/integration/.gitignore +@@ -1,5 +1,7 @@ ++/*.check ++/*~ + /Makefile + /Makefile.in + /check-common.sh +-/*.check +-/*~ ++/test-misc ++/test-setshow +-- +1.6.2.1 + Added: csw/mgar/pkg/bashdb/trunk/files/0006-sig-SunOS.right-is-same-as-sig-41.right.patch =================================================================== --- csw/mgar/pkg/bashdb/trunk/files/0006-sig-SunOS.right-is-same-as-sig-41.right.patch (rev 0) +++ csw/mgar/pkg/bashdb/trunk/files/0006-sig-SunOS.right-is-same-as-sig-41.right.patch 2010-01-18 07:50:23 UTC (rev 8062) @@ -0,0 +1,24 @@ +From fe4012d2196d8b0ab2ef531e62616e13e479d1f2 Mon Sep 17 00:00:00 2001 +From: rocky +Date: Thu, 24 Dec 2009 22:54:12 -0500 +Subject: [PATCH 6/6] sig-SunOS.right is same as sig-41.right. + +--- + test/data/Makefile.am | 1 - + 1 files changed, 0 insertions(+), 1 deletions(-) + +diff --git a/test/data/Makefile.am b/test/data/Makefile.am +index 071aaf1..f44b617 100644 +--- a/test/data/Makefile.am ++++ b/test/data/Makefile.am +@@ -69,7 +69,6 @@ check_DATA = \ + sig.right \ + sig-41.right \ + sig-Darwin.right \ +- sig-SunOS.right \ + skip.cmd \ + skip.right \ + sopts.right \ +-- +1.6.2.1 + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Mon Jan 18 08:51:13 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Mon, 18 Jan 2010 07:51:13 +0000 Subject: [csw-devel] SF.net SVN: gar:[8063] csw/mgar/pkg/libbonobo2 Message-ID: Revision: 8063 http://gar.svn.sourceforge.net/gar/?rev=8063&view=rev Author: dmichelsen Date: 2010-01-18 07:51:12 +0000 (Mon, 18 Jan 2010) Log Message: ----------- libbonobo2: Initial commit Added Paths: ----------- csw/mgar/pkg/libbonobo2/branches/ csw/mgar/pkg/libbonobo2/tags/ csw/mgar/pkg/libbonobo2/tags/legacy/ csw/mgar/pkg/libbonobo2/trunk/Makefile csw/mgar/pkg/libbonobo2/trunk/checksums csw/mgar/pkg/libbonobo2/trunk/files/ Property Changed: ---------------- csw/mgar/pkg/libbonobo2/trunk/ Property changes on: csw/mgar/pkg/libbonobo2/trunk ___________________________________________________________________ Added: svn:ignore + cookies download work Added: svn:externals + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 Added: csw/mgar/pkg/libbonobo2/trunk/Makefile =================================================================== --- csw/mgar/pkg/libbonobo2/trunk/Makefile (rev 0) +++ csw/mgar/pkg/libbonobo2/trunk/Makefile 2010-01-18 07:51:12 UTC (rev 8063) @@ -0,0 +1,22 @@ +GARNAME = libbonobo +GARVERSION = 2.24.2 +CATEGORIES = gnome + +DESCRIPTION = GNOME component and compound document system +define BLURB +endef + +MASTER_SITES = $(GNOME_MIRROR) +DISTFILES = $(GARNAME)-$(GARVERSION).tar.bz2 + +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + +BUILD64 = 1 +CONFIGURE_ARGS = $(DIRPATHS) + +TEST_TARGET = check + +include gar/category.mk + +PATH := /opt/csw/gnu:$(PATH) Added: csw/mgar/pkg/libbonobo2/trunk/checksums =================================================================== --- csw/mgar/pkg/libbonobo2/trunk/checksums (rev 0) +++ csw/mgar/pkg/libbonobo2/trunk/checksums 2010-01-18 07:51:12 UTC (rev 8063) @@ -0,0 +1 @@ +5c7c5ea9c2f78a3c1e9ff2f1e27ad751 libbonobo-2.24.2.tar.bz2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Mon Jan 18 08:52:12 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Mon, 18 Jan 2010 07:52:12 +0000 Subject: [csw-devel] SF.net SVN: gar:[8064] csw/mgar/pkg Message-ID: Revision: 8064 http://gar.svn.sourceforge.net/gar/?rev=8064&view=rev Author: dmichelsen Date: 2010-01-18 07:52:12 +0000 (Mon, 18 Jan 2010) Log Message: ----------- libmkv: Initial commit, doesn't compile yet Added Paths: ----------- csw/mgar/pkg/libmkv/ csw/mgar/pkg/libmkv/branches/ csw/mgar/pkg/libmkv/tags/ csw/mgar/pkg/libmkv/trunk/ csw/mgar/pkg/libmkv/trunk/Makefile csw/mgar/pkg/libmkv/trunk/checksums csw/mgar/pkg/libmkv/trunk/files/ Property changes on: csw/mgar/pkg/libmkv/trunk ___________________________________________________________________ Added: svn:ignore + cookies download work Added: svn:externals + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 Added: csw/mgar/pkg/libmkv/trunk/Makefile =================================================================== --- csw/mgar/pkg/libmkv/trunk/Makefile (rev 0) +++ csw/mgar/pkg/libmkv/trunk/Makefile 2010-01-18 07:52:12 UTC (rev 8064) @@ -0,0 +1,22 @@ +GARNAME = libmkv +GARVERSION = 1.0 +CATEGORIES = category + +DESCRIPTION = Brief description +define BLURB + Long description +endef + +MASTER_SITES = +DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz + +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + +# If the url used to check for software update is different of MASTER_SITES, then +# uncomment the next line. Otherwise it is set by default to the value of MASTER_SITES +# UPSTREAM_MASTER_SITES = + +CONFIGURE_ARGS = $(DIRPATHS) + +include gar/category.mk This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From hson at users.sourceforge.net Mon Jan 18 09:59:03 2010 From: hson at users.sourceforge.net (hson at users.sourceforge.net) Date: Mon, 18 Jan 2010 08:59:03 +0000 Subject: [csw-devel] SF.net SVN: gar:[8065] csw/mgar/pkg/libproxy/trunk/Makefile Message-ID: Revision: 8065 http://gar.svn.sourceforge.net/gar/?rev=8065&view=rev Author: hson Date: 2010-01-18 08:59:03 +0000 (Mon, 18 Jan 2010) Log Message: ----------- libproxy: Make libproxy build and package on both Solaris8 and Solaris10 with same Makefile Modified Paths: -------------- csw/mgar/pkg/libproxy/trunk/Makefile Modified: csw/mgar/pkg/libproxy/trunk/Makefile =================================================================== --- csw/mgar/pkg/libproxy/trunk/Makefile 2010-01-18 07:52:12 UTC (rev 8064) +++ csw/mgar/pkg/libproxy/trunk/Makefile 2010-01-18 08:59:03 UTC (rev 8065) @@ -13,25 +13,32 @@ MASTER_SITES = http://libproxy.googlecode.com/files/ DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz +DISTFILES += SunStudio-have-no-stdc99-flag.patch +DISTFILES += Solaris8-have-no-stdc99-flag.patch +DISTFILES += stdfiles.patch +DISTFILES += proxy.c.patch +DISTFILES += 0002-Dont-preset-CFLAGS.patch + +PACKAGING_PLATFORMS = solaris8-sparc solaris8-i386 +PACKAGING_PLATFORMS += solaris10-sparc solaris10-i386 + #PATCHFILES = 0001-Use-xc99-for-Sun-Studio-compiler.patch -PATCHFILES += 0002-Dont-preset-CFLAGS.patch # For Solaris 10 targets -#PATCHFILES_isa-amd64 += SunStudio-have-no-stdc99-flag.patch -#PATCHFILES_isa-sparcv8 += SunStudio-have-no-stdc99-flag.patch -#PATCHFILES_isa-sparcv9 += SunStudio-have-no-stdc99-flag.patch -#PATCHFILES_isa-i386 += SunStudio-have-no-stdc99-flag.patch +PATCHFILES_solaris10-sparc += SunStudio-have-no-stdc99-flag.patch +PATCHFILES_solaris10-i386 += SunStudio-have-no-stdc99-flag.patch #For Solaris 8 targets -PATCHFILES_isa-amd64 += SunStudio-have-no-stdc99-flag.patch -PATCHFILES_isa-sparcv8 += Solaris8-have-no-stdc99-flag.patch -PATCHFILES_isa-sparcv8 += stdfiles.patch -PATCHFILES_isa-sparcv8 += proxy.c.patch -PATCHFILES_isa-sparcv9 += Solaris8-have-no-stdc99-flag.patch -PATCHFILES_isa-sparcv9 += stdfiles.patch -PATCHFILES_isa-sparcv9 += proxy.c.patch -PATCHFILES_isa-i386 += Solaris8-have-no-stdc99-flag.patch -PATCHFILES_isa-i386 += stdfiles.patch -PATCHFILES_isa-i386 += proxy.c.patch +PATCHFILES_solaris8-sparc += Solaris8-have-no-stdc99-flag.patch +PATCHFILES_solaris8-sparc += stdfiles.patch +PATCHFILES_solaris8-sparc += proxy.c.patch +PATCHFILES_solaris8-i386_isa-amd64 += SunStudio-have-no-stdc99-flag.patch +PATCHFILES_solaris8-i386_isa-i386 += Solaris8-have-no-stdc99-flag.patch +PATCHFILES_solaris8-i386_isa-i386 += stdfiles.patch +PATCHFILES_solaris8-i386_isa-i386 += proxy.c.patch +PATCHFILES += $(PATCHFILES_$(PLATFORM)) +PATCHFILES += $(PATCHFILES_$(PLATFORM)_$(MODULATION)) +PATCHFILES += 0002-Dont-preset-CFLAGS.patch + PACKAGES = CSWlibproxy CSWlibproxydevel CSWpy-libproxy CATALOGNAME_CSWlibproxy = libproxy CATALOGNAME_CSWlibproxydevel = libproxy_devel This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Mon Jan 18 10:08:07 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Mon, 18 Jan 2010 09:08:07 +0000 Subject: [csw-devel] SF.net SVN: gar:[8066] csw/mgar/pkg/libtasn1/trunk Message-ID: Revision: 8066 http://gar.svn.sourceforge.net/gar/?rev=8066&view=rev Author: dmichelsen Date: 2010-01-18 09:08:07 +0000 (Mon, 18 Jan 2010) Log Message: ----------- libtasn1: Update to 2.4 Modified Paths: -------------- csw/mgar/pkg/libtasn1/trunk/Makefile csw/mgar/pkg/libtasn1/trunk/checksums Modified: csw/mgar/pkg/libtasn1/trunk/Makefile =================================================================== --- csw/mgar/pkg/libtasn1/trunk/Makefile 2010-01-18 08:59:03 UTC (rev 8065) +++ csw/mgar/pkg/libtasn1/trunk/Makefile 2010-01-18 09:08:07 UTC (rev 8066) @@ -1,9 +1,12 @@ GARNAME = libtasn1 -GARVERSION = 2.3 +GARVERSION = 2.4 CATEGORIES = lib DESCRIPTION = GNU ASN1 library define BLURB + Libtasn1 is the ASN.1 library used by GnuTLS, GNU Shishi and some other packages. + It was written by Fabio Fiorina, and has been shipped as part of GnuTLS for some + time but is now a proper GNU package. endef MASTER_SITES = $(GNU_MIRROR) Modified: csw/mgar/pkg/libtasn1/trunk/checksums =================================================================== --- csw/mgar/pkg/libtasn1/trunk/checksums 2010-01-18 08:59:03 UTC (rev 8065) +++ csw/mgar/pkg/libtasn1/trunk/checksums 2010-01-18 09:08:07 UTC (rev 8066) @@ -1 +1 @@ -4f0918cf8fe8b2b4ba189938772d1dd2 libtasn1-2.3.tar.gz +bdfd59d6eb7924350e91367eb8adaa3c libtasn1-2.4.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bonivart at users.sourceforge.net Mon Jan 18 10:11:24 2010 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Mon, 18 Jan 2010 09:11:24 +0000 Subject: [csw-devel] SF.net SVN: gar:[8067] csw/mgar/pkg/memconf/trunk Message-ID: Revision: 8067 http://gar.svn.sourceforge.net/gar/?rev=8067&view=rev Author: bonivart Date: 2010-01-18 09:11:24 +0000 (Mon, 18 Jan 2010) Log Message: ----------- memconf: update to 2.13 Modified Paths: -------------- csw/mgar/pkg/memconf/trunk/Makefile csw/mgar/pkg/memconf/trunk/checksums Modified: csw/mgar/pkg/memconf/trunk/Makefile =================================================================== --- csw/mgar/pkg/memconf/trunk/Makefile 2010-01-18 09:08:07 UTC (rev 8066) +++ csw/mgar/pkg/memconf/trunk/Makefile 2010-01-18 09:11:24 UTC (rev 8067) @@ -1,5 +1,5 @@ GARNAME = memconf -GARVERSION = 2.12 +GARVERSION = 2.13 CATEGORIES = utils DESCRIPTION = perl script that displays memory modules installed Modified: csw/mgar/pkg/memconf/trunk/checksums =================================================================== --- csw/mgar/pkg/memconf/trunk/checksums 2010-01-18 09:08:07 UTC (rev 8066) +++ csw/mgar/pkg/memconf/trunk/checksums 2010-01-18 09:11:24 UTC (rev 8067) @@ -1,3 +1,3 @@ 818efbe29da417ad462e3f6345690c3d COPYING -25f0fc4fcd06e749dedc2e0fa7e0287b memconf.gz -a99158c0948d76ecb9012494697c840b memconf.man +ff3f49496c54bba509801800e3e154b9 memconf.gz +d850cd562037cd972be81a86efb8566b memconf.man This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From hson at users.sourceforge.net Mon Jan 18 10:34:38 2010 From: hson at users.sourceforge.net (hson at users.sourceforge.net) Date: Mon, 18 Jan 2010 09:34:38 +0000 Subject: [csw-devel] SF.net SVN: gar:[8068] csw/mgar/pkg/libproxy/tags Message-ID: Revision: 8068 http://gar.svn.sourceforge.net/gar/?rev=8068&view=rev Author: hson Date: 2010-01-18 09:34:38 +0000 (Mon, 18 Jan 2010) Log Message: ----------- libproxy: Tag release version Added Paths: ----------- csw/mgar/pkg/libproxy/tags/libproxy-0.3.0REV=2010.01.18/ csw/mgar/pkg/libproxy/tags/libproxy-0.3.0REV=2010.01.18/Makefile csw/mgar/pkg/libproxy/tags/libproxy-0.3.0REV=2010.01.18/checksums csw/mgar/pkg/libproxy/tags/libproxy-0.3.0REV=2010.01.18/files/0001-Use-xc99-for-Sun-Studio-compiler.patch csw/mgar/pkg/libproxy/tags/libproxy-0.3.0REV=2010.01.18/files/Solaris8-have-no-stdc99-flag.patch csw/mgar/pkg/libproxy/tags/libproxy-0.3.0REV=2010.01.18/files/SunStudio-have-no-stdc99-flag.patch csw/mgar/pkg/libproxy/tags/libproxy-0.3.0REV=2010.01.18/files/proxy.c.patch csw/mgar/pkg/libproxy/tags/libproxy-0.3.0REV=2010.01.18/files/stdfiles.patch Removed Paths: ------------- csw/mgar/pkg/libproxy/tags/libproxy-0.3.0REV=2010.01.15/ csw/mgar/pkg/libproxy/tags/libproxy-0.3.0REV=2010.01.18/Makefile csw/mgar/pkg/libproxy/tags/libproxy-0.3.0REV=2010.01.18/checksums csw/mgar/pkg/libproxy/tags/libproxy-0.3.0REV=2010.01.18/files/0001-Use-xc99-for-Sun-Studio-compiler.patch Deleted: csw/mgar/pkg/libproxy/tags/libproxy-0.3.0REV=2010.01.18/Makefile =================================================================== --- csw/mgar/pkg/libproxy/trunk/Makefile 2010-01-11 15:28:58 UTC (rev 7969) +++ csw/mgar/pkg/libproxy/tags/libproxy-0.3.0REV=2010.01.18/Makefile 2010-01-18 09:34:38 UTC (rev 8068) @@ -1,33 +0,0 @@ -GARNAME = libproxy -GARVERSION = 0.3.0 -CATEGORIES = lib - -DESCRIPTION = A library that provides automatic proxy configuration management -define BLURB - libproxy exists to answer the question: Given a network resource, how do I - reach it? It handles all the details, enabling you to get back to programming. - GNOME? KDE? Command line? WPAD? PAC? Network changed? It doesn't matter! Just - ask libproxy what proxy to use: you get simple code and your users get correct, - consistant behavior and broad infrastructure compatibility. -endef - -MASTER_SITES = http://libproxy.googlecode.com/files/ -DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz -PATCHFILES = 0001-Use-xc99-for-Sun-Studio-compiler.patch -PATCHFILES += 0002-Dont-preset-CFLAGS.patch - -# We define upstream file regex so we can be notifed of new upstream software release -UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz - -PACKAGING_PLATFORMS = solaris10-sparc solaris10-i386 - -EXTRA_LINKER_FLAGS = -lnsl -BUILD64 = 1 -CONFIGURE_ARGS = $(DIRPATHS) - -TEST_TARGET = check - -include gar/category.mk - -# There is actually the cpp executable in /usr/lib -PATH := $(PATH):/usr/lib Copied: csw/mgar/pkg/libproxy/tags/libproxy-0.3.0REV=2010.01.18/Makefile (from rev 8065, csw/mgar/pkg/libproxy/trunk/Makefile) =================================================================== --- csw/mgar/pkg/libproxy/tags/libproxy-0.3.0REV=2010.01.18/Makefile (rev 0) +++ csw/mgar/pkg/libproxy/tags/libproxy-0.3.0REV=2010.01.18/Makefile 2010-01-18 09:34:38 UTC (rev 8068) @@ -0,0 +1,100 @@ +GARNAME = libproxy +GARVERSION = 0.3.0 +CATEGORIES = lib + +DESCRIPTION = A library that provides automatic proxy configuration management +define BLURB + libproxy exists to answer the question: Given a network resource, how do I + reach it? It handles all the details, enabling you to get back to programming. + GNOME? KDE? Command line? WPAD? PAC? Network changed? It doesn't matter! Just + ask libproxy what proxy to use: you get simple code and your users get correct, + consistant behavior and broad infrastructure compatibility. +endef + +MASTER_SITES = http://libproxy.googlecode.com/files/ +DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz +DISTFILES += SunStudio-have-no-stdc99-flag.patch +DISTFILES += Solaris8-have-no-stdc99-flag.patch +DISTFILES += stdfiles.patch +DISTFILES += proxy.c.patch +DISTFILES += 0002-Dont-preset-CFLAGS.patch + +PACKAGING_PLATFORMS = solaris8-sparc solaris8-i386 +PACKAGING_PLATFORMS += solaris10-sparc solaris10-i386 + +#PATCHFILES = 0001-Use-xc99-for-Sun-Studio-compiler.patch +# For Solaris 10 targets +PATCHFILES_solaris10-sparc += SunStudio-have-no-stdc99-flag.patch +PATCHFILES_solaris10-i386 += SunStudio-have-no-stdc99-flag.patch +#For Solaris 8 targets +PATCHFILES_solaris8-sparc += Solaris8-have-no-stdc99-flag.patch +PATCHFILES_solaris8-sparc += stdfiles.patch +PATCHFILES_solaris8-sparc += proxy.c.patch +PATCHFILES_solaris8-i386_isa-amd64 += SunStudio-have-no-stdc99-flag.patch +PATCHFILES_solaris8-i386_isa-i386 += Solaris8-have-no-stdc99-flag.patch +PATCHFILES_solaris8-i386_isa-i386 += stdfiles.patch +PATCHFILES_solaris8-i386_isa-i386 += proxy.c.patch +PATCHFILES += $(PATCHFILES_$(PLATFORM)) +PATCHFILES += $(PATCHFILES_$(PLATFORM)_$(MODULATION)) +PATCHFILES += 0002-Dont-preset-CFLAGS.patch + + +PACKAGES = CSWlibproxy CSWlibproxydevel CSWpy-libproxy +CATALOGNAME_CSWlibproxy = libproxy +CATALOGNAME_CSWlibproxydevel = libproxy_devel +CATALOGNAME_CSWpy-libproxy = py_libproxy +SPKG_DESC_CSWlibproxy = A library that provides automatic proxy configuration management +SPKG_DESC_CSWlibproxydevel = A library that provides automatic proxy configuration management - development files +SPKG_DESC_CSWpy-libproxy = A library that provides automatic proxy configuration management - Python bindings + +REQUIRED_PKGS_CSWlibproxy += CSWlibice CSWlibsm CSWlibx11 CSWlibxmu CSWlibxt +REQUIRED_PKGS_CSWlibproxydevel += CSWlibproxy +REQUIRED_PKGS_CSWpy-libproxy += CSWpython CSWlibproxy +PREREQUISITE_PKGS += CSWlibx11devel CSWlibxmudevel CSWlibdbusdev +#Disable Mozilla/Firefox/Seamonkey plugin until there is a 64-bit version +#PREREQUISITE_PKGS += CSWmozilla CSWseamonkey CSWfirefox + +PKGFILES_CSWlibproxydevel = $(PKGFILES_DEVEL) +PKGFILES_CSWpy-libproxy = $(libdir).*/python/site-packages/.* + +ARCHALL_CSWpy-libproxy = 1 + +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + +#PACKAGING_PLATFORMS = solaris10-sparc solaris10-i386 + +EXTRA_LINKER_FLAGS = -lnsl +BUILD64 = 1 + +EXTRA_INC = $(prefix)/X11/include +EXTRA_LIB = $(prefix)/X11/lib +EXTRA_PKG_CONFIG_DIRS = $(prefix)/X11/lib +#Disable Mozilla/Firefox/Seamonkey plugin until there is a 64-bit version +#EXTRA_PKG_CONFIG_DIRS += $(prefix)/mozilla/lib +#EXTRA_PKG_CONFIG_DIRS += $(prefix)/mozilla/firefox/lib +#EXTRA_PKG_CONFIG_DIRS += $(prefix)/mozilla/seamonkey/lib + + +CONFIGURE_ARGS = $(DIRPATHS) +#Disable Mozilla/Firefox/Seamonkey plugin until there is a 64-bit version +CONFIGURE_ARGS += --without-mozjs +CONFIGURE_ARGS += --with-python +CONFIGURE_ARGS += --disable-silent-rules + +TEST_TARGET = check + +include gar/category.mk + +#pre-configure-modulated: +# @echo " ==> Regenerating build tools..." +# @(cd $(WORKSRC) ; \ +# aclocal && \ +# autoconf && \ +# libtoolize --automake --force && \ +# aclocal && \ +# automake -a ) +# @$(MAKECOOKIE) + + +# There is actually the cpp executable in /usr/lib +PATH := $(PATH):/usr/lib Deleted: csw/mgar/pkg/libproxy/tags/libproxy-0.3.0REV=2010.01.18/checksums =================================================================== --- csw/mgar/pkg/libproxy/trunk/checksums 2010-01-11 15:28:58 UTC (rev 7969) +++ csw/mgar/pkg/libproxy/tags/libproxy-0.3.0REV=2010.01.18/checksums 2010-01-18 09:34:38 UTC (rev 8068) @@ -1,3 +0,0 @@ -ce2d836df293fa8183265176459cf87e 0001-Use-xc99-for-Sun-Studio-compiler.patch -acd3e61f107ff188722fb1335e0ed37c 0002-Dont-preset-CFLAGS.patch -6ded75a6c6aef53be657ece207cc26c4 libproxy-0.3.0.tar.gz Copied: csw/mgar/pkg/libproxy/tags/libproxy-0.3.0REV=2010.01.18/checksums (from rev 8006, csw/mgar/pkg/libproxy/trunk/checksums) =================================================================== --- csw/mgar/pkg/libproxy/tags/libproxy-0.3.0REV=2010.01.18/checksums (rev 0) +++ csw/mgar/pkg/libproxy/tags/libproxy-0.3.0REV=2010.01.18/checksums 2010-01-18 09:34:38 UTC (rev 8068) @@ -0,0 +1,6 @@ +acd3e61f107ff188722fb1335e0ed37c 0002-Dont-preset-CFLAGS.patch +dd08c0fd4795084e5970d59f8de149dd Solaris8-have-no-stdc99-flag.patch +95c2645311c9e840c0ed81c7a9aefadb SunStudio-have-no-stdc99-flag.patch +6ded75a6c6aef53be657ece207cc26c4 libproxy-0.3.0.tar.gz +647cefd3bb414eb269cb59aace9eb35b proxy.c.patch +7dd25dd1f615fe7a3c2a1d9c9a179e74 stdfiles.patch Deleted: csw/mgar/pkg/libproxy/tags/libproxy-0.3.0REV=2010.01.18/files/0001-Use-xc99-for-Sun-Studio-compiler.patch =================================================================== --- csw/mgar/pkg/libproxy/trunk/files/0001-Use-xc99-for-Sun-Studio-compiler.patch 2010-01-11 15:28:58 UTC (rev 7969) +++ csw/mgar/pkg/libproxy/tags/libproxy-0.3.0REV=2010.01.18/files/0001-Use-xc99-for-Sun-Studio-compiler.patch 2010-01-18 09:34:38 UTC (rev 8068) @@ -1,56 +0,0 @@ -From 3ea26b980c8929de2f92a33de49a09dc12f63a68 Mon Sep 17 00:00:00 2001 -From: Dagobert Michelsen -Date: Tue, 5 Jan 2010 15:29:01 +0100 -Subject: [PATCH] Use xc99 for Sun Studio compiler - ---- - src/bin/Makefile.am | 2 +- - src/bin/Makefile.in | 2 +- - src/lib/Makefile.am | 2 +- - src/lib/Makefile.in | 2 +- - src/modules/Makefile.am | 2 +- - src/modules/Makefile.in | 2 +- - 6 files changed, 6 insertions(+), 6 deletions(-) - -diff --git a/src/bin/Makefile.in b/src/bin/Makefile.in -index 625fbb3..ed8cd56 100644 ---- a/src/bin/Makefile.in -+++ b/src/bin/Makefile.in -@@ -239,7 +239,7 @@ xmu_LIBS = @xmu_LIBS@ - - # Command line interface to libproxy - proxy_SOURCES = proxy.c --proxy_CPPFLAGS = -I$(top_srcdir)/src/lib -std=c99 -+proxy_CPPFLAGS = -I$(top_srcdir)/src/lib -xc99 - proxy_LDADD = ../lib/libproxy.la - all: all-am - -diff --git a/src/lib/Makefile.in b/src/lib/Makefile.in -index 77bb2da..73e087c 100644 ---- a/src/lib/Makefile.in -+++ b/src/lib/Makefile.in -@@ -277,7 +277,7 @@ libproxy_la_SOURCES = \ - strdict.c strdict.h \ - url.c url.h - --libproxy_la_CFLAGS = -DMODULEDIR=\"@MODULEDIR@@DIR_SEPARATOR@\" -DSYSCONFDIR=\"@SYSCONFDIR@@DIR_SEPARATOR@\" -std=c99 -D_POSIX_C_SOURCE=200112L -+libproxy_la_CFLAGS = -DMODULEDIR=\"@MODULEDIR@@DIR_SEPARATOR@\" -DSYSCONFDIR=\"@SYSCONFDIR@@DIR_SEPARATOR@\" -xc99 -D_POSIX_C_SOURCE=200112L - libproxy_la_LDFLAGS = -lpthread -lm -no-undefined - include_HEADERS = proxy.h - all: all-am -diff --git a/src/modules/Makefile.in b/src/modules/Makefile.in -index 6965056..45c9c57 100644 ---- a/src/modules/Makefile.in -+++ b/src/modules/Makefile.in -@@ -359,7 +359,7 @@ x11_LIBS = @x11_LIBS@ - xmu_CFLAGS = @xmu_CFLAGS@ - xmu_LIBS = @xmu_LIBS@ - moduledir = @MODULEDIR@ --AM_CFLAGS = -std=c99 -+AM_CFLAGS = -xc99 - AM_LDFLAGS = -module -avoid-version -no-undefined - - # Which modules to build --- -1.6.6 - Copied: csw/mgar/pkg/libproxy/tags/libproxy-0.3.0REV=2010.01.18/files/0001-Use-xc99-for-Sun-Studio-compiler.patch (from rev 8005, csw/mgar/pkg/libproxy/trunk/files/0001-Use-xc99-for-Sun-Studio-compiler.patch) =================================================================== --- csw/mgar/pkg/libproxy/tags/libproxy-0.3.0REV=2010.01.18/files/0001-Use-xc99-for-Sun-Studio-compiler.patch (rev 0) +++ csw/mgar/pkg/libproxy/tags/libproxy-0.3.0REV=2010.01.18/files/0001-Use-xc99-for-Sun-Studio-compiler.patch 2010-01-18 09:34:38 UTC (rev 8068) @@ -0,0 +1,56 @@ +From 3ea26b980c8929de2f92a33de49a09dc12f63a68 Mon Sep 17 00:00:00 2001 +From: Dagobert Michelsen +Date: Tue, 5 Jan 2010 15:29:01 +0100 +Subject: [PATCH] Use xc99 for Sun Studio compiler + +--- + src/bin/Makefile.am | 2 +- + src/bin/Makefile.in | 2 +- + src/lib/Makefile.am | 2 +- + src/lib/Makefile.in | 2 +- + src/modules/Makefile.am | 2 +- + src/modules/Makefile.in | 2 +- + 6 files changed, 6 insertions(+), 6 deletions(-) + +diff --git a/src/bin/Makefile.in b/src/bin/Makefile.in +index 625fbb3..ed8cd56 100644 +--- a/src/bin/Makefile.in ++++ b/src/bin/Makefile.in +@@ -239,7 +239,7 @@ xmu_LIBS = @xmu_LIBS@ + + # Command line interface to libproxy + proxy_SOURCES = proxy.c +-proxy_CPPFLAGS = -I$(top_srcdir)/src/lib -std=c99 ++proxy_CPPFLAGS = -I$(top_srcdir)/src/lib -xc99 + proxy_LDADD = ../lib/libproxy.la + all: all-am + +diff --git a/src/lib/Makefile.in b/src/lib/Makefile.in +index 77bb2da..73e087c 100644 +--- a/src/lib/Makefile.in ++++ b/src/lib/Makefile.in +@@ -277,7 +277,7 @@ libproxy_la_SOURCES = \ + strdict.c strdict.h \ + url.c url.h + +-libproxy_la_CFLAGS = -DMODULEDIR=\"@MODULEDIR@@DIR_SEPARATOR@\" -DSYSCONFDIR=\"@SYSCONFDIR@@DIR_SEPARATOR@\" -std=c99 -D_POSIX_C_SOURCE=200112L ++libproxy_la_CFLAGS = -DMODULEDIR=\"@MODULEDIR@@DIR_SEPARATOR@\" -DSYSCONFDIR=\"@SYSCONFDIR@@DIR_SEPARATOR@\" -xc99 -D_POSIX_C_SOURCE=200112L + libproxy_la_LDFLAGS = -lpthread -lm -no-undefined + include_HEADERS = proxy.h + all: all-am +diff --git a/src/modules/Makefile.in b/src/modules/Makefile.in +index 6965056..45c9c57 100644 +--- a/src/modules/Makefile.in ++++ b/src/modules/Makefile.in +@@ -359,7 +359,7 @@ x11_LIBS = @x11_LIBS@ + xmu_CFLAGS = @xmu_CFLAGS@ + xmu_LIBS = @xmu_LIBS@ + moduledir = @MODULEDIR@ +-AM_CFLAGS = -std=c99 ++AM_CFLAGS = -xc99 + AM_LDFLAGS = -module -avoid-version -no-undefined + + # Which modules to build +-- +1.6.6 + Copied: csw/mgar/pkg/libproxy/tags/libproxy-0.3.0REV=2010.01.18/files/Solaris8-have-no-stdc99-flag.patch (from rev 8006, csw/mgar/pkg/libproxy/trunk/files/Solaris8-have-no-stdc99-flag.patch) =================================================================== --- csw/mgar/pkg/libproxy/tags/libproxy-0.3.0REV=2010.01.18/files/Solaris8-have-no-stdc99-flag.patch (rev 0) +++ csw/mgar/pkg/libproxy/tags/libproxy-0.3.0REV=2010.01.18/files/Solaris8-have-no-stdc99-flag.patch 2010-01-18 09:34:38 UTC (rev 8068) @@ -0,0 +1,134 @@ +diff -Nru libproxy-0.3.0.orig/src/bin/Makefile.am libproxy-0.3.0/src/bin/Makefile.am +--- libproxy-0.3.0.orig/src/bin/Makefile.am 2009-08-14 21:00:32.000000000 +0200 ++++ libproxy-0.3.0/src/bin/Makefile.am 2010-01-07 12:16:16.608932753 +0100 +@@ -2,5 +2,5 @@ + + # Command line interface to libproxy + proxy_SOURCES = proxy.c +-proxy_CPPFLAGS = -I$(top_srcdir)/src/lib -std=c99 ++proxy_CPPFLAGS = -I$(top_srcdir)/src/lib + proxy_LDADD = ../lib/libproxy.la +diff -Nru libproxy-0.3.0.orig/src/lib/Makefile.am libproxy-0.3.0/src/lib/Makefile.am +--- libproxy-0.3.0.orig/src/lib/Makefile.am 2009-08-14 21:00:32.000000000 +0200 ++++ libproxy-0.3.0/src/lib/Makefile.am 2010-01-07 12:17:37.568266736 +0100 +@@ -10,8 +10,8 @@ + strdict.c strdict.h \ + url.c url.h + +-libproxy_la_CFLAGS = -DMODULEDIR=\"@MODULEDIR@@DIR_SEPARATOR@\" -DSYSCONFDIR=\"@SYSCONFDIR@@DIR_SEPARATOR@\" -std=c99 -D_POSIX_C_SOURCE=200112L ++libproxy_la_CFLAGS = -DMODULEDIR=\"@MODULEDIR@@DIR_SEPARATOR@\" -DSYSCONFDIR=\"@SYSCONFDIR@@DIR_SEPARATOR@\" + libproxy_la_LDFLAGS = -lpthread -lm -no-undefined + + include_HEADERS = proxy.h + +diff -Nru libproxy-0.3.0.orig/src/lib/Makefile.in libproxy-0.3.0/src/lib/Makefile.in +--- libproxy-0.3.0.orig/src/lib/Makefile.in 2009-08-14 21:05:15.000000000 +0200 ++++ libproxy-0.3.0/src/lib/Makefile.in 2010-01-07 11:58:19.284179024 +0100 +@@ -277,7 +277,7 @@ + strdict.c strdict.h \ + url.c url.h + +-libproxy_la_CFLAGS = -DMODULEDIR=\"@MODULEDIR@@DIR_SEPARATOR@\" -DSYSCONFDIR=\"@SYSCONFDIR@@DIR_SEPARATOR@\" -std=c99 -D_POSIX_C_SOURCE=200112L ++libproxy_la_CFLAGS = -DMODULEDIR=\"@MODULEDIR@@DIR_SEPARATOR@\" -DSYSCONFDIR=\"@SYSCONFDIR@@DIR_SEPARATOR@\" + libproxy_la_LDFLAGS = -lpthread -lm -no-undefined + include_HEADERS = proxy.h + all: all-am +diff -Nru libproxy-0.3.0.orig/src/modules/Makefile.am libproxy-0.3.0/src/modules/Makefile.am +--- libproxy-0.3.0.orig/src/modules/Makefile.am 2009-08-14 21:06:30.000000000 +0200 ++++ libproxy-0.3.0/src/modules/Makefile.am 2010-01-07 12:18:24.020865842 +0100 +@@ -1,5 +1,5 @@ + moduledir = @MODULEDIR@ +-AM_CFLAGS = -std=c99 ++AM_CFLAGS = + AM_LDFLAGS = -module -avoid-version -no-undefined + + +@@ -50,7 +50,7 @@ + + # GConf/GNOME Config Module + config_gnome_la_SOURCES = config_gnome.c xhasclient.c +-config_gnome_la_CPPFLAGS = -I$(top_srcdir)/src/lib -D_POSIX_C_SOURCE=200112L -DGCONFTOOLBIN='"@GCONFTOOLBIN@"' @GNOME_CFLAGS@ ++config_gnome_la_CPPFLAGS = -I$(top_srcdir)/src/lib -DGCONFTOOLBIN='"@GCONFTOOLBIN@"' @GNOME_CFLAGS@ + config_gnome_la_LIBADD = ../lib/libproxy.la + config_gnome_la_LDFLAGS = $(AM_LDFLAGS) @GNOME_LIBS@ + +@@ -77,12 +77,12 @@ + + # IP Ignore Module + ignore_ip_la_SOURCES = ignore_ip.c +-ignore_ip_la_CPPFLAGS = -I$(top_srcdir)/src/lib -D_POSIX_C_SOURCE=200112L ++ignore_ip_la_CPPFLAGS = -I$(top_srcdir)/src/lib + ignore_ip_la_LIBADD = ../lib/libproxy.la + + # WebKit (JavaScriptCore) based PAC runner + pacrunner_webkit_la_SOURCES = pacrunner_webkit.c +-pacrunner_webkit_la_CPPFLAGS = -I$(top_srcdir)/src/lib @WEBKIT_CFLAGS@ -D_POSIX_C_SOURCE=200112L ++pacrunner_webkit_la_CPPFLAGS = -I$(top_srcdir)/src/lib @WEBKIT_CFLAGS@ + pacrunner_webkit_la_LIBADD = ../lib/libproxy.la + if MINGW32 + pacrunner_webkit_la_LIBADD += ../platform/win32/libwinutils.la +@@ -92,7 +92,7 @@ + + # Mozilla (Spidermonkey) based PAC runner + pacrunner_mozjs_la_SOURCES = pacrunner_mozjs.c +-pacrunner_mozjs_la_CPPFLAGS = -I$(top_srcdir)/src/lib @MOZJS_CFLAGS@ -D_POSIX_C_SOURCE=200112L ++pacrunner_mozjs_la_CPPFLAGS = -I$(top_srcdir)/src/lib @MOZJS_CFLAGS@ + pacrunner_mozjs_la_LIBADD = ../lib/libproxy.la + pacrunner_mozjs_la_LDFLAGS = $(AM_LDFLAGS) @MOZJS_LIBS@ + nodist_pacrunner_mozjs_la_SOURCES = pacutils.h +diff -Nru libproxy-0.3.0.orig/src/modules/Makefile.in libproxy-0.3.0/src/modules/Makefile.in +--- libproxy-0.3.0.orig/src/modules/Makefile.in 2009-08-14 21:07:00.000000000 +0200 ++++ libproxy-0.3.0/src/modules/Makefile.in 2010-01-14 18:03:41.850944638 +0100 +@@ -359,7 +359,7 @@ + xmu_CFLAGS = @xmu_CFLAGS@ + xmu_LIBS = @xmu_LIBS@ + moduledir = @MODULEDIR@ +-AM_CFLAGS = -std=c99 ++AM_CFLAGS = + AM_LDFLAGS = -module -avoid-version -no-undefined + + # Which modules to build +@@ -385,7 +385,7 @@ + + # GConf/GNOME Config Module + config_gnome_la_SOURCES = config_gnome.c xhasclient.c +-config_gnome_la_CPPFLAGS = -I$(top_srcdir)/src/lib -D_POSIX_C_SOURCE=200112L -DGCONFTOOLBIN='"@GCONFTOOLBIN@"' @GNOME_CFLAGS@ ++config_gnome_la_CPPFLAGS = -I$(top_srcdir)/src/lib -DGCONFTOOLBIN='"@GCONFTOOLBIN@"' @GNOME_CFLAGS@ + config_gnome_la_LIBADD = ../lib/libproxy.la + config_gnome_la_LDFLAGS = $(AM_LDFLAGS) @GNOME_LIBS@ + +@@ -412,19 +412,19 @@ + + # IP Ignore Module + ignore_ip_la_SOURCES = ignore_ip.c +-ignore_ip_la_CPPFLAGS = -I$(top_srcdir)/src/lib -D_POSIX_C_SOURCE=200112L ++ignore_ip_la_CPPFLAGS = -I$(top_srcdir)/src/lib + ignore_ip_la_LIBADD = ../lib/libproxy.la + + # WebKit (JavaScriptCore) based PAC runner + pacrunner_webkit_la_SOURCES = pacrunner_webkit.c +-pacrunner_webkit_la_CPPFLAGS = -I$(top_srcdir)/src/lib @WEBKIT_CFLAGS@ -D_POSIX_C_SOURCE=200112L ++pacrunner_webkit_la_CPPFLAGS = -I$(top_srcdir)/src/lib @WEBKIT_CFLAGS@ + pacrunner_webkit_la_LIBADD = ../lib/libproxy.la $(am__append_10) + pacrunner_webkit_la_LDFLAGS = $(AM_LDFLAGS) @WEBKIT_LIBS@ + nodist_pacrunner_webkit_la_SOURCES = pacutils.h + + # Mozilla (Spidermonkey) based PAC runner + pacrunner_mozjs_la_SOURCES = pacrunner_mozjs.c +-pacrunner_mozjs_la_CPPFLAGS = -I$(top_srcdir)/src/lib @MOZJS_CFLAGS@ -D_POSIX_C_SOURCE=200112L ++pacrunner_mozjs_la_CPPFLAGS = -I$(top_srcdir)/src/lib @MOZJS_CFLAGS@ + pacrunner_mozjs_la_LIBADD = ../lib/libproxy.la + pacrunner_mozjs_la_LDFLAGS = $(AM_LDFLAGS) @MOZJS_LIBS@ + nodist_pacrunner_mozjs_la_SOURCES = pacutils.h +diff -Nru libproxy-0.3.0.orig/src/bin/Makefile.in libproxy-0.3.0/src/bin/Makefile.in +--- libproxy-0.3.0.orig/src/bin/Makefile.in 2009-08-14 21:05:15.000000000 +0200 ++++ libproxy-0.3.0/src/bin/Makefile.in 2010-01-14 18:04:24.531275033 +0100 +@@ -239,7 +239,7 @@ + + # Command line interface to libproxy + proxy_SOURCES = proxy.c +-proxy_CPPFLAGS = -I$(top_srcdir)/src/lib -std=c99 ++proxy_CPPFLAGS = -I$(top_srcdir)/src/lib + proxy_LDADD = ../lib/libproxy.la + all: all-am + Copied: csw/mgar/pkg/libproxy/tags/libproxy-0.3.0REV=2010.01.18/files/SunStudio-have-no-stdc99-flag.patch (from rev 8006, csw/mgar/pkg/libproxy/trunk/files/SunStudio-have-no-stdc99-flag.patch) =================================================================== --- csw/mgar/pkg/libproxy/tags/libproxy-0.3.0REV=2010.01.18/files/SunStudio-have-no-stdc99-flag.patch (rev 0) +++ csw/mgar/pkg/libproxy/tags/libproxy-0.3.0REV=2010.01.18/files/SunStudio-have-no-stdc99-flag.patch 2010-01-18 09:34:38 UTC (rev 8068) @@ -0,0 +1,69 @@ +diff -Nru libproxy-0.3.0.orig/src/bin/Makefile.am libproxy-0.3.0/src/bin/Makefile.am +--- libproxy-0.3.0.orig/src/bin/Makefile.am 2009-08-14 21:00:32.000000000 +0200 ++++ libproxy-0.3.0/src/bin/Makefile.am 2010-01-07 12:16:16.608932753 +0100 +@@ -2,5 +2,5 @@ + + # Command line interface to libproxy + proxy_SOURCES = proxy.c +-proxy_CPPFLAGS = -I$(top_srcdir)/src/lib -std=c99 ++proxy_CPPFLAGS = -I$(top_srcdir)/src/lib -xc99 + proxy_LDADD = ../lib/libproxy.la +diff -Nru libproxy-0.3.0.orig/src/lib/Makefile.am libproxy-0.3.0/src/lib/Makefile.am +--- libproxy-0.3.0.orig/src/lib/Makefile.am 2009-08-14 21:00:32.000000000 +0200 ++++ libproxy-0.3.0/src/lib/Makefile.am 2010-01-07 12:17:37.568266736 +0100 +@@ -10,8 +10,8 @@ + strdict.c strdict.h \ + url.c url.h + +-libproxy_la_CFLAGS = -DMODULEDIR=\"@MODULEDIR@@DIR_SEPARATOR@\" -DSYSCONFDIR=\"@SYSCONFDIR@@DIR_SEPARATOR@\" -std=c99 -D_POSIX_C_SOURCE=200112L ++libproxy_la_CFLAGS = -DMODULEDIR=\"@MODULEDIR@@DIR_SEPARATOR@\" -DSYSCONFDIR=\"@SYSCONFDIR@@DIR_SEPARATOR@\" -xc99 -D_POSIX_C_SOURCE=200112L + libproxy_la_LDFLAGS = -lpthread -lm -no-undefined + + include_HEADERS = proxy.h + +diff -Nru libproxy-0.3.0.orig/src/lib/Makefile.in libproxy-0.3.0/src/lib/Makefile.in +--- libproxy-0.3.0.orig/src/lib/Makefile.in 2009-08-14 21:05:15.000000000 +0200 ++++ libproxy-0.3.0/src/lib/Makefile.in 2010-01-07 11:58:19.284179024 +0100 +@@ -277,7 +277,7 @@ + strdict.c strdict.h \ + url.c url.h + +-libproxy_la_CFLAGS = -DMODULEDIR=\"@MODULEDIR@@DIR_SEPARATOR@\" -DSYSCONFDIR=\"@SYSCONFDIR@@DIR_SEPARATOR@\" -std=c99 -D_POSIX_C_SOURCE=200112L ++libproxy_la_CFLAGS = -DMODULEDIR=\"@MODULEDIR@@DIR_SEPARATOR@\" -DSYSCONFDIR=\"@SYSCONFDIR@@DIR_SEPARATOR@\" -xc99 -D_POSIX_C_SOURCE=200112L + libproxy_la_LDFLAGS = -lpthread -lm -no-undefined + include_HEADERS = proxy.h + all: all-am +diff -Nru libproxy-0.3.0.orig/src/modules/Makefile.am libproxy-0.3.0/src/modules/Makefile.am +--- libproxy-0.3.0.orig/src/modules/Makefile.am 2009-08-14 21:06:30.000000000 +0200 ++++ libproxy-0.3.0/src/modules/Makefile.am 2010-01-07 12:18:24.020865842 +0100 +@@ -1,5 +1,5 @@ + moduledir = @MODULEDIR@ +-AM_CFLAGS = -std=c99 ++AM_CFLAGS = -xc99 + AM_LDFLAGS = -module -avoid-version -no-undefined + + +diff -Nru libproxy-0.3.0.orig/src/modules/Makefile.in libproxy-0.3.0/src/modules/Makefile.in +--- libproxy-0.3.0.orig/src/modules/Makefile.in 2009-08-14 21:07:00.000000000 +0200 ++++ libproxy-0.3.0/src/modules/Makefile.in 2010-01-14 18:03:41.850944638 +0100 +@@ -359,7 +359,7 @@ + xmu_CFLAGS = @xmu_CFLAGS@ + xmu_LIBS = @xmu_LIBS@ + moduledir = @MODULEDIR@ +-AM_CFLAGS = -std=c99 ++AM_CFLAGS = -xc99 + AM_LDFLAGS = -module -avoid-version -no-undefined + + # Which modules to build +diff -Nru libproxy-0.3.0.orig/src/bin/Makefile.in libproxy-0.3.0/src/bin/Makefile.in +--- libproxy-0.3.0.orig/src/bin/Makefile.in 2009-08-14 21:05:15.000000000 +0200 ++++ libproxy-0.3.0/src/bin/Makefile.in 2010-01-14 18:04:24.531275033 +0100 +@@ -239,7 +239,7 @@ + + # Command line interface to libproxy + proxy_SOURCES = proxy.c +-proxy_CPPFLAGS = -I$(top_srcdir)/src/lib -std=c99 ++proxy_CPPFLAGS = -I$(top_srcdir)/src/lib -xc99 + proxy_LDADD = ../lib/libproxy.la + all: all-am + Copied: csw/mgar/pkg/libproxy/tags/libproxy-0.3.0REV=2010.01.18/files/proxy.c.patch (from rev 8006, csw/mgar/pkg/libproxy/trunk/files/proxy.c.patch) =================================================================== --- csw/mgar/pkg/libproxy/tags/libproxy-0.3.0REV=2010.01.18/files/proxy.c.patch (rev 0) +++ csw/mgar/pkg/libproxy/tags/libproxy-0.3.0REV=2010.01.18/files/proxy.c.patch 2010-01-18 09:34:38 UTC (rev 8068) @@ -0,0 +1,40 @@ +diff -Nru libproxy-0.3.0.orig/src/lib/proxy.c libproxy-0.3.0/src/lib/proxy.c +--- libproxy-0.3.0.orig/src/lib/proxy.c 2009-08-14 21:00:32.000000000 +0200 ++++ libproxy-0.3.0/src/lib/proxy.c 2010-01-07 11:57:19.188739832 +0100 +@@ -162,17 +162,37 @@ + if (!px_module_manager_register_type(self->mm, pxWPADModule, _px_wpad_module_cmp, false)) goto error; + + /* If we have a config file, load the config order from it */ ++#if (defined(__SUNPRO_C) && ( defined(__SunOS_5_8) || defined(__SunOS_5_9))) ++ char *envp; ++ envp = px_malloc0(strlen("_PX_CONFIG_ORDER")+3); ++ sprintf(envp,"_PX_CONFIG_ORDER="); ++ putenv(envp); ++#else + setenv("_PX_CONFIG_ORDER", "", 1); ++#endif + pxConfigFile *cf = px_config_file_new(SYSCONFDIR "proxy.conf"); + if (cf) + { + char *tmp = px_config_file_get_value(cf, PX_CONFIG_FILE_DEFAULT_SECTION, "config_order"); + px_config_file_free(cf); ++#if (defined(__SUNPRO_C) && ( defined(__SunOS_5_8) || defined(__SunOS_5_9))) ++ if (tmp) { ++ int retval; ++ envp = px_malloc0(strlen("_PX_CONFIG_ORDER")+strlen(tmp)+2); ++ sprintf(envp,"_PX_CONFIG_ORDER=%s",tmp); ++ retval = putenv(envp); ++ if(retval) { ++ px_free(tmp); ++ goto error; ++ } ++ } ++#else + if (tmp && setenv("_PX_CONFIG_ORDER", tmp, 1)) + { + px_free(tmp); + goto error; + } ++#endif + px_free(tmp); + } Copied: csw/mgar/pkg/libproxy/tags/libproxy-0.3.0REV=2010.01.18/files/stdfiles.patch (from rev 8006, csw/mgar/pkg/libproxy/trunk/files/stdfiles.patch) =================================================================== --- csw/mgar/pkg/libproxy/tags/libproxy-0.3.0REV=2010.01.18/files/stdfiles.patch (rev 0) +++ csw/mgar/pkg/libproxy/tags/libproxy-0.3.0REV=2010.01.18/files/stdfiles.patch 2010-01-18 09:34:38 UTC (rev 8068) @@ -0,0 +1,34 @@ +diff -Nru libproxy-0.3.0.orig/src/lib/stdbool.h libproxy-0.3.0/src/lib/stdbool.h +--- libproxy-0.3.0.orig/src/lib/stdbool.h 1970-01-01 01:00:00.000000000 +0100 ++++ libproxy-0.3.0/src/lib/stdbool.h 2010-01-15 00:49:51.930719445 +0100 +@@ -0,0 +1,17 @@ ++#ifndef _STDBOOL_H ++#ifndef _MY_STDBOOL_H ++#define _MY_STDBOOL_H ++ ++#if !defined(__GNUG__) && (defined(__SUNPRO_C) && ( defined(__SunOS_5_8) || defined(__SunOS_5_9))) ++ ++#ifndef bool ++#define bool int ++#define false 0 ++#define true 1 ++#endif /* bool */ ++ ++#endif /* Compiler has bool */ ++ ++ ++#endif /* _MY_BOOL_H_*/ ++#endif /* _STDBOOL_H_*/ +diff -Nru libproxy-0.3.0.orig/src/lib/stdint.h libproxy-0.3.0/src/lib/stdint.h +--- libproxy-0.3.0.orig/src/lib/stdint.h 1970-01-01 01:00:00.000000000 +0100 ++++ libproxy-0.3.0/src/lib/stdint.h 2010-01-15 01:00:57.971084112 +0100 +@@ -0,0 +1,9 @@ ++#ifndef _STDINT_H ++#ifndef _MY_STDINT_H ++#define _MY_STDINT_H ++ ++#if !defined(__GNUG__) && (defined(__SUNPRO_C) && ( defined(__SunOS_5_8) || defined(__SunOS_5_9))) ++#include ++#endif /* Compiler has stdint.h */ ++#endif /* _MY_STDINT_H */ ++#endif /* _STDINT_H */ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Mon Jan 18 11:36:17 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Mon, 18 Jan 2010 10:36:17 +0000 Subject: [csw-devel] SF.net SVN: gar:[8069] csw/mgar/pkg Message-ID: Revision: 8069 http://gar.svn.sourceforge.net/gar/?rev=8069&view=rev Author: dmichelsen Date: 2010-01-18 10:36:17 +0000 (Mon, 18 Jan 2010) Log Message: ----------- libgnugetopt: Initial commit Added Paths: ----------- csw/mgar/pkg/libgnugetopt/ csw/mgar/pkg/libgnugetopt/branches/ csw/mgar/pkg/libgnugetopt/tags/ csw/mgar/pkg/libgnugetopt/trunk/ csw/mgar/pkg/libgnugetopt/trunk/Makefile csw/mgar/pkg/libgnugetopt/trunk/checksums csw/mgar/pkg/libgnugetopt/trunk/files/ Property changes on: csw/mgar/pkg/libgnugetopt/trunk ___________________________________________________________________ Added: svn:ignore + cookies download work Added: svn:externals + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 Added: csw/mgar/pkg/libgnugetopt/trunk/Makefile =================================================================== --- csw/mgar/pkg/libgnugetopt/trunk/Makefile (rev 0) +++ csw/mgar/pkg/libgnugetopt/trunk/Makefile 2010-01-18 10:36:17 UTC (rev 8069) @@ -0,0 +1,20 @@ +GARNAME = libgnugetopt +GARVERSION = 1.3 +CATEGORIES = lib + +DESCRIPTION = Library containing getopt_long +define BLURB +endef + +MASTER_SITES = http://distfiles.macports.org/libgnugetopt/ +DISTFILES = $(GARNAME)-$(GARVERSION).tar.bz2 + +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.bz2 + +BUILD64 = 1 +CONFIGURE_ARGS = $(DIRPATHS) + +TEST_TARGET = check + +include gar/category.mk Added: csw/mgar/pkg/libgnugetopt/trunk/checksums =================================================================== --- csw/mgar/pkg/libgnugetopt/trunk/checksums (rev 0) +++ csw/mgar/pkg/libgnugetopt/trunk/checksums 2010-01-18 10:36:17 UTC (rev 8069) @@ -0,0 +1 @@ +0aaa5f3b90a6f7c44aeec26cd61dca92 libgnugetopt-1.3.tar.bz2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Mon Jan 18 11:54:06 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Mon, 18 Jan 2010 10:54:06 +0000 Subject: [csw-devel] SF.net SVN: gar:[8070] csw/mgar/gar/v2/gar.conf.mk Message-ID: Revision: 8070 http://gar.svn.sourceforge.net/gar/?rev=8070&view=rev Author: dmichelsen Date: 2010-01-18 10:54:06 +0000 (Mon, 18 Jan 2010) Log Message: ----------- mGAR v2: Add Berlios support Modified Paths: -------------- csw/mgar/gar/v2/gar.conf.mk Modified: csw/mgar/gar/v2/gar.conf.mk =================================================================== --- csw/mgar/gar/v2/gar.conf.mk 2010-01-18 10:36:17 UTC (rev 8069) +++ csw/mgar/gar/v2/gar.conf.mk 2010-01-18 10:54:06 UTC (rev 8070) @@ -561,6 +561,10 @@ GOOGLE_PROJECT ?= $(GARNAME) GOOGLE_MIRROR ?= http://$(GOOGLE_PROJECT).googlecode.com/files/ +# Berlios +BERLIOS_PROJECT ?= $(GARNAME) +BERLIOS_MIRROR ?= http://download.berlios.de/$(BERLIOS_PROJECT)/ http://download2.berlios.de/$(BERLIOS_PROJECT)/ + # GNU GNU_SITE = http://mirrors.kernel.org GNU_GNUROOT = $(GNU_SITE)/gnu This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Mon Jan 18 13:30:10 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Mon, 18 Jan 2010 12:30:10 +0000 Subject: [csw-devel] SF.net SVN: gar:[8071] csw/mgar/pkg Message-ID: Revision: 8071 http://gar.svn.sourceforge.net/gar/?rev=8071&view=rev Author: dmichelsen Date: 2010-01-18 12:30:10 +0000 (Mon, 18 Jan 2010) Log Message: ----------- lensfun: Initial commit, doesn't compile yet Added Paths: ----------- csw/mgar/pkg/lensfun/ csw/mgar/pkg/lensfun/branches/ csw/mgar/pkg/lensfun/tags/ csw/mgar/pkg/lensfun/trunk/ csw/mgar/pkg/lensfun/trunk/Makefile csw/mgar/pkg/lensfun/trunk/checksums csw/mgar/pkg/lensfun/trunk/files/ Property changes on: csw/mgar/pkg/lensfun/trunk ___________________________________________________________________ Added: svn:ignore + cookies download work Added: svn:externals + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 Added: csw/mgar/pkg/lensfun/trunk/Makefile =================================================================== --- csw/mgar/pkg/lensfun/trunk/Makefile (rev 0) +++ csw/mgar/pkg/lensfun/trunk/Makefile 2010-01-18 12:30:10 UTC (rev 8071) @@ -0,0 +1,61 @@ +GARNAME = lensfun +GARVERSION = 0.2.4 +CATEGORIES = lib + +DESCRIPTION = Library to correct images based on intimate knowledge of lens characteristics +define BLURB + The project provides a database of photographic lenses and a library that allows + advanced access to the database including functions to correct images based on + intimate knowledge of lens characteristics and calibration data. +endef + +MASTER_SITES = $(BERLIOS_MIRROR) +DISTFILES = $(GARNAME)-$(GARVERSION).tar.bz2 + +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.bz2 + +REQUIRED_PKGS = CSWzlib CSWpng +PREREQUISITE_PKGS = $(REQUIRED_PKGS) CSWpython CSWdoxygen + +PACKAGES = CSWliblensfun +CATALOGNAME = liblensfun + +SPKG_SOURCEURL = http://developer.berlios.de/projects/lensfun/ + +LD=$(CC) +EXTRA_COMMON_EXPORTS = LD + +BUILD64 = 1 +# This is not autoconf, but some hand-hacked Python thingie. +CONFIGURE_ARGS = --prefix=$(prefix) +CONFIGURE_ARGS += --bindir=$(bindir) +CONFIGURE_ARGS += --sysconfdir=$(sysconfdir) +CONFIGURE_ARGS += --datadir=$(datadir) +CONFIGURE_ARGS += --libdir=$(libdir) +CONFIGURE_ARGS += --includedir=$(includedir) +CONFIGURE_ARGS += --libexecdir=$(libexecdir) +CONFIGURE_ARGS += --docdir=$(docdir) +CONFIGURE_ARGS += --verbose +CONFIGURE_ARGS += --mode=release +# CONFIGURE_ARGS += --compiler=$(CC) +# [ "CC", None, "Override the C compiler name/path" ], +# [ "CXX", None, "Override the C++ compiler name/path" ], +# [ "LD", None, "Override the linker name/path" ] +CONFIGURE_ARGS += --cflags="$(CFLAGS)" +CONFIGURE_ARGS += --cxxflags="$(CXXFLAGS)" +CONFIGURE_ARGS += --ldflags="$(LDFLAGS)" +CONFIGURE_ARGS += --target=posix +CONFIGURE_ARGS += --staticlibs=NO +# --libs=LIBS Additional libraries to link with + +BUILD_ARG = all + +include gar/category.mk + +# Make sure we have GNU make with name "make" before /usr/ccs/bin/make +PATH := /opt/csw/gnu:$(PATH) + +post-extract-modulated: + perl -pi -e "s,#!/usr/bin/python,#!/opt/csw/bin/python," $(WORKSRC)/configure + @$(MAKECOOKIE) Added: csw/mgar/pkg/lensfun/trunk/checksums =================================================================== --- csw/mgar/pkg/lensfun/trunk/checksums (rev 0) +++ csw/mgar/pkg/lensfun/trunk/checksums 2010-01-18 12:30:10 UTC (rev 8071) @@ -0,0 +1 @@ +ce5c25fc708d1c629d485fbf959dc1cc lensfun-0.2.4.tar.bz2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Mon Jan 18 13:39:53 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Mon, 18 Jan 2010 12:39:53 +0000 Subject: [csw-devel] SF.net SVN: gar:[8072] csw/mgar/pkg/sasl/branches/sasl-2.1.23-mGARv2 Message-ID: Revision: 8072 http://gar.svn.sourceforge.net/gar/?rev=8072&view=rev Author: dmichelsen Date: 2010-01-18 12:39:52 +0000 (Mon, 18 Jan 2010) Log Message: ----------- sasl branch 2.1.23: Move to mGAR v2 Modified Paths: -------------- csw/mgar/pkg/sasl/branches/sasl-2.1.23-mGARv2/Makefile csw/mgar/pkg/sasl/branches/sasl-2.1.23-mGARv2/checksums csw/mgar/pkg/sasl/branches/sasl-2.1.23-mGARv2/files/cswsaslauthd.init Removed Paths: ------------- csw/mgar/pkg/sasl/branches/sasl-2.1.23-mGARv2/files/CSWsasl.depend csw/mgar/pkg/sasl/branches/sasl-2.1.23-mGARv2/files/CSWsasl.gspec csw/mgar/pkg/sasl/branches/sasl-2.1.23-mGARv2/files/CSWsasl.postinstall csw/mgar/pkg/sasl/branches/sasl-2.1.23-mGARv2/files/CSWsasl.preinstall csw/mgar/pkg/sasl/branches/sasl-2.1.23-mGARv2/files/CSWsaslauthd.depend csw/mgar/pkg/sasl/branches/sasl-2.1.23-mGARv2/files/CSWsaslauthd.gspec csw/mgar/pkg/sasl/branches/sasl-2.1.23-mGARv2/files/CSWsaslgssapi.depend csw/mgar/pkg/sasl/branches/sasl-2.1.23-mGARv2/files/CSWsaslgssapi.gspec csw/mgar/pkg/sasl/branches/sasl-2.1.23-mGARv2/files/CSWsaslgssapi.prototype csw/mgar/pkg/sasl/branches/sasl-2.1.23-mGARv2/files/CSWsaslsql.depend csw/mgar/pkg/sasl/branches/sasl-2.1.23-mGARv2/files/CSWsaslsql.gspec csw/mgar/pkg/sasl/branches/sasl-2.1.23-mGARv2/files/CSWsaslsql.prototype csw/mgar/pkg/sasl/branches/sasl-2.1.23-mGARv2/files/cswusergroup Modified: csw/mgar/pkg/sasl/branches/sasl-2.1.23-mGARv2/Makefile =================================================================== --- csw/mgar/pkg/sasl/branches/sasl-2.1.23-mGARv2/Makefile 2010-01-18 12:30:10 UTC (rev 8071) +++ csw/mgar/pkg/sasl/branches/sasl-2.1.23-mGARv2/Makefile 2010-01-18 12:39:52 UTC (rev 8072) @@ -11,40 +11,25 @@ layer is inserted between the protocol and the connection. endef -# Source location MASTER_SITES = ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/ - -# Visitor information -SPKG_SOURCEURL = http://asg.web.cmu.edu/sasl/ - WORKSRC = $(WORKDIR)/cyrus-$(GARNAME)-$(GARVERSION) DISTFILES = cyrus-$(GARNAME)-$(GARVERSION).tar.gz - -# SASL libraries and utilities -DISTFILES += CSWsasl.preinstall CSWsasl.postinstall -# SASL authentication server -#DISTFILES += $(call admfiles,CSWsaslauthd,$(ADMADDON)) -# SASL sql plugin -#DISTFILES += $(call admfiles,CSWsaslsql,$(ADMSTANDARD)) -# SASL gssapi plugin -#DISTFILES += $(call admfiles,CSWsaslgssapi,$(ADMSTANDARD)) - -DISTFILES += cswusergroup - -# Init files for SASLAUTHD DISTFILES += cswsaslauthd.init saslauthd.init.CSW +DISTFILES += README.sasl README.saslauthd PATCHFILES = saslauthd-doc.diff saslauthd-groff.diff ltmain.diff PACKAGES = CSWsasl CSWsaslauthd CSWsaslgssapi CSWsaslsql +SPKG_SOURCEURL = http://asg.web.cmu.edu/sasl/ + CATALOGNAME_CSWsasl = sasl CATALOGNAME_CSWsaslauthd = saslauthd CATALOGNAME_CSWsaslgssapi = sasl_gssapi CATALOGNAME_CSWsaslsql = sasl_sql -REQUIRED_PKGS_CSWsasl = CSWosslrt CSWbdb4 +REQUIRED_PKGS_CSWsasl = CSWosslrt CSWbdb47 REQUIRED_PKGS_CSWsaslauthd = CSWosslrt CSWoldaprt CSWkrb5lib REQUIRED_PKGS_CSWsaslgssapi = CSWsasl CSWkrb5lib REQUIRED_PKGS_CSWsaslsql = CSWsasl CSWlibpq CSWmysql4rt CSWsqlite @@ -57,11 +42,12 @@ # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = cyrus-$(GARNAME)-(\d+(?:\.\d+)*).tar.gz -BUILD64 = 1 +# It is a long way to 64 bits... +# BUILD64 = 1 # Do not use LD_OPTIONS as it breaks tests by using the installed libraries # before the newly built ones. -EXTRA_LDFLAGS = $(RUNPATH_LINKER_FLAGS) +EXTRA_LINKER_FLAGS = $(RUNPATH_LINKER_FLAGS) LD_OPTIONS = BUILD_ENV = _REENTRANT=1 @@ -70,20 +56,24 @@ EXTRA_LIBS += /opt/csw/mysql4/lib EXTRA_LIBS += /opt/csw/postgresql/lib +sysconfdir = /etc/opt/csw +localstatedir = /var/opt/csw + # SASL configuration CONFIGURE_ARGS = $(DIRPATHS) +CONFIGURE_ARGS += --enable-shared CONFIGURE_ARGS += --disable-static CONFIGURE_ARGS += --enable-sql CONFIGURE_ARGS += --with-bdb-libdir=/opt/csw/bdb47/lib CONFIGURE_ARGS += --with-bdb-incdir=/opt/csw/bdb47/include/ -CONFIGURE_ARGS += --with-saslauthd=/var/opt/csw/saslauthd +CONFIGURE_ARGS += --with-saslauthd=$(localstatedir)/saslauthd CONFIGURE_ARGS += --with-ipctype=unix -CONFIGURE_ARGS += --with-ldap=/opt/csw -CONFIGURE_ARGS += --with-mysql=/opt/csw/mysql4/ -CONFIGURE_ARGS += --with-pgsql=/opt/csw/postgresql -CONFIGURE_ARGS += --with-openssl=/opt/csw -CONFIGURE_ARGS += --with-dbpath=/opt/csw/etc/sasldb2 -CONFIGURE_ARGS += --with-plugindir=/opt/csw/lib/sasl2 +CONFIGURE_ARGS += --with-ldap=$(prefix) +CONFIGURE_ARGS += --with-mysql=$(prefix)/mysql4/ +CONFIGURE_ARGS += --with-pgsql=$(prefix)/postgresql +CONFIGURE_ARGS += --with-openssl=$(prefix) +CONFIGURE_ARGS += --with-dbpath=$(sysconfdir)/sasldb2 +CONFIGURE_ARGS += --with-plugindir=$(libdir)/sasl2 CONFIGURE_ARGS += --enable-login SED=/usr/bin/sed @@ -94,9 +84,29 @@ #INSTALL_OVERRIDE_DIRS = prefix exec_prefix bindir libdir includedir mandir +PKGFILES_CSWsaslauthd = /etc/opt/csw/init.d/cswsaslauthd.init +PKGFILES_CSWsaslauthd += $(bindir)/testsaslauthd +PKGFILES_CSWsaslauthd += $(sbindir)/saslauthd +PKGFILES_CSWsaslauthd += $(mandir)/.*/saslauthd\.8 +PKGFILES_CSWsaslauthd += $(docdir)/saslauthd/LDAP_SASLAUTHD +PKGFILES_CSWsaslauthd += $(docdir)/saslauthd/README.saslauthd +PKGFILES_CSWsaslauthd += /var/opt/csw/saslauthd +PKGFILES_CSWsaslgssapi = $(libdir)/sasl2/libgssapiv2\..* +PKGFILES_CSWsaslsql = $(libdir)/sasl2/libsql\..* + +MIGRATECONF = saslauthd.conf sasldb2 +PRESERVECONF = saslauthd.conf + +INITSMF = /etc/opt/csw/init.d/cswsaslauthd.init + +CSWsasl_usergroup = :sasl:::::: + include gar/category.mk post-install-modulated: testsaslauthd install-testsaslauthd install-doc + ginstall -d $(DESTDIR)/etc/opt/csw/init.d/ + ginstall $(WORKDIR)/cswsaslauthd.init $(DESTDIR)/etc/opt/csw/init.d + @$(MAKECOOKIE) DOC_FILES = rfc1321.txt \ rfc1939.txt \ @@ -142,23 +152,21 @@ TODO \ ONEWS -INSTDIR = $(DESTDIR)/opt/csw - - testsaslauthd: cd $(WORKSRC)/saslauthd && make testsaslauthd install-testsaslauthd: - -mkdir -p $(INSTDIR)/bin - cp $(WORKSRC)/saslauthd/testsaslauthd $(INSTDIR)/bin + mkdir -p $(DESTDIR)$(bindir) + cp $(WORKSRC)/saslauthd/testsaslauthd $(DESTDIR)$(bindir) + mkdir -p $(DESTDIR)/var/opt/csw/saslauthd install-doc: - -mkdir -p $(INSTDIR)/share/doc/sasl + mkdir -p $(DESTDIR)$(docdir)/sasl + cp $(WORKDIR)/README.sasl $(DESTDIR)$(docdir)/sasl/README.CSW list='$(DOC_FILES)'; for file in $$list; do \ - cp $(WORKSRC)/doc/$$file $(INSTDIR)/share/doc/sasl; \ + cp $(WORKSRC)/doc/$$file $(DESTDIR)$(docdir)/sasl; \ done - cp files/README.sasl $(INSTDIR)/share/doc/sasl/README.CSW - -mkdir -p $(INSTDIR)/share/doc/saslauthd - cp $(WORKSRC)/saslauthd/LDAP_SASLAUTHD $(INSTDIR)/share/doc/saslauthd - cp files/README.saslauthd $(INSTDIR)/share/doc/saslauthd/README.CSW + mkdir -p $(DESTDIR)$(docdir)/saslauthd + cp $(WORKSRC)/saslauthd/LDAP_SASLAUTHD $(DESTDIR)$(docdir)/saslauthd + cp $(WORKDIR)/README.saslauthd $(DESTDIR)$(docdir)/saslauthd/README.CSW Modified: csw/mgar/pkg/sasl/branches/sasl-2.1.23-mGARv2/checksums =================================================================== --- csw/mgar/pkg/sasl/branches/sasl-2.1.23-mGARv2/checksums 2010-01-18 12:30:10 UTC (rev 8071) +++ csw/mgar/pkg/sasl/branches/sasl-2.1.23-mGARv2/checksums 2010-01-18 12:39:52 UTC (rev 8072) @@ -1,6 +1,6 @@ -614bb55932ed32486c1fd57a0059059a CSWsasl.postinstall -2762eafea57ec2e5e28e5a5a95937fa7 CSWsasl.preinstall -b2491dcfbb2be4a4a09f3003cffb1bc7 cswsaslauthd.init +0ae8b5fe39e9b2ce940284fb85de9303 README.sasl +95b3cae3de944bf6602ad83cb04f3f32 README.saslauthd +62cc0bee2337e4937fcfa847f7bdf26a cswsaslauthd.init 2eb0e48106f0e9cd8001e654f267ecbc cyrus-sasl-2.1.23.tar.gz 48af784184961368ce250c7b33d207b8 ltmain.diff 40b526754554c46d5b134f5ca21fe371 saslauthd-doc.diff Deleted: csw/mgar/pkg/sasl/branches/sasl-2.1.23-mGARv2/files/CSWsasl.depend =================================================================== --- csw/mgar/pkg/sasl/branches/sasl-2.1.23-mGARv2/files/CSWsasl.depend 2010-01-18 12:30:10 UTC (rev 8071) +++ csw/mgar/pkg/sasl/branches/sasl-2.1.23-mGARv2/files/CSWsasl.depend 2010-01-18 12:39:52 UTC (rev 8072) @@ -1,5 +0,0 @@ -P SUNWcsr - Core Solaris, (Root) -P SUNWcsl - Core Solaris, (Shared Libs) -P SUNWlibms - Sun WorkShop Bundled shared libm -P CSWossl - OpenSSL Secure Sockets Layer lib and utilities -P CSWbdb4 - berkeleydb4, embedded database libraries and utilities Deleted: csw/mgar/pkg/sasl/branches/sasl-2.1.23-mGARv2/files/CSWsasl.gspec =================================================================== --- csw/mgar/pkg/sasl/branches/sasl-2.1.23-mGARv2/files/CSWsasl.gspec 2010-01-18 12:30:10 UTC (rev 8071) +++ csw/mgar/pkg/sasl/branches/sasl-2.1.23-mGARv2/files/CSWsasl.gspec 2010-01-18 12:39:52 UTC (rev 8072) @@ -1,5 +0,0 @@ -%var bitname sasl -%var pkgname CSWsasl -%copyright url file://%{WORKSRC}/COPYING -%depend url file://%{GARDIR}/lib/sasl/files/CSWsasl.depend -%include url file://%{GARDIR}/pkglib/csw_standard.gspec Deleted: csw/mgar/pkg/sasl/branches/sasl-2.1.23-mGARv2/files/CSWsasl.postinstall =================================================================== --- csw/mgar/pkg/sasl/branches/sasl-2.1.23-mGARv2/files/CSWsasl.postinstall 2010-01-18 12:30:10 UTC (rev 8071) +++ csw/mgar/pkg/sasl/branches/sasl-2.1.23-mGARv2/files/CSWsasl.postinstall 2010-01-18 12:39:52 UTC (rev 8072) @@ -1,6 +0,0 @@ -# Display message -echo '***' -echo '*** See README.CSW in /opt/csw/share/doc/sasl **' -echo '***' - -exit 0 Deleted: csw/mgar/pkg/sasl/branches/sasl-2.1.23-mGARv2/files/CSWsasl.preinstall =================================================================== --- csw/mgar/pkg/sasl/branches/sasl-2.1.23-mGARv2/files/CSWsasl.preinstall 2010-01-18 12:30:10 UTC (rev 8071) +++ csw/mgar/pkg/sasl/branches/sasl-2.1.23-mGARv2/files/CSWsasl.preinstall 2010-01-18 12:39:52 UTC (rev 8072) @@ -1,24 +0,0 @@ -#!/bin/sh - -if [ "$PKG_INSTALL_ROOT" = "" ] ; then PKG_INSTALL_ROOT=/ ; fi - -# Next, verify that group sasl exists. -# First check target machines group file, THEN check -# NIS/NIS+/whatever - -${BASEDIR}/usr/bin/grep '^sasl:' ${BASEDIR}/etc/group >/dev/null -if [ $? -ne 0 ] ; then - ${BASEDIR}/usr/bin/getent group sasl >/dev/null - if [ $? -ne 0 ] ; then - ADDGROUP=1 - fi -fi - -if [ "$ADDGROUP" = 1 ] ; then - chroot $PKG_INSTALL_ROOT /usr/sbin/groupadd sasl - echo "sasl group added" -else - echo "sasl group detected" -fi - -exit 0 Deleted: csw/mgar/pkg/sasl/branches/sasl-2.1.23-mGARv2/files/CSWsaslauthd.depend =================================================================== --- csw/mgar/pkg/sasl/branches/sasl-2.1.23-mGARv2/files/CSWsaslauthd.depend 2010-01-18 12:30:10 UTC (rev 8071) +++ csw/mgar/pkg/sasl/branches/sasl-2.1.23-mGARv2/files/CSWsaslauthd.depend 2010-01-18 12:39:52 UTC (rev 8072) @@ -1,5 +0,0 @@ -P SUNWcsl - Core Solaris, (Shared Libs) -P SUNWgss - GSSAPI V2 -P CSWossl - OpenSSL Secure Sockets Layer lib and utilities -P CSWoldaprt - openldap, ldap clients,libraries and server -P CSWkrb5lib - A Kerberos 5 implementation: libraries Deleted: csw/mgar/pkg/sasl/branches/sasl-2.1.23-mGARv2/files/CSWsaslauthd.gspec =================================================================== --- csw/mgar/pkg/sasl/branches/sasl-2.1.23-mGARv2/files/CSWsaslauthd.gspec 2010-01-18 12:30:10 UTC (rev 8071) +++ csw/mgar/pkg/sasl/branches/sasl-2.1.23-mGARv2/files/CSWsaslauthd.gspec 2010-01-18 12:39:52 UTC (rev 8072) @@ -1,5 +0,0 @@ -%var bitname saslauthd -%var pkgname CSWsaslauthd -%copyright url file://%{WORKSRC}/COPYING -%depend url file://%{GARDIR}/lib/sasl/files/CSWsaslauthd.depend -%include url file://%{GARDIR}/pkglib/csw_standard.gspec Deleted: csw/mgar/pkg/sasl/branches/sasl-2.1.23-mGARv2/files/CSWsaslgssapi.depend =================================================================== --- csw/mgar/pkg/sasl/branches/sasl-2.1.23-mGARv2/files/CSWsaslgssapi.depend 2010-01-18 12:30:10 UTC (rev 8071) +++ csw/mgar/pkg/sasl/branches/sasl-2.1.23-mGARv2/files/CSWsaslgssapi.depend 2010-01-18 12:39:52 UTC (rev 8072) @@ -1,5 +0,0 @@ -P SUNWcsr - Core Solaris, (Root) -P SUNWcsl - Core Solaris, (Shared Libs) -P SUNWlibms - Sun WorkShop Bundled shared libm -P CSWsasl - sasl, Simple Authentication and Security Layer -P CSWkrb5lib - MIT Kerberos 5 core libraries Deleted: csw/mgar/pkg/sasl/branches/sasl-2.1.23-mGARv2/files/CSWsaslgssapi.gspec =================================================================== --- csw/mgar/pkg/sasl/branches/sasl-2.1.23-mGARv2/files/CSWsaslgssapi.gspec 2010-01-18 12:30:10 UTC (rev 8071) +++ csw/mgar/pkg/sasl/branches/sasl-2.1.23-mGARv2/files/CSWsaslgssapi.gspec 2010-01-18 12:39:52 UTC (rev 8072) @@ -1,5 +0,0 @@ -%var bitname sasl_gssapi -%var pkgname CSWsaslgssapi -%copyright url file://%{WORKSRC}/COPYING -%depend url file://%{GARDIR}/lib/sasl/files/CSWsaslgssapi.depend -%include url file://%{GARDIR}/pkglib/csw_standard.gspec Deleted: csw/mgar/pkg/sasl/branches/sasl-2.1.23-mGARv2/files/CSWsaslgssapi.prototype =================================================================== --- csw/mgar/pkg/sasl/branches/sasl-2.1.23-mGARv2/files/CSWsaslgssapi.prototype 2010-01-18 12:30:10 UTC (rev 8071) +++ csw/mgar/pkg/sasl/branches/sasl-2.1.23-mGARv2/files/CSWsaslgssapi.prototype 2010-01-18 12:39:52 UTC (rev 8072) @@ -1,7 +0,0 @@ -i copyright=CSWsaslgssapi.copyright -i depend=CSWsaslgssapi.depend -i pkginfo=CSWsaslgssapi.pkginfo -f none /opt/csw/lib/sasl2/libgssapiv2.la 0755 root bin -f none /opt/csw/lib/sasl2/libgssapiv2.so.2.0.22 0755 root bin -s none /opt/csw/lib/sasl2/libgssapiv2.so.2=libgssapiv2.so.2.0.22 root bin -s none /opt/csw/lib/sasl2/libgssapiv2.so=libgssapiv2.so.2.0.22 root bin Deleted: csw/mgar/pkg/sasl/branches/sasl-2.1.23-mGARv2/files/CSWsaslsql.depend =================================================================== --- csw/mgar/pkg/sasl/branches/sasl-2.1.23-mGARv2/files/CSWsaslsql.depend 2010-01-18 12:30:10 UTC (rev 8071) +++ csw/mgar/pkg/sasl/branches/sasl-2.1.23-mGARv2/files/CSWsaslsql.depend 2010-01-18 12:39:52 UTC (rev 8072) @@ -1,7 +0,0 @@ -P SUNWcsr - Core Solaris, (Root) -P SUNWcsl - Core Solaris, (Shared Libs) -P SUNWlibms - Sun WorkShop Bundled shared libm -P CSWsasl - sasl, Simple Authentication and Security Layer -P CSWlibpq - libraries needed by postgresql server and clients -P CSWmysql4rt - run-time lib for mysql4 -P CSWsqlite - An embeddable SQL engine in a C library Deleted: csw/mgar/pkg/sasl/branches/sasl-2.1.23-mGARv2/files/CSWsaslsql.gspec =================================================================== --- csw/mgar/pkg/sasl/branches/sasl-2.1.23-mGARv2/files/CSWsaslsql.gspec 2010-01-18 12:30:10 UTC (rev 8071) +++ csw/mgar/pkg/sasl/branches/sasl-2.1.23-mGARv2/files/CSWsaslsql.gspec 2010-01-18 12:39:52 UTC (rev 8072) @@ -1,5 +0,0 @@ -%var bitname sasl_sql -%var pkgname CSWsaslsql -%copyright url file://%{WORKSRC}/COPYING -%depend url file://%{GARDIR}/lib/sasl/files/CSWsaslsql.depend -%include url file://%{GARDIR}/pkglib/csw_standard.gspec Deleted: csw/mgar/pkg/sasl/branches/sasl-2.1.23-mGARv2/files/CSWsaslsql.prototype =================================================================== --- csw/mgar/pkg/sasl/branches/sasl-2.1.23-mGARv2/files/CSWsaslsql.prototype 2010-01-18 12:30:10 UTC (rev 8071) +++ csw/mgar/pkg/sasl/branches/sasl-2.1.23-mGARv2/files/CSWsaslsql.prototype 2010-01-18 12:39:52 UTC (rev 8072) @@ -1,7 +0,0 @@ -i copyright=CSWsaslsql.copyright -i depend=CSWsaslsql.depend -i pkginfo=CSWsaslsql.pkginfo -f none /opt/csw/lib/sasl2/libsql.la 0755 root bin -f none /opt/csw/lib/sasl2/libsql.so.2.0.22 0755 root bin -s none /opt/csw/lib/sasl2/libsql.so.2=libsql.so.2.0.22 root bin -s none /opt/csw/lib/sasl2/libsql.so=libsql.so.2.0.22 root bin Modified: csw/mgar/pkg/sasl/branches/sasl-2.1.23-mGARv2/files/cswsaslauthd.init =================================================================== --- csw/mgar/pkg/sasl/branches/sasl-2.1.23-mGARv2/files/cswsaslauthd.init 2010-01-18 12:30:10 UTC (rev 8071) +++ csw/mgar/pkg/sasl/branches/sasl-2.1.23-mGARv2/files/cswsaslauthd.init 2010-01-18 12:39:52 UTC (rev 8072) @@ -1,6 +1,18 @@ #!/bin/sh # Startup script for saslauthd +# s none /etc/rc2.d/S85cswsaslauthd=../init.d/cswsaslauthd +# s none /etc/rc0.d/K15cswsaslauthd=../init.d/cswsaslauthd +# s none /etc/rc1.d/K15cswsaslauthd=../init.d/cswsaslauthd +# s none /etc/rc2.d/K15cswsaslauthd=../init.d/cswsaslauthd +# s none /etc/rcS.d/K15cswsaslauthd=../init.d/cswsaslauthd + +# Magic setting for CSWcswclassutils +#RC_KNUM 15 +#RC_SNUM 85 +#RC_KLEV 0,1,2,S +#RC_SLEV 2 + INIT_FILE=/etc/opt/csw/saslauthd.init if [ -f "${INIT_FILE}" ]; then INIT_FILE=/opt/csw/etc/saslauthd.init Deleted: csw/mgar/pkg/sasl/branches/sasl-2.1.23-mGARv2/files/cswusergroup =================================================================== --- csw/mgar/pkg/sasl/branches/sasl-2.1.23-mGARv2/files/cswusergroup 2010-01-18 12:30:10 UTC (rev 8071) +++ csw/mgar/pkg/sasl/branches/sasl-2.1.23-mGARv2/files/cswusergroup 2010-01-18 12:39:52 UTC (rev 8072) @@ -1 +0,0 @@ -:sasl:::::: This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bonivart at users.sourceforge.net Mon Jan 18 13:49:26 2010 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Mon, 18 Jan 2010 12:49:26 +0000 Subject: [csw-devel] SF.net SVN: gar:[8073] csw/mgar/pkg Message-ID: Revision: 8073 http://gar.svn.sourceforge.net/gar/?rev=8073&view=rev Author: bonivart Date: 2010-01-18 12:49:26 +0000 (Mon, 18 Jan 2010) Log Message: ----------- Digest-SHA: update to 5.48 Added Paths: ----------- csw/mgar/pkg/Digest-SHA/ csw/mgar/pkg/Digest-SHA/branches/ csw/mgar/pkg/Digest-SHA/tags/ csw/mgar/pkg/Digest-SHA/trunk/ csw/mgar/pkg/Digest-SHA/trunk/Makefile csw/mgar/pkg/Digest-SHA/trunk/checksums csw/mgar/pkg/Digest-SHA/trunk/files/ csw/mgar/pkg/Digest-SHA/trunk/files/COPYING Property changes on: csw/mgar/pkg/Digest-SHA/trunk ___________________________________________________________________ Added: svn:ignore + cookies download work Added: svn:externals + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 Added: csw/mgar/pkg/Digest-SHA/trunk/Makefile =================================================================== --- csw/mgar/pkg/Digest-SHA/trunk/Makefile (rev 0) +++ csw/mgar/pkg/Digest-SHA/trunk/Makefile 2010-01-18 12:49:26 UTC (rev 8073) @@ -0,0 +1,16 @@ +GARNAME = Digest-SHA +GARVERSION = 5.48 +CATEGORIES = cpan +AUTHOR = MSHELOR + +DESCRIPTION = Perl extension for SHA-1/224/256/384/512 +define BLURB + Perl extension for SHA-1/224/256/384/512 +endef + +DISTFILES = COPYING + +PACKAGES = CSWpmdigestsha +CATALOGNAME = pm_digestsha + +include gar/category.mk Added: csw/mgar/pkg/Digest-SHA/trunk/checksums =================================================================== --- csw/mgar/pkg/Digest-SHA/trunk/checksums (rev 0) +++ csw/mgar/pkg/Digest-SHA/trunk/checksums 2010-01-18 12:49:26 UTC (rev 8073) @@ -0,0 +1,2 @@ +46e51a66dc97c970b6330ce8108aca04 COPYING +a7ec2c09a58a68dbf419aa191567d75e Digest-SHA-5.48.tar.gz Added: csw/mgar/pkg/Digest-SHA/trunk/files/COPYING =================================================================== --- csw/mgar/pkg/Digest-SHA/trunk/files/COPYING (rev 0) +++ csw/mgar/pkg/Digest-SHA/trunk/files/COPYING 2010-01-18 12:49:26 UTC (rev 8073) @@ -0,0 +1,10 @@ +COPYRIGHT AND LICENSE + +Copyright (C) 2003-2010 Mark Shelor + +This library is free software; you can redistribute it and/or modify +it under the same terms as Perl itself. + +Please refer to the Perl Artistic License for details: + +http://search.cpan.org/perldoc?perlartistic This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Mon Jan 18 14:16:04 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Mon, 18 Jan 2010 13:16:04 +0000 Subject: [csw-devel] SF.net SVN: gar:[8074] csw/mgar/pkg/sasl/branches/sasl-2.1.23-mGARv2/ Makefile Message-ID: Revision: 8074 http://gar.svn.sourceforge.net/gar/?rev=8074&view=rev Author: dmichelsen Date: 2010-01-18 13:16:04 +0000 (Mon, 18 Jan 2010) Log Message: ----------- sasl: Move to MySQL5 Modified Paths: -------------- csw/mgar/pkg/sasl/branches/sasl-2.1.23-mGARv2/Makefile Modified: csw/mgar/pkg/sasl/branches/sasl-2.1.23-mGARv2/Makefile =================================================================== --- csw/mgar/pkg/sasl/branches/sasl-2.1.23-mGARv2/Makefile 2010-01-18 12:49:26 UTC (rev 8073) +++ csw/mgar/pkg/sasl/branches/sasl-2.1.23-mGARv2/Makefile 2010-01-18 13:16:04 UTC (rev 8074) @@ -32,7 +32,7 @@ REQUIRED_PKGS_CSWsasl = CSWosslrt CSWbdb47 REQUIRED_PKGS_CSWsaslauthd = CSWosslrt CSWoldaprt CSWkrb5lib REQUIRED_PKGS_CSWsaslgssapi = CSWsasl CSWkrb5lib -REQUIRED_PKGS_CSWsaslsql = CSWsasl CSWlibpq CSWmysql4rt CSWsqlite +REQUIRED_PKGS_CSWsaslsql = CSWsasl CSWlibpq CSWmysql5rt CSWsqlite SPKG_DESC_CSWsasl = Cyrus Simple Authentication and Security Layer SPKG_DESC_CSWsaslauthd = Cyrus Simple Authentication and Security Layer Authentication Daemon @@ -53,9 +53,11 @@ BUILD_ENV = _REENTRANT=1 EXTRA_LIBS += /opt/csw/bdb47/lib -EXTRA_LIBS += /opt/csw/mysql4/lib +EXTRA_LIBS += /opt/csw/mysql5/lib EXTRA_LIBS += /opt/csw/postgresql/lib +EXTRA_INC = /opt/csw/mysql5/include + sysconfdir = /etc/opt/csw localstatedir = /var/opt/csw @@ -69,7 +71,7 @@ CONFIGURE_ARGS += --with-saslauthd=$(localstatedir)/saslauthd CONFIGURE_ARGS += --with-ipctype=unix CONFIGURE_ARGS += --with-ldap=$(prefix) -CONFIGURE_ARGS += --with-mysql=$(prefix)/mysql4/ +CONFIGURE_ARGS += --with-mysql=$(prefix)/mysql5/ CONFIGURE_ARGS += --with-pgsql=$(prefix)/postgresql CONFIGURE_ARGS += --with-openssl=$(prefix) CONFIGURE_ARGS += --with-dbpath=$(sysconfdir)/sasldb2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Mon Jan 18 14:25:58 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Mon, 18 Jan 2010 13:25:58 +0000 Subject: [csw-devel] SF.net SVN: gar:[8075] csw/mgar/gar/v2/bin/checkpkg Message-ID: Revision: 8075 http://gar.svn.sourceforge.net/gar/?rev=8075&view=rev Author: wahwah Date: 2010-01-18 13:25:58 +0000 (Mon, 18 Jan 2010) Log Message: ----------- mGAR v2: checkpkg, a fix for the new 'file' which prints out two colons instead of one. Modified Paths: -------------- csw/mgar/gar/v2/bin/checkpkg Modified: csw/mgar/gar/v2/bin/checkpkg =================================================================== --- csw/mgar/gar/v2/bin/checkpkg 2010-01-18 13:16:04 UTC (rev 8074) +++ csw/mgar/gar/v2/bin/checkpkg 2010-01-18 13:25:58 UTC (rev 8075) @@ -90,7 +90,9 @@ set_variables_for_individual_package_check() { f=$1 - file $f |sed 's/^.*://' |grep gzip >/dev/null + file $f \ + | sed 's/^[^:]*://' \ + | grep gzip >/dev/null if [ $? -eq 0 ] ; then TMPARCHIVE=$CHECKPKG_TMPDIR/`basename $f` if [[ -f $TMPARCHIVE ]] ; then This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bonivart at users.sourceforge.net Mon Jan 18 14:32:08 2010 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Mon, 18 Jan 2010 13:32:08 +0000 Subject: [csw-devel] SF.net SVN: gar:[8076] csw/mgar/pkg Message-ID: Revision: 8076 http://gar.svn.sourceforge.net/gar/?rev=8076&view=rev Author: bonivart Date: 2010-01-18 13:32:08 +0000 (Mon, 18 Jan 2010) Log Message: ----------- NetAddr-IP: update to 4.027 Added Paths: ----------- csw/mgar/pkg/NetAddr-IP/ csw/mgar/pkg/NetAddr-IP/branches/ csw/mgar/pkg/NetAddr-IP/tags/ csw/mgar/pkg/NetAddr-IP/trunk/ csw/mgar/pkg/NetAddr-IP/trunk/Makefile csw/mgar/pkg/NetAddr-IP/trunk/checksums csw/mgar/pkg/NetAddr-IP/trunk/files/ csw/mgar/pkg/NetAddr-IP/trunk/files/COPYING Property changes on: csw/mgar/pkg/NetAddr-IP/trunk ___________________________________________________________________ Added: svn:ignore + cookies download work Added: svn:externals + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 Added: csw/mgar/pkg/NetAddr-IP/trunk/Makefile =================================================================== --- csw/mgar/pkg/NetAddr-IP/trunk/Makefile (rev 0) +++ csw/mgar/pkg/NetAddr-IP/trunk/Makefile 2010-01-18 13:32:08 UTC (rev 8076) @@ -0,0 +1,16 @@ +GARNAME = NetAddr-IP +GARVERSION = 4.027 +CATEGORIES = cpan +AUTHOR = MIKER + +DESCRIPTION = Manages IPv4 and IPv6 addresses and subnets +define BLURB + Manages IPv4 and IPv6 addresses and subnets +endef + +DISTFILES = COPYING + +PACKAGES = CSWpmnetaddrip +CATALOGNAME = pm_netaddrip + +include gar/category.mk Added: csw/mgar/pkg/NetAddr-IP/trunk/checksums =================================================================== --- csw/mgar/pkg/NetAddr-IP/trunk/checksums (rev 0) +++ csw/mgar/pkg/NetAddr-IP/trunk/checksums 2010-01-18 13:32:08 UTC (rev 8076) @@ -0,0 +1,2 @@ +12b4da4f58fd06d52dcba60b39927d8d COPYING +c4a21a76e5b1b9f4c8e9810b78559d7b NetAddr-IP-4.027.tar.gz Added: csw/mgar/pkg/NetAddr-IP/trunk/files/COPYING =================================================================== --- csw/mgar/pkg/NetAddr-IP/trunk/files/COPYING (rev 0) +++ csw/mgar/pkg/NetAddr-IP/trunk/files/COPYING 2010-01-18 13:32:08 UTC (rev 8076) @@ -0,0 +1,9 @@ +LICENSE AND WARRANTY + +This software is (c) Luis E. Munoz and Michael A. Robinton. It can be +used under the terms of the perl artistic license provided that proper +credit for the work of the authors is preserved in the form of this +copyright notice and license for this module. + +No warranty of any kind is expressed or implied. This code might make +your computer go up in a puff of black smoke. This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Mon Jan 18 14:34:30 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Mon, 18 Jan 2010 13:34:30 +0000 Subject: [csw-devel] SF.net SVN: gar:[8077] csw/mgar/pkg/cpan/Mail-SPF/trunk/Makefile Message-ID: Revision: 8077 http://gar.svn.sourceforge.net/gar/?rev=8077&view=rev Author: dmichelsen Date: 2010-01-18 13:34:30 +0000 (Mon, 18 Jan 2010) Log Message: ----------- cpan/Mail-SPF: Fix build method and bugs #4139, #4140 Modified Paths: -------------- csw/mgar/pkg/cpan/Mail-SPF/trunk/Makefile Modified: csw/mgar/pkg/cpan/Mail-SPF/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/Mail-SPF/trunk/Makefile 2010-01-18 13:32:08 UTC (rev 8076) +++ csw/mgar/pkg/cpan/Mail-SPF/trunk/Makefile 2010-01-18 13:34:30 UTC (rev 8077) @@ -13,9 +13,20 @@ PACKAGES = CSWpmmailspf CATALOGNAME = pm_mailspf +# Required packages due to bug reports +# http://www.opencsw.org/mantis/view.php?id=4139 +# http://www.opencsw.org/mantis/view.php?id=4140 +REQUIRED_PKGS = CSWpmversion CSWpmnetaddrip + ARCHALL = 1 +CONFIGURE_SCRIPTS = $(WORKSRC)/Build.PL +BUILD_SCRIPTS = $(WORKSRC)/Build +TEST_SCRIPTS = $(WORKSRC)/Build +EXTRA_PERLBUILD_INSTALL_ARGS = --install_path sbin=$(sbindir) +INSTALL_SCRIPTS = $(WORKSRC)/Build + EXTRA_PAX_ARGS = '-s,spfquery,spfquery-cpan,p' -EXTRA_PAX_ARGS += '-s,/usr/sbin/spfd,$(sbindir)/spfd-cpan,p' +EXTRA_PAX_ARGS += '-s,spfd,spfd-cpan,p' include gar/category.mk This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Mon Jan 18 15:11:53 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Mon, 18 Jan 2010 14:11:53 +0000 Subject: [csw-devel] SF.net SVN: gar:[8078] csw/mgar/pkg Message-ID: Revision: 8078 http://gar.svn.sourceforge.net/gar/?rev=8078&view=rev Author: dmichelsen Date: 2010-01-18 14:11:50 +0000 (Mon, 18 Jan 2010) Log Message: ----------- exiv2: Initial commit Added Paths: ----------- csw/mgar/pkg/exiv2/ csw/mgar/pkg/exiv2/branches/ csw/mgar/pkg/exiv2/tags/ csw/mgar/pkg/exiv2/trunk/ csw/mgar/pkg/exiv2/trunk/Makefile csw/mgar/pkg/exiv2/trunk/checksums csw/mgar/pkg/exiv2/trunk/files/ Property changes on: csw/mgar/pkg/exiv2/trunk ___________________________________________________________________ Added: svn:ignore + cookies download work Added: svn:externals + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 Added: csw/mgar/pkg/exiv2/trunk/Makefile =================================================================== --- csw/mgar/pkg/exiv2/trunk/Makefile (rev 0) +++ csw/mgar/pkg/exiv2/trunk/Makefile 2010-01-18 14:11:50 UTC (rev 8078) @@ -0,0 +1,25 @@ +GARNAME = exiv2 +GARVERSION = 0.19 +CATEGORIES = lib + +DESCRIPTION = Image metadata library and tools +define BLURB + Exiv2 is a C++ library and a command line utility to manage image metadata. + It provides fast and easy read and write access to the Exif, IPTC and XMP metadata + of images in various formats. Exiv2 is available as free software and with a + commercial license, and is used in many projects. +endef + +MASTER_SITES = http://www.exiv2.org/ +DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz + +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + +BUILD64 = 1 +CONFIGURE_ARGS = $(DIRPATHS) + +# Sun Studio doesn't unerstand g++ features +CONFIGURE_ARGS += --disable-visibility + +include gar/category.mk Added: csw/mgar/pkg/exiv2/trunk/checksums =================================================================== --- csw/mgar/pkg/exiv2/trunk/checksums (rev 0) +++ csw/mgar/pkg/exiv2/trunk/checksums 2010-01-18 14:11:50 UTC (rev 8078) @@ -0,0 +1 @@ +f52fb75a2cb7512f1484deab76473e13 exiv2-0.19.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Mon Jan 18 16:39:38 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Mon, 18 Jan 2010 15:39:38 +0000 Subject: [csw-devel] SF.net SVN: gar:[8079] csw/mgar/pkg/exiv2/trunk Message-ID: Revision: 8079 http://gar.svn.sourceforge.net/gar/?rev=8079&view=rev Author: dmichelsen Date: 2010-01-18 15:39:38 +0000 (Mon, 18 Jan 2010) Log Message: ----------- exiv2: Add patch Modified Paths: -------------- csw/mgar/pkg/exiv2/trunk/Makefile csw/mgar/pkg/exiv2/trunk/checksums Added Paths: ----------- csw/mgar/pkg/exiv2/trunk/files/0001-Remove-unknown-flag-to-Sun-Studio.patch Modified: csw/mgar/pkg/exiv2/trunk/Makefile =================================================================== --- csw/mgar/pkg/exiv2/trunk/Makefile 2010-01-18 14:11:50 UTC (rev 8078) +++ csw/mgar/pkg/exiv2/trunk/Makefile 2010-01-18 15:39:38 UTC (rev 8079) @@ -12,6 +12,7 @@ MASTER_SITES = http://www.exiv2.org/ DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz +PATCHFILES = 0001-Remove-unknown-flag-to-Sun-Studio.patch # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz Modified: csw/mgar/pkg/exiv2/trunk/checksums =================================================================== --- csw/mgar/pkg/exiv2/trunk/checksums 2010-01-18 14:11:50 UTC (rev 8078) +++ csw/mgar/pkg/exiv2/trunk/checksums 2010-01-18 15:39:38 UTC (rev 8079) @@ -1 +1,2 @@ +ac2024c172a70a811b9972cd8b46f3f3 0001-Remove-unknown-flag-to-Sun-Studio.patch f52fb75a2cb7512f1484deab76473e13 exiv2-0.19.tar.gz Added: csw/mgar/pkg/exiv2/trunk/files/0001-Remove-unknown-flag-to-Sun-Studio.patch =================================================================== --- csw/mgar/pkg/exiv2/trunk/files/0001-Remove-unknown-flag-to-Sun-Studio.patch (rev 0) +++ csw/mgar/pkg/exiv2/trunk/files/0001-Remove-unknown-flag-to-Sun-Studio.patch 2010-01-18 15:39:38 UTC (rev 8079) @@ -0,0 +1,25 @@ +From 34049ff8c3eeaa116ccf07e4ee37ffaa7511860b Mon Sep 17 00:00:00 2001 +From: Dagobert Michelsen +Date: Mon, 18 Jan 2010 16:37:20 +0100 +Subject: [PATCH] Remove unknown flag to Sun Studio + +--- + xmpsdk/src/Makefile | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/xmpsdk/src/Makefile b/xmpsdk/src/Makefile +index 02b06f4..3b27979 100644 +--- a/xmpsdk/src/Makefile ++++ b/xmpsdk/src/Makefile +@@ -86,7 +86,7 @@ SHELL = /bin/sh + .PRECIOUS: %.cpp + + # For a debug build, replace -DNDEBUG=1 with -DDEBUG=1 -D_DEBUG=1 +-CPPFLAGS += -I../include -funsigned-char -DNDEBUG=1 $(EXPAT_CPPFLAGS) ++CPPFLAGS += -I../include -DNDEBUG=1 $(EXPAT_CPPFLAGS) + ifdef HAVE_STDINT + CPPFLAGS += -DEXV_HAVE_STDINT_H=1 + endif +-- +1.6.6 + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From skayser at users.sourceforge.net Mon Jan 18 23:48:29 2010 From: skayser at users.sourceforge.net (skayser at users.sourceforge.net) Date: Mon, 18 Jan 2010 22:48:29 +0000 Subject: [csw-devel] SF.net SVN: gar:[8080] csw/mgar/pkg/subversion/trunk/Makefile Message-ID: Revision: 8080 http://gar.svn.sourceforge.net/gar/?rev=8080&view=rev Author: skayser Date: 2010-01-18 22:48:28 +0000 (Mon, 18 Jan 2010) Log Message: ----------- subversion: documented test details and build times Modified Paths: -------------- csw/mgar/pkg/subversion/trunk/Makefile Modified: csw/mgar/pkg/subversion/trunk/Makefile =================================================================== --- csw/mgar/pkg/subversion/trunk/Makefile 2010-01-18 15:39:38 UTC (rev 8079) +++ csw/mgar/pkg/subversion/trunk/Makefile 2010-01-18 22:48:28 UTC (rev 8080) @@ -6,10 +6,11 @@ # required? The shared objects generated by SWIG have them in their NEEDED # list, but they also link against the main libsvn_client-1.so which in # turn pulls in the rest. Can this be tweaked? +# +# Known build facts/issues: # -# Known build issues/facts: -# -# * Build takes about 50 mins on build8x/build8s +# * Build takes about 50 mins on build8x, 25 mins on build8s. This is only +# the build, the tests take about 5 times as much (see TEST_TARGET). # * checkpkg suggests CSWbdb over CSWbdb47, because it picks up the # libdb-4.7.so symlink in $(libdir) which belongs to the stub CSWbdb. As # the lib itself belongs to CSWbdb47, the CSWbdb47 dep is completely fine. @@ -165,9 +166,18 @@ CONFIGURE_ARGS += --with-zlib=$(prefix) CONFIGURE_ARGS += --with-serf=$(prefix) -# Tests take *forever* -#TEST_TARGET = check -TEST_TARGET = +# Once you have verified that a new upstream release passes the tests, you can use +# "SKIPTEST=1 gmake " to skip the tests for simple repackaging tasks. +# +# Tests that fail with XFAIL (eXpected FAILs) are not actual FAILs, see +# http://svn.collab.net/repos/svn/trunk/subversion/tests/README +# +# Tests take about 4hrs on build8x, 2hrs+ on build8s +# merge_tests.py sub-suite takes most of the time. For a list of its tests see +# $(WORKSRC)/subversion/tests/cmdline/merge_tests.py --list +# and for progress information you could compare this with +# tail -f $(WORKSRC)/tests.log | grep merge_tests.py +TEST_TARGET = check include gar/category.mk This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From skayser at users.sourceforge.net Tue Jan 19 01:34:50 2010 From: skayser at users.sourceforge.net (skayser at users.sourceforge.net) Date: Tue, 19 Jan 2010 00:34:50 +0000 Subject: [csw-devel] SF.net SVN: gar:[8081] csw/mgar/pkg/mutt/trunk/Makefile Message-ID: Revision: 8081 http://gar.svn.sourceforge.net/gar/?rev=8081&view=rev Author: skayser Date: 2010-01-19 00:34:44 +0000 (Tue, 19 Jan 2010) Log Message: ----------- mutt: further fixes WRT to #3726, added --with-ssl --enable-smtp --enable-gpgme Modified Paths: -------------- csw/mgar/pkg/mutt/trunk/Makefile Modified: csw/mgar/pkg/mutt/trunk/Makefile =================================================================== --- csw/mgar/pkg/mutt/trunk/Makefile 2010-01-18 22:48:28 UTC (rev 8080) +++ csw/mgar/pkg/mutt/trunk/Makefile 2010-01-19 00:34:44 UTC (rev 8081) @@ -7,12 +7,16 @@ DESCRIPTION = A text-based mail client for Unix operating systems define BLURB + Mutt is a small but very powerful text-based MIME mail client. Mutt is + highly configurable, and is well suited to the mail power user with + advanced features like key bindings, keyboard macros, mail threading, + regular expression searches and a powerful pattern matching language for + selecting groups of messages. endef +VENDOR_URL = http://www.mutt.org MASTER_SITES = $(SF_MIRRORS) -DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz - -# We define upstream file regex so we can be notifed of new upstream software release +DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz LICENSE = COPYRIGHT @@ -37,13 +41,16 @@ sysconfdir = /etc/opt/csw -CONFIGURE_ARGS = $(DIRPATHS) - -# Add requested header fields requested in this bug: +CONFIGURE_ARGS = $(DIRPATHS) +CONFIGURE_ARGS += --enable-pop +CONFIGURE_ARGS += --enable-imap +CONFIGURE_ARGS += --enable-smtp +CONFIGURE_ARGS += --enable-gpgme +# Add IMAP header caching and SASL as requested per: # http://www.opencsw.org/mantis/view.php?id=3726 -CONFIGURE_ARGS += --with-sasl --enable-hcache -# This required POP and/or IMAP -CONFIGURE_ARGS += --enable-pop --enable-imap +CONFIGURE_ARGS += --enable-hcache +CONFIGURE_ARGS += --with-sasl +CONFIGURE_ARGS += --with-ssl CONFIGURE_ARGS_SLANG-no = CONFIGURE_ARGS_SLANG-yes = --with-slang=$(prefix) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From skayser at users.sourceforge.net Tue Jan 19 02:30:47 2010 From: skayser at users.sourceforge.net (skayser at users.sourceforge.net) Date: Tue, 19 Jan 2010 01:30:47 +0000 Subject: [csw-devel] SF.net SVN: gar:[8082] csw/mgar/pkg/mutt/trunk/Makefile Message-ID: Revision: 8082 http://gar.svn.sourceforge.net/gar/?rev=8082&view=rev Author: skayser Date: 2010-01-19 01:30:47 +0000 (Tue, 19 Jan 2010) Log Message: ----------- mutt: added required dependencies on gpgme, osslrt, zlib Modified Paths: -------------- csw/mgar/pkg/mutt/trunk/Makefile Modified: csw/mgar/pkg/mutt/trunk/Makefile =================================================================== --- csw/mgar/pkg/mutt/trunk/Makefile 2010-01-19 00:34:44 UTC (rev 8081) +++ csw/mgar/pkg/mutt/trunk/Makefile 2010-01-19 01:30:47 UTC (rev 8082) @@ -23,9 +23,18 @@ PACKAGES = CSWmutt-base CSWmutt-ncurses CSWmutt-slang -REQUIRED_PKGS_CSWmutt-base = CSWggettextrt CSWiconv CSWlibidn -REQUIRED_PKGS_CSWmutt-ncurses = CSWmutt-base CSWncurses CSWggettextrt CSWiconv CSWlibidn CSWgdbm CSWsasl -REQUIRED_PKGS_CSWmutt-slang = CSWmutt-base CSWslang CSWggettextrt CSWiconv CSWlibidn CSWgdbm CSWsasl +REQUIRED_PKGS_core = CSWgdbm +REQUIRED_PKGS_core += CSWggettextrt +REQUIRED_PKGS_core += CSWgpgerr +REQUIRED_PKGS_core += CSWgpgme +REQUIRED_PKGS_core += CSWiconv +REQUIRED_PKGS_core += CSWlibidn +REQUIRED_PKGS_core += CSWosslrt +REQUIRED_PKGS_core += CSWsasl +REQUIRED_PKGS_core += CSWzlib +REQUIRED_PKGS_CSWmutt-ncurses = $(REQUIRED_PKGS_core) CSWmutt-base CSWncurses +REQUIRED_PKGS_CSWmutt-slang = $(REQUIRED_PKGS_core) CSWmutt-base CSWslang +REQUIRED_PKGS_CSWmutt-base = CSWggettextrt CSWiconv CSWlibidn CATALOGNAME_CSWmutt-base = mutt_base CATALOGNAME_CSWmutt-ncurses = mutt_ncurses This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Tue Jan 19 08:30:26 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 19 Jan 2010 07:30:26 +0000 Subject: [csw-devel] SF.net SVN: gar:[8083] csw/mgar/pkg/slang/trunk/Makefile Message-ID: Revision: 8083 http://gar.svn.sourceforge.net/gar/?rev=8083&view=rev Author: dmichelsen Date: 2010-01-19 07:30:26 +0000 (Tue, 19 Jan 2010) Log Message: ----------- slang: Add support for oniguruma Modified Paths: -------------- csw/mgar/pkg/slang/trunk/Makefile Modified: csw/mgar/pkg/slang/trunk/Makefile =================================================================== --- csw/mgar/pkg/slang/trunk/Makefile 2010-01-19 01:30:47 UTC (rev 8082) +++ csw/mgar/pkg/slang/trunk/Makefile 2010-01-19 07:30:26 UTC (rev 8083) @@ -21,7 +21,7 @@ # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz -REQUIRED_PKGS = CSWiconv CSWpcrert CSWpng CSWzlib +REQUIRED_PKGS = CSWiconv CSWpcrert CSWpng CSWzlib CSWoniguruma SPKG_SOURCEURL = http://www.s-lang.org/ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Tue Jan 19 09:15:38 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 19 Jan 2010 08:15:38 +0000 Subject: [csw-devel] SF.net SVN: gar:[8084] csw/mgar/pkg/neon/trunk/Makefile Message-ID: Revision: 8084 http://gar.svn.sourceforge.net/gar/?rev=8084&view=rev Author: dmichelsen Date: 2010-01-19 08:15:37 +0000 (Tue, 19 Jan 2010) Log Message: ----------- neon: Add dependency to libproxy Modified Paths: -------------- csw/mgar/pkg/neon/trunk/Makefile Modified: csw/mgar/pkg/neon/trunk/Makefile =================================================================== --- csw/mgar/pkg/neon/trunk/Makefile 2010-01-19 07:30:26 UTC (rev 8083) +++ csw/mgar/pkg/neon/trunk/Makefile 2010-01-19 08:15:37 UTC (rev 8084) @@ -25,9 +25,11 @@ CATALOGNAME_CSWneon = neon CATALOGNAME_CSWneon-devel = neon_devel -REQUIRED_PKGS_CSWneon = CSWexpat CSWkrb5lib CSWosslrt CSWzlib CSWggettextrt CSWpakchois +REQUIRED_PKGS_CSWneon = CSWexpat CSWkrb5lib CSWosslrt CSWzlib CSWggettextrt CSWpakchois CSWlibproxy REQUIRED_PKGS_CSWneon-devel = CSWneon +PREREQUISITE_PKGS = $(REQUIRED_PKGS_CSWneon) + SPKG_DESC_CSWneon = Neon HTTP and WebDAV client library SPKG_DESC_CSWneon-devel = Neon HTTP and WebDAV development support This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From janholzh at users.sourceforge.net Tue Jan 19 09:44:53 2010 From: janholzh at users.sourceforge.net (janholzh at users.sourceforge.net) Date: Tue, 19 Jan 2010 08:44:53 +0000 Subject: [csw-devel] SF.net SVN: gar:[8085] csw/mgar/pkg/transmission/trunk/Makefile Message-ID: Revision: 8085 http://gar.svn.sourceforge.net/gar/?rev=8085&view=rev Author: janholzh Date: 2010-01-19 08:44:52 +0000 (Tue, 19 Jan 2010) Log Message: ----------- transmission: removed one EXTRA_FLAG Modified Paths: -------------- csw/mgar/pkg/transmission/trunk/Makefile Modified: csw/mgar/pkg/transmission/trunk/Makefile =================================================================== --- csw/mgar/pkg/transmission/trunk/Makefile 2010-01-19 08:15:37 UTC (rev 8084) +++ csw/mgar/pkg/transmission/trunk/Makefile 2010-01-19 08:44:52 UTC (rev 8085) @@ -55,7 +55,7 @@ CATALOGNAME_CSWtransmissiongtk2 = transmission_gtk2 -EXTRA_CFLAGS = -DNO_SYS_QUEUE_H -lresolv -mt +EXTRA_CFLAGS = -DNO_SYS_QUEUE_H -lresolv EXTRA_INC = /opt/csw/X11/include EXTRA_LIB = /opt/csw/X11/lib This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bonivart at users.sourceforge.net Tue Jan 19 10:53:45 2010 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Tue, 19 Jan 2010 09:53:45 +0000 Subject: [csw-devel] SF.net SVN: gar:[8086] csw/mgar/pkg/dhcp/trunk Message-ID: Revision: 8086 http://gar.svn.sourceforge.net/gar/?rev=8086&view=rev Author: bonivart Date: 2010-01-19 09:53:44 +0000 (Tue, 19 Jan 2010) Log Message: ----------- dhcp: update to 4.1.1 final Modified Paths: -------------- csw/mgar/pkg/dhcp/trunk/Makefile csw/mgar/pkg/dhcp/trunk/checksums Modified: csw/mgar/pkg/dhcp/trunk/Makefile =================================================================== --- csw/mgar/pkg/dhcp/trunk/Makefile 2010-01-19 08:44:52 UTC (rev 8085) +++ csw/mgar/pkg/dhcp/trunk/Makefile 2010-01-19 09:53:44 UTC (rev 8086) @@ -1,5 +1,5 @@ GARNAME = dhcp -GARVERSION = 4.1.1rc1 +GARVERSION = 4.1.1 CATEGORIES = net DESCRIPTION = ISC DHCP reference implementation @@ -24,7 +24,6 @@ CATALOGNAME_CSWdhcpdevel = dhcp_devel ARCHALL_CSWdhcpdevel = 1 -# We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = ($(GARNAME)-\d+(?:\.\d+)*).tar.gz GARCOMPILER = GNU Modified: csw/mgar/pkg/dhcp/trunk/checksums =================================================================== --- csw/mgar/pkg/dhcp/trunk/checksums 2010-01-19 08:44:52 UTC (rev 8085) +++ csw/mgar/pkg/dhcp/trunk/checksums 2010-01-19 09:53:44 UTC (rev 8086) @@ -1 +1 @@ -f2b4dfe70640d33b29da6b75eb5c82a0 dhcp-4.1.1rc1.tar.gz +38a74c89d8913b9b5f33737047623c18 dhcp-4.1.1.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From janholzh at users.sourceforge.net Tue Jan 19 11:22:43 2010 From: janholzh at users.sourceforge.net (janholzh at users.sourceforge.net) Date: Tue, 19 Jan 2010 10:22:43 +0000 Subject: [csw-devel] SF.net SVN: gar:[8087] csw/mgar/pkg/libsoup2/trunk/Makefile Message-ID: Revision: 8087 http://gar.svn.sourceforge.net/gar/?rev=8087&view=rev Author: janholzh Date: 2010-01-19 10:22:43 +0000 (Tue, 19 Jan 2010) Log Message: ----------- libsoup2: Update Makefile Modified Paths: -------------- csw/mgar/pkg/libsoup2/trunk/Makefile Modified: csw/mgar/pkg/libsoup2/trunk/Makefile =================================================================== --- csw/mgar/pkg/libsoup2/trunk/Makefile 2010-01-19 09:53:44 UTC (rev 8086) +++ csw/mgar/pkg/libsoup2/trunk/Makefile 2010-01-19 10:22:43 UTC (rev 8087) @@ -20,7 +20,7 @@ EXTRA_LIB = /opt/csw/X11/lib EXTRA_PKG_CONFIG_DIRS = $(prefix)/X11/lib -CONFIGURE_ARGS = $(DIRPATHS) +CONFIGURE_ARGS = $(DIRPATHS) --disable-static --with-apache-httpd=/opt/csw/apache2/sbin/httpd --with-apache-module-dir=/opt/csw/apache2/libexec/ TEST_TARGET = check This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From skayser at users.sourceforge.net Tue Jan 19 12:09:21 2010 From: skayser at users.sourceforge.net (skayser at users.sourceforge.net) Date: Tue, 19 Jan 2010 11:09:21 +0000 Subject: [csw-devel] SF.net SVN: gar:[8088] csw/mgar/pkg/subversion/trunk Message-ID: Revision: 8088 http://gar.svn.sourceforge.net/gar/?rev=8088&view=rev Author: skayser Date: 2010-01-19 11:09:21 +0000 (Tue, 19 Jan 2010) Log Message: ----------- subversion: added changelog.CSW Modified Paths: -------------- csw/mgar/pkg/subversion/trunk/Makefile csw/mgar/pkg/subversion/trunk/files/changelog.CSW Modified: csw/mgar/pkg/subversion/trunk/Makefile =================================================================== --- csw/mgar/pkg/subversion/trunk/Makefile 2010-01-19 10:22:43 UTC (rev 8087) +++ csw/mgar/pkg/subversion/trunk/Makefile 2010-01-19 11:09:21 UTC (rev 8088) @@ -281,3 +281,9 @@ $(BUILD_ENV) gmake -C $(WORKSRC) javahl; $(INSTALL_ENV) gmake -C $(WORKSRC) install-javahl; @$(MAKECOOKIE) + +post-merge: $(foreach P,$(_PKG_SPECS),install-changelog-$P) + +install-changelog-%: + ginstall -D $(FILEDIR)/changelog.CSW \ + $(PKGROOT)$(docdir)/$(call catalogname,$*)/changelog.CSW Modified: csw/mgar/pkg/subversion/trunk/files/changelog.CSW =================================================================== --- csw/mgar/pkg/subversion/trunk/files/changelog.CSW 2010-01-19 10:22:43 UTC (rev 8087) +++ csw/mgar/pkg/subversion/trunk/files/changelog.CSW 2010-01-19 11:09:21 UTC (rev 8088) @@ -1,10 +1,11 @@ -subversion (1.6.6,REV=2010.01.17) +subversion (1.6.6,REV=2010.01.19) + * Non-maintainer submission. * Restricted cswpycompile usage to python modules. (Closes #4156) * Corrected libsvn_ra_dav-1.so.0 symlinks. (Closes #4096) * Dropped openssl_rt dependency (neon with SSL support is built separately). * Dropped kerberos dependency (neon comes with Kerberos support). * Dropped libnet dependency (not required). - * Re-ordered RUNPATH and introduced $ISALIB for /opt/csw/lib/, /opt/csw/bdb47. + * Reordered RUNPATH and introduced $ISALIB for /opt/csw/lib/, /opt/csw/bdb47. - -- Sebastian Kayser Sun, 17 Jan 2010 02:39:59 +0100 + -- Sebastian Kayser Tue, 19 Jan 2010 12:06:51 +0100 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Tue Jan 19 13:40:48 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Tue, 19 Jan 2010 12:40:48 +0000 Subject: [csw-devel] SF.net SVN: gar:[8089] csw/mgar/pkg/puppet/branches/puppet-0.24.x/files/ cswpuppetd Message-ID: Revision: 8089 http://gar.svn.sourceforge.net/gar/?rev=8089&view=rev Author: wahwah Date: 2010-01-19 12:40:47 +0000 (Tue, 19 Jan 2010) Log Message: ----------- puppet-0.24.x: A fix for the startup script. The binary is in bindir, not sbindir. Modified Paths: -------------- csw/mgar/pkg/puppet/branches/puppet-0.24.x/files/cswpuppetd Modified: csw/mgar/pkg/puppet/branches/puppet-0.24.x/files/cswpuppetd =================================================================== --- csw/mgar/pkg/puppet/branches/puppet-0.24.x/files/cswpuppetd 2010-01-19 11:09:21 UTC (rev 8088) +++ csw/mgar/pkg/puppet/branches/puppet-0.24.x/files/cswpuppetd 2010-01-19 12:40:47 UTC (rev 8089) @@ -17,16 +17,17 @@ . /lib/svc/share/smf_include.sh prefix="/opt/csw" -exec_prefix="/opt/csw" -sysconfdir="/etc/csw/opt" -sbindir="/opt/csw/sbin" -localstatedir="/var/opt/csw" +exec_prefix="${prefix}" +sysconfdir="/etc${prefix}" +bindir="${prefix}/bin" +sbindir="${prefix}/sbin" +localstatedir="/var${prefix}" start_puppetd() { cd / # Start daemons. - ${sbindir}/puppetd + ${bindir}/puppetd } reload_puppetd() { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Tue Jan 19 13:41:34 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Tue, 19 Jan 2010 12:41:34 +0000 Subject: [csw-devel] SF.net SVN: gar:[8090] csw/mgar/pkg/puppet/branches/puppet-0.24.x/checksums Message-ID: Revision: 8090 http://gar.svn.sourceforge.net/gar/?rev=8090&view=rev Author: wahwah Date: 2010-01-19 12:41:33 +0000 (Tue, 19 Jan 2010) Log Message: ----------- puppet-0.24.x: checksums update Modified Paths: -------------- csw/mgar/pkg/puppet/branches/puppet-0.24.x/checksums Modified: csw/mgar/pkg/puppet/branches/puppet-0.24.x/checksums =================================================================== --- csw/mgar/pkg/puppet/branches/puppet-0.24.x/checksums 2010-01-19 12:40:47 UTC (rev 8089) +++ csw/mgar/pkg/puppet/branches/puppet-0.24.x/checksums 2010-01-19 12:41:33 UTC (rev 8090) @@ -1,6 +1,6 @@ abaa404420106f9f28e9e1218b4e365b 0001-pkgutil-support.patch 9c27c0cdca051eae986b56b91ef889ca 0002-Using-the-single-option-of-pkgutil.patch -f4a95dece2231805abf4754d72471de4 cswpuppetd +ee39853fe02ec20eae7847bcb2822ed4 cswpuppetd aba2c79e589b9bd1c881a22aa663a213 cswpuppetmasterd 3ab0d4f9801075bc78b68b766b496fc7 cswusergroup 288d46dee00acad64d0f3ecc6d8ba6fa puppet-0.24.8.tgz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From janholzh at users.sourceforge.net Tue Jan 19 13:57:23 2010 From: janholzh at users.sourceforge.net (janholzh at users.sourceforge.net) Date: Tue, 19 Jan 2010 12:57:23 +0000 Subject: [csw-devel] SF.net SVN: gar:[8091] csw/mgar/pkg/libsoup2/trunk Message-ID: Revision: 8091 http://gar.svn.sourceforge.net/gar/?rev=8091&view=rev Author: janholzh Date: 2010-01-19 12:57:23 +0000 (Tue, 19 Jan 2010) Log Message: ----------- libsoup2: finish Makefile Modified Paths: -------------- csw/mgar/pkg/libsoup2/trunk/Makefile Property Changed: ---------------- csw/mgar/pkg/libsoup2/trunk/ Property changes on: csw/mgar/pkg/libsoup2/trunk ___________________________________________________________________ Added: svn:ignore + work Modified: csw/mgar/pkg/libsoup2/trunk/Makefile =================================================================== --- csw/mgar/pkg/libsoup2/trunk/Makefile 2010-01-19 12:41:33 UTC (rev 8090) +++ csw/mgar/pkg/libsoup2/trunk/Makefile 2010-01-19 12:57:23 UTC (rev 8091) @@ -14,14 +14,55 @@ UFILES_REGEX = -(\d+(?:\.\d+)*).tar.bz2 PACKAGES = CSWlibsoup2 +PACKAGES += CSWlibsoup2dev +PACKAGES += CSWlibsoup2gnome +PACKAGES += CSWlibsoup2gnomedev +SPKG_DESC_CSWlibsoup2 = HTTP client/server library for GNOME +SPKG_DESC_CSWlibsoup2dev = HTTP client/server library for GNOME, dev files +SPKG_DESC_CSWlibsoup2gnome = HTTP client/server library for GNOME, gnome part +SPKG_DESC_CSWlibsoup2gnomedev = HTTP client/server library for GNOME, gnome dev part +REQUIRED_PKGS_CSWlibsoup2gnome = CSWgconf2 +REQUIRED_PKGS_CSWlibsoup2gnome += CSWgcrypt +REQUIRED_PKGS_CSWlibsoup2gnome += CSWggettextrt +REQUIRED_PKGS_CSWlibsoup2gnome += CSWglib2 +REQUIRED_PKGS_CSWlibsoup2gnome += CSWgnutls +REQUIRED_PKGS_CSWlibsoup2gnome += CSWgpgerr +REQUIRED_PKGS_CSWlibsoup2gnome += CSWlibproxy +REQUIRED_PKGS_CSWlibsoup2gnome += CSWlibxml2 +REQUIRED_PKGS_CSWlibsoup2gnome += CSWsqlite3rt +REQUIRED_PKGS_CSWlibsoup2gnome += CSWlibsoup2 + +REQUIRED_PKGS_CSWlibsoup2dev = CSWlibsoup2 +REQUIRED_PKGS_CSWlibsoup2gnomedev = CSWlibsoup2gnome + +REQUIRED_PKGS_CSWlibsoup2 = CSWgcrypt +REQUIRED_PKGS_CSWlibsoup2 += CSWggettextrt +REQUIRED_PKGS_CSWlibsoup2 += CSWglib2 +REQUIRED_PKGS_CSWlibsoup2 += CSWgnutls +REQUIRED_PKGS_CSWlibsoup2 += CSWgpgerr +#REQUIRED_PKGS_CSWlibsoup2 += CSWlibproxy +REQUIRED_PKGS_CSWlibsoup2 += CSWlibxml2 + +REQUIRED_PKGS_CSWlibsoup2dev = CSWlibsoup2 + +PKGFILES_CSWlibsoup2 = /opt/csw/lib/libsoup-2.4.so.1.2.0 +PKGFILES_CSWlibsoup2dev = /opt/csw/lib/pkgconfig/libsoup-2.4.pc +PKGFILES_CSWlibsoup2dev += /opt/csw/include/libsoup-2.4/.* +PKGFILES_CSWlibsoup2gnomedev = /opt/csw/lib/pkgconfig/libsoup-gnome-2.4.pc +PKGFILES_CSWlibsoup2gnomedev += /opt/csw/include/libsoup-gnome-2.4/.* + + + EXTRA_INC = /opt/csw/X11/include EXTRA_LIB = /opt/csw/X11/lib EXTRA_PKG_CONFIG_DIRS = $(prefix)/X11/lib +STRIP_LIBTOOL = 1 CONFIGURE_ARGS = $(DIRPATHS) --disable-static --with-apache-httpd=/opt/csw/apache2/sbin/httpd --with-apache-module-dir=/opt/csw/apache2/libexec/ -TEST_TARGET = check +#TEST_TARGET = check +TEST_TARGET = include gar/category.mk This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From roger.hakansson at gmail.com Tue Jan 19 14:53:42 2010 From: roger.hakansson at gmail.com (=?ISO-8859-1?Q?Roger_H=E5kansson?=) Date: Tue, 19 Jan 2010 14:53:42 +0100 Subject: [csw-devel] SF.net SVN: gar:[8091] csw/mgar/pkg/libsoup2/trunk In-Reply-To: References: Message-ID: <4B55B966.6060505@gmail.com> janholzh at users.sourceforge.net wrote: > Revision: 8091 > http://gar.svn.sourceforge.net/gar/?rev=8091&view=rev > Author: janholzh > Date: 2010-01-19 12:57:23 +0000 (Tue, 19 Jan 2010) > > Log Message: > ----------- > libsoup2: finish Makefile > Noticed that you committed some stuff for libsoup2, I've been working on releasing a updated version, but I've not committed my stuff yet. However I was going to update libsoup to current and scrap libsoup2 as a separate package since there is only a few packages needing libsoup2. So keeping them as separate packages is in my world not necessary. Also, is there really a need to split the gnome-stuff in a separate package? Even the base stuff are dependent on some GNOME-libs so you won't gain that much. Btw, you don't seem to have a opencsw mail address? -------------- next part -------------- A non-text attachment was scrubbed... Name: smime.p7s Type: application/x-pkcs7-signature Size: 3344 bytes Desc: S/MIME Cryptographic Signature URL: From dmichelsen at users.sourceforge.net Tue Jan 19 15:04:09 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 19 Jan 2010 14:04:09 +0000 Subject: [csw-devel] SF.net SVN: gar:[8092] csw/mgar/pkg Message-ID: Revision: 8092 http://gar.svn.sourceforge.net/gar/?rev=8092&view=rev Author: dmichelsen Date: 2010-01-19 14:04:08 +0000 (Tue, 19 Jan 2010) Log Message: ----------- unrtf: Initial commit, pathes still not right Added Paths: ----------- csw/mgar/pkg/unrtf/ csw/mgar/pkg/unrtf/branches/ csw/mgar/pkg/unrtf/tags/ csw/mgar/pkg/unrtf/trunk/ csw/mgar/pkg/unrtf/trunk/Makefile csw/mgar/pkg/unrtf/trunk/checksums csw/mgar/pkg/unrtf/trunk/files/ Property changes on: csw/mgar/pkg/unrtf/trunk ___________________________________________________________________ Added: svn:ignore + cookies download work Added: svn:externals + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 Added: csw/mgar/pkg/unrtf/trunk/Makefile =================================================================== --- csw/mgar/pkg/unrtf/trunk/Makefile (rev 0) +++ csw/mgar/pkg/unrtf/trunk/Makefile 2010-01-19 14:04:08 UTC (rev 8092) @@ -0,0 +1,23 @@ +GARNAME = unrtf +GARVERSION = 0.21.1 +CATEGORIES = utils + +DESCRIPTION = A tool which converts documents from Rich Text Format +define BLURB +endef + +MASTER_SITES = $(GNU_MIRROR) +DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz + +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + +REQUIRED_PKGS = CSWiconv + +EXTRA_LINKER_FLAGS = -liconv + +CONFIGURE_ARGS = $(DIRPATHS) + +TEST_TARGET = check + +include gar/category.mk Added: csw/mgar/pkg/unrtf/trunk/checksums =================================================================== --- csw/mgar/pkg/unrtf/trunk/checksums (rev 0) +++ csw/mgar/pkg/unrtf/trunk/checksums 2010-01-19 14:04:08 UTC (rev 8092) @@ -0,0 +1 @@ +ce069646837d0a2c15b439a5529afde8 unrtf-0.21.1.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From janholzh at users.sourceforge.net Tue Jan 19 15:55:52 2010 From: janholzh at users.sourceforge.net (janholzh at users.sourceforge.net) Date: Tue, 19 Jan 2010 14:55:52 +0000 Subject: [csw-devel] SF.net SVN: gar:[8093] csw/mgar/pkg/libsoup2/trunk/Makefile Message-ID: Revision: 8093 http://gar.svn.sourceforge.net/gar/?rev=8093&view=rev Author: janholzh Date: 2010-01-19 14:55:52 +0000 (Tue, 19 Jan 2010) Log Message: ----------- libsoup2: merged gnome and non-gnome part Modified Paths: -------------- csw/mgar/pkg/libsoup2/trunk/Makefile Modified: csw/mgar/pkg/libsoup2/trunk/Makefile =================================================================== --- csw/mgar/pkg/libsoup2/trunk/Makefile 2010-01-19 14:04:08 UTC (rev 8092) +++ csw/mgar/pkg/libsoup2/trunk/Makefile 2010-01-19 14:55:52 UTC (rev 8093) @@ -15,44 +15,24 @@ PACKAGES = CSWlibsoup2 PACKAGES += CSWlibsoup2dev -PACKAGES += CSWlibsoup2gnome -PACKAGES += CSWlibsoup2gnomedev SPKG_DESC_CSWlibsoup2 = HTTP client/server library for GNOME SPKG_DESC_CSWlibsoup2dev = HTTP client/server library for GNOME, dev files -SPKG_DESC_CSWlibsoup2gnome = HTTP client/server library for GNOME, gnome part -SPKG_DESC_CSWlibsoup2gnomedev = HTTP client/server library for GNOME, gnome dev part -REQUIRED_PKGS_CSWlibsoup2gnome = CSWgconf2 -REQUIRED_PKGS_CSWlibsoup2gnome += CSWgcrypt -REQUIRED_PKGS_CSWlibsoup2gnome += CSWggettextrt -REQUIRED_PKGS_CSWlibsoup2gnome += CSWglib2 -REQUIRED_PKGS_CSWlibsoup2gnome += CSWgnutls -REQUIRED_PKGS_CSWlibsoup2gnome += CSWgpgerr -REQUIRED_PKGS_CSWlibsoup2gnome += CSWlibproxy -REQUIRED_PKGS_CSWlibsoup2gnome += CSWlibxml2 -REQUIRED_PKGS_CSWlibsoup2gnome += CSWsqlite3rt - -REQUIRED_PKGS_CSWlibsoup2gnome += CSWlibsoup2 - -REQUIRED_PKGS_CSWlibsoup2dev = CSWlibsoup2 -REQUIRED_PKGS_CSWlibsoup2gnomedev = CSWlibsoup2gnome - -REQUIRED_PKGS_CSWlibsoup2 = CSWgcrypt +REQUIRED_PKGS_CSWlibsoup2 = CSWgconf2 +REQUIRED_PKGS_CSWlibsoup2 += CSWgcrypt REQUIRED_PKGS_CSWlibsoup2 += CSWggettextrt REQUIRED_PKGS_CSWlibsoup2 += CSWglib2 REQUIRED_PKGS_CSWlibsoup2 += CSWgnutls REQUIRED_PKGS_CSWlibsoup2 += CSWgpgerr -#REQUIRED_PKGS_CSWlibsoup2 += CSWlibproxy +REQUIRED_PKGS_CSWlibsoup2 += CSWlibproxy REQUIRED_PKGS_CSWlibsoup2 += CSWlibxml2 +REQUIRED_PKGS_CSWlibsoup2 += CSWsqlite3rt -REQUIRED_PKGS_CSWlibsoup2dev = CSWlibsoup2 +REQUIRED_PKGS_CSWlibsoup2dev += CSWlibsoup2 -PKGFILES_CSWlibsoup2 = /opt/csw/lib/libsoup-2.4.so.1.2.0 -PKGFILES_CSWlibsoup2dev = /opt/csw/lib/pkgconfig/libsoup-2.4.pc -PKGFILES_CSWlibsoup2dev += /opt/csw/include/libsoup-2.4/.* -PKGFILES_CSWlibsoup2gnomedev = /opt/csw/lib/pkgconfig/libsoup-gnome-2.4.pc -PKGFILES_CSWlibsoup2gnomedev += /opt/csw/include/libsoup-gnome-2.4/.* +PKGFILES_CSWlibsoup2dev = /opt/csw/lib/pkgconfig/.* +PKGFILES_CSWlibsoup2dev += /opt/csw/include/.* EXTRA_INC = /opt/csw/X11/include @@ -60,9 +40,9 @@ EXTRA_PKG_CONFIG_DIRS = $(prefix)/X11/lib STRIP_LIBTOOL = 1 -CONFIGURE_ARGS = $(DIRPATHS) --disable-static --with-apache-httpd=/opt/csw/apache2/sbin/httpd --with-apache-module-dir=/opt/csw/apache2/libexec/ +CONFIGURE_ARGS = $(DIRPATHS) --disable-static -#TEST_TARGET = check -TEST_TARGET = +# Test disabled because of missing Apache stuff +TEST_TARGET = include gar/category.mk This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Tue Jan 19 16:59:44 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Tue, 19 Jan 2010 15:59:44 +0000 Subject: [csw-devel] SF.net SVN: gar:[8094] csw/mgar/pkg/sudo/trunk/Makefile Message-ID: Revision: 8094 http://gar.svn.sourceforge.net/gar/?rev=8094&view=rev Author: wahwah Date: 2010-01-19 15:59:44 +0000 (Tue, 19 Jan 2010) Log Message: ----------- sudo: Setting the --with-logpath option and making sure it's installed Modified Paths: -------------- csw/mgar/pkg/sudo/trunk/Makefile Modified: csw/mgar/pkg/sudo/trunk/Makefile =================================================================== --- csw/mgar/pkg/sudo/trunk/Makefile 2010-01-19 14:55:52 UTC (rev 8093) +++ csw/mgar/pkg/sudo/trunk/Makefile 2010-01-19 15:59:44 UTC (rev 8094) @@ -36,13 +36,15 @@ DISTFILES += CSWsudo-common.postinstall +LOGPATH = /var/opt/csw/log/sudo + CONFIGURE_ARGS = $(DIRPATHS) CONFIGURE_ARGS += --with-pam CONFIGURE_ARGS += --with-logging=both CONFIGURE_ARGS += --with-ignore-dot CONFIGURE_ARGS += --with-env-editor CONFIGURE_ARGS += --disable-path-info -CONFIGURE_ARGS += --with-logpath=/var/opt/csw/sudo/logs/sudolog +CONFIGURE_ARGS += --with-logpath=$(LOGPATH)/sudolog ifneq ($(shell uname -r),5.8) CONFIGURE_ARGS += --with-project endif @@ -57,6 +59,10 @@ PKGFILES_CSWsudo = $(bindir)/sudo.minimal PKGFILES_CSWsudo += $(bindir)/sudo +PROTOTYPE_MODIFIERS = sudo +PROTOTYPE_FILES_sudo = $(bindir)/sudo.minimal +PROTOTYPE_PERMS_sudo = 4755 + include gar/category.mk post-install-modulated: @@ -65,6 +71,7 @@ @( cd $(DESTDIR)$(bindir) ; grm -f sudoedit ) @( cd $(DESTDIR)$(bindir) ; gcp sudo.minimal sudoedit ) @( cd $(DESTDIR)$(sysconfdir) ; gmv sudoers sudoers.CSW ) + install -m 755 -d $(DESTDIR)$(LOGPATH)/logs @$(MAKECOOKIE) post-merge-modulated: This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Wed Jan 20 15:24:48 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 20 Jan 2010 14:24:48 +0000 Subject: [csw-devel] SF.net SVN: gar:[8095] csw/mgar/pkg/pcre/tags/pcre-8.00, REV=2009.11.17/ Message-ID: Revision: 8095 http://gar.svn.sourceforge.net/gar/?rev=8095&view=rev Author: dmichelsen Date: 2010-01-20 14:24:48 +0000 (Wed, 20 Jan 2010) Log Message: ----------- pcre: Tag 8.00,REV=2009.11.17 Added Paths: ----------- csw/mgar/pkg/pcre/tags/pcre-8.00,REV=2009.11.17/ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Wed Jan 20 16:09:18 2010 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Wed, 20 Jan 2010 15:09:18 +0000 Subject: [csw-devel] SF.net SVN: gar:[8096] csw/mgar/pkg/x11/lib/libpthread-stubs/trunk Message-ID: Revision: 8096 http://gar.svn.sourceforge.net/gar/?rev=8096&view=rev Author: wbonnet Date: 2010-01-20 15:09:09 +0000 (Wed, 20 Jan 2010) Log Message: ----------- Upgrade to version 0.3 Modified Paths: -------------- csw/mgar/pkg/x11/lib/libpthread-stubs/trunk/Makefile csw/mgar/pkg/x11/lib/libpthread-stubs/trunk/checksums Modified: csw/mgar/pkg/x11/lib/libpthread-stubs/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/lib/libpthread-stubs/trunk/Makefile 2010-01-20 14:24:48 UTC (rev 8095) +++ csw/mgar/pkg/x11/lib/libpthread-stubs/trunk/Makefile 2010-01-20 15:09:09 UTC (rev 8096) @@ -1,5 +1,5 @@ GARNAME = libpthread-stubs -GARVERSION = 0.1 +GARVERSION = 0.3 CATEGORIES = x11 DESCRIPTION = pthread stubs not provided by native libc Modified: csw/mgar/pkg/x11/lib/libpthread-stubs/trunk/checksums =================================================================== --- csw/mgar/pkg/x11/lib/libpthread-stubs/trunk/checksums 2010-01-20 14:24:48 UTC (rev 8095) +++ csw/mgar/pkg/x11/lib/libpthread-stubs/trunk/checksums 2010-01-20 15:09:09 UTC (rev 8096) @@ -1 +1 @@ -5e3e75160ab6a8c212d0ecd82aa04651 download/libpthread-stubs-0.1.tar.gz +a09d928c4af54fe5436002345ef71138 libpthread-stubs-0.3.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Wed Jan 20 16:14:09 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 20 Jan 2010 15:14:09 +0000 Subject: [csw-devel] SF.net SVN: gar:[8097] csw/mgar/pkg/pcre/trunk Message-ID: Revision: 8097 http://gar.svn.sourceforge.net/gar/?rev=8097&view=rev Author: dmichelsen Date: 2010-01-20 15:14:09 +0000 (Wed, 20 Jan 2010) Log Message: ----------- pcre: Update to 8.01 Modified Paths: -------------- csw/mgar/pkg/pcre/trunk/Makefile csw/mgar/pkg/pcre/trunk/checksums Added Paths: ----------- csw/mgar/pkg/pcre/trunk/files/0001-Add-missing-inttypes.h.patch Modified: csw/mgar/pkg/pcre/trunk/Makefile =================================================================== --- csw/mgar/pkg/pcre/trunk/Makefile 2010-01-20 15:09:09 UTC (rev 8096) +++ csw/mgar/pkg/pcre/trunk/Makefile 2010-01-20 15:14:09 UTC (rev 8097) @@ -1,5 +1,5 @@ GARNAME = pcre -GARVERSION = 8.00 +GARVERSION = 8.01 CATEGORIES = lib DESCRIPTION = Perl-compatible regular expression tools @@ -12,12 +12,13 @@ MASTER_SITES = ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/ DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz +PATCHFILES = 0001-Add-missing-inttypes.h.patch SPKG_SOURCEURL = http://www.pcre.org PREREQUISITE_PKGS = CSWgnulinks -REQUIRED_PKGS_CSWpcrert = CSWzlib CSWbzip2 CSWreadline CSWncurses -REQUIRED_PKGS_CSWpcre = CSWpcrert $(REQUIRED_PKGS_CSWpcrert) +REQUIRED_PKGS_CSWpcrert = CSWncurses +REQUIRED_PKGS_CSWpcre = CSWpcrert CSWzlib CSWbzip2 CSWreadline $(REQUIRED_PKGS_CSWpcrert) PACKAGES = CSWpcre CSWpcrert CATALOGNAME_CSWpcrert = pcre_rt Modified: csw/mgar/pkg/pcre/trunk/checksums =================================================================== --- csw/mgar/pkg/pcre/trunk/checksums 2010-01-20 15:09:09 UTC (rev 8096) +++ csw/mgar/pkg/pcre/trunk/checksums 2010-01-20 15:14:09 UTC (rev 8097) @@ -1 +1,2 @@ -c95500eeda12c8c7edc6b0926d60952c pcre-8.00.tar.gz +dc6be5e75d8322e6337161990b8ae424 0001-Add-missing-inttypes.h.patch +def40e944d2c429cbf563357e61c1ad2 pcre-8.01.tar.gz Added: csw/mgar/pkg/pcre/trunk/files/0001-Add-missing-inttypes.h.patch =================================================================== --- csw/mgar/pkg/pcre/trunk/files/0001-Add-missing-inttypes.h.patch (rev 0) +++ csw/mgar/pkg/pcre/trunk/files/0001-Add-missing-inttypes.h.patch 2010-01-20 15:14:09 UTC (rev 8097) @@ -0,0 +1,21 @@ +From 8d080cb9ee95738c6b446f1a1fcb8cddbbae7559 Mon Sep 17 00:00:00 2001 +From: Dagobert Michelsen +Date: Wed, 20 Jan 2010 15:55:55 +0100 +Subject: [PATCH] Add missing inttypes.h + +--- + pcre_compile.c | 1 + + 1 files changed, 1 insertions(+), 0 deletions(-) + +diff --git a/pcre_compile.c b/pcre_compile.c +index beae0e4..8a54b54 100644 +--- a/pcre_compile.c ++++ b/pcre_compile.c +@@ -1,3 +1,4 @@ ++#include + /************************************************* + * Perl-Compatible Regular Expressions * + *************************************************/ +-- +1.6.6 + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Wed Jan 20 16:27:28 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 20 Jan 2010 15:27:28 +0000 Subject: [csw-devel] SF.net SVN: gar:[8098] csw/mgar/pkg Message-ID: Revision: 8098 http://gar.svn.sourceforge.net/gar/?rev=8098&view=rev Author: dmichelsen Date: 2010-01-20 15:27:26 +0000 (Wed, 20 Jan 2010) Log Message: ----------- xerces-c: Initial commit Added Paths: ----------- csw/mgar/pkg/xerces-c/ csw/mgar/pkg/xerces-c/branches/ csw/mgar/pkg/xerces-c/tags/ csw/mgar/pkg/xerces-c/trunk/ csw/mgar/pkg/xerces-c/trunk/Makefile csw/mgar/pkg/xerces-c/trunk/checksums csw/mgar/pkg/xerces-c/trunk/files/ Property changes on: csw/mgar/pkg/xerces-c/trunk ___________________________________________________________________ Added: svn:ignore + cookies download work Added: svn:externals + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 Added: csw/mgar/pkg/xerces-c/trunk/Makefile =================================================================== --- csw/mgar/pkg/xerces-c/trunk/Makefile (rev 0) +++ csw/mgar/pkg/xerces-c/trunk/Makefile 2010-01-20 15:27:26 UTC (rev 8098) @@ -0,0 +1,29 @@ +GARNAME = xerces-c +GARVERSION = 3.0.1 +CATEGORIES = lib + +DESCRIPTION = Xerces XML parser for C++ +define BLURB + Xerces-C++ is a validating XML parser written in a portable subset + of C++. Xerces-C++ makes it easy to give your application the ability + to read and write XML data. A shared library is provided for parsing, + generating, manipulating, and validating XML documents using the DOM, + SAX, and SAX2 APIs. For an introduction to programming with Xerces-C++ + refer to the Programming Guide. +endef + +MASTER_SITES = http://apache.abdaal.com/xerces/c/3/sources/ +DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz + +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + +PACKAGES = CSWxerces-c +CATALOGNAME = xerces_c + +SPKG_SOURCEURL = http://xerces.apache.org/xerces-c/ + +BUILD64 = 1 +CONFIGURE_ARGS = $(DIRPATHS) + +include gar/category.mk Added: csw/mgar/pkg/xerces-c/trunk/checksums =================================================================== --- csw/mgar/pkg/xerces-c/trunk/checksums (rev 0) +++ csw/mgar/pkg/xerces-c/trunk/checksums 2010-01-20 15:27:26 UTC (rev 8098) @@ -0,0 +1 @@ +293c03f59bf8e956020d73f5b122094c xerces-c-3.0.1.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From skayser at users.sourceforge.net Thu Jan 21 02:01:21 2010 From: skayser at users.sourceforge.net (skayser at users.sourceforge.net) Date: Thu, 21 Jan 2010 01:01:21 +0000 Subject: [csw-devel] SF.net SVN: gar:[8099] csw/mgar/pkg Message-ID: Revision: 8099 http://gar.svn.sourceforge.net/gar/?rev=8099&view=rev Author: skayser Date: 2010-01-21 01:01:21 +0000 (Thu, 21 Jan 2010) Log Message: ----------- libvanessa-logger: initial commit Added Paths: ----------- csw/mgar/pkg/libvanessa-logger/ csw/mgar/pkg/libvanessa-logger/branches/ csw/mgar/pkg/libvanessa-logger/tags/ csw/mgar/pkg/libvanessa-logger/trunk/ csw/mgar/pkg/libvanessa-logger/trunk/Makefile csw/mgar/pkg/libvanessa-logger/trunk/checksums csw/mgar/pkg/libvanessa-logger/trunk/files/ csw/mgar/pkg/libvanessa-logger/trunk/files/changelog.CSW Property changes on: csw/mgar/pkg/libvanessa-logger/trunk ___________________________________________________________________ Added: svn:ignore + cookies download work Added: svn:externals + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 Added: csw/mgar/pkg/libvanessa-logger/trunk/Makefile =================================================================== --- csw/mgar/pkg/libvanessa-logger/trunk/Makefile (rev 0) +++ csw/mgar/pkg/libvanessa-logger/trunk/Makefile 2010-01-21 01:01:21 UTC (rev 8099) @@ -0,0 +1,33 @@ +GARNAME = libvanessa-logger +GARVERSION = 0.0.8 +CATEGORIES = lib + +DESCRIPTION = Generic logging library +define BLURB + Provides a generic logging layer that may be used to log to one or more + of syslog, an open file handle or a file name. Though due to to + limitations in the implementation of syslog opening multiple syslog + loggers doesn't makes sense. Includes the ability to limit which + messages will be logged based on priorities. +endef + +VENDOR_URL = http://www.vergenet.net/linux/vanessa/ +MASTER_SITES = $(VENDOR_URL)/download/vanessa_logger/$(GARVERSION)/ +DISTFILES = vanessa_logger-$(GARVERSION).tar.gz +DISTNAME = vanessa_logger-$(GARVERSION) +UFILES_REGEX = (\d+(?:\.\d+)*) +UPSTREAM_MASTER_SITES = $(VENDOR_URL)/download/vanessa_logger/ + +CONFIGURE_ARGS = $(DIRPATHS) + +TEST_TARGET = + +include gar/category.mk + + +post-merge: $(foreach P,$(_PKG_SPECS),install-changelog-$P) + +install-changelog-%: + ginstall -D $(FILEDIR)/changelog.CSW \ + $(PKGROOT)$(docdir)/$(call catalogname,$*)/changelog.CSW + @$(MAKECOOKIE) Added: csw/mgar/pkg/libvanessa-logger/trunk/checksums =================================================================== --- csw/mgar/pkg/libvanessa-logger/trunk/checksums (rev 0) +++ csw/mgar/pkg/libvanessa-logger/trunk/checksums 2010-01-21 01:01:21 UTC (rev 8099) @@ -0,0 +1 @@ +12c17d44bd27141c175d69c7b5d0f4dc vanessa_logger-0.0.8.tar.gz Added: csw/mgar/pkg/libvanessa-logger/trunk/files/changelog.CSW =================================================================== --- csw/mgar/pkg/libvanessa-logger/trunk/files/changelog.CSW (rev 0) +++ csw/mgar/pkg/libvanessa-logger/trunk/files/changelog.CSW 2010-01-21 01:01:21 UTC (rev 8099) @@ -0,0 +1,5 @@ +libvanessa-logger (0.0.8,REV=2010.01.21) + + * Initial release. + + -- Sebastian Kayser Thu, 21 Jan 2010 01:59:21 +0100 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From skayser at users.sourceforge.net Thu Jan 21 02:09:14 2010 From: skayser at users.sourceforge.net (skayser at users.sourceforge.net) Date: Thu, 21 Jan 2010 01:09:14 +0000 Subject: [csw-devel] SF.net SVN: gar:[8100] csw/mgar/pkg Message-ID: Revision: 8100 http://gar.svn.sourceforge.net/gar/?rev=8100&view=rev Author: skayser Date: 2010-01-21 01:09:14 +0000 (Thu, 21 Jan 2010) Log Message: ----------- libvanessa-socket: initial commit Added Paths: ----------- csw/mgar/pkg/libvanessa-socket/ csw/mgar/pkg/libvanessa-socket/branches/ csw/mgar/pkg/libvanessa-socket/tags/ csw/mgar/pkg/libvanessa-socket/trunk/ csw/mgar/pkg/libvanessa-socket/trunk/Makefile csw/mgar/pkg/libvanessa-socket/trunk/checksums csw/mgar/pkg/libvanessa-socket/trunk/files/ csw/mgar/pkg/libvanessa-socket/trunk/files/changelog.CSW Property changes on: csw/mgar/pkg/libvanessa-socket/trunk ___________________________________________________________________ Added: svn:ignore + cookies download work Added: svn:externals + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 Added: csw/mgar/pkg/libvanessa-socket/trunk/Makefile =================================================================== --- csw/mgar/pkg/libvanessa-socket/trunk/Makefile (rev 0) +++ csw/mgar/pkg/libvanessa-socket/trunk/Makefile 2010-01-21 01:09:14 UTC (rev 8100) @@ -0,0 +1,32 @@ +GARNAME = libvanessa-socket +GARVERSION = 0.0.9 +CATEGORIES = lib + +DESCRIPTION = Library to simplify common socket operations. +define BLURB + Simplifies TCP/IP socket operations. It includes code to open a socket + to a server as a client, to listen on socket for clients as a server and + to pipe information between sockets. +endef + +VENDOR_URL = http://www.vergenet.net/linux/vanessa/ +MASTER_SITES = $(VENDOR_URL)/download/vanessa_socket/$(GARVERSION)/ +DISTFILES = vanessa_socket-$(GARVERSION).tar.gz +DISTNAME = vanessa_socket-$(GARVERSION) +UFILES_REGEX = (\d+(?:\.\d+)*) +UPSTREAM_MASTER_SITES = $(VENDOR_URL)/download/vanessa_socket/ + +PACKAGES = CSWlibvanessa-socket +CATALOGNAME = libvanessa_socket +REQUIRED_PKGS = CSWlibvanessa-logger + +CONFIGURE_ARGS = $(DIRPATHS) + +include gar/category.mk + +post-merge: $(foreach P,$(_PKG_SPECS),install-changelog-$P) + +install-changelog-%: + ginstall -D $(FILEDIR)/changelog.CSW \ + $(PKGROOT)$(docdir)/$(call catalogname,$*)/changelog.CSW + @$(MAKECOOKIE) Added: csw/mgar/pkg/libvanessa-socket/trunk/checksums =================================================================== --- csw/mgar/pkg/libvanessa-socket/trunk/checksums (rev 0) +++ csw/mgar/pkg/libvanessa-socket/trunk/checksums 2010-01-21 01:09:14 UTC (rev 8100) @@ -0,0 +1 @@ +b63fb0f22938ceec7eec3c77cfcae69b vanessa_socket-0.0.9.tar.gz Added: csw/mgar/pkg/libvanessa-socket/trunk/files/changelog.CSW =================================================================== --- csw/mgar/pkg/libvanessa-socket/trunk/files/changelog.CSW (rev 0) +++ csw/mgar/pkg/libvanessa-socket/trunk/files/changelog.CSW 2010-01-21 01:09:14 UTC (rev 8100) @@ -0,0 +1,5 @@ +libvanessa-socket (0.0.9,REV=2010.01.21) + + * Initial release. + + -- Sebastian Kayser Thu, 21 Jan 2010 02:08:20 +0100 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From skayser at users.sourceforge.net Thu Jan 21 02:10:23 2010 From: skayser at users.sourceforge.net (skayser at users.sourceforge.net) Date: Thu, 21 Jan 2010 01:10:23 +0000 Subject: [csw-devel] SF.net SVN: gar:[8101] csw/mgar/pkg/libvanessa-logger/trunk/Makefile Message-ID: Revision: 8101 http://gar.svn.sourceforge.net/gar/?rev=8101&view=rev Author: skayser Date: 2010-01-21 01:10:23 +0000 (Thu, 21 Jan 2010) Log Message: ----------- libvanessa-logger: adjust PACKAGES/CATALOGNAME Modified Paths: -------------- csw/mgar/pkg/libvanessa-logger/trunk/Makefile Modified: csw/mgar/pkg/libvanessa-logger/trunk/Makefile =================================================================== --- csw/mgar/pkg/libvanessa-logger/trunk/Makefile 2010-01-21 01:09:14 UTC (rev 8100) +++ csw/mgar/pkg/libvanessa-logger/trunk/Makefile 2010-01-21 01:10:23 UTC (rev 8101) @@ -18,6 +18,9 @@ UFILES_REGEX = (\d+(?:\.\d+)*) UPSTREAM_MASTER_SITES = $(VENDOR_URL)/download/vanessa_logger/ +PACKAGES = CSWlibvanessa-logger +CATALOGNAME = libvanessa_logger + CONFIGURE_ARGS = $(DIRPATHS) TEST_TARGET = This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Thu Jan 21 09:26:14 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Thu, 21 Jan 2010 08:26:14 +0000 Subject: [csw-devel] SF.net SVN: gar:[8102] csw/mgar/gar/v2/bin/checkpkg.d/testdata/ checkpkg_test_data_CSWpostfix.py Message-ID: Revision: 8102 http://gar.svn.sourceforge.net/gar/?rev=8102&view=rev Author: wahwah Date: 2010-01-21 08:26:14 +0000 (Thu, 21 Jan 2010) Log Message: ----------- mGAR v2: checkpkg, updating the dest data for postfix (d7) Modified Paths: -------------- csw/mgar/gar/v2/bin/checkpkg.d/testdata/checkpkg_test_data_CSWpostfix.py Modified: csw/mgar/gar/v2/bin/checkpkg.d/testdata/checkpkg_test_data_CSWpostfix.py =================================================================== --- csw/mgar/gar/v2/bin/checkpkg.d/testdata/checkpkg_test_data_CSWpostfix.py 2010-01-21 01:10:23 UTC (rev 8101) +++ csw/mgar/gar/v2/bin/checkpkg.d/testdata/checkpkg_test_data_CSWpostfix.py 2010-01-21 08:26:14 UTC (rev 8102) @@ -1,13 +1,13 @@ # Testing data for CSWpostfix # $Id: checkpkg-libs.py 7997 2010-01-14 09:22:25Z wahwah $ DATA_PKGNAME = 'CSWpostfix' -DATA_DECLARED_DEPENDENCIES = {'CSWcswclassutils': 'CSWcswclassutils cswclassutils - CSW class action utilities ', 'CSWpcrert': 'CSWpcrert pcre_rt - Perl-compatible regular expression runtime libraries ', 'CSWmysql5rt': 'CSWmysql5rt mysql5rt - MySQL 5 runtime files ', 'CSWbdb4': 'CSWbdb4 berkeleydb4 - Stub package as contents moved to CSWbdb42 ', 'CSWlibpq': 'CSWlibpq libpq - libraries needed by postgresql server and clients ', 'CSWsasl': 'CSWsasl sasl - Simple Authentication and Security Layer ', 'CSWcommon': 'CSWcommon common - common files and dirs for CSW packages ', 'CSWoldaprt': 'CSWoldaprt openldap_rt - OpenLDAP runtime libraries (oldaprt) ', 'CSWosslrt': 'CSWosslrt openssl_rt - Openssl runtime libraries '} -DATA_BINARIES_BY_PKGNAME = {'CSWpostfix': ['anvil', 'spawn', 'nqmgr', 'tlsmgr', 'scache', 'discard', 'pickup', 'oqmgr', 'proxymap', 'flush', 'verify', 'pipe', 'master', 'bounce', 'error', 'qmqpd', 'virtual', 'smtpd', 'lmtp', 'trivial-rewrite', 'showq', 'cleanup', 'local', 'postmap', 'postlog', 'postmulti', 'postalias', 'postsuper', 'postconf', 'postlock', 'postcat', 'sendmail', 'postqueue', 'postkick', 'postfix', 'postdrop']} -DATA_NEEDED_SONAMES_BY_BINARY = {'postmulti': {'soname': 'postmulti', 'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/bdb4/lib', '/opt/csw/mysql5/lib/mysql', '/opt/csw/postgresql/lib/', '/usr/lib/$ISALIST', '/usr/lib', '/lib/$ISALIST', '/lib'], 'needed sonames': ['libpcre.so.0', 'libdb-4.2.so', 'libssl.so.0.9.8', 'libcrypto.so.0.9.8', 'libsasl2.so.2', 'libldap-2.3.so.0', 'liblber-2.3.so.0', 'libmysqlclient.so.15', 'libpq.so.5', 'libresolv.so.2', 'libsocket.so.1', 'libnsl.so.1', 'libc.so.1']}, 'spawn': {'soname': 'spawn', 'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/bdb4/lib', '/opt/csw/mysql5/lib/mysql', '/opt/csw/postgresql/lib/', '/usr/lib/$ISALIST', '/usr/lib', '/lib/$ISALIST', '/lib'], 'needed sonames': ['libpcre.so.0', 'libdb-4.2.so', 'libssl.so.0.9.8', 'libcrypto.so.0.9.8', 'libsasl2.so.2', 'libldap-2.3.so.0', 'liblber-2.3.so.0', 'libmysqlclient.so.15', 'libpq.so.5', 'libresolv.so.2', 'libsocket.so.1', 'libnsl.so.1', 'libc.so.1']}, 'pos tkick': {'soname': 'postkick', 'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/bdb4/lib', '/opt/csw/mysql5/lib/mysql', '/opt/csw/postgresql/lib/', '/usr/lib/$ISALIST', '/usr/lib', '/lib/$ISALIST', '/lib'], 'needed sonames': ['libpcre.so.0', 'libdb-4.2.so', 'libssl.so.0.9.8', 'libcrypto.so.0.9.8', 'libsasl2.so.2', 'libldap-2.3.so.0', 'liblber-2.3.so.0', 'libmysqlclient.so.15', 'libpq.so.5', 'libresolv.so.2', 'libsocket.so.1', 'libnsl.so.1', 'libc.so.1']}, 'postlog': {'soname': 'postlog', 'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/bdb4/lib', '/opt/csw/mysql5/lib/mysql', '/opt/csw/postgresql/lib/', '/usr/lib/$ISALIST', '/usr/lib', '/lib/$ISALIST', '/lib'], 'needed sonames': ['libpcre.so.0', 'libdb-4.2.so', 'libssl.so.0.9.8', 'libcrypto.so.0.9.8', 'libsasl2.so.2', 'libldap-2.3.so.0', 'liblber-2.3.so.0', 'libmysqlclient.so.15', 'libpq.so.5', 'libresolv.so.2', 'libsocket.so.1', 'libnsl.so.1', 'libc.so.1']}, 'postconf': {'soname': 'postconf', 'run path': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/bdb4/lib', '/opt/csw/mysql5/lib/mysql', '/opt/csw/postgresql/lib/', '/usr/lib/$ISALIST', '/usr/lib', '/lib/$ISALIST', '/lib'], 'needed sonames': ['libpcre.so.0', 'libdb-4.2.so', 'libssl.so.0.9.8', 'libcrypto.so.0.9.8', 'libsasl2.so.2', 'libldap-2.3.so.0', 'liblber-2.3.so.0', 'libmysqlclient.so.15', 'libpq.so.5', 'libresolv.so.2', 'libsocket.so.1', 'libnsl.so.1', 'libc.so.1']}, 'bounce': {'soname': 'bounce', 'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/bdb4/lib', '/opt/csw/mysql5/lib/mysql', '/opt/csw/postgresql/lib/', '/usr/lib/$ISALIST', '/usr/lib', '/lib/$ISALIST', '/lib'], 'needed sonames': ['libpcre.so.0', 'libdb-4.2.so', 'libssl.so.0.9.8', 'libcrypto.so.0.9.8', 'libsasl2.so.2', 'libldap-2.3.so.0', 'liblber-2.3.so.0', 'libmysqlclient.so.15', 'libpq.so.5', 'libresolv.so.2', 'libsocket.so.1', 'libnsl.so.1', 'libc.so.1']}, 'qmqpd': {'soname': 'qmqpd', 'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/ lib', '/opt/csw/bdb4/lib', '/opt/csw/mysql5/lib/mysql', '/opt/csw/postgresql/lib/', '/usr/lib/$ISALIST', '/usr/lib', '/lib/$ISALIST', '/lib'], 'needed sonames': ['libpcre.so.0', 'libdb-4.2.so', 'libssl.so.0.9.8', 'libcrypto.so.0.9.8', 'libsasl2.so.2', 'libldap-2.3.so.0', 'liblber-2.3.so.0', 'libmysqlclient.so.15', 'libpq.so.5', 'libresolv.so.2', 'libsocket.so.1', 'libnsl.so.1', 'libc.so.1']}, 'nqmgr': {'soname': 'nqmgr', 'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/bdb4/lib', '/opt/csw/mysql5/lib/mysql', '/opt/csw/postgresql/lib/', '/usr/lib/$ISALIST', '/usr/lib', '/lib/$ISALIST', '/lib'], 'needed sonames': ['libpcre.so.0', 'libdb-4.2.so', 'libssl.so.0.9.8', 'libcrypto.so.0.9.8', 'libsasl2.so.2', 'libldap-2.3.so.0', 'liblber-2.3.so.0', 'libmysqlclient.so.15', 'libpq.so.5', 'libresolv.so.2', 'libsocket.so.1', 'libnsl.so.1', 'libc.so.1']}, 'flush': {'soname': 'flush', 'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/bdb4/lib', '/opt/csw/mysql5/l ib/mysql', '/opt/csw/postgresql/lib/', '/usr/lib/$ISALIST', '/usr/lib', '/lib/$ISALIST', '/lib'], 'needed sonames': ['libpcre.so.0', 'libdb-4.2.so', 'libssl.so.0.9.8', 'libcrypto.so.0.9.8', 'libsasl2.so.2', 'libldap-2.3.so.0', 'liblber-2.3.so.0', 'libmysqlclient.so.15', 'libpq.so.5', 'libresolv.so.2', 'libsocket.so.1', 'libnsl.so.1', 'libc.so.1']}, 'proxymap': {'soname': 'proxymap', 'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/bdb4/lib', '/opt/csw/mysql5/lib/mysql', '/opt/csw/postgresql/lib/', '/usr/lib/$ISALIST', '/usr/lib', '/lib/$ISALIST', '/lib'], 'needed sonames': ['libpcre.so.0', 'libdb-4.2.so', 'libssl.so.0.9.8', 'libcrypto.so.0.9.8', 'libsasl2.so.2', 'libldap-2.3.so.0', 'liblber-2.3.so.0', 'libmysqlclient.so.15', 'libpq.so.5', 'libresolv.so.2', 'libsocket.so.1', 'libnsl.so.1', 'libc.so.1']}, 'scache': {'soname': 'scache', 'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/bdb4/lib', '/opt/csw/mysql5/lib/mysql', '/opt/csw/postgresql/lib/' , '/usr/lib/$ISALIST', '/usr/lib', '/lib/$ISALIST', '/lib'], 'needed sonames': ['libpcre.so.0', 'libdb-4.2.so', 'libssl.so.0.9.8', 'libcrypto.so.0.9.8', 'libsasl2.so.2', 'libldap-2.3.so.0', 'liblber-2.3.so.0', 'libmysqlclient.so.15', 'libpq.so.5', 'libresolv.so.2', 'libsocket.so.1', 'libnsl.so.1', 'libc.so.1']}, 'anvil': {'soname': 'anvil', 'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/bdb4/lib', '/opt/csw/mysql5/lib/mysql', '/opt/csw/postgresql/lib/', '/usr/lib/$ISALIST', '/usr/lib', '/lib/$ISALIST', '/lib'], 'needed sonames': ['libpcre.so.0', 'libdb-4.2.so', 'libssl.so.0.9.8', 'libcrypto.so.0.9.8', 'libsasl2.so.2', 'libldap-2.3.so.0', 'liblber-2.3.so.0', 'libmysqlclient.so.15', 'libpq.so.5', 'libresolv.so.2', 'libsocket.so.1', 'libnsl.so.1', 'libc.so.1']}, 'verify': {'soname': 'verify', 'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/bdb4/lib', '/opt/csw/mysql5/lib/mysql', '/opt/csw/postgresql/lib/', '/usr/lib/$ISALIST', '/usr/lib', '/lib/$I SALIST', '/lib'], 'needed sonames': ['libpcre.so.0', 'libdb-4.2.so', 'libssl.so.0.9.8', 'libcrypto.so.0.9.8', 'libsasl2.so.2', 'libldap-2.3.so.0', 'liblber-2.3.so.0', 'libmysqlclient.so.15', 'libpq.so.5', 'libresolv.so.2', 'libsocket.so.1', 'libnsl.so.1', 'libc.so.1']}, 'postalias': {'soname': 'postalias', 'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/bdb4/lib', '/opt/csw/mysql5/lib/mysql', '/opt/csw/postgresql/lib/', '/usr/lib/$ISALIST', '/usr/lib', '/lib/$ISALIST', '/lib'], 'needed sonames': ['libpcre.so.0', 'libdb-4.2.so', 'libssl.so.0.9.8', 'libcrypto.so.0.9.8', 'libsasl2.so.2', 'libldap-2.3.so.0', 'liblber-2.3.so.0', 'libmysqlclient.so.15', 'libpq.so.5', 'libresolv.so.2', 'libsocket.so.1', 'libnsl.so.1', 'libc.so.1']}, 'postcat': {'soname': 'postcat', 'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/bdb4/lib', '/opt/csw/mysql5/lib/mysql', '/opt/csw/postgresql/lib/', '/usr/lib/$ISALIST', '/usr/lib', '/lib/$ISALIST', '/lib'], 'needed sonames ': ['libpcre.so.0', 'libdb-4.2.so', 'libssl.so.0.9.8', 'libcrypto.so.0.9.8', 'libsasl2.so.2', 'libldap-2.3.so.0', 'liblber-2.3.so.0', 'libmysqlclient.so.15', 'libpq.so.5', 'libresolv.so.2', 'libsocket.so.1', 'libnsl.so.1', 'libc.so.1']}, 'virtual': {'soname': 'virtual', 'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/bdb4/lib', '/opt/csw/mysql5/lib/mysql', '/opt/csw/postgresql/lib/', '/usr/lib/$ISALIST', '/usr/lib', '/lib/$ISALIST', '/lib'], 'needed sonames': ['libpcre.so.0', 'libdb-4.2.so', 'libssl.so.0.9.8', 'libcrypto.so.0.9.8', 'libsasl2.so.2', 'libldap-2.3.so.0', 'liblber-2.3.so.0', 'libmysqlclient.so.15', 'libpq.so.5', 'libresolv.so.2', 'libsocket.so.1', 'libnsl.so.1', 'libc.so.1']}, 'pickup': {'soname': 'pickup', 'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/bdb4/lib', '/opt/csw/mysql5/lib/mysql', '/opt/csw/postgresql/lib/', '/usr/lib/$ISALIST', '/usr/lib', '/lib/$ISALIST', '/lib'], 'needed sonames': ['libpcre.so.0', 'libdb-4.2.so', 'li bssl.so.0.9.8', 'libcrypto.so.0.9.8', 'libsasl2.so.2', 'libldap-2.3.so.0', 'liblber-2.3.so.0', 'libmysqlclient.so.15', 'libpq.so.5', 'libresolv.so.2', 'libsocket.so.1', 'libnsl.so.1', 'libc.so.1']}, 'oqmgr': {'soname': 'oqmgr', 'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/bdb4/lib', '/opt/csw/mysql5/lib/mysql', '/opt/csw/postgresql/lib/', '/usr/lib/$ISALIST', '/usr/lib', '/lib/$ISALIST', '/lib'], 'needed sonames': ['libpcre.so.0', 'libdb-4.2.so', 'libssl.so.0.9.8', 'libcrypto.so.0.9.8', 'libsasl2.so.2', 'libldap-2.3.so.0', 'liblber-2.3.so.0', 'libmysqlclient.so.15', 'libpq.so.5', 'libresolv.so.2', 'libsocket.so.1', 'libnsl.so.1', 'libc.so.1']}, 'master': {'soname': 'master', 'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/bdb4/lib', '/opt/csw/mysql5/lib/mysql', '/opt/csw/postgresql/lib/', '/usr/lib/$ISALIST', '/usr/lib', '/lib/$ISALIST', '/lib'], 'needed sonames': ['libpcre.so.0', 'libdb-4.2.so', 'libssl.so.0.9.8', 'libcrypto.so.0.9.8', 'libs asl2.so.2', 'libldap-2.3.so.0', 'liblber-2.3.so.0', 'libmysqlclient.so.15', 'libpq.so.5', 'libresolv.so.2', 'libsocket.so.1', 'libnsl.so.1', 'libc.so.1']}, 'postqueue': {'soname': 'postqueue', 'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/bdb4/lib', '/opt/csw/mysql5/lib/mysql', '/opt/csw/postgresql/lib/', '/usr/lib/$ISALIST', '/usr/lib', '/lib/$ISALIST', '/lib'], 'needed sonames': ['libpcre.so.0', 'libdb-4.2.so', 'libssl.so.0.9.8', 'libcrypto.so.0.9.8', 'libsasl2.so.2', 'libldap-2.3.so.0', 'liblber-2.3.so.0', 'libmysqlclient.so.15', 'libpq.so.5', 'libresolv.so.2', 'libsocket.so.1', 'libnsl.so.1', 'libc.so.1']}, 'postmap': {'soname': 'postmap', 'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/bdb4/lib', '/opt/csw/mysql5/lib/mysql', '/opt/csw/postgresql/lib/', '/usr/lib/$ISALIST', '/usr/lib', '/lib/$ISALIST', '/lib'], 'needed sonames': ['libpcre.so.0', 'libdb-4.2.so', 'libssl.so.0.9.8', 'libcrypto.so.0.9.8', 'libsasl2.so.2', 'libldap-2.3.so.0', ' liblber-2.3.so.0', 'libmysqlclient.so.15', 'libpq.so.5', 'libresolv.so.2', 'libsocket.so.1', 'libnsl.so.1', 'libc.so.1']}, 'local': {'soname': 'local', 'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/bdb4/lib', '/opt/csw/mysql5/lib/mysql', '/opt/csw/postgresql/lib/', '/usr/lib/$ISALIST', '/usr/lib', '/lib/$ISALIST', '/lib'], 'needed sonames': ['libpcre.so.0', 'libdb-4.2.so', 'libssl.so.0.9.8', 'libcrypto.so.0.9.8', 'libsasl2.so.2', 'libldap-2.3.so.0', 'liblber-2.3.so.0', 'libmysqlclient.so.15', 'libpq.so.5', 'libresolv.so.2', 'libsocket.so.1', 'libnsl.so.1', 'libc.so.1']}, 'showq': {'soname': 'showq', 'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/bdb4/lib', '/opt/csw/mysql5/lib/mysql', '/opt/csw/postgresql/lib/', '/usr/lib/$ISALIST', '/usr/lib', '/lib/$ISALIST', '/lib'], 'needed sonames': ['libpcre.so.0', 'libdb-4.2.so', 'libssl.so.0.9.8', 'libcrypto.so.0.9.8', 'libsasl2.so.2', 'libldap-2.3.so.0', 'liblber-2.3.so.0', 'libmysqlclient.so.15', 'l ibpq.so.5', 'libresolv.so.2', 'libsocket.so.1', 'libnsl.so.1', 'libc.so.1']}, 'sendmail': {'soname': 'sendmail', 'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/bdb4/lib', '/opt/csw/mysql5/lib/mysql', '/opt/csw/postgresql/lib/', '/usr/lib/$ISALIST', '/usr/lib', '/lib/$ISALIST', '/lib'], 'needed sonames': ['libpcre.so.0', 'libdb-4.2.so', 'libssl.so.0.9.8', 'libcrypto.so.0.9.8', 'libsasl2.so.2', 'libldap-2.3.so.0', 'liblber-2.3.so.0', 'libmysqlclient.so.15', 'libpq.so.5', 'libresolv.so.2', 'libsocket.so.1', 'libnsl.so.1', 'libc.so.1']}, 'smtpd': {'soname': 'smtpd', 'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/bdb4/lib', '/opt/csw/mysql5/lib/mysql', '/opt/csw/postgresql/lib/', '/usr/lib/$ISALIST', '/usr/lib', '/lib/$ISALIST', '/lib'], 'needed sonames': ['libpcre.so.0', 'libdb-4.2.so', 'libssl.so.0.9.8', 'libcrypto.so.0.9.8', 'libsasl2.so.2', 'libldap-2.3.so.0', 'liblber-2.3.so.0', 'libmysqlclient.so.15', 'libpq.so.5', 'libresolv.so.2', 'libsocke t.so.1', 'libnsl.so.1', 'libc.so.1']}, 'lmtp': {'soname': 'lmtp', 'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/bdb4/lib', '/opt/csw/mysql5/lib/mysql', '/opt/csw/postgresql/lib/', '/usr/lib/$ISALIST', '/usr/lib', '/lib/$ISALIST', '/lib'], 'needed sonames': ['libpcre.so.0', 'libdb-4.2.so', 'libssl.so.0.9.8', 'libcrypto.so.0.9.8', 'libsasl2.so.2', 'libldap-2.3.so.0', 'liblber-2.3.so.0', 'libmysqlclient.so.15', 'libpq.so.5', 'libresolv.so.2', 'libsocket.so.1', 'libnsl.so.1', 'libc.so.1']}, 'postdrop': {'soname': 'postdrop', 'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/bdb4/lib', '/opt/csw/mysql5/lib/mysql', '/opt/csw/postgresql/lib/', '/usr/lib/$ISALIST', '/usr/lib', '/lib/$ISALIST', '/lib'], 'needed sonames': ['libpcre.so.0', 'libdb-4.2.so', 'libssl.so.0.9.8', 'libcrypto.so.0.9.8', 'libsasl2.so.2', 'libldap-2.3.so.0', 'liblber-2.3.so.0', 'libmysqlclient.so.15', 'libpq.so.5', 'libresolv.so.2', 'libsocket.so.1', 'libnsl.so.1', 'libc.so.1']}, 't rivial-rewrite': {'soname': 'trivial-rewrite', 'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/bdb4/lib', '/opt/csw/mysql5/lib/mysql', '/opt/csw/postgresql/lib/', '/usr/lib/$ISALIST', '/usr/lib', '/lib/$ISALIST', '/lib'], 'needed sonames': ['libpcre.so.0', 'libdb-4.2.so', 'libssl.so.0.9.8', 'libcrypto.so.0.9.8', 'libsasl2.so.2', 'libldap-2.3.so.0', 'liblber-2.3.so.0', 'libmysqlclient.so.15', 'libpq.so.5', 'libresolv.so.2', 'libsocket.so.1', 'libnsl.so.1', 'libc.so.1']}, 'postfix': {'soname': 'postfix', 'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/bdb4/lib', '/opt/csw/mysql5/lib/mysql', '/opt/csw/postgresql/lib/', '/usr/lib/$ISALIST', '/usr/lib', '/lib/$ISALIST', '/lib'], 'needed sonames': ['libpcre.so.0', 'libdb-4.2.so', 'libssl.so.0.9.8', 'libcrypto.so.0.9.8', 'libsasl2.so.2', 'libldap-2.3.so.0', 'liblber-2.3.so.0', 'libmysqlclient.so.15', 'libpq.so.5', 'libresolv.so.2', 'libsocket.so.1', 'libnsl.so.1', 'libc.so.1']}, 'postlock': {'soname': 'postlock', 'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/bdb4/lib', '/opt/csw/mysql5/lib/mysql', '/opt/csw/postgresql/lib/', '/usr/lib/$ISALIST', '/usr/lib', '/lib/$ISALIST', '/lib'], 'needed sonames': ['libpcre.so.0', 'libdb-4.2.so', 'libssl.so.0.9.8', 'libcrypto.so.0.9.8', 'libsasl2.so.2', 'libldap-2.3.so.0', 'liblber-2.3.so.0', 'libmysqlclient.so.15', 'libpq.so.5', 'libresolv.so.2', 'libsocket.so.1', 'libnsl.so.1', 'libc.so.1']}, 'pipe': {'soname': 'pipe', 'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/bdb4/lib', '/opt/csw/mysql5/lib/mysql', '/opt/csw/postgresql/lib/', '/usr/lib/$ISALIST', '/usr/lib', '/lib/$ISALIST', '/lib'], 'needed sonames': ['libpcre.so.0', 'libdb-4.2.so', 'libssl.so.0.9.8', 'libcrypto.so.0.9.8', 'libsasl2.so.2', 'libldap-2.3.so.0', 'liblber-2.3.so.0', 'libmysqlclient.so.15', 'libpq.so.5', 'libresolv.so.2', 'libsocket.so.1', 'libnsl.so.1', 'libc.so.1']}, 'tlsmgr': {'soname': 'tlsmgr', 'runpath': ['/opt/csw/lib/$ISALIS T', '/opt/csw/lib', '/opt/csw/bdb4/lib', '/opt/csw/mysql5/lib/mysql', '/opt/csw/postgresql/lib/', '/usr/lib/$ISALIST', '/usr/lib', '/lib/$ISALIST', '/lib'], 'needed sonames': ['libpcre.so.0', 'libdb-4.2.so', 'libssl.so.0.9.8', 'libcrypto.so.0.9.8', 'libsasl2.so.2', 'libldap-2.3.so.0', 'liblber-2.3.so.0', 'libmysqlclient.so.15', 'libpq.so.5', 'libresolv.so.2', 'libsocket.so.1', 'libnsl.so.1', 'libc.so.1']}, 'error': {'soname': 'error', 'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/bdb4/lib', '/opt/csw/mysql5/lib/mysql', '/opt/csw/postgresql/lib/', '/usr/lib/$ISALIST', '/usr/lib', '/lib/$ISALIST', '/lib'], 'needed sonames': ['libpcre.so.0', 'libdb-4.2.so', 'libssl.so.0.9.8', 'libcrypto.so.0.9.8', 'libsasl2.so.2', 'libldap-2.3.so.0', 'liblber-2.3.so.0', 'libmysqlclient.so.15', 'libpq.so.5', 'libresolv.so.2', 'libsocket.so.1', 'libnsl.so.1', 'libc.so.1']}, 'discard': {'soname': 'discard', 'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/bdb4/lib', '/opt/csw/mysql5/lib/mysql', '/opt/csw/postgresql/lib/', '/usr/lib/$ISALIST', '/usr/lib', '/lib/$ISALIST', '/lib'], 'needed sonames': ['libpcre.so.0', 'libdb-4.2.so', 'libssl.so.0.9.8', 'libcrypto.so.0.9.8', 'libsasl2.so.2', 'libldap-2.3.so.0', 'liblber-2.3.so.0', 'libmysqlclient.so.15', 'libpq.so.5', 'libresolv.so.2', 'libsocket.so.1', 'libnsl.so.1', 'libc.so.1']}, 'postsuper': {'soname': 'postsuper', 'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/bdb4/lib', '/opt/csw/mysql5/lib/mysql', '/opt/csw/postgresql/lib/', '/usr/lib/$ISALIST', '/usr/lib', '/lib/$ISALIST', '/lib'], 'needed sonames': ['libpcre.so.0', 'libdb-4.2.so', 'libssl.so.0.9.8', 'libcrypto.so.0.9.8', 'libsasl2.so.2', 'libldap-2.3.so.0', 'liblber-2.3.so.0', 'libmysqlclient.so.15', 'libpq.so.5', 'libresolv.so.2', 'libsocket.so.1', 'libnsl.so.1', 'libc.so.1']}, 'cleanup': {'soname': 'cleanup', 'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/bdb4/lib', '/opt/csw/mysql5/lib/mysql', '/op t/csw/postgresql/lib/', '/usr/lib/$ISALIST', '/usr/lib', '/lib/$ISALIST', '/lib'], 'needed sonames': ['libpcre.so.0', 'libdb-4.2.so', 'libssl.so.0.9.8', 'libcrypto.so.0.9.8', 'libsasl2.so.2', 'libldap-2.3.so.0', 'liblber-2.3.so.0', 'libmysqlclient.so.15', 'libpq.so.5', 'libresolv.so.2', 'libsocket.so.1', 'libnsl.so.1', 'libc.so.1']}} -DATA_PKGS_BY_FILENAME = {'libresolv.so.2': u'SUNWcslx', 'libnsl.so.1': u'SUNWcslx', 'libsasl2.so.2': u'CSWsasl', 'libmysqlclient.so.15': u'CSWmysql5rt', 'libpcre.so.0': u'CSWpcrert', 'libssl.so.0.9.8': u'CSWosslrt', 'libldap-2.3.so.0': u'CSWoldaprt', 'libcrypto.so.0.9.8': u'CSWosslrt', 'libsocket.so.1': u'SUNWcslx', 'liblber-2.3.so.0': u'CSWoldaprt', 'libc.so.1': u'SUNWcslx'} -DATA_FILENAMES_BY_SONAME = {'postmulti': 'postmulti', 'spawn': 'spawn', 'postkick': 'postkick', 'postlog': 'postlog', 'postconf': 'postconf', 'bounce': 'bounce', 'qmqpd': 'qmqpd', 'nqmgr': 'nqmgr', 'flush': 'flush', 'proxymap': 'proxymap', 'scache': 'scache', 'anvil': 'anvil', 'verify': 'verify', 'postalias': 'postalias', 'postcat': 'postcat', 'virtual': 'virtual', 'pickup': 'pickup', 'oqmgr': 'oqmgr', 'master': 'master', 'postqueue': 'postqueue', 'postmap': 'postmap', 'local': 'local', 'showq': 'showq', 'sendmail': 'sendmail', 'smtpd': 'smtpd', 'lmtp': 'lmtp', 'postdrop': 'postdrop', 'trivial-rewrite': 'trivial-rewrite', 'postfix': 'postfix', 'postlock': 'postlock', 'pipe': 'pipe', 'tlsmgr': 'tlsmgr', 'error': 'error', 'discard': 'discard', 'postsuper': 'postsuper', 'cleanup': 'cleanup'} -DATA_PKG_BY_ANY_FILENAME = {'BASIC_CONFIGURATION_README': 'CSWpostfix', 'postlock.1': 'CSWpostfix', 'newaliases.1.html': 'CSWpostfix', 'CDB_README': 'CSWpostfix', 'MULTI_INSTANCE_README': 'CSWpostfix', 'CONTENT_INSPECTION_README.html': 'CSWpostfix', 'trace.8': 'CSWpostfix', 'SASL_README.html': 'CSWpostfix', 'postsuper': 'CSWpostfix', 'showq.8': 'CSWpostfix', 'qmqpd': 'CSWpostfix', 'cidr_table.5.html': 'CSWpostfix', 'virtual': 'CSWpostfix', 'verify.8': 'CSWpostfix', 'ETRN_README.html': 'CSWpostfix', 'pgsql_table.5.html': 'CSWpostfix', 'generic.CSW': 'CSWpostfix', 'FILTER_README.html': 'CSWpostfix', 'cswusergroup': 'CSWpostfix', 'CONNECTION_CACHE_README': 'CSWpostfix', 'STRESS_README.html': 'CSWpostfix', 'pickup.8': 'CSWpostfix', 'postconf.1': 'CSWpostfix', 'OVERVIEW': 'CSWpostfix', 'showq.8.html': 'CSWpostfix', 'XFORWARD_README.html': 'CSWpostfix', 'pickup.8.html': 'CSWpostfix', 'master.5.html': 'CSWpostfix', 'smtpd.8': 'CSWpostfix', 'ADDRESS_VERIFICATION_README': 'CSWpo stfix', 'discard.8': 'CSWpostfix', 'IPV6_README': 'CSWpostfix', 'local': 'CSWpostfix', 'qmgr.8': 'CSWpostfix', 'local.8.html': 'CSWpostfix', 'newaliases.1': 'CSWpostfix', 'PACKAGE_README': 'CSWpostfix', 'header_checks.CSW': 'CSWpostfix', 'PACKAGE_README.html': 'CSWpostfix', 'postmap.1.html': 'CSWpostfix', 'regexp_table.5': 'CSWpostfix', 'VIRTUAL_README.html': 'CSWpostfix', 'virtual.8': 'CSWpostfix', 'postlock.1.html': 'CSWpostfix', 'postfix-wrapper': 'CSWpostfix', 'tlsmgr.8': 'CSWpostfix', 'lmtp': 'CSWpostfix', 'verify': 'CSWpostfix', 'trivial-rewrite': 'CSWpostfix', 'scache': 'CSWpostfix', 'CONNECTION_CACHE_README.html': 'CSWpostfix', 'postlog.1.html': 'CSWpostfix', 'postconf.1.html': 'CSWpostfix', 'postfix-files': 'CSWpostfix', 'VIRTUAL_README': 'CSWpostfix', 'TLS_LEGACY_README.html': 'CSWpostfix', 'LOCAL_RECIPIENT_README': 'CSWpostfix', 'TUNING_README': 'CSWpostfix', 'main.cf': 'CSWpostfix', 'postfix-wrapper.5.html': 'CSWpostfix', 'cidr_table.5': 'CSWpostfix', 'NFS_README ': 'CSWpostfix', 'flush.8': 'CSWpostfix', 'postkick.1.html': 'CSWpostfix', 'postalias': 'CSWpostfix', 'STANDARD_CONFIGURATION_README': 'CSWpostfix', 'postmulti': 'CSWpostfix', 'postqueue.1': 'CSWpostfix', 'MAILDROP_README': 'CSWpostfix', 'postqueue.1.html': 'CSWpostfix', 'postlog': 'CSWpostfix', 'postconf': 'CSWpostfix', 'nisplus_table.5.html': 'CSWpostfix', 'scache.8': 'CSWpostfix', 'aliases.5': 'CSWpostfix', 'bounce.8': 'CSWpostfix', 'ldap_table.5.html': 'CSWpostfix', 'master.5': 'CSWpostfix', 'flush': 'CSWpostfix', 'master.8': 'CSWpostfix', 'postmulti.1.html': 'CSWpostfix', 'STANDARD_CONFIGURATION_README.html': 'CSWpostfix', 'bounce.5': 'CSWpostfix', 'smtp-source.1.html': 'CSWpostfix', 'smtpd': 'CSWpostfix', 'proxymap.8.html': 'CSWpostfix', 'oqmgr.8': 'CSWpostfix', 'postkick.1': 'CSWpostfix', 'BACKSCATTER_README.html': 'CSWpostfix', 'tcp_table.5': 'CSWpostfix', 'pkginfo': 'CSWpostfix', 'postfix.1.html': 'CSWpostfix', 'post-install': 'CSWpostfix', 'access.CSW': 'CSWpostfix ', 'CONTENT_INSPECTION_README': 'CSWpostfix', 'SMTPD_POLICY_README': 'CSWpostfix', 'TLS_README.html': 'CSWpostfix', 'postconf.5': 'CSWpostfix', 'smtpd.8.html': 'CSWpostfix', 'MILTER_README': 'CSWpostfix', 'LINUX_README': 'CSWpostfix', 'SMTPD_PROXY_README.html': 'CSWpostfix', 'showq': 'CSWpostfix', 'tlsmgr': 'CSWpostfix', 'INSTALL.html': 'CSWpostfix', 'access.5.html': 'CSWpostfix', 'relocated.CSW': 'CSWpostfix', 'ULTRIX_README': 'CSWpostfix', 'sendmail': 'CSWpostfix', 'error': 'CSWpostfix', 'ETRN_README': 'CSWpostfix', 'AAAREADME': 'CSWpostfix', 'master.cf.CSW': 'CSWpostfix', 'pgsql_table.5': 'CSWpostfix', 'error.8': 'CSWpostfix', 'depend': 'CSWpostfix', 'LDAP_README': 'CSWpostfix', 'canonical.5': 'CSWpostfix', 'postmulti.1': 'CSWpostfix', 'MYSQL_README.html': 'CSWpostfix', 'qmgr.8.html': 'CSWpostfix', 'smtp.8': 'CSWpostfix', 'pipe.8.html': 'CSWpostfix', 'oqmgr': 'CSWpostfix', 'anvil': 'CSWpostfix', 'main.cf.CSW': 'CSWpostfix', 'postlock': 'CSWpostfix', 'postfix.1': 'CSWpostf ix', 'ADDRESS_CLASS_README': 'CSWpostfix', 'OVERVIEW.html': 'CSWpostfix', 'QSHAPE_README': 'CSWpostfix', 'NFS_README.html': 'CSWpostfix', 'discard': 'CSWpostfix', 'FILTER_README': 'CSWpostfix', 'lmtp.8.html': 'CSWpostfix', 'body_checks.5': 'CSWpostfix', 'generic.5.html': 'CSWpostfix', 'postdrop.1.html': 'CSWpostfix', 'error.8.html': 'CSWpostfix', 'verify.8.html': 'CSWpostfix', 'TLS_LICENSE': 'CSWpostfix', 'discard.8.html': 'CSWpostfix', 'tcp_table.5.html': 'CSWpostfix', 'header_checks.5': 'CSWpostfix', 'PGSQL_README': 'CSWpostfix', 'XFORWARD_README': 'CSWpostfix', 'postmap': 'CSWpostfix', 'proxymap': 'CSWpostfix', 'RESTRICTION_CLASS_README': 'CSWpostfix', 'LDAP_README.html': 'CSWpostfix', 'defer.8.html': 'CSWpostfix', 'flush.8.html': 'CSWpostfix', 'VERP_README': 'CSWpostfix', 'cleanup.8': 'CSWpostfix', 'XCLIENT_README.html': 'CSWpostfix', 'virtual.CSW': 'CSWpostfix', 'qmqpd.8.html': 'CSWpostfix', 'cleanup.8.html': 'CSWpostfix', 'postdrop': 'CSWpostfix', 'qshape.1.html': 'CSW postfix', 'VERP_README.html': 'CSWpostfix', 'SCHEDULER_README.html': 'CSWpostfix', 'trivial-rewrite.8.html': 'CSWpostfix', 'postqueue': 'CSWpostfix', 'master': 'CSWpostfix', 'oqmgr.8.html': 'CSWpostfix', 'trivial-rewrite.8': 'CSWpostfix', 'master.8.html': 'CSWpostfix', 'PGSQL_README.html': 'CSWpostfix', 'STRESS_README': 'CSWpostfix', 'header_checks.5.html': 'CSWpostfix', 'canonical.CSW': 'CSWpostfix', 'relocated.5.html': 'CSWpostfix', 'TLS_README': 'CSWpostfix', 'BACKSCATTER_README': 'CSWpostfix', 'pcre_table.5': 'CSWpostfix', 'postfix-script': 'CSWpostfix', 'qmqp-source.1.html': 'CSWpostfix', 'postcat': 'CSWpostfix', 'transport.5': 'CSWpostfix', 'defer.8': 'CSWpostfix', 'bounce': 'CSWpostfix', 'postsuper.1': 'CSWpostfix', 'LINUX_README.html': 'CSWpostfix', 'index.html': 'CSWpostfix', 'postdrop.1': 'CSWpostfix', 'transport.CSW': 'CSWpostfix', 'ADDRESS_REWRITING_README.html': 'CSWpostfix', 'pipe.8': 'CSWpostfix', 'proxymap.8': 'CSWpostfix', 'DB_README.html': 'CSWpostfix', 'LO CAL_RECIPIENT_README.html': 'CSWpostfix', 'UUCP_README': 'CSWpostfix', 'postcat.1.html': 'CSWpostfix', 'ldap_table.5': 'CSWpostfix', 'pkgmap': 'CSWpostfix', 'postmulti-script': 'CSWpostfix', 'BUILTIN_FILTER_README.html': 'CSWpostfix', 'SMTPD_POLICY_README.html': 'CSWpostfix', 'main.cf.default': 'CSWpostfix', 'postfix-wrapper.5': 'CSWpostfix', 'IPV6_README.html': 'CSWpostfix', 'qmqpd.8': 'CSWpostfix', 'spawn': 'CSWpostfix', 'mailq.1': 'CSWpostfix', 'DB_README': 'CSWpostfix', 'pickup': 'CSWpostfix', 'BASIC_CONFIGURATION_README.html': 'CSWpostfix', 'postsuper.1.html': 'CSWpostfix', 'cswpostfix': 'CSWpostfix', 'postconf.5.html': 'CSWpostfix', 'CDB_README.html': 'CSWpostfix', 'BUILTIN_FILTER_README': 'CSWpostfix', 'SMTPD_ACCESS_README': 'CSWpostfix', 'TLS_LEGACY_README': 'CSWpostfix', 'virtual.8.html': 'CSWpostfix', 'DATABASE_README': 'CSWpostfix', 'lmtp.8': 'CSWpostfix', 'spawn.8.html': 'CSWpostfix', 'access.5': 'CSWpostfix', 'ADDRESS_REWRITING_README': 'CSWpostfix', 'aliases.CS W': 'CSWpostfix', 'SASL_README': 'CSWpostfix', 'pcre_table.5.html': 'CSWpostfix', 'MYSQL_README': 'CSWpostfix', 'ADDRESS_VERIFICATION_README.html': 'CSWpostfix', 'mysql_table.5': 'CSWpostfix', 'DSN_README.html': 'CSWpostfix', 'DATABASE_README.html': 'CSWpostfix', 'postfix-manuals.html': 'CSWpostfix', 'SCHEDULER_README': 'CSWpostfix', 'SMTPD_ACCESS_README.html': 'CSWpostfix', 'postlog.1': 'CSWpostfix', 'nqmgr': 'CSWpostfix', 'nisplus_table.5': 'CSWpostfix', 'local.8': 'CSWpostfix', 'smtp-sink.1.html': 'CSWpostfix', 'ADDRESS_CLASS_README.html': 'CSWpostfix', 'cleanup': 'CSWpostfix', 'QSHAPE_README.html': 'CSWpostfix', 'virtual.5.html': 'CSWpostfix', 'XCLIENT_README': 'CSWpostfix', 'UUCP_README.html': 'CSWpostfix', 'relocated.5': 'CSWpostfix', 'RELEASE_NOTES': 'CSWpostfix', 'canonical.5.html': 'CSWpostfix', 'checkinstall': 'CSWpostfix', 'INSTALL': 'CSWpostfix', 'PCRE_README': 'CSWpostfix', 'postalias.1.html': 'CSWpostfix', 'postcat.1': 'CSWpostfix', 'sendmail.1': 'CSWpostfix', 'bounce.cf.default': 'CSWpostfix', 'postfix-logo.jpg': 'CSWpostfix', 'TUNING_README.html': 'CSWpostfix', 'anvil.8.html': 'CSWpostfix', 'mysql_table.5.html': 'CSWpostfix', 'RESTRICTION_CLASS_README.html': 'CSWpostfix', 'master.cf': 'CSWpostfix', 'postkick': 'CSWpostfix', 'MULTI_INSTANCE_README.html': 'CSWpostfix', 'spawn.8': 'CSWpostfix', 'DEBUG_README': 'CSWpostfix', 'postalias.1': 'CSWpostfix', 'PCRE_README.html': 'CSWpostfix', 'postfix': 'CSWpostfix', 'DEBUG_README.html': 'CSWpostfix', 'MILTER_README.html': 'CSWpostfix', 'MAILDROP_README.html': 'CSWpostfix', 'aliases.5.html': 'CSWpostfix', 'pipe': 'CSWpostfix', 'SMTPD_PROXY_README': 'CSWpostfix', 'regexp_table.5.html': 'CSWpostfix', 'postmap.1': 'CSWpostfix', 'transport.5.html': 'CSWpostfix', 'qmqp-sink.1.html': 'CSWpostfix', 'DSN_README': 'CSWpostfix', 'anvil.8': 'CSWpostfix', 'virtual.5': 'CSWpostfix', 'generic.5': 'CSWpostfix'} -DATA_LINES_BY_SONAME = {'libresolv.so.2': u'/usr/lib/sparcv9/libresolv.so.2 f none 0755 root bin 448048 5947 1234567885 SUNWcslx', 'libnsl.so.1': u'/usr/lib/sparcv9/libnsl.so.1 f none 0755 root bin 1099248 7581 1217954364 SUNWcslx', 'libsasl2.so.2': u'/opt/csw/lib/libsasl2.so.2=libsasl2.so.2.0.22 s none CSWsasl', 'libmysqlclient.so.15': u'/opt/csw/mysql5/lib/mysql/libmysqlclient.so.15=libmysqlclient.so.15.0.0 s none CSWmysql5rt', 'libpcre.so.0': u'/opt/csw/lib/sparcv9/libpcre.so.0=libpcre.so.0.0.1 s none CSWpcrert', 'libssl.so.0.9.8': u'/opt/csw/lib/sparcv9/libssl.so.0.9.8 f none 0755 root bin 427792 46460 1261308405 CSWosslrt', 'libldap-2.3.so.0': u'/opt/csw/lib/sparcv9/libldap-2.3.so.0=libldap-2.3.so.0.2.27 s none CSWoldaprt', 'libcrypto.so.0.9.8': u'/opt/csw/lib/sparcv9/libcrypto.so.0.9.8 f none 0755 root bin 2520480 3820 1261308405 CSWosslrt', 'libsocket.so.1': u'/usr/lib/sparcv9/libsocket.so.1 f none 0755 root bin 96448 3175 1210705279 SUNWcslx', 'libc.so.1': u '/usr/lib/sparcv9/libc.so.1 f none 0755 root bin 1271000 23501 1217954364 SUNWcslx', 'liblber-2.3.so.0': u'/opt/csw/lib/sparcv9/liblber-2.3.so.0=liblber-2.3.so.0.2.27 s none CSWoldaprt'} +DATA_DECLARED_DEPENDENCIES = {'CSWbdb42': 'CSWbdb42 berkeleydb42 - BerkeleyDB 4.2 embedded database libraries and utilities ', 'CSWcswclassutils': 'CSWcswclassutils cswclassutils - CSW class action utilities ', 'CSWpcrert': 'CSWpcrert pcre_rt - Perl-compatible regular expression runtime libraries ', 'CSWmysql5rt': 'CSWmysql5rt mysql5rt - MySQL 5.0 runtime files ', 'CSWlibpq': 'CSWlibpq libpq - libraries needed by postgresql server and clients ', 'CSWsasl': 'CSWsasl sasl - Simple Authentication and Security Layer ', 'CSWcommon': 'CSWcommon common - common files and dirs for CSW packages ', 'CSWoldaprt': 'CSWoldaprt openldap_rt - OpenLDAP runtime libraries (oldaprt) ', 'CSWosslrt': 'CSWosslrt openssl_rt - Openssl runtime libraries '} +DATA_BINARIES_BY_PKGNAME = {'CSWpostfix': ['postmap', 'postqueue', 'postlog', 'postdrop', 'sendmail', 'postkick', 'postalias', 'postmulti', 'postcat', 'postlock', 'postconf', 'postsuper', 'postfix', 'discard', 'showq', 'smtpd', 'trivial-rewrite', 'proxymap', 'local', 'bounce', 'flush', 'qmqpd', 'error', 'verify', 'master', 'pipe', 'virtual', 'tlsmgr', 'scache', 'cleanup', 'pickup', 'oqmgr', 'anvil', 'lmtp', 'nqmgr', 'spawn']} +DATA_NEEDED_SONAMES_BY_BINARY = {'spawn': {'soname': 'spawn', 'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/bdb42/lib', '/opt/csw/mysql5/lib/mysql', '/opt/csw/postgresql/lib/', '/usr/lib/$ISALIST', '/usr/lib', '/lib/$ISALIST', '/lib'], 'needed sonames': ['libpcre.so.0', 'libdb-4.2.so', 'libssl.so.0.9.8', 'libcrypto.so.0.9.8', 'libsasl2.so.2', 'libldap-2.3.so.0', 'liblber-2.3.so.0', 'libmysqlclient.so.15', 'libpq.so.5', 'libresolv.so.2', 'libsocket.so.1', 'libnsl.so.1', 'libc.so.1']}, 'postmulti': {'soname': 'postmulti', 'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/bdb42/lib', '/opt/csw/mysql5/lib/mysql', '/opt/csw/postgresql/lib/', '/usr/lib/$ISALIST', '/usr/lib', '/lib/$ISALIST', '/lib'], 'needed sonames': ['libpcre.so.0', 'libdb-4.2.so', 'libssl.so.0.9.8', 'libcrypto.so.0.9.8', 'libsasl2.so.2', 'libldap-2.3.so.0', 'liblber-2.3.so.0', 'libmysqlclient.so.15', 'libpq.so.5', 'libresolv.so.2', 'libsocket.so.1', 'libnsl.so.1', 'libc.so.1']}, 'p ostkick': {'soname': 'postkick', 'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/bdb42/lib', '/opt/csw/mysql5/lib/mysql', '/opt/csw/postgresql/lib/', '/usr/lib/$ISALIST', '/usr/lib', '/lib/$ISALIST', '/lib'], 'needed sonames': ['libpcre.so.0', 'libdb-4.2.so', 'libssl.so.0.9.8', 'libcrypto.so.0.9.8', 'libsasl2.so.2', 'libldap-2.3.so.0', 'liblber-2.3.so.0', 'libmysqlclient.so.15', 'libpq.so.5', 'libresolv.so.2', 'libsocket.so.1', 'libnsl.so.1', 'libc.so.1']}, 'postlog': {'soname': 'postlog', 'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/bdb42/lib', '/opt/csw/mysql5/lib/mysql', '/opt/csw/postgresql/lib/', '/usr/lib/$ISALIST', '/usr/lib', '/lib/$ISALIST', '/lib'], 'needed sonames': ['libpcre.so.0', 'libdb-4.2.so', 'libssl.so.0.9.8', 'libcrypto.so.0.9.8', 'libsasl2.so.2', 'libldap-2.3.so.0', 'liblber-2.3.so.0', 'libmysqlclient.so.15', 'libpq.so.5', 'libresolv.so.2', 'libsocket.so.1', 'libnsl.so.1', 'libc.so.1']}, 'postconf': {'soname': 'postconf', 'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/bdb42/lib', '/opt/csw/mysql5/lib/mysql', '/opt/csw/postgresql/lib/', '/usr/lib/$ISALIST', '/usr/lib', '/lib/$ISALIST', '/lib'], 'needed sonames': ['libpcre.so.0', 'libdb-4.2.so', 'libssl.so.0.9.8', 'libcrypto.so.0.9.8', 'libsasl2.so.2', 'libldap-2.3.so.0', 'liblber-2.3.so.0', 'libmysqlclient.so.15', 'libpq.so.5', 'libresolv.so.2', 'libsocket.so.1', 'libnsl.so.1', 'libc.so.1']}, 'bounce': {'soname': 'bounce', 'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/bdb42/lib', '/opt/csw/mysql5/lib/mysql', '/opt/csw/postgresql/lib/', '/usr/lib/$ISALIST', '/usr/lib', '/lib/$ISALIST', '/lib'], 'needed sonames': ['libpcre.so.0', 'libdb-4.2.so', 'libssl.so.0.9.8', 'libcrypto.so.0.9.8', 'libsasl2.so.2', 'libldap-2.3.so.0', 'liblber-2.3.so.0', 'libmysqlclient.so.15', 'libpq.so.5', 'libresolv.so.2', 'libsocket.so.1', 'libnsl.so.1', 'libc.so.1']}, 'qmqpd': {'soname': 'qmqpd', 'runpath': ['/opt/csw/lib/$ISALIST', '/op t/csw/lib', '/opt/csw/bdb42/lib', '/opt/csw/mysql5/lib/mysql', '/opt/csw/postgresql/lib/', '/usr/lib/$ISALIST', '/usr/lib', '/lib/$ISALIST', '/lib'], 'needed sonames': ['libpcre.so.0', 'libdb-4.2.so', 'libssl.so.0.9.8', 'libcrypto.so.0.9.8', 'libsasl2.so.2', 'libldap-2.3.so.0', 'liblber-2.3.so.0', 'libmysqlclient.so.15', 'libpq.so.5', 'libresolv.so.2', 'libsocket.so.1', 'libnsl.so.1', 'libc.so.1']}, 'nqmgr': {'soname': 'nqmgr', 'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/bdb42/lib', '/opt/csw/mysql5/lib/mysql', '/opt/csw/postgresql/lib/', '/usr/lib/$ISALIST', '/usr/lib', '/lib/$ISALIST', '/lib'], 'needed sonames': ['libpcre.so.0', 'libdb-4.2.so', 'libssl.so.0.9.8', 'libcrypto.so.0.9.8', 'libsasl2.so.2', 'libldap-2.3.so.0', 'liblber-2.3.so.0', 'libmysqlclient.so.15', 'libpq.so.5', 'libresolv.so.2', 'libsocket.so.1', 'libnsl.so.1', 'libc.so.1']}, 'flush': {'soname': 'flush', 'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/bdb42/lib', '/opt/csw /mysql5/lib/mysql', '/opt/csw/postgresql/lib/', '/usr/lib/$ISALIST', '/usr/lib', '/lib/$ISALIST', '/lib'], 'needed sonames': ['libpcre.so.0', 'libdb-4.2.so', 'libssl.so.0.9.8', 'libcrypto.so.0.9.8', 'libsasl2.so.2', 'libldap-2.3.so.0', 'liblber-2.3.so.0', 'libmysqlclient.so.15', 'libpq.so.5', 'libresolv.so.2', 'libsocket.so.1', 'libnsl.so.1', 'libc.so.1']}, 'proxymap': {'soname': 'proxymap', 'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/bdb42/lib', '/opt/csw/mysql5/lib/mysql', '/opt/csw/postgresql/lib/', '/usr/lib/$ISALIST', '/usr/lib', '/lib/$ISALIST', '/lib'], 'needed sonames': ['libpcre.so.0', 'libdb-4.2.so', 'libssl.so.0.9.8', 'libcrypto.so.0.9.8', 'libsasl2.so.2', 'libldap-2.3.so.0', 'liblber-2.3.so.0', 'libmysqlclient.so.15', 'libpq.so.5', 'libresolv.so.2', 'libsocket.so.1', 'libnsl.so.1', 'libc.so.1']}, 'scache': {'soname': 'scache', 'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/bdb42/lib', '/opt/csw/mysql5/lib/mysql', '/opt/csw/postg resql/lib/', '/usr/lib/$ISALIST', '/usr/lib', '/lib/$ISALIST', '/lib'], 'needed sonames': ['libpcre.so.0', 'libdb-4.2.so', 'libssl.so.0.9.8', 'libcrypto.so.0.9.8', 'libsasl2.so.2', 'libldap-2.3.so.0', 'liblber-2.3.so.0', 'libmysqlclient.so.15', 'libpq.so.5', 'libresolv.so.2', 'libsocket.so.1', 'libnsl.so.1', 'libc.so.1']}, 'anvil': {'soname': 'anvil', 'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/bdb42/lib', '/opt/csw/mysql5/lib/mysql', '/opt/csw/postgresql/lib/', '/usr/lib/$ISALIST', '/usr/lib', '/lib/$ISALIST', '/lib'], 'needed sonames': ['libpcre.so.0', 'libdb-4.2.so', 'libssl.so.0.9.8', 'libcrypto.so.0.9.8', 'libsasl2.so.2', 'libldap-2.3.so.0', 'liblber-2.3.so.0', 'libmysqlclient.so.15', 'libpq.so.5', 'libresolv.so.2', 'libsocket.so.1', 'libnsl.so.1', 'libc.so.1']}, 'verify': {'soname': 'verify', 'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/bdb42/lib', '/opt/csw/mysql5/lib/mysql', '/opt/csw/postgresql/lib/', '/usr/lib/$ISALIST', '/usr/l ib', '/lib/$ISALIST', '/lib'], 'needed sonames': ['libpcre.so.0', 'libdb-4.2.so', 'libssl.so.0.9.8', 'libcrypto.so.0.9.8', 'libsasl2.so.2', 'libldap-2.3.so.0', 'liblber-2.3.so.0', 'libmysqlclient.so.15', 'libpq.so.5', 'libresolv.so.2', 'libsocket.so.1', 'libnsl.so.1', 'libc.so.1']}, 'postalias': {'soname': 'postalias', 'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/bdb42/lib', '/opt/csw/mysql5/lib/mysql', '/opt/csw/postgresql/lib/', '/usr/lib/$ISALIST', '/usr/lib', '/lib/$ISALIST', '/lib'], 'needed sonames': ['libpcre.so.0', 'libdb-4.2.so', 'libssl.so.0.9.8', 'libcrypto.so.0.9.8', 'libsasl2.so.2', 'libldap-2.3.so.0', 'liblber-2.3.so.0', 'libmysqlclient.so.15', 'libpq.so.5', 'libresolv.so.2', 'libsocket.so.1', 'libnsl.so.1', 'libc.so.1']}, 'postcat': {'soname': 'postcat', 'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/bdb42/lib', '/opt/csw/mysql5/lib/mysql', '/opt/csw/postgresql/lib/', '/usr/lib/$ISALIST', '/usr/lib', '/lib/$ISALIST', '/lib'], 'needed sonames': ['libpcre.so.0', 'libdb-4.2.so', 'libssl.so.0.9.8', 'libcrypto.so.0.9.8', 'libsasl2.so.2', 'libldap-2.3.so.0', 'liblber-2.3.so.0', 'libmysqlclient.so.15', 'libpq.so.5', 'libresolv.so.2', 'libsocket.so.1', 'libnsl.so.1', 'libc.so.1']}, 'virtual': {'soname': 'virtual', 'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/bdb42/lib', '/opt/csw/mysql5/lib/mysql', '/opt/csw/postgresql/lib/', '/usr/lib/$ISALIST', '/usr/lib', '/lib/$ISALIST', '/lib'], 'needed sonames': ['libpcre.so.0', 'libdb-4.2.so', 'libssl.so.0.9.8', 'libcrypto.so.0.9.8', 'libsasl2.so.2', 'libldap-2.3.so.0', 'liblber-2.3.so.0', 'libmysqlclient.so.15', 'libpq.so.5', 'libresolv.so.2', 'libsocket.so.1', 'libnsl.so.1', 'libc.so.1']}, 'pickup': {'soname': 'pickup', 'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/bdb42/lib', '/opt/csw/mysql5/lib/mysql', '/opt/csw/postgresql/lib/', '/usr/lib/$ISALIST', '/usr/lib', '/lib/$ISALIST', '/lib'], 'needed sonames': ['libpcre.so.0', 'l ibdb-4.2.so', 'libssl.so.0.9.8', 'libcrypto.so.0.9.8', 'libsasl2.so.2', 'libldap-2.3.so.0', 'liblber-2.3.so.0', 'libmysqlclient.so.15', 'libpq.so.5', 'libresolv.so.2', 'libsocket.so.1', 'libnsl.so.1', 'libc.so.1']}, 'oqmgr': {'soname': 'oqmgr', 'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/bdb42/lib', '/opt/csw/mysql5/lib/mysql', '/opt/csw/postgresql/lib/', '/usr/lib/$ISALIST', '/usr/lib', '/lib/$ISALIST', '/lib'], 'needed sonames': ['libpcre.so.0', 'libdb-4.2.so', 'libssl.so.0.9.8', 'libcrypto.so.0.9.8', 'libsasl2.so.2', 'libldap-2.3.so.0', 'liblber-2.3.so.0', 'libmysqlclient.so.15', 'libpq.so.5', 'libresolv.so.2', 'libsocket.so.1', 'libnsl.so.1', 'libc.so.1']}, 'master': {'soname': 'master', 'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/bdb42/lib', '/opt/csw/mysql5/lib/mysql', '/opt/csw/postgresql/lib/', '/usr/lib/$ISALIST', '/usr/lib', '/lib/$ISALIST', '/lib'], 'needed sonames': ['libpcre.so.0', 'libdb-4.2.so', 'libssl.so.0.9.8', 'libcryp to.so.0.9.8', 'libsasl2.so.2', 'libldap-2.3.so.0', 'liblber-2.3.so.0', 'libmysqlclient.so.15', 'libpq.so.5', 'libresolv.so.2', 'libsocket.so.1', 'libnsl.so.1', 'libc.so.1']}, 'postqueue': {'soname': 'postqueue', 'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/bdb42/lib', '/opt/csw/mysql5/lib/mysql', '/opt/csw/postgresql/lib/', '/usr/lib/$ISALIST', '/usr/lib', '/lib/$ISALIST', '/lib'], 'needed sonames': ['libpcre.so.0', 'libdb-4.2.so', 'libssl.so.0.9.8', 'libcrypto.so.0.9.8', 'libsasl2.so.2', 'libldap-2.3.so.0', 'liblber-2.3.so.0', 'libmysqlclient.so.15', 'libpq.so.5', 'libresolv.so.2', 'libsocket.so.1', 'libnsl.so.1', 'libc.so.1']}, 'trivial-rewrite': {'soname': 'trivial-rewrite', 'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/bdb42/lib', '/opt/csw/mysql5/lib/mysql', '/opt/csw/postgresql/lib/', '/usr/lib/$ISALIST', '/usr/lib', '/lib/$ISALIST', '/lib'], 'needed sonames': ['libpcre.so.0', 'libdb-4.2.so', 'libssl.so.0.9.8', 'libcrypto.so.0.9.8', ' libsasl2.so.2', 'libldap-2.3.so.0', 'liblber-2.3.so.0', 'libmysqlclient.so.15', 'libpq.so.5', 'libresolv.so.2', 'libsocket.so.1', 'libnsl.so.1', 'libc.so.1']}, 'local': {'soname': 'local', 'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/bdb42/lib', '/opt/csw/mysql5/lib/mysql', '/opt/csw/postgresql/lib/', '/usr/lib/$ISALIST', '/usr/lib', '/lib/$ISALIST', '/lib'], 'needed sonames': ['libpcre.so.0', 'libdb-4.2.so', 'libssl.so.0.9.8', 'libcrypto.so.0.9.8', 'libsasl2.so.2', 'libldap-2.3.so.0', 'liblber-2.3.so.0', 'libmysqlclient.so.15', 'libpq.so.5', 'libresolv.so.2', 'libsocket.so.1', 'libnsl.so.1', 'libc.so.1']}, 'showq': {'soname': 'showq', 'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/bdb42/lib', '/opt/csw/mysql5/lib/mysql', '/opt/csw/postgresql/lib/', '/usr/lib/$ISALIST', '/usr/lib', '/lib/$ISALIST', '/lib'], 'needed sonames': ['libpcre.so.0', 'libdb-4.2.so', 'libssl.so.0.9.8', 'libcrypto.so.0.9.8', 'libsasl2.so.2', 'libldap-2.3.so.0', 'liblbe r-2.3.so.0', 'libmysqlclient.so.15', 'libpq.so.5', 'libresolv.so.2', 'libsocket.so.1', 'libnsl.so.1', 'libc.so.1']}, 'sendmail': {'soname': 'sendmail', 'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/bdb42/lib', '/opt/csw/mysql5/lib/mysql', '/opt/csw/postgresql/lib/', '/usr/lib/$ISALIST', '/usr/lib', '/lib/$ISALIST', '/lib'], 'needed sonames': ['libpcre.so.0', 'libdb-4.2.so', 'libssl.so.0.9.8', 'libcrypto.so.0.9.8', 'libsasl2.so.2', 'libldap-2.3.so.0', 'liblber-2.3.so.0', 'libmysqlclient.so.15', 'libpq.so.5', 'libresolv.so.2', 'libsocket.so.1', 'libnsl.so.1', 'libc.so.1']}, 'discard': {'soname': 'discard', 'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/bdb42/lib', '/opt/csw/mysql5/lib/mysql', '/opt/csw/postgresql/lib/', '/usr/lib/$ISALIST', '/usr/lib', '/lib/$ISALIST', '/lib'], 'needed sonames': ['libpcre.so.0', 'libdb-4.2.so', 'libssl.so.0.9.8', 'libcrypto.so.0.9.8', 'libsasl2.so.2', 'libldap-2.3.so.0', 'liblber-2.3.so.0', 'libmysqlclient.so.1 5', 'libpq.so.5', 'libresolv.so.2', 'libsocket.so.1', 'libnsl.so.1', 'libc.so.1']}, 'lmtp': {'soname': 'lmtp', 'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/bdb42/lib', '/opt/csw/mysql5/lib/mysql', '/opt/csw/postgresql/lib/', '/usr/lib/$ISALIST', '/usr/lib', '/lib/$ISALIST', '/lib'], 'needed sonames': ['libpcre.so.0', 'libdb-4.2.so', 'libssl.so.0.9.8', 'libcrypto.so.0.9.8', 'libsasl2.so.2', 'libldap-2.3.so.0', 'liblber-2.3.so.0', 'libmysqlclient.so.15', 'libpq.so.5', 'libresolv.so.2', 'libsocket.so.1', 'libnsl.so.1', 'libc.so.1']}, 'postdrop': {'soname': 'postdrop', 'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/bdb42/lib', '/opt/csw/mysql5/lib/mysql', '/opt/csw/postgresql/lib/', '/usr/lib/$ISALIST', '/usr/lib', '/lib/$ISALIST', '/lib'], 'needed sonames': ['libpcre.so.0', 'libdb-4.2.so', 'libssl.so.0.9.8', 'libcrypto.so.0.9.8', 'libsasl2.so.2', 'libldap-2.3.so.0', 'liblber-2.3.so.0', 'libmysqlclient.so.15', 'libpq.so.5', 'libresolv.so.2', 'li bsocket.so.1', 'libnsl.so.1', 'libc.so.1']}, 'postmap': {'soname': 'postmap', 'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/bdb42/lib', '/opt/csw/mysql5/lib/mysql', '/opt/csw/postgresql/lib/', '/usr/lib/$ISALIST', '/usr/lib', '/lib/$ISALIST', '/lib'], 'needed sonames': ['libpcre.so.0', 'libdb-4.2.so', 'libssl.so.0.9.8', 'libcrypto.so.0.9.8', 'libsasl2.so.2', 'libldap-2.3.so.0', 'liblber-2.3.so.0', 'libmysqlclient.so.15', 'libpq.so.5', 'libresolv.so.2', 'libsocket.so.1', 'libnsl.so.1', 'libc.so.1']}, 'postfix': {'soname': 'postfix', 'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/bdb42/lib', '/opt/csw/mysql5/lib/mysql', '/opt/csw/postgresql/lib/', '/usr/lib/$ISALIST', '/usr/lib', '/lib/$ISALIST', '/lib'], 'needed sonames': ['libpcre.so.0', 'libdb-4.2.so', 'libssl.so.0.9.8', 'libcrypto.so.0.9.8', 'libsasl2.so.2', 'libldap-2.3.so.0', 'liblber-2.3.so.0', 'libmysqlclient.so.15', 'libpq.so.5', 'libresolv.so.2', 'libsocket.so.1', 'libnsl.so.1', 'libc .so.1']}, 'postlock': {'soname': 'postlock', 'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/bdb42/lib', '/opt/csw/mysql5/lib/mysql', '/opt/csw/postgresql/lib/', '/usr/lib/$ISALIST', '/usr/lib', '/lib/$ISALIST', '/lib'], 'needed sonames': ['libpcre.so.0', 'libdb-4.2.so', 'libssl.so.0.9.8', 'libcrypto.so.0.9.8', 'libsasl2.so.2', 'libldap-2.3.so.0', 'liblber-2.3.so.0', 'libmysqlclient.so.15', 'libpq.so.5', 'libresolv.so.2', 'libsocket.so.1', 'libnsl.so.1', 'libc.so.1']}, 'pipe': {'soname': 'pipe', 'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/bdb42/lib', '/opt/csw/mysql5/lib/mysql', '/opt/csw/postgresql/lib/', '/usr/lib/$ISALIST', '/usr/lib', '/lib/$ISALIST', '/lib'], 'needed sonames': ['libpcre.so.0', 'libdb-4.2.so', 'libssl.so.0.9.8', 'libcrypto.so.0.9.8', 'libsasl2.so.2', 'libldap-2.3.so.0', 'liblber-2.3.so.0', 'libmysqlclient.so.15', 'libpq.so.5', 'libresolv.so.2', 'libsocket.so.1', 'libnsl.so.1', 'libc.so.1']}, 'tlsmgr': {'soname': 'tlsmgr' , 'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/bdb42/lib', '/opt/csw/mysql5/lib/mysql', '/opt/csw/postgresql/lib/', '/usr/lib/$ISALIST', '/usr/lib', '/lib/$ISALIST', '/lib'], 'needed sonames': ['libpcre.so.0', 'libdb-4.2.so', 'libssl.so.0.9.8', 'libcrypto.so.0.9.8', 'libsasl2.so.2', 'libldap-2.3.so.0', 'liblber-2.3.so.0', 'libmysqlclient.so.15', 'libpq.so.5', 'libresolv.so.2', 'libsocket.so.1', 'libnsl.so.1', 'libc.so.1']}, 'error': {'soname': 'error', 'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/bdb42/lib', '/opt/csw/mysql5/lib/mysql', '/opt/csw/postgresql/lib/', '/usr/lib/$ISALIST', '/usr/lib', '/lib/$ISALIST', '/lib'], 'needed sonames': ['libpcre.so.0', 'libdb-4.2.so', 'libssl.so.0.9.8', 'libcrypto.so.0.9.8', 'libsasl2.so.2', 'libldap-2.3.so.0', 'liblber-2.3.so.0', 'libmysqlclient.so.15', 'libpq.so.5', 'libresolv.so.2', 'libsocket.so.1', 'libnsl.so.1', 'libc.so.1']}, 'smtpd': {'soname': 'smtpd', 'runpath': ['/opt/csw/lib/$ISALIST', '/op t/csw/lib', '/opt/csw/bdb42/lib', '/opt/csw/mysql5/lib/mysql', '/opt/csw/postgresql/lib/', '/usr/lib/$ISALIST', '/usr/lib', '/lib/$ISALIST', '/lib'], 'needed sonames': ['libpcre.so.0', 'libdb-4.2.so', 'libssl.so.0.9.8', 'libcrypto.so.0.9.8', 'libsasl2.so.2', 'libldap-2.3.so.0', 'liblber-2.3.so.0', 'libmysqlclient.so.15', 'libpq.so.5', 'libresolv.so.2', 'libsocket.so.1', 'libnsl.so.1', 'libc.so.1']}, 'postsuper': {'soname': 'postsuper', 'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/bdb42/lib', '/opt/csw/mysql5/lib/mysql', '/opt/csw/postgresql/lib/', '/usr/lib/$ISALIST', '/usr/lib', '/lib/$ISALIST', '/lib'], 'needed sonames': ['libpcre.so.0', 'libdb-4.2.so', 'libssl.so.0.9.8', 'libcrypto.so.0.9.8', 'libsasl2.so.2', 'libldap-2.3.so.0', 'liblber-2.3.so.0', 'libmysqlclient.so.15', 'libpq.so.5', 'libresolv.so.2', 'libsocket.so.1', 'libnsl.so.1', 'libc.so.1']}, 'cleanup': {'soname': 'cleanup', 'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/bdb42/lib ', '/opt/csw/mysql5/lib/mysql', '/opt/csw/postgresql/lib/', '/usr/lib/$ISALIST', '/usr/lib', '/lib/$ISALIST', '/lib'], 'needed sonames': ['libpcre.so.0', 'libdb-4.2.so', 'libssl.so.0.9.8', 'libcrypto.so.0.9.8', 'libsasl2.so.2', 'libldap-2.3.so.0', 'liblber-2.3.so.0', 'libmysqlclient.so.15', 'libpq.so.5', 'libresolv.so.2', 'libsocket.so.1', 'libnsl.so.1', 'libc.so.1']}} +DATA_PKGS_BY_FILENAME = {'libresolv.so.2': u'SUNWcslx', 'libdb-4.2.so': u'CSWbdb42', 'libsasl2.so.2': u'CSWsasl', 'libmysqlclient.so.15': u'CSWmysql5rt', 'libpcre.so.0': u'CSWpcrert', 'libssl.so.0.9.8': u'CSWosslrt', 'libldap-2.3.so.0': u'CSWoldaprt', 'libnsl.so.1': u'SUNWcslx', 'libcrypto.so.0.9.8': u'CSWosslrt', 'libpq.so.5': u'CSWlibpq', 'libsocket.so.1': u'SUNWcslx', 'liblber-2.3.so.0': u'CSWoldaprt', 'libc.so.1': u'SUNWcslx'} +DATA_FILENAMES_BY_SONAME = {'spawn': 'spawn', 'postmulti': 'postmulti', 'postkick': 'postkick', 'postlog': 'postlog', 'postconf': 'postconf', 'bounce': 'bounce', 'qmqpd': 'qmqpd', 'nqmgr': 'nqmgr', 'flush': 'flush', 'proxymap': 'proxymap', 'scache': 'scache', 'anvil': 'anvil', 'verify': 'verify', 'postalias': 'postalias', 'postcat': 'postcat', 'virtual': 'virtual', 'pickup': 'pickup', 'oqmgr': 'oqmgr', 'master': 'master', 'postqueue': 'postqueue', 'trivial-rewrite': 'trivial-rewrite', 'local': 'local', 'showq': 'showq', 'sendmail': 'sendmail', 'discard': 'discard', 'lmtp': 'lmtp', 'postdrop': 'postdrop', 'postmap': 'postmap', 'postfix': 'postfix', 'postlock': 'postlock', 'pipe': 'pipe', 'tlsmgr': 'tlsmgr', 'error': 'error', 'smtpd': 'smtpd', 'postsuper': 'postsuper', 'cleanup': 'cleanup'} +DATA_PKG_BY_ANY_FILENAME = {'BASIC_CONFIGURATION_README': 'CSWpostfix', 'SMTPD_ACCESS_README.html': 'CSWpostfix', 'CDB_README': 'CSWpostfix', 'cswusergroup': 'CSWpostfix', 'CONTENT_INSPECTION_README.html': 'CSWpostfix', 'post-install': 'CSWpostfix', 'trace.8': 'CSWpostfix', 'PACKAGE_README': 'CSWpostfix', 'postcat': 'CSWpostfix', 'qmqpd': 'CSWpostfix', 'cidr_table.5.html': 'CSWpostfix', 'virtual': 'CSWpostfix', 'verify.8': 'CSWpostfix', 'ETRN_README.html': 'CSWpostfix', 'pgsql_table.5.html': 'CSWpostfix', 'oqmgr.8': 'CSWpostfix', 'FILTER_README.html': 'CSWpostfix', 'MULTI_INSTANCE_README': 'CSWpostfix', 'CONNECTION_CACHE_README': 'CSWpostfix', 'STRESS_README.html': 'CSWpostfix', 'pickup.8': 'CSWpostfix', 'SMTPD_POLICY_README': 'CSWpostfix', 'showq.8.html': 'CSWpostfix', 'TLS_README.html': 'CSWpostfix', 'pickup.8.html': 'CSWpostfix', 'master.5.html': 'CSWpostfix', 'smtpd.8': 'CSWpostfix', 'ADDRESS_VERIFICATION_README': 'CSWpostfix', 'anvil': 'CSWpostfix', 'IPV6_README': 'CSWpostfix', 'local': 'CSWpostfix', 'qmgr.8': 'CSWpostfix', 'local.8.html': 'CSWpostfix', 'newaliases.1': 'CSWpostfix', 'virtual.5': 'CSWpostfix', 'bounce': 'CSWpostfix', 'header_checks.CSW': 'CSWpostfix', 'OVERVIEW': 'CSWpostfix', 'postmap.1.html': 'CSWpostfix', 'postconf.1.html': 'CSWpostfix', 'main.cf.default': 'CSWpostfix', 'virtual.8': 'CSWpostfix', 'postlock.1.html': 'CSWpostfix', 'tlsmgr.8': 'CSWpostfix', 'lmtp': 'CSWpostfix', 'spawn.8.html': 'CSWpostfix', 'trivial-rewrite': 'CSWpostfix', 'scache': 'CSWpostfix', 'CONNECTION_CACHE_README.html': 'CSWpostfix', 'postlog.1.html': 'CSWpostfix', 'anvil.8': 'CSWpostfix', 'postfix-files': 'CSWpostfix', 'RELEASE_NOTES': 'CSWpostfix', 'ADDRESS_REWRITING_README.html': 'CSWpostfix', 'LOCAL_RECIPIENT_README': 'CSWpostfix', 'TUNING_README': 'CSWpostfix', 'ADDRESS_CLASS_README': 'CSWpostfix', 'showq': 'CSWpostfix', 'postfix-wrapper.5.html': 'CSWpostfix', 'STANDARD_CONFIGURATION_README.html': 'CSWpostfix', 'cidr_table.5': 'CSWpostfix ', 'canonical.5.html': 'CSWpostfix', 'flush.8': 'CSWpostfix', 'XFORWARD_README': 'CSWpostfix', 'postmulti': 'CSWpostfix', 'postqueue.1': 'CSWpostfix', 'MAILDROP_README': 'CSWpostfix', 'postqueue.1.html': 'CSWpostfix', 'postlog': 'CSWpostfix', 'postconf': 'CSWpostfix', 'nisplus_table.5.html': 'CSWpostfix', 'aliases.5': 'CSWpostfix', 'bounce.8': 'CSWpostfix', 'ldap_table.5.html': 'CSWpostfix', 'master.5': 'CSWpostfix', 'flush': 'CSWpostfix', 'master.8': 'CSWpostfix', 'FILTER_README': 'CSWpostfix', 'main.cf': 'CSWpostfix', 'STANDARD_CONFIGURATION_README': 'CSWpostfix', 'bounce.5': 'CSWpostfix', 'smtp-source.1.html': 'CSWpostfix', 'proxymap.8.html': 'CSWpostfix', 'generic.CSW': 'CSWpostfix', 'postkick.1': 'CSWpostfix', 'BACKSCATTER_README.html': 'CSWpostfix', 'tcp_table.5': 'CSWpostfix', 'pkginfo': 'CSWpostfix', 'postfix.1.html': 'CSWpostfix', 'oqmgr.8.html': 'CSWpostfix', 'DSN_README': 'CSWpostfix', 'access.CSW': 'CSWpostfix', 'CONTENT_INSPECTION_README': 'CSWpostfix', 'postcon f.1': 'CSWpostfix', 'postlog.1': 'CSWpostfix', 'postconf.5': 'CSWpostfix', 'smtpd.8.html': 'CSWpostfix', 'MILTER_README': 'CSWpostfix', 'postmap': 'CSWpostfix', 'SMTPD_PROXY_README.html': 'CSWpostfix', 'MAILDROP_README.html': 'CSWpostfix', 'virtual.5.html': 'CSWpostfix', 'tlsmgr': 'CSWpostfix', 'INSTALL.html': 'CSWpostfix', 'access.5.html': 'CSWpostfix', 'relocated.CSW': 'CSWpostfix', 'ULTRIX_README': 'CSWpostfix', 'sendmail': 'CSWpostfix', 'error': 'CSWpostfix', 'ETRN_README': 'CSWpostfix', 'postkick.1.html': 'CSWpostfix', 'AAAREADME': 'CSWpostfix', 'master.cf.CSW': 'CSWpostfix', 'pgsql_table.5': 'CSWpostfix', 'error.8': 'CSWpostfix', 'depend': 'CSWpostfix', 'LDAP_README': 'CSWpostfix', 'postsuper': 'CSWpostfix', 'VERP_README': 'CSWpostfix', 'DEBUG_README.html': 'CSWpostfix', 'MYSQL_README.html': 'CSWpostfix', 'qmgr.8.html': 'CSWpostfix', 'pipe.8.html': 'CSWpostfix', 'oqmgr': 'CSWpostfix', 'main.cf.CSW': 'CSWpostfix', 'smtpd': 'CSWpostfix', 'qmqp-source.1.html': 'CSWpostfix ', 'postlock': 'CSWpostfix', 'sendmail.1': 'CSWpostfix', 'OVERVIEW.html': 'CSWpostfix', 'QSHAPE_README': 'CSWpostfix', 'NFS_README.html': 'CSWpostfix', 'virtual.CSW': 'CSWpostfix', 'discard': 'CSWpostfix', 'proxymap.8': 'CSWpostfix', 'lmtp.8.html': 'CSWpostfix', 'qmqpd.8.html': 'CSWpostfix', 'generic.5.html': 'CSWpostfix', 'postdrop.1.html': 'CSWpostfix', 'error.8.html': 'CSWpostfix', 'verify.8.html': 'CSWpostfix', 'postkick': 'CSWpostfix', 'mailq.1.html': 'CSWpostfix', 'discard.8.html': 'CSWpostfix', 'XFORWARD_README.html': 'CSWpostfix', 'tcp_table.5.html': 'CSWpostfix', 'header_checks.5': 'CSWpostfix', 'PGSQL_README': 'CSWpostfix', 'VERP_README.html': 'CSWpostfix', 'proxymap': 'CSWpostfix', 'RESTRICTION_CLASS_README': 'CSWpostfix', 'LDAP_README.html': 'CSWpostfix', 'LINUX_README': 'CSWpostfix', 'SASL_README.html': 'CSWpostfix', 'flush.8.html': 'CSWpostfix', 'postmulti.1': 'CSWpostfix', 'cleanup.8': 'CSWpostfix', 'XCLIENT_README.html': 'CSWpostfix', 'bounce.cf.default': 'CS Wpostfix', 'body_checks.5': 'CSWpostfix', 'cleanup.8.html': 'CSWpostfix', 'qshape.1.html': 'CSWpostfix', 'spawn': 'CSWpostfix', 'postmulti.1.html': 'CSWpostfix', 'SCHEDULER_README.html': 'CSWpostfix', 'trivial-rewrite.8.html': 'CSWpostfix', 'postqueue': 'CSWpostfix', 'master': 'CSWpostfix', 'aliases.CSW': 'CSWpostfix', 'ADDRESS_REWRITING_README': 'CSWpostfix', 'trivial-rewrite.8': 'CSWpostfix', 'master.8.html': 'CSWpostfix', 'BUILTIN_FILTER_README': 'CSWpostfix', 'TLS_LEGACY_README.html': 'CSWpostfix', 'STRESS_README': 'CSWpostfix', 'TUNING_README.html': 'CSWpostfix', 'header_checks.5.html': 'CSWpostfix', 'smtp-sink.1.html': 'CSWpostfix', 'relocated.5.html': 'CSWpostfix', 'TLS_README': 'CSWpostfix', 'BACKSCATTER_README': 'CSWpostfix', 'pcre_table.5': 'CSWpostfix', 'postfix-script': 'CSWpostfix', 'generic.5': 'CSWpostfix', 'defer.8': 'CSWpostfix', 'trace.8.html': 'CSWpostfix', 'postsuper.1': 'CSWpostfix', 'LINUX_README.html': 'CSWpostfix', 'index.html': 'CSWpostfix', 'postdro p.1': 'CSWpostfix', 'transport.CSW': 'CSWpostfix', 'PACKAGE_README.html': 'CSWpostfix', 'TLS_LEGACY_README': 'CSWpostfix', 'pipe.8': 'CSWpostfix', 'DB_README.html': 'CSWpostfix', 'LOCAL_RECIPIENT_README.html': 'CSWpostfix', 'UUCP_README': 'CSWpostfix', 'postcat.1.html': 'CSWpostfix', 'ldap_table.5': 'CSWpostfix', 'pkgmap': 'CSWpostfix', 'postmulti-script': 'CSWpostfix', 'BUILTIN_FILTER_README.html': 'CSWpostfix', 'SMTPD_POLICY_README.html': 'CSWpostfix', 'canonical.5': 'CSWpostfix', 'postfix-wrapper.5': 'CSWpostfix', 'IPV6_README.html': 'CSWpostfix', 'qmqpd.8': 'CSWpostfix', 'postfix-wrapper': 'CSWpostfix', 'mailq.1': 'CSWpostfix', 'PCRE_README.html': 'CSWpostfix', 'DB_README': 'CSWpostfix', 'TLS_LICENSE': 'CSWpostfix', 'pickup': 'CSWpostfix', 'BASIC_CONFIGURATION_README.html': 'CSWpostfix', 'postsuper.1.html': 'CSWpostfix', 'cswpostfix': 'CSWpostfix', 'postconf.5.html': 'CSWpostfix', 'CDB_README.html': 'CSWpostfix', 'PGSQL_README.html': 'CSWpostfix', 'postfix.1': 'CSWpostfi x', 'virtual.8.html': 'CSWpostfix', 'DATABASE_README': 'CSWpostfix', 'lmtp.8': 'CSWpostfix', 'INSTALL': 'CSWpostfix', 'access.5': 'CSWpostfix', 'smtp.8': 'CSWpostfix', 'SASL_README': 'CSWpostfix', 'pcre_table.5.html': 'CSWpostfix', 'relocated.5': 'CSWpostfix', 'ADDRESS_VERIFICATION_README.html': 'CSWpostfix', 'mysql_table.5': 'CSWpostfix', 'DSN_README.html': 'CSWpostfix', 'DATABASE_README.html': 'CSWpostfix', 'postfix-manuals.html': 'CSWpostfix', 'nqmgr': 'CSWpostfix', 'SCHEDULER_README': 'CSWpostfix', 'postalias': 'CSWpostfix', 'showq.8': 'CSWpostfix', 'verify': 'CSWpostfix', 'nisplus_table.5': 'CSWpostfix', 'local.8': 'CSWpostfix', 'canonical.CSW': 'CSWpostfix', 'ADDRESS_CLASS_README.html': 'CSWpostfix', 'cleanup': 'CSWpostfix', 'QSHAPE_README.html': 'CSWpostfix', 'regexp_table.5': 'CSWpostfix', 'XCLIENT_README': 'CSWpostfix', 'UUCP_README.html': 'CSWpostfix', 'MYSQL_README': 'CSWpostfix', 'VIRTUAL_README': 'CSWpostfix', 'NFS_README': 'CSWpostfix', 'checkinstall': 'CSWpost fix', 'PCRE_README': 'CSWpostfix', 'postalias.1.html': 'CSWpostfix', 'postcat.1': 'CSWpostfix', 'discard.8': 'CSWpostfix', 'postfix-logo.jpg': 'CSWpostfix', 'aliases.5.html': 'CSWpostfix', 'anvil.8.html': 'CSWpostfix', 'mysql_table.5.html': 'CSWpostfix', 'RESTRICTION_CLASS_README.html': 'CSWpostfix', 'master.cf': 'CSWpostfix', 'MULTI_INSTANCE_README.html': 'CSWpostfix', 'spawn.8': 'CSWpostfix', 'postdrop': 'CSWpostfix', 'postalias.1': 'CSWpostfix', 'scache.8': 'CSWpostfix', 'postfix': 'CSWpostfix', 'postlock.1': 'CSWpostfix', 'MILTER_README.html': 'CSWpostfix', 'VIRTUAL_README.html': 'CSWpostfix', 'SMTPD_ACCESS_README': 'CSWpostfix', 'pipe': 'CSWpostfix', 'SMTPD_PROXY_README': 'CSWpostfix', 'regexp_table.5.html': 'CSWpostfix', 'postmap.1': 'CSWpostfix', 'transport.5.html': 'CSWpostfix', 'qmqp-sink.1.html': 'CSWpostfix', 'DEBUG_README': 'CSWpostfix', 'transport.5': 'CSWpostfix'} +DATA_LINES_BY_SONAME = {'libresolv.so.2': u'/usr/lib/sparcv9/libresolv.so.2 f none 0755 root bin 448048 5947 1234567885 SUNWcslx', 'libdb-4.2.so': u'/opt/csw/bdb42/lib/libdb-4.2.so f none 0755 root bin 1327544 49309 1254747864 CSWbdb42', 'libsasl2.so.2': u'/opt/csw/lib/libsasl2.so.2=libsasl2.so.2.0.22 s none CSWsasl', 'libmysqlclient.so.15': u'/opt/csw/mysql5/lib/mysql/libmysqlclient.so.15=libmysqlclient.so.15.0.0 s none CSWmysql5rt', 'libpcre.so.0': u'/opt/csw/lib/sparcv9/libpcre.so.0=libpcre.so.0.0.1 s none CSWpcrert', 'libssl.so.0.9.8': u'/opt/csw/lib/sparcv9/libssl.so.0.9.8 f none 0755 root bin 427792 46460 1261308405 CSWosslrt', 'libldap-2.3.so.0': u'/opt/csw/lib/sparcv9/libldap-2.3.so.0=libldap-2.3.so.0.2.27 s none CSWoldaprt', 'libnsl.so.1': u'/usr/lib/sparcv9/libnsl.so.1 f none 0755 root bin 1099248 7581 1217954364 SUNWcslx', 'libcrypto.so.0.9.8': u'/opt/csw/lib/sparcv9/libcrypto.so.0.9.8 f none 0755 root bin 2520480 3820 1261308405 CSWosslrt', 'libsocket.so .1': u'/usr/lib/sparcv9/libsocket.so.1 f none 0755 root bin 96448 3175 1210705279 SUNWcslx', 'libc.so.1': u'/usr/lib/sparcv9/libc.so.1 f none 0755 root bin 1271000 23501 1217954364 SUNWcslx', 'liblber-2.3.so.0': u'/opt/csw/lib/sparcv9/liblber-2.3.so.0=liblber-2.3.so.0.2.27 s none CSWoldaprt', 'libpq.so.5': u'/opt/csw/postgresql/lib/libpq.so.5=libpq.so.5.1 s none CSWlibpq'} DATA_PKGMAP_CACHE = {'libresolv.so.2': {u'/usr/lib/sparcv9': u'/usr/lib/sparcv9/libresolv.so.2 f none 0755 root bin 448048 5947 1234567885 SUNWcslx', u'/usr/lib': u'/usr/lib/libresolv.so.2 f none 0755 root bin 392904 57407 1234567884 SUNWcsl'}, 'libdb-4.2.so': {u'/opt/csw/bdb42/lib': u'/opt/csw/bdb42/lib/libdb-4.2.so f none 0755 root bin 1327544 49309 1254747864 CSWbdb42', u'/opt/csw/bdb42/lib/sparcv9': u'/opt/csw/bdb42/lib/sparcv9/libdb-4.2.so f none 0755 root bin 1450608 31012 1254748763 CSWbdb42'}, 'libsasl2.so.2': {u'/opt/csw/lib': u'/opt/csw/lib/libsasl2.so.2=libsasl2.so.2.0.22 s none CSWsasl'}, 'libmysqlclient.so.15': {u'/opt/csw/mysql5/lib/mysql': u'/opt/csw/mysql5/lib/mysql/libmysqlclient.so.15=libmysqlclient.so.15.0.0 s none CSWmysql5rt', u'/opt/csw/mysql5/lib/sparcv9/mysql': u'/opt/csw/mysql5/lib/sparcv9/mysql/libmysqlclient.so.15=libmysqlclient.so.15.0.0 s none CSWmysql5rt'}, 'libpcre.so.0': {u'/opt/csw/lib': u'/opt/csw/lib/libpcre.so.0=libpcre.so.0.0. 1 s none CSWpcrert', u'/opt/csw/lib/sparcv9': u'/opt/csw/lib/sparcv9/libpcre.so.0=libpcre.so.0.0.1 s none CSWpcrert'}, 'libssl.so.0.9.8': {u'/opt/csw/lib/sparcv8plus+vis': u'/opt/csw/lib/sparcv8plus+vis/libssl.so.0.9.8 f none 0755 root bin 375532 23572 1261306582 CSWosslrt', u'/opt/csw/lib': u'/opt/csw/lib/libssl.so.0.9.8 f none 0555 root bin 372000 63313 1261304839 CSWosslrt', u'/opt/csw/lib/sparcv9': u'/opt/csw/lib/sparcv9/libssl.so.0.9.8 f none 0755 root bin 427792 46460 1261308405 CSWosslrt'}, 'libldap-2.3.so.0': {u'/opt/csw/lib': u'/opt/csw/lib/libldap-2.3.so.0=libldap-2.3.so.0.2.27 s none CSWoldaprt', u'/opt/csw/lib/sparcv9': u'/opt/csw/lib/sparcv9/libldap-2.3.so.0=libldap-2.3.so.0.2.27 s none CSWoldaprt'}, 'libnsl.so.1': {u'/usr/lib/sparcv9': u'/usr/lib/sparcv9/libnsl.so.1 f none 0755 root bin 1099248 7581 1217954364 SUNWcslx', u'/usr/lib': u'/usr/lib/libnsl.so.1 f none 0755 root bin 920500 29766 1217954358 SUNWcsl'}, 'libcrypto.so.0.9.8': {u'/opt/csw/lib/sparcv8plus+ vis': u'/opt/csw/lib/sparcv8plus+vis/libcrypto.so.0.9.8 f none 0755 root bin 2194440 48878 1261306582 CSWosslrt', u'/opt/csw/lib': u'/opt/csw/lib/libcrypto.so.0.9.8 f none 0555 root bin 2166696 48180 1261304839 CSWosslrt', u'/opt/csw/lib/sparcv9': u'/opt/csw/lib/sparcv9/libcrypto.so.0.9.8 f none 0755 root bin 2520480 3820 1261308405 CSWosslrt'}, 'libsocket.so.1': {u'/usr/lib/sparcv9': u'/usr/lib/sparcv9/libsocket.so.1 f none 0755 root bin 96448 3175 1210705279 SUNWcslx', u'/usr/lib': u'/usr/lib/libsocket.so.1 f none 0755 root bin 70860 28509 1210705279 SUNWcsl'}, 'libc.so.1': {u'/usr/lib/libp/sparcv9': u'/usr/lib/libp/sparcv9/libc.so.1 f none 0755 root bin 1395296 13745 1217954372 SUNWdplx', u'/usr/lib/sparcv9': u'/usr/lib/sparcv9/libc.so.1 f none 0755 root bin 1271000 23501 1217954364 SUNWcslx', u'/usr/lib': u'/usr/lib/libc.so.1 f none 0755 root bin 1157948 58901 1217954358 SUNWcsl'}, 'liblber-2.3.so.0': {u'/opt/csw/lib': u'/opt/csw/lib/liblber-2.3.so.0=liblber-2.3.so.0.2.2 7 s none CSWoldaprt', u'/opt/csw/lib/sparcv9': u'/opt/csw/lib/sparcv9/liblber-2.3.so.0=liblber-2.3.so.0.2.27 s none CSWoldaprt'}, 'libpq.so.5': {u'/opt/csw/postgresql/lib': u'/opt/csw/postgresql/lib/libpq.so.5=libpq.so.5.1 s none CSWlibpq', u'/opt/csw/postgresql/lib/sparcv9': u'/opt/csw/postgresql/lib/sparcv9/libpq.so.5=libpq.so.5.1 s none CSWlibpq'}} -DATA_BINARIES_BY_SONAME = {'libresolv.so.2': set(['postmulti', 'spawn', 'postkick', 'postlog', 'postconf', 'bounce', 'qmqpd', 'virtual', 'flush', 'proxymap', 'scache', 'anvil', 'verify', 'postalias', 'postcat', 'nqmgr', 'pickup', 'oqmgr', 'master', 'postqueue', 'postmap', 'local', 'showq', 'sendmail', 'discard', 'lmtp', 'postdrop', 'trivial-rewrite', 'postfix', 'postlock', 'pipe', 'tlsmgr', 'error', 'smtpd', 'postsuper', 'cleanup']), 'libdb-4.2.so': set(['postmulti', 'spawn', 'postkick', 'postlog', 'postconf', 'bounce', 'qmqpd', 'virtual', 'flush', 'proxymap', 'scache', 'anvil', 'verify', 'postalias', 'postcat', 'nqmgr', 'pickup', 'oqmgr', 'master', 'postqueue', 'postmap', 'local', 'showq', 'sendmail', 'discard', 'lmtp', 'postdrop', 'trivial-rewrite', 'postfix', 'postlock', 'pipe', 'tlsmgr', 'error', 'smtpd', 'postsuper', 'cleanup']), 'libsasl2.so.2': set(['postmulti', 'spawn', 'postkick', 'postlog', 'postconf', 'bounce', 'qmqpd', 'virtual', 'flush', 'proxymap', 'scach e', 'anvil', 'verify', 'postalias', 'postcat', 'nqmgr', 'pickup', 'oqmgr', 'master', 'postqueue', 'postmap', 'local', 'showq', 'sendmail', 'discard', 'lmtp', 'postdrop', 'trivial-rewrite', 'postfix', 'postlock', 'pipe', 'tlsmgr', 'error', 'smtpd', 'postsuper', 'cleanup']), 'libmysqlclient.so.15': set(['postmulti', 'spawn', 'postkick', 'postlog', 'postconf', 'bounce', 'qmqpd', 'virtual', 'flush', 'proxymap', 'scache', 'anvil', 'verify', 'postalias', 'postcat', 'nqmgr', 'pickup', 'oqmgr', 'master', 'postqueue', 'postmap', 'local', 'showq', 'sendmail', 'discard', 'lmtp', 'postdrop', 'trivial-rewrite', 'postfix', 'postlock', 'pipe', 'tlsmgr', 'error', 'smtpd', 'postsuper', 'cleanup']), 'libpcre.so.0': set(['postmulti', 'spawn', 'postkick', 'postlog', 'postconf', 'bounce', 'qmqpd', 'virtual', 'flush', 'proxymap', 'scache', 'anvil', 'verify', 'postalias', 'postcat', 'nqmgr', 'pickup', 'oqmgr', 'master', 'postqueue', 'postmap', 'local', 'showq', 'sendmail', 'discard', 'lmtp', 'post drop', 'trivial-rewrite', 'postfix', 'postlock', 'pipe', 'tlsmgr', 'error', 'smtpd', 'postsuper', 'cleanup']), 'libssl.so.0.9.8': set(['postmulti', 'spawn', 'postkick', 'postlog', 'postconf', 'bounce', 'qmqpd', 'virtual', 'flush', 'proxymap', 'scache', 'anvil', 'verify', 'postalias', 'postcat', 'nqmgr', 'pickup', 'oqmgr', 'master', 'postqueue', 'postmap', 'local', 'showq', 'sendmail', 'discard', 'lmtp', 'postdrop', 'trivial-rewrite', 'postfix', 'postlock', 'pipe', 'tlsmgr', 'error', 'smtpd', 'postsuper', 'cleanup']), 'libldap-2.3.so.0': set(['postmulti', 'spawn', 'postkick', 'postlog', 'postconf', 'bounce', 'qmqpd', 'virtual', 'flush', 'proxymap', 'scache', 'anvil', 'verify', 'postalias', 'postcat', 'nqmgr', 'pickup', 'oqmgr', 'master', 'postqueue', 'postmap', 'local', 'showq', 'sendmail', 'discard', 'lmtp', 'postdrop', 'trivial-rewrite', 'postfix', 'postlock', 'pipe', 'tlsmgr', 'error', 'smtpd', 'postsuper', 'cleanup']), 'libnsl.so.1': set(['postmulti', 'spawn', 'postkick', 'postlog', 'postconf', 'bounce', 'qmqpd', 'virtual', 'flush', 'proxymap', 'scache', 'anvil', 'verify', 'postalias', 'postcat', 'nqmgr', 'pickup', 'oqmgr', 'master', 'postqueue', 'postmap', 'local', 'showq', 'sendmail', 'discard', 'lmtp', 'postdrop', 'trivial-rewrite', 'postfix', 'postlock', 'pipe', 'tlsmgr', 'error', 'smtpd', 'postsuper', 'cleanup']), 'libcrypto.so.0.9.8': set(['postmulti', 'spawn', 'postkick', 'postlog', 'postconf', 'bounce', 'qmqpd', 'virtual', 'flush', 'proxymap', 'scache', 'anvil', 'verify', 'postalias', 'postcat', 'nqmgr', 'pickup', 'oqmgr', 'master', 'postqueue', 'postmap', 'local', 'showq', 'sendmail', 'discard', 'lmtp', 'postdrop', 'trivial-rewrite', 'postfix', 'postlock', 'pipe', 'tlsmgr', 'error', 'smtpd', 'postsuper', 'cleanup']), 'libc.so.1': set(['postmulti', 'spawn', 'postkick', 'postlog', 'postconf', 'bounce', 'qmqpd', 'virtual', 'flush', 'proxymap', 'scache', 'anvil', 'verify', 'postalias', 'postcat', 'nqmgr', 'pickup', 'oqmgr', 'master', 'p ostqueue', 'postmap', 'local', 'showq', 'sendmail', 'discard', 'lmtp', 'postdrop', 'trivial-rewrite', 'postfix', 'postlock', 'pipe', 'tlsmgr', 'error', 'smtpd', 'postsuper', 'cleanup']), 'libsocket.so.1': set(['postmulti', 'spawn', 'postkick', 'postlog', 'postconf', 'bounce', 'qmqpd', 'virtual', 'flush', 'proxymap', 'scache', 'anvil', 'verify', 'postalias', 'postcat', 'nqmgr', 'pickup', 'oqmgr', 'master', 'postqueue', 'postmap', 'local', 'showq', 'sendmail', 'discard', 'lmtp', 'postdrop', 'trivial-rewrite', 'postfix', 'postlock', 'pipe', 'tlsmgr', 'error', 'smtpd', 'postsuper', 'cleanup']), 'liblber-2.3.so.0': set(['postmulti', 'spawn', 'postkick', 'postlog', 'postconf', 'bounce', 'qmqpd', 'virtual', 'flush', 'proxymap', 'scache', 'anvil', 'verify', 'postalias', 'postcat', 'nqmgr', 'pickup', 'oqmgr', 'master', 'postqueue', 'postmap', 'local', 'showq', 'sendmail', 'discard', 'lmtp', 'postdrop', 'trivial-rewrite', 'postfix', 'postlock', 'pipe', 'tlsmgr', 'error', 'smtpd', 'pos tsuper', 'cleanup']), 'libpq.so.5': set(['postmulti', 'spawn', 'postkick', 'postlog', 'postconf', 'bounce', 'qmqpd', 'virtual', 'flush', 'proxymap', 'scache', 'anvil', 'verify', 'postalias', 'postcat', 'nqmgr', 'pickup', 'oqmgr', 'master', 'postqueue', 'postmap', 'local', 'showq', 'sendmail', 'discard', 'lmtp', 'postdrop', 'trivial-rewrite', 'postfix', 'postlock', 'pipe', 'tlsmgr', 'error', 'smtpd', 'postsuper', 'cleanup'])} +DATA_BINARIES_BY_SONAME = {'libresolv.so.2': set(['spawn', 'postmulti', 'postkick', 'postlog', 'postconf', 'bounce', 'qmqpd', 'virtual', 'flush', 'proxymap', 'scache', 'anvil', 'verify', 'postalias', 'postcat', 'nqmgr', 'pickup', 'oqmgr', 'master', 'postqueue', 'trivial-rewrite', 'local', 'showq', 'sendmail', 'smtpd', 'lmtp', 'postdrop', 'postmap', 'postfix', 'postlock', 'pipe', 'tlsmgr', 'error', 'discard', 'postsuper', 'cleanup']), 'libdb-4.2.so': set(['spawn', 'postmulti', 'postkick', 'postlog', 'postconf', 'bounce', 'qmqpd', 'virtual', 'flush', 'proxymap', 'scache', 'anvil', 'verify', 'postalias', 'postcat', 'nqmgr', 'pickup', 'oqmgr', 'master', 'postqueue', 'trivial-rewrite', 'local', 'showq', 'sendmail', 'smtpd', 'lmtp', 'postdrop', 'postmap', 'postfix', 'postlock', 'pipe', 'tlsmgr', 'error', 'discard', 'postsuper', 'cleanup']), 'libsasl2.so.2': set(['spawn', 'postmulti', 'postkick', 'postlog', 'postconf', 'bounce', 'qmqpd', 'virtual', 'flush', 'proxymap', 'scach e', 'anvil', 'verify', 'postalias', 'postcat', 'nqmgr', 'pickup', 'oqmgr', 'master', 'postqueue', 'trivial-rewrite', 'local', 'showq', 'sendmail', 'smtpd', 'lmtp', 'postdrop', 'postmap', 'postfix', 'postlock', 'pipe', 'tlsmgr', 'error', 'discard', 'postsuper', 'cleanup']), 'libmysqlclient.so.15': set(['spawn', 'postmulti', 'postkick', 'postlog', 'postconf', 'bounce', 'qmqpd', 'virtual', 'flush', 'proxymap', 'scache', 'anvil', 'verify', 'postalias', 'postcat', 'nqmgr', 'pickup', 'oqmgr', 'master', 'postqueue', 'trivial-rewrite', 'local', 'showq', 'sendmail', 'smtpd', 'lmtp', 'postdrop', 'postmap', 'postfix', 'postlock', 'pipe', 'tlsmgr', 'error', 'discard', 'postsuper', 'cleanup']), 'libpcre.so.0': set(['spawn', 'postmulti', 'postkick', 'postlog', 'postconf', 'bounce', 'qmqpd', 'virtual', 'flush', 'proxymap', 'scache', 'anvil', 'verify', 'postalias', 'postcat', 'nqmgr', 'pickup', 'oqmgr', 'master', 'postqueue', 'trivial-rewrite', 'local', 'showq', 'sendmail', 'smtpd', 'lmtp', 'postdrop', 'postmap', 'postfix', 'postlock', 'pipe', 'tlsmgr', 'error', 'discard', 'postsuper', 'cleanup']), 'libssl.so.0.9.8': set(['spawn', 'postmulti', 'postkick', 'postlog', 'postconf', 'bounce', 'qmqpd', 'virtual', 'flush', 'proxymap', 'scache', 'anvil', 'verify', 'postalias', 'postcat', 'nqmgr', 'pickup', 'oqmgr', 'master', 'postqueue', 'trivial-rewrite', 'local', 'showq', 'sendmail', 'smtpd', 'lmtp', 'postdrop', 'postmap', 'postfix', 'postlock', 'pipe', 'tlsmgr', 'error', 'discard', 'postsuper', 'cleanup']), 'libldap-2.3.so.0': set(['spawn', 'postmulti', 'postkick', 'postlog', 'postconf', 'bounce', 'qmqpd', 'virtual', 'flush', 'proxymap', 'scache', 'anvil', 'verify', 'postalias', 'postcat', 'nqmgr', 'pickup', 'oqmgr', 'master', 'postqueue', 'trivial-rewrite', 'local', 'showq', 'sendmail', 'smtpd', 'lmtp', 'postdrop', 'postmap', 'postfix', 'postlock', 'pipe', 'tlsmgr', 'error', 'discard', 'postsuper', 'cleanup']), 'libnsl.so.1': set(['spawn', 'postmulti', 'postkick', 'postlog', 'postconf', 'bounce', 'qmqpd', 'virtual', 'flush', 'proxymap', 'scache', 'anvil', 'verify', 'postalias', 'postcat', 'nqmgr', 'pickup', 'oqmgr', 'master', 'postqueue', 'trivial-rewrite', 'local', 'showq', 'sendmail', 'smtpd', 'lmtp', 'postdrop', 'postmap', 'postfix', 'postlock', 'pipe', 'tlsmgr', 'error', 'discard', 'postsuper', 'cleanup']), 'libcrypto.so.0.9.8': set(['spawn', 'postmulti', 'postkick', 'postlog', 'postconf', 'bounce', 'qmqpd', 'virtual', 'flush', 'proxymap', 'scache', 'anvil', 'verify', 'postalias', 'postcat', 'nqmgr', 'pickup', 'oqmgr', 'master', 'postqueue', 'trivial-rewrite', 'local', 'showq', 'sendmail', 'smtpd', 'lmtp', 'postdrop', 'postmap', 'postfix', 'postlock', 'pipe', 'tlsmgr', 'error', 'discard', 'postsuper', 'cleanup']), 'libc.so.1': set(['spawn', 'postmulti', 'postkick', 'postlog', 'postconf', 'bounce', 'qmqpd', 'virtual', 'flush', 'proxymap', 'scache', 'anvil', 'verify', 'postalias', 'postcat', 'nqmgr', 'pickup', 'oqmgr', 'master', 'p ostqueue', 'trivial-rewrite', 'local', 'showq', 'sendmail', 'smtpd', 'lmtp', 'postdrop', 'postmap', 'postfix', 'postlock', 'pipe', 'tlsmgr', 'error', 'discard', 'postsuper', 'cleanup']), 'libsocket.so.1': set(['spawn', 'postmulti', 'postkick', 'postlog', 'postconf', 'bounce', 'qmqpd', 'virtual', 'flush', 'proxymap', 'scache', 'anvil', 'verify', 'postalias', 'postcat', 'nqmgr', 'pickup', 'oqmgr', 'master', 'postqueue', 'trivial-rewrite', 'local', 'showq', 'sendmail', 'smtpd', 'lmtp', 'postdrop', 'postmap', 'postfix', 'postlock', 'pipe', 'tlsmgr', 'error', 'discard', 'postsuper', 'cleanup']), 'liblber-2.3.so.0': set(['spawn', 'postmulti', 'postkick', 'postlog', 'postconf', 'bounce', 'qmqpd', 'virtual', 'flush', 'proxymap', 'scache', 'anvil', 'verify', 'postalias', 'postcat', 'nqmgr', 'pickup', 'oqmgr', 'master', 'postqueue', 'trivial-rewrite', 'local', 'showq', 'sendmail', 'smtpd', 'lmtp', 'postdrop', 'postmap', 'postfix', 'postlock', 'pipe', 'tlsmgr', 'error', 'discard', 'pos tsuper', 'cleanup']), 'libpq.so.5': set(['spawn', 'postmulti', 'postkick', 'postlog', 'postconf', 'bounce', 'qmqpd', 'virtual', 'flush', 'proxymap', 'scache', 'anvil', 'verify', 'postalias', 'postcat', 'nqmgr', 'pickup', 'oqmgr', 'master', 'postqueue', 'trivial-rewrite', 'local', 'showq', 'sendmail', 'smtpd', 'lmtp', 'postdrop', 'postmap', 'postfix', 'postlock', 'pipe', 'tlsmgr', 'error', 'discard', 'postsuper', 'cleanup'])} DATA_ISALIST = ['sparcv9+vis2', 'sparcv9+vis', 'sparcv9', 'sparcv8plus+vis2', 'sparcv8plus+vis', 'sparcv8plus', 'sparcv8', 'sparcv8-fsmuld', 'sparcv7', 'sparc'] This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From janholzh at users.sourceforge.net Thu Jan 21 10:53:55 2010 From: janholzh at users.sourceforge.net (janholzh at users.sourceforge.net) Date: Thu, 21 Jan 2010 09:53:55 +0000 Subject: [csw-devel] SF.net SVN: gar:[8103] csw/mgar/pkg/transmission/trunk Message-ID: Revision: 8103 http://gar.svn.sourceforge.net/gar/?rev=8103&view=rev Author: janholzh Date: 2010-01-21 09:53:55 +0000 (Thu, 21 Jan 2010) Log Message: ----------- transmission: Update to 1.80 Modified Paths: -------------- csw/mgar/pkg/transmission/trunk/Makefile csw/mgar/pkg/transmission/trunk/checksums Modified: csw/mgar/pkg/transmission/trunk/Makefile =================================================================== --- csw/mgar/pkg/transmission/trunk/Makefile 2010-01-21 08:26:14 UTC (rev 8102) +++ csw/mgar/pkg/transmission/trunk/Makefile 2010-01-21 09:53:55 UTC (rev 8103) @@ -1,5 +1,5 @@ GARNAME = transmission -GARVERSION = 1.76 +GARVERSION = 1.80 CATEGORIES = net DESCRIPTION = Fast, easy, and free multi-platform BitTorrent client @@ -34,6 +34,7 @@ REQUIRED_PKGS_CSWtransmissiongtk2 += CSWpango REQUIRED_PKGS_CSWtransmissiongtk2 += CSWzlib REQUIRED_PKGS_CSWtransmissiongtk2 += CSWdbus +REQUIRED_PKGS_CSWtransmissiongtk2 += CSWgconf2 REQUIRED_PKGS_CSWtransmission = CSWcurlrt REQUIRED_PKGS_CSWtransmission += CSWlibevent @@ -61,7 +62,8 @@ EXTRA_LIB = /opt/csw/X11/lib EXTRA_PKG_CONFIG_DIRS = $(prefix)/X11/lib -CONFIGURE_ARGS = $(DIRPATHS) --enable-gtk +CONFIGURE_ARGS = $(DIRPATHS) --enable-gtk +STRIP_LIBTOOL = 1 TEST_TARGET = check Modified: csw/mgar/pkg/transmission/trunk/checksums =================================================================== --- csw/mgar/pkg/transmission/trunk/checksums 2010-01-21 08:26:14 UTC (rev 8102) +++ csw/mgar/pkg/transmission/trunk/checksums 2010-01-21 09:53:55 UTC (rev 8103) @@ -1,3 +1,3 @@ cbdb5cfaf24b68727042c3828b252534 icons-makefile.patch 7124b4836210a10fe649bba75c706cc9 linker-include.patch -ac44511ba4c203998be3079626126ede transmission-1.76.tar.bz2 +19a7d7dd60527199d05cf5e2e775929e transmission-1.80.tar.bz2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Thu Jan 21 12:13:13 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Thu, 21 Jan 2010 11:13:13 +0000 Subject: [csw-devel] SF.net SVN: gar:[8104] csw/mgar/gar/v2/bin Message-ID: Revision: 8104 http://gar.svn.sourceforge.net/gar/?rev=8104&view=rev Author: wahwah Date: 2010-01-21 11:13:10 +0000 (Thu, 21 Jan 2010) Log Message: ----------- mGAR v2: checkpkg, emulating the effect of the /opt/csw/lib/i386 -> . symlink during package installation; printing out a message about checking the package cache. Modified Paths: -------------- csw/mgar/gar/v2/bin/checkpkg csw/mgar/gar/v2/bin/checkpkg.d/checkpkg.py csw/mgar/gar/v2/bin/checkpkg.d/checkpkg_test.py csw/mgar/gar/v2/bin/checkpkg.d/update_contents_cache.py Property Changed: ---------------- csw/mgar/gar/v2/bin/checkpkg.d/update_contents_cache.py Modified: csw/mgar/gar/v2/bin/checkpkg =================================================================== --- csw/mgar/gar/v2/bin/checkpkg 2010-01-21 09:53:55 UTC (rev 8103) +++ csw/mgar/gar/v2/bin/checkpkg 2010-01-21 11:13:10 UTC (rev 8104) @@ -556,7 +556,6 @@ set_variables_for_individual_package_check "$f" -echo "Running modular tests" test_suite_ok=1 checkpkg_scriptname=`basename $0` checkpkg_basedir=${0%/${checkpkg_scriptname}} @@ -571,6 +570,7 @@ debugmsg "plugindir: '$plugindir'" log_files="" if [[ -d "$plugindir" ]]; then + echo "Running modular tests" # echo plugin dir exists for plugin in "${plugindir}"/checkpkg-*; do if [[ -x "${plugin}" ]]; then Modified: csw/mgar/gar/v2/bin/checkpkg.d/checkpkg.py =================================================================== --- csw/mgar/gar/v2/bin/checkpkg.d/checkpkg.py 2010-01-21 09:53:55 UTC (rev 8103) +++ csw/mgar/gar/v2/bin/checkpkg.d/checkpkg.py 2010-01-21 11:13:10 UTC (rev 8104) @@ -24,6 +24,11 @@ DO_NOT_REPORT_SURPLUS = set([u"CSWcommon", u"CSWcswclassutils", u"CSWisaexec"]) DO_NOT_REPORT_MISSING = set([u"SUNWlibC", u"SUNWcsl", u"SUNWlibms", u"*SUNWcslr", u"*SUNWlibC", u"*SUNWlibms"]) +SYSTEM_SYMLINKS = ( + ("/opt/csw/bdb4", ["/opt/csw/bdb42"]), + ("/64", ["/amd64", "/sparcv9"]), + ("/opt/csw/lib/i386", ["/opt/csw/lib"]), +) # This shared library is present on Solaris 10 on amd64, but it's missing on # Solaris 8 on i386. It's okay if it's missing. @@ -182,6 +187,7 @@ logging.debug("Connecting to the %s database.", self.db_path) self.conn = sqlite3.connect(self.db_path) if not self.IsDatabaseUpToDate(): + logging.warning("Rebuilding the package cache, can take a few minutes.") self.PurgeDatabase() self.PopulateDatabase() else: @@ -210,6 +216,10 @@ """) self.PopulateDatabase() + def SymlinkDuringInstallation(self, p): + """Emulates the effect of some symlinks present during installations.""" + p = p.replace("/opt/csw/lib/i386", "/opt/csw/lib") + def PopulateDatabase(self): """Imports data into the database. @@ -296,10 +306,11 @@ def IsDatabaseUpToDate(self): f_mtime = self.GetFileMtime() d_mtime = self.GetDatabaseMtime() - logging.debug("f_mtime", f_mtime, "d_time", d_mtime) + logging.debug("f_mtime %s, d_time: %s", f_mtime, d_mtime) return self.GetFileMtime() <= self.GetDatabaseMtime() def PurgeDatabase(self): + logging.info("Purging the cache database") c = self.conn.cursor() sql = "DELETE FROM config;" c.execute(sql) @@ -438,25 +449,27 @@ expanded_list = [runpath] return expanded_list +def ExpandSymlink(symlink, target, input_path): + symlink_re = re.compile(r"%s(/|$)" % symlink) + if re.search(symlink_re, input_path): + result = input_path.replace(symlink, target) + else: + result = input_path + return result + def Emulate64BitSymlinks(runpath_list): """Need to emulate the 64 -> amd64, 64 -> sparcv9 symlink Since we don't know the architecture, we'll adding both amd64 and sparcv9. It should be safe. """ - symlinks = ( - ("/opt/csw/bdb4", ["/opt/csw/bdb42"]), - ("/64", ["/amd64", "/sparcv9"]), - ) symlinked_list = [] for runpath in runpath_list: - for symlink, expansion_list in symlinks: - symlink_re = re.compile(r"%s(/|$)" % symlink) - if re.search(symlink_re, runpath): - for expansion in expansion_list: - symlinked_list.append(runpath.replace(symlink, expansion)) - else: - symlinked_list.append(runpath) + for symlink, expansion_list in SYSTEM_SYMLINKS: + for target in expansion_list: + expanded = ExpandSymlink(symlink, target, runpath) + if expanded not in symlinked_list: + symlinked_list.append(expanded) return symlinked_list @@ -484,6 +497,17 @@ runpath_list = ExpandRunpath(runpath, isalist) runpath_list = Emulate64BitSymlinks(runpath_list) soname_runpath_data = pkgmap.GetPkgmapLineByBasename(soname) + # Emulating the install time symlinks, for instance, if the prototype contains + # /opt/csw/lib/i386/foo.so.0 and /opt/csw/lib/i386 is a symlink to ".", + # the shared library ends up in /opt/csw/lib/foo.so.0 and should be findable even when + # RPATH does not contain $ISALIST. + new_soname_runpath_data = {} + for p in soname_runpath_data: + expanded_p_list = Emulate64BitSymlinks([p]) + for expanded_p in expanded_p_list: + new_soname_runpath_data[expanded_p] = soname_runpath_data[p] + soname_runpath_data = new_soname_runpath_data + logging.debug("%s: will be looking for %s in %s" % (soname, runpath_list, soname_runpath_data.keys())) for runpath_expanded in runpath_list: Modified: csw/mgar/gar/v2/bin/checkpkg.d/checkpkg_test.py =================================================================== --- csw/mgar/gar/v2/bin/checkpkg.d/checkpkg_test.py 2010-01-21 09:53:55 UTC (rev 8103) +++ csw/mgar/gar/v2/bin/checkpkg.d/checkpkg_test.py 2010-01-21 11:13:10 UTC (rev 8104) @@ -310,6 +310,13 @@ result = checkpkg.Emulate64BitSymlinks(runpath_list) self.assertTrue(expected in result, "%s not in %s" % (expected, result)) + def testEmulate64BitSymlinks_4(self): + """No repeated paths because of symlink expansion""" + runpath_list = ["/opt/csw/lib"] + expected = "/opt/csw/lib" + result = checkpkg.Emulate64BitSymlinks(runpath_list) + self.assertEquals(1, len(result), "len(%s) != %s" % (result, 1)) + def testEmulateSymlinks_3(self): runpath_list = ["/opt/csw/bdb4"] expected = "/opt/csw/bdb42" @@ -324,6 +331,22 @@ self.assertTrue(expected in result, "%s not in %s" % (expected, result)) self.assertFalse(not_expected in result, "%s is in %s" % (not_expected, result)) + def testEmulateSymlinks_5(self): + """Install time symlink expansion.""" + runpath_list = ["/opt/csw/lib/i386"] + expected = "/opt/csw/lib" + result = checkpkg.Emulate64BitSymlinks(runpath_list) + self.assertTrue(expected in result, "%s not in %s" % (expected, result)) + + def testEmulateSymlinks_6(self): + """ExpandSymlink for /opt/csw/lib/i386.""" + runpath_list = ["/opt/csw/lib/i386"] + expected = "/opt/csw/lib" + not_expected = "/opt/csw/lib/i386" + result = checkpkg.ExpandSymlink("/opt/csw/lib/i386", "/opt/csw/lib", "/opt/csw/lib/i386") + self.assertTrue(expected in result, "%s not in %s" % (expected, result)) + self.assertFalse(not_expected in result, "%s is in %s" % (not_expected, result)) + def testGetLinesBySoname(self): expected = {'foo.so.1': '/opt/csw/lib/isa-value-1/foo.so.1 foo'} pkgmap = self.pkgmap_mocker.CreateMock(checkpkg.SystemPkgmap) @@ -441,11 +464,14 @@ binaries_by_soname, runpath_by_needed_soname) = checkpkg.BuildIndexesBySoname( d6.DATA_NEEDED_SONAMES_BY_BINARY) + # The original data did not have amd64 in the isalist. + isalist = ['amd64', 'pentium_pro+mmx', 'pentium_pro', 'pentium+mmx', + 'pentium', 'i486', 'i386', 'i86'] result = checkpkg.GetLinesBySoname( pkgmap_stub, set([soname]), runpath_by_needed_soname, - d6.DATA_ISALIST) + isalist) self.assertEqual(expected, result) def testGetLinesBySoname_8(self): @@ -461,6 +487,24 @@ self.pkgmap_mocker.VerifyAll() self.assertEqual(expected, result) + def testGetLinesBySoname_9(self): + """Emulation of binaries installed into /opt/csw/lib/i386. + + The problem is that /opt/csw/lib/i386 is a symlink and the binaries + end up in /opt/csw/lib instead. + """ + expected = {'foo.so.0': '/opt/csw/lib/i386/foo.so.0 foo'} + lines1 = {"/opt/csw/lib/i386": "/opt/csw/lib/i386/foo.so.0 foo"} + pkgmap = self.pkgmap_mocker.CreateMock(checkpkg.SystemPkgmap) + pkgmap.GetPkgmapLineByBasename("foo.so.0").AndReturn(lines1) + self.pkgmap_mocker.ReplayAll() + needed_sonames = set(["foo.so.0"]) + runpath_by_needed_soname = {"foo.so.0": ["/opt/csw/lib", "/usr/lib"]} + isalist = ["isa-value-1", "isa-value-2"] + result = checkpkg.GetLinesBySoname(pkgmap, needed_sonames, runpath_by_needed_soname, isalist) + self.pkgmap_mocker.VerifyAll() + self.assertEqual(expected, result) + def testSanitizeRunpath_1(self): self.assertEqual("/opt/csw/lib", checkpkg.SanitizeRunpath("/opt/csw/lib/")) Modified: csw/mgar/gar/v2/bin/checkpkg.d/update_contents_cache.py =================================================================== --- csw/mgar/gar/v2/bin/checkpkg.d/update_contents_cache.py 2010-01-21 09:53:55 UTC (rev 8103) +++ csw/mgar/gar/v2/bin/checkpkg.d/update_contents_cache.py 2010-01-21 11:13:10 UTC (rev 8104) @@ -1,8 +1,17 @@ #!/opt/csw/bin/python2.6 +# +# $Id$ +# +# This file only creates an instance of SystemPkgmap in order to update the +# package cache (if necessary), and display the information about the update. import checkpkg +import logging + def main(): + print "Checking if the package cache is up to date." + logging.basicConfig(level=logging.INFO) test_pkgmap = checkpkg.SystemPkgmap() Property changes on: csw/mgar/gar/v2/bin/checkpkg.d/update_contents_cache.py ___________________________________________________________________ Added: svn:keywords + Id This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From a_o_m at users.sourceforge.net Thu Jan 21 12:18:23 2010 From: a_o_m at users.sourceforge.net (a_o_m at users.sourceforge.net) Date: Thu, 21 Jan 2010 11:18:23 +0000 Subject: [csw-devel] SF.net SVN: gar:[8105] csw/mgar/pkg/fontconfig/trunk Message-ID: Revision: 8105 http://gar.svn.sourceforge.net/gar/?rev=8105&view=rev Author: a_o_m Date: 2010-01-21 11:18:18 +0000 (Thu, 21 Jan 2010) Log Message: ----------- fontconfig: upgrade to 2.8.0 Modified Paths: -------------- csw/mgar/pkg/fontconfig/trunk/Makefile csw/mgar/pkg/fontconfig/trunk/checksums Modified: csw/mgar/pkg/fontconfig/trunk/Makefile =================================================================== --- csw/mgar/pkg/fontconfig/trunk/Makefile 2010-01-21 11:13:10 UTC (rev 8104) +++ csw/mgar/pkg/fontconfig/trunk/Makefile 2010-01-21 11:18:18 UTC (rev 8105) @@ -1,5 +1,5 @@ GARNAME = fontconfig -GARVERSION = 2.7.3 +GARVERSION = 2.8.0 CATEGORIES = lib DESCRIPTION = A library for configuring and customizing font access. Modified: csw/mgar/pkg/fontconfig/trunk/checksums =================================================================== --- csw/mgar/pkg/fontconfig/trunk/checksums 2010-01-21 11:13:10 UTC (rev 8104) +++ csw/mgar/pkg/fontconfig/trunk/checksums 2010-01-21 11:18:18 UTC (rev 8105) @@ -1,5 +1,5 @@ -747d2c691c66b563c8e8c1784ce8d014 download/fontconfig-2.7.3.tar.gz -5a5b382b4a5e579cfc869bcffd7c034e download/CSWfconfig.postinstall -21481d18c2100203177ccab5b51e50d7 download/CSWfconfig.checkinstall -0fb83ca9bf9a7b99ab7601347e8c855d download/fontconfig.h.diff -bbdb45396408c48d50c7db5747dfae4e download/fix-zerowidth-struct.patch +21481d18c2100203177ccab5b51e50d7 CSWfconfig.checkinstall +5a5b382b4a5e579cfc869bcffd7c034e CSWfconfig.postinstall +bbdb45396408c48d50c7db5747dfae4e fix-zerowidth-struct.patch +77e15a92006ddc2adbb06f840d591c0e fontconfig-2.8.0.tar.gz +0fb83ca9bf9a7b99ab7601347e8c855d fontconfig.h.diff This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From a_o_m at users.sourceforge.net Thu Jan 21 14:01:18 2010 From: a_o_m at users.sourceforge.net (a_o_m at users.sourceforge.net) Date: Thu, 21 Jan 2010 13:01:18 +0000 Subject: [csw-devel] SF.net SVN: gar:[8106] csw/mgar/pkg/fontconfig/trunk Message-ID: Revision: 8106 http://gar.svn.sourceforge.net/gar/?rev=8106&view=rev Author: a_o_m Date: 2010-01-21 13:01:18 +0000 (Thu, 21 Jan 2010) Log Message: ----------- fontconfig: removed patches for older releases, removing cache-csw-2 files during postinstall now Modified Paths: -------------- csw/mgar/pkg/fontconfig/trunk/Makefile csw/mgar/pkg/fontconfig/trunk/files/CSWfconfig.postinstall Removed Paths: ------------- csw/mgar/pkg/fontconfig/trunk/files/CSWfconfig.checkinstall csw/mgar/pkg/fontconfig/trunk/files/fix-zerowidth-struct.patch csw/mgar/pkg/fontconfig/trunk/files/fontconfig.h.diff Modified: csw/mgar/pkg/fontconfig/trunk/Makefile =================================================================== --- csw/mgar/pkg/fontconfig/trunk/Makefile 2010-01-21 11:18:18 UTC (rev 8105) +++ csw/mgar/pkg/fontconfig/trunk/Makefile 2010-01-21 13:01:18 UTC (rev 8106) @@ -13,11 +13,7 @@ MASTER_SITES = http://www.fontconfig.org/release/ DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz DISTFILES += CSWfconfig.postinstall -DISTFILES += CSWfconfig.checkinstall -PATCHFILES = fontconfig.h.diff -PATCHFILES += fix-zerowidth-struct.patch - REQUIRED_PKGS = CSWexpat CSWftype2 CSWzlib CSWiconv # We define upstream file regex so we can be notifed of new upstream software release @@ -35,6 +31,4 @@ CONFIGURE_ARGS += --with-cache-dir=/var/opt/csw/cache/fontconfig CONFIGURE_ARGS += --with-confdir=/opt/csw/etc/fontconfig -EXTRA_MERGE_EXCLUDE_FILES = .*/fonts.conf.bak - include gar/category.mk Deleted: csw/mgar/pkg/fontconfig/trunk/files/CSWfconfig.checkinstall =================================================================== --- csw/mgar/pkg/fontconfig/trunk/files/CSWfconfig.checkinstall 2010-01-21 11:18:18 UTC (rev 8105) +++ csw/mgar/pkg/fontconfig/trunk/files/CSWfconfig.checkinstall 2010-01-21 13:01:18 UTC (rev 8106) @@ -1,8 +0,0 @@ -#!/bin/sh - -if [ ! -f ${BASEDIR}/opt/csw/lib/libexpat.so.1 ]; then - echo Expat XML parser version 2.0 or higher required. Please upgrade CSWexpat first. - exit 1 -fi - -exit 0 Modified: csw/mgar/pkg/fontconfig/trunk/files/CSWfconfig.postinstall =================================================================== --- csw/mgar/pkg/fontconfig/trunk/files/CSWfconfig.postinstall 2010-01-21 11:18:18 UTC (rev 8105) +++ csw/mgar/pkg/fontconfig/trunk/files/CSWfconfig.postinstall 2010-01-21 13:01:18 UTC (rev 8106) @@ -3,8 +3,8 @@ CHROOTDIR=${BASEDIR:-/} echo -echo fc-cache is running now to build font information caches -echo this may take up to several minutes on slow workstations +echo Fontconfig needs to update its font cache. +echo This can take up to a couple of minutes. echo ${BASEDIR}/usr/sbin/chroot ${CHROOTDIR} /opt/csw/bin/fc-cache -f -s @@ -15,6 +15,8 @@ find ${BASEDIR}/usr/openwin/lib/X11/fonts -user root -name fonts.cache-csw-1 -exec rm -f {} \; find ${BASEDIR}/usr/openwin/lib/locale -user root -name fonts.cache-csw-1 -exec rm -f {} \; find ${BASEDIR}/opt/csw -user root -name fonts.cache-csw-1 -exec rm -f {} \; +# removing ancient *.cache-csw-2 files +rm "${BASEDIR}/opt/csw/var/cache/fontconfig/*.cache-csw-2" 2>/dev/null # remove obsolete cache dir [ -d "${BASEDIR}/opt/csw/var/cache-fontconfig" ] && rm -r "${BASEDIR}/opt/csw/var/cache-fontconfig" 2>/dev/null Deleted: csw/mgar/pkg/fontconfig/trunk/files/fix-zerowidth-struct.patch =================================================================== --- csw/mgar/pkg/fontconfig/trunk/files/fix-zerowidth-struct.patch 2010-01-21 11:18:18 UTC (rev 8105) +++ csw/mgar/pkg/fontconfig/trunk/files/fix-zerowidth-struct.patch 2010-01-21 13:01:18 UTC (rev 8106) @@ -1,12 +0,0 @@ -diff -Naur fontconfig-2.7.3.orig/src/fcint.h fontconfig-2.7.3.patched/src/fcint.h ---- fontconfig-2.7.3.orig/src/fcint.h 2009-06-28 19:46:36.000000000 +0200 -+++ fontconfig-2.7.3.patched/src/fcint.h 2009-09-28 15:47:07.195049714 +0200 -@@ -253,7 +253,7 @@ - FcExprPage *next_page; - FcExpr *next; - FcExpr exprs[(1024 - 2/* two pointers */ - 2/* malloc overhead */) * sizeof (void *) / sizeof (FcExpr)]; -- FcExpr end[0]; -+ FcExpr end[]; - }; - - typedef enum _FcQual { Deleted: csw/mgar/pkg/fontconfig/trunk/files/fontconfig.h.diff =================================================================== --- csw/mgar/pkg/fontconfig/trunk/files/fontconfig.h.diff 2010-01-21 11:18:18 UTC (rev 8105) +++ csw/mgar/pkg/fontconfig/trunk/files/fontconfig.h.diff 2010-01-21 13:01:18 UTC (rev 8106) @@ -1,15 +0,0 @@ ---- fontconfig-2.6.0/fontconfig/fontconfig.h_orig 2008-06-01 04:24:34.000000000 +0200 -+++ fontconfig-2.6.0/fontconfig/fontconfig.h 2009-04-24 12:14:14.404366000 +0200 -@@ -113,9 +113,9 @@ - #define FC_DECORATIVE "decorative" /* Bool - true if style is a decorative variant */ - #define FC_LCD_FILTER "lcdfilter" /* Int */ - --#define FC_CACHE_SUFFIX ".cache-"FC_CACHE_VERSION --#define FC_DIR_CACHE_FILE "fonts.cache-"FC_CACHE_VERSION --#define FC_USER_CACHE_FILE ".fonts.cache-"FC_CACHE_VERSION -+#define FC_CACHE_SUFFIX ".cache-csw-"FC_CACHE_VERSION -+#define FC_DIR_CACHE_FILE "fonts.cache-csw-"FC_CACHE_VERSION -+#define FC_USER_CACHE_FILE ".fonts.cache-csw-"FC_CACHE_VERSION - - /* Adjust outline rasterizer */ - #define FC_CHAR_WIDTH "charwidth" /* Int */ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From a_o_m at users.sourceforge.net Thu Jan 21 14:03:21 2010 From: a_o_m at users.sourceforge.net (a_o_m at users.sourceforge.net) Date: Thu, 21 Jan 2010 13:03:21 +0000 Subject: [csw-devel] SF.net SVN: gar:[8107] csw/mgar/pkg/fontconfig/trunk/checksums Message-ID: Revision: 8107 http://gar.svn.sourceforge.net/gar/?rev=8107&view=rev Author: a_o_m Date: 2010-01-21 13:03:21 +0000 (Thu, 21 Jan 2010) Log Message: ----------- fontconfig: checksums updated Modified Paths: -------------- csw/mgar/pkg/fontconfig/trunk/checksums Modified: csw/mgar/pkg/fontconfig/trunk/checksums =================================================================== --- csw/mgar/pkg/fontconfig/trunk/checksums 2010-01-21 13:01:18 UTC (rev 8106) +++ csw/mgar/pkg/fontconfig/trunk/checksums 2010-01-21 13:03:21 UTC (rev 8107) @@ -1,5 +1,2 @@ -21481d18c2100203177ccab5b51e50d7 CSWfconfig.checkinstall -5a5b382b4a5e579cfc869bcffd7c034e CSWfconfig.postinstall -bbdb45396408c48d50c7db5747dfae4e fix-zerowidth-struct.patch +8749af801a9e33c61092da59354bbceb CSWfconfig.postinstall 77e15a92006ddc2adbb06f840d591c0e fontconfig-2.8.0.tar.gz -0fb83ca9bf9a7b99ab7601347e8c855d fontconfig.h.diff This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From a_o_m at users.sourceforge.net Thu Jan 21 14:42:33 2010 From: a_o_m at users.sourceforge.net (a_o_m at users.sourceforge.net) Date: Thu, 21 Jan 2010 13:42:33 +0000 Subject: [csw-devel] SF.net SVN: gar:[8108] csw/mgar/pkg/fontconfig/trunk Message-ID: Revision: 8108 http://gar.svn.sourceforge.net/gar/?rev=8108&view=rev Author: a_o_m Date: 2010-01-21 13:42:33 +0000 (Thu, 21 Jan 2010) Log Message: ----------- fontconfig: fix-zerowidth-struct patch readded Modified Paths: -------------- csw/mgar/pkg/fontconfig/trunk/Makefile csw/mgar/pkg/fontconfig/trunk/checksums Added Paths: ----------- csw/mgar/pkg/fontconfig/trunk/files/fix-zerowidth-struct.patch Modified: csw/mgar/pkg/fontconfig/trunk/Makefile =================================================================== --- csw/mgar/pkg/fontconfig/trunk/Makefile 2010-01-21 13:03:21 UTC (rev 8107) +++ csw/mgar/pkg/fontconfig/trunk/Makefile 2010-01-21 13:42:33 UTC (rev 8108) @@ -14,6 +14,8 @@ DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz DISTFILES += CSWfconfig.postinstall +PATCHFILES = fix-zerowidth-struct.patch + REQUIRED_PKGS = CSWexpat CSWftype2 CSWzlib CSWiconv # We define upstream file regex so we can be notifed of new upstream software release Modified: csw/mgar/pkg/fontconfig/trunk/checksums =================================================================== --- csw/mgar/pkg/fontconfig/trunk/checksums 2010-01-21 13:03:21 UTC (rev 8107) +++ csw/mgar/pkg/fontconfig/trunk/checksums 2010-01-21 13:42:33 UTC (rev 8108) @@ -1,2 +1,3 @@ 8749af801a9e33c61092da59354bbceb CSWfconfig.postinstall +bbdb45396408c48d50c7db5747dfae4e fix-zerowidth-struct.patch 77e15a92006ddc2adbb06f840d591c0e fontconfig-2.8.0.tar.gz Added: csw/mgar/pkg/fontconfig/trunk/files/fix-zerowidth-struct.patch =================================================================== --- csw/mgar/pkg/fontconfig/trunk/files/fix-zerowidth-struct.patch (rev 0) +++ csw/mgar/pkg/fontconfig/trunk/files/fix-zerowidth-struct.patch 2010-01-21 13:42:33 UTC (rev 8108) @@ -0,0 +1,12 @@ +diff -Naur fontconfig-2.7.3.orig/src/fcint.h fontconfig-2.7.3.patched/src/fcint.h +--- fontconfig-2.7.3.orig/src/fcint.h 2009-06-28 19:46:36.000000000 +0200 ++++ fontconfig-2.7.3.patched/src/fcint.h 2009-09-28 15:47:07.195049714 +0200 +@@ -253,7 +253,7 @@ + FcExprPage *next_page; + FcExpr *next; + FcExpr exprs[(1024 - 2/* two pointers */ - 2/* malloc overhead */) * sizeof (void *) / sizeof (FcExpr)]; +- FcExpr end[0]; ++ FcExpr end[]; + }; + + typedef enum _FcQual { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Thu Jan 21 14:51:08 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Thu, 21 Jan 2010 13:51:08 +0000 Subject: [csw-devel] SF.net SVN: gar:[8109] csw/mgar/gar/v2/bin/checkpkg.d/checkpkg.py Message-ID: Revision: 8109 http://gar.svn.sourceforge.net/gar/?rev=8109&view=rev Author: wahwah Date: 2010-01-21 13:51:06 +0000 (Thu, 21 Jan 2010) Log Message: ----------- mGAR v2: checkpkg, don't report SUNWcslx in missing packages, it's a core package. Modified Paths: -------------- csw/mgar/gar/v2/bin/checkpkg.d/checkpkg.py Modified: csw/mgar/gar/v2/bin/checkpkg.d/checkpkg.py =================================================================== --- csw/mgar/gar/v2/bin/checkpkg.d/checkpkg.py 2010-01-21 13:42:33 UTC (rev 8108) +++ csw/mgar/gar/v2/bin/checkpkg.d/checkpkg.py 2010-01-21 13:51:06 UTC (rev 8109) @@ -23,7 +23,8 @@ CONFIG_MTIME = "mtime" DO_NOT_REPORT_SURPLUS = set([u"CSWcommon", u"CSWcswclassutils", u"CSWisaexec"]) DO_NOT_REPORT_MISSING = set([u"SUNWlibC", u"SUNWcsl", u"SUNWlibms", - u"*SUNWcslr", u"*SUNWlibC", u"*SUNWlibms"]) + u"*SUNWcslr", u"*SUNWlibC", u"*SUNWlibms", + u"SUNWcslx"]) SYSTEM_SYMLINKS = ( ("/opt/csw/bdb4", ["/opt/csw/bdb42"]), ("/64", ["/amd64", "/sparcv9"]), This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Thu Jan 21 14:52:57 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Thu, 21 Jan 2010 13:52:57 +0000 Subject: [csw-devel] SF.net SVN: gar:[8110] csw/mgar/pkg Message-ID: Revision: 8110 http://gar.svn.sourceforge.net/gar/?rev=8110&view=rev Author: wahwah Date: 2010-01-21 13:52:51 +0000 (Thu, 21 Jan 2010) Log Message: ----------- pycurl: Initial commit Modified Paths: -------------- csw/mgar/pkg/pycurl/trunk/Makefile csw/mgar/pkg/pycurl/trunk/checksums Added Paths: ----------- csw/mgar/pkg/pycurl/ csw/mgar/pkg/pycurl/trunk/files/remove-static-libs.patch Modified: csw/mgar/pkg/pycurl/trunk/Makefile =================================================================== --- csw/mgar/pkg/template/trunk/Makefile 2010-01-21 13:03:21 UTC (rev 8107) +++ csw/mgar/pkg/pycurl/trunk/Makefile 2010-01-21 13:52:51 UTC (rev 8110) @@ -2,184 +2,23 @@ # Distributed under the terms of the GNU General Public License v2 # $Id$ -## This file contains comments to guide you through various GAR settings. -## Please remove unnecessary comments before committing your code to the code -## repository. The comments to remove are marked with double hashes. -## If you want to remove them all in-place, use: -## gsed -i -e '/^##/d' Makefile -## -## For more information about GAR variables, please see: -## https://sourceforge.net/apps/trac/gar/wiki/GAR%20Variable%20Reference -## -GARNAME = mypkg -GARVERSION = 1.0 -## -## The category that your software fits in. This is not a descriptive field, but -## influences the build process. Depending on the CATEGORIES setting, different -## Makefiles are included from gar/categories/ in your trunk directory, which -## adjust the build settings for the respective category. -## -## Possible settings are: -## apps, cpan, devel, gnome, java, kde, lang, lib, meta, net, python, server, -## utils, x11, xfce, xorg, xtra -CATEGORIES = lib -## -## A one-line description of the package, which will appear in the pkginfo. -DESCRIPTION = -## -## A longer description of the package. This is only for descriptive purposes -## inside the Makefile and is not used elsewhere. +GARNAME = pycurl +GARVERSION = 7.19.0 +CATEGORIES = python +DESCRIPTION = PycURL is a Python interface to libcurl +PACKAGES = CSWpy-curl +CATALOGNAME_CSWpy-curl = py_curl define BLURB - endef -## -## Upstream URL that should show up in the VENDOR field as well as on -## http://opencsw.org/packages/. -SPKG_SOURCEURL = -## -## Whitespace-separated list of URLs to download the source package from. -## There are presets: $(SF_MIRRORS), $(GNU_MIRRORS) and $(GOOGLE_MIRROR). -MASTER_SITES = -## -## SF_PROJ is required if you set $(MASTER_SITES) to $(SF_MIRRORS) and the -## Sourceforge project name differs from $(GARNAME). Specifies the Sourceforge -## project name of the software you wish to download. -## SF_PROJ = -## -## A list of space separated patch filenames from files/ that are to be applied -## to the extracted software before the ./configure stage. Patches need to be -## included in the DISTFILES variable as well. -## PATCHFILES = -## -## Whitespace-separated list of files which comprise this build. mGAR will look -## for the files in the $(FILEDIR) (trunk/files) directory and on the -## $(MASTER_SITES). +SPKG_SOURCEURL = http://pycurl.sourceforge.net/ +MASTER_SITES = http://pycurl.sourceforge.net/download/ +PATCHFILES = remove-static-libs.patch DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz -## -## We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz -## -## Catalog name is the name to be used with pkg{-get,util} -i . -## It is different from the system package name, which by convention is CSWpkgname. -## CATALOGNAME = -## -## Set to 1 to mark the package as architecture-independent. -## ARCHALL = 0 -## -## A list of files / patterns that should be excluded from the package. Amends -## the default list of excluded filenames $(MERGE_EXCLUDE_DEFAULT), which -## contains things like libtool .la files and files with a leading ~. -## EXTRA_MERGE_EXCLUDE_FILES = -## -## A list of space separated package names that should be marked as -## incompatible with the current package. This will go into the depend file. -## When a user has one of the incompatible packages installed and installs -## your package, he will be prompted that the incompatible package must be -## removed. He will however not be prevented to install your package without -## removing the conflicting package first. -## INCOMPATIBLE_PKGS = -## -## The name of the license file that should be included in your package. Defaults -## to COPYING. See http://sourceforge.net/apps/trac/gar/wiki/CopyRightfor details -## on including and displaying licenses. -## LICENSE = -## -## A list of space separated package names that should be produced from your -## Makefile. This is used when a software has different components that can be -## packaged and used individually (think runtime libraries, client tools, server -## files, development headers). You don't need to set this when you just want to -## produce one package. -## -## When you set this variable to include more than one package, you also need to -## set PKGFILES_CSWpkgname for each package (except for the first one in your -## $(PACKAGES) list) to define which files go into each package. The first -## package from $(PACKAGES) one will hold all files that are not matched by -## PKGFILES_ for other packages. -## PACKAGES = -## -## If specified, GAR feeds the almost-final package prototype file to -## $(PROTOTYPE_FILTER) and reads the final package prototype file from it. -## $(PROTOTYPE_FILTER) is usually a sed/awk/perl one-liner, which was mostly used -## to prepare the prototype file for use with cswclassutils (see -## $(SPKG_CLASSES)). Now that there are convenience variables for cswclassutils, -## you will rarely have to use this. A still valid use case would be to change -## the file permissions of a file to be set-UID. -## See http://wiki.opencsw.org/cswclassutils-package for common usage information -## PROTOTYPE_FILTER = -## -## cswclassutils settings -## -## A list of action classes. Possible values are: -## none cswpreserveconf cswcpsampleconf cswpycompile cswusergroup cswinitsmf -## cswinetd cswetcservices -## The class 'cswinitsmf' must be the last class listed. When you use cswclassutils, -## you need to add CSWcswclassutils to REQUIRED_PKGS. -## SPKG_CLASSES = none -## Simplified settings for classes: -## PRESERVECONF = -## SAMPLECONF = -## INITSMF = -## USERGROUP = -## ETCSERVICES = -## INETDCONF = -## A list of runtime package dependencies in the form of CSWfoo. -## REQUIRED_PKGS = -## -## A list of packages necessary to build this package -## PREREQUISITE_PKGS = $(REQUIRED_PKGS) -## -## When using non-empty $(PACKAGES): -## REQUIRED_PKGS_CSWpkgname = -## SPKG_DESC_CSWpkgname = -## PKGFILES_CSWpkgname = -## CATALOGNAME_CSWpkgname = -## -## A list of space separated directories where objects should be stripped in -## addition to the bin/ and sbin/ directories. -## STRIP_DIRS = -## -## Define a custom target for the configure phase. When you set this, the target -## that will be used instead of configure: target, is named -## configure-$(CONFIGURE_SCRIPTS) and you will need to define it in your Makefile -## after including gar/gar.include.mk. If you want to skip the configure phase -## completely (for example when your software doesn't need to be compiled) assign -## this variable an empty value. The procedure works for configure, build, -## install and test steps. -## CONFIGURE_SCRIPTS = -## BUILD_SCRIPTS = -## INSTALL_SCRIPTS = -## TEST_SCRIPTS = -## -## Compilation settings -## -## The build directory. -## WORKSRC = $(WORKDIR)/$(GARNAME)-$(GARVERSION) -## -## BUILD_ARGS is passed as an argument to gmake during the build phase. Use this -## for example, if you need to override Makefile variables. -## BUILD_ARGS = -## -## Arguments passed to the ./configure script. -CONFIGURE_ARGS = $(DIRPATHS) -## -## BUILD64 = -## CONFIGURE_ENV = -## EXTRA_CFLAGS = -## EXTRA_LDFLAGS = -## EXTRA_INC = -## EXTRA_LIB = -## GARFLAVOR = -## INSTALL_ARGS = -## OPT_FLAGS_SOS = -xO3 -## OPT_FLAGS_GCC = -O2 -pipe -## -## The compiler to use. Defaults to SOS11, can be also: SOS12, GCC3, GCC4. -## GARCOMPILER = SOS11 -## -# Remove the following rules and uncomment the -# include before building. -all: .DEFAULT -.DEFAULT: - @true - -#include gar/category.mk +REQUIRED_PKGS += CSWcurlrt +REQUIRED_PKGS += CSWlibidn +REQUIRED_PKGS += CSWoldaprt +REQUIRED_PKGS += CSWosslrt +REQUIRED_PKGS += CSWzlib +TEST_SCRIPTS = +include gar/category.mk Modified: csw/mgar/pkg/pycurl/trunk/checksums =================================================================== --- csw/mgar/pkg/template/trunk/checksums 2010-01-21 13:03:21 UTC (rev 8107) +++ csw/mgar/pkg/pycurl/trunk/checksums 2010-01-21 13:52:51 UTC (rev 8110) @@ -0,0 +1,2 @@ +919d58fe37e69fe87ce4534d8b6a1c7b pycurl-7.19.0.tar.gz +530dc7258db23c9a1d1e39082011a6c1 remove-static-libs.patch Added: csw/mgar/pkg/pycurl/trunk/files/remove-static-libs.patch =================================================================== --- csw/mgar/pkg/pycurl/trunk/files/remove-static-libs.patch (rev 0) +++ csw/mgar/pkg/pycurl/trunk/files/remove-static-libs.patch 2010-01-21 13:52:51 UTC (rev 8110) @@ -0,0 +1,12 @@ +--- pycurl-7.19.0/setup.py.orig 2010-01-21 14:37:49.752839487 +0100 ++++ pycurl-7.19.0/setup.py 2010-01-21 14:38:07.351889431 +0100 +@@ -97,8 +97,7 @@ + else: + extra_compile_args.append(e) + libs = split_quoted( +- os.popen("'%s' --libs" % CURL_CONFIG).read()+\ +- os.popen("'%s' --static-libs" % CURL_CONFIG).read()) ++ os.popen("'%s' --libs" % CURL_CONFIG).read()) + for e in libs: + if e[:2] == "-l": + libraries.append(e[2:]) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From hson at users.sourceforge.net Thu Jan 21 15:06:25 2010 From: hson at users.sourceforge.net (hson at users.sourceforge.net) Date: Thu, 21 Jan 2010 14:06:25 +0000 Subject: [csw-devel] SF.net SVN: gar:[8111] csw/mgar/pkg Message-ID: Revision: 8111 http://gar.svn.sourceforge.net/gar/?rev=8111&view=rev Author: hson Date: 2010-01-21 14:06:24 +0000 (Thu, 21 Jan 2010) Log Message: ----------- exempi: Initial commit Added Paths: ----------- csw/mgar/pkg/exempi/ csw/mgar/pkg/exempi/Makefile csw/mgar/pkg/exempi/branches/ csw/mgar/pkg/exempi/tags/ csw/mgar/pkg/exempi/trunk/ csw/mgar/pkg/exempi/trunk/Makefile csw/mgar/pkg/exempi/trunk/checksums csw/mgar/pkg/exempi/trunk/files/ csw/mgar/pkg/exempi/trunk/files/Makefiles.patch csw/mgar/pkg/exempi/trunk/files/RIFF_Support.cpp csw/mgar/pkg/exempi/trunk/files/XML_Node.cpp csw/mgar/pkg/exempi/trunk/files/boost.m4.patch csw/mgar/pkg/exempi/trunk/files/configure.patch csw/mgar/pkg/exempi/trunk/files/exempi.cpp.patch csw/mgar/pkg/exempi/trunk/files/utils.cpp.patch csw/mgar/pkg/exempi/trunk/files/xmp.h.patch Added: csw/mgar/pkg/exempi/Makefile =================================================================== --- csw/mgar/pkg/exempi/Makefile (rev 0) +++ csw/mgar/pkg/exempi/Makefile 2010-01-21 14:06:24 UTC (rev 8111) @@ -0,0 +1,15 @@ +# vim: ft=make ts=4 sw=4 noet + +default: + @echo "You are in the pkg/ directory." + +%: + $(MAKE) -C trunk $* + +paranoid-%: + $(MAKE) -C trunk $* || exit 2 + +export BUILDLOG ?= $(shell pwd)/buildlog.txt + +report-%: + $(MAKE) -C trunk $* || echo " *** make $* in $$i failed ***" >> $(BUILDLOG) Property changes on: csw/mgar/pkg/exempi/trunk ___________________________________________________________________ Added: svn:ignore + cookies download work Added: svn:externals + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 Added: csw/mgar/pkg/exempi/trunk/Makefile =================================================================== --- csw/mgar/pkg/exempi/trunk/Makefile (rev 0) +++ csw/mgar/pkg/exempi/trunk/Makefile 2010-01-21 14:06:24 UTC (rev 8111) @@ -0,0 +1,47 @@ +GARNAME = exempi +GARVERSION = 2.1.1 +CATEGORIES = lib + +DESCRIPTION = Exempi is an implementation of XMP +define BLURB + Exempi is an implementation of XMP. Version 2.x is based on Adobe XMP SDK + 4.1.1 and released under a BSD-style license like Adobe's. The 3 clause + BSD (aka New-BSD) license is compatible with GPL. The licensing is kept + identical in order to allow two-way merging of the code (ie sending our + change to the XMP SDK to Adobe for integration). + + The API is C based and means to be used from any language and be easier + to maintain ABI stability. +endef + +MASTER_SITES = http://libopenraw.freedesktop.org/download/ +DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz + +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + +REQUIRED_PKGS += CSWexpat CSWstlport CSWzlib +PREREQUISITE_PKGS += CSWiconv CSWboostrt CSWboostdevel + +PATCHFILES += Makefiles.patch +PATCHFILES += RIFF_Support.cpp +PATCHFILES += XML_Node.cpp +PATCHFILES += configure.patch +PATCHFILES += exempi.cpp.patch +PATCHFILES += utils.cpp.patch +PATCHFILES += xmp.h.patch +PATCHFILES += boost.m4.patch + +EXTRA_CXXFLAGS = -D__EXTENSIONS__ -library=stlport4 -DHAVE_NATIVE_TLS=0 +EXTRA_LINKER_FLAGS = -liconv + +CONFIGURE_ARGS = $(DIRPATHS) +CONFIGURE_ARGS += --with-boost=/opt/csw + +TEST_TARGET = check + +include gar/category.mk + +pre-configure-modulated: + @echo " ==> Regenerating build tools..." + @(cd $(WORKSRC) ; autoconf) + @$(MAKECOOKIE) Added: csw/mgar/pkg/exempi/trunk/checksums =================================================================== --- csw/mgar/pkg/exempi/trunk/checksums (rev 0) +++ csw/mgar/pkg/exempi/trunk/checksums 2010-01-21 14:06:24 UTC (rev 8111) @@ -0,0 +1,9 @@ +8fded282d0b747d5be8d401f268e6c87 Makefiles.patch +58df21dd4e8418040ef8e422b7f50fe9 RIFF_Support.cpp +2624b4b7c56c09d1311716c28aa94424 XML_Node.cpp +ad7b0d343edb20fdca06f7a2b66e3b46 boost.m4.patch +432f995204aff834ac8ac6a5d6ff4a1f configure.patch +62ecb5a01387b9f940a5429b3df67e65 exempi-2.1.1.tar.gz +9919b1d4e37a3b48a8d9977c433e6193 exempi.cpp.patch +24f2cde07cbd4d999d9ec30625841158 utils.cpp.patch +eede9560fa348ca476dc37ae2dc93271 xmp.h.patch Added: csw/mgar/pkg/exempi/trunk/files/Makefiles.patch =================================================================== --- csw/mgar/pkg/exempi/trunk/files/Makefiles.patch (rev 0) +++ csw/mgar/pkg/exempi/trunk/files/Makefiles.patch 2010-01-21 14:06:24 UTC (rev 8111) @@ -0,0 +1,159 @@ +diff -Nru exempi-2.1.1.orig/exempi/Makefile.in exempi-2.1.1/exempi/Makefile.in +--- exempi-2.1.1.orig/exempi/Makefile.in 2009-05-16 05:25:19.000000000 +0200 ++++ exempi-2.1.1/exempi/Makefile.in 2010-01-20 21:17:55.040718572 +0100 +@@ -276,7 +276,7 @@ + exempidir = $(includedir)/@EXEMPI_INCLUDE_BASE@/exempi + exempi_HEADERS = xmp.h xmpconsts.h xmperrors.h + INCLUDES = -I$(top_srcdir)/public/include +-AM_CPPFLAGS = -Wall -D at EXEMPI_PLATFORM_DEF@=1 ++AM_CPPFLAGS = -D at EXEMPI_PLATFORM_DEF@=1 + lib_LTLIBRARIES = libexempi.la + pkgconfig_DATA = exempi- at EXEMPI_MAJOR_VERSION@.pc + libexempi_la_SOURCES = exempi.cpp +diff -Nru exempi-2.1.1.orig/exempi/tests/Makefile.in exempi-2.1.1/exempi/tests/Makefile.in +--- exempi-2.1.1.orig/exempi/tests/Makefile.in 2009-05-16 01:33:41.000000000 +0200 ++++ exempi-2.1.1/exempi/tests/Makefile.in 2010-01-21 07:54:09.406465019 +0100 +@@ -188,6 +188,8 @@ + AUTOMAKE = @AUTOMAKE@ + AWK = @AWK@ + BOOST_CPPFLAGS = @BOOST_CPPFLAGS@ ++BOOST_TEST_EXEC_MONITOR_LDFLAGS = @BOOST_TEST_EXEC_MONITOR_LDFLAGS@ ++BOOST_TEST_EXEC_MONITOR_LIBS = @BOOST_TEST_EXEC_MONITOR_LIBS@ + BOOST_UNIT_TEST_FRAMEWORK_LDFLAGS = @BOOST_UNIT_TEST_FRAMEWORK_LDFLAGS@ + BOOST_UNIT_TEST_FRAMEWORK_LIBS = @BOOST_UNIT_TEST_FRAMEWORK_LIBS@ + CC = @CC@ +@@ -323,32 +325,32 @@ + EXTRA_DIST = $(check_DATA) $(check_SCRIPTS) + CLEANFILES = test.jpg + testinit_SOURCES = testinit.cpp utils.cpp +-testinit_LDADD = ../libexempi.la @BOOST_UNIT_TEST_FRAMEWORK_LIBS@ +-testinit_LDFLAGS = -static @BOOST_UNIT_TEST_FRAMEWORK_LDFLAGS@ ++testinit_LDADD = ../libexempi.la @BOOST_UNIT_TEST_FRAMEWORK_LIBS@ @BOOST_TEST_EXEC_MONITOR_LIBS@ ++testinit_LDFLAGS = -static @BOOST_UNIT_TEST_FRAMEWORK_LDFLAGS@ @BOOST_TEST_EXEC_MONITOR_LDFLAGS@ + testexempicore_SOURCES = test-exempi-core.cpp utils.cpp +-testexempicore_LDADD = ../libexempi.la @BOOST_UNIT_TEST_FRAMEWORK_LIBS@ +-testexempicore_LDFLAGS = -static @BOOST_UNIT_TEST_FRAMEWORK_LDFLAGS@ ++testexempicore_LDADD = ../libexempi.la @BOOST_UNIT_TEST_FRAMEWORK_LIBS@ @BOOST_TEST_EXEC_MONITOR_LIBS@ ++testexempicore_LDFLAGS = -static @BOOST_UNIT_TEST_FRAMEWORK_LDFLAGS@ @BOOST_TEST_EXEC_MONITOR_LDFLAGS@ + testserialise_SOURCES = test-serialise.cpp utils.cpp +-testserialise_LDADD = ../libexempi.la @BOOST_UNIT_TEST_FRAMEWORK_LIBS@ +-testserialise_LDFLAGS = -static @BOOST_UNIT_TEST_FRAMEWORK_LDFLAGS@ ++testserialise_LDADD = ../libexempi.la @BOOST_UNIT_TEST_FRAMEWORK_LIBS@ @BOOST_TEST_EXEC_MONITOR_LIBS@ ++testserialise_LDFLAGS = -static @BOOST_UNIT_TEST_FRAMEWORK_LDFLAGS@ @BOOST_TEST_EXEC_MONITOR_LDFLAGS@ + testwritenewprop_SOURCES = test-write-new-prop.cpp utils.cpp +-testwritenewprop_LDADD = ../libexempi.la @BOOST_UNIT_TEST_FRAMEWORK_LIBS@ +-testwritenewprop_LDFLAGS = -static @BOOST_UNIT_TEST_FRAMEWORK_LDFLAGS@ ++testwritenewprop_LDADD = ../libexempi.la @BOOST_UNIT_TEST_FRAMEWORK_LIBS@ @BOOST_TEST_EXEC_MONITOR_LIBS@ ++testwritenewprop_LDFLAGS = -static @BOOST_UNIT_TEST_FRAMEWORK_LDFLAGS@ @BOOST_TEST_EXEC_MONITOR_LDFLAGS@ + testtiffleak_SOURCES = test-tiff-leak.cpp utils.cpp +-testtiffleak_LDADD = ../libexempi.la @BOOST_UNIT_TEST_FRAMEWORK_LIBS@ +-testtiffleak_LDFLAGS = -static @BOOST_UNIT_TEST_FRAMEWORK_LDFLAGS@ ++testtiffleak_LDADD = ../libexempi.la @BOOST_UNIT_TEST_FRAMEWORK_LIBS@ @BOOST_TEST_EXEC_MONITOR_LIBS@ ++testtiffleak_LDFLAGS = -static @BOOST_UNIT_TEST_FRAMEWORK_LDFLAGS@ @BOOST_TEST_EXEC_MONITOR_LDFLAGS@ + testxmpfiles_SOURCES = test-xmpfiles.cpp utils.cpp +-testxmpfiles_LDADD = ../libexempi.la @BOOST_UNIT_TEST_FRAMEWORK_LIBS@ +-testxmpfiles_LDFLAGS = -static @BOOST_UNIT_TEST_FRAMEWORK_LDFLAGS@ ++testxmpfiles_LDADD = ../libexempi.la @BOOST_UNIT_TEST_FRAMEWORK_LIBS@ @BOOST_TEST_EXEC_MONITOR_LIBS@ ++testxmpfiles_LDFLAGS = -static @BOOST_UNIT_TEST_FRAMEWORK_LDFLAGS@ @BOOST_TEST_EXEC_MONITOR_LDFLAGS@ + testxmpfileswrite_SOURCES = test-xmpfiles-write.cpp utils.cpp +-testxmpfileswrite_LDADD = ../libexempi.la @BOOST_UNIT_TEST_FRAMEWORK_LIBS@ +-testxmpfileswrite_LDFLAGS = -static @BOOST_UNIT_TEST_FRAMEWORK_LDFLAGS@ ++testxmpfileswrite_LDADD = ../libexempi.la @BOOST_UNIT_TEST_FRAMEWORK_LIBS@ @BOOST_TEST_EXEC_MONITOR_LIBS@ ++testxmpfileswrite_LDFLAGS = -static @BOOST_UNIT_TEST_FRAMEWORK_LDFLAGS@ @BOOST_TEST_EXEC_MONITOR_LDFLAGS@ + test3_SOURCES = test3.cpp utils.cpp +-test3_LDADD = ../libexempi.la @BOOST_UNIT_TEST_FRAMEWORK_LIBS@ +-test3_LDFLAGS = -static @BOOST_UNIT_TEST_FRAMEWORK_LDFLAGS@ ++test3_LDADD = ../libexempi.la @BOOST_UNIT_TEST_FRAMEWORK_LIBS@ @BOOST_TEST_EXEC_MONITOR_LIBS@ ++test3_LDFLAGS = -static @BOOST_UNIT_TEST_FRAMEWORK_LDFLAGS@ @BOOST_TEST_EXEC_MONITOR_LDFLAGS@ + testfdo18635_SOURCES = test-bgo.cpp utils.cpp +-testfdo18635_LDADD = ../libexempi.la @BOOST_UNIT_TEST_FRAMEWORK_LIBS@ +-testfdo18635_LDFLAGS = -static @BOOST_UNIT_TEST_FRAMEWORK_LDFLAGS@ ++testfdo18635_LDADD = ../libexempi.la @BOOST_UNIT_TEST_FRAMEWORK_LIBS@ @BOOST_TEST_EXEC_MONITOR_LIBS@ ++testfdo18635_LDFLAGS = -static @BOOST_UNIT_TEST_FRAMEWORK_LDFLAGS@ @BOOST_TEST_EXEC_MONITOR_LDFLAGS@ + all: all-am + + .SUFFIXES: +diff -Nru exempi-2.1.1.orig/samples/source/Makefile.in exempi-2.1.1/samples/source/Makefile.in +--- exempi-2.1.1.orig/samples/source/Makefile.in 2009-05-16 01:33:42.000000000 +0200 ++++ exempi-2.1.1/samples/source/Makefile.in 2010-01-21 04:13:57.049873855 +0100 +@@ -273,8 +273,7 @@ + top_build_prefix = @top_build_prefix@ + top_builddir = @top_builddir@ + top_srcdir = @top_srcdir@ +-AM_CXXFLAGS = -fexceptions -funsigned-char -fPIC \ +- -Wno-multichar -Wno-implicit -Wno-ctor-dtor-privacy ++AM_CXXFLAGS = -xchar=unsigned -KPIC + + AM_CPPFLAGS = -D at EXEMPI_PLATFORM_DEF@=1 -D_FILE_OFFSET_BITS=64 + XMPLIBS = $(top_builddir)/source/XMPCore/libXMPCore.la \ +diff -Nru exempi-2.1.1.orig/source/XMPCore/Makefile.in exempi-2.1.1/source/XMPCore/Makefile.in +--- exempi-2.1.1.orig/source/XMPCore/Makefile.in 2009-05-16 01:33:42.000000000 +0200 ++++ exempi-2.1.1/source/XMPCore/Makefile.in 2010-01-20 21:31:48.303689677 +0100 +@@ -252,10 +252,9 @@ + -I$(srcdir)/../common/ \ + -I$(top_srcdir)/third-party/MD5 + +-AM_CXXFLAGS = -Wno-multichar -Wno-implicit -Wno-ctor-dtor-privacy \ +- -funsigned-char -fexceptions ++AM_CXXFLAGS = -xchar=unsigned + +-AM_CPPFLAGS = -Wall \ ++AM_CPPFLAGS = \ + -D at EXEMPI_PLATFORM_DEF@=1 -DXMP_IMPL=1 -DXMP_ClientBuild=0 \ + -D_FILE_OFFSET_BITS=64 -DHAVE_EXPAT_CONFIG_H=1 -DXML_STATIC=1 + +diff -Nru exempi-2.1.1.orig/source/XMPFiles/FileHandlers/Makefile.in exempi-2.1.1/source/XMPFiles/FileHandlers/Makefile.in +--- exempi-2.1.1.orig/source/XMPFiles/FileHandlers/Makefile.in 2009-05-16 01:33:42.000000000 +0200 ++++ exempi-2.1.1/source/XMPFiles/FileHandlers/Makefile.in 2010-01-20 21:33:24.157916525 +0100 +@@ -260,6 +260,8 @@ + -I$(top_srcdir)/public/include/ -I$(top_srcdir)/build/ \ + -I$(top_srcdir)/third-party/MD5 + ++AM_CXXFLAGS = ++ + AM_CPPFLAGS = \ + -D at EXEMPI_PLATFORM_DEF@=1 -DXMP_IMPL=1 -DXMP_ClientBuild=0 \ + -D_FILE_OFFSET_BITS=64 -DHAVE_EXPAT_CONFIG_H=1 -DXML_STATIC=1 +diff -Nru exempi-2.1.1.orig/source/XMPFiles/FormatSupport/Makefile.in exempi-2.1.1/source/XMPFiles/FormatSupport/Makefile.in +--- exempi-2.1.1.orig/source/XMPFiles/FormatSupport/Makefile.in 2009-05-16 01:33:42.000000000 +0200 ++++ exempi-2.1.1/source/XMPFiles/FormatSupport/Makefile.in 2010-01-20 21:34:48.039865264 +0100 +@@ -266,7 +266,9 @@ + -I$(top_srcdir)/public/include/ -I$(top_srcdir)/build/ \ + -I$(top_srcdir)/third-party/MD5 + +-AM_CPPFLAGS = -Wno-multichar\ ++AM_CXXFLAGS = ++ ++AM_CPPFLAGS = \ + -D at EXEMPI_PLATFORM_DEF@=1 -DXMP_IMPL=1 -DXMP_ClientBuild=0 \ + -D_FILE_OFFSET_BITS=64 -DHAVE_EXPAT_CONFIG_H=1 -DXML_STATIC=1 + +diff -Nru exempi-2.1.1.orig/source/XMPFiles/Makefile.in exempi-2.1.1/source/XMPFiles/Makefile.in +--- exempi-2.1.1.orig/source/XMPFiles/Makefile.in 2009-05-16 01:33:42.000000000 +0200 ++++ exempi-2.1.1/source/XMPFiles/Makefile.in 2010-01-20 21:33:54.330126061 +0100 +@@ -261,10 +261,9 @@ + -I$(srcdir)/../common/ \ + -I$(top_srcdir)/third-party/MD5 + +-AM_CXXFLAGS = -Wno-multichar -Wno-implicit -Wno-ctor-dtor-privacy \ +- -funsigned-char -fexceptions -fno-strict-aliasing ++AM_CXXFLAGS = -xchar=unsigned + +-AM_CPPFLAGS = -Wall\ ++AM_CPPFLAGS = \ + -D at EXEMPI_PLATFORM_DEF@=1 -DXMP_IMPL=1 -DXMP_ClientBuild=0 \ + -D_FILE_OFFSET_BITS=64 -DHAVE_EXPAT_CONFIG_H=1 -DXML_STATIC=1 \ + -DDISABLE_QUICKTIME +diff -Nru exempi-2.1.1.orig/source/common/Makefile.in exempi-2.1.1/source/common/Makefile.in +--- exempi-2.1.1.orig/source/common/Makefile.in 2009-05-16 01:33:42.000000000 +0200 ++++ exempi-2.1.1/source/common/Makefile.in 2010-01-20 21:28:47.770546778 +0100 +@@ -246,8 +246,7 @@ + INCLUDES = -I$(top_srcdir)/public/include \ + -I$(top_srcdir)/public/include/client-glue + +-AM_CXXFLAGS = -Wno-multichar -Wno-implicit -Wno-ctor-dtor-privacy \ +- -funsigned-char -fexceptions ++AM_CXXFLAGS = -xchar=unsigned + + AM_CPPFLAGS = \ + -D at EXEMPI_PLATFORM_DEF@=1 -DXMP_IMPL=1 -DXMP_ClientBuild=0 \ Added: csw/mgar/pkg/exempi/trunk/files/RIFF_Support.cpp =================================================================== --- csw/mgar/pkg/exempi/trunk/files/RIFF_Support.cpp (rev 0) +++ csw/mgar/pkg/exempi/trunk/files/RIFF_Support.cpp 2010-01-21 14:06:24 UTC (rev 8111) @@ -0,0 +1,21 @@ +diff -Nru exempi-2.1.1.orig/source/XMPFiles/FormatSupport/RIFF_Support.cpp exempi-2.1.1/source/XMPFiles/FormatSupport/RIFF_Support.cpp +--- exempi-2.1.1.orig/source/XMPFiles/FormatSupport/RIFF_Support.cpp 2009-02-17 05:10:42.000000000 +0100 ++++ exempi-2.1.1/source/XMPFiles/FormatSupport/RIFF_Support.cpp 2010-01-20 21:35:32.833002097 +0100 +@@ -550,7 +550,7 @@ + + // *** Could be moved to a separate header + +-#pragma pack(push,1) ++//#pragma pack(push,1) + + // [TODO] Can we switch to using just a full path here? + struct FSSpecLegacy +@@ -603,7 +603,7 @@ + FSSpecLegacy fullPath; // Full path of the project file + }; + +-#pragma pack(pop) ++//#pragma pack(pop) + + // ------------------------------------------------------------------------------------------------- + Added: csw/mgar/pkg/exempi/trunk/files/XML_Node.cpp =================================================================== --- csw/mgar/pkg/exempi/trunk/files/XML_Node.cpp (rev 0) +++ csw/mgar/pkg/exempi/trunk/files/XML_Node.cpp 2010-01-21 14:06:24 UTC (rev 8111) @@ -0,0 +1,11 @@ +diff -Nru exempi-2.1.1.orig/source/common/XML_Node.cpp exempi-2.1.1/source/common/XML_Node.cpp +--- exempi-2.1.1.orig/source/common/XML_Node.cpp 2009-02-17 05:10:42.000000000 +0100 ++++ exempi-2.1.1/source/common/XML_Node.cpp 2010-01-20 21:30:44.823511273 +0100 +@@ -9,6 +9,7 @@ + #include "XMP_Environment.h" // ! Must be the first #include! + #include "XMLParserAdapter.hpp" + ++#include + #include + #include + #include Added: csw/mgar/pkg/exempi/trunk/files/boost.m4.patch =================================================================== --- csw/mgar/pkg/exempi/trunk/files/boost.m4.patch (rev 0) +++ csw/mgar/pkg/exempi/trunk/files/boost.m4.patch 2010-01-21 14:06:24 UTC (rev 8111) @@ -0,0 +1,12 @@ +--- exempi-2.1.1.orig/m4/boost.m4 2009-02-17 05:10:40.000000000 +0100 ++++ exempi-2.1.1/m4/boost.m4 2010-01-21 07:23:38.252002318 +0100 +@@ -489,6 +489,9 @@ + BOOST_FIND_LIB([unit_test_framework], [$1], + [boost/test/unit_test.hpp], [BOOST_CHECK(2==2);], + [using boost::unit_test::test_suite; test_suite* init_unit_test_suite( int argc, char ** argv ) { return NULL;}]) ++BOOST_FIND_LIB([test_exec_monitor], [$1], ++ [boost/test/test_tools.hpp], [BOOST_CHECK(1==1);], ++ [int test_main( int argc, char ** argv ) {return 0;}]) + ])# BOOST_TEST + + Added: csw/mgar/pkg/exempi/trunk/files/configure.patch =================================================================== --- csw/mgar/pkg/exempi/trunk/files/configure.patch (rev 0) +++ csw/mgar/pkg/exempi/trunk/files/configure.patch 2010-01-21 14:06:24 UTC (rev 8111) @@ -0,0 +1,11 @@ +diff -Nru exempi-2.1.1.orig/configure exempi-2.1.1/configure +--- exempi-2.1.1.orig/configure 2009-05-16 01:32:11.000000000 +0200 ++++ exempi-2.1.1/configure 2010-01-20 21:14:55.409183278 +0100 +@@ -16528,6 +16528,7 @@ + "defined _MSC_VER && _MSC_VER == 1300 @ vc7" \ + "defined __GNUC__ && __GNUC__ == 4 && __GNUC_MINOR__ == 3 && !defined __ICC @ gcc43" \ + "defined __GNUC__ && __GNUC__ == 2 && __GNUC_MINOR__ == 95 && !defined __ICC @ gcc295" \ ++ "defined __SUNPRO_CC @ sun" \ + "defined __MWERKS__ && __MWERKS__ <= 0x32FF @ cw9" \ + "defined _MSC_VER && _MSC_VER < 1300 && !defined UNDER_CE @ vc6" \ + "defined _MSC_VER && _MSC_VER < 1300 && defined UNDER_CE @ evc4" \ Added: csw/mgar/pkg/exempi/trunk/files/exempi.cpp.patch =================================================================== --- csw/mgar/pkg/exempi/trunk/files/exempi.cpp.patch (rev 0) +++ csw/mgar/pkg/exempi/trunk/files/exempi.cpp.patch 2010-01-21 14:06:24 UTC (rev 8111) @@ -0,0 +1,21 @@ +diff -Nru exempi-2.1.1.orig/exempi/exempi.cpp exempi-2.1.1/exempi/exempi.cpp +--- exempi-2.1.1.orig/exempi/exempi.cpp 2009-05-16 05:25:05.000000000 +0200 ++++ exempi-2.1.1/exempi/exempi.cpp 2010-01-21 04:42:31.483045937 +0100 +@@ -587,7 +587,7 @@ + SXMPMeta *txmp = (SXMPMeta *)xmp; + XMP_OptionBits optionBits; + // the long converstion is needed until XMPCore is fixed it use proper types. +- ret = txmp->GetProperty_Int(schema, name, property, &optionBits); ++ ret = txmp->GetProperty_Int(schema, name, (long *) property, &optionBits); + if(propsBits) { + *propsBits = optionBits; + } +@@ -988,7 +988,7 @@ + return titer->Next(reinterpret_cast(schema), + reinterpret_cast(propName), + reinterpret_cast(propValue), +- options); ++ (unsigned long *)options); + } + + bool xmp_iterator_skip(XmpIteratorPtr iter, XmpIterSkipOptions options) Added: csw/mgar/pkg/exempi/trunk/files/utils.cpp.patch =================================================================== --- csw/mgar/pkg/exempi/trunk/files/utils.cpp.patch (rev 0) +++ csw/mgar/pkg/exempi/trunk/files/utils.cpp.patch 2010-01-21 14:06:24 UTC (rev 8111) @@ -0,0 +1,12 @@ +diff -Nru exempi-2.1.1.orig/exempi/tests/utils.cpp exempi-2.1.1/exempi/tests/utils.cpp +--- exempi-2.1.1.orig/exempi/tests/utils.cpp 2009-02-17 05:10:40.000000000 +0100 ++++ exempi-2.1.1/exempi/tests/utils.cpp 2010-01-20 21:24:39.303070019 +0100 +@@ -34,6 +34,8 @@ + * OF THE POSSIBILITY OF SUCH DAMAGE. + */ + ++#include ++#include + #include + + #include Added: csw/mgar/pkg/exempi/trunk/files/xmp.h.patch =================================================================== --- csw/mgar/pkg/exempi/trunk/files/xmp.h.patch (rev 0) +++ csw/mgar/pkg/exempi/trunk/files/xmp.h.patch 2010-01-21 14:06:24 UTC (rev 8111) @@ -0,0 +1,15 @@ +diff -Nru exempi-2.1.1.orig/exempi/xmp.h exempi-2.1.1/exempi/xmp.h +--- exempi-2.1.1.orig/exempi/xmp.h 2009-02-17 05:10:40.000000000 +0100 ++++ exempi-2.1.1/exempi/xmp.h 2010-01-21 04:16:45.610494834 +0100 +@@ -43,8 +43,10 @@ + /* stdbool choke on Sun (bug# 14612) */ + #if !defined(__sun) + #include +-#endif + #include ++#else ++#include ++#endif + + #include + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Thu Jan 21 15:15:25 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Thu, 21 Jan 2010 14:15:25 +0000 Subject: [csw-devel] SF.net SVN: gar:[8112] csw/mgar/gar/v2/bin Message-ID: Revision: 8112 http://gar.svn.sourceforge.net/gar/?rev=8112&view=rev Author: wahwah Date: 2010-01-21 14:15:25 +0000 (Thu, 21 Jan 2010) Log Message: ----------- mGAR v2: checkpkg, don't print long output by default, display a hint how to run in the debug mode Modified Paths: -------------- csw/mgar/gar/v2/bin/checkpkg csw/mgar/gar/v2/bin/checkpkg.d/checkpkg-libs.py Modified: csw/mgar/gar/v2/bin/checkpkg =================================================================== --- csw/mgar/gar/v2/bin/checkpkg 2010-01-21 14:06:24 UTC (rev 8111) +++ csw/mgar/gar/v2/bin/checkpkg 2010-01-21 14:15:25 UTC (rev 8112) @@ -42,6 +42,9 @@ COLOR_RESET="" fi +readonly selfpath="$0" +readonly selfargs="$*" + # always print out a warning message. (to stderr) # exit script, if quit_on_warn set @@ -79,6 +82,8 @@ print ERROR: $* >/dev/fd/2 cleanup cleanupset + print "To run checkpkg in the debug mode, add the '-d' flag:" + print "${selfpath} -d ${selfargs}" exit 1 } @@ -203,8 +208,7 @@ case $software in *[A-Z]*) - echo ERROR: $software must be all lowercase - exit 1 + errmsg "$software must be all lowercase" ;; esac @@ -273,8 +277,7 @@ case $version in *-*) - print ERROR: VERSION field not allowed to have '"-"' in it - exit 1 + errmsg "VERSION field not allowed to have \"-\" in it" ;; *,REV=20[01][0-9].[0-9][0-9].[0-9][0-9]*) : @@ -494,8 +497,7 @@ # sanity check against "depends on self" nawk '$2=="'$pkgname'" {exit 1}' $EXTRACTDIR/$pkgname/install/depend if [[ $? -ne 0 ]] ; then - print ERROR: $pkgname references self in depend file - exit 1 + errmsg "$pkgname references self in depend file" fi # Verify that there are no multiple depends Modified: csw/mgar/gar/v2/bin/checkpkg.d/checkpkg-libs.py =================================================================== --- csw/mgar/gar/v2/bin/checkpkg.d/checkpkg-libs.py 2010-01-21 14:06:24 UTC (rev 8111) +++ csw/mgar/gar/v2/bin/checkpkg.d/checkpkg-libs.py 2010-01-21 14:15:25 UTC (rev 8112) @@ -121,7 +121,7 @@ # same bit of code with do checking and reporting. # # TODO: Rewrite this using cheetah templates - if needed_sonames: + if options.debug and needed_sonames: print "Analysis of sonames needed by the package set:" binaries_with_missing_sonames = set([]) for soname in needed_sonames: This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Thu Jan 21 15:35:36 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Thu, 21 Jan 2010 14:35:36 +0000 Subject: [csw-devel] SF.net SVN: gar:[8113] csw/mgar/gar/v2/bin/checkpkg Message-ID: Revision: 8113 http://gar.svn.sourceforge.net/gar/?rev=8113&view=rev Author: wahwah Date: 2010-01-21 14:35:32 +0000 (Thu, 21 Jan 2010) Log Message: ----------- mGAR v2: checkpkg, don't output log markers unless in the debug mode. Modified Paths: -------------- csw/mgar/gar/v2/bin/checkpkg Modified: csw/mgar/gar/v2/bin/checkpkg =================================================================== --- csw/mgar/gar/v2/bin/checkpkg 2010-01-21 14:15:25 UTC (rev 8112) +++ csw/mgar/gar/v2/bin/checkpkg 2010-01-21 14:35:32 UTC (rev 8113) @@ -599,11 +599,11 @@ echo for log_file in ${log_files}; do if [[ -s "${log_file}" ]]; then - echo "LOG START: ${log_file}" - echo + debugmsg "LOG START: ${log_file}" + debugmsg cat "${log_file}" - echo - echo "LOG END: ${log_file}" + debugmsg + debugmsg "LOG END: ${log_file}" fi done echo @@ -611,7 +611,7 @@ if [[ ${test_suite_ok} -ne 1 ]]; then errmsg "One or more modular tests have failed." else - print "All tests were successful." + print "All modular tests were successful." fi print "" This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From hson at users.sourceforge.net Thu Jan 21 16:37:59 2010 From: hson at users.sourceforge.net (hson at users.sourceforge.net) Date: Thu, 21 Jan 2010 15:37:59 +0000 Subject: [csw-devel] SF.net SVN: gar:[8114] csw/mgar/pkg/exempi/trunk/Makefile Message-ID: Revision: 8114 http://gar.svn.sourceforge.net/gar/?rev=8114&view=rev Author: hson Date: 2010-01-21 15:37:58 +0000 (Thu, 21 Jan 2010) Log Message: ----------- exempi: Prepare Makefile for package release Modified Paths: -------------- csw/mgar/pkg/exempi/trunk/Makefile Modified: csw/mgar/pkg/exempi/trunk/Makefile =================================================================== --- csw/mgar/pkg/exempi/trunk/Makefile 2010-01-21 14:35:32 UTC (rev 8113) +++ csw/mgar/pkg/exempi/trunk/Makefile 2010-01-21 15:37:58 UTC (rev 8114) @@ -19,9 +19,20 @@ UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz -REQUIRED_PKGS += CSWexpat CSWstlport CSWzlib -PREREQUISITE_PKGS += CSWiconv CSWboostrt CSWboostdevel +PACKAGES = CSWexempi CSWexempidevel +CATALOGNAME_CSWexempi = exempi +CATALOGNAME_CSWexempidevel = exempi_devel +SPKG_DESC_CSWexempi = Exempi is an implementation of XMP +SPKG_DESC_CSWexempidevel = Exempi is an implementation of XMP - developer package +REQUIRED_PKGS_CSWexempi += CSWexpat CSWstlport CSWzlib CSWiconv +REQUIRED_PKGS_CSWexempidevel += CSWexempi + +PREREQUISITE_PKGS += $(REQUIRED_PKGS_CSWexempi) +PREREQUISITE_PKGS += CSWboostrt CSWboostdevel + +PKGFILES_CSWexempidevel = $(PKGFILES_DEVEL) + PATCHFILES += Makefiles.patch PATCHFILES += RIFF_Support.cpp PATCHFILES += XML_Node.cpp @@ -31,7 +42,9 @@ PATCHFILES += xmp.h.patch PATCHFILES += boost.m4.patch -EXTRA_CXXFLAGS = -D__EXTENSIONS__ -library=stlport4 -DHAVE_NATIVE_TLS=0 +EXTRA_CXXFLAGS = -D__EXTENSIONS__ -library=stlport4 +# Ugly, but need to owerwrite this since autoconf system doesn't work +EXTRA_CXXFLAGS += -DHAVE_NATIVE_TLS=0 EXTRA_LINKER_FLAGS = -liconv CONFIGURE_ARGS = $(DIRPATHS) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Fri Jan 22 11:08:09 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Fri, 22 Jan 2010 10:08:09 +0000 Subject: [csw-devel] SF.net SVN: gar:[8115] csw/mgar/gar/v2/bin/checkpkg.d/checkpkg_test.py Message-ID: Revision: 8115 http://gar.svn.sourceforge.net/gar/?rev=8115&view=rev Author: wahwah Date: 2010-01-22 10:08:08 +0000 (Fri, 22 Jan 2010) Log Message: ----------- mGAR v2: checkpkg, update the expected test result, SUNWcslx should not be reported as missing dependency. Modified Paths: -------------- csw/mgar/gar/v2/bin/checkpkg.d/checkpkg_test.py Modified: csw/mgar/gar/v2/bin/checkpkg.d/checkpkg_test.py =================================================================== --- csw/mgar/gar/v2/bin/checkpkg.d/checkpkg_test.py 2010-01-21 15:37:58 UTC (rev 8114) +++ csw/mgar/gar/v2/bin/checkpkg.d/checkpkg_test.py 2010-01-22 10:08:08 UTC (rev 8115) @@ -202,7 +202,7 @@ self.assertEquals(set([]), self.orphan_sonames) def testMissingDeps(self): - expected = set([u'SUNWcslx']) + expected = set([]) self.assertEquals(expected, self.missing_deps) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From trygvis at users.sourceforge.net Fri Jan 22 21:13:17 2010 From: trygvis at users.sourceforge.net (trygvis at users.sourceforge.net) Date: Fri, 22 Jan 2010 20:13:17 +0000 Subject: [csw-devel] SF.net SVN: gar:[8116] csw/mgar/pkg Message-ID: Revision: 8116 http://gar.svn.sourceforge.net/gar/?rev=8116&view=rev Author: trygvis Date: 2010-01-22 20:13:17 +0000 (Fri, 22 Jan 2010) Log Message: ----------- ngspice: Initial commit, seems to work. Added Paths: ----------- csw/mgar/pkg/ngspice/ csw/mgar/pkg/ngspice/branches/ csw/mgar/pkg/ngspice/tags/ csw/mgar/pkg/ngspice/trunk/ csw/mgar/pkg/ngspice/trunk/Makefile csw/mgar/pkg/ngspice/trunk/checksums csw/mgar/pkg/ngspice/trunk/files/ csw/mgar/pkg/ngspice/trunk/files/fix-missing-include-in-src-spicelib-parser-inpptree.c.patch Property changes on: csw/mgar/pkg/ngspice/trunk ___________________________________________________________________ Added: svn:ignore + cookies download work Added: svn:externals + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 Added: csw/mgar/pkg/ngspice/trunk/Makefile =================================================================== --- csw/mgar/pkg/ngspice/trunk/Makefile (rev 0) +++ csw/mgar/pkg/ngspice/trunk/Makefile 2010-01-22 20:13:17 UTC (rev 8116) @@ -0,0 +1,19 @@ +GARNAME = ngspice +GARVERSION = 20 +CATEGORIES = apps + + +DESCRIPTION = Brief description +define BLURB + Long description +endef + +MASTER_SITES = http://downloads.sourceforge.net/project/ngspice/ng-spice-rework/$(GARVERSION)/ +DISTFILES = ng-spice-rework-$(GARVERSION).tar.gz +PATCHFILES = fix-missing-include-in-src-spicelib-parser-inpptree.c.patch + +CONFIGURE_ARGS = $(DIRPATHS) + +TEST_SCRIPTS = + +include gar/category.mk Added: csw/mgar/pkg/ngspice/trunk/checksums =================================================================== --- csw/mgar/pkg/ngspice/trunk/checksums (rev 0) +++ csw/mgar/pkg/ngspice/trunk/checksums 2010-01-22 20:13:17 UTC (rev 8116) @@ -0,0 +1,2 @@ +fa207497c3b314dd79fc2cdc366a2b40 fix-missing-include-in-src-spicelib-parser-inpptree.c.patch +81bc667a4190ef31081a6957d3c7f7b5 ng-spice-rework-20.tar.gz Added: csw/mgar/pkg/ngspice/trunk/files/fix-missing-include-in-src-spicelib-parser-inpptree.c.patch =================================================================== --- csw/mgar/pkg/ngspice/trunk/files/fix-missing-include-in-src-spicelib-parser-inpptree.c.patch (rev 0) +++ csw/mgar/pkg/ngspice/trunk/files/fix-missing-include-in-src-spicelib-parser-inpptree.c.patch 2010-01-22 20:13:17 UTC (rev 8116) @@ -0,0 +1,12 @@ +diff -u -r ngspice-20.orig/src/spicelib/parser/inpptree.c ngspice-20/src/spicelib/parser/inpptree.c +--- ngspice-20.orig/src/spicelib/parser/inpptree.c 2010-01-19 01:07:08.590249587 +0100 ++++ ngspice-20/src/spicelib/parser/inpptree.c 2010-01-19 01:07:57.394826730 +0100 +@@ -10,6 +10,8 @@ + #include "inpptree.h" + #include "inp.h" + ++#include ++ + static INPparseNode *mkcon(double value); + static INPparseNode *mkb(int type, INPparseNode * left, + INPparseNode * right); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From chninkel at users.sourceforge.net Fri Jan 22 22:14:47 2010 From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net) Date: Fri, 22 Jan 2010 21:14:47 +0000 Subject: [csw-devel] SF.net SVN: gar:[8117] csw/mgar/pkg/bash/trunk Message-ID: Revision: 8117 http://gar.svn.sourceforge.net/gar/?rev=8117&view=rev Author: chninkel Date: 2010-01-22 21:14:47 +0000 (Fri, 22 Jan 2010) Log Message: ----------- bash: added patches 001 and 002 Modified Paths: -------------- csw/mgar/pkg/bash/trunk/Makefile csw/mgar/pkg/bash/trunk/checksums csw/mgar/pkg/bash/trunk/files/changelog.CSW Removed Paths: ------------- csw/mgar/pkg/bash/trunk/files/vsnprintf.patch Modified: csw/mgar/pkg/bash/trunk/Makefile =================================================================== --- csw/mgar/pkg/bash/trunk/Makefile 2010-01-22 20:13:17 UTC (rev 8116) +++ csw/mgar/pkg/bash/trunk/Makefile 2010-01-22 21:14:47 UTC (rev 8117) @@ -13,7 +13,7 @@ ###### Package information ####### GARNAME = bash -GARVERSION = 4.1.0 +GARVERSION = 4.1.2 CATEGORIES = devel DESCRIPTION = A sh-compatible command language interpreter @@ -67,8 +67,6 @@ # opencsw bash use /etc/bash.bashrc and /etc/bash.bash_logout files PATCHFILES += use_system_bashrc_and_logout.patch -# Temporary fix for vsnprintf definition -PATCHFILES += vsnprintf.patch ##### Build and installation information ##### Modified: csw/mgar/pkg/bash/trunk/checksums =================================================================== --- csw/mgar/pkg/bash/trunk/checksums 2010-01-22 20:13:17 UTC (rev 8116) +++ csw/mgar/pkg/bash/trunk/checksums 2010-01-22 21:14:47 UTC (rev 8117) @@ -1,6 +1,7 @@ f93b41b44ce6b023df65b72f00386ac5 CSWbash.prototype 9800d8724815fd84994d9be65ab5e7b8 bash-4.1.tar.gz -c2f23fbca9f119574b933d4f335a838d changelog.CSW +582dea5671b557f783e18629c2f77b68 bash41-001 +118d465095d4a4706eb1d34696a2666a bash41-002 +0cdd3f1f6e96a3307d83317231d9b170 changelog.CSW 60956e6be20f69dafbb06fcc83bab88e shells 29607316cff22f7427322d8f190cbadf use_system_bashrc_and_logout.patch -44859f2b196b79f037134d32c4ee79ea vsnprintf.patch Modified: csw/mgar/pkg/bash/trunk/files/changelog.CSW =================================================================== --- csw/mgar/pkg/bash/trunk/files/changelog.CSW 2010-01-22 20:13:17 UTC (rev 8116) +++ csw/mgar/pkg/bash/trunk/files/changelog.CSW 2010-01-22 21:14:47 UTC (rev 8117) @@ -1,3 +1,10 @@ +bash (4.1.02,REV=2010.01.07) unstable + + * Added bash patches bash41-001 and bash41-002. + * Removed patch vsnprintf.patch applied upstream. + + -- Yann Rouillard Fri, 22 Jan 2010 22:04:28 +0100 + bash (4.1,REV=2010.01.07) unstable * New upstream release. Deleted: csw/mgar/pkg/bash/trunk/files/vsnprintf.patch =================================================================== --- csw/mgar/pkg/bash/trunk/files/vsnprintf.patch 2010-01-22 20:13:17 UTC (rev 8116) +++ csw/mgar/pkg/bash/trunk/files/vsnprintf.patch 2010-01-22 21:14:47 UTC (rev 8117) @@ -1,15 +0,0 @@ -*** ../bash-4.1/builtins/printf.def 2009-11-20 15:31:23.000000000 -0500 ---- builtins/printf.def 2010-01-07 08:50:06.000000000 -0500 -*************** -*** 173,177 **** - - #if !HAVE_VSNPRINTF -! extern int vsnprintf __P((char *, size_t, const char *, ...)) __attribute__((__format__ (printf, 3, 4))); - #endif - ---- 173,177 ---- - - #if !HAVE_VSNPRINTF -! extern int vsnprintf __P((char *, size_t, const char *, va_list)) __attribute__((__format__ (printf, 3, 0))); - #endif - This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From chninkel at users.sourceforge.net Sat Jan 23 01:00:25 2010 From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net) Date: Sat, 23 Jan 2010 00:00:25 +0000 Subject: [csw-devel] SF.net SVN: gar:[8118] csw/mgar/pkg/bash/trunk Message-ID: Revision: 8118 http://gar.svn.sourceforge.net/gar/?rev=8118&view=rev Author: chninkel Date: 2010-01-23 00:00:25 +0000 (Sat, 23 Jan 2010) Log Message: ----------- bash: updated changelog.CSW Modified Paths: -------------- csw/mgar/pkg/bash/trunk/checksums csw/mgar/pkg/bash/trunk/files/changelog.CSW Modified: csw/mgar/pkg/bash/trunk/checksums =================================================================== --- csw/mgar/pkg/bash/trunk/checksums 2010-01-22 21:14:47 UTC (rev 8117) +++ csw/mgar/pkg/bash/trunk/checksums 2010-01-23 00:00:25 UTC (rev 8118) @@ -2,6 +2,6 @@ 9800d8724815fd84994d9be65ab5e7b8 bash-4.1.tar.gz 582dea5671b557f783e18629c2f77b68 bash41-001 118d465095d4a4706eb1d34696a2666a bash41-002 -0cdd3f1f6e96a3307d83317231d9b170 changelog.CSW +a3e2dc4ade9f1b1dafc8185e7f1c737e changelog.CSW 60956e6be20f69dafbb06fcc83bab88e shells 29607316cff22f7427322d8f190cbadf use_system_bashrc_and_logout.patch Modified: csw/mgar/pkg/bash/trunk/files/changelog.CSW =================================================================== --- csw/mgar/pkg/bash/trunk/files/changelog.CSW 2010-01-22 21:14:47 UTC (rev 8117) +++ csw/mgar/pkg/bash/trunk/files/changelog.CSW 2010-01-23 00:00:25 UTC (rev 8118) @@ -1,4 +1,4 @@ -bash (4.1.02,REV=2010.01.07) unstable +bash (4.1.02,REV=2010.01.23) unstable * Added bash patches bash41-001 and bash41-002. * Removed patch vsnprintf.patch applied upstream. This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Sat Jan 23 10:58:11 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Sat, 23 Jan 2010 09:58:11 +0000 Subject: [csw-devel] SF.net SVN: gar:[8119] csw/mgar/pkg/xerces-c/trunk/Makefile Message-ID: Revision: 8119 http://gar.svn.sourceforge.net/gar/?rev=8119&view=rev Author: dmichelsen Date: 2010-01-23 09:58:11 +0000 (Sat, 23 Jan 2010) Log Message: ----------- xerces-c: Fix test target Modified Paths: -------------- csw/mgar/pkg/xerces-c/trunk/Makefile Modified: csw/mgar/pkg/xerces-c/trunk/Makefile =================================================================== --- csw/mgar/pkg/xerces-c/trunk/Makefile 2010-01-23 00:00:25 UTC (rev 8118) +++ csw/mgar/pkg/xerces-c/trunk/Makefile 2010-01-23 09:58:11 UTC (rev 8119) @@ -26,4 +26,6 @@ BUILD64 = 1 CONFIGURE_ARGS = $(DIRPATHS) +TEST_TARGET = check + include gar/category.mk This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Sat Jan 23 14:43:57 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Sat, 23 Jan 2010 13:43:57 +0000 Subject: [csw-devel] SF.net SVN: gar:[8120] csw/mgar/pkg/tcpwrappers/trunk/Makefile Message-ID: Revision: 8120 http://gar.svn.sourceforge.net/gar/?rev=8120&view=rev Author: dmichelsen Date: 2010-01-23 13:43:56 +0000 (Sat, 23 Jan 2010) Log Message: ----------- tcpwrap: Add file migration from /opt/csw/etc to /etc/opt/csw Modified Paths: -------------- csw/mgar/pkg/tcpwrappers/trunk/Makefile Modified: csw/mgar/pkg/tcpwrappers/trunk/Makefile =================================================================== --- csw/mgar/pkg/tcpwrappers/trunk/Makefile 2010-01-23 09:58:11 UTC (rev 8119) +++ csw/mgar/pkg/tcpwrappers/trunk/Makefile 2010-01-23 13:43:56 UTC (rev 8120) @@ -71,6 +71,8 @@ MERGE_SCRIPTS_isa-amd64-extended-on = copy-relocated-only MERGE_DIRS_isa-amd64-extended-on = $(libdir) +MIGRATE_FILES = hosts.allow hosts.deny + include gar/category.mk build-custom: This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bensons at users.sourceforge.net Sat Jan 23 18:03:21 2010 From: bensons at users.sourceforge.net (bensons at users.sourceforge.net) Date: Sat, 23 Jan 2010 17:03:21 +0000 Subject: [csw-devel] SF.net SVN: gar:[8121] csw/mgar/pkg/xpdf/trunk Message-ID: Revision: 8121 http://gar.svn.sourceforge.net/gar/?rev=8121&view=rev Author: bensons Date: 2010-01-23 17:03:21 +0000 (Sat, 23 Jan 2010) Log Message: ----------- bumped to xpdf-3.02pl4 Modified Paths: -------------- csw/mgar/pkg/xpdf/trunk/Makefile csw/mgar/pkg/xpdf/trunk/checksums Added Paths: ----------- csw/mgar/pkg/xpdf/trunk/files/xpdf-3.02pl4.patch Modified: csw/mgar/pkg/xpdf/trunk/Makefile =================================================================== --- csw/mgar/pkg/xpdf/trunk/Makefile 2010-01-23 13:43:56 UTC (rev 8120) +++ csw/mgar/pkg/xpdf/trunk/Makefile 2010-01-23 17:03:21 UTC (rev 8121) @@ -1,7 +1,7 @@ GARNAME = xpdf GARVERSION = 3.02 CATEGORIES = utils -RELEASE = rev=p3 +RELEASE = rev=p4 DESCRIPTION = Open source viewer for Portable Document Format (PDF) files define BLURB @@ -34,6 +34,7 @@ PATCHFILES = xpdf-3.02pl1.patch PATCHFILES += xpdf-3.02pl2.patch PATCHFILES += xpdf-3.02pl3.patch +PATCHFILES += xpdf-3.02pl4.patch PATCHFILES += patch-GString.cc PATCHFILES += patch-XPDFCore.cc Modified: csw/mgar/pkg/xpdf/trunk/checksums =================================================================== --- csw/mgar/pkg/xpdf/trunk/checksums 2010-01-23 13:43:56 UTC (rev 8120) +++ csw/mgar/pkg/xpdf/trunk/checksums 2010-01-23 17:03:21 UTC (rev 8121) @@ -1,6 +1,7 @@ -28cd772ed42159f2dbbe3a0e8e9e4dfa download/patch-GString.cc -4c23bc375fbb6096fb8b2266d0ef527d download/patch-XPDFCore.cc -599dc4cc65a07ee868cf92a667a913d2 download/xpdf-3.02.tar.gz -877118786dfe27d1b7aa5a6759cc6e45 download/xpdf-3.02pl1.patch -3a5cb165ae66781e0b21e6219ae06795 download/xpdf-3.02pl2.patch -581963ede0fb5715e1a69f01b5b8ce63 download/xpdf-3.02pl3.patch +28cd772ed42159f2dbbe3a0e8e9e4dfa patch-GString.cc +4c23bc375fbb6096fb8b2266d0ef527d patch-XPDFCore.cc +599dc4cc65a07ee868cf92a667a913d2 xpdf-3.02.tar.gz +877118786dfe27d1b7aa5a6759cc6e45 xpdf-3.02pl1.patch +3a5cb165ae66781e0b21e6219ae06795 xpdf-3.02pl2.patch +581963ede0fb5715e1a69f01b5b8ce63 xpdf-3.02pl3.patch +70b752716798dd341a4bf890df5f6fdc xpdf-3.02pl4.patch Added: csw/mgar/pkg/xpdf/trunk/files/xpdf-3.02pl4.patch =================================================================== --- csw/mgar/pkg/xpdf/trunk/files/xpdf-3.02pl4.patch (rev 0) +++ csw/mgar/pkg/xpdf/trunk/files/xpdf-3.02pl4.patch 2010-01-23 17:03:21 UTC (rev 8121) @@ -0,0 +1,282 @@ +*** xpdf-3.02.orig/xpdf/Stream.cc Fri Jul 24 14:30:46 2009 +--- xpdf-3.02/xpdf/Stream.cc Mon Oct 5 11:07:49 2009 +*************** +*** 323,328 **** +--- 323,332 ---- + } else { + imgLineSize = nVals; + } ++ if (width > INT_MAX / nComps) { ++ // force a call to gmallocn(-1,...), which will throw an exception ++ imgLineSize = -1; ++ } + imgLine = (Guchar *)gmallocn(imgLineSize, sizeof(Guchar)); + imgIdx = nVals; + } +*** xpdf-3.02.orig/xpdf/PSOutputDev.cc Tue Feb 27 14:05:52 2007 +--- xpdf-3.02/xpdf/PSOutputDev.cc Fri Oct 2 12:38:58 2009 +*************** +*** 4301,4307 **** + width, -height, height); + + // allocate a line buffer +! lineBuf = (Guchar *)gmalloc(4 * width); + + // set up to process the data stream + imgStr = new ImageStream(str, width, colorMap->getNumPixelComps(), +--- 4301,4307 ---- + width, -height, height); + + // allocate a line buffer +! lineBuf = (Guchar *)gmallocn(width, 4); + + // set up to process the data stream + imgStr = new ImageStream(str, width, colorMap->getNumPixelComps(), +diff -r -c xpdf-3.02.orig/splash/Splash.cc xpdf-3.02/splash/Splash.cc +*** xpdf-3.02.orig/splash/Splash.cc Tue Feb 27 14:05:52 2007 +--- xpdf-3.02/splash/Splash.cc Fri Aug 14 14:05:08 2009 +*************** +*** 12,17 **** +--- 12,18 ---- + + #include + #include ++ #include + #include "gmem.h" + #include "SplashErrorCodes.h" + #include "SplashMath.h" +*************** +*** 1912,1918 **** + xq = w % scaledWidth; + + // allocate pixel buffer +! pixBuf = (SplashColorPtr)gmalloc((yp + 1) * w); + + // initialize the pixel pipe + pipeInit(&pipe, 0, 0, state->fillPattern, NULL, state->fillAlpha, +--- 1913,1922 ---- + xq = w % scaledWidth; + + // allocate pixel buffer +! if (yp < 0 || yp > INT_MAX - 1) { +! return splashErrBadArg; +! } +! pixBuf = (SplashColorPtr)gmallocn(yp + 1, w); + + // initialize the pixel pipe + pipeInit(&pipe, 0, 0, state->fillPattern, NULL, state->fillAlpha, +*************** +*** 2208,2216 **** + xq = w % scaledWidth; + + // allocate pixel buffers +! colorBuf = (SplashColorPtr)gmalloc((yp + 1) * w * nComps); + if (srcAlpha) { +! alphaBuf = (Guchar *)gmalloc((yp + 1) * w); + } else { + alphaBuf = NULL; + } +--- 2212,2223 ---- + xq = w % scaledWidth; + + // allocate pixel buffers +! if (yp < 0 || yp > INT_MAX - 1 || w > INT_MAX / nComps) { +! return splashErrBadArg; +! } +! colorBuf = (SplashColorPtr)gmallocn(yp + 1, w * nComps); + if (srcAlpha) { +! alphaBuf = (Guchar *)gmallocn(yp + 1, w); + } else { + alphaBuf = NULL; + } +diff -r -c xpdf-3.02.orig/splash/SplashErrorCodes.h xpdf-3.02/splash/SplashErrorCodes.h +*** xpdf-3.02.orig/splash/SplashErrorCodes.h Tue Feb 27 14:05:52 2007 +--- xpdf-3.02/splash/SplashErrorCodes.h Fri Aug 14 14:03:46 2009 +*************** +*** 29,32 **** +--- 29,34 ---- + + #define splashErrSingularMatrix 8 // matrix is singular + ++ #define splashErrBadArg 9 // bad argument ++ + #endif +*** xpdf-3.02.orig/splash/SplashBitmap.cc Tue Feb 27 14:05:52 2007 +--- xpdf-3.02/splash/SplashBitmap.cc Wed Aug 19 14:55:39 2009 +*************** +*** 11,16 **** +--- 11,17 ---- + #endif + + #include ++ #include + #include "gmem.h" + #include "SplashErrorCodes.h" + #include "SplashBitmap.h" +*************** +*** 27,56 **** + mode = modeA; + switch (mode) { + case splashModeMono1: +! rowSize = (width + 7) >> 3; + break; + case splashModeMono8: +! rowSize = width; + break; + case splashModeRGB8: + case splashModeBGR8: +! rowSize = width * 3; + break; + #if SPLASH_CMYK + case splashModeCMYK8: +! rowSize = width * 4; + break; + #endif + } +! rowSize += rowPad - 1; +! rowSize -= rowSize % rowPad; +! data = (SplashColorPtr)gmalloc(rowSize * height); + if (!topDown) { + data += (height - 1) * rowSize; + rowSize = -rowSize; + } + if (alphaA) { +! alpha = (Guchar *)gmalloc(width * height); + } else { + alpha = NULL; + } +--- 28,75 ---- + mode = modeA; + switch (mode) { + case splashModeMono1: +! if (width > 0) { +! rowSize = (width + 7) >> 3; +! } else { +! rowSize = -1; +! } + break; + case splashModeMono8: +! if (width > 0) { +! rowSize = width; +! } else { +! rowSize = -1; +! } + break; + case splashModeRGB8: + case splashModeBGR8: +! if (width > 0 && width <= INT_MAX / 3) { +! rowSize = width * 3; +! } else { +! rowSize = -1; +! } + break; + #if SPLASH_CMYK + case splashModeCMYK8: +! if (width > 0 && width <= INT_MAX / 4) { +! rowSize = width * 4; +! } else { +! rowSize = -1; +! } + break; + #endif + } +! if (rowSize > 0) { +! rowSize += rowPad - 1; +! rowSize -= rowSize % rowPad; +! } +! data = (SplashColorPtr)gmallocn(height, rowSize); + if (!topDown) { + data += (height - 1) * rowSize; + rowSize = -rowSize; + } + if (alphaA) { +! alpha = (Guchar *)gmallocn(width, height); + } else { + alpha = NULL; + } +*** xpdf-3.02.orig/xpdf/XRef.cc Tue Feb 27 14:05:52 2007 +--- xpdf-3.02/xpdf/XRef.cc Tue Oct 13 11:57:24 2009 +*************** +*** 52,57 **** +--- 52,59 ---- + // generation 0. + ObjectStream(XRef *xref, int objStrNumA); + ++ GBool isOk() { return ok; } ++ + ~ObjectStream(); + + // Return the object number of this object stream. +*************** +*** 67,72 **** +--- 69,75 ---- + int nObjects; // number of objects in the stream + Object *objs; // the objects (length = nObjects) + int *objNums; // the object numbers (length = nObjects) ++ GBool ok; + }; + + ObjectStream::ObjectStream(XRef *xref, int objStrNumA) { +*************** +*** 80,85 **** +--- 83,89 ---- + nObjects = 0; + objs = NULL; + objNums = NULL; ++ ok = gFalse; + + if (!xref->fetch(objStrNum, 0, &objStr)->isStream()) { + goto err1; +*************** +*** 105,110 **** +--- 109,121 ---- + goto err1; + } + ++ // this is an arbitrary limit to avoid integer overflow problems ++ // in the 'new Object[nObjects]' call (Acrobat apparently limits ++ // object streams to 100-200 objects) ++ if (nObjects > 1000000) { ++ error(-1, "Too many objects in an object stream"); ++ goto err1; ++ } + objs = new Object[nObjects]; + objNums = (int *)gmallocn(nObjects, sizeof(int)); + offsets = (int *)gmallocn(nObjects, sizeof(int)); +*************** +*** 161,170 **** + } + + gfree(offsets); + + err1: + objStr.free(); +- return; + } + + ObjectStream::~ObjectStream() { +--- 172,181 ---- + } + + gfree(offsets); ++ ok = gTrue; + + err1: + objStr.free(); + } + + ObjectStream::~ObjectStream() { +*************** +*** 837,842 **** +--- 848,858 ---- + delete objStr; + } + objStr = new ObjectStream(this, e->offset); ++ if (!objStr->isOk()) { ++ delete objStr; ++ objStr = NULL; ++ goto err; ++ } + } + objStr->getObject(e->gen, num, obj); + break; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bensons at users.sourceforge.net Sat Jan 23 18:54:18 2010 From: bensons at users.sourceforge.net (bensons at users.sourceforge.net) Date: Sat, 23 Jan 2010 17:54:18 +0000 Subject: [csw-devel] SF.net SVN: gar:[8122] csw/mgar/pkg/xpdf/trunk/Makefile Message-ID: Revision: 8122 http://gar.svn.sourceforge.net/gar/?rev=8122&view=rev Author: bensons Date: 2010-01-23 17:54:00 +0000 (Sat, 23 Jan 2010) Log Message: ----------- adjust the package name Modified Paths: -------------- csw/mgar/pkg/xpdf/trunk/Makefile Modified: csw/mgar/pkg/xpdf/trunk/Makefile =================================================================== --- csw/mgar/pkg/xpdf/trunk/Makefile 2010-01-23 17:03:21 UTC (rev 8121) +++ csw/mgar/pkg/xpdf/trunk/Makefile 2010-01-23 17:54:00 UTC (rev 8122) @@ -1,7 +1,7 @@ GARNAME = xpdf GARVERSION = 3.02 CATEGORIES = utils -RELEASE = rev=p4 +RELEASE = p4 DESCRIPTION = Open source viewer for Portable Document Format (PDF) files define BLURB @@ -42,7 +42,7 @@ TEST_SCRIPTS = include gar/category.mk -SPKG_REVSTAMP := $(SPKG_REVSTAMP)_$(RELEASE) +SPKG_VERSION := $(SPKG_VERSION)$(RELEASE) pre-build-modulated: @cp files/xpdfrc ${WORKSRC}/doc/sample-xpdfrc This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bensons at users.sourceforge.net Sat Jan 23 19:51:36 2010 From: bensons at users.sourceforge.net (bensons at users.sourceforge.net) Date: Sat, 23 Jan 2010 18:51:36 +0000 Subject: [csw-devel] SF.net SVN: gar:[8123] csw/mgar/pkg/pureftpd/trunk Message-ID: Revision: 8123 http://gar.svn.sourceforge.net/gar/?rev=8123&view=rev Author: bensons Date: 2010-01-23 18:51:35 +0000 (Sat, 23 Jan 2010) Log Message: ----------- bump to version 1.0.27 Modified Paths: -------------- csw/mgar/pkg/pureftpd/trunk/Makefile csw/mgar/pkg/pureftpd/trunk/checksums Modified: csw/mgar/pkg/pureftpd/trunk/Makefile =================================================================== --- csw/mgar/pkg/pureftpd/trunk/Makefile 2010-01-23 17:54:00 UTC (rev 8122) +++ csw/mgar/pkg/pureftpd/trunk/Makefile 2010-01-23 18:51:35 UTC (rev 8123) @@ -1,5 +1,5 @@ GARNAME = pureftpd -GARVERSION = 1.0.22 +GARVERSION = 1.0.27 CATEGORIES = net SRCNAME = pure-ftpd Modified: csw/mgar/pkg/pureftpd/trunk/checksums =================================================================== --- csw/mgar/pkg/pureftpd/trunk/checksums 2010-01-23 17:54:00 UTC (rev 8122) +++ csw/mgar/pkg/pureftpd/trunk/checksums 2010-01-23 18:51:35 UTC (rev 8123) @@ -1 +1 @@ -51857369794ba5d305e37bec55eb06c5 download/pure-ftpd-1.0.22.tar.gz +63bc52cfbcf99aae84f9b6472ed31ae1 pure-ftpd-1.0.27.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Sat Jan 23 21:34:29 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Sat, 23 Jan 2010 20:34:29 +0000 Subject: [csw-devel] SF.net SVN: gar:[8124] csw/mgar/gar/v2-dirpackage/ Message-ID: Revision: 8124 http://gar.svn.sourceforge.net/gar/?rev=8124&view=rev Author: dmichelsen Date: 2010-01-23 20:34:29 +0000 (Sat, 23 Jan 2010) Log Message: ----------- mGAR v2: Make dirpackage branch Added Paths: ----------- csw/mgar/gar/v2-dirpackage/ Property changes on: csw/mgar/gar/v2-dirpackage ___________________________________________________________________ Added: svn:mergeinfo + /csw/mgar/gar/v2:4936-6678 /csw/mgar/gar/v2-checkpkg:7722-7855 /csw/mgar/gar/v2-collapsed-modulations:6895 /csw/mgar/gar/v2-migrateconf:7082-7211 /csw/mgar/gar/v2-skayser:6087-6132 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Sat Jan 23 21:38:05 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Sat, 23 Jan 2010 20:38:05 +0000 Subject: [csw-devel] SF.net SVN: gar:[8125] csw/mgar/gar/v2/categories/cpan/category.mk Message-ID: Revision: 8125 http://gar.svn.sourceforge.net/gar/?rev=8125&view=rev Author: dmichelsen Date: 2010-01-23 20:38:04 +0000 (Sat, 23 Jan 2010) Log Message: ----------- mGAR v2: Add PERLBUILD_INSTALL_ARGS Modified Paths: -------------- csw/mgar/gar/v2/categories/cpan/category.mk Modified: csw/mgar/gar/v2/categories/cpan/category.mk =================================================================== --- csw/mgar/gar/v2/categories/cpan/category.mk 2010-01-23 20:34:29 UTC (rev 8124) +++ csw/mgar/gar/v2/categories/cpan/category.mk 2010-01-23 20:38:04 UTC (rev 8125) @@ -88,9 +88,10 @@ @( cd $* ; $(TEST_ENV) ./Build test ) @$(MAKECOOKIE) +PERLBUILD_INSTALL_ARGS ?= destdir=$(DESTDIR) $(EXTRA_PERLBUILD_INSTALL_ARGS) install-%/Build: @echo " ==> Running Build install in $*" - @( cd $* ; $(INSTALL_ENV) ./Build install destdir=$(DESTDIR) ) + ( cd $* ; $(INSTALL_ENV) ./Build install $(PERLBUILD_INSTALL_ARGS) ) @$(MAKECOOKIE) # Check for a CPAN module version update This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Sat Jan 23 21:45:12 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Sat, 23 Jan 2010 20:45:12 +0000 Subject: [csw-devel] SF.net SVN: gar:[8126] csw/mgar/gar/v2-dirpackage/gar.pkg.mk Message-ID: Revision: 8126 http://gar.svn.sourceforge.net/gar/?rev=8126&view=rev Author: dmichelsen Date: 2010-01-23 20:45:12 +0000 (Sat, 23 Jan 2010) Log Message: ----------- mGAR v2 dirpackage: Add new target 'dirpackage' Modified Paths: -------------- csw/mgar/gar/v2-dirpackage/gar.pkg.mk Modified: csw/mgar/gar/v2-dirpackage/gar.pkg.mk =================================================================== --- csw/mgar/gar/v2-dirpackage/gar.pkg.mk 2010-01-23 20:38:04 UTC (rev 8125) +++ csw/mgar/gar/v2-dirpackage/gar.pkg.mk 2010-01-23 20:45:12 UTC (rev 8126) @@ -693,7 +693,7 @@ # We depend on extract as the additional package files (like .gspec) must be # unpacked to global/ for packaging. E. g. 'merge' depends only on the specific # modulations and does not fill global/. -ENABLE_CHECK ?= 1 +_package: ENABLE_CHECK ?= 1 _package: validateplatform extract-global merge $(SPKG_DESTDIRS) pre-package $(PACKAGE_TARGETS) post-package $(if $(ENABLE_CHECK),pkgcheck) @$(MAKECOOKIE) @@ -705,6 +705,18 @@ @echo @$(DONADA) +dirpackage: _DIRPACKAGE=1 +dirpackage: ENABLE_CHECK= +dirpackage: _package + @echo "The following packages have been built:" + @echo + @$(MAKE) -s PLATFORM=$(PLATFORM) _dirpkgshow + @echo + @$(DONADA) + +_dirpkgshow: + @$(foreach SPEC,$(_PKG_SPECS),echo " $(SPKG_SPOOLDIR)/$(SPEC)";) + _pkgshow: @$(foreach SPEC,$(_PKG_SPECS),printf " %-20s %s\n" $(SPEC) $(SPKG_EXPORT)/$(shell $(call _PKG_ENV,$(SPEC)) $(GARBIN)/mkpackage -qs $(WORKDIR)/$(SPEC).gspec -D pkgfile).gz;) @@ -720,7 +732,7 @@ --pkgbase $(SPKG_PKGBASE) \ --pkgroot $(SPKG_PKGROOT) \ -v WORKDIR_FIRSTMOD=../build-$(firstword $(MODULATIONS)) \ - --compress \ + $(if $(_DIRPACKAGE),--notransfer --nocompress,--compress) \ $(MKPACKAGE_ARGS) ) || exit 2 @$(MAKECOOKIE) @@ -754,6 +766,8 @@ repackage: pkgreset package +redirpackage: pkgreset dirpackage + # This rule automatically logs into every host where a package for this software should # be built. It is especially suited for automated build bots. platforms: This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bensons at users.sourceforge.net Sat Jan 23 23:25:06 2010 From: bensons at users.sourceforge.net (bensons at users.sourceforge.net) Date: Sat, 23 Jan 2010 22:25:06 +0000 Subject: [csw-devel] SF.net SVN: gar:[8127] csw/mgar/pkg/pureftpd/trunk/Makefile Message-ID: Revision: 8127 http://gar.svn.sourceforge.net/gar/?rev=8127&view=rev Author: bensons Date: 2010-01-23 22:24:56 +0000 (Sat, 23 Jan 2010) Log Message: ----------- include example config Modified Paths: -------------- csw/mgar/pkg/pureftpd/trunk/Makefile Modified: csw/mgar/pkg/pureftpd/trunk/Makefile =================================================================== --- csw/mgar/pkg/pureftpd/trunk/Makefile 2010-01-23 20:45:12 UTC (rev 8126) +++ csw/mgar/pkg/pureftpd/trunk/Makefile 2010-01-23 22:24:56 UTC (rev 8127) @@ -1,3 +1,9 @@ +# known build facts +# +# no linkage against +# - ldap +# - mysql +# - pgsql GARNAME = pureftpd GARVERSION = 1.0.27 CATEGORIES = net @@ -40,6 +46,9 @@ # No test suite available TEST_SCRIPTS = +sysconfdir = /etc/opt/csw +SAMPLECONF = $(sysconfdir)/$(SRCNAME)/*.conf + include gar/category.mk # make sure, the linker uses libcrypt before libssl @@ -57,7 +66,19 @@ # create config directory pre-install-modulated: ginstall -d $(DESTDIR)$(sysconfdir)/$(SRCNAME) + ginstall -d $(DESTDIR)$(docdir)/$(SRCNAME) ginstall -d $(DESTDIR)/var/opt/csw/run perl -pi -e 's@/var/run@/var/opt/csw/run@' ${WORKSRC}/src/ftpd.h perl -pi -e 's@/var/run@/var/opt/csw/run@' ${WORKSRC}/src/ftpwho-update.h perl -pi -e 's@/var/run@/var/opt/csw/run@' ${WORKSRC}/src/upload-pipe.h + @$(MAKECOOKIE) + +conf-list = $(WORKSRC)/pureftpd-ldap.conf +conf-list += $(WORKSRC)/pureftpd-mysql.conf +conf-list += $(WORKSRC)/pureftpd-pgsql.conf +post-install-modulated: + ( for file in $(conf-list) ; do \ + ginstall -m 644 $$file $(DESTDIR)$(sysconfdir)/$(SRCNAME) ; \ + done ) + ginstall -m 644 $(WORKSRC)/pureftpd.schema $(DESTDIR)$(docdir)/$(SRCNAME) + @$(MAKECOOKIE) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bensons at users.sourceforge.net Sun Jan 24 00:44:01 2010 From: bensons at users.sourceforge.net (bensons at users.sourceforge.net) Date: Sat, 23 Jan 2010 23:44:01 +0000 Subject: [csw-devel] SF.net SVN: gar:[8128] csw/mgar/pkg/siege/trunk Message-ID: Revision: 8128 http://gar.svn.sourceforge.net/gar/?rev=8128&view=rev Author: bensons Date: 2010-01-23 23:44:00 +0000 (Sat, 23 Jan 2010) Log Message: ----------- bump to version 2.69 Modified Paths: -------------- csw/mgar/pkg/siege/trunk/Makefile csw/mgar/pkg/siege/trunk/checksums csw/mgar/pkg/siege/trunk/files/patch-configure Added Paths: ----------- csw/mgar/pkg/siege/trunk/files/patch-auth.c Modified: csw/mgar/pkg/siege/trunk/Makefile =================================================================== --- csw/mgar/pkg/siege/trunk/Makefile 2010-01-23 22:24:56 UTC (rev 8127) +++ csw/mgar/pkg/siege/trunk/Makefile 2010-01-23 23:44:00 UTC (rev 8128) @@ -1,5 +1,5 @@ GARNAME = siege -GARVERSION = 2.66 +GARVERSION = 2.69 CATEGORIES = xtra DESCRIPTION = A http regression testing and benchmarking utility @@ -26,6 +26,7 @@ # patch bombardment PATCHFILES = patch-bombardment.in PATCHFILES += patch-configure +PATCHFILES += patch-auth.c CONFIGURE_ARGS = $(DIRPATHS) CONFIGURE_ARGS += --with-ssl=$(prefix) @@ -37,6 +38,10 @@ include gar/category.mk +pre-configure-modulated: + gsed -ie 's,^LIBTOOL=.*,LIBTOOL=/opt/csw/bin/libtool,' \ + $(WORKSRC)/configure + x-post-configure-modulated: find $(WORKSRC) -name Makefile | xargs grep -l '^CFLAGS' \ | xargs perl -pi -e 's at CFLAGS =@CFLAGS = $(CFLAGS)@' Modified: csw/mgar/pkg/siege/trunk/checksums =================================================================== --- csw/mgar/pkg/siege/trunk/checksums 2010-01-23 22:24:56 UTC (rev 8127) +++ csw/mgar/pkg/siege/trunk/checksums 2010-01-23 23:44:00 UTC (rev 8128) @@ -1,3 +1,4 @@ -4acf8817dc68474af49acd8a73353559 download/patch-bombardment.in -e71b9d49cf017469f779448b32102468 download/patch-configure -a5592e42d4217572d8035dec000f479c download/siege-2.66.tar.gz +8921c3aa03b87a4c02ac977bee5f415e patch-auth.c +4acf8817dc68474af49acd8a73353559 patch-bombardment.in +a48a4fb226a52894fdf59d0e0f67cf06 patch-configure +77190ad255dfa14232137d03fd0d994b siege-2.69.tar.gz Added: csw/mgar/pkg/siege/trunk/files/patch-auth.c =================================================================== --- csw/mgar/pkg/siege/trunk/files/patch-auth.c (rev 0) +++ csw/mgar/pkg/siege/trunk/files/patch-auth.c 2010-01-23 23:44:00 UTC (rev 8128) @@ -0,0 +1,11 @@ +--- siege-2.69.orig/src/auth.c 2008-08-19 15:53:31.000000000 +0200 ++++ siege-2.69/src/auth.c 2010-01-24 00:37:36.433891267 +0100 +@@ -491,7 +491,7 @@ + } + } + else { +- fprintf(stderr, "invalid call to %s algorithm is [%s]\n", __FUNCTION__, challenge->algorithm); ++ fprintf(stderr, "invalid call to %s algorithm is [%s]\n", __func__, challenge->algorithm); + return NULL; + } + Modified: csw/mgar/pkg/siege/trunk/files/patch-configure =================================================================== --- csw/mgar/pkg/siege/trunk/files/patch-configure 2010-01-23 22:24:56 UTC (rev 8127) +++ csw/mgar/pkg/siege/trunk/files/patch-configure 2010-01-23 23:44:00 UTC (rev 8128) @@ -1,6 +1,6 @@ ---- siege-2.66.orig/configure 2007-03-29 20:07:30.000000000 +0200 -+++ siege-2.66/configure 2009-07-22 17:21:11.798205557 +0200 -@@ -20688,9 +20688,8 @@ +--- siege-2.69.orig/configure 2009-05-08 19:59:04.000000000 +0200 ++++ siege-2.69/configure 2010-01-23 23:56:00.558503364 +0100 +@@ -19745,9 +19745,8 @@ ;; esac @@ -11,7 +11,7 @@ echo "$as_me:$LINENO: checking for buggy pthread mutex initializers" >&5 echo $ECHO_N "checking for buggy pthread mutex initializers... $ECHO_C" >&6 -@@ -26980,9 +26979,9 @@ +@@ -26094,9 +26093,9 @@ AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir" prefix=$prefix sysconfdir=$sysconfdir localstatedir=$localstatedir VERSION=$VERSION DATE="$DATE" PROGRAM="$PROGRAM" AUTHOR="$AUTHOR" EMAIL="$EMAIL" @@ -24,10 +24,10 @@ PLATFORM=$PLATFORM _ACEOF -@@ -27891,7 +27890,7 @@ - +@@ -27008,7 +27007,7 @@ #define SIEGE_HOME "$prefix" - #define CNF_FILE "$sysconfdir/urls.txt" + #define URL_FILE "$sysconfdir/urls.txt" + #define CNF_FILE "$sysconfdir/siegerc" -#define LOG_FILE "$localstatedir/siege.log" +#define LOG_FILE "$localstatedir/log/siege.log" This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Sun Jan 24 00:49:43 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Sat, 23 Jan 2010 23:49:43 +0000 Subject: [csw-devel] SF.net SVN: gar:[8129] csw/mgar/gar/v2/gar.mk Message-ID: Revision: 8129 http://gar.svn.sourceforge.net/gar/?rev=8129&view=rev Author: dmichelsen Date: 2010-01-23 23:49:42 +0000 (Sat, 23 Jan 2010) Log Message: ----------- mGAR v2: Call garchive per default on makesum target Modified Paths: -------------- csw/mgar/gar/v2/gar.mk Modified: csw/mgar/gar/v2/gar.mk =================================================================== --- csw/mgar/gar/v2/gar.mk 2010-01-23 23:44:00 UTC (rev 8128) +++ csw/mgar/gar/v2/gar.mk 2010-01-23 23:49:42 UTC (rev 8129) @@ -356,9 +356,11 @@ @$(foreach COOKIEFILE,$(CHECKSUM_TARGETS), test -e $(COOKIEDIR)/$(COOKIEFILE) ;) # makesum - Generate distinfo (only do this for your own ports!). +GARCHIVE_TARGETS = $(addprefix $(GARCHIVEDIR)/,$(filter-out $(ALLFILES_DYNSCRIPTS), $(ALLFILES))) + MAKESUM_TARGETS = $(filter-out $(_NOCHECKSUM) $(NOCHECKSUM),$(ALLFILES)) -makesum: fetch $(addprefix $(DOWNLOADDIR)/,$(MAKESUM_TARGETS)) +makesum: fetch $(addprefix $(DOWNLOADDIR)/,$(MAKESUM_TARGETS)) $(GARCHIVE_TARGETS) @if test "x$(MAKESUM_TARGETS)" != "x "; then \ (cd $(DOWNLOADDIR) && gmd5sum $(MAKESUM_TARGETS)) > $(CHECKSUM_FILE) ; \ echo "Checksums made for $(MAKESUM_TARGETS)" ; \ @@ -368,8 +370,6 @@ # I am always typing this by mistake makesums: makesum -GARCHIVE_TARGETS = $(addprefix $(GARCHIVEDIR)/,$(filter-out $(ALLFILES_DYNSCRIPTS), $(ALLFILES))) - garchive: checksum $(GARCHIVE_TARGETS) ; # extract - Unpacks $(DISTFILES) into $(EXTRACTDIR) (patches are "zcatted" into the patch program) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Sun Jan 24 00:56:45 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Sat, 23 Jan 2010 23:56:45 +0000 Subject: [csw-devel] SF.net SVN: gar:[8130] csw/mgar/pkg/cpan/Unix-Statgrab/trunk/Makefile Message-ID: Revision: 8130 http://gar.svn.sourceforge.net/gar/?rev=8130&view=rev Author: dmichelsen Date: 2010-01-23 23:56:45 +0000 (Sat, 23 Jan 2010) Log Message: ----------- cpan/Unix-Statgrab: Fix configure args Modified Paths: -------------- csw/mgar/pkg/cpan/Unix-Statgrab/trunk/Makefile Modified: csw/mgar/pkg/cpan/Unix-Statgrab/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/Unix-Statgrab/trunk/Makefile 2010-01-23 23:49:42 UTC (rev 8129) +++ csw/mgar/pkg/cpan/Unix-Statgrab/trunk/Makefile 2010-01-23 23:56:45 UTC (rev 8130) @@ -13,4 +13,6 @@ REQUIRED_PKGS = CSWlibstatgrab PREREQUISITE_PKGS = $(REQUIRED_PKGS) +EXTRA_PERL_CONFIGURE_ARGS = CC=$(CC) LIBS="-L$(libdir) -lstatgrab -lperl" INC="-I$(includedir)" + include gar/category.mk This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bensons at users.sourceforge.net Sun Jan 24 01:00:33 2010 From: bensons at users.sourceforge.net (bensons at users.sourceforge.net) Date: Sun, 24 Jan 2010 00:00:33 +0000 Subject: [csw-devel] SF.net SVN: gar:[8131] csw/mgar/pkg/siege/trunk/Makefile Message-ID: Revision: 8131 http://gar.svn.sourceforge.net/gar/?rev=8131&view=rev Author: bensons Date: 2010-01-24 00:00:33 +0000 (Sun, 24 Jan 2010) Log Message: ----------- siege: cleanup Makefile Modified Paths: -------------- csw/mgar/pkg/siege/trunk/Makefile Modified: csw/mgar/pkg/siege/trunk/Makefile =================================================================== --- csw/mgar/pkg/siege/trunk/Makefile 2010-01-23 23:56:45 UTC (rev 8130) +++ csw/mgar/pkg/siege/trunk/Makefile 2010-01-24 00:00:33 UTC (rev 8131) @@ -21,7 +21,7 @@ REQUIRED_PKGS = CSWosslrt # handle config file -PRESERVECONF = $(sysconfdir)/urls.txt.CSW +PRESERVECONF = $(sysconfdir)/urls.txt # patch bombardment PATCHFILES = patch-bombardment.in @@ -41,10 +41,12 @@ pre-configure-modulated: gsed -ie 's,^LIBTOOL=.*,LIBTOOL=/opt/csw/bin/libtool,' \ $(WORKSRC)/configure + @$(MAKECOOKIE) x-post-configure-modulated: find $(WORKSRC) -name Makefile | xargs grep -l '^CFLAGS' \ | xargs perl -pi -e 's at CFLAGS =@CFLAGS = $(CFLAGS)@' + @$(MAKECOOKIE) # install is broken.. bin-list = $(WORKSRC)/src/siege @@ -59,11 +61,13 @@ @( for file in $(bin-list) ; do \ ginstall -m 751 $$file $(DESTDIR)$(bindir) ; \ done ) + @$(MAKECOOKIE) install-additional: ginstall -d $(DESTDIR)$(sysconfdir) ginstall -m 644 $(WORKSRC)/doc/urls.txt \ - $(DESTDIR)$(sysconfdir)/urls.txt.CSW + $(DESTDIR)$(sysconfdir)/urls.txt + @$(MAKECOOKIE) install-man: ginstall -d $(DESTDIR)$(mandir)/man1 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bensons at users.sourceforge.net Sun Jan 24 01:22:39 2010 From: bensons at users.sourceforge.net (bensons at users.sourceforge.net) Date: Sun, 24 Jan 2010 00:22:39 +0000 Subject: [csw-devel] SF.net SVN: gar:[8132] csw/mgar/pkg/pbzip2/trunk/Makefile Message-ID: Revision: 8132 http://gar.svn.sourceforge.net/gar/?rev=8132&view=rev Author: bensons Date: 2010-01-24 00:22:39 +0000 (Sun, 24 Jan 2010) Log Message: ----------- pbzip2: add 64bit build Modified Paths: -------------- csw/mgar/pkg/pbzip2/trunk/Makefile Modified: csw/mgar/pkg/pbzip2/trunk/Makefile =================================================================== --- csw/mgar/pkg/pbzip2/trunk/Makefile 2010-01-24 00:00:33 UTC (rev 8131) +++ csw/mgar/pkg/pbzip2/trunk/Makefile 2010-01-24 00:22:39 UTC (rev 8132) @@ -26,6 +26,10 @@ # since there is no configure script, this is intentionally left empty CONFIGURE_SCRIPTS = +# build 64bit binary +BUILD64 = 1 +NO_ISAEXEC = 1 + # no build tests SKIPTEST = 1 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Sun Jan 24 02:31:18 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sun, 24 Jan 2010 01:31:18 +0000 Subject: [csw-devel] SF.net SVN: gar:[8133] csw/mgar/pkg Message-ID: Revision: 8133 http://gar.svn.sourceforge.net/gar/?rev=8133&view=rev Author: wahwah Date: 2010-01-24 01:31:18 +0000 (Sun, 24 Jan 2010) Log Message: ----------- tests: The first sketch of end-to-end testing of GAR Added Paths: ----------- csw/mgar/pkg/tests/ csw/mgar/pkg/tests/gartest.py Added: csw/mgar/pkg/tests/gartest.py =================================================================== --- csw/mgar/pkg/tests/gartest.py (rev 0) +++ csw/mgar/pkg/tests/gartest.py 2010-01-24 01:31:18 UTC (rev 8133) @@ -0,0 +1,168 @@ +# $Id$ + +import Cheetah.Template +import shutil +import tempfile +import unittest +import os +import os.path +import subprocess +import opencsw + +"""A module used to do end-to-end testing of GAR.""" + +MAKEFILE_TMPL = """# GAR Makefile generated by $test_id +# +GARNAME = $garname +GARVERSION = $garversion +CATEGORIES = $profile +DESCRIPTION = $description +#if $blurb +define BLURB + blurb +endef +#end if +#if $upstream_url +SPKG_SOURCEURL = $upstream_url +#end if +#if $master_sites +MASTER_SITES = $master_sites +#end if +## PATCHFILES = +## DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz +## UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz +## CATALOGNAME = +## ARCHALL = 0 +## PACKAGES = +CONFIGURE_SCRIPTS = +BUILD_SCRIPTS = +INSTALL_SCRIPTS = +TEST_SCRIPTS = +#if $configure_args +CONFIGURE_ARGS = $configure_args +#end if +## BUILD64 = +include gar/category.mk +#if $install_files +post-install-modulated: +#for filedir_name, directory, file_name, content in $install_files +\tginstall -m 755 -d \$(DESTDIR)$directory +\tginstall -m 644 $tmpdir/\$(FILEDIR)/$filedir_name \$(DESTDIR)$directory/$file_name +#end for +#end if +# GAR recipe ends here. +""" +TMPDIR_PREFIX = "garpkg" +DIR_PKG_OUT_DIR = "/home/maciej/spool.5.8-sparc" + +class Error(Exception): + pass + +class GarBuild(object): + """Represents a GAR build. + + Can create a GAR build and execute it. + """ + def __init__(self): + self.tmpdir = tempfile.mkdtemp(prefix=TMPDIR_PREFIX) + self.filedir = os.path.join(self.tmpdir, "files") + self.makefile_filename = os.path.join(self.tmpdir, "Makefile") + os.mkdir(self.filedir) + self.install_files = [] + self.built = False + self.tmpldata = { + "garname": "testbuild", + "garsrc": "/home/maciej/src/opencsw/gar/v2-dirpackage", + "blurb": None, + "description": u"A test package from %s" % self, + "profile": "lib", + "configure_args": "$(DIRPATHS)", + "upstream_url": "http://www.opencsw.org/", + "master_sites": None, + "install_files": self.install_files, + "garversion": "0.0.1", + "tmpdir": self.tmpdir, + "test_id": "$Id$", + } + os.symlink(self.tmpldata["garsrc"], os.path.join(self.tmpdir, "gar")) + + def WriteGarFiles(self): + # print "The tmpdir is", self.tmpdir + for filedir_name, directory, filename, content in self.install_files: + file_path = os.path.join(self.filedir, filedir_name) + print "Writing to %s" % file_path + fp = open(file_path, "w") + fp.write(content) + fp.close() + searchlist = [self.tmpldata] + t = Cheetah.Template.Template(MAKEFILE_TMPL, searchlist) + print t + fp = open(self.makefile_filename, "w") + fp.write(str(t)) + fp.close() + + def Build(self): + if self.built: + return 0 + args = ["gmake", "dirpackage"] + gar_proc = subprocess.Popen(args, cwd=self.tmpdir, + stdout=subprocess.PIPE, + stderr=subprocess.PIPE) + stdout, stderr = gar_proc.communicate() + ret = gar_proc.wait() + if ret: + print "ERROR: GAR run has failed." + self.built = False + else: + self.built = True + return ret + + def GetBuiltPackages(self): + if not self.built: + raise Error("The packages have not been built yet.") + args = ["gmake", "pkglist"] + gar_proc = subprocess.Popen(args, cwd=self.tmpdir, stdout=subprocess.PIPE) + stdout, stderr = gar_proc.communicate() + ret = gar_proc.wait() + pkglist = [] + for line in stdout.splitlines(): + # directory, catalogname, pkgname + pkglist.append(tuple(line.split("\t"))) + packages = [opencsw.DirectoryFormatPackage(os.path.join(DIR_PKG_OUT_DIR, z)) for x, y, z in pkglist] + return packages + + def AddInstallFile(self, file_path, content): + filedir_name = file_path.replace("/", "-") + directory, file_name = os.path.split(file_path) + self.install_files.append((filedir_name, directory, + file_name, content)) + + def __del__(self): + shutil.rmtree(self.tmpdir) + + +class FooUnitTest(unittest.TestCase): + """This is the docstring for the FooUnitTest.""" + + def testSomething(self): + """This is a doc string for the test method. + + You can write more text here. + """ + mybuild = GarBuild() + mybuild.tmpldata["garname"] = "blah" + mybuild.AddInstallFile("/opt/csw/share/foo", "bar!\n") + mybuild.WriteGarFiles() + self.assertEquals(0, mybuild.Build()) + packages = mybuild.GetBuiltPackages() + for pkg in packages: + print pkg + print pkg.GetParsedPkginfo() + # package = mybuild.GetFirstDirFormatPackage() + # self.assertEqual("blah", package.catalogname) + + +if __name__ == '__main__': + unittest.main() + +# vim:set ts=2 sts=2 sw=2 expandtab: Property changes on: csw/mgar/pkg/tests/gartest.py ___________________________________________________________________ Added: svn:keywords + Id This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Sun Jan 24 08:18:53 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sun, 24 Jan 2010 07:18:53 +0000 Subject: [csw-devel] SF.net SVN: gar:[8134] csw/mgar/pkg/tests Message-ID: Revision: 8134 http://gar.svn.sourceforge.net/gar/?rev=8134&view=rev Author: wahwah Date: 2010-01-24 07:18:53 +0000 (Sun, 24 Jan 2010) Log Message: ----------- mGAR v2: tests, separated the library and the executable, better API for variables. Modified Paths: -------------- csw/mgar/pkg/tests/gartest.py Added Paths: ----------- csw/mgar/pkg/tests/run_tests.py Modified: csw/mgar/pkg/tests/gartest.py =================================================================== --- csw/mgar/pkg/tests/gartest.py 2010-01-24 01:31:18 UTC (rev 8133) +++ csw/mgar/pkg/tests/gartest.py 2010-01-24 07:18:53 UTC (rev 8134) @@ -12,36 +12,14 @@ """A module used to do end-to-end testing of GAR.""" MAKEFILE_TMPL = """# GAR Makefile generated by $test_id -# -GARNAME = $garname -GARVERSION = $garversion -CATEGORIES = $profile -DESCRIPTION = $description +#for varname in $garvars +$varname = $garvars[$varname] +#end for #if $blurb define BLURB blurb endef #end if -#if $upstream_url -SPKG_SOURCEURL = $upstream_url -#end if -#if $master_sites -MASTER_SITES = $master_sites -#end if -## PATCHFILES = -## DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz -## UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz -## CATALOGNAME = -## ARCHALL = 0 -## PACKAGES = -CONFIGURE_SCRIPTS = -BUILD_SCRIPTS = -INSTALL_SCRIPTS = -TEST_SCRIPTS = -#if $configure_args -CONFIGURE_ARGS = $configure_args -#end if -## BUILD64 = include gar/category.mk #if $install_files post-install-modulated: @@ -64,36 +42,47 @@ Can create a GAR build and execute it. """ def __init__(self): + self.packages = None self.tmpdir = tempfile.mkdtemp(prefix=TMPDIR_PREFIX) self.filedir = os.path.join(self.tmpdir, "files") self.makefile_filename = os.path.join(self.tmpdir, "Makefile") os.mkdir(self.filedir) self.install_files = [] self.built = False + self.garvars = { + "GARNAME": "testbuild", + "DESCRIPTION": u"A test package from %s" % self, + "CATEGORIES": "lib", + "CONFIGURE_ARGS": "$(DIRPATHS)", + "SPKG_SOURCEURL": "http://www.opencsw.org/", + "MASTER_SITES": "", + "GARVERSION": "0.0.1", + "CONFIGURE_SCRIPTS": "", + "BUILD_SCRIPTS": "", + "TEST_SCRIPTS": "", + "INSTALL_SCRIPTS": "", + } self.tmpldata = { - "garname": "testbuild", + "garvars": self.garvars, "garsrc": "/home/maciej/src/opencsw/gar/v2-dirpackage", "blurb": None, - "description": u"A test package from %s" % self, - "profile": "lib", - "configure_args": "$(DIRPATHS)", - "upstream_url": "http://www.opencsw.org/", - "master_sites": None, "install_files": self.install_files, - "garversion": "0.0.1", "tmpdir": self.tmpdir, "test_id": "$Id$", } os.symlink(self.tmpldata["garsrc"], os.path.join(self.tmpdir, "gar")) + def SetGarVariable(self, varname, value): + self.garvars[varname] = value + def WriteGarFiles(self): # print "The tmpdir is", self.tmpdir for filedir_name, directory, filename, content in self.install_files: - file_path = os.path.join(self.filedir, filedir_name) - print "Writing to %s" % file_path - fp = open(file_path, "w") - fp.write(content) - fp.close() + file_path = os.path.join(self.filedir, filedir_name) + print "Writing to %s" % file_path + fp = open(file_path, "w") + fp.write(content) + fp.close() searchlist = [self.tmpldata] t = Cheetah.Template.Template(MAKEFILE_TMPL, searchlist) print t @@ -103,7 +92,7 @@ def Build(self): if self.built: - return 0 + return 0 args = ["gmake", "dirpackage"] gar_proc = subprocess.Popen(args, cwd=self.tmpdir, stdout=subprocess.PIPE, @@ -112,26 +101,38 @@ ret = gar_proc.wait() if ret: print "ERROR: GAR run has failed." + print stdout + print stderr self.built = False else: - self.built = True + self.built = True return ret def GetBuiltPackages(self): if not self.built: - raise Error("The packages have not been built yet.") + raise Error("The packages have not been built yet.") args = ["gmake", "pkglist"] gar_proc = subprocess.Popen(args, cwd=self.tmpdir, stdout=subprocess.PIPE) stdout, stderr = gar_proc.communicate() ret = gar_proc.wait() pkglist = [] for line in stdout.splitlines(): - # directory, catalogname, pkgname - pkglist.append(tuple(line.split("\t"))) - packages = [opencsw.DirectoryFormatPackage(os.path.join(DIR_PKG_OUT_DIR, z)) for x, y, z in pkglist] - return packages + # directory, catalogname, pkgname + pkglist.append(tuple(line.split("\t"))) + self.packages = [ + opencsw.DirectoryFormatPackage( + os.path.join(DIR_PKG_OUT_DIR, z)) + for x, y, z in pkglist] + return self.packages + def GetFirstBuiltPackage(self): + """Returns only the first package. Easy to use.""" + packages = self.GetBuiltPackages() + if packages: + return packages[0] + def AddInstallFile(self, file_path, content): + """Creates a file in the package, with the given path and content.""" filedir_name = file_path.replace("/", "-") directory, file_name = os.path.split(file_path) self.install_files.append((filedir_name, directory, @@ -140,29 +141,4 @@ def __del__(self): shutil.rmtree(self.tmpdir) - -class FooUnitTest(unittest.TestCase): - """This is the docstring for the FooUnitTest.""" - - def testSomething(self): - """This is a doc string for the test method. - - You can write more text here. - """ - mybuild = GarBuild() - mybuild.tmpldata["garname"] = "blah" - mybuild.AddInstallFile("/opt/csw/share/foo", "bar!\n") - mybuild.WriteGarFiles() - self.assertEquals(0, mybuild.Build()) - packages = mybuild.GetBuiltPackages() - for pkg in packages: - print pkg - print pkg.GetParsedPkginfo() - # package = mybuild.GetFirstDirFormatPackage() - # self.assertEqual("blah", package.catalogname) - - -if __name__ == '__main__': - unittest.main() - # vim:set ts=2 sts=2 sw=2 expandtab: Added: csw/mgar/pkg/tests/run_tests.py =================================================================== --- csw/mgar/pkg/tests/run_tests.py (rev 0) +++ csw/mgar/pkg/tests/run_tests.py 2010-01-24 07:18:53 UTC (rev 8134) @@ -0,0 +1,26 @@ +# $Id$ + +import unittest +import gartest + +class ExampleEndToEndTest(unittest.TestCase): + """An example end-to-end test of GAR.""" + + def testPkginfoName(self): + """Checks that the GARNAME makes it to the NAME in pkginfo.""" + mybuild = gartest.GarBuild() + mybuild.SetGarVariable("GARNAME", "foo") + mybuild.AddInstallFile("/opt/csw/share/foo", "bar!\n") + mybuild.WriteGarFiles() + self.assertEquals(0, mybuild.Build()) + pkg = mybuild.GetFirstBuiltPackage() + pkginfo = pkg.GetParsedPkginfo() + # By default, the garname should be used to create the catalog name, which + # in turn ends up in the NAME field in pkginfo. + self.assertTrue(pkginfo["NAME"].startswith("foo")) + + +if __name__ == '__main__': + unittest.main() + +# vim:set ts=2 sts=2 sw=2 expandtab: Property changes on: csw/mgar/pkg/tests/run_tests.py ___________________________________________________________________ Added: svn:executable + * Added: svn:keywords + Id This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Sun Jan 24 08:24:07 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sun, 24 Jan 2010 07:24:07 +0000 Subject: [csw-devel] SF.net SVN: gar:[8135] csw/mgar/pkg/tests/run_tests.py Message-ID: Revision: 8135 http://gar.svn.sourceforge.net/gar/?rev=8135&view=rev Author: wahwah Date: 2010-01-24 07:24:06 +0000 (Sun, 24 Jan 2010) Log Message: ----------- mGAR v2: tests, setting shebang for the executable Modified Paths: -------------- csw/mgar/pkg/tests/run_tests.py Modified: csw/mgar/pkg/tests/run_tests.py =================================================================== --- csw/mgar/pkg/tests/run_tests.py 2010-01-24 07:18:53 UTC (rev 8134) +++ csw/mgar/pkg/tests/run_tests.py 2010-01-24 07:24:06 UTC (rev 8135) @@ -1,3 +1,4 @@ +#!/opt/csw/bin/python2.6 # $Id$ import unittest This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bensons at users.sourceforge.net Sun Jan 24 10:30:18 2010 From: bensons at users.sourceforge.net (bensons at users.sourceforge.net) Date: Sun, 24 Jan 2010 09:30:18 +0000 Subject: [csw-devel] SF.net SVN: gar:[8136] csw/mgar/pkg/p7zip/trunk Message-ID: Revision: 8136 http://gar.svn.sourceforge.net/gar/?rev=8136&view=rev Author: bensons Date: 2010-01-24 09:30:17 +0000 (Sun, 24 Jan 2010) Log Message: ----------- p7zip: upgraded to version 9.04 Modified Paths: -------------- csw/mgar/pkg/p7zip/trunk/Makefile csw/mgar/pkg/p7zip/trunk/checksums Modified: csw/mgar/pkg/p7zip/trunk/Makefile =================================================================== --- csw/mgar/pkg/p7zip/trunk/Makefile 2010-01-24 07:24:06 UTC (rev 8135) +++ csw/mgar/pkg/p7zip/trunk/Makefile 2010-01-24 09:30:17 UTC (rev 8136) @@ -1,5 +1,5 @@ GARNAME = p7zip -GARVERSION = 4.65 +GARVERSION = 9.04 CATEGORIES = utils DESCRIPTION = File archiver with high compression ratio Modified: csw/mgar/pkg/p7zip/trunk/checksums =================================================================== --- csw/mgar/pkg/p7zip/trunk/checksums 2010-01-24 07:24:06 UTC (rev 8135) +++ csw/mgar/pkg/p7zip/trunk/checksums 2010-01-24 09:30:17 UTC (rev 8136) @@ -1,3 +1,3 @@ -f78ed232436dc8f8be25a2f95d4e5f9a download/p7zip_4.65_src_all.tar.bz2 -6d31812ad3facefbc8ba8bd750522be7 download/patch-CPP-7zip-Archive-Zip-ZipHandler.cpp -06482af0e45c61b245b2f664602e4742 download/patch-install.sh +9194ebf9a2b3735d236aed001de5f6f8 p7zip_9.04_src_all.tar.bz2 +6d31812ad3facefbc8ba8bd750522be7 patch-CPP-7zip-Archive-Zip-ZipHandler.cpp +06482af0e45c61b245b2f664602e4742 patch-install.sh This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bensons at users.sourceforge.net Sun Jan 24 11:00:23 2010 From: bensons at users.sourceforge.net (bensons at users.sourceforge.net) Date: Sun, 24 Jan 2010 10:00:23 +0000 Subject: [csw-devel] SF.net SVN: gar:[8137] csw/mgar/pkg/cpan Message-ID: Revision: 8137 http://gar.svn.sourceforge.net/gar/?rev=8137&view=rev Author: bensons Date: 2010-01-24 10:00:22 +0000 (Sun, 24 Jan 2010) Log Message: ----------- cpan File-Cat: initial GARify Added Paths: ----------- csw/mgar/pkg/cpan/File-Cat/ csw/mgar/pkg/cpan/File-Cat/branches/ csw/mgar/pkg/cpan/File-Cat/tags/ csw/mgar/pkg/cpan/File-Cat/trunk/ csw/mgar/pkg/cpan/File-Cat/trunk/Makefile csw/mgar/pkg/cpan/File-Cat/trunk/checksums csw/mgar/pkg/cpan/File-Cat/trunk/files/ Property changes on: csw/mgar/pkg/cpan/File-Cat/trunk ___________________________________________________________________ Added: svn:ignore + cookies download work Added: svn:externals + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 Added: csw/mgar/pkg/cpan/File-Cat/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/File-Cat/trunk/Makefile (rev 0) +++ csw/mgar/pkg/cpan/File-Cat/trunk/Makefile 2010-01-24 10:00:22 UTC (rev 8137) @@ -0,0 +1,19 @@ +GARNAME = File-Cat +GARVERSION = 1.2 +CATEGORIES = cpan +AUTHOR = FIMM + +DESCRIPTION = Perl implementation of cat(1) +define BLURB + File::Cat is a module of adventure, danger, and low cunning. + With it, you will explore some of the most inane programs ever seen + by mortals. No computer should be without one! +endef + +# Disable interactive tests +# PATCHFILES = itest.diff +# Fix names +PACKAGES = CSWpmfilecat +CATALOGNAME = pm_filecat + +include gar/category.mk Added: csw/mgar/pkg/cpan/File-Cat/trunk/checksums =================================================================== --- csw/mgar/pkg/cpan/File-Cat/trunk/checksums (rev 0) +++ csw/mgar/pkg/cpan/File-Cat/trunk/checksums 2010-01-24 10:00:22 UTC (rev 8137) @@ -0,0 +1 @@ +300600b3786cec4360e88947f775f4fb File-Cat-1.2.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bensons at users.sourceforge.net Sun Jan 24 11:14:03 2010 From: bensons at users.sourceforge.net (bensons at users.sourceforge.net) Date: Sun, 24 Jan 2010 10:14:03 +0000 Subject: [csw-devel] SF.net SVN: gar:[8138] csw/mgar/pkg/cpan Message-ID: Revision: 8138 http://gar.svn.sourceforge.net/gar/?rev=8138&view=rev Author: bensons Date: 2010-01-24 10:14:02 +0000 (Sun, 24 Jan 2010) Log Message: ----------- cpan Net-Pcap: inital GAR commit Added Paths: ----------- csw/mgar/pkg/cpan/Net-Pcap/ csw/mgar/pkg/cpan/Net-Pcap/branches/ csw/mgar/pkg/cpan/Net-Pcap/tags/ csw/mgar/pkg/cpan/Net-Pcap/trunk/ csw/mgar/pkg/cpan/Net-Pcap/trunk/Makefile csw/mgar/pkg/cpan/Net-Pcap/trunk/checksums csw/mgar/pkg/cpan/Net-Pcap/trunk/files/ Property changes on: csw/mgar/pkg/cpan/Net-Pcap/trunk ___________________________________________________________________ Added: svn:ignore + cookies download work Added: svn:externals + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 Added: csw/mgar/pkg/cpan/Net-Pcap/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/Net-Pcap/trunk/Makefile (rev 0) +++ csw/mgar/pkg/cpan/Net-Pcap/trunk/Makefile 2010-01-24 10:14:02 UTC (rev 8138) @@ -0,0 +1,18 @@ +GARNAME = Net-Pcap +GARVERSION = 0.16 +CATEGORIES = cpan +AUTHOR = SAPER + +DESCRIPTION = Interface to pcap(3) LBL packet capture library +define BLURB + Net::Pcap is a Perl binding to the LBL pcap(3) library. + The README for libpcap describes itself as: +endef + +PACKAGES = CSWpmnetpcap +CATALOGNAME = pm_netpcap + +# depends +PREREQUISITE_PKGS = CSWlibpcap CSWlibpcapdevel + +include gar/category.mk Added: csw/mgar/pkg/cpan/Net-Pcap/trunk/checksums =================================================================== --- csw/mgar/pkg/cpan/Net-Pcap/trunk/checksums (rev 0) +++ csw/mgar/pkg/cpan/Net-Pcap/trunk/checksums 2010-01-24 10:14:02 UTC (rev 8138) @@ -0,0 +1 @@ +b150d8e0a40137fad2a7df792d80cab4 Net-Pcap-0.16.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bensons at users.sourceforge.net Sun Jan 24 11:18:20 2010 From: bensons at users.sourceforge.net (bensons at users.sourceforge.net) Date: Sun, 24 Jan 2010 10:18:20 +0000 Subject: [csw-devel] SF.net SVN: gar:[8139] csw/mgar/pkg/cpan/Net-Pcap/trunk/Makefile Message-ID: Revision: 8139 http://gar.svn.sourceforge.net/gar/?rev=8139&view=rev Author: bensons Date: 2010-01-24 10:18:20 +0000 (Sun, 24 Jan 2010) Log Message: ----------- cpan Net-Pcap: adjust dependency Modified Paths: -------------- csw/mgar/pkg/cpan/Net-Pcap/trunk/Makefile Modified: csw/mgar/pkg/cpan/Net-Pcap/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/Net-Pcap/trunk/Makefile 2010-01-24 10:14:02 UTC (rev 8138) +++ csw/mgar/pkg/cpan/Net-Pcap/trunk/Makefile 2010-01-24 10:18:20 UTC (rev 8139) @@ -13,6 +13,6 @@ CATALOGNAME = pm_netpcap # depends -PREREQUISITE_PKGS = CSWlibpcap CSWlibpcapdevel +PREREQUISITE_PKGS = CSWlibpcap include gar/category.mk This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From a_o_m at users.sourceforge.net Sun Jan 24 11:19:30 2010 From: a_o_m at users.sourceforge.net (a_o_m at users.sourceforge.net) Date: Sun, 24 Jan 2010 10:19:30 +0000 Subject: [csw-devel] SF.net SVN: gar:[8140] csw/mgar/pkg/fontconfig/trunk Message-ID: Revision: 8140 http://gar.svn.sourceforge.net/gar/?rev=8140&view=rev Author: a_o_m Date: 2010-01-24 10:19:30 +0000 (Sun, 24 Jan 2010) Log Message: ----------- fontconfig: conf migrated to /etc/opt/csw Modified Paths: -------------- csw/mgar/pkg/fontconfig/trunk/Makefile csw/mgar/pkg/fontconfig/trunk/checksums csw/mgar/pkg/fontconfig/trunk/files/CSWfconfig.postinstall Modified: csw/mgar/pkg/fontconfig/trunk/Makefile =================================================================== --- csw/mgar/pkg/fontconfig/trunk/Makefile 2010-01-24 10:18:20 UTC (rev 8139) +++ csw/mgar/pkg/fontconfig/trunk/Makefile 2010-01-24 10:19:30 UTC (rev 8140) @@ -27,10 +27,12 @@ SPKG_SOURCEURL = http://www.fontconfig.org/ +MIGRATE_FILES = fontconfig + CONFIGURE_ARGS = $(DIRPATHS) CONFIGURE_ARGS += --with-default-fonts=/usr/openwin/lib/X11/fonts CONFIGURE_ARGS += --with-add-fonts=/usr/openwin/lib/locale,/usr/share/fonts,/opt/csw/share/fonts CONFIGURE_ARGS += --with-cache-dir=/var/opt/csw/cache/fontconfig -CONFIGURE_ARGS += --with-confdir=/opt/csw/etc/fontconfig +CONFIGURE_ARGS += --with-confdir=/etc/opt/csw/fontconfig include gar/category.mk Modified: csw/mgar/pkg/fontconfig/trunk/checksums =================================================================== --- csw/mgar/pkg/fontconfig/trunk/checksums 2010-01-24 10:18:20 UTC (rev 8139) +++ csw/mgar/pkg/fontconfig/trunk/checksums 2010-01-24 10:19:30 UTC (rev 8140) @@ -1,3 +1,3 @@ -8749af801a9e33c61092da59354bbceb CSWfconfig.postinstall +0d3f1e7200a203a89dee4324a421e275 CSWfconfig.postinstall bbdb45396408c48d50c7db5747dfae4e fix-zerowidth-struct.patch 77e15a92006ddc2adbb06f840d591c0e fontconfig-2.8.0.tar.gz Modified: csw/mgar/pkg/fontconfig/trunk/files/CSWfconfig.postinstall =================================================================== --- csw/mgar/pkg/fontconfig/trunk/files/CSWfconfig.postinstall 2010-01-24 10:18:20 UTC (rev 8139) +++ csw/mgar/pkg/fontconfig/trunk/files/CSWfconfig.postinstall 2010-01-24 10:19:30 UTC (rev 8140) @@ -8,6 +8,7 @@ echo ${BASEDIR}/usr/sbin/chroot ${CHROOTDIR} /opt/csw/bin/fc-cache -f -s +touch ${BASEDIR}/var/opt/csw/cache/fontconfig/.fc-cache_done 2>/dev/null ${BASEDIR}/usr/sbin/chroot ${CHROOTDIR} /opt/csw/bin/fc-list 2>&1 >/dev/null & @@ -15,8 +16,8 @@ find ${BASEDIR}/usr/openwin/lib/X11/fonts -user root -name fonts.cache-csw-1 -exec rm -f {} \; find ${BASEDIR}/usr/openwin/lib/locale -user root -name fonts.cache-csw-1 -exec rm -f {} \; find ${BASEDIR}/opt/csw -user root -name fonts.cache-csw-1 -exec rm -f {} \; -# removing ancient *.cache-csw-2 files -rm "${BASEDIR}/opt/csw/var/cache/fontconfig/*.cache-csw-2" 2>/dev/null +# removing ancient *.cache-2 files +rm ${BASEDIR}/var/opt/csw/cache/fontconfig/*.cache-2 2>/dev/null # remove obsolete cache dir [ -d "${BASEDIR}/opt/csw/var/cache-fontconfig" ] && rm -r "${BASEDIR}/opt/csw/var/cache-fontconfig" 2>/dev/null This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bensons at users.sourceforge.net Sun Jan 24 11:32:38 2010 From: bensons at users.sourceforge.net (bensons at users.sourceforge.net) Date: Sun, 24 Jan 2010 10:32:38 +0000 Subject: [csw-devel] SF.net SVN: gar:[8141] csw/mgar/pkg/cpan Message-ID: Revision: 8141 http://gar.svn.sourceforge.net/gar/?rev=8141&view=rev Author: bensons Date: 2010-01-24 10:32:38 +0000 (Sun, 24 Jan 2010) Log Message: ----------- cpan NetPacket: inital GAR checkin Added Paths: ----------- csw/mgar/pkg/cpan/NetPacket/ csw/mgar/pkg/cpan/NetPacket/branches/ csw/mgar/pkg/cpan/NetPacket/tags/ csw/mgar/pkg/cpan/NetPacket/trunk/ csw/mgar/pkg/cpan/NetPacket/trunk/Makefile csw/mgar/pkg/cpan/NetPacket/trunk/checksums csw/mgar/pkg/cpan/NetPacket/trunk/files/ Property changes on: csw/mgar/pkg/cpan/NetPacket/trunk ___________________________________________________________________ Added: svn:ignore + cookies download work Added: svn:externals + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 Added: csw/mgar/pkg/cpan/NetPacket/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/NetPacket/trunk/Makefile (rev 0) +++ csw/mgar/pkg/cpan/NetPacket/trunk/Makefile 2010-01-24 10:32:38 UTC (rev 8141) @@ -0,0 +1,17 @@ +GARNAME = NetPacket +GARVERSION = 0.41.1 +CATEGORIES = cpan +AUTHOR = YANICK + +DESCRIPTION = Modules to assemble/disassemble network packets +define BLURB + NetPacket provides a base class for a cluster of modules related to + decoding and encoding of network protocols. Each NetPacket descendent + module knows how to encode and decode packets for the network protocol + it implements. +endef + +PACKAGES = CSWpmnetpacket +CATALOGNAME = pm_netpacket + +include gar/category.mk Added: csw/mgar/pkg/cpan/NetPacket/trunk/checksums =================================================================== --- csw/mgar/pkg/cpan/NetPacket/trunk/checksums (rev 0) +++ csw/mgar/pkg/cpan/NetPacket/trunk/checksums 2010-01-24 10:32:38 UTC (rev 8141) @@ -0,0 +1 @@ +77c1482927c6892b9571404485ffe591 NetPacket-0.41.1.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From a_o_m at users.sourceforge.net Sun Jan 24 11:42:24 2010 From: a_o_m at users.sourceforge.net (a_o_m at users.sourceforge.net) Date: Sun, 24 Jan 2010 10:42:24 +0000 Subject: [csw-devel] SF.net SVN: gar:[8142] csw/mgar/pkg/fontconfig/trunk Message-ID: Revision: 8142 http://gar.svn.sourceforge.net/gar/?rev=8142&view=rev Author: a_o_m Date: 2010-01-24 10:42:24 +0000 (Sun, 24 Jan 2010) Log Message: ----------- fontconfig: fixed file name of old cache files Modified Paths: -------------- csw/mgar/pkg/fontconfig/trunk/checksums csw/mgar/pkg/fontconfig/trunk/files/CSWfconfig.postinstall Modified: csw/mgar/pkg/fontconfig/trunk/checksums =================================================================== --- csw/mgar/pkg/fontconfig/trunk/checksums 2010-01-24 10:32:38 UTC (rev 8141) +++ csw/mgar/pkg/fontconfig/trunk/checksums 2010-01-24 10:42:24 UTC (rev 8142) @@ -1,3 +1,3 @@ -0d3f1e7200a203a89dee4324a421e275 CSWfconfig.postinstall +efa9e30f80c303a90f0e42110ea0f933 CSWfconfig.postinstall bbdb45396408c48d50c7db5747dfae4e fix-zerowidth-struct.patch 77e15a92006ddc2adbb06f840d591c0e fontconfig-2.8.0.tar.gz Modified: csw/mgar/pkg/fontconfig/trunk/files/CSWfconfig.postinstall =================================================================== --- csw/mgar/pkg/fontconfig/trunk/files/CSWfconfig.postinstall 2010-01-24 10:32:38 UTC (rev 8141) +++ csw/mgar/pkg/fontconfig/trunk/files/CSWfconfig.postinstall 2010-01-24 10:42:24 UTC (rev 8142) @@ -16,8 +16,8 @@ find ${BASEDIR}/usr/openwin/lib/X11/fonts -user root -name fonts.cache-csw-1 -exec rm -f {} \; find ${BASEDIR}/usr/openwin/lib/locale -user root -name fonts.cache-csw-1 -exec rm -f {} \; find ${BASEDIR}/opt/csw -user root -name fonts.cache-csw-1 -exec rm -f {} \; -# removing ancient *.cache-2 files -rm ${BASEDIR}/var/opt/csw/cache/fontconfig/*.cache-2 2>/dev/null +# removing ancient *.cache-csw-2 files +rm ${BASEDIR}/var/opt/csw/cache/fontconfig/*.cache-csw-2 2>/dev/null # remove obsolete cache dir [ -d "${BASEDIR}/opt/csw/var/cache-fontconfig" ] && rm -r "${BASEDIR}/opt/csw/var/cache-fontconfig" 2>/dev/null This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bensons at users.sourceforge.net Sun Jan 24 11:42:55 2010 From: bensons at users.sourceforge.net (bensons at users.sourceforge.net) Date: Sun, 24 Jan 2010 10:42:55 +0000 Subject: [csw-devel] SF.net SVN: gar:[8143] csw/mgar/pkg/cpan Message-ID: Revision: 8143 http://gar.svn.sourceforge.net/gar/?rev=8143&view=rev Author: bensons Date: 2010-01-24 10:42:52 +0000 (Sun, 24 Jan 2010) Log Message: ----------- cpan Net-Analysis: initial GAR checkin Added Paths: ----------- csw/mgar/pkg/cpan/Net-Analysis/ csw/mgar/pkg/cpan/Net-Analysis/branches/ csw/mgar/pkg/cpan/Net-Analysis/tags/ csw/mgar/pkg/cpan/Net-Analysis/trunk/ csw/mgar/pkg/cpan/Net-Analysis/trunk/Makefile csw/mgar/pkg/cpan/Net-Analysis/trunk/checksums csw/mgar/pkg/cpan/Net-Analysis/trunk/files/ Property changes on: csw/mgar/pkg/cpan/Net-Analysis/trunk ___________________________________________________________________ Added: svn:ignore + cookies download work Added: svn:externals + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 Added: csw/mgar/pkg/cpan/Net-Analysis/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/Net-Analysis/trunk/Makefile (rev 0) +++ csw/mgar/pkg/cpan/Net-Analysis/trunk/Makefile 2010-01-24 10:42:52 UTC (rev 8143) @@ -0,0 +1,19 @@ +GARNAME = Net-Analysis +GARVERSION = 0.40 +CATEGORIES = cpan +AUTHOR = WORRALL + +DESCRIPTION = Modules for analysing network traffic +define BLURB + Net::Analysis is a suite of modules that parse tcpdump files, + reconstruct TCP sessions from the packets, and provide a very + lightweight framework for writing protocol anaylsers. +endef + +PACKAGES = CSWpmnetanalysis +CATALOGNAME = pm_netanalysis + +# depends +PREREQUISITE_PKGS = CSWpmnetpcap CSWpmnetpacket CSWpmtstmockobject + +include gar/category.mk Added: csw/mgar/pkg/cpan/Net-Analysis/trunk/checksums =================================================================== --- csw/mgar/pkg/cpan/Net-Analysis/trunk/checksums (rev 0) +++ csw/mgar/pkg/cpan/Net-Analysis/trunk/checksums 2010-01-24 10:42:52 UTC (rev 8143) @@ -0,0 +1 @@ +54a247f75ad2e5f5e3e3618bf5ae6b97 Net-Analysis-0.40.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From janholzh at users.sourceforge.net Sun Jan 24 13:38:19 2010 From: janholzh at users.sourceforge.net (janholzh at users.sourceforge.net) Date: Sun, 24 Jan 2010 12:38:19 +0000 Subject: [csw-devel] SF.net SVN: gar:[8144] csw/mgar/pkg/transmission/trunk Message-ID: Revision: 8144 http://gar.svn.sourceforge.net/gar/?rev=8144&view=rev Author: janholzh Date: 2010-01-24 12:38:19 +0000 (Sun, 24 Jan 2010) Log Message: ----------- transmission: Update to 1.82 Modified Paths: -------------- csw/mgar/pkg/transmission/trunk/Makefile csw/mgar/pkg/transmission/trunk/checksums Modified: csw/mgar/pkg/transmission/trunk/Makefile =================================================================== --- csw/mgar/pkg/transmission/trunk/Makefile 2010-01-24 10:42:52 UTC (rev 8143) +++ csw/mgar/pkg/transmission/trunk/Makefile 2010-01-24 12:38:19 UTC (rev 8144) @@ -1,5 +1,5 @@ GARNAME = transmission -GARVERSION = 1.80 +GARVERSION = 1.82 CATEGORIES = net DESCRIPTION = Fast, easy, and free multi-platform BitTorrent client Modified: csw/mgar/pkg/transmission/trunk/checksums =================================================================== --- csw/mgar/pkg/transmission/trunk/checksums 2010-01-24 10:42:52 UTC (rev 8143) +++ csw/mgar/pkg/transmission/trunk/checksums 2010-01-24 12:38:19 UTC (rev 8144) @@ -1,3 +1,3 @@ cbdb5cfaf24b68727042c3828b252534 icons-makefile.patch 7124b4836210a10fe649bba75c706cc9 linker-include.patch -19a7d7dd60527199d05cf5e2e775929e transmission-1.80.tar.bz2 +00fe9cc2c4f8e004c89825812e387fc4 transmission-1.82.tar.bz2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Sun Jan 24 14:26:16 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Sun, 24 Jan 2010 13:26:16 +0000 Subject: [csw-devel] SF.net SVN: gar:[8145] csw/mgar/pkg Message-ID: Revision: 8145 http://gar.svn.sourceforge.net/gar/?rev=8145&view=rev Author: dmichelsen Date: 2010-01-24 13:26:16 +0000 (Sun, 24 Jan 2010) Log Message: ----------- r: Initial commit Added Paths: ----------- csw/mgar/pkg/r/ csw/mgar/pkg/r/branches/ csw/mgar/pkg/r/tags/ csw/mgar/pkg/r/trunk/ csw/mgar/pkg/r/trunk/Makefile csw/mgar/pkg/r/trunk/checksums csw/mgar/pkg/r/trunk/files/ Property changes on: csw/mgar/pkg/r/trunk ___________________________________________________________________ Added: svn:ignore + cookies download work Added: svn:externals + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 Added: csw/mgar/pkg/r/trunk/Makefile =================================================================== --- csw/mgar/pkg/r/trunk/Makefile (rev 0) +++ csw/mgar/pkg/r/trunk/Makefile 2010-01-24 13:26:16 UTC (rev 8145) @@ -0,0 +1,26 @@ +GARNAME = R +GARVERSION = 2.10.1 +CATEGORIES = apps + +DESCRIPTION = A language and environment for statistical computing and graphics +define BLURB +endef + +MASTER_SITES = http://stat.ethz.ch/CRAN/src/base/R-2/ +DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz + +PACKAGES = CSWr +CATALOGNAME = r + +REQUIRED_PKGS = CSWggettextrt CSWiconv CSWlibicu CSWperl CSWreadline CSWsunmath + +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + +SPKG_SOURCEURL = http://www.r-project.org/ + +CONFIGURE_ARGS = $(DIRPATHS) + +TEST_TARGET = check-recommended + +include gar/category.mk Added: csw/mgar/pkg/r/trunk/checksums =================================================================== --- csw/mgar/pkg/r/trunk/checksums (rev 0) +++ csw/mgar/pkg/r/trunk/checksums 2010-01-24 13:26:16 UTC (rev 8145) @@ -0,0 +1 @@ +75f8b7e875b846ea96a4c6cc0abc00a4 R-2.10.1.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Sun Jan 24 15:16:53 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Sun, 24 Jan 2010 14:16:53 +0000 Subject: [csw-devel] SF.net SVN: gar:[8146] csw/mgar/pkg/scala/trunk/Makefile Message-ID: Revision: 8146 http://gar.svn.sourceforge.net/gar/?rev=8146&view=rev Author: dmichelsen Date: 2010-01-24 14:16:53 +0000 (Sun, 24 Jan 2010) Log Message: ----------- scala: Use new mGAR features Modified Paths: -------------- csw/mgar/pkg/scala/trunk/Makefile Modified: csw/mgar/pkg/scala/trunk/Makefile =================================================================== --- csw/mgar/pkg/scala/trunk/Makefile 2010-01-24 13:26:16 UTC (rev 8145) +++ csw/mgar/pkg/scala/trunk/Makefile 2010-01-24 14:16:53 UTC (rev 8146) @@ -15,8 +15,6 @@ DISTNAME = $(GARNAME)-$(GARVERSION).final SPKG_SOURCEURL = http://www.scala-lang.org/ -SPKG_CLASSES = none cswpreserveconf -REQUIRED_PKGS = CSWcswclassutils ARCHALL = 1 # We define upstream file regex so we can be notifed of new upstream software release @@ -28,10 +26,7 @@ TEST_SCRIPTS = INSTALL_SCRIPTS = custom -PROTOTYPE_FILTER = awk '\ - $$$$3 ~ /meta\/[^/]+.CSW$$$$/ { $$$$2 = "cswpreserveconf" } \ - $$$$3 ~ /config\/[^/]+.CSW$$$$/ { $$$$2 = "cswpreserveconf" } \ - { print }' +PRESERVECONF = .*/meta/[^/]+ .*/config/[^/]+ include gar/category.mk This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From idogan23 at users.sourceforge.net Sun Jan 24 19:58:22 2010 From: idogan23 at users.sourceforge.net (idogan23 at users.sourceforge.net) Date: Sun, 24 Jan 2010 18:58:22 +0000 Subject: [csw-devel] SF.net SVN: gar:[8147] csw/mgar/pkg/rrdtool/trunk Message-ID: Revision: 8147 http://gar.svn.sourceforge.net/gar/?rev=8147&view=rev Author: idogan23 Date: 2010-01-24 18:58:22 +0000 (Sun, 24 Jan 2010) Log Message: ----------- rrdtool: fixes from hson Modified Paths: -------------- csw/mgar/pkg/rrdtool/trunk/Makefile csw/mgar/pkg/rrdtool/trunk/checksums Modified: csw/mgar/pkg/rrdtool/trunk/Makefile =================================================================== --- csw/mgar/pkg/rrdtool/trunk/Makefile 2010-01-24 14:16:53 UTC (rev 8146) +++ csw/mgar/pkg/rrdtool/trunk/Makefile 2010-01-24 18:58:22 UTC (rev 8147) @@ -1,5 +1,5 @@ GARNAME = rrdtool -GARVERSION = 1.3.8 +GARVERSION = 1.4.2 CATEGORIES = utils DESCRIPTION = time-series data logging and graphing. @@ -36,13 +36,18 @@ EXTRA_PKG_CONFIG_DIRS = $(prefix)/X11/lib -CONFIGURE_ARGS = $(DIRPATHS) +EXTRA_SOS_LD_FLAGS = -L$(abspath $(prefix)/X11/lib/$(MM_LIBDIR)) +EXTRA_SOS_LD_OPTIONS = -R$(abspath $(prefix)/X11/lib/$(MM_LIBDIR)) + +CONFIGURE_ARS = $(DIRPATHS) CONFIGURE_ARGS += --with-docdir=$(sharedstatedir)/doc/$(GARNAME) CONFIGURE_ARGS += --disable-python CONFIGURE_ARGS += --enable-ruby CONFIGURE_ARGS += --disable-libintl CONFIGURE_ARGS += --enable-perl CONFIGURE_ARGS += --with-perl-options=INSTALLDIRS=vendor +CONFIGURE_ARGS += --x-includes=$(prefix)/X11/include +CONFIGURE_ARGS += --x-libraries=$(abspath $(prefix)/X11/lib/$(MM_LIBDIR)) EXTRA_MERGE_EXCLUDE_FILES = .*~ .*perllocal\.pod Modified: csw/mgar/pkg/rrdtool/trunk/checksums =================================================================== --- csw/mgar/pkg/rrdtool/trunk/checksums 2010-01-24 14:16:53 UTC (rev 8146) +++ csw/mgar/pkg/rrdtool/trunk/checksums 2010-01-24 18:58:22 UTC (rev 8147) @@ -1,2 +1,2 @@ -48a9b258cf8b4b943dbaf30ea939c315 download/CSWrrdtool.gspec -0de79494ab969cebfbfae3d237de18fe download/rrdtool-1.3.8.tar.gz +48a9b258cf8b4b943dbaf30ea939c315 CSWrrdtool.gspec +9318d3b4016dd9dd9897f1eac7548032 rrdtool-1.4.2.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From hson at users.sourceforge.net Mon Jan 25 00:26:33 2010 From: hson at users.sourceforge.net (hson at users.sourceforge.net) Date: Sun, 24 Jan 2010 23:26:33 +0000 Subject: [csw-devel] SF.net SVN: gar:[8148] csw/mgar/pkg/tiff/trunk Message-ID: Revision: 8148 http://gar.svn.sourceforge.net/gar/?rev=8148&view=rev Author: hson Date: 2010-01-24 23:26:33 +0000 (Sun, 24 Jan 2010) Log Message: ----------- tiff: Add runtime package Modified Paths: -------------- csw/mgar/pkg/tiff/trunk/Makefile Added Paths: ----------- csw/mgar/pkg/tiff/trunk/files/libtiff-CVE-2009-2347.patch csw/mgar/pkg/tiff/trunk/files/libtiff-jpeg-scanline.patch csw/mgar/pkg/tiff/trunk/files/libtiff-mantypo.patch csw/mgar/pkg/tiff/trunk/files/libtiff-scanlinesize.patch Modified: csw/mgar/pkg/tiff/trunk/Makefile =================================================================== --- csw/mgar/pkg/tiff/trunk/Makefile 2010-01-24 18:58:22 UTC (rev 8147) +++ csw/mgar/pkg/tiff/trunk/Makefile 2010-01-24 23:26:33 UTC (rev 8148) @@ -10,19 +10,23 @@ DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz DISTNAME = $(GARNAME)-$(GARVERSION) -PACKAGES = CSWtiff CSWtiffdevel CSWtiffdoc +PACKAGES = CSWtiff CSWtiffrt CSWtiffdevel CSWtiffdoc CATALOGNAME_CSWtiff = tiff +CATALOGNAME_CSWtiffrt = tiffrt CATALOGNAME_CSWtiffdevel = tiff_devel CATALOGNAME_CSWtiffdoc = tiff_doc -SPKG_DESC_CSWtiff += Library for writing single instance application -SPKG_DESC_CSWtiffdevel += Library for writing single instance application - developer package -SPKG_DESC_CSWtiffdoc += Library for writing single instance application - documentation +SPKG_DESC_CSWtiff += lib and tools for Tag Image File Format +SPKG_DESC_CSWtiffrt += lib and tools for Tag Image File Format - runtime package +SPKG_DESC_CSWtiffdevel += lib and tools for Tag Image File Format - developer package +SPKG_DESC_CSWtiffdoc += lib and tools for Tag Image File Format - documentation -REQUIRED_PKGS_CSWtiff += CSWjbigkit CSWjpeg CSWzlib -REQUIRED_PKGS_CSWtiffdevel += CSWtiff -REQUIRED_PKGS_CSWtiffdoc += CSWtiff +REQUIRED_PKGS_CSWtiff += CSWtiffrtCSWjbigkit CSWjpeg CSWzlib +REQUIRED_PKGS_CSWtiffrt += CSWjbigkit CSWjpeg CSWzlib +REQUIRED_PKGS_CSWtiffdevel += CSWtiffrt +REQUIRED_PKGS_CSWtiffdoc += +PKGFILES_CSWtiffrt = $(PKGFILES_RT) PKGFILES_CSWtiffdevel = $(PKGFILES_DEVEL) PKGFILES_CSWtiffdoc = $(sharedstatedir)/doc/.* @@ -32,6 +36,12 @@ SPKG_SOURCEURL = http://www.remotesensing.org/libtiff/ +# Patches from upstream (found via src.opensolaris.org), not applied for now +#PATCHFILES += libtiff-mantypo.patch +#PATCHFILES += libtiff-scanlinesize.patch +#PATCHFILES += libtiff-jpeg-scanline.patch +#PATCHFILES += libtiff-CVE-2009-2347.patch + BUILD64 = 1 STRIP_LIBTOOL = 1 Added: csw/mgar/pkg/tiff/trunk/files/libtiff-CVE-2009-2347.patch =================================================================== --- csw/mgar/pkg/tiff/trunk/files/libtiff-CVE-2009-2347.patch (rev 0) +++ csw/mgar/pkg/tiff/trunk/files/libtiff-CVE-2009-2347.patch 2010-01-24 23:26:33 UTC (rev 8148) @@ -0,0 +1,90 @@ +http://bugzilla.maptools.org/show_bug.cgi?id=2079 + + +diff -Naur tiff-3.9.2.orig/tools/tiff2rgba.c tiff-3.9.2/tools/tiff2rgba.c +--- tiff-3.9.2.orig/tools/tiff2rgba.c 2009-08-20 16:23:53.000000000 -0400 ++++ tiff-3.9.2/tools/tiff2rgba.c 2009-12-03 12:19:07.000000000 -0500 +@@ -125,6 +125,17 @@ + return (0); + } + ++static tsize_t ++multiply(tsize_t m1, tsize_t m2) ++{ ++ tsize_t prod = m1 * m2; ++ ++ if (m1 && prod / m1 != m2) ++ prod = 0; /* overflow */ ++ ++ return prod; ++} ++ + static int + cvt_by_tile( TIFF *in, TIFF *out ) + +@@ -134,6 +145,7 @@ + uint32 tile_width, tile_height; + uint32 row, col; + uint32 *wrk_line; ++ tsize_t raster_size; + int ok = 1; + + TIFFGetField(in, TIFFTAG_IMAGEWIDTH, &width); +@@ -151,7 +163,14 @@ + /* + * Allocate tile buffer + */ +- raster = (uint32*)_TIFFmalloc(tile_width * tile_height * sizeof (uint32)); ++ raster_size = multiply(multiply(tile_width, tile_height), sizeof (uint32)); ++ if (!raster_size) { ++ TIFFError(TIFFFileName(in), ++ "Can't allocate buffer for raster of size %lux%lu", ++ (unsigned long) tile_width, (unsigned long) tile_height); ++ return (0); ++ } ++ raster = (uint32*)_TIFFmalloc(raster_size); + if (raster == 0) { + TIFFError(TIFFFileName(in), "No space for raster buffer"); + return (0); +@@ -159,7 +178,7 @@ + + /* + * Allocate a scanline buffer for swapping during the vertical +- * mirroring pass. ++ * mirroring pass. (Request can't overflow given prior checks.) + */ + wrk_line = (uint32*)_TIFFmalloc(tile_width * sizeof (uint32)); + if (!wrk_line) { +@@ -236,6 +255,7 @@ + uint32 width, height; /* image width & height */ + uint32 row; + uint32 *wrk_line; ++ tsize_t raster_size; + int ok = 1; + + TIFFGetField(in, TIFFTAG_IMAGEWIDTH, &width); +@@ -251,7 +271,14 @@ + /* + * Allocate strip buffer + */ +- raster = (uint32*)_TIFFmalloc(width * rowsperstrip * sizeof (uint32)); ++ raster_size = multiply(multiply(width, rowsperstrip), sizeof (uint32)); ++ if (!raster_size) { ++ TIFFError(TIFFFileName(in), ++ "Can't allocate buffer for raster of size %lux%lu", ++ (unsigned long) width, (unsigned long) rowsperstrip); ++ return (0); ++ } ++ raster = (uint32*)_TIFFmalloc(raster_size); + if (raster == 0) { + TIFFError(TIFFFileName(in), "No space for raster buffer"); + return (0); +@@ -259,7 +286,7 @@ + + /* + * Allocate a scanline buffer for swapping during the vertical +- * mirroring pass. ++ * mirroring pass. (Request can't overflow given prior checks.) + */ + wrk_line = (uint32*)_TIFFmalloc(width * sizeof (uint32)); + if (!wrk_line) { Added: csw/mgar/pkg/tiff/trunk/files/libtiff-jpeg-scanline.patch =================================================================== --- csw/mgar/pkg/tiff/trunk/files/libtiff-jpeg-scanline.patch (rev 0) +++ csw/mgar/pkg/tiff/trunk/files/libtiff-jpeg-scanline.patch 2010-01-24 23:26:33 UTC (rev 8148) @@ -0,0 +1,59 @@ +http://bugzilla.maptools.org/show_bug.cgi?id=1936 + + +diff -Naur tiff-3.9.2.orig/libtiff/tif_dir.c tiff-3.9.2/libtiff/tif_dir.c +--- tiff-3.9.2.orig/libtiff/tif_dir.c 2008-12-31 19:10:43.000000000 -0500 ++++ tiff-3.9.2/libtiff/tif_dir.c 2010-01-05 19:59:12.000000000 -0500 +@@ -1100,6 +1100,13 @@ + */ + tif->tif_flags &= ~TIFF_ISTILED; + ++ /* ++ * Clear other directory-specific fields. ++ */ ++ tif->tif_tilesize = -1; ++ tif->tif_scanlinesize = -1; ++ ++ + return (1); + } + +diff -Naur tiff-3.9.2.orig/libtiff/tif_jpeg.c tiff-3.9.2/libtiff/tif_jpeg.c +--- tiff-3.9.2.orig/libtiff/tif_jpeg.c 2009-08-30 12:21:46.000000000 -0400 ++++ tiff-3.9.2/libtiff/tif_jpeg.c 2010-01-05 19:59:12.000000000 -0500 +@@ -1613,7 +1613,11 @@ + * Must recalculate cached tile size in case sampling state changed. + * Should we really be doing this now if image size isn't set? + */ +- tif->tif_tilesize = isTiled(tif) ? TIFFTileSize(tif) : (tsize_t) -1; ++ if( tif->tif_tilesize > 0 ) ++ tif->tif_tilesize = isTiled(tif) ? TIFFTileSize(tif) : (tsize_t) -1; ++ ++ if(tif->tif_scanlinesize > 0 ) ++ tif->tif_scanlinesize = TIFFScanlineSize(tif); + } + + static int +@@ -1741,13 +1745,21 @@ + return; + } + else +- { ++ { + if( !TIFFFillStrip( tif, 0 ) ) + return; + } + + TIFFSetField( tif, TIFFTAG_YCBCRSUBSAMPLING, + (uint16) sp->h_sampling, (uint16) sp->v_sampling ); ++ ++ /* ++ ** We want to clear the loaded strip so the application has time ++ ** to set JPEGCOLORMODE or other behavior modifiers. This essentially ++ ** undoes the JPEGPreDecode triggers by TIFFFileStrip(). (#1936) ++ */ ++ tif->tif_curstrip = -1; ++ + #endif /* CHECK_JPEG_YCBCR_SUBSAMPLING */ + } + Added: csw/mgar/pkg/tiff/trunk/files/libtiff-mantypo.patch =================================================================== --- csw/mgar/pkg/tiff/trunk/files/libtiff-mantypo.patch (rev 0) +++ csw/mgar/pkg/tiff/trunk/files/libtiff-mantypo.patch 2010-01-24 23:26:33 UTC (rev 8148) @@ -0,0 +1,15 @@ +http://bugzilla.maptools.org/show_bug.cgi?id=2129 + + +diff -Naur tiff-3.9.2.orig/man/tiffset.1 tiff-3.9.2/man/tiffset.1 +--- tiff-3.9.2.orig/man/tiffset.1 2006-04-20 08:17:19.000000000 -0400 ++++ tiff-3.9.2/man/tiffset.1 2009-12-03 12:11:58.000000000 -0500 +@@ -60,7 +60,7 @@ + ``Anonymous'': + .RS + .nf +-tiffset \-s 305 Anonymous a.tif ++tiffset \-s 315 Anonymous a.tif + .fi + .RE + .PP Added: csw/mgar/pkg/tiff/trunk/files/libtiff-scanlinesize.patch =================================================================== --- csw/mgar/pkg/tiff/trunk/files/libtiff-scanlinesize.patch (rev 0) +++ csw/mgar/pkg/tiff/trunk/files/libtiff-scanlinesize.patch 2010-01-24 23:26:33 UTC (rev 8148) @@ -0,0 +1,68 @@ +http://bugzilla.maptools.org/show_bug.cgi?id=2140 + + +diff -Naur tiff-3.9.2.orig/libtiff/tif_jpeg.c tiff-3.9.2/libtiff/tif_jpeg.c +--- tiff-3.9.2.orig/libtiff/tif_jpeg.c 2009-08-30 12:21:46.000000000 -0400 ++++ tiff-3.9.2/libtiff/tif_jpeg.c 2010-01-05 22:40:40.000000000 -0500 +@@ -988,8 +988,15 @@ + tsize_t nrows; + (void) s; + +- /* data is expected to be read in multiples of a scanline */ +- if ( (nrows = sp->cinfo.d.image_height) ) { ++ nrows = cc / sp->bytesperline; ++ if (cc % sp->bytesperline) ++ TIFFWarningExt(tif->tif_clientdata, tif->tif_name, "fractional scanline not read"); ++ ++ if( nrows > (int) sp->cinfo.d.image_height ) ++ nrows = sp->cinfo.d.image_height; ++ ++ /* data is expected to be read in multiples of a scanline */ ++ if (nrows) { + /* Cb,Cr both have sampling factors 1, so this is correct */ + JDIMENSION clumps_per_line = sp->cinfo.d.comp_info[1].downsampled_width; + int samples_per_clump = sp->samplesperclump; +@@ -1087,8 +1094,7 @@ + * TODO: resolve this */ + buf += sp->bytesperline; + cc -= sp->bytesperline; +- nrows -= sp->v_sampling; +- } while (nrows > 0); ++ } while (--nrows > 0); + + #ifdef JPEG_LIB_MK1 + _TIFFfree(tmpbuf); +diff -Naur tiff-3.9.2.orig/libtiff/tif_strip.c tiff-3.9.2/libtiff/tif_strip.c +--- tiff-3.9.2.orig/libtiff/tif_strip.c 2006-03-25 13:04:35.000000000 -0500 ++++ tiff-3.9.2/libtiff/tif_strip.c 2010-01-05 21:39:20.000000000 -0500 +@@ -238,23 +238,19 @@ + ycbcrsubsampling + 0, + ycbcrsubsampling + 1); + +- if (ycbcrsubsampling[0] == 0) { ++ if (ycbcrsubsampling[0]*ycbcrsubsampling[1] == 0) { + TIFFErrorExt(tif->tif_clientdata, tif->tif_name, + "Invalid YCbCr subsampling"); + return 0; + } + +- scanline = TIFFroundup(td->td_imagewidth, ++ /* number of sample clumps per line */ ++ scanline = TIFFhowmany(td->td_imagewidth, + ycbcrsubsampling[0]); +- scanline = TIFFhowmany8(multiply(tif, scanline, +- td->td_bitspersample, +- "TIFFScanlineSize")); +- return ((tsize_t) +- summarize(tif, scanline, +- multiply(tif, 2, +- scanline / ycbcrsubsampling[0], +- "TIFFVStripSize"), +- "TIFFVStripSize")); ++ /* number of samples per line */ ++ scanline = multiply(tif, scanline, ++ ycbcrsubsampling[0]*ycbcrsubsampling[1] + 2, ++ "TIFFScanlineSize"); + } else { + scanline = multiply(tif, td->td_imagewidth, + td->td_samplesperpixel, This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From hson at users.sourceforge.net Mon Jan 25 00:29:13 2010 From: hson at users.sourceforge.net (hson at users.sourceforge.net) Date: Sun, 24 Jan 2010 23:29:13 +0000 Subject: [csw-devel] SF.net SVN: gar:[8149] csw/mgar/pkg/jpeg Message-ID: Revision: 8149 http://gar.svn.sourceforge.net/gar/?rev=8149&view=rev Author: hson Date: 2010-01-24 23:29:13 +0000 (Sun, 24 Jan 2010) Log Message: ----------- Split package in tree Add intermediate makefile Modified Paths: -------------- csw/mgar/pkg/jpeg/trunk/Makefile Added Paths: ----------- csw/mgar/pkg/jpeg/Makefile Added: csw/mgar/pkg/jpeg/Makefile =================================================================== --- csw/mgar/pkg/jpeg/Makefile (rev 0) +++ csw/mgar/pkg/jpeg/Makefile 2010-01-24 23:29:13 UTC (rev 8149) @@ -0,0 +1,15 @@ +# vim: ft=make ts=4 sw=4 noet + +default: + @echo "You are in the pkg/ directory." + +%: + $(MAKE) -C trunk $* + +paranoid-%: + $(MAKE) -C trunk $* || exit 2 + +export BUILDLOG ?= $(shell pwd)/buildlog.txt + +report-%: + $(MAKE) -C trunk $* || echo " *** make $* in $$i failed ***" >> $(BUILDLOG) Modified: csw/mgar/pkg/jpeg/trunk/Makefile =================================================================== --- csw/mgar/pkg/jpeg/trunk/Makefile 2010-01-24 23:26:33 UTC (rev 8148) +++ csw/mgar/pkg/jpeg/trunk/Makefile 2010-01-24 23:29:13 UTC (rev 8149) @@ -1,5 +1,5 @@ GARNAME = jpeg -GARVERSION = 6 +GARVERSION = 7 CATEGORIES = lib DESCRIPTION = JPEG library and tools by the Independent JPEG Group @@ -10,14 +10,35 @@ MASTER_SITES = http://www.ijg.org/files/ DISTFILES = $(GARNAME)src.v$(GARVERSION).tar.gz -CONFIGURE_ARGS = $(DIRPATHS) -CONFIGURE_ARGS += --enable-shared +PACKAGES = CSWjpeg CSWjpegrt CSWjpegdevel +CATALOGNAME_CSWjpeg = jpeg +CATALOGNAME_CSWjpegrt = jpeg_rt +CATALOGNAME_CSWjpegdevel = jpeg_devel -EXTRA_CC_FLAGS = -g -w -EXTRA_CXX_FLAGS = -g -w -EXTRA_LD_FLAGS = -g -OPT_FLAGS_SOS = +SPKG_DESC_CSWjpeg += JPEG library and tools by the Independent JPEG Group +SPKG_DESC_CSWjpegrt += JPEG library and tools by the Independent JPEG Group - runtime package +SPKG_DESC_CSWjpegdevel += JPEG library and tools by the Independent JPEG Group - developer pa ckage +REQUIRED_PKGS_CSWjpeg += CSWjpegrt +REQUIRED_PKGS_CSWjpegrt += +REQUIRED_PKGS_CSWjpegdevel += CSWjpegrt + +PKGFILES_CSWjpegrt = $(PKGFILES_RT) +PKGFILES_CSWjpegdevel = $(PKGFILES_DEVEL) + +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.bz2 + +SPKG_SOURCEURL = http://www.ijg.org + +BUILD64 = 1 + STRIP_LIBTOOL = 1 +EXTRA_INC = $(prefix)/X11/include +EXTRA_LIB = $(prefix)/X11/lib +EXTRA_PKG_CONFIG_DIRS = $(prefix)/X11/lib + +CONFIGURE_ARGS = $(DIRPATHS) +CONFIGURE_ARGS += --enable-shared + include gar/category.mk This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From hson at users.sourceforge.net Mon Jan 25 00:42:58 2010 From: hson at users.sourceforge.net (hson at users.sourceforge.net) Date: Sun, 24 Jan 2010 23:42:58 +0000 Subject: [csw-devel] SF.net SVN: gar:[8150] csw/mgar/pkg/libcairo/trunk/Makefile Message-ID: Revision: 8150 http://gar.svn.sourceforge.net/gar/?rev=8150&view=rev Author: hson Date: 2010-01-24 23:42:57 +0000 (Sun, 24 Jan 2010) Log Message: ----------- libcairo: Update prerequsites Modified Paths: -------------- csw/mgar/pkg/libcairo/trunk/Makefile Modified: csw/mgar/pkg/libcairo/trunk/Makefile =================================================================== --- csw/mgar/pkg/libcairo/trunk/Makefile 2010-01-24 23:29:13 UTC (rev 8149) +++ csw/mgar/pkg/libcairo/trunk/Makefile 2010-01-24 23:42:57 UTC (rev 8150) @@ -28,7 +28,8 @@ PKGFILES_CSWlibcairodoc = $(sharedstatedir)/gtk-doc.* PKGFILES_CSWlibcairodoc += $(docdir)/libcairo_doc/.* -PREREQUISITE_PKGS = CSWlibxrenderdevel +PREREQUISITE_PKGS += CSWlibxrenderdevel CSWkbproto CSWrenderproto +PREREQUISITE_PKGS += CSWlibspectre REQUIRED_PKGS_CSWlibcairo = CSWfconfig REQUIRED_PKGS_CSWlibcairo += CSWftype2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From hson at users.sourceforge.net Mon Jan 25 00:47:44 2010 From: hson at users.sourceforge.net (hson at users.sourceforge.net) Date: Sun, 24 Jan 2010 23:47:44 +0000 Subject: [csw-devel] SF.net SVN: gar:[8151] csw/mgar/pkg/json-glib/trunk/Makefile Message-ID: Revision: 8151 http://gar.svn.sourceforge.net/gar/?rev=8151&view=rev Author: hson Date: 2010-01-24 23:47:44 +0000 (Sun, 24 Jan 2010) Log Message: ----------- json-glib: Package naming update Modified Paths: -------------- csw/mgar/pkg/json-glib/trunk/Makefile Modified: csw/mgar/pkg/json-glib/trunk/Makefile =================================================================== --- csw/mgar/pkg/json-glib/trunk/Makefile 2010-01-24 23:42:57 UTC (rev 8150) +++ csw/mgar/pkg/json-glib/trunk/Makefile 2010-01-24 23:47:44 UTC (rev 8151) @@ -18,27 +18,24 @@ MASTER_SITES = $(GNOME_MIRROR) DISTFILES = $(GARNAME)-$(GARVERSION).tar.bz2 -PACKAGES = CSWjsonglib CSWjsonglibdevel CSWjsonglibdoc -CATALOGNAME_CSWjsonglib = json_glib -CATALOGNAME_CSWjsonglibdevel = json_glib_devel -CATALOGNAME_CSWjsonglibdoc = json_glib_doc +PACKAGES = CSWjson-glib CSWjson-glibdevel CSWjson-glibdoc +CATALOGNAME_CSWjson-glib = json_glib +CATALOGNAME_CSWjson-glibdevel = json_glib_devel +CATALOGNAME_CSWjson-glibdoc = json_glib_doc -SPKG_DESC_CSWjsonglib += Library providing serialization and deserialization support for the JSON format -SPKG_DESC_CSWjsonglibdevel += Library providing serialization and deserialization support for the JSON format develiper package -SPKG_DESC_CSWjsonglibdoc += Library providing serialization and deserialization support for the JSON format documentation +SPKG_DESC_CSWjson-glib += Library providing serialization and deserialization support for the JSON format +SPKG_DESC_CSWjson-glibdevel += Library providing serialization and deserialization support for the JSON format develiper package +SPKG_DESC_CSWjson-glibdoc += Library providing serialization and deserialization support for the JSON format documentation -#PREREQUISITE_PKGS += CSWlibxcbdevel CSWlibpthreadstubs CSWlibxaudevel -#PREREQUISITE_PKGS += CSWxproto CSWrenderproto CSWkbproto CSWpython-devel +PKGFILES_CSWjson-glibdevel = $(PKGFILES_DEVEL) +PKGFILES_CSWjson-glibdoc = $(sharedstatedir)/gtk-doc/.* -#REQUIRED_PKGS += CSWbonobo2 CSWgconf2 CSWggettextrt CSWglib2 CSWgnomekeyring -#REQUIRED_PKGS += CSWgnomevfs2 CSWgtk2 CSWlibart CSWlibatk CSWlibbonoboui -#REQUIRED_PKGS += CSWlibcairo CSWlibglade2 CSWlibgnome CSWlibgnomecanvas -#REQUIRED_PKGS += CSWlibgnomeui CSWlibgoffice CSWlibgsf CSWlibpopt CSWlibxml2 -#REQUIRED_PKGS += CSWorbit2 CSWpango CSWperl CSWzlib -REQUIRED_PKGS_CSWjsonglib += CSWggettextrt CSWglib2 -REQUIRED_PKGS_CSWjsonglibdevel += CSWjsonglib -REQUIRED_PKGS_CSWjsonglibdoc += CSWjsonglib +ARCHALL_CSWjson-glibdoc = 1 +REQUIRED_PKGS_CSWjson-glib += CSWggettextrt CSWglib2 +REQUIRED_PKGS_CSWjson-glibdevel += CSWjson-glib +REQUIRED_PKGS_CSWjson-glibdoc += CSWjson-glib + UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.bz2 SPKG_SOURCEURL = http://live.gnome.org/JsonGlib @@ -47,8 +44,8 @@ EXTRA_LIB = $(prefix)/X11/lib EXTRA_PKG_CONFIG_DIRS = $(prefix)/X11/lib -NO_ISAEXEC = 1 -NOISALIST = 1 +#NO_ISAEXEC = 1 +#NOISALIST = 1 BUILD64 = 1 CONFIGURE_ARGS = $(DIRPATHS) @@ -57,11 +54,6 @@ SHELL = /opt/csw/bin/bash -PKGFILES_CSWjsonglibdevel = $(PKGFILES_DEVEL) -PKGFILES_CSWjsonglibdoc = $(sharedstatedir)/gtk-doc/.* - -ARCHALL_CSWjsonglibdoc = 1 - CONFIGURE_ARGS = $(DIRPATHS) include gar/category.mk This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From hson at users.sourceforge.net Mon Jan 25 00:53:15 2010 From: hson at users.sourceforge.net (hson at users.sourceforge.net) Date: Sun, 24 Jan 2010 23:53:15 +0000 Subject: [csw-devel] SF.net SVN: gar:[8152] csw/mgar/pkg/goocanvas/trunk/Makefile Message-ID: Revision: 8152 http://gar.svn.sourceforge.net/gar/?rev=8152&view=rev Author: hson Date: 2010-01-24 23:53:15 +0000 (Sun, 24 Jan 2010) Log Message: ----------- goocanvas: Fix link flags for X11 Modified Paths: -------------- csw/mgar/pkg/goocanvas/trunk/Makefile Modified: csw/mgar/pkg/goocanvas/trunk/Makefile =================================================================== --- csw/mgar/pkg/goocanvas/trunk/Makefile 2010-01-24 23:47:44 UTC (rev 8151) +++ csw/mgar/pkg/goocanvas/trunk/Makefile 2010-01-24 23:53:15 UTC (rev 8152) @@ -33,11 +33,7 @@ EXTRA_INC = $(prefix)/X11/include EXTRA_LIB = $(prefix)/X11/lib EXTRA_PKG_CONFIG_DIRS = $(prefix)/X11/lib -EXTRA_LINKER_FLAGS_isa-i386 = /usr/openwin/lib/libXext.so -EXTRA_LINKER_FLAGS_isa-sparcv8 = /usr/openwin/lib/libXext.so -EXTRA_LINKER_FLAGS_isa-amd64 = /usr/openwin/lib/amd64/libXext.so -EXTRA_LINKER_FLAGS_isa-sparcv9 = /usr/openwin/lib/sparcv9/libXext.so -EXTRA_LINKER_FLAGS += $(EXTRA_LINKER_FLAGS_$(MODULATION)) +EXTRA_SOS_LD_FLAGS = -L$(abspath $(prefix)/X11/lib/$(MM_LIBDIR)) #NO_ISAEXEC = 1 #NOISALIST = 1 @@ -54,6 +50,8 @@ STRIP_LIBTOOL = 1 CONFIGURE_ARGS = $(DIRPATHS) +CONFIGURE_ARGS += --x-include=$(prefix)/X11/include +CONFIGURE_ARGS += --x-libraries=$(abspath $(prefix)/X11/lib/$(MM_LIBDIR)) TEST_TARGET = check This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From hson at users.sourceforge.net Mon Jan 25 00:55:41 2010 From: hson at users.sourceforge.net (hson at users.sourceforge.net) Date: Sun, 24 Jan 2010 23:55:41 +0000 Subject: [csw-devel] SF.net SVN: gar:[8153] csw/mgar/pkg/gtksourceview/trunk/Makefile Message-ID: Revision: 8153 http://gar.svn.sourceforge.net/gar/?rev=8153&view=rev Author: hson Date: 2010-01-24 23:55:40 +0000 (Sun, 24 Jan 2010) Log Message: ----------- gtksourceview: Fix link flags for X11 Modified Paths: -------------- csw/mgar/pkg/gtksourceview/trunk/Makefile Modified: csw/mgar/pkg/gtksourceview/trunk/Makefile =================================================================== --- csw/mgar/pkg/gtksourceview/trunk/Makefile 2010-01-24 23:53:15 UTC (rev 8152) +++ csw/mgar/pkg/gtksourceview/trunk/Makefile 2010-01-24 23:55:40 UTC (rev 8153) @@ -37,12 +37,7 @@ EXTRA_INC = $(prefix)/X11/include EXTRA_LIB = $(prefix)/X11/lib EXTRA_PKG_CONFIG_DIRS = $(prefix)/X11/lib -#This is ugly, should be EXTRA_LINKER_FLAGS, but due to libtool it doesn't work -EXTRA_LD_FLAGS_isa-i386 = -L/usr/openwin/lib -lXext -EXTRA_LD_FLAGS_isa-sparcv8 = -L/usr/openwin/lib -lXext -EXTRA_LD_FLAGS_isa-amd64 = -L/usr/openwin/lib/amd64 -lXext -EXTRA_LD_FLAGS_isa-sparcv9 = -L/usr/openwin/lib/sparcv9 -lXext -EXTRA_LD_FLAGS += $(EXTRA_LD_FLAGS_$(MODULATION)) +EXTRA_SOS_LD_FLAGS = -L$(abspath $(prefix)/X11/lib/$(MM_LIBDIR)) #NO_ISAEXEC = 1 #NOISALIST = 1 @@ -55,6 +50,8 @@ ARCHALL_CSWgtksourceviewdoc = 1 CONFIGURE_ARGS = $(DIRPATHS) +CONFIGURE_ARGS += --x-include=$(prefix)/X11/include +CONFIGURE_ARGS += --x-libraries=$(abspath $(prefix)/X11/lib/$(MM_LIBDIR)) # Test fails due to: # Xlib: extension "Generic Event Extension" missing on display ":0.0". This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From hson at users.sourceforge.net Mon Jan 25 01:06:52 2010 From: hson at users.sourceforge.net (hson at users.sourceforge.net) Date: Mon, 25 Jan 2010 00:06:52 +0000 Subject: [csw-devel] SF.net SVN: gar:[8154] csw/mgar/pkg/lcms/trunk/Makefile Message-ID: Revision: 8154 http://gar.svn.sourceforge.net/gar/?rev=8154&view=rev Author: hson Date: 2010-01-25 00:06:47 +0000 (Mon, 25 Jan 2010) Log Message: ----------- Add runtime package Don't build static lib Modified Paths: -------------- csw/mgar/pkg/lcms/trunk/Makefile Modified: csw/mgar/pkg/lcms/trunk/Makefile =================================================================== --- csw/mgar/pkg/lcms/trunk/Makefile 2010-01-24 23:55:40 UTC (rev 8153) +++ csw/mgar/pkg/lcms/trunk/Makefile 2010-01-25 00:06:47 UTC (rev 8154) @@ -18,32 +18,33 @@ DISTFILES = $(GARNAME)-$(GARVERSION)$(GARSUBREV).tar.gz #DISTFILES = $(GARNAME)-$(GARVERSION)$(GARSUBREV).tar.gz -PACKAGES = CSWlcms CSWlcmsdevel +PACKAGES = CSWlcms CSWlcmsrt CSWlcmsdevel CATALOGNAME_CSWlcms = lcms +CATALOGNAME_CSWlcmsrt = lcms_rt CATALOGNAME_CSWlcmsdevel = lcms_devel SPKG_DESC_CSWlcms += The little color management system and tools +SPKG_DESC_CSWlcmsrt += The little color management system and tools - runtime package SPKG_DESC_CSWlcmsdevel += The little color management system and tools - developer package -REQUIRED_PKGS_CSWlcms += CSWjpeg CSWtiff CSWzlib +REQUIRED_PKGS_CSWlcms += CSWlcmsrt CSWjpeg CSWtiff CSWzlib +REQUIRED_PKGS_CSWlcmsrt += REQUIRED_PKGS_CSWlcmsdevel += CSWlcms +PKGFILES_CSWlcmsrt = $(PKGFILES_RT) PKGFILES_CSWlcmsdevel = $(PKGFILES_DEVEL) SPKG_SOURCEURL = http://www.littlecms.com LICENSE = COPYING -# We define upstream file regex so we can be notifed of new upstream software release UPSTREAM_MASTER_SITES = $(SF_PROJECT_SHOWFILE)=26279 UPSTREAM_USE_SF = 1 UFILES_REGEX = (\d+(?:\.\d+)*) -# If the url used to check for software update is different of MASTER_SITES, then -# uncomment the next line. Otherwise it is set by default to the value of MASTER_SITES -# UPSTREAM_MASTER_SITES = - CONFIGURE_ARGS = $(DIRPATHS) +CONFIGURE_ARGS += --enable-static=no +CONFIGURE_ARGS += --with-python BUILD64 = 1 @@ -51,4 +52,3 @@ include gar/category.mk -#SPKG_REVSTAMP := $(SPKG_REVSTAMP)_rev=$(GARSUBREV) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From hson at users.sourceforge.net Mon Jan 25 01:07:19 2010 From: hson at users.sourceforge.net (hson at users.sourceforge.net) Date: Mon, 25 Jan 2010 00:07:19 +0000 Subject: [csw-devel] SF.net SVN: gar:[8155] csw/mgar/pkg/ImageMagick/trunk/Makefile Message-ID: Revision: 8155 http://gar.svn.sourceforge.net/gar/?rev=8155&view=rev Author: hson Date: 2010-01-25 00:07:18 +0000 (Mon, 25 Jan 2010) Log Message: ----------- Add 64-bit support (even though not all modules can be built on 64-bit) Modified Paths: -------------- csw/mgar/pkg/ImageMagick/trunk/Makefile Modified: csw/mgar/pkg/ImageMagick/trunk/Makefile =================================================================== --- csw/mgar/pkg/ImageMagick/trunk/Makefile 2010-01-25 00:06:47 UTC (rev 8154) +++ csw/mgar/pkg/ImageMagick/trunk/Makefile 2010-01-25 00:07:18 UTC (rev 8155) @@ -32,14 +32,22 @@ #CPPFLAGS += -I/usr/openwin/include -I/usr/openwin/include/X11 -CONFIGURE_ARGS = $(DIRPATHS) -CONFIGURE_ARGS += --with-perl=$(bindir)/perl -CONFIGURE_ARGS += --enable-shared --disable-static -CONFIGURE_ARGS += --with-dps=yes --with-gslib=yes -CONFIGURE_ARGS += --x-includes=/opt/csw/X11/include -CONFIGURE_ARGS += --x-libraries=/opt/csw/X11/lib -CONFIGURE_ARGS += --disable-openmp +CONFIGURE_ARGS_COMMON = $(DIRPATHS) +CONFIGURE_ARGS_COMMON += --with-perl=$(bindir)/perl +CONFIGURE_ARGS_COMMON += --enable-shared --disable-static +CONFIGURE_ARGS_COMMON += --with-dps=yes --with-gslib=yes +CONFIGURE_ARGS_COMMON += --x-includes=/opt/csw/X11/include +CONFIGURE_ARGS_COMMON += --x-libraries=/opt/csw/X11/lib +CONFIGURE_ARGS_COMMON += --disable-openmp +CONFIGURE_ARGS_isa-amd64 += --without-gvc +CONFIGURE_ARGS_isa-amd64 += --without-rsvg +CONFIGURE_ARGS_isa-amd64 += --without-perl +CONFIGURE_ARGS_isa-sparcv9 += --without-gvc +CONFIGURE_ARGS_isa-sparcv9 += --without-rsvg +CONFIGURE_ARGS_isa-sparcv9 += --without-perl +CONFIGURE_ARGS ?= $(CONFIGURE_ARGS_COMMON) $(foreach M,$(MODULATIONS),$(CONFIGURE_ARGS_$M)) + PATCHFILES += Makefile.patch # Temporary patch until upstream make a more permenent fix #PATCHFILES += djvu.c.diff @@ -48,13 +56,17 @@ #TEST_TARGET = check TEST_TARGET = +BUILD64 = 1 + EXTRA_INC = $(prefix)/X11/include EXTRA_LIB = $(prefix)/X11/lib EXTRA_PKG_CONFIG_DIRS = $(prefix)/X11/lib -EXTRA_LD_OPTIONS = -L./magick/.libs +#EXTRA_LDFLAGS = -L./magick/.libs +#EXTRA_LD_OPTIONS = -L./magick/.libs # We want to be link with Xrender from $(prefix)/X11/lib not $(prefix)/lib # since the latter is linked to /usr/openwin/lib/libX11.so.4 -EXTRA_SOS_LD_FLAGS = -L$(abspath $(prefix)/X11/lib/$(MM_LIBDIR)) +EXTRA_SOS_LD_FLAGS = -L./magick/.libs +EXTRA_SOS_LD_FLAGS +=-L$(abspath $(prefix)/X11/lib/$(MM_LIBDIR)) MERGE_EXCLUDE_LIBTOOL ?= $(libdir)/lib.*\.la EXTRA_MERGE_EXCLUDE_FILES = .*/perllocal.pod @@ -73,7 +85,7 @@ @( if [ ! -r $(INSTALLISADIR)$(libdir)/libWand.so.10.0.4 ] ; then ln -s libWand.so.10.0.4 $(INSTALLISADIR)$(libdir)/libWand.so.10 ; fi ) @( if [ ! -r $(INSTALLISADIR)$(libdir)/libMagick++.so.10.0.4 ] ; then ln -s libMagick++.so.10.0.4 $(INSTALLISADIR)$(libdir)/libMagick++.so.10 ; fi ) @ln -s ImageMagick-$(GARVERSION) $(INSTALLISADIR)$(docdir)/ImageMagick - @( cd $(INSTALLISADIR)$(libdir) ; gzip -dc $(DESTDIR)/../../$(FILEDIR)/lib_6.2.9_s.tar.gz |tar xf -) + @( cd $(INSTALLISADIR)$(libdir) ; gzip -dc $(CURDIR)/$(FILEDIR)/lib_6.2.9_s.tar.gz |tar xf -) @mv $(INSTALLISADIR)$(mandir)/man1/compare.1 $(INSTALLISADIR)$(mandir)/man1/compare2.1 @mv $(INSTALLISADIR)$(bindir)/compare $(INSTALLISADIR)$(bindir)/compare2 @$(MAKECOOKIE) @@ -86,7 +98,7 @@ @( if [ ! -r $(INSTALLISADIR)$(libdir)/libWand.so.10.0.4 ] ; then ln -s libWand.so.10.0.4 $(INSTALLISADIR)$(libdir)/libWand.so.10 ; fi ) @( if [ ! -r $(INSTALLISADIR)$(libdir)/libMagick++.so.10.0.4 ] ; then ln -s libMagick++.so.10.0.4 $(INSTALLISADIR)$(libdir)/libMagick++.so.10 ; fi ) @ln -s ImageMagick-$(GARVERSION) $(INSTALLISADIR)$(docdir)/ImageMagick - @( cd $(INSTALLISADIR)$(libdir) ; gzip -dc $(DESTDIR)/../../$(FILEDIR)/lib_6.2.9_i.tar.gz |tar xf -) + @( cd $(INSTALLISADIR)$(libdir) ; gzip -dc $(CURDIR)/$(FILEDIR)/lib_6.2.9_i.tar.gz |tar xf -) @mv $(INSTALLISADIR)$(mandir)/man1/compare.1 $(INSTALLISADIR)$(mandir)/man1/compare2.1 @mv $(INSTALLISADIR)$(bindir)/compare $(INSTALLISADIR)$(bindir)/compare2 @$(MAKECOOKIE) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From hson at users.sourceforge.net Mon Jan 25 01:29:13 2010 From: hson at users.sourceforge.net (hson at users.sourceforge.net) Date: Mon, 25 Jan 2010 00:29:13 +0000 Subject: [csw-devel] SF.net SVN: gar:[8156] csw/mgar/pkg/librsvg/trunk/Makefile Message-ID: Revision: 8156 http://gar.svn.sourceforge.net/gar/?rev=8156&view=rev Author: hson Date: 2010-01-25 00:29:13 +0000 (Mon, 25 Jan 2010) Log Message: ----------- librsvg: Add some missing dependecy Modified Paths: -------------- csw/mgar/pkg/librsvg/trunk/Makefile Modified: csw/mgar/pkg/librsvg/trunk/Makefile =================================================================== --- csw/mgar/pkg/librsvg/trunk/Makefile 2010-01-25 00:07:18 UTC (rev 8155) +++ csw/mgar/pkg/librsvg/trunk/Makefile 2010-01-25 00:29:13 UTC (rev 8156) @@ -28,11 +28,13 @@ REQUIRED_PKGS += CSWbzip2 CSWfconfig CSWftype2 CSWggettextrt REQUIRED_PKGS += CSWglib2 CSWgs CSWgtk2 CSWiconv CSWlibatk -REQUIRED_PKGS += CSWlibcairo CSWlibcroco CSWlibgsf +REQUIRED_PKGS += CSWlibcairo CSWlibcroco CSWlibgsf CSWlibx11 REQUIRED_PKGS += CSWlibxml2 CSWlibxml2devel CSWpango CSWpng CSWzlib REQUIRED_PKGS += CSWbonobo2 CSWgconf2 CSWgnomevfs2 CSWlibxrender CSWorbit2 -# We define upstream file regex so we can be notifed of new upstream software release +# Only if building mozilla plugin +#PREREQUISITE_PKGS += CSWmozilla + UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.bz2 # Upstream develops on gcc only @@ -40,8 +42,8 @@ PATCHFILES += perceptualdiff.patch # Upstream have missed adding some required libs PATCHFILES += test_makefiles.patch -# gtkdoc-rebase doesn't exist -PATCHFILES += doc_makefile.patch +# gtkdoc-rebase doesn't exist (now it does) +#PATCHFILES += doc_makefile.patch LIBS=-lm EXTRA_COMMON_EXPORTS = LIBS This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From hson at users.sourceforge.net Mon Jan 25 01:31:23 2010 From: hson at users.sourceforge.net (hson at users.sourceforge.net) Date: Mon, 25 Jan 2010 00:31:23 +0000 Subject: [csw-devel] SF.net SVN: gar:[8157] csw/mgar/pkg/ImageMagick/trunk Message-ID: Revision: 8157 http://gar.svn.sourceforge.net/gar/?rev=8157&view=rev Author: hson Date: 2010-01-25 00:31:22 +0000 (Mon, 25 Jan 2010) Log Message: ----------- Update to 6.5.9-0 Disable silent build Modified Paths: -------------- csw/mgar/pkg/ImageMagick/trunk/Makefile csw/mgar/pkg/ImageMagick/trunk/checksums Modified: csw/mgar/pkg/ImageMagick/trunk/Makefile =================================================================== --- csw/mgar/pkg/ImageMagick/trunk/Makefile 2010-01-25 00:29:13 UTC (rev 8156) +++ csw/mgar/pkg/ImageMagick/trunk/Makefile 2010-01-25 00:31:22 UTC (rev 8157) @@ -1,6 +1,6 @@ GARNAME = imagemagick -GARVERSION = 6.5.8 -GARSUBREV = 10 +GARVERSION = 6.5.9 +GARSUBREV = 0 CATEGORIES = lib DESCRIPTION = A comprehensive package supporting automated and interative manipulation of images @@ -30,8 +30,6 @@ # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = ImageMagick-((\d+(?:\.\d+)*)-(\d+)?).tar.bz2 -#CPPFLAGS += -I/usr/openwin/include -I/usr/openwin/include/X11 - CONFIGURE_ARGS_COMMON = $(DIRPATHS) CONFIGURE_ARGS_COMMON += --with-perl=$(bindir)/perl CONFIGURE_ARGS_COMMON += --enable-shared --disable-static @@ -39,6 +37,7 @@ CONFIGURE_ARGS_COMMON += --x-includes=/opt/csw/X11/include CONFIGURE_ARGS_COMMON += --x-libraries=/opt/csw/X11/lib CONFIGURE_ARGS_COMMON += --disable-openmp +CONFIGURE_ARGS_COMMON += --disable-silent-rules CONFIGURE_ARGS_isa-amd64 += --without-gvc CONFIGURE_ARGS_isa-amd64 += --without-rsvg CONFIGURE_ARGS_isa-amd64 += --without-perl Modified: csw/mgar/pkg/ImageMagick/trunk/checksums =================================================================== --- csw/mgar/pkg/ImageMagick/trunk/checksums 2010-01-25 00:29:13 UTC (rev 8156) +++ csw/mgar/pkg/ImageMagick/trunk/checksums 2010-01-25 00:31:22 UTC (rev 8157) @@ -1,2 +1,2 @@ -fc04d56c32bb2eebba7885d0db042f9a ImageMagick-6.5.8-10.tar.bz2 +58130d17863449ad1b7c6d04cee95943 ImageMagick-6.5.9-0.tar.bz2 6bd361fe352c7d497d60d8d2cbe7cfd4 Makefile.patch This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From hson at users.sourceforge.net Mon Jan 25 01:31:40 2010 From: hson at users.sourceforge.net (hson at users.sourceforge.net) Date: Mon, 25 Jan 2010 00:31:40 +0000 Subject: [csw-devel] SF.net SVN: gar:[8158] csw/mgar/pkg/libpaper/trunk/Makefile Message-ID: Revision: 8158 http://gar.svn.sourceforge.net/gar/?rev=8158&view=rev Author: hson Date: 2010-01-25 00:31:39 +0000 (Mon, 25 Jan 2010) Log Message: ----------- libpaper: Build 64-bit Modified Paths: -------------- csw/mgar/pkg/libpaper/trunk/Makefile Modified: csw/mgar/pkg/libpaper/trunk/Makefile =================================================================== --- csw/mgar/pkg/libpaper/trunk/Makefile 2010-01-25 00:31:22 UTC (rev 8157) +++ csw/mgar/pkg/libpaper/trunk/Makefile 2010-01-25 00:31:39 UTC (rev 8158) @@ -29,6 +29,8 @@ EXTRA_CFLAGS = -Xc +BUILD64 = 1 + CONFIGURE_ARGS = $(DIRPATHS) TEST_TARGET = check This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From hson at users.sourceforge.net Mon Jan 25 03:02:24 2010 From: hson at users.sourceforge.net (hson at users.sourceforge.net) Date: Mon, 25 Jan 2010 02:02:24 +0000 Subject: [csw-devel] SF.net SVN: gar:[8159] csw/mgar/pkg/libsoup Message-ID: Revision: 8159 http://gar.svn.sourceforge.net/gar/?rev=8159&view=rev Author: hson Date: 2010-01-25 02:02:24 +0000 (Mon, 25 Jan 2010) Log Message: ----------- libsoup: Inital commit Added Paths: ----------- csw/mgar/pkg/libsoup/branches/ csw/mgar/pkg/libsoup/tags/ csw/mgar/pkg/libsoup/trunk/Makefile csw/mgar/pkg/libsoup/trunk/checksums csw/mgar/pkg/libsoup/trunk/files/ Property Changed: ---------------- csw/mgar/pkg/libsoup/trunk/ Property changes on: csw/mgar/pkg/libsoup/trunk ___________________________________________________________________ Added: svn:ignore + cookies download work Added: csw/mgar/pkg/libsoup/trunk/Makefile =================================================================== --- csw/mgar/pkg/libsoup/trunk/Makefile (rev 0) +++ csw/mgar/pkg/libsoup/trunk/Makefile 2010-01-25 02:02:24 UTC (rev 8159) @@ -0,0 +1,56 @@ +GARNAME = libsoup +GARVERSION = 2.26.3 +CATEGORIES = lib + + +DESCRIPTION = HTTP client/server library for GNOME +define BLURB +endef +MASTER_SITES = $(GNOME_MIRROR) +DISTFILES = $(GARNAME)-$(GARVERSION).tar.bz2 + + +PACKAGES = CSWlibsoup CSWlibsoupdevel CSWlibsoupdoc +CATALOGNAME_CSWlibsoup = libsoup +CATALOGNAME_CSWlibsoupdevel = libsoup_devel +CATALOGNAME_CSWlibsoupdoc = libsoup_doc + +SPKG_DESC_CSWlibsoup += HTTP client/server library for GNOME +SPKG_DESC_CSWlibsoupdevel += HTTP client/server library for GNOME - developer package +SPKG_DESC_CSWlibsoupdoc += HTTP client/server library for GNOME - documentation + +REQUIRED_PKGS_CSWlibsoup += CSWgconf2 CSWgcrypt CSWggettextrt CSWglib2 +REQUIRED_PKGS_CSWlibsoup += CSWgnutls CSWgpgerr CSWlibproxy CSWlibxml2 +REQUIRED_PKGS_CSWlibsoup += CSWsqlite3rt +REQUIRED_PKGS_CSWlibsoupdevel += CSWlibsoup +REQUIRED_PKGS_CSWlibsoupdoc += + +PREREQUISITE_PKGS += CSWlibproxy + +PKGFILES_CSWlibsoupdevel = $(PKGFILES_DEVEL) +PKGFILES_CSWlibsoupdoc = $(sharedstatedir)/gtk-doc/.* + +ARCHALL_CSWlibsoupdoc = 1 + +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.bz2 + +EXTRA_INC = /opt/csw/X11/include +EXTRA_LIB = /opt/csw/X11/lib +EXTRA_PKG_CONFIG_DIRS = $(prefix)/X11/lib +EXTRA_SOS_LD_FLAGS = -L$(abspath $(prefix)/X11/lib/$(MM_LIBDIR)) + +CONFIGURE_ARGS = $(DIRPATHS) +CONFIGURE_ARGS += --x-includes=$(prefix)/X11/include +CONFIGURE_ARGS += --x-libraries=$(abspath $(prefix)/X11/lib/$(MM_LIBDIR)) + +STRIP_LIBTOOL = 1 + +# Not working until gconf2 is 64-bit +#BUILD64 = 1 + +# One test fails for some unknown reason +#TEST_TARGET = check +TEST_TARGET = + +include gar/category.mk Added: csw/mgar/pkg/libsoup/trunk/checksums =================================================================== --- csw/mgar/pkg/libsoup/trunk/checksums (rev 0) +++ csw/mgar/pkg/libsoup/trunk/checksums 2010-01-25 02:02:24 UTC (rev 8159) @@ -0,0 +1 @@ +19f15636380a9a08a0f071cc53069b80 libsoup-2.26.3.tar.bz2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From hson at users.sourceforge.net Mon Jan 25 03:04:10 2010 From: hson at users.sourceforge.net (hson at users.sourceforge.net) Date: Mon, 25 Jan 2010 02:04:10 +0000 Subject: [csw-devel] SF.net SVN: gar:[8160] csw/mgar/pkg/libsoup/trunk/ Message-ID: Revision: 8160 http://gar.svn.sourceforge.net/gar/?rev=8160&view=rev Author: hson Date: 2010-01-25 02:04:09 +0000 (Mon, 25 Jan 2010) Log Message: ----------- libsoup: Add gar Property Changed: ---------------- csw/mgar/pkg/libsoup/trunk/ Property changes on: csw/mgar/pkg/libsoup/trunk ___________________________________________________________________ Added: svn:externals + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From hson at users.sourceforge.net Mon Jan 25 03:47:29 2010 From: hson at users.sourceforge.net (hson at users.sourceforge.net) Date: Mon, 25 Jan 2010 02:47:29 +0000 Subject: [csw-devel] SF.net SVN: gar:[8161] csw/mgar/pkg/librsvg/trunk/Makefile Message-ID: Revision: 8161 http://gar.svn.sourceforge.net/gar/?rev=8161&view=rev Author: hson Date: 2010-01-25 02:47:29 +0000 (Mon, 25 Jan 2010) Log Message: ----------- librsvg: Split package Modified Paths: -------------- csw/mgar/pkg/librsvg/trunk/Makefile Modified: csw/mgar/pkg/librsvg/trunk/Makefile =================================================================== --- csw/mgar/pkg/librsvg/trunk/Makefile 2010-01-25 02:04:09 UTC (rev 8160) +++ csw/mgar/pkg/librsvg/trunk/Makefile 2010-01-25 02:47:29 UTC (rev 8161) @@ -26,14 +26,36 @@ LICENSE = COPYING.LIB -REQUIRED_PKGS += CSWbzip2 CSWfconfig CSWftype2 CSWggettextrt -REQUIRED_PKGS += CSWglib2 CSWgs CSWgtk2 CSWiconv CSWlibatk -REQUIRED_PKGS += CSWlibcairo CSWlibcroco CSWlibgsf CSWlibx11 -REQUIRED_PKGS += CSWlibxml2 CSWlibxml2devel CSWpango CSWpng CSWzlib -REQUIRED_PKGS += CSWbonobo2 CSWgconf2 CSWgnomevfs2 CSWlibxrender CSWorbit2 +PACKAGES = CSWlibrsvg CSWlibrsvgdevel CSWlibrsvgdoc CSWlibrsvgmozilla +CATALOGNAME_CSWlibrsvg = librsvg +CATALOGNAME_CSWlibrsvgdevel = librsvg_devel +CATALOGNAME_CSWlibrsvgdoc = librsvg_doc +CATALOGNAME_CSWlibrsvgmozilla = librsvg_mozilla + +SPKG_DESC_CSWlibrsvg += Scalable Vector Graphics library +SPKG_DESC_CSWlibrsvgdevel += Scalable Vector Graphics library - developer package +SPKG_DESC_CSWlibrsvgdoc += Scalable Vector Graphics library - documentation +SPKG_DESC_CSWlibrsvgmozilla += Scalable Vector Graphics library - Mozilla plugin + +REQUIRED_PKGS_CSWlibrsvg += CSWfconfig CSWftype2 CSWggettextrt +REQUIRED_PKGS_CSWlibrsvg += CSWglib2 CSWgtk2 CSWlibatk +REQUIRED_PKGS_CSWlibrsvg += CSWlibcairo CSWlibcroco CSWlibgsf CSWlibx11 +REQUIRED_PKGS_CSWlibrsvg += CSWlibxml2 CSWpango CSWpng CSWzlib CSWorbit2 +REQUIRED_PKGS_CSWlibrsvg += CSWbonobo2 CSWgconf2 CSWgnomevfs2 CSWlibxrender +REQUIRED_PKGS_CSWlibrsvgdevel += CSWlibrsvg +REQUIRED_PKGS_CSWlibrsvgdoc += +REQUIRED_PKGS_CSWlibrsvgmozilla += CSWggettextrt CSWglib2 + +PKGFILES_CSWlibrsvgdevel = $(PKGFILES_DEVEL) +PKGFILES_CSWlibrsvgmozilla = $(libdir)/mozilla/.* +PKGFILES_CSWlibrsvgdoc = $(sharedstatedir)/gtk-doc/.* + +ARCHALL_CSWlibrsvgdoc = 1 + # Only if building mozilla plugin -#PREREQUISITE_PKGS += CSWmozilla +PREREQUISITE_PKGS += CSWmozilla +PREREQUISITE_PKGS += CSWlibxml2devel UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.bz2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From hson at users.sourceforge.net Mon Jan 25 04:03:22 2010 From: hson at users.sourceforge.net (hson at users.sourceforge.net) Date: Mon, 25 Jan 2010 03:03:22 +0000 Subject: [csw-devel] SF.net SVN: gar:[8162] csw/mgar/pkg/ghostscript/trunk Message-ID: Revision: 8162 http://gar.svn.sourceforge.net/gar/?rev=8162&view=rev Author: hson Date: 2010-01-25 03:03:21 +0000 (Mon, 25 Jan 2010) Log Message: ----------- ghostscript: Final fixes for GAR package Modified Paths: -------------- csw/mgar/pkg/ghostscript/trunk/Makefile csw/mgar/pkg/ghostscript/trunk/checksums Added Paths: ----------- csw/mgar/pkg/ghostscript/trunk/files/0004-PLATFORM-is-used-by-GAR.patch csw/mgar/pkg/ghostscript/trunk/files/0005-Fix-pathes-according-to-old-package.patch csw/mgar/pkg/ghostscript/trunk/files/0006-Fix-dynamic-link-flag.patch Modified: csw/mgar/pkg/ghostscript/trunk/Makefile =================================================================== --- csw/mgar/pkg/ghostscript/trunk/Makefile 2010-01-25 02:47:29 UTC (rev 8161) +++ csw/mgar/pkg/ghostscript/trunk/Makefile 2010-01-25 03:03:21 UTC (rev 8162) @@ -9,11 +9,17 @@ MASTER_SITES = $(SF_MIRRORS) DISTFILES = $(GARNAME)-$(GARVERSION).tar.bz2 -SPKG_SOURCEURL = http://www.ghostscript.com +PACKAGES = CSWgs +CATALOGNAME_CSWgs = ghostscript +SPKG_DESC_CSWgs = Ghostscript, a PostScript and PDF interpreter for previewing, conversion and printing -LICENSE = COPYING +REQUIRED_PKGS_CSWgs += CSWfconfig CSWjpeg CSWlibcairo CSWgsfonts +REQUIRED_PKGS_CSWgs += CSWftype2 CSWggettextrt CSWglib2 CSWgnutls CSWgtk2 +REQUIRED_PKGS_CSWgs += CSWkrb5lib CSWlibatk CSWlibcups CSWpango CSWperl CSWzlib +# Pending release of libpaper +#REQUIRED_PKGS_CSWgs += CSWlibpaper -REQUIRED_PKGS += +SPKG_SOURCEURL = http://www.ghostscript.com UPSTREAM_MASTER_SITES = $(SF_PROJECT_SHOWFILE)= UPSTREAM_USE_SF = 1 @@ -22,21 +28,40 @@ #PATCHFILES += 0001-Support-libjpeg7.patch PATCHFILES += 0002-Rearrange-compiler-flags.patch PATCHFILES += 0003-Change-gcc-flags-to-sun.patch +PATCHFILES += 0004-PLATFORM-is-used-by-GAR.patch +PATCHFILES += 0005-Fix-pathes-according-to-old-package.patch +PATCHFILES += 0006-Fix-dynamic-link-flag.patch -#BUILD64 = 1 +# Not until libcupsimage.so libcups.so libkrb5.so libk5crypto.so +# libcom_err.so libkrb5support.so are 64-bit EXTRA_INC = $(prefix)/X11/include EXTRA_LIB = $(prefix)/X11/lib EXTRA_PKG_CONFIG_DIRS = $(prefix)/X11/lib +# We want to be linked with Xrender from $(prefix)/X11/lib not +# $(prefix)/lib since the latter is linked to /usr/openwin/lib/libX11.so.4 +EXTRA_SOS_LD_FLAGS = -L$(abspath $(prefix)/X11/lib/$(MM_LIBDIR)) CONFIGURE_ARGS = $(DIRPATHS) CONFIGURE_ARGS += --enable-dynamic +CONFIGURE_ARGS += --enable-cups +CONFIGURE_ARGS += --with-fontpath=$(datadir)/ghostscript/fonts CONFIGURE_ARGS += --x-includes=$(prefix)/X11/include CONFIGURE_ARGS += --x-libraries=$(prefix)/X11/lib +# This fails due to ghostscript using PLATFORM for internal use which gets set +# by GAR +#TEST_TARGET = check +TEST_TARGET = + include gar/category.mk +BUILD_ARGS = std so +INSTALL_ARGS = install install-so + +# Use CSW build packages instead of bundled stuff pre-configure-$(MODULATION): - @(echo "~~~ Removing bundled jpeglib ~~~") + @(echo "~~~ Removing bundled stuff ~~~") @rm -rf $(WORKSRC)/jpeg + @rm -rf $(WORKSRC)/jbig2dec # @rm -rf $(WORKSRC)/jasper Modified: csw/mgar/pkg/ghostscript/trunk/checksums =================================================================== --- csw/mgar/pkg/ghostscript/trunk/checksums 2010-01-25 02:47:29 UTC (rev 8161) +++ csw/mgar/pkg/ghostscript/trunk/checksums 2010-01-25 03:03:21 UTC (rev 8162) @@ -1,3 +1,7 @@ +251419464651542627742f241455a935 0001-Support-libjpeg7.patch 5ebe8476ccc2170e4f2d620fe284f875 0002-Rearrange-compiler-flags.patch 5c142b23f91c2b2f48ba1f354e26346f 0003-Change-gcc-flags-to-sun.patch +c3b8108ba2a09ce9473e785cdea12662 0004-PLATFORM-is-used-by-GAR.patch +b4957c4667d2bf767c2a18707429477d 0005-Fix-pathes-according-to-old-package.patch +0ac8a3bc8cc018a695c892328f65f2cf 0006-Fix-dynamic-link-flag.patch 526366f8cb4fda0d3d293597cc5b984b ghostscript-8.70.tar.bz2 Added: csw/mgar/pkg/ghostscript/trunk/files/0004-PLATFORM-is-used-by-GAR.patch =================================================================== --- csw/mgar/pkg/ghostscript/trunk/files/0004-PLATFORM-is-used-by-GAR.patch (rev 0) +++ csw/mgar/pkg/ghostscript/trunk/files/0004-PLATFORM-is-used-by-GAR.patch 2010-01-25 03:03:21 UTC (rev 8162) @@ -0,0 +1,116 @@ +diff -Nru ghostscript-8.70.orig/base/gs.mak ghostscript-8.70/base/gs.mak +--- ghostscript-8.70.orig/base/gs.mak 2009-01-27 21:43:37.000000000 +0100 ++++ ghostscript-8.70/base/gs.mak 2010-01-10 23:24:54.511788159 +0100 +@@ -363,7 +363,7 @@ + FEATURE_DEVS_EXTRA= + DEVICE_DEVS_EXTRA= + +-DEVS_ALL=$(GLGENDIR)$(D)$(PLATFORM).dev\ ++DEVS_ALL=$(GLGENDIR)$(D)$(BUILD_PLATFORM).dev\ + $(FEATURE_DEVS) $(FEATURE_DEVS_EXTRA) \ + $(DEVICE_DEVS) $(DEVICE_DEVS1) \ + $(DEVICE_DEVS2) $(DEVICE_DEVS3) $(DEVICE_DEVS4) $(DEVICE_DEVS5) \ +@@ -375,7 +375,7 @@ + + devs_tr=$(GLGENDIR)$(D)devs.tr + $(devs_tr) : $(GS_MAK) $(TOP_MAKEFILES) $(ECHOGS_XE) +- $(EXP)$(ECHOGS_XE) -w $(devs_tr) - -include $(GLGENDIR)$(D)$(PLATFORM) ++ $(EXP)$(ECHOGS_XE) -w $(devs_tr) - -include $(GLGENDIR)$(D)$(BUILD_PLATFORM) + $(EXP)$(ECHOGS_XE) -a $(devs_tr) -+ $(FEATURE_DEVS) + $(EXP)$(ECHOGS_XE) -a $(devs_tr) -+ $(FEATURE_DEVS_EXTRA) + $(EXP)$(ECHOGS_XE) -a $(devs_tr) -+ $(DEVICE_DEVS) +diff -Nru ghostscript-8.70.orig/base/macos-mcp.mak ghostscript-8.70/base/macos-mcp.mak +--- ghostscript-8.70.orig/base/macos-mcp.mak 2009-01-08 10:17:18.000000000 +0100 ++++ ghostscript-8.70/base/macos-mcp.mak 2010-01-10 23:25:55.154224777 +0100 +@@ -75,7 +75,7 @@ + + # Define the platform name. + +-PLATFORM=macos_ ++BUILD_PLATFORM=macos_ + + + # don't use any shared libraries, they are compiled into the Ghostscript Lib +@@ -267,7 +267,7 @@ + include $(GLSRCDIR)/unixhead.mak + + # Redefine the platform name before going on +-PLATFORM=macos_ ++BUILD_PLATFORM=macos_ + + include $(GLSRCDIR)/gs.mak + # psromfs.mak must precede lib.mak +diff -Nru ghostscript-8.70.orig/base/msvclib.mak ghostscript-8.70/base/msvclib.mak +--- ghostscript-8.70.orig/base/msvclib.mak 2008-08-29 01:16:39.000000000 +0200 ++++ ghostscript-8.70/base/msvclib.mak 2010-01-10 23:26:01.887097616 +0100 +@@ -445,7 +445,7 @@ + + LIB_ONLY=$(GLOBJDIR)\gslib.obj $(GLOBJDIR)\gsnogc.obj $(GLOBJDIR)\gconfig.obj $(GLOBJDIR)\gscdefs.obj $(GLOBJDIR)\gsromfs$(COMPILE_INITS).obj + MAKEDLL=0 +-PLATFORM=mslib32_ ++BUILD_PLATFORM=mslib32_ + + !include $(GLSRCDIR)\version.mak + !include $(GLSRCDIR)\msvccmd.mak +diff -Nru ghostscript-8.70.orig/base/openvms.mak ghostscript-8.70/base/openvms.mak +--- ghostscript-8.70.orig/base/openvms.mak 2009-01-08 10:17:18.000000000 +0100 ++++ ghostscript-8.70/base/openvms.mak 2010-01-10 23:25:36.911773955 +0100 +@@ -270,7 +270,7 @@ + + # Define the platform name. + +-PLATFORM=openvms_ ++BUILD_PLATFORM=openvms_ + + # Define the name of the makefile -- used in dependencies. + +diff -Nru ghostscript-8.70.orig/base/openvms.mmk ghostscript-8.70/base/openvms.mmk +--- ghostscript-8.70.orig/base/openvms.mmk 2009-01-08 10:17:18.000000000 +0100 ++++ ghostscript-8.70/base/openvms.mmk 2010-01-10 23:25:27.461102799 +0100 +@@ -298,7 +298,7 @@ + + # Define the platform name. + +-PLATFORM=openvms_ ++BUILD_PLATFORM=openvms_ + + # Define the name of the makefile -- used in dependencies. + +diff -Nru ghostscript-8.70.orig/base/unixhead.mak ghostscript-8.70/base/unixhead.mak +--- ghostscript-8.70.orig/base/unixhead.mak 2007-12-31 19:07:59.000000000 +0100 ++++ ghostscript-8.70/base/unixhead.mak 2010-01-10 23:22:33.391601312 +0100 +@@ -21,7 +21,7 @@ + # Define the platform name. For a "stock" System V platform, + # use sysv_ instead of unix_. + +-PLATFORM=unix_ ++BUILD_PLATFORM=unix_ + + # Define the syntax for command, object, and executable files. + +diff -Nru ghostscript-8.70.orig/base/watclib.mak ghostscript-8.70/base/watclib.mak +--- ghostscript-8.70.orig/base/watclib.mak 2009-01-08 10:17:18.000000000 +0100 ++++ ghostscript-8.70/base/watclib.mak 2010-01-10 23:25:03.490859364 +0100 +@@ -115,7 +115,7 @@ + SYNC=winsync + !endif + +-PLATFORM=watclib_ ++BUILD_PLATFORM=watclib_ + MAKEFILE=$(GLSRCDIR)\watclib.mak + TOP_MAKEFILES=$(MAKEFILE) $(GLSRCDIR)\wccommon.mak + PLATOPT= +diff -Nru ghostscript-8.70.orig/base/winlib.mak ghostscript-8.70/base/winlib.mak +--- ghostscript-8.70.orig/base/winlib.mak 2009-02-21 21:59:34.000000000 +0100 ++++ ghostscript-8.70/base/winlib.mak 2010-01-10 23:25:12.830496306 +0100 +@@ -28,8 +28,8 @@ + + # Define the platform name. + +-!ifndef PLATFORM +-PLATFORM=mswin32_ ++!ifndef BUILD_PLATFORM ++BUILD_PLATFORM=mswin32_ + !endif + + # Define the auxiliary program dependency. We use this to Added: csw/mgar/pkg/ghostscript/trunk/files/0005-Fix-pathes-according-to-old-package.patch =================================================================== --- csw/mgar/pkg/ghostscript/trunk/files/0005-Fix-pathes-according-to-old-package.patch (rev 0) +++ csw/mgar/pkg/ghostscript/trunk/files/0005-Fix-pathes-according-to-old-package.patch 2010-01-25 03:03:21 UTC (rev 8162) @@ -0,0 +1,27 @@ +--- ../../../work.old/solaris8-sparc/build-isa-sparcv8/ghostscript-8.70.orig/Makefile.in 2009-05-22 01:46:45.000000000 +0200 ++++ ghostscript-8.70/Makefile.in 2010-01-11 04:36:20.575145752 +0100 +@@ -67,11 +67,11 @@ + # The following must be substituted using @datadir@ and @libdir@ + # to avoid adding RPM generation paths (CUPS STR #1112) + gsdir = @datadir@/ghostscript +-gsdatadir = $(gsdir)/$(GS_DOT_VERSION) ++gsdatadir = $(gsdir) + gssharedir = @libdir@/ghostscript/$(GS_DOT_VERSION) + gsincludedir = @includedir@/ghostscript/ + +-docdir=$(gsdatadir)/doc ++docdir=$(gsdir)/doc/ghostscript + exdir=$(gsdatadir)/examples + GS_DOCDIR=$(docdir) + +@@ -342,8 +342,8 @@ + RM=rm -f + + # ------ Dynamic loader options ------- # +-SOC_CFLAGS = @SOC_CFLAGS@ +-SOC_LIBS = @SOC_LIBS@ ++SOC_CFLAGS = -I/opt/csw/X11/include @SOC_CFLAGS@ ++SOC_LIBS = -L/opt/csw/X11/lib @SOC_LIBS@ + SOC_LOADER = @SOC_LOADER@ + + Added: csw/mgar/pkg/ghostscript/trunk/files/0006-Fix-dynamic-link-flag.patch =================================================================== --- csw/mgar/pkg/ghostscript/trunk/files/0006-Fix-dynamic-link-flag.patch (rev 0) +++ csw/mgar/pkg/ghostscript/trunk/files/0006-Fix-dynamic-link-flag.patch 2010-01-25 03:03:21 UTC (rev 8162) @@ -0,0 +1,11 @@ +--- ghostscript-8.70.orig/base/unix-dll.mak 2008-09-13 22:22:25.000000000 +0200 ++++ ghostscript-8.70/base/unix-dll.mak 2010-01-11 03:00:54.165762459 +0100 +@@ -49,7 +49,7 @@ + GS_SONAME=$(GS_SONAME_BASE).$(GS_SOEXT) + GS_SONAME_MAJOR=$(GS_SONAME).$(GS_VERSION_MAJOR) + GS_SONAME_MAJOR_MINOR=$(GS_SONAME).$(GS_VERSION_MAJOR).$(GS_VERSION_MINOR) +-LDFLAGS_SO=-shared -Wl,-soname=$(GS_SONAME_MAJOR) ++LDFLAGS_SO=-G -h$(GS_SONAME_MAJOR) + + # MacOS X + #GS_SOEXT=dylib This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bonivart at users.sourceforge.net Mon Jan 25 11:30:29 2010 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Mon, 25 Jan 2010 10:30:29 +0000 Subject: [csw-devel] SF.net SVN: gar:[8163] csw/mgar/pkg/bind/trunk Message-ID: Revision: 8163 http://gar.svn.sourceforge.net/gar/?rev=8163&view=rev Author: bonivart Date: 2010-01-25 10:30:29 +0000 (Mon, 25 Jan 2010) Log Message: ----------- bind: update to 9.6.1-P3 Modified Paths: -------------- csw/mgar/pkg/bind/trunk/Makefile csw/mgar/pkg/bind/trunk/checksums Modified: csw/mgar/pkg/bind/trunk/Makefile =================================================================== --- csw/mgar/pkg/bind/trunk/Makefile 2010-01-25 03:03:21 UTC (rev 8162) +++ csw/mgar/pkg/bind/trunk/Makefile 2010-01-25 10:30:29 UTC (rev 8163) @@ -1,6 +1,9 @@ +# readme for chroot pkg? +# owner/group for device files? (root:sys) + GARNAME = bind GARVERSION = 9.6.1 -RELEASE = P2 +RELEASE = P3 DISTVERSION = $(GARVERSION)-$(RELEASE) SPKG_VERSION = $(GARVERSION)$(RELEASE) DISTNAME = $(GARNAME)-$(GARVERSION)-$(RELEASE) @@ -44,7 +47,6 @@ REQUIRED_PKGS_CSWbindutils = CSWlibbind CSWiconv CSWlibxml2 CSWosslrt CSWzlib REQUIRED_PKGS_CSWbindchroot = CSWbind -# We define upstream file regex so we can be notifed of new upstream software release UPSTREAM_MASTER_SITES = http://ftp.isc.org/isc/bind9/ UFILES_REGEX = (\d+(?:\.\d+)*) Modified: csw/mgar/pkg/bind/trunk/checksums =================================================================== --- csw/mgar/pkg/bind/trunk/checksums 2010-01-25 03:03:21 UTC (rev 8162) +++ csw/mgar/pkg/bind/trunk/checksums 2010-01-25 10:30:29 UTC (rev 8163) @@ -1,2 +1,2 @@ dbbc839888d11d22aad3ccb65942d2e5 CSWbindchroot.postinstall -435bc2e26e470d46ddf2acb24abb6ea6 bind-9.6.1-P2.tar.gz +a0952d589b3051538033387be4c983f9 bind-9.6.1-P3.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Mon Jan 25 12:26:35 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Mon, 25 Jan 2010 11:26:35 +0000 Subject: [csw-devel] SF.net SVN: gar:[8164] csw/mgar Message-ID: Revision: 8164 http://gar.svn.sourceforge.net/gar/?rev=8164&view=rev Author: wahwah Date: 2010-01-25 11:26:34 +0000 (Mon, 25 Jan 2010) Log Message: ----------- mGAR v2-dirpackage: Static build tests. Added Paths: ----------- csw/mgar/gar/v2-dirpackage/lib/ csw/mgar/gar/v2-dirpackage/lib/python/ csw/mgar/gar/v2-dirpackage/lib/python/opencsw.py csw/mgar/gar/v2-dirpackage/tests/ csw/mgar/gar/v2-dirpackage/tests/gartest.py csw/mgar/gar/v2-dirpackage/tests/run_tests.py csw/mgar/gar/v2-dirpackage/tests/static/ csw/mgar/gar/v2-dirpackage/tests/static/example/ csw/mgar/gar/v2-dirpackage/tests/static/example/Makefile csw/mgar/gar/v2-dirpackage/tests/static/example/checksums csw/mgar/gar/v2-dirpackage/tests/static/example/gar Removed Paths: ------------- csw/mgar/gar/v2-dirpackage/tests/gartest.py csw/mgar/pkg/tests/gartest.py csw/mgar/pkg/tests/run_tests.py Added: csw/mgar/gar/v2-dirpackage/lib/python/opencsw.py =================================================================== --- csw/mgar/gar/v2-dirpackage/lib/python/opencsw.py (rev 0) +++ csw/mgar/gar/v2-dirpackage/lib/python/opencsw.py 2010-01-25 11:26:34 UTC (rev 8164) @@ -0,0 +1,718 @@ +#!/opt/csw/bin/python2.6 +# coding=utf-8 +# +# $Id$ +# +# vim:set sw=2 ts=2 sts=2 expandtab: +# +# Copyright (c) 2009 OpenCSW +# Author: Maciej Blizi?ski +# +# This program is free software; you can redistribute it and/or modify it under +# the terms of the GNU General Public License version 2 as published by the +# Free Software Foundation. + +import copy +import datetime +import difflib +import logging +import os +import os.path +import re +import shutil +import subprocess +import tempfile +import urllib2 + +ARCHITECTURES = ["i386", "sparc", "all"] +MAJOR_VERSION = "major version" +MINOR_VERSION = "minor version" +PATCHLEVEL = "patchlevel" +REVISION = "revision" +OTHER_VERSION_INFO = "other version info" +NEW_PACKAGE = "new package" +NO_VERSION_CHANGE = "no version change" +REVISION_ADDED = "revision number added" +PKG_URL_TMPL = "http://www.opencsw.org/packages/%s" +CATALOG_URL = "http://mirror.opencsw.org/opencsw/current/i386/5.10/catalog" +ADMIN_FILE_CONTENT = """ +basedir=default +runlevel=nocheck +conflict=nocheck +setuid=nocheck +action=nocheck +partial=nocheck +instance=unique +idepend=quit +rdepend=quit +space=quit +authentication=nocheck +networktimeout=10 +networkretries=5 +keystore=/var/sadm/security +proxy= +""" +EMAIL_TMPL = """From: %(from)s +To: %(to)s +Cc: %(cc)s +Date: %(date)s +Subject: newpkgs %(pkgnames)s + +%(body)s + +-- +$Id$ +""" + + +class Error(Exception): + pass + + +class PackageError(Error): + pass + + +def ParsePackageFileName(p): + bits = p.split("-") + catalogname = bits[0] + version, version_info, revision_info = ParseVersionString(bits[1]) + data = { + 'catalogname': catalogname, + 'full_version_string': bits[1], + 'version': version, + 'version_info': version_info, + 'revision_info': revision_info, + } + return data + +def ParseVersionString(s): + version_bits = re.split("_|,", s) + version_str = version_bits[0] + revision_bits = version_bits[1:] + revision_info = {} + version_info = {} + version_number_bits = version_str.split(".") + version_info[MAJOR_VERSION] = version_number_bits[0] + if len(version_number_bits) >= 2: + version_info[MINOR_VERSION] = version_number_bits[1] + if len(version_number_bits) >= 3: + version_info[PATCHLEVEL] = version_number_bits[2] + for version_bit in revision_bits: + if "=" in version_bit: + (var_name, var_value) = version_bit.split("=") + revision_info[var_name] = var_value + else: + if not "extra_strings" in revision_info: + revision_info["extra_strings"] = [] + revision_info["extra_strings"].append(version_bit) + return version_str, version_info, revision_info + + +class CatalogBasedOpencswPackage(object): + + catalog_downloaded = False + + def __init__(self, catalogname): + self.catalogname = catalogname + + def IsOnTheWeb(self): + url = PKG_URL_TMPL % self.catalogname + logging.debug("Opening %s", repr(url)) + package_page = urllib2.urlopen(url) + html = package_page.read() + # Since beautifulsoup is not installed on the buildfarm yet, a quirk in + # package page display is going to be used. + package_not_in_mantis_pattern = u"cannot find maintainer" + return html.find(package_not_in_mantis_pattern) >= 0 + + def IsNew(self): + return not self.IsOnTheWeb() + + def UpgradeType(self, new_version_string): + """What kind of upgrade would it be if the new version was X. + + This function contains ugly logic. It has many unit tests to prove that it + does the right thing. + + Args: + New (candidate) version string + + Returns: + Revision type, message, (old_data, new_data) + """ + (new_version, + new_version_info, + new_revision_info) = ParseVersionString(new_version_string) + catalog_data = self.GetCatalogPkgData() + if not catalog_data: + return (NEW_PACKAGE, + "/dev/null -> %s" % new_version_string, + (None, new_version_string)) + cat_version_info = catalog_data["version_info"] + levels = (MAJOR_VERSION, MINOR_VERSION, PATCHLEVEL) + for level in levels: + if level in cat_version_info and level in new_version_info: + if (cat_version_info[level] != new_version_info[level]): + versions = (catalog_data["full_version_string"], new_version_string) + msg = "%s --> %s" % versions + return level, msg, versions + cat_rev_info = catalog_data["revision_info"] + for rev_kw in new_revision_info: + if rev_kw in cat_rev_info: + if cat_rev_info[rev_kw] != new_revision_info[rev_kw]: + msg = "%s: %s --> %s" % (rev_kw, + cat_rev_info[rev_kw], + new_revision_info[rev_kw]) + versions = cat_rev_info[rev_kw], new_revision_info[rev_kw] + return REVISION, msg, versions + else: + # This revision info is missing from the old package + msg = "new tag %s: %s" % (repr(rev_kw), + new_revision_info[rev_kw]) + return REVISION_ADDED, msg, (None, new_revision_info[rev_kw]) + if (catalog_data["version"] == new_version + and + catalog_data["revision_info"] == new_revision_info): + return NO_VERSION_CHANGE, "no", (new_version, new_version) + return OTHER_VERSION_INFO, "other", (None, None) + + @classmethod + def LazyDownloadCatalogData(cls, catalog_source=None): + if not cls.catalog_downloaded: + cls.DownloadCatalogData(catalog_source) + cls.catalog_downloaded = True + + @classmethod + def DownloadCatalogData(cls, catalog_source): + """Downloads catalog data.""" + logging.debug("Downloading catalog data from %s.", repr(CATALOG_URL)) + if not catalog_source: + catalog_source = urllib2.urlopen(CATALOG_URL) + cls.catalog = {} + for line in catalog_source: + # Working around the GPG signature + if line.startswith("#"): continue + if "BEGIN PGP SIGNED MESSAGE" in line: continue + if line.startswith("Hash:"): continue + if len(line.strip()) <= 0: continue + if "BEGIN PGP SIGNATURE" in line: break + fields = re.split(r"\s+", line) + try: + cls.catalog[fields[0]] = ParsePackageFileName(fields[3]) + except IndexError, e: + print repr(line) + print fields + print e + raise + + @classmethod + def _GetCatalogPkgData(cls, catalogname): + cls.LazyDownloadCatalogData() + if catalogname in cls.catalog: + return cls.catalog[catalogname] + else: + return None + + def GetCatalogPkgData(self): + """A wrapper for the classmethod _GetCatalogPkgData, supplying the catalogname.""" + return self._GetCatalogPkgData(self.catalogname) + + +class StagingDir(object): + """Represents a staging directory.""" + + def __init__(self, dir_path): + self.dir_path = dir_path + + def GetLatest(self, software, architectures=ARCHITECTURES): + files = os.listdir(self.dir_path) + package_files = [] + for a in architectures: + relevant_pkgs = sorted(shutil.fnmatch.filter(files, + "*-%s-*.pkg.gz" % a)) + relevant_pkgs = sorted(shutil.fnmatch.filter(relevant_pkgs, + "%s-*.pkg.gz" % software)) + if relevant_pkgs: + package_files.append(relevant_pkgs[-1]) + if not package_files: + raise PackageError("Could not find %s in %s" % (software, self.dir_path)) + logging.debug("The latest packages %s in %s are %s", + repr(software), + repr(self.dir_path), + repr(package_files)) + return [os.path.join(self.dir_path, x) for x in package_files] + + +class NewpkgMailer(object): + + def __init__(self, pkgnames, paths, + release_mgr_name, + release_mgr_email, + sender_name, + sender_email, + release_cc): + self.sender = u"%s <%s>" % (sender_name, sender_email) + self.pkgnames = pkgnames + self.paths = paths + self.release_mgr = u"%s <%s>" % (release_mgr_name, release_mgr_email) + self.release_cc = u"%s" % release_cc + + def FormatMail(self): + body_list = ["The following package files are ready to be released:"] + body_list.append("") + # Gathering package information, grouping packages that are upgraded + # together. + pkgs_data = {} + for p in self.paths: + base_file_name = os.path.split(p)[1] + catalogname = base_file_name.split("-")[0] + pkg = CatalogBasedOpencswPackage(catalogname) + new_data = ParsePackageFileName(base_file_name) + new_version_str = new_data["full_version_string"] + catalog_data = pkg.GetCatalogPkgData() + if catalog_data: + catalog_version_str = catalog_data["full_version_string"] + else: + catalog_version_str = "package not in the catalog" + upgrade_type, upgrade_msg, versions = pkg.UpgradeType(new_version_str) + pkgs_data_key = (upgrade_type, upgrade_msg, versions) + if pkgs_data_key not in pkgs_data: + pkgs_data[pkgs_data_key] = [] + pkg.srv4path = p + pkg.cat_version_str = catalog_version_str + pkg.new_version_str = new_version_str + pkgs_data[pkgs_data_key].append(pkg) + # Formatting grouped packages: + for upgrade_type, upgrade_msg, versions in pkgs_data: + msg = [] + pkgs = pkgs_data[(upgrade_type, upgrade_msg, versions)] + group_name = CatalogNameGroupName([pkg.catalogname for pkg in pkgs]) + if upgrade_type == NEW_PACKAGE: + msg.append("* %s: %s" % (upgrade_type, group_name)) + elif upgrade_type == NO_VERSION_CHANGE: + msg.append("* WARNING: no version change of %s" % group_name) + else: + msg.append("* %s: %s upgrade" % (group_name, upgrade_type)) + msg.append(" - from: %s" % versions[0]) + msg.append(" - to: %s" % versions[1]) + for pkg in pkgs: + msg.append(" + %s" % os.path.split(pkg.srv4path)[1]) + body_list.extend(msg) + body_list.append("") + body = "\n".join(body_list) + d = { + 'from': self.sender, + 'to': self.release_mgr, + 'cc': self.release_cc, + 'pkgnames': ", ".join(self.pkgnames), + 'body': body, + 'date': datetime.datetime.now(), + } + mail_text = EMAIL_TMPL % d + return mail_text + + def GetEditorName(self, env): + editor = "/opt/csw/bin/vim" + if "EDITOR" in env: + editor = env["EDITOR"] + if "VISUAL" in env: + editor = env["VISUAL"] + return editor + + +class ShellMixin(object): + + def ShellCommand(self, args, quiet=False): + logging.debug("Calling: %s", repr(args)) + if quiet: + sub_stdout = subprocess.PIPE + sub_stderr = subprocess.PIPE + else: + sub_stdout = None + sub_stderr = None + retcode = subprocess.call(args, + stdout=sub_stdout, + stderr=sub_stderr) + if retcode: + raise Error("Running %s has failed." % repr(args)) + return retcode + + +class CswSrv4File(ShellMixin, object): + """Represents a package in the srv4 format (pkg).""" + + def __init__(self, pkg_path): + self.pkg_path = pkg_path + self.workdir = None + self.gunzipped_path = None + self.transformed = False + self.dir_format_pkg = None + + def GetWorkDir(self): + if not self.workdir: + self.workdir = tempfile.mkdtemp(prefix="pkg_") + fd = open(os.path.join(self.workdir, "admin"), "w") + fd.write(ADMIN_FILE_CONTENT) + fd.close() + return self.workdir + + def GetAdminFilePath(self): + return os.path.join(self.GetWorkDir(), "admin") + + def GetGunzippedPath(self): + gzip_suffix = ".gz" + pkg_suffix = ".pkg" + if not self.gunzipped_path: + if self.pkg_path.endswith("%s%s" % (pkg_suffix, gzip_suffix)): + base_name_gz = os.path.split(self.pkg_path)[1] + shutil.copy(self.pkg_path, self.GetWorkDir()) + self.pkg_path = os.path.join(self.GetWorkDir(), base_name_gz) + args = ["gunzip", "-f", self.pkg_path] + retcode = self.ShellCommand(args) + self.gunzipped_path = self.pkg_path[:(-len(gzip_suffix))] + elif self.pkg_path.endswith(pkg_suffix): + self.gunzipped_path = self.pkg_path + else: + raise Error("The file name should end in either " + "%s or %s." % (gzip_suffix, pkg_suffix)) + return self.gunzipped_path + + def TransformToDir(self): + if not self.transformed: + args = ["pkgtrans", "-a", self.GetAdminFilePath(), + self.GetGunzippedPath(), self.GetWorkDir(), "all"] + retcode = self.ShellCommand(args, quiet=True) + dirs = self.GetDirs() + if len(dirs) != 1: + raise Error("Need exactly one package in the package stream: " + "%s." % (dirs)) + self.dir_format_pkg = DirectoryFormatPackage(dirs[0]) + self.transformed = True + + def GetDirFormatPkg(self): + self.TransformToDir(self) + return self.dir_format_pkg + + def GetDirs(self): + paths = os.listdir(self.GetWorkDir()) + dirs = [] + for p in paths: + abspath = os.path.join(self.GetWorkDir(), p) + if os.path.isdir(abspath): + dirs.append(abspath) + return dirs + + def GetPkgmap(self, analyze_permissions, strip=None): + dir_format_pkg = self.GetDirFormatPkg() + return dir_format_pkg.GetPkgmap(analyze_permissions, strip) + + def __del__(self): + if self.workdir: + logging.debug("Removing %s", repr(self.workdir)) + shutil.rmtree(self.workdir) + + +def ParsePkginfo(lines): + """Parses a pkginfo data.""" + d = {} + for line in lines: + try: + # Can't use split, because there might be multiple '=' characters. + line = line.strip() + # Skip empty and commented lines + if not line: continue + if line.startswith("#"): continue + var_name, var_value = line.split("=", 1) + d[var_name] = var_value + except ValueError, e: + raise PackageError("Can't parse %s: %s" % (repr(line), e)) + return d + + +def PkgnameToCatName(pkgname): + """Creates a catalog name based on the pkgname. + + SUNWbash --> sunw_bash + SUNWbashS --> sunw_bash_s + SUNWPython --> sunw_python + + Incomprehensible, but unit tested! + """ + known_prefixes = ["SUNW", "FJSV", "CSW"] + for prefix in known_prefixes: + if pkgname.startswith(prefix): + unused, tmp_prefix, the_rest = pkgname.partition(prefix) + pkgname = tmp_prefix + "_" + the_rest + return "_".join(SplitByCase(pkgname)) + + +def SplitByCase(s): + def CharType(c): + if c.isalnum(): + if c.isupper(): + return 1 + else: + return 2 + else: + return 3 + chartype_list = [CharType(x) for x in s] + neighbors = zip(chartype_list, chartype_list[1:]) + casechange = [False] + [x != y for x, y in neighbors] + str_list = [(cc * "_") + l.lower() for l, cc in zip(s, casechange)] + s2 = "".join(str_list) + return re.findall(r"[a-z]+", s2) + + +def CatalogNameGroupName(catalogname_list): + """Uses heuristics to guess the common name of a group of packages.""" + catalogname_list = copy.copy(catalogname_list) + if len(catalogname_list) == 1: + return catalogname_list[0] + current_substring = catalogname_list.pop() + while catalogname_list and current_substring: + substring_set = LongestCommonSubstring(current_substring, + catalogname_list.pop()) + if substring_set: + current_substring = list(substring_set)[0] + if len(current_substring) >= 2: + return current_substring + return "various packages" + + +def LongestCommonSubstring(S, T): + """Stolen from Wikibooks + + http://en.wikibooks.org/wiki/Algorithm_Implementation/Strings/Longest_common_substring#Python""" + m = len(S); n = len(T) + L = [[0] * (n+1) for i in xrange(m+1)] + LCS = set() + longest = 0 + for i in xrange(m): + for j in xrange(n): + if S[i] == T[j]: + v = L[i][j] + 1 + L[i+1][j+1] = v + if v > longest: + longest = v + LCS = set() + if v == longest: + LCS.add(S[i-v+1:i+1]) + return LCS + + +def PkginfoToSrv4Name(pkginfo_dict): + SRV4_FN_TMPL = "%(catalog_name)s-%(version)s-%(osver)s-%(arch)s-%(tag)s.pkg" + fn_data = {} + fn_data["catalog_name"] = PkgnameToCatName(pkginfo_dict["PKG"]) + fn_data["version"] = pkginfo_dict["VERSION"] + # os_version = pkginfo_dict["SUNW_PRODVERS"].split("/", 1)[0] + # fn_data["osver"] = pkginfo_dict["SUNW_PRODNAME"] + os_version + fn_data["osver"] = "SunOS5.10" # Hardcoded, because the original data contains + # trash. + fn_data["arch"] = pkginfo_dict["ARCH"] + fn_data["tag"] = "SUNW" + return SRV4_FN_TMPL % fn_data + + +class DirectoryFormatPackage(ShellMixin, object): + + def __init__(self, directory): + self.directory = directory + self.pkginfo_dict = None + + def GetParsedPkginfo(self): + if not self.pkginfo_dict: + pkginfo_fd = open(self.GetPkginfoFilename(), "r") + self.pkginfo_dict = ParsePkginfo(pkginfo_fd) + pkginfo_fd.close() + return self.pkginfo_dict + + def GetSrv4FileName(self): + """Guesses the Srv4FileName based on the package directory contents.""" + return PkginfoToSrv4Name(self.GetParsedPkginfo()) + + def ToSrv4(self, target_dir): + target_file_name = self.GetSrv4FileName() + target_path = os.path.join(target_dir, target_file_name) + if os.path.exists(target_path): + return target_path + pkg_container_dir, pkg_dir = os.path.split(self.directory) + if not os.path.isdir(target_dir): + os.makedirs(target_dir) + args = ["pkgtrans", "-s", pkg_container_dir, target_path, pkg_dir] + self.ShellCommand(args, quiet=True) + args = ["gzip", "-f", target_path] + self.ShellCommand(args, quiet=True) + return target_path + + def GetPkgmap(self, analyze_permissions=False, strip=None): + fd = open(os.path.join(self.directory, "pkgmap"), "r") + return Pkgmap(fd, analyze_permissions, strip) + + def SetPkginfoEntry(self, key, value): + pkginfo = self.GetParsedPkginfo() + logging.debug("Setting %s to %s", repr(key), repr(value)) + pkginfo[key] = value + self.WritePkginfo(pkginfo) + pkgmap_path = os.path.join(self.directory, "pkgmap") + pkgmap_fd = open(pkgmap_path, "r") + new_pkgmap_lines = [] + pkginfo_re = re.compile("1 i pkginfo") + ws_re = re.compile(r"\s+") + for line in pkgmap_fd: + if pkginfo_re.search(line): + fields = ws_re.split(line) + # 3: size + # 4: sum + pkginfo_path = os.path.join(self.directory, "pkginfo") + args = ["cksum", pkginfo_path] + cksum_process = subprocess.Popen(args, stdout=subprocess.PIPE) + stdout, stderr = cksum_process.communicate() + cksum_process.wait() + size = ws_re.split(stdout)[1] + args = ["sum", pkginfo_path] + sum_process = subprocess.Popen(args, stdout=subprocess.PIPE) + stdout, stderr = sum_process.communicate() + sum_process.wait() + sum = ws_re.split(stdout)[0] + fields[3] = size + fields[4] = sum + logging.debug("New pkgmap line: %s", fields) + line = " ".join(fields) + new_pkgmap_lines.append(line.strip()) + pkgmap_fd.close() + # Write that back + pkgmap_path_new = pkgmap_path + ".new" + logging.debug("Writing back to %s", pkgmap_path_new) + pkgmap_fd = open(pkgmap_path_new, "w") + pkgmap_fd.write("\n".join(new_pkgmap_lines)) + pkgmap_fd.close() + shutil.move(pkgmap_path_new, pkgmap_path) + + # TODO(maciej): Need to update the relevant line on pkgmap too + + def GetPkginfoFilename(self): + return os.path.join(self.directory, "pkginfo") + + def WritePkginfo(self, pkginfo_dict): + # Some packages extract read-only. To be sure, change them to be + # user-writable. + args = ["chmod", "-R", "u+w", self.directory] + self.ShellCommand(args) + pkginfo_filename = self.GetPkginfoFilename() + os.chmod(pkginfo_filename, 0644) + pkginfo_fd = open(pkginfo_filename, "w") + pkginfo_dict = self.GetParsedPkginfo() + for k, v in pkginfo_dict.items(): + pkginfo_fd.write("%s=%s\n" % (k, pkginfo_dict[k])) + pkginfo_fd.close() + + def ResetNameProperty(self): + """Sometimes, NAME= contains useless data. This method resets them.""" + pkginfo_dict = self.GetParsedPkginfo() + catalog_name = PkgnameToCatName(pkginfo_dict["PKG"]) + description = pkginfo_dict["DESC"] + pkginfo_name = "%s - %s" % (catalog_name, description) + self.SetPkginfoEntry("NAME", pkginfo_name) + +class Pkgmap(object): + + def __init__(self, input, permissions=False, + strip=None): + self.paths = set() + self.analyze_permissions = permissions + for line in input: + fields = re.split(r'\s+', line) + if strip: + strip_re = re.compile(r"^%s" % strip) + fields = [re.sub(strip_re, "", x) for x in fields] + logging.debug(fields) + line_to_add = None + if len(fields) < 2: + continue + elif fields[1] in ('f', 'd'): + line_to_add = fields[3] + if self.analyze_permissions: + line_to_add += " %s" % fields[4] + elif fields[1] in ('s', 'l'): + link_from, link_to = fields[3].split("=") + line_to_add = "%s --> %s" % (link_from, link_to) + if line_to_add: + self.paths.add(line_to_add) + + +class PackageComparator(object): + + def __init__(self, file_name_a, file_name_b, + permissions=False, + strip_a=None, + strip_b=None): + self.analyze_permissions = permissions + self.pkg_a = CswSrv4File(file_name_a) + self.pkg_b = CswSrv4File(file_name_b) + self.strip_a = strip_a + self.strip_b = strip_b + + def Run(self): + pkgmap_a = self.pkg_a.GetPkgmap(self.analyze_permissions, strip=self.strip_a) + pkgmap_b = self.pkg_b.GetPkgmap(self.analyze_permissions, strip=self.strip_b) + diff_ab = difflib.unified_diff(sorted(pkgmap_a.paths), + sorted(pkgmap_b.paths), + fromfile=self.pkg_a.pkg_path, + tofile=self.pkg_b.pkg_path) + diff_text = "\n".join(diff_ab) + if diff_text: + less_proc = subprocess.Popen(["less"], stdin=subprocess.PIPE) + less_stdout, less_stderr = less_proc.communicate(input=diff_text) + less_proc.wait() + else: + print "No differences found." + + +class OpencswCatalogBuilder(object): + + def __init__(self, product_dir, catalog_dir): + self.product_dir = product_dir + self.catalog_dir = catalog_dir + + def Run(self): + pkg_dirs = os.listdir(self.product_dir) + for pkg_dir in pkg_dirs: + pkg_path = os.path.join(self.product_dir, pkg_dir) + pkginfo_path = os.path.join(pkg_path, "pkginfo") + if (os.path.isdir(pkg_path) + and + os.path.exists(pkginfo_path)): + if not self.Srv4Exists(pkg_path): + pkg = None + tmpdir = None + try: + tmpdir = tempfile.mkdtemp(prefix="sunw-pkg-") + logging.debug("Copying %s to %s", repr(pkg_path), repr(tmpdir)) + tmp_pkg_dir = os.path.join(tmpdir, pkg_dir) + shutil.copytree(pkg_path, tmp_pkg_dir, symlinks=True) + pkg = DirectoryFormatPackage(tmp_pkg_dir) + # Replacing NAME= in the pkginfo, setting it to the catalog name. + pkg.ResetNameProperty() + pkg.ToSrv4(self.catalog_dir) + except IOError, e: + logging.warn("%s has failed: %s", pkg_path, e) + finally: + if pkg: + del(pkg) + if os.path.exists(tmpdir): + shutil.rmtree(tmpdir) + else: + logging.warn("srv4 file for %s already exists, skipping", pkg_path) + else: + logging.warn("%s is not a directory.", pkg_path) + + def Srv4Exists(self, pkg_dir): + pkg = DirectoryFormatPackage(pkg_dir) + srv4_name = pkg.GetSrv4FileName() + srv4_name += ".gz" + srv4_path = os.path.join(self.catalog_dir, srv4_name) + result = os.path.exists(srv4_path) + logging.debug("Srv4Exists(%s) => %s, %s", pkg_dir, repr(srv4_path), result) + return result Property changes on: csw/mgar/gar/v2-dirpackage/lib/python/opencsw.py ___________________________________________________________________ Added: svn:keywords + Id Deleted: csw/mgar/gar/v2-dirpackage/tests/gartest.py =================================================================== --- csw/mgar/pkg/tests/gartest.py 2010-01-24 01:31:18 UTC (rev 8133) +++ csw/mgar/gar/v2-dirpackage/tests/gartest.py 2010-01-25 11:26:34 UTC (rev 8164) @@ -1,168 +0,0 @@ -# $Id$ - -import Cheetah.Template -import shutil -import tempfile -import unittest -import os -import os.path -import subprocess -import opencsw - -"""A module used to do end-to-end testing of GAR.""" - -MAKEFILE_TMPL = """# GAR Makefile generated by $test_id -# -GARNAME = $garname -GARVERSION = $garversion -CATEGORIES = $profile -DESCRIPTION = $description -#if $blurb -define BLURB - blurb -endef -#end if -#if $upstream_url -SPKG_SOURCEURL = $upstream_url -#end if -#if $master_sites -MASTER_SITES = $master_sites -#end if -## PATCHFILES = -## DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz -## UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz -## CATALOGNAME = -## ARCHALL = 0 -## PACKAGES = -CONFIGURE_SCRIPTS = -BUILD_SCRIPTS = -INSTALL_SCRIPTS = -TEST_SCRIPTS = -#if $configure_args -CONFIGURE_ARGS = $configure_args -#end if -## BUILD64 = -include gar/category.mk -#if $install_files -post-install-modulated: -#for filedir_name, directory, file_name, content in $install_files -\tginstall -m 755 -d \$(DESTDIR)$directory -\tginstall -m 644 $tmpdir/\$(FILEDIR)/$filedir_name \$(DESTDIR)$directory/$file_name -#end for -#end if -# GAR recipe ends here. -""" -TMPDIR_PREFIX = "garpkg" -DIR_PKG_OUT_DIR = "/home/maciej/spool.5.8-sparc" - -class Error(Exception): - pass - -class GarBuild(object): - """Represents a GAR build. - - Can create a GAR build and execute it. - """ - def __init__(self): - self.tmpdir = tempfile.mkdtemp(prefix=TMPDIR_PREFIX) - self.filedir = os.path.join(self.tmpdir, "files") - self.makefile_filename = os.path.join(self.tmpdir, "Makefile") - os.mkdir(self.filedir) - self.install_files = [] - self.built = False - self.tmpldata = { - "garname": "testbuild", - "garsrc": "/home/maciej/src/opencsw/gar/v2-dirpackage", - "blurb": None, - "description": u"A test package from %s" % self, - "profile": "lib", - "configure_args": "$(DIRPATHS)", - "upstream_url": "http://www.opencsw.org/", - "master_sites": None, - "install_files": self.install_files, - "garversion": "0.0.1", - "tmpdir": self.tmpdir, - "test_id": "$Id$", - } - os.symlink(self.tmpldata["garsrc"], os.path.join(self.tmpdir, "gar")) - - def WriteGarFiles(self): - # print "The tmpdir is", self.tmpdir - for filedir_name, directory, filename, content in self.install_files: - file_path = os.path.join(self.filedir, filedir_name) - print "Writing to %s" % file_path - fp = open(file_path, "w") - fp.write(content) - fp.close() - searchlist = [self.tmpldata] - t = Cheetah.Template.Template(MAKEFILE_TMPL, searchlist) - print t - fp = open(self.makefile_filename, "w") - fp.write(str(t)) - fp.close() - - def Build(self): - if self.built: - return 0 - args = ["gmake", "dirpackage"] - gar_proc = subprocess.Popen(args, cwd=self.tmpdir, - stdout=subprocess.PIPE, - stderr=subprocess.PIPE) - stdout, stderr = gar_proc.communicate() - ret = gar_proc.wait() - if ret: - print "ERROR: GAR run has failed." - self.built = False - else: - self.built = True - return ret - - def GetBuiltPackages(self): - if not self.built: - raise Error("The packages have not been built yet.") - args = ["gmake", "pkglist"] - gar_proc = subprocess.Popen(args, cwd=self.tmpdir, stdout=subprocess.PIPE) - stdout, stderr = gar_proc.communicate() - ret = gar_proc.wait() - pkglist = [] - for line in stdout.splitlines(): - # directory, catalogname, pkgname - pkglist.append(tuple(line.split("\t"))) - packages = [opencsw.DirectoryFormatPackage(os.path.join(DIR_PKG_OUT_DIR, z)) for x, y, z in pkglist] - return packages - - def AddInstallFile(self, file_path, content): - filedir_name = file_path.replace("/", "-") - directory, file_name = os.path.split(file_path) - self.install_files.append((filedir_name, directory, - file_name, content)) - - def __del__(self): - shutil.rmtree(self.tmpdir) - - -class FooUnitTest(unittest.TestCase): - """This is the docstring for the FooUnitTest.""" - - def testSomething(self): - """This is a doc string for the test method. - - You can write more text here. - """ - mybuild = GarBuild() - mybuild.tmpldata["garname"] = "blah" - mybuild.AddInstallFile("/opt/csw/share/foo", "bar!\n") - mybuild.WriteGarFiles() - self.assertEquals(0, mybuild.Build()) - packages = mybuild.GetBuiltPackages() - for pkg in packages: - print pkg - print pkg.GetParsedPkginfo() - # package = mybuild.GetFirstDirFormatPackage() - # self.assertEqual("blah", package.catalogname) - - -if __name__ == '__main__': - unittest.main() - -# vim:set ts=2 sts=2 sw=2 expandtab: Copied: csw/mgar/gar/v2-dirpackage/tests/gartest.py (from rev 8134, csw/mgar/pkg/tests/gartest.py) =================================================================== --- csw/mgar/gar/v2-dirpackage/tests/gartest.py (rev 0) +++ csw/mgar/gar/v2-dirpackage/tests/gartest.py 2010-01-25 11:26:34 UTC (rev 8164) @@ -0,0 +1,176 @@ +# $Id$ + +import Cheetah.Template +import shutil +import tempfile +import unittest +import os +import os.path +import subprocess +import opencsw + +"""A module used to do end-to-end testing of GAR.""" + +MAKEFILE_TMPL = """# GAR Makefile generated by $test_id +#for varname in $sorted($garvars) +$varname = $garvars[$varname] +#end for +#if $blurb +define BLURB + blurb +endef +#end if +include gar/category.mk +#if $install_files +post-install-modulated: +#for filedir_name, directory, file_name, content in $install_files +\tginstall -m 755 -d \$(DESTDIR)$directory +\tginstall -m 644 \$(FILEDIR)/$filedir_name \$(DESTDIR)$directory/$file_name +#end for +#end if +# GAR recipe ends here. +""" +TMPDIR_PREFIX = "gartest-" +# FIXME: This information should be pulled out from GAR +DIR_PKG_OUT_DIR = os.path.join(os.environ["HOME"], "spool.5.8-sparc") + +class Error(Exception): + pass + + +class GarBuild(object): + + def __init__(self): + self.built = False + self.packages = None + self.cleanup = True + + def GetDebugHelp(self): + """To be overriden in subclasses.""" + return "" + + def Build(self): + if self.built: + return 0 + args = ["gmake", "dirpackage"] + gar_proc = subprocess.Popen(args, cwd=self.tmpdir, + stdout=subprocess.PIPE, + stderr=subprocess.PIPE) + stdout, stderr = gar_proc.communicate() + ret = gar_proc.wait() + if ret: + print "ERROR: GAR run has failed." + print stdout + print stderr + self.built = False + # To allow debugging + self.cleanup = False + print self.GetDebugHelp() + else: + self.built = True + return ret + + def GetBuiltPackages(self): + if not self.built: + raise Error("The packages have not been built yet.") + args = ["gmake", "pkglist"] + gar_proc = subprocess.Popen(args, cwd=self.tmpdir, stdout=subprocess.PIPE) + stdout, stderr = gar_proc.communicate() + ret = gar_proc.wait() + pkglist = [] + for line in stdout.splitlines(): + # directory, catalogname, pkgname + pkglist.append(tuple(line.split("\t"))) + self.packages = [ + opencsw.DirectoryFormatPackage( + os.path.join(DIR_PKG_OUT_DIR, z)) + for x, y, z in pkglist] + return self.packages + + def GetFirstBuiltPackage(self): + """Returns only the first package. Easy to use.""" + packages = self.GetBuiltPackages() + if packages: + return packages[0] + + +class DynamicGarBuild(GarBuild): + """Represents a GAR build. + + Can create a GAR build and execute it. + """ + def __init__(self): + super(DynamicGarBuild, self).__init__() + self.tmpdir = tempfile.mkdtemp(prefix=TMPDIR_PREFIX) + self.filedir = os.path.join(self.tmpdir, "files") + self.makefile_filename = os.path.join(self.tmpdir, "Makefile") + os.mkdir(self.filedir) + self.install_files = [] + self.garvars = { + "GARNAME": "testbuild", + "DESCRIPTION": u"A test package from %s" % self, + "CATEGORIES": "lib", + "CONFIGURE_ARGS": "$(DIRPATHS)", + "SPKG_SOURCEURL": "http://www.opencsw.org/", + "MASTER_SITES": "", + "GARVERSION": "0.0.1", + "CONFIGURE_SCRIPTS": "", + "BUILD_SCRIPTS": "", + "TEST_SCRIPTS": "", + "INSTALL_SCRIPTS": "", + } + self.tmpldata = { + "garvars": self.garvars, + "garsrc": os.path.join(os.getcwd(), ".."), + "blurb": None, + "install_files": self.install_files, + "tmpdir": self.tmpdir, + "test_id": "$Id$", + } + os.symlink(self.tmpldata["garsrc"], os.path.join(self.tmpdir, "gar")) + + def SetGarVariable(self, varname, value): + self.garvars[varname] = value + + def WriteGarFiles(self): + # print "The tmpdir is", self.tmpdir + for filedir_name, directory, filename, content in self.install_files: + file_path = os.path.join(self.filedir, filedir_name) + print "Writing to %s" % file_path + fp = open(file_path, "w") + fp.write(content) + fp.close() + searchlist = [self.tmpldata] + t = Cheetah.Template.Template(MAKEFILE_TMPL, searchlist) + # For easy debugging, but only until we find a better solution, because it + # clutters the screen. + print t + fp = open(self.makefile_filename, "w") + fp.write(str(t)) + fp.close() + + def AddInstallFile(self, file_path, content): + """Creates a file in the package, with the given path and content.""" + filedir_name = file_path.replace("/", "-") + directory, file_name = os.path.split(file_path) + self.install_files.append((filedir_name, directory, + file_name, content)) + + def GetDebugHelp(self): + return ("Please look into %s.\n" + "Remember to remove it when you're done debugging." + % repr(self.tmpdir)) + + def __del__(self): + if self.cleanup: + shutil.rmtree(self.tmpdir) + + +class StaticGarBuild(GarBuild): + + def __init__(self, build_dir): + super(StaticGarBuild, self).__init__() + self.build_dir = build_dir + self.tmpdir = build_dir + +# vim:set ts=2 sts=2 sw=2 expandtab: Copied: csw/mgar/gar/v2-dirpackage/tests/run_tests.py (from rev 8135, csw/mgar/pkg/tests/run_tests.py) =================================================================== --- csw/mgar/gar/v2-dirpackage/tests/run_tests.py (rev 0) +++ csw/mgar/gar/v2-dirpackage/tests/run_tests.py 2010-01-25 11:26:34 UTC (rev 8164) @@ -0,0 +1,44 @@ +#!/opt/csw/bin/python2.6 +# $Id$ + +import unittest +import sys +sys.path.append("../lib/python") +import gartest + +class ExampleEndToEndTest(unittest.TestCase): + """An example end-to-end test of GAR.""" + + def testPkginfoName(self): + """Checks that the GARNAME makes it to the NAME in pkginfo.""" + mybuild = gartest.DynamicGarBuild() + mybuild.SetGarVariable("GARNAME", "foo") + mybuild.AddInstallFile("/opt/csw/share/foo", "bar!\n") + mybuild.WriteGarFiles() + self.assertEquals(0, mybuild.Build()) + pkg = mybuild.GetFirstBuiltPackage() + pkginfo = pkg.GetParsedPkginfo() + # By default, the garname should be used to create the catalog name, which + # in turn ends up in the NAME field in pkginfo. + self.assertTrue(pkginfo["NAME"].startswith("foo")) + + +class StaticBuildTestExample(unittest.TestCase): + """An example of a static build. + + This uses a static directory where GAR can be called. + """ + + def testLooseFiles(self): + mybuild = gartest.StaticGarBuild("static/example") + mybuild.Build() + pkg = mybuild.GetFirstBuiltPackage() + pkginfo = pkg.GetParsedPkginfo() + # This part would often use "self.assertEqual(, )" + self.assertTrue(pkginfo["NAME"].startswith("loose")) + + +if __name__ == '__main__': + unittest.main() + +# vim:set ts=2 sts=2 sw=2 expandtab: Property changes on: csw/mgar/gar/v2-dirpackage/tests/static/example ___________________________________________________________________ Added: svn:ignore + work gar Added: csw/mgar/gar/v2-dirpackage/tests/static/example/Makefile =================================================================== --- csw/mgar/gar/v2-dirpackage/tests/static/example/Makefile (rev 0) +++ csw/mgar/gar/v2-dirpackage/tests/static/example/Makefile 2010-01-25 11:26:34 UTC (rev 8164) @@ -0,0 +1,39 @@ +# Copyright 2009 OpenCSW +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +GARNAME = loose-files +GARVERSION = 1.0 +CATEGORIES = utils +DESCRIPTION = An example of a package created from loose files. +define BLURB +endef +SPKG_SOURCEURL = http://gar.sf.net + +PACKAGES = CSWloosefilesexa +CATALOGNAME = loose_files_example + +# The directory where all the sources are kept. The slash at the end is +# necessary. +LOCAL_SRC = /usr/xpg4/ + +# The list of files to include, relative to LOCAL_SRC +FILES = bin/grep +FILES += include/curses.h + +MASTER_SITES = $(sort $(addprefix file://$(LOCAL_SRC),$(dir $(FILES)))) +DISTFILES = $(notdir $(FILES)) + +CONFIGURE_SCRIPTS = +BUILD_SCRIPTS = +INSTALL_SCRIPTS = custom +TEST_SCRIPTS = + +include gar/category.mk + +install-custom: + $(foreach F,$(FILES),ginstall \ + -d $(DESTDIR)$(prefix)/$(dir $F) \ + && ginstall $(WORKDIR)/$(notdir $F) \ + $(DESTDIR)$(prefix)/$(dir $F);) + @$(MAKECOOKIE) Property changes on: csw/mgar/gar/v2-dirpackage/tests/static/example/Makefile ___________________________________________________________________ Added: svn:keywords + Id Added: csw/mgar/gar/v2-dirpackage/tests/static/example/checksums =================================================================== --- csw/mgar/gar/v2-dirpackage/tests/static/example/checksums (rev 0) +++ csw/mgar/gar/v2-dirpackage/tests/static/example/checksums 2010-01-25 11:26:34 UTC (rev 8164) @@ -0,0 +1,2 @@ +d388c5613c830fb4571d0457f53580a0 curses.h +492eba390abe4fe74c185d0d343c2b81 grep Added: csw/mgar/gar/v2-dirpackage/tests/static/example/gar =================================================================== --- csw/mgar/gar/v2-dirpackage/tests/static/example/gar (rev 0) +++ csw/mgar/gar/v2-dirpackage/tests/static/example/gar 2010-01-25 11:26:34 UTC (rev 8164) @@ -0,0 +1 @@ +link ../../.. \ No newline at end of file Property changes on: csw/mgar/gar/v2-dirpackage/tests/static/example/gar ___________________________________________________________________ Added: svn:special + * Deleted: csw/mgar/pkg/tests/gartest.py =================================================================== --- csw/mgar/pkg/tests/gartest.py 2010-01-25 10:30:29 UTC (rev 8163) +++ csw/mgar/pkg/tests/gartest.py 2010-01-25 11:26:34 UTC (rev 8164) @@ -1,144 +0,0 @@ -# $Id$ - -import Cheetah.Template -import shutil -import tempfile -import unittest -import os -import os.path -import subprocess -import opencsw - -"""A module used to do end-to-end testing of GAR.""" - -MAKEFILE_TMPL = """# GAR Makefile generated by $test_id -#for varname in $garvars -$varname = $garvars[$varname] -#end for -#if $blurb -define BLURB - blurb -endef -#end if -include gar/category.mk -#if $install_files -post-install-modulated: -#for filedir_name, directory, file_name, content in $install_files -\tginstall -m 755 -d \$(DESTDIR)$directory -\tginstall -m 644 $tmpdir/\$(FILEDIR)/$filedir_name \$(DESTDIR)$directory/$file_name -#end for -#end if -# GAR recipe ends here. -""" -TMPDIR_PREFIX = "garpkg" -DIR_PKG_OUT_DIR = "/home/maciej/spool.5.8-sparc" - -class Error(Exception): - pass - -class GarBuild(object): - """Represents a GAR build. - - Can create a GAR build and execute it. - """ - def __init__(self): - self.packages = None - self.tmpdir = tempfile.mkdtemp(prefix=TMPDIR_PREFIX) - self.filedir = os.path.join(self.tmpdir, "files") - self.makefile_filename = os.path.join(self.tmpdir, "Makefile") - os.mkdir(self.filedir) - self.install_files = [] - self.built = False - self.garvars = { - "GARNAME": "testbuild", - "DESCRIPTION": u"A test package from %s" % self, - "CATEGORIES": "lib", - "CONFIGURE_ARGS": "$(DIRPATHS)", - "SPKG_SOURCEURL": "http://www.opencsw.org/", - "MASTER_SITES": "", - "GARVERSION": "0.0.1", - "CONFIGURE_SCRIPTS": "", - "BUILD_SCRIPTS": "", - "TEST_SCRIPTS": "", - "INSTALL_SCRIPTS": "", - } - self.tmpldata = { - "garvars": self.garvars, - "garsrc": "/home/maciej/src/opencsw/gar/v2-dirpackage", - "blurb": None, - "install_files": self.install_files, - "tmpdir": self.tmpdir, - "test_id": "$Id$", - } - os.symlink(self.tmpldata["garsrc"], os.path.join(self.tmpdir, "gar")) - - def SetGarVariable(self, varname, value): - self.garvars[varname] = value - - def WriteGarFiles(self): - # print "The tmpdir is", self.tmpdir - for filedir_name, directory, filename, content in self.install_files: - file_path = os.path.join(self.filedir, filedir_name) - print "Writing to %s" % file_path - fp = open(file_path, "w") - fp.write(content) - fp.close() - searchlist = [self.tmpldata] - t = Cheetah.Template.Template(MAKEFILE_TMPL, searchlist) - print t - fp = open(self.makefile_filename, "w") - fp.write(str(t)) - fp.close() - - def Build(self): - if self.built: - return 0 - args = ["gmake", "dirpackage"] - gar_proc = subprocess.Popen(args, cwd=self.tmpdir, - stdout=subprocess.PIPE, - stderr=subprocess.PIPE) - stdout, stderr = gar_proc.communicate() - ret = gar_proc.wait() - if ret: - print "ERROR: GAR run has failed." - print stdout - print stderr - self.built = False - else: - self.built = True - return ret - - def GetBuiltPackages(self): - if not self.built: - raise Error("The packages have not been built yet.") - args = ["gmake", "pkglist"] - gar_proc = subprocess.Popen(args, cwd=self.tmpdir, stdout=subprocess.PIPE) - stdout, stderr = gar_proc.communicate() - ret = gar_proc.wait() - pkglist = [] - for line in stdout.splitlines(): - # directory, catalogname, pkgname - pkglist.append(tuple(line.split("\t"))) - self.packages = [ - opencsw.DirectoryFormatPackage( - os.path.join(DIR_PKG_OUT_DIR, z)) - for x, y, z in pkglist] - return self.packages - - def GetFirstBuiltPackage(self): - """Returns only the first package. Easy to use.""" - packages = self.GetBuiltPackages() - if packages: - return packages[0] - - def AddInstallFile(self, file_path, content): - """Creates a file in the package, with the given path and content.""" - filedir_name = file_path.replace("/", "-") - directory, file_name = os.path.split(file_path) - self.install_files.append((filedir_name, directory, - file_name, content)) - - def __del__(self): - shutil.rmtree(self.tmpdir) - -# vim:set ts=2 sts=2 sw=2 expandtab: Deleted: csw/mgar/pkg/tests/run_tests.py =================================================================== --- csw/mgar/pkg/tests/run_tests.py 2010-01-25 10:30:29 UTC (rev 8163) +++ csw/mgar/pkg/tests/run_tests.py 2010-01-25 11:26:34 UTC (rev 8164) @@ -1,27 +0,0 @@ -#!/opt/csw/bin/python2.6 -# $Id$ - -import unittest -import gartest - -class ExampleEndToEndTest(unittest.TestCase): - """An example end-to-end test of GAR.""" - - def testPkginfoName(self): - """Checks that the GARNAME makes it to the NAME in pkginfo.""" - mybuild = gartest.GarBuild() - mybuild.SetGarVariable("GARNAME", "foo") - mybuild.AddInstallFile("/opt/csw/share/foo", "bar!\n") - mybuild.WriteGarFiles() - self.assertEquals(0, mybuild.Build()) - pkg = mybuild.GetFirstBuiltPackage() - pkginfo = pkg.GetParsedPkginfo() - # By default, the garname should be used to create the catalog name, which - # in turn ends up in the NAME field in pkginfo. - self.assertTrue(pkginfo["NAME"].startswith("foo")) - - -if __name__ == '__main__': - unittest.main() - -# vim:set ts=2 sts=2 sw=2 expandtab: This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Mon Jan 25 12:29:54 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Mon, 25 Jan 2010 11:29:54 +0000 Subject: [csw-devel] SF.net SVN: gar:[8165] csw/mgar/pkg/tests/ Message-ID: Revision: 8165 http://gar.svn.sourceforge.net/gar/?rev=8165&view=rev Author: wahwah Date: 2010-01-25 11:29:54 +0000 (Mon, 25 Jan 2010) Log Message: ----------- mGAR v2-dirpackage: Removing an empty directory Removed Paths: ------------- csw/mgar/pkg/tests/ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bonivart at users.sourceforge.net Mon Jan 25 12:42:45 2010 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Mon, 25 Jan 2010 11:42:45 +0000 Subject: [csw-devel] SF.net SVN: gar:[8166] csw/mgar/pkg/spamassassin/trunk Message-ID: Revision: 8166 http://gar.svn.sourceforge.net/gar/?rev=8166&view=rev Author: bonivart Date: 2010-01-25 11:42:45 +0000 (Mon, 25 Jan 2010) Log Message: ----------- spamassassin: update to 3.3 Modified Paths: -------------- csw/mgar/pkg/spamassassin/trunk/Makefile csw/mgar/pkg/spamassassin/trunk/checksums Modified: csw/mgar/pkg/spamassassin/trunk/Makefile =================================================================== --- csw/mgar/pkg/spamassassin/trunk/Makefile 2010-01-25 11:29:54 UTC (rev 8165) +++ csw/mgar/pkg/spamassassin/trunk/Makefile 2010-01-25 11:42:45 UTC (rev 8166) @@ -11,9 +11,9 @@ endef #MASTER_SITES = http://apache.jumper.nu/spamassassin/source/ -MASTER_SITES = http://people.apache.org/~wtogami/devel/3.3.0-rc3.unofficial/ -#DISTFILES = $(SPKG_NAME)-$(GARVERSION).tar.gz -DISTFILES = $(SPKG_NAME)-$(GARVERSION)-rc3.tar.gz +MASTER_SITES = http://people.apache.org/~jm/devel/ +DISTFILES = $(SPKG_NAME)-$(GARVERSION).tar.gz +#DISTFILES = $(SPKG_NAME)-$(GARVERSION)-rc3.tar.gz DISTFILES += COPYING REQUIRED_PKGS = CSWosslrt CSWperl CSWpmarchivetar CSWpmdbi CSWpmdigestsha @@ -40,18 +40,24 @@ WORKSRC = $(WORKDIR)/$(SPKG_NAME)-$(GARVERSION) SPKG_SOURCEURL = http://spamassassin.apache.org/ +ifeq ($(shell uname -p), sparc) + SEDCFLAGS = -xarch=v8 +else + SEDCFLAGS = +endif + configure-custom: @echo " ==> Configuring $(GARNAME) (custom)" @( cd $(WORKSRC) ; \ perl Makefile.PL INSTALLDIRS=vendor DESTDIR=$(DESTDIR) CONFDIR=/opt/csw/etc/spamassassin LOCALSTATEDIR=/var/opt/csw/spamassassin CONTACT_ADDRESS=postmaster ) @$(MAKECOOKIE) -#pre-build-modulated: -# @echo " ==> Pre-build $(GARNAME) (custom)" -# @( cd $(WORKSRC)/spamc ; \ -# sed 's/CFLAGS = /CFLAGS = -xarch=v8 /' Makefile.in > Makefile.tmp ; \ -# cp Makefile.tmp Makefile.in ) -# @$(MAKECOOKIE) +pre-build-modulated: + @echo " ==> Pre-build $(GARNAME) (custom)" + @( cd $(WORKSRC)/spamc ; \ + sed 's/CFLAGS = /CFLAGS = $(SEDCFLAGS) /' Makefile.in > Makefile.tmp ; \ + cp Makefile.tmp Makefile.in ) + @$(MAKECOOKIE) build-custom: @echo " ==> Building $(GARNAME) (custom)" Modified: csw/mgar/pkg/spamassassin/trunk/checksums =================================================================== --- csw/mgar/pkg/spamassassin/trunk/checksums 2010-01-25 11:29:54 UTC (rev 8165) +++ csw/mgar/pkg/spamassassin/trunk/checksums 2010-01-25 11:42:45 UTC (rev 8166) @@ -1,2 +1,2 @@ 3b83ef96387f14655fc854ddc3c6bd57 COPYING -98ad221b18c6c881f609d1a35bb800a0 Mail-SpamAssassin-3.3.0-rc3.tar.gz +38078b07396c0ab92b46386bc70ef086 Mail-SpamAssassin-3.3.0.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Mon Jan 25 12:56:00 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Mon, 25 Jan 2010 11:56:00 +0000 Subject: [csw-devel] SF.net SVN: gar:[8167] csw/mgar/pkg Message-ID: Revision: 8167 http://gar.svn.sourceforge.net/gar/?rev=8167&view=rev Author: dmichelsen Date: 2010-01-25 11:56:00 +0000 (Mon, 25 Jan 2010) Log Message: ----------- gzip: Initial commit Added Paths: ----------- csw/mgar/pkg/gzip/ csw/mgar/pkg/gzip/branches/ csw/mgar/pkg/gzip/tags/ csw/mgar/pkg/gzip/trunk/ csw/mgar/pkg/gzip/trunk/Makefile csw/mgar/pkg/gzip/trunk/checksums csw/mgar/pkg/gzip/trunk/files/ Property changes on: csw/mgar/pkg/gzip/trunk ___________________________________________________________________ Added: svn:ignore + cookies download work Added: svn:externals + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 Added: csw/mgar/pkg/gzip/trunk/Makefile =================================================================== --- csw/mgar/pkg/gzip/trunk/Makefile (rev 0) +++ csw/mgar/pkg/gzip/trunk/Makefile 2010-01-25 11:56:00 UTC (rev 8167) @@ -0,0 +1,19 @@ +GARNAME = gzip +GARVERSION = 1.4 +CATEGORIES = utils + +DESCRIPTION = GNU zip +define BLURB +endef + +MASTER_SITES = $(GNU_MIRROR) +DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz + +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + +CONFIGURE_ARGS = $(DIRPATHS) + +TEST_TARGET = check + +include gar/category.mk Added: csw/mgar/pkg/gzip/trunk/checksums =================================================================== --- csw/mgar/pkg/gzip/trunk/checksums (rev 0) +++ csw/mgar/pkg/gzip/trunk/checksums 2010-01-25 11:56:00 UTC (rev 8167) @@ -0,0 +1 @@ +e381b8506210c794278f5527cba0e765 gzip-1.4.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From rthurner at users.sourceforge.net Fri Jan 1 11:36:42 2010 From: rthurner at users.sourceforge.net (rthurner at users.sourceforge.net) Date: Fri, 01 Jan 2010 10:36:42 +0000 Subject: [csw-devel] SF.net SVN: gar:[7805] csw/mgar/pkg/cmake/trunk Message-ID: Revision: 7805 http://gar.svn.sourceforge.net/gar/?rev=7805&view=rev Author: rthurner Date: 2010-01-01 10:36:36 +0000 (Fri, 01 Jan 2010) Log Message: ----------- cmake - upgrade to cmake-2.8.0 Modified Paths: -------------- csw/mgar/pkg/cmake/trunk/Makefile csw/mgar/pkg/cmake/trunk/checksums Modified: csw/mgar/pkg/cmake/trunk/Makefile =================================================================== --- csw/mgar/pkg/cmake/trunk/Makefile 2009-12-31 16:49:02 UTC (rev 7804) +++ csw/mgar/pkg/cmake/trunk/Makefile 2010-01-01 10:36:36 UTC (rev 7805) @@ -1,5 +1,5 @@ GARNAME = cmake -GARVERSION = 2.6.3 +GARVERSION = 2.8.0 CATEGORIES = devel DESCRIPTION = Cross-platform make @@ -13,8 +13,8 @@ endef RELVER = $(shell echo $(GARVERSION) |gsed 's/\(^[0-9].*\)\.[0-9]*/\1/') -SPKG_SOURCEURL = http://www.cmake.org/ -MASTER_SITES = http://www.cmake.org/files/v$(RELVER)/ +SPKG_SOURCEURL = http://cmake.org/ +MASTER_SITES = http://cmake.org/files/v$(RELVER)/ DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz PACKAGES = CSWcmake Modified: csw/mgar/pkg/cmake/trunk/checksums =================================================================== --- csw/mgar/pkg/cmake/trunk/checksums 2009-12-31 16:49:02 UTC (rev 7804) +++ csw/mgar/pkg/cmake/trunk/checksums 2010-01-01 10:36:36 UTC (rev 7805) @@ -1 +1 @@ -5ba47a94ce276f326abca1fd72a7e7c6 download/cmake-2.6.3.tar.gz +3b3679b8a6afaedc38a8c15dd7ff4fcf cmake-2.8.0.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Fri Jan 1 12:04:45 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 01 Jan 2010 11:04:45 +0000 Subject: [csw-devel] SF.net SVN: gar:[7806] csw/mgar/pkg/readline/tags/readline-6.0, REV=2009.03. 31/ Message-ID: Revision: 7806 http://gar.svn.sourceforge.net/gar/?rev=7806&view=rev Author: dmichelsen Date: 2010-01-01 11:04:45 +0000 (Fri, 01 Jan 2010) Log Message: ----------- readline: Tag readline-6.0,REV=2009.03.31 Added Paths: ----------- csw/mgar/pkg/readline/tags/readline-6.0,REV=2009.03.31/ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Fri Jan 1 12:08:41 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 01 Jan 2010 11:08:41 +0000 Subject: [csw-devel] SF.net SVN: gar:[7807] csw/mgar/pkg/readline/trunk Message-ID: Revision: 7807 http://gar.svn.sourceforge.net/gar/?rev=7807&view=rev Author: dmichelsen Date: 2010-01-01 11:08:41 +0000 (Fri, 01 Jan 2010) Log Message: ----------- readline: Update to 6.1 Modified Paths: -------------- csw/mgar/pkg/readline/trunk/Makefile csw/mgar/pkg/readline/trunk/checksums Modified: csw/mgar/pkg/readline/trunk/Makefile =================================================================== --- csw/mgar/pkg/readline/trunk/Makefile 2010-01-01 11:04:45 UTC (rev 7806) +++ csw/mgar/pkg/readline/trunk/Makefile 2010-01-01 11:08:41 UTC (rev 7807) @@ -1,9 +1,9 @@ GARNAME = readline -GARVERSION = 6.0 +GARVERSION = 6.1 CATEGORIES = lib EXTRA_MODULATORS = GARVERSION -MODULATIONS_GARVERSION = 4.3 5.2 6.0 +MODULATIONS_GARVERSION = 4.3 5.2 6.1 DESCRIPTION = GNU readline define BLURB @@ -18,10 +18,10 @@ MASTER_SITES = $(GNU_MIRROR) DISTFILES = $(foreach V,$(MODULATIONS_GARVERSION),$(GARNAME)-$(V).tar.gz) -PATCHFILES_isa-sparcv8-garversion-6.0 = patch-history.3.diff -PATCHFILES_isa-sparcv9-garversion-6.0 = patch-history.3.diff -PATCHFILES_isa-i386-garversion-6.0 = patch-history.3.diff -PATCHFILES_isa-amd64-garversion-6.0 = patch-history.3.diff +PATCHFILES_isa-sparcv8-garversion-6.1 = patch-history.3.diff +PATCHFILES_isa-sparcv9-garversion-6.1 = patch-history.3.diff +PATCHFILES_isa-i386-garversion-6.1 = patch-history.3.diff +PATCHFILES_isa-amd64-garversion-6.1 = patch-history.3.diff REQUIRED_PKGS = CSWncurses @@ -37,34 +37,20 @@ TEST_TARGET = check -MERGE_SCRIPTS_isa-i386-garversion-4.3 = copy-only -MERGE_DIRS_isa-i386-garversion-4.3 = $(libdir) -MERGE_SCRIPTS_isa-amd64-garversion-4.3 = copy-relocated-only -MERGE_DIRS_isa-amd64-garversion-4.3 = $(libdir) +MERGE_SCRIPTS_isa-default-garversion-4.3 = copy-only +MERGE_DIRS_isa-default-garversion-4.3 = $(libdir) +MERGE_SCRIPTS_isa-default64-garversion-4.3 = copy-relocated-only +MERGE_DIRS_isa-default64-garversion-4.3 = $(libdir) -MERGE_SCRIPTS_isa-i386-garversion-5.2 = copy-only -MERGE_DIRS_isa-i386-garversion-5.2 = $(libdir) -MERGE_SCRIPTS_isa-amd64-garversion-5.2 = copy-relocated-only -MERGE_DIRS_isa-amd64-garversion-5.2 = $(libdir) +MERGE_SCRIPTS_default-i386-garversion-5.2 = copy-only +MERGE_DIRS_isa-default-garversion-5.2 = $(libdir) +MERGE_SCRIPTS_isa-default64-garversion-5.2 = copy-relocated-only +MERGE_DIRS_isa-default64-garversion-5.2 = $(libdir) -MERGE_SCRIPTS_isa-i386-garversion-6.0 = copy-all -MERGE_SCRIPTS_isa-amd64-garversion-6.0 = copy-relocated-only -MERGE_DIRS_isa-amd64-garversion-6.0 = $(bindir) $(sbindir) $(libexecdir) $(libdir) +MERGE_SCRIPTS_isa-default-garversion-6.1 = copy-all +MERGE_SCRIPTS_isa-default64-garversion-6.1 = copy-relocated-only +MERGE_DIRS_isa-default64-garversion-6.1 = $(bindir) $(sbindir) $(libexecdir) $(libdir) -MERGE_SCRIPTS_isa-sparcv8-garversion-4.3 = copy-only -MERGE_DIRS_isa-sparcv8-garversion-4.3 = $(libdir) -MERGE_SCRIPTS_isa-sparcv9-garversion-4.3 = copy-relocated-only -MERGE_DIRS_isa-sparcv9-garversion-4.3 = $(libdir) - -MERGE_SCRIPTS_isa-sparcv8-garversion-5.2 = copy-only -MERGE_DIRS_isa-sparcv8-garversion-5.2 = $(libdir) -MERGE_SCRIPTS_isa-sparcv9-garversion-5.2 = copy-relocated-only -MERGE_DIRS_isa-sparcv9-garversion-5.2 = $(libdir) - -MERGE_SCRIPTS_isa-sparcv8-garversion-6.0 = copy-all -MERGE_SCRIPTS_isa-sparcv9-garversion-6.0 = copy-relocated-only -MERGE_DIRS_isa-sparcv9-garversion-6.0 = $(bindir) $(sbindir) $(libexecdir) $(libdir) - SPKG_SOURCEURL = http://tiswww.case.edu/php/chet/readline/rltop.html include gar/category.mk Modified: csw/mgar/pkg/readline/trunk/checksums =================================================================== --- csw/mgar/pkg/readline/trunk/checksums 2010-01-01 11:04:45 UTC (rev 7806) +++ csw/mgar/pkg/readline/trunk/checksums 2010-01-01 11:08:41 UTC (rev 7807) @@ -1,4 +1,4 @@ -f86f7cb717ab321fe15f1bbcb058c11e download/readline-4.3.tar.gz -e39331f32ad14009b9ff49cc10c5e751 download/readline-5.2.tar.gz -b7f65a48add447693be6e86f04a63019 download/readline-6.0.tar.gz -8db909e6af79c3f5c266fad1972b4e41 download/patch-history.3.diff +8db909e6af79c3f5c266fad1972b4e41 patch-history.3.diff +f86f7cb717ab321fe15f1bbcb058c11e readline-4.3.tar.gz +e39331f32ad14009b9ff49cc10c5e751 readline-5.2.tar.gz +fc2f7e714fe792db1ce6ddc4c9fb4ef3 readline-6.1.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Fri Jan 1 14:42:49 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 01 Jan 2010 13:42:49 +0000 Subject: [csw-devel] SF.net SVN: gar:[7808] csw/mgar/pkg/readline/trunk/Makefile Message-ID: Revision: 7808 http://gar.svn.sourceforge.net/gar/?rev=7808&view=rev Author: dmichelsen Date: 2010-01-01 13:42:49 +0000 (Fri, 01 Jan 2010) Log Message: ----------- readline: Fix typo Modified Paths: -------------- csw/mgar/pkg/readline/trunk/Makefile Modified: csw/mgar/pkg/readline/trunk/Makefile =================================================================== --- csw/mgar/pkg/readline/trunk/Makefile 2010-01-01 11:08:41 UTC (rev 7807) +++ csw/mgar/pkg/readline/trunk/Makefile 2010-01-01 13:42:49 UTC (rev 7808) @@ -42,7 +42,7 @@ MERGE_SCRIPTS_isa-default64-garversion-4.3 = copy-relocated-only MERGE_DIRS_isa-default64-garversion-4.3 = $(libdir) -MERGE_SCRIPTS_default-i386-garversion-5.2 = copy-only +MERGE_SCRIPTS_isa-deafult-garversion-5.2 = copy-only MERGE_DIRS_isa-default-garversion-5.2 = $(libdir) MERGE_SCRIPTS_isa-default64-garversion-5.2 = copy-relocated-only MERGE_DIRS_isa-default64-garversion-5.2 = $(libdir) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Fri Jan 1 14:49:30 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 01 Jan 2010 13:49:30 +0000 Subject: [csw-devel] SF.net SVN: gar:[7809] csw/mgar/pkg/readline/trunk/Makefile Message-ID: Revision: 7809 http://gar.svn.sourceforge.net/gar/?rev=7809&view=rev Author: dmichelsen Date: 2010-01-01 13:49:30 +0000 (Fri, 01 Jan 2010) Log Message: ----------- readline: Fix typo ...again :-( Modified Paths: -------------- csw/mgar/pkg/readline/trunk/Makefile Modified: csw/mgar/pkg/readline/trunk/Makefile =================================================================== --- csw/mgar/pkg/readline/trunk/Makefile 2010-01-01 13:42:49 UTC (rev 7808) +++ csw/mgar/pkg/readline/trunk/Makefile 2010-01-01 13:49:30 UTC (rev 7809) @@ -42,7 +42,7 @@ MERGE_SCRIPTS_isa-default64-garversion-4.3 = copy-relocated-only MERGE_DIRS_isa-default64-garversion-4.3 = $(libdir) -MERGE_SCRIPTS_isa-deafult-garversion-5.2 = copy-only +MERGE_SCRIPTS_isa-default-garversion-5.2 = copy-only MERGE_DIRS_isa-default-garversion-5.2 = $(libdir) MERGE_SCRIPTS_isa-default64-garversion-5.2 = copy-relocated-only MERGE_DIRS_isa-default64-garversion-5.2 = $(libdir) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Fri Jan 1 14:54:45 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 01 Jan 2010 13:54:45 +0000 Subject: [csw-devel] SF.net SVN: gar:[7810] csw/mgar/pkg/libgcrypt/trunk/Makefile Message-ID: Revision: 7810 http://gar.svn.sourceforge.net/gar/?rev=7810&view=rev Author: dmichelsen Date: 2010-01-01 13:54:45 +0000 (Fri, 01 Jan 2010) Log Message: ----------- libgcrypt: Fix typo in catalog name Modified Paths: -------------- csw/mgar/pkg/libgcrypt/trunk/Makefile Modified: csw/mgar/pkg/libgcrypt/trunk/Makefile =================================================================== --- csw/mgar/pkg/libgcrypt/trunk/Makefile 2010-01-01 13:49:30 UTC (rev 7809) +++ csw/mgar/pkg/libgcrypt/trunk/Makefile 2010-01-01 13:54:45 UTC (rev 7810) @@ -11,7 +11,7 @@ DISTFILES = $(GARNAME)-$(GARVERSION).tar.bz2 PACKAGES = CSWgcrypt -CATALOGNAME = llibgcrypt +CATALOGNAME = libgcrypt SPKG_SOURCEURL = http://www.gnupg.org/related_software/libraries.en.html#lib-libgcrypt This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From rthurner at users.sourceforge.net Fri Jan 1 15:03:34 2010 From: rthurner at users.sourceforge.net (rthurner at users.sourceforge.net) Date: Fri, 01 Jan 2010 14:03:34 +0000 Subject: [csw-devel] SF.net SVN: gar:[7811] csw/mgar/pkg Message-ID: Revision: 7811 http://gar.svn.sourceforge.net/gar/?rev=7811&view=rev Author: rthurner Date: 2010-01-01 14:03:34 +0000 (Fri, 01 Jan 2010) Log Message: ----------- kde4libs - first try of kdelibs, kde4 Added Paths: ----------- csw/mgar/pkg/kde4libs/ csw/mgar/pkg/kde4libs/branches/ csw/mgar/pkg/kde4libs/tags/ csw/mgar/pkg/kde4libs/trunk/ csw/mgar/pkg/kde4libs/trunk/Makefile csw/mgar/pkg/kde4libs/trunk/checksums csw/mgar/pkg/kde4libs/trunk/files/ Property changes on: csw/mgar/pkg/kde4libs/trunk ___________________________________________________________________ Added: svn:ignore + cookies download work Added: svn:externals + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 Added: csw/mgar/pkg/kde4libs/trunk/Makefile =================================================================== --- csw/mgar/pkg/kde4libs/trunk/Makefile (rev 0) +++ csw/mgar/pkg/kde4libs/trunk/Makefile 2010-01-01 14:03:34 UTC (rev 7811) @@ -0,0 +1,10 @@ +GARNAME = kde4libs +DISTNAME = kdelibs +CATEGORIES = kde4 + +DESCRIPTION = Brief description +define BLURB + Long description +endef + +include gar/category.mk Added: csw/mgar/pkg/kde4libs/trunk/checksums =================================================================== --- csw/mgar/pkg/kde4libs/trunk/checksums (rev 0) +++ csw/mgar/pkg/kde4libs/trunk/checksums 2010-01-01 14:03:34 UTC (rev 7811) @@ -0,0 +1 @@ +bc781838ad8cafa479e99139f7f403f3 kdelibs-4.3.4.tar.bz2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From rthurner at users.sourceforge.net Fri Jan 1 15:04:23 2010 From: rthurner at users.sourceforge.net (rthurner at users.sourceforge.net) Date: Fri, 01 Jan 2010 14:04:23 +0000 Subject: [csw-devel] SF.net SVN: gar:[7812] csw/mgar/gar/v2/categories Message-ID: Revision: 7812 http://gar.svn.sourceforge.net/gar/?rev=7812&view=rev Author: rthurner Date: 2010-01-01 14:04:23 +0000 (Fri, 01 Jan 2010) Log Message: ----------- kde4 - add new category for kde4 builds Added Paths: ----------- csw/mgar/gar/v2/categories/kde4/ csw/mgar/gar/v2/categories/kde4/category.mk Removed Paths: ------------- csw/mgar/gar/v2/categories/kde4/category.mk Deleted: csw/mgar/gar/v2/categories/kde4/category.mk =================================================================== --- csw/mgar/gar/v2/categories/kde/category.mk 2009-12-20 15:40:36 UTC (rev 7684) +++ csw/mgar/gar/v2/categories/kde4/category.mk 2010-01-01 14:04:23 UTC (rev 7812) @@ -1,16 +0,0 @@ - -# KDE -KDE_ROOT = http://download.kde.org -KDE_VERSION = 3.5.2 -KDE_DIST = stable -KDE_MIRROR = $(KDE_ROOT)/$(KDE_DIST)/$(KDE_VERSION)/src/ - -MASTER_SITES ?= $(KDE_MIRROR) -GARVERSION ?= $(KDE_VERSION) -PKGDIST ?= $(GARNAME)-$(GARVERSION).tar.bz2 -DISTFILES += $(PKGDIST) - -# Compiler -GARCOMPILER = GNU - -include gar/gar.mk Copied: csw/mgar/gar/v2/categories/kde4/category.mk (from rev 7739, csw/mgar/gar/v2/categories/kde/category.mk) =================================================================== --- csw/mgar/gar/v2/categories/kde4/category.mk (rev 0) +++ csw/mgar/gar/v2/categories/kde4/category.mk 2010-01-01 14:04:23 UTC (rev 7812) @@ -0,0 +1,16 @@ + +# KDE +KDE_ROOT = http://download.kde.org +KDE_VERSION = 4.3.4 +KDE_DIST = stable +KDE_MIRROR = $(KDE_ROOT)/$(KDE_DIST)/$(KDE_VERSION)/src/ + +MASTER_SITES ?= $(KDE_MIRROR) +GARVERSION ?= $(KDE_VERSION) +PKGDIST ?= $(DISTNAME)-$(GARVERSION).tar.bz2 +DISTFILES += $(PKGDIST) + +# Compiler +GARCOMPILER = GNU + +include gar/gar.mk This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From rthurner at users.sourceforge.net Fri Jan 1 18:07:39 2010 From: rthurner at users.sourceforge.net (rthurner at users.sourceforge.net) Date: Fri, 01 Jan 2010 17:07:39 +0000 Subject: [csw-devel] SF.net SVN: gar:[7813] csw/mgar/pkg/apr/trunk/Makefile Message-ID: Revision: 7813 http://gar.svn.sourceforge.net/gar/?rev=7813&view=rev Author: rthurner Date: 2010-01-01 17:07:39 +0000 (Fri, 01 Jan 2010) Log Message: ----------- apr - remove layout Modified Paths: -------------- csw/mgar/pkg/apr/trunk/Makefile Modified: csw/mgar/pkg/apr/trunk/Makefile =================================================================== --- csw/mgar/pkg/apr/trunk/Makefile 2010-01-01 14:04:23 UTC (rev 7812) +++ csw/mgar/pkg/apr/trunk/Makefile 2010-01-01 17:07:39 UTC (rev 7813) @@ -17,35 +17,10 @@ BUILD64 = 1 -CONFIGURE_ARGS = --prefix=$(prefix) -CONFIGURE_ARGS += --enable-layout=csw +CONFIGURE_ARGS = $(DIRPATHS) CONFIGURE_ARGS += --enable-threads CONFIGURE_ARGS += --enable-other-child TEST_TARGET = check include gar/category.mk - -post-extract-modulated: - ginstall -d $(WORKSRC) - (echo "# csw layout";\ - echo "";\ - echo " prefix: $(prefix)";\ - echo " exec_prefix: $(exec_prefix)";\ - echo " bindir: $(bindir)";\ - echo " sbindir: $(sbindir)";\ - echo " libdir: $(libdir)";\ - echo " libexecdir: $(libdir)/apr/modules";\ - echo " mandir: $(mandir)";\ - echo " datadir: $(datadir)/apr";\ - echo " includedir: $(includedir)/apr-$${APR_MAJOR_VERSION}";\ - echo " localstatedir: /var/run";\ - echo " runtimedir: /var/run";\ - echo " infodir: $(infodir)";\ - echo " libsuffix: -$${APR_MAJOR_VERSION}";\ - echo "") >$(WORKSRC)/config.layout - @$(MAKECOOKIE) - -post-install-modulated: - gln -s apr-1-config $(DESTDIR)$(bindir)/apr-config - @$(MAKECOOKIE) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Fri Jan 1 23:12:54 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 01 Jan 2010 22:12:54 +0000 Subject: [csw-devel] SF.net SVN: gar:[7814] csw/mgar/pkg/ncftp/trunk Message-ID: Revision: 7814 http://gar.svn.sourceforge.net/gar/?rev=7814&view=rev Author: dmichelsen Date: 2010-01-01 22:12:41 +0000 (Fri, 01 Jan 2010) Log Message: ----------- ncftp: Update to 3.2.3 Modified Paths: -------------- csw/mgar/pkg/ncftp/trunk/Makefile csw/mgar/pkg/ncftp/trunk/checksums Removed Paths: ------------- csw/mgar/pkg/ncftp/trunk/files/CSWncftp.depend csw/mgar/pkg/ncftp/trunk/files/CSWncftp.gspec csw/mgar/pkg/ncftp/trunk/files/Makefile.in.diff Property Changed: ---------------- csw/mgar/pkg/ncftp/trunk/ Property changes on: csw/mgar/pkg/ncftp/trunk ___________________________________________________________________ Modified: svn:externals - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v1 + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 Modified: csw/mgar/pkg/ncftp/trunk/Makefile =================================================================== --- csw/mgar/pkg/ncftp/trunk/Makefile 2010-01-01 17:07:39 UTC (rev 7813) +++ csw/mgar/pkg/ncftp/trunk/Makefile 2010-01-01 22:12:41 UTC (rev 7814) @@ -1,5 +1,5 @@ GARNAME = ncftp -GARVERSION = 3.2.0 +GARVERSION = 3.2.3 CATEGORIES = net DESCRIPTION = File Transfer Protocol (FTP) client applications. @@ -10,18 +10,19 @@ endef MASTER_SITES = ftp://ftp.ncftp.com/ncftp/ -DISTFILES = $(GARNAME)-$(GARVERSION)-src.tar.bz2 -DISTFILES += $(call admfiles,CSWncftp,depend) +DISTFILES = $(DISTNAME)-src.tar.bz2 # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*)-src.tar.bz2 -WORKSRC = $(WORKDIR)/$(GARNAME)-$(GARVERSION) +REQUIRED_PKGS = CSWgtar -CONFIGURE_ARGS = $(DIRPATHS) --without-ncurses +LICENSE = doc/LICENSE.txt -PATCHFILES = Makefile.in.diff +SPKG_SOURCEURL = http://www.ncftp.com/ +CONFIGURE_ARGS = $(DIRPATHS) + # No test target in the makefile TEST_SCRIPTS = Modified: csw/mgar/pkg/ncftp/trunk/checksums =================================================================== --- csw/mgar/pkg/ncftp/trunk/checksums 2010-01-01 17:07:39 UTC (rev 7813) +++ csw/mgar/pkg/ncftp/trunk/checksums 2010-01-01 22:12:41 UTC (rev 7814) @@ -1,4 +1 @@ -384b7f01d725c89ccd30692628b3ac1b download/ncftp-3.2.0-src.tar.bz2 -22825be4246e37b86d4b5ad58f63974a download/CSWncftp.gspec -f52b45c3c795753b4ce943dc304b49d5 download/CSWncftp.depend -a0d80d971e7d8f337915e5a90041c4b9 download/Makefile.in.diff +fac4aa169e1734e8d9617afd4a9b51e5 ncftp-3.2.3-src.tar.bz2 Deleted: csw/mgar/pkg/ncftp/trunk/files/CSWncftp.depend =================================================================== --- csw/mgar/pkg/ncftp/trunk/files/CSWncftp.depend 2010-01-01 17:07:39 UTC (rev 7813) +++ csw/mgar/pkg/ncftp/trunk/files/CSWncftp.depend 2010-01-01 22:12:41 UTC (rev 7814) @@ -1 +0,0 @@ -P CSWgtar - gtar - GNU tape archiver Deleted: csw/mgar/pkg/ncftp/trunk/files/CSWncftp.gspec =================================================================== --- csw/mgar/pkg/ncftp/trunk/files/CSWncftp.gspec 2010-01-01 17:07:39 UTC (rev 7813) +++ csw/mgar/pkg/ncftp/trunk/files/CSWncftp.gspec 2010-01-01 22:12:41 UTC (rev 7814) @@ -1,4 +0,0 @@ -%var bitname ncftp -%var pkgname CSWncftp -%include url file://%{PKGLIB}/csw_dyndepend.gspec -%copyright url file://%{WORKSRC}/doc/LICENSE.txt Deleted: csw/mgar/pkg/ncftp/trunk/files/Makefile.in.diff =================================================================== --- csw/mgar/pkg/ncftp/trunk/files/Makefile.in.diff 2010-01-01 17:07:39 UTC (rev 7813) +++ csw/mgar/pkg/ncftp/trunk/files/Makefile.in.diff 2010-01-01 22:12:41 UTC (rev 7814) @@ -1,12 +0,0 @@ -diff --speed-large-files --minimal -Nru ncftp-3.2.0.orig/Makefile.in ncftp-3.2.0/Makefile.in ---- ncftp-3.2.0.orig/Makefile.in 2006-08-05 17:42:30.000000000 -0400 -+++ ncftp-3.2.0/Makefile.in 2006-09-17 09:23:21.647033000 -0400 -@@ -44,7 +44,7 @@ - @( cd ./sh_util ; $(MAKE) "CC=$(CC)" "CFLAGS=$(CFLAGS)" ) - @( cd ./vis ; $(MAKE) "CC=$(CC)" "CFLAGS=$(CFLAGS)" ) - - at test -z "$(DESTDIR)" || mkdir -p "$DESTDIR" 2>/dev/null -- -mkdir "$(DESTDIR)$(prefix)" "$(DESTDIR)$(BINDIR)" "$(DESTDIR)$(SYSCONFDIR)" "$(DESTDIR)$(mandir)" "$(DESTDIR)$(mandir)/man1" 2>/dev/null -+ -mkdir -p "$(DESTDIR)$(prefix)" "$(DESTDIR)$(BINDIR)" "$(DESTDIR)$(SYSCONFDIR)" "$(DESTDIR)$(mandir)" "$(DESTDIR)$(mandir)/man1" 2>/dev/null - - at echo '..... Installing the programs .....' - $(INSTALL_PROGRAM) bin/ncftp at EXEEXT@ "$(DESTDIR)$(BINDIR)/ncftp at EXEEXT@" - $(INSTALL_PROGRAM) bin/ncftpget at EXEEXT@ "$(DESTDIR)$(BINDIR)/ncftpget at EXEEXT@" This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Fri Jan 1 23:59:56 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 01 Jan 2010 22:59:56 +0000 Subject: [csw-devel] SF.net SVN: gar:[7815] csw/mgar/pkg Message-ID: Revision: 7815 http://gar.svn.sourceforge.net/gar/?rev=7815&view=rev Author: dmichelsen Date: 2010-01-01 22:59:56 +0000 (Fri, 01 Jan 2010) Log Message: ----------- fam: Initial commit , does not build yet Added Paths: ----------- csw/mgar/pkg/fam/ csw/mgar/pkg/fam/branches/ csw/mgar/pkg/fam/tags/ csw/mgar/pkg/fam/trunk/ csw/mgar/pkg/fam/trunk/Makefile csw/mgar/pkg/fam/trunk/checksums csw/mgar/pkg/fam/trunk/files/ Property changes on: csw/mgar/pkg/fam/trunk ___________________________________________________________________ Added: svn:ignore + cookies download work Added: svn:externals + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 Added: csw/mgar/pkg/fam/trunk/Makefile =================================================================== --- csw/mgar/pkg/fam/trunk/Makefile (rev 0) +++ csw/mgar/pkg/fam/trunk/Makefile 2010-01-01 22:59:56 UTC (rev 7815) @@ -0,0 +1,27 @@ +GARNAME = fam +GARVERSION = 2.7.0 +CATEGORIES = server + +DESCRIPTION = File Alteration Monitor, daemon and interface library +define BLURB + GUI tools should not mislead the user; they should display the current + state of the system, even when changes to the system originate from outside + of the tools themselves. FAM helps make GUI tools more usable by notifying + them when the files they're interested in are created, modified, executed, + and removed. +endef + +MASTER_SITES = ftp://oss.sgi.com/projects/fam/download/stable/ +DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz + +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + +SPKG_SOURCEURL = http://oss.sgi.com/projects/fam/ + +CONFIGURE_ARGS = $(DIRPATHS) + +CSWfam_etcrpc = "sgi_fam 391002" +CSWfam_inetdconf = "sgi_fam/1-2 stream rpc/tcp wait root $(bindir)/fam fam" + +include gar/category.mk Added: csw/mgar/pkg/fam/trunk/checksums =================================================================== --- csw/mgar/pkg/fam/trunk/checksums (rev 0) +++ csw/mgar/pkg/fam/trunk/checksums 2010-01-01 22:59:56 UTC (rev 7815) @@ -0,0 +1 @@ +1bf3ae6c0c58d3201afc97c6a4834e39 fam-2.7.0.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Sat Jan 2 00:28:32 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 01 Jan 2010 23:28:32 +0000 Subject: [csw-devel] SF.net SVN: gar:[7816] csw/mgar/pkg/squid/tags/squid-squid-2.7, REV=2009.06. 18_STABLE6/ Message-ID: Revision: 7816 http://gar.svn.sourceforge.net/gar/?rev=7816&view=rev Author: dmichelsen Date: 2010-01-01 23:28:32 +0000 (Fri, 01 Jan 2010) Log Message: ----------- squid: Tag squid-2.7,REV=2009.06.18_STABLE6 Added Paths: ----------- csw/mgar/pkg/squid/tags/squid-squid-2.7,REV=2009.06.18_STABLE6/ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From rthurner at users.sourceforge.net Sat Jan 2 09:39:27 2010 From: rthurner at users.sourceforge.net (rthurner at users.sourceforge.net) Date: Sat, 02 Jan 2010 08:39:27 +0000 Subject: [csw-devel] SF.net SVN: gar:[7817] csw/mgar/pkg/mercurial/trunk Message-ID: Revision: 7817 http://gar.svn.sourceforge.net/gar/?rev=7817&view=rev Author: rthurner Date: 2010-01-02 08:39:27 +0000 (Sat, 02 Jan 2010) Log Message: ----------- mercurial-1.4.2 upgrade Modified Paths: -------------- csw/mgar/pkg/mercurial/trunk/Makefile csw/mgar/pkg/mercurial/trunk/checksums Modified: csw/mgar/pkg/mercurial/trunk/Makefile =================================================================== --- csw/mgar/pkg/mercurial/trunk/Makefile 2010-01-01 23:28:32 UTC (rev 7816) +++ csw/mgar/pkg/mercurial/trunk/Makefile 2010-01-02 08:39:27 UTC (rev 7817) @@ -1,5 +1,5 @@ GARNAME = mercurial -GARVERSION = 1.4.1 +GARVERSION = 1.4.2 CATEGORIES = devel DESCRIPTION = Fast, lightweight Source Control Management system Modified: csw/mgar/pkg/mercurial/trunk/checksums =================================================================== --- csw/mgar/pkg/mercurial/trunk/checksums 2010-01-01 23:28:32 UTC (rev 7816) +++ csw/mgar/pkg/mercurial/trunk/checksums 2010-01-02 08:39:27 UTC (rev 7817) @@ -1,3 +1,3 @@ db884ecb306bcbf49b671f880d29c431 CSWmercurial.changelog.CSW d280026d7687f061371e87ff306c97c2 CSWmercurial.gspec -eacffecad59ec145e61a1edf332b3f1f mercurial-1.4.1.tar.gz +cf23b0887f0437c8601d5b89ae4663a6 mercurial-1.4.2.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From rthurner at users.sourceforge.net Sat Jan 2 09:43:33 2010 From: rthurner at users.sourceforge.net (rthurner at users.sourceforge.net) Date: Sat, 02 Jan 2010 08:43:33 +0000 Subject: [csw-devel] SF.net SVN: gar:[7818] csw/mgar/pkg/mercurial/trunk Message-ID: Revision: 7818 http://gar.svn.sourceforge.net/gar/?rev=7818&view=rev Author: rthurner Date: 2010-01-02 08:43:33 +0000 (Sat, 02 Jan 2010) Log Message: ----------- mercurial - remove double depends, changelog file and outdated gspec Modified Paths: -------------- csw/mgar/pkg/mercurial/trunk/Makefile Removed Paths: ------------- csw/mgar/pkg/mercurial/trunk/files/CSWmercurial.changelog.CSW csw/mgar/pkg/mercurial/trunk/files/CSWmercurial.gspec Modified: csw/mgar/pkg/mercurial/trunk/Makefile =================================================================== --- csw/mgar/pkg/mercurial/trunk/Makefile 2010-01-02 08:39:27 UTC (rev 7817) +++ csw/mgar/pkg/mercurial/trunk/Makefile 2010-01-02 08:43:33 UTC (rev 7818) @@ -12,7 +12,7 @@ SPKG_DESC_CSWmercurial = Mercurial -REQUIRED_PKGS_CSWmercurial = CSWpython CSWpython-rt +REQUIRED_PKGS_CSWmercurial = CSWpython # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz Deleted: csw/mgar/pkg/mercurial/trunk/files/CSWmercurial.changelog.CSW =================================================================== --- csw/mgar/pkg/mercurial/trunk/files/CSWmercurial.changelog.CSW 2010-01-02 08:39:27 UTC (rev 7817) +++ csw/mgar/pkg/mercurial/trunk/files/CSWmercurial.changelog.CSW 2010-01-02 08:43:33 UTC (rev 7818) @@ -1,6 +0,0 @@ -mercurial (1.0,REV=2008.03.26) unstable - - * Updated to latest mercurial - * Fixing bug #2813: CGI scripts doesn't use #!/opt/csw/bin/python - - -- Trygve Laugstol Wed Mar 26 15:47:58 CET 2008 Deleted: csw/mgar/pkg/mercurial/trunk/files/CSWmercurial.gspec =================================================================== --- csw/mgar/pkg/mercurial/trunk/files/CSWmercurial.gspec 2010-01-02 08:39:27 UTC (rev 7817) +++ csw/mgar/pkg/mercurial/trunk/files/CSWmercurial.gspec 2010-01-02 08:43:33 UTC (rev 7818) @@ -1,7 +0,0 @@ -%var bitname mercurial -%var pkgname CSWmercurial -%include url file://%{PKGLIB}/csw_dyndepend.gspec -%copyright - -Please see /opt/csw/share/doc/mercurial/LICENSE for license information - This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From rthurner at users.sourceforge.net Sat Jan 2 09:45:29 2010 From: rthurner at users.sourceforge.net (rthurner at users.sourceforge.net) Date: Sat, 02 Jan 2010 08:45:29 +0000 Subject: [csw-devel] SF.net SVN: gar:[7819] csw/mgar/pkg/mercurial/trunk/Makefile Message-ID: Revision: 7819 http://gar.svn.sourceforge.net/gar/?rev=7819&view=rev Author: rthurner Date: 2010-01-02 08:45:28 +0000 (Sat, 02 Jan 2010) Log Message: ----------- mercurial - remove changelog Modified Paths: -------------- csw/mgar/pkg/mercurial/trunk/Makefile Modified: csw/mgar/pkg/mercurial/trunk/Makefile =================================================================== --- csw/mgar/pkg/mercurial/trunk/Makefile 2010-01-02 08:43:33 UTC (rev 7818) +++ csw/mgar/pkg/mercurial/trunk/Makefile 2010-01-02 08:45:28 UTC (rev 7819) @@ -8,7 +8,6 @@ MASTER_SITES = http://selenic.com/mercurial/release/ DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz -DISTFILES += $(call admfiles,CSWmercurial,changelog.CSW) SPKG_DESC_CSWmercurial = Mercurial This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From rthurner at users.sourceforge.net Sat Jan 2 09:46:38 2010 From: rthurner at users.sourceforge.net (rthurner at users.sourceforge.net) Date: Sat, 02 Jan 2010 08:46:38 +0000 Subject: [csw-devel] SF.net SVN: gar:[7820] csw/mgar/pkg/mercurial/trunk/checksums Message-ID: Revision: 7820 http://gar.svn.sourceforge.net/gar/?rev=7820&view=rev Author: rthurner Date: 2010-01-02 08:46:38 +0000 (Sat, 02 Jan 2010) Log Message: ----------- mercurial - update checksums, consider removed files Modified Paths: -------------- csw/mgar/pkg/mercurial/trunk/checksums Modified: csw/mgar/pkg/mercurial/trunk/checksums =================================================================== --- csw/mgar/pkg/mercurial/trunk/checksums 2010-01-02 08:45:28 UTC (rev 7819) +++ csw/mgar/pkg/mercurial/trunk/checksums 2010-01-02 08:46:38 UTC (rev 7820) @@ -1,3 +1 @@ -db884ecb306bcbf49b671f880d29c431 CSWmercurial.changelog.CSW -d280026d7687f061371e87ff306c97c2 CSWmercurial.gspec cf23b0887f0437c8601d5b89ae4663a6 mercurial-1.4.2.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Sat Jan 2 10:49:53 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sat, 02 Jan 2010 09:49:53 +0000 Subject: [csw-devel] SF.net SVN: gar:[7821] csw/mgar/gar/v2-checkpkg/bin/checkpkg.d/checkpkg.py Message-ID: Revision: 7821 http://gar.svn.sourceforge.net/gar/?rev=7821&view=rev Author: wahwah Date: 2010-01-02 09:49:52 +0000 (Sat, 02 Jan 2010) Log Message: ----------- mGAR v2-checkpkg: Implemented cache age checking, this was the last missing major feature. Modified Paths: -------------- csw/mgar/gar/v2-checkpkg/bin/checkpkg.d/checkpkg.py Modified: csw/mgar/gar/v2-checkpkg/bin/checkpkg.d/checkpkg.py =================================================================== --- csw/mgar/gar/v2-checkpkg/bin/checkpkg.d/checkpkg.py 2010-01-02 08:46:38 UTC (rev 7820) +++ csw/mgar/gar/v2-checkpkg/bin/checkpkg.d/checkpkg.py 2010-01-02 09:49:52 UTC (rev 7821) @@ -3,20 +3,22 @@ # This is the checkpkg library, common for all checkpkg tests written in # Python. +import itertools +import logging import optparse import os import os.path -import logging -import subprocess import re +import socket import sqlite3 -import socket +import subprocess SYSTEM_PKGMAP = "/var/sadm/install/contents" WS_RE = re.compile(r"\s+") NEEDED_SONAMES = "needed sonames" RUNPATH = "runpath" SONAME = "soname" +CONFIG_MTIME = "mtime" DO_NOT_REPORT_SURPLUS = set([u"CSWcommon", u"CSWcswclassutils", u"CSWisaexec"]) DO_NOT_REPORT_MISSING = set([u"SUNWlibC", u"SUNWcsl", u"SUNWlibms", u"*SUNWcslr", u"*SUNWlibC", u"*SUNWlibms"]) @@ -25,7 +27,6 @@ # Solaris 8 on i386. It's okay if it's missing. ALLOWED_ORPHAN_SONAMES = set([u"libm.so.2"]) - class Error(Exception): pass @@ -131,9 +132,14 @@ self.fqdn = socket.getfqdn() self.db_path = os.path.join(self.checkpkg_dir, self.SQLITE3_DBNAME_TMPL % self.fqdn) + self.file_mtime = None + self.cache_mtime = None if os.path.exists(self.db_path): logging.debug("Connecting to the %s database.", self.db_path) self.conn = sqlite3.connect(self.db_path) + if not self.IsDatabaseUpToDate(): + self.PurgeDatabase() + self.PopulateDatabase() else: print "Building a cache of /var/sadm/install/contents." print "The cache will be kept in %s." % self.db_path @@ -150,31 +156,62 @@ line TEXT ); """) + self.debug("Creating the config table.") + c.execute(""" + CREATE TABLE config ( + key VARCHAR(255) PRIMARY KEY, + float_value FLOAT, + str_value VARCHAR(255) + ); + """) + self.PopulateDatabase() - # Original bit of code from checkpkg: - # - # egrep -v 'SUNWbcp|SUNWowbcp|SUNWucb' /var/sadm/install/contents | - # fgrep -f $EXTRACTDIR/liblist >$EXTRACTDIR/shortcatalog + def PopulateDatabase(self): + """Imports data into the database. - system_pkgmap_fd = open(SYSTEM_PKGMAP, "r") + Original bit of code from checkpkg: + + egrep -v 'SUNWbcp|SUNWowbcp|SUNWucb' /var/sadm/install/contents | + fgrep -f $EXTRACTDIR/liblist >$EXTRACTDIR/shortcatalog + """ - stop_re = re.compile("(%s)" % "|".join(self.STOP_PKGS)) + system_pkgmap_fd = open(SYSTEM_PKGMAP, "r") + stop_re = re.compile("(%s)" % "|".join(self.STOP_PKGS)) + # Creating a data structure: + # soname - {: , : , ...} + logging.debug("Building sqlite3 cache db of the %s file", + SYSTEM_PKGMAP) + c = self.conn.cursor() + count = itertools.count() + for line in system_pkgmap_fd: + i = count.next() + if not i % 1000: + print "\r%s" % i, + if stop_re.search(line): + continue + fields = re.split(WS_RE, line) + pkgmap_entry_path = fields[0].split("=")[0] + pkgmap_entry_dir, pkgmap_entry_base_name = os.path.split(pkgmap_entry_path) + sql = "INSERT INTO systempkgmap (basename, path, line) VALUES (?, ?, ?);" + c.execute(sql, (pkgmap_entry_base_name, pkgmap_entry_dir, line.strip())) + print + print "Creating the main database index." + sql = "CREATE INDEX basename_idx ON systempkgmap(basename);" + c.execute(sql) + self.SetDatabaseMtime() + self.conn.commit() - # Creating a data structure: - # soname - {: , : , ...} - logging.debug("Building sqlite3 cache db of the %s file", - SYSTEM_PKGMAP) - for line in system_pkgmap_fd: - if stop_re.search(line): - continue - fields = re.split(WS_RE, line) - pkgmap_entry_path = fields[0].split("=")[0] - pkgmap_entry_dir, pkgmap_entry_base_name = os.path.split(pkgmap_entry_path) - sql = "INSERT INTO systempkgmap (basename, path, line) VALUES (?, ?, ?);" - c.execute(sql, (pkgmap_entry_base_name, pkgmap_entry_dir, line.strip())) - print "Creating a database index." - sql = "CREATE INDEX basename_idx ON systempkgmap(basename);" - self.conn.execute(sql) + def SetDatabaseMtime(self): + c = self.conn.cursor() + sql = "DELETE FROM config WHERE key = ?;" + c.execute(sql, [CONFIG_MTIME]) + mtime = self.GetFileMtime() + logging.debug("Inserting the mtime (%s) into the database.", mtime) + sql = """ + INSERT INTO config (key, float_value) + VALUES (?, ?); + """ + c.execute(sql, [CONFIG_MTIME, mtime]) def GetPkgmapLineByBasename(self, filename): if filename in self.cache: @@ -190,6 +227,46 @@ self.cache[filename] = lines return lines + def GetDatabaseMtime(self): + if not self.cache_mtime: + sql = """ + SELECT float_value FROM config + WHERE key = ?; + """ + c = self.conn.cursor() + c.execute(sql, [CONFIG_MTIME]) + row = c.fetchone() + if not row: + # raise ConfigurationError("Could not find the mtime setting") + self.cache_mtime = 1 + else: + self.cache_mtime = row[0] + return self.cache_mtime + + def GetFileMtime(self): + if not self.file_mtime: + stat_data = os.stat(SYSTEM_PKGMAP) + self.file_mtime = stat_data.st_mtime + return self.file_mtime + + def IsDatabaseUpToDate(self): + f_mtime = self.GetFileMtime() + d_mtime = self.GetDatabaseMtime() + logging.debug("f_mtime", f_mtime, "d_time", d_mtime) + return self.GetFileMtime() <= self.GetDatabaseMtime() + + def PurgeDatabase(self): + c = self.conn.cursor() + sql = "DELETE FROM config;" + c.execute(sql) + sql = "DELETE FROM systempkgmap;" + c.execute(sql) + sql = "DROP INDEX basename_idx;" + try: + c.execute(sql) + except sqlite3.OperationalError, e: + logging.warn(e) + def SharedObjectDependencies(pkgname, binaries_by_pkgname, needed_sonames_by_binary, @@ -334,7 +411,7 @@ symlinked_list.append(runpath.replace("/64", "/amd64")) symlinked_list.append(runpath.replace("/64", "/sparcv9")) else: - symlinked_list.append(runpath) + symlinked_list.append(runpath) return symlinked_list This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Sat Jan 2 11:29:31 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sat, 02 Jan 2010 10:29:31 +0000 Subject: [csw-devel] SF.net SVN: gar:[7822] csw/mgar/gar/v2-checkpkg/bin/checkpkg.d/checkpkg.py Message-ID: Revision: 7822 http://gar.svn.sourceforge.net/gar/?rev=7822&view=rev Author: wahwah Date: 2010-01-02 10:29:31 +0000 (Sat, 02 Jan 2010) Log Message: ----------- mGAR v2-checkpkg: Fixing a small bug Modified Paths: -------------- csw/mgar/gar/v2-checkpkg/bin/checkpkg.d/checkpkg.py Modified: csw/mgar/gar/v2-checkpkg/bin/checkpkg.d/checkpkg.py =================================================================== --- csw/mgar/gar/v2-checkpkg/bin/checkpkg.d/checkpkg.py 2010-01-02 09:49:52 UTC (rev 7821) +++ csw/mgar/gar/v2-checkpkg/bin/checkpkg.d/checkpkg.py 2010-01-02 10:29:31 UTC (rev 7822) @@ -156,7 +156,7 @@ line TEXT ); """) - self.debug("Creating the config table.") + logging.debug("Creating the config table.") c.execute(""" CREATE TABLE config ( key VARCHAR(255) PRIMARY KEY, This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Sat Jan 2 11:30:28 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sat, 02 Jan 2010 10:30:28 +0000 Subject: [csw-devel] SF.net SVN: gar:[7823] csw/mgar/gar/v2-checkpkg/bin/checkpkg Message-ID: Revision: 7823 http://gar.svn.sourceforge.net/gar/?rev=7823&view=rev Author: wahwah Date: 2010-01-02 10:30:28 +0000 (Sat, 02 Jan 2010) Log Message: ----------- mGAR v2-checkpkg: Adding colors to test result reporting. Modified Paths: -------------- csw/mgar/gar/v2-checkpkg/bin/checkpkg Modified: csw/mgar/gar/v2-checkpkg/bin/checkpkg =================================================================== --- csw/mgar/gar/v2-checkpkg/bin/checkpkg 2010-01-02 10:29:31 UTC (rev 7822) +++ csw/mgar/gar/v2-checkpkg/bin/checkpkg 2010-01-02 10:30:28 UTC (rev 7823) @@ -552,12 +552,13 @@ plugin_base_name=`basename ${plugin}` plugin_log="${EXTRACTDIR}/${plugin_base_name}.log" log_files="${log_files} ${plugin_log}" + printf "TEST: ${plugin} running..." ${plugin} $extra_options -e "${EXTRACTDIR}" ${pkgnames} > "${plugin_log}" 2>&1 if [[ "$?" -ne 0 ]]; then - print "TEST: ${plugin} [FAIL]" + printf "\rTEST: ${plugin} \\033[1;31;40m[OK]\\033[00m \\n" test_suite_ok=0 else - print "TEST: ${plugin} [OK]" + printf "\rTEST: ${plugin} \\033[0;32;40m[OK]\\033[00m \\n" fi else debugmsg "'${plugin}' is not executable" This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Sat Jan 2 11:44:33 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Sat, 02 Jan 2010 10:44:33 +0000 Subject: [csw-devel] SF.net SVN: gar:[7824] csw/mgar/pkg Message-ID: Revision: 7824 http://gar.svn.sourceforge.net/gar/?rev=7824&view=rev Author: dmichelsen Date: 2010-01-02 10:44:32 +0000 (Sat, 02 Jan 2010) Log Message: ----------- yasm: Initial commit Added Paths: ----------- csw/mgar/pkg/yasm/ csw/mgar/pkg/yasm/branches/ csw/mgar/pkg/yasm/tags/ csw/mgar/pkg/yasm/trunk/ csw/mgar/pkg/yasm/trunk/Makefile csw/mgar/pkg/yasm/trunk/checksums csw/mgar/pkg/yasm/trunk/files/ csw/mgar/pkg/yasm/trunk/files/0001-Force-bash-on-testsuite.patch csw/mgar/pkg/yasm/trunk/files/0002-Additional-force-to-bash.patch Property changes on: csw/mgar/pkg/yasm/trunk ___________________________________________________________________ Added: svn:ignore + cookies download work Added: svn:externals + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 Added: csw/mgar/pkg/yasm/trunk/Makefile =================================================================== --- csw/mgar/pkg/yasm/trunk/Makefile (rev 0) +++ csw/mgar/pkg/yasm/trunk/Makefile 2010-01-02 10:44:32 UTC (rev 7824) @@ -0,0 +1,33 @@ +GARNAME = yasm +GARVERSION = 0.8.0 +CATEGORIES = devel + +DESCRIPTION = A complete rewrite of the NASM assembler +define BLURB + Yasm is a complete rewrite of the NASM assembler under the "new" BSD License + (some portions are under other licenses, see COPYING for details). Yasm currently + supports the x86 and AMD64 instruction sets, accepts NASM and GAS assembler syntaxes, + outputs binary, ELF32, ELF64, 32 and 64-bit Mach-O, RDOFF2, COFF, Win32, and Win64 + object formats, and generates source debugging information in STABS, DWARF 2, and + CodeView 8 formats. Yasm can be easily integrated into Visual Studio 2005 (see + VisualStudio2005) for assembly of NASM or GAS syntax code into Win32 or Win64 object files. +endef + +MASTER_SITES = http://www.tortall.net/projects/yasm/releases/ +DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz + +# Patch testsuite until this has been fixed: +# +PATCHFILES = 0001-Force-bash-on-testsuite.patch +PATCHFILES += 0002-Additional-force-to-bash.patch + +REQUIRED_PKGS = CSWggettextrt + +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + +CONFIGURE_ARGS = $(DIRPATHS) + +TEST_TARGET = check + +include gar/category.mk Added: csw/mgar/pkg/yasm/trunk/checksums =================================================================== --- csw/mgar/pkg/yasm/trunk/checksums (rev 0) +++ csw/mgar/pkg/yasm/trunk/checksums 2010-01-02 10:44:32 UTC (rev 7824) @@ -0,0 +1,3 @@ +1638b5fd7d97e30a437b2cab16d26f95 0001-Force-bash-on-testsuite.patch +8c9a186524ffca15f69be7c984290712 0002-Additional-force-to-bash.patch +84a72204c9b452a00b39b1b00495163f yasm-0.8.0.tar.gz Added: csw/mgar/pkg/yasm/trunk/files/0001-Force-bash-on-testsuite.patch =================================================================== --- csw/mgar/pkg/yasm/trunk/files/0001-Force-bash-on-testsuite.patch (rev 0) +++ csw/mgar/pkg/yasm/trunk/files/0001-Force-bash-on-testsuite.patch 2010-01-02 10:44:32 UTC (rev 7824) @@ -0,0 +1,22 @@ +From 674f59ac775a2860d10b159c6a768987bf42e675 Mon Sep 17 00:00:00 2001 +From: Dagobert Michelsen +Date: Sat, 2 Jan 2010 11:14:49 +0100 +Subject: [PATCH 1/2] Force bash on testsuite + +--- + out_test.sh | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/out_test.sh b/out_test.sh +index 610140d..67dc5d5 100755 +--- a/out_test.sh ++++ b/out_test.sh +@@ -1,4 +1,4 @@ +-#! /bin/sh ++#!/opt/csw/bin/bash + # $Id: out_test.sh 1825 2007-04-22 03:32:46Z peter $ + + YASM_TEST_SUITE=1 +-- +1.6.6 + Added: csw/mgar/pkg/yasm/trunk/files/0002-Additional-force-to-bash.patch =================================================================== --- csw/mgar/pkg/yasm/trunk/files/0002-Additional-force-to-bash.patch (rev 0) +++ csw/mgar/pkg/yasm/trunk/files/0002-Additional-force-to-bash.patch 2010-01-02 10:44:32 UTC (rev 7824) @@ -0,0 +1,22 @@ +From 595b93bd837b5349154d2796da90d53567de5adb Mon Sep 17 00:00:00 2001 +From: Dagobert Michelsen +Date: Sat, 2 Jan 2010 11:21:42 +0100 +Subject: [PATCH 2/2] Additional force to bash + +--- + .../objfmts/bin/tests/multisect/bin_multi_test.sh | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/modules/objfmts/bin/tests/multisect/bin_multi_test.sh b/modules/objfmts/bin/tests/multisect/bin_multi_test.sh +index acd0c34..4984530 100755 +--- a/modules/objfmts/bin/tests/multisect/bin_multi_test.sh ++++ b/modules/objfmts/bin/tests/multisect/bin_multi_test.sh +@@ -1,4 +1,4 @@ +-#! /bin/sh ++#! /bin/bash + # $Id: bin_multi_test.sh 2010 2007-11-14 08:33:32Z peter $ + + YASM_TEST_SUITE=1 +-- +1.6.6 + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Sat Jan 2 12:01:08 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sat, 02 Jan 2010 11:01:08 +0000 Subject: [csw-devel] SF.net SVN: gar:[7825] csw/mgar/gar/v2-checkpkg/bin/checkpkg Message-ID: Revision: 7825 http://gar.svn.sourceforge.net/gar/?rev=7825&view=rev Author: wahwah Date: 2010-01-02 11:01:08 +0000 (Sat, 02 Jan 2010) Log Message: ----------- mGAR v2-checkpkg: Output 'FAIL' when a test fails Modified Paths: -------------- csw/mgar/gar/v2-checkpkg/bin/checkpkg Modified: csw/mgar/gar/v2-checkpkg/bin/checkpkg =================================================================== --- csw/mgar/gar/v2-checkpkg/bin/checkpkg 2010-01-02 10:44:32 UTC (rev 7824) +++ csw/mgar/gar/v2-checkpkg/bin/checkpkg 2010-01-02 11:01:08 UTC (rev 7825) @@ -555,7 +555,7 @@ printf "TEST: ${plugin} running..." ${plugin} $extra_options -e "${EXTRACTDIR}" ${pkgnames} > "${plugin_log}" 2>&1 if [[ "$?" -ne 0 ]]; then - printf "\rTEST: ${plugin} \\033[1;31;40m[OK]\\033[00m \\n" + printf "\rTEST: ${plugin} \\033[1;31;40m[FAIL]\\033[00m \\n" test_suite_ok=0 else printf "\rTEST: ${plugin} \\033[0;32;40m[OK]\\033[00m \\n" This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Sat Jan 2 12:01:42 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sat, 02 Jan 2010 11:01:42 +0000 Subject: [csw-devel] SF.net SVN: gar:[7826] csw/mgar/gar/v2-checkpkg/bin/checkpkg.d/ checkpkg-obsolete-deps.py Message-ID: Revision: 7826 http://gar.svn.sourceforge.net/gar/?rev=7826&view=rev Author: wahwah Date: 2010-01-02 11:01:42 +0000 (Sat, 02 Jan 2010) Log Message: ----------- A test for obsolete packages: checkpkg-obsolete-deps.py Added Paths: ----------- csw/mgar/gar/v2-checkpkg/bin/checkpkg.d/checkpkg-obsolete-deps.py Added: csw/mgar/gar/v2-checkpkg/bin/checkpkg.d/checkpkg-obsolete-deps.py =================================================================== --- csw/mgar/gar/v2-checkpkg/bin/checkpkg.d/checkpkg-obsolete-deps.py (rev 0) +++ csw/mgar/gar/v2-checkpkg/bin/checkpkg.d/checkpkg-obsolete-deps.py 2010-01-02 11:01:42 UTC (rev 7826) @@ -0,0 +1,43 @@ +#!/opt/csw/bin/python2.6 +# $Id$ + +import checkpkg +import logging +import os.path +import sys + +OBSOLETE_DEPS = { + # "CSWfoo": { + # "reason": "Due to...", + # "url": "http://www.opencsw.org/bugtrack/view.php?id=..." + # }, + "CSWpython-rt": { + "reason": "CSWpython-rt is deprecated.", + "url": "http://www.opencsw.org/bugtrack/view.php?id=4031" + }, +} + +def main(): + options, args = checkpkg.GetOptions() + ok = True + for pkgname in args: + pkgpath = os.path.join(options.extractdir, pkgname) + checker = checkpkg.CheckpkgBase(options.extractdir, pkgname) + deps = set(checker.GetDependencies()) + obsolete_pkg_deps = deps.intersection(set(OBSOLETE_DEPS)) + if obsolete_pkg_deps: + ok = False + for pkg in obsolete_pkg_deps: + print ("ERROR: Package %s should not depend on %s." + % (checker.pkgname, pkg)) + if "reason" in OBSOLETE_DEPS[pkg]: + print "Reason:", OBSOLETE_DEPS[pkg]["reason"] + if "url" in OBSOLETE_DEPS[pkg]: + print "URL:", OBSOLETE_DEPS[pkg]["url"] + if ok: + sys.exit(0) + else: + sys.exit(1) + +if __name__ == '__main__': + main() Property changes on: csw/mgar/gar/v2-checkpkg/bin/checkpkg.d/checkpkg-obsolete-deps.py ___________________________________________________________________ Added: svn:executable + * Added: svn:keywords + Id This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Sat Jan 2 12:14:03 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sat, 02 Jan 2010 11:14:03 +0000 Subject: [csw-devel] SF.net SVN: gar:[7827] csw/mgar/gar/v2-checkpkg/bin/checkpkg.d/ checkpkg-obsolete-deps.py Message-ID: Revision: 7827 http://gar.svn.sourceforge.net/gar/?rev=7827&view=rev Author: wahwah Date: 2010-01-02 11:14:03 +0000 (Sat, 02 Jan 2010) Log Message: ----------- mGAR v2-checkpkg: A hint is better than a reason Modified Paths: -------------- csw/mgar/gar/v2-checkpkg/bin/checkpkg.d/checkpkg-obsolete-deps.py Modified: csw/mgar/gar/v2-checkpkg/bin/checkpkg.d/checkpkg-obsolete-deps.py =================================================================== --- csw/mgar/gar/v2-checkpkg/bin/checkpkg.d/checkpkg-obsolete-deps.py 2010-01-02 11:01:42 UTC (rev 7826) +++ csw/mgar/gar/v2-checkpkg/bin/checkpkg.d/checkpkg-obsolete-deps.py 2010-01-02 11:14:03 UTC (rev 7827) @@ -8,11 +8,11 @@ OBSOLETE_DEPS = { # "CSWfoo": { - # "reason": "Due to...", + # "hint": "Do this...", # "url": "http://www.opencsw.org/bugtrack/view.php?id=..." # }, "CSWpython-rt": { - "reason": "CSWpython-rt is deprecated.", + "hint": "CSWpython-rt is deprecated, use CSWpython instead.", "url": "http://www.opencsw.org/bugtrack/view.php?id=4031" }, } @@ -30,8 +30,8 @@ for pkg in obsolete_pkg_deps: print ("ERROR: Package %s should not depend on %s." % (checker.pkgname, pkg)) - if "reason" in OBSOLETE_DEPS[pkg]: - print "Reason:", OBSOLETE_DEPS[pkg]["reason"] + if "hint" in OBSOLETE_DEPS[pkg]: + print "Hint:", OBSOLETE_DEPS[pkg]["hint"] if "url" in OBSOLETE_DEPS[pkg]: print "URL:", OBSOLETE_DEPS[pkg]["url"] if ok: This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Sat Jan 2 12:34:18 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sat, 02 Jan 2010 11:34:18 +0000 Subject: [csw-devel] SF.net SVN: gar:[7828] csw/mgar/gar/v2-checkpkg/bin/mkpackage Message-ID: Revision: 7828 http://gar.svn.sourceforge.net/gar/?rev=7828&view=rev Author: wahwah Date: 2010-01-02 11:34:18 +0000 (Sat, 02 Jan 2010) Log Message: ----------- mGAR v2-checkpkg: Reverting from pigz to gzip as the default. Modified Paths: -------------- csw/mgar/gar/v2-checkpkg/bin/mkpackage Modified: csw/mgar/gar/v2-checkpkg/bin/mkpackage =================================================================== --- csw/mgar/gar/v2-checkpkg/bin/mkpackage 2010-01-02 11:14:03 UTC (rev 7827) +++ csw/mgar/gar/v2-checkpkg/bin/mkpackage 2010-01-02 11:34:18 UTC (rev 7828) @@ -908,7 +908,7 @@ my $compress = $config{usebzip} ? 'bzip2 -9 -f %s' - : 'pigz -9 -f %s'; + : 'gzip -9 -f %s'; vexec( sprintf( $compress, $tmppkg ), "Failed to compress $tmppkg" ); $tmppkg .= $config{usebzip} ? ".bz2" : ".gz"; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From chninkel at users.sourceforge.net Sat Jan 2 14:15:07 2010 From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net) Date: Sat, 02 Jan 2010 13:15:07 +0000 Subject: [csw-devel] SF.net SVN: gar:[7829] csw/mgar/pkg/bash/trunk Message-ID: Revision: 7829 http://gar.svn.sourceforge.net/gar/?rev=7829&view=rev Author: chninkel Date: 2010-01-02 13:15:07 +0000 (Sat, 02 Jan 2010) Log Message: ----------- bash: updated to 4.1 Modified Paths: -------------- csw/mgar/pkg/bash/trunk/Makefile csw/mgar/pkg/bash/trunk/checksums csw/mgar/pkg/bash/trunk/files/changelog.CSW Modified: csw/mgar/pkg/bash/trunk/Makefile =================================================================== --- csw/mgar/pkg/bash/trunk/Makefile 2010-01-02 11:34:18 UTC (rev 7828) +++ csw/mgar/pkg/bash/trunk/Makefile 2010-01-02 13:15:07 UTC (rev 7829) @@ -13,7 +13,7 @@ ###### Package information ####### GARNAME = bash -GARVERSION = 4.0.35 +GARVERSION = 4.1.0 CATEGORIES = devel DESCRIPTION = A sh-compatible command language interpreter Modified: csw/mgar/pkg/bash/trunk/checksums =================================================================== --- csw/mgar/pkg/bash/trunk/checksums 2010-01-02 11:34:18 UTC (rev 7828) +++ csw/mgar/pkg/bash/trunk/checksums 2010-01-02 13:15:07 UTC (rev 7829) @@ -1,40 +1,5 @@ f93b41b44ce6b023df65b72f00386ac5 CSWbash.prototype -a90a1b5a6db4838483f05438e05e8eb9 bash-4.0.tar.gz -bc7f4762443939bd7dccb42370f0d932 bash40-001 -c2a4a4786a83ed4ec366c6a8924369a2 bash40-002 -22e8a824eddba21a8fce10d7984c2aba bash40-003 -ed7cbced8c7c964323265522369a37a2 bash40-004 -8ed86b7d31423d71ecf3148251d63512 bash40-005 -5f447338cb98ff156cabf1fd9879d5f3 bash40-006 -96e946cb66a4ca186cba1da44f1ee163 bash40-007 -d3eb7b6f00d525e032478c33f51d46a8 bash40-008 -340601c997ce569532417a7ae92248b8 bash40-009 -0bd5ab96d514ffb1afbb8c7984b15146 bash40-010 -32cb20f339a20e1e9fb37a5d18f18fca bash40-011 -33fd9e93d30a17988c19554ef26d56e0 bash40-012 -a266b42df5e9ed7e8818a8b00d50e00b bash40-013 -86cac78f191a32cd1404f11264eb9b2a bash40-014 -bb41963d030bc61a20e8185367b337c5 bash40-015 -f75455048a086528971252fd979b8755 bash40-016 -34b2cd57271a452f4a26b39d77ff908f bash40-017 -99318eed8dcc05e10a14ae27043f175d bash40-018 -af3b9aaeadc71a5007bec2b98c751cde bash40-019 -eb7c7ddeb7e8451eb59228dca3329696 bash40-020 -585d701b978ceb63967dc020db3a2234 bash40-021 -7a70f2608f90f6ac0c2051e5f1c6c414 bash40-022 -7a23aa41630dd4fe8d30108a200e2d96 bash40-023 -82ba5fc9eb780eb57d8b7628a17b7d74 bash40-024 -b26f9007ac4eef5c378f1abcb8959025 bash40-025 -83bc844c82d0a30740e8d91a8238bfa9 bash40-026 -a41c187f05ecab07389c18acc91214c6 bash40-027 -fcc367e6471267d2e397257e703b817d bash40-028 -4d4da1c0be8dfee8e2a6a7703901130f bash40-029 -55cbdc8e5173d7d59bf1113c3ff590dc bash40-030 -389635281133416de9d13295251cabc7 bash40-031 -d646cb4aed8e0f0d1d47eea2ed5f3690 bash40-032 -d3e77d2a0a051478aca8c30d13ded834 bash40-033 -05a54807fd388e71bac8912ad530ac6d bash40-034 -fc3d8fdb83ccc407ab7f6d1b7ac6a221 bash40-035 -fd14570004ad0895c04ca969609712ed changelog.CSW +9800d8724815fd84994d9be65ab5e7b8 bash-4.1.tar.gz +8b104a3cddca41849186af53c8602eef changelog.CSW 60956e6be20f69dafbb06fcc83bab88e shells 29607316cff22f7427322d8f190cbadf use_system_bashrc_and_logout.patch Modified: csw/mgar/pkg/bash/trunk/files/changelog.CSW =================================================================== --- csw/mgar/pkg/bash/trunk/files/changelog.CSW 2010-01-02 11:34:18 UTC (rev 7828) +++ csw/mgar/pkg/bash/trunk/files/changelog.CSW 2010-01-02 13:15:07 UTC (rev 7829) @@ -1,3 +1,9 @@ +bash (4.1,REV=2010.01.02) unstable + + * New upstream release. + + -- Yann Rouillard Sat, 02 Jan 2010 14:12:18 +0100 + bash (4.0.35,REV=2009.12.23) unstable * Fixed Source url info (bug #4087). This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Sat Jan 2 17:37:07 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Sat, 02 Jan 2010 16:37:07 +0000 Subject: [csw-devel] SF.net SVN: gar:[7830] csw/mgar/pkg Message-ID: Revision: 7830 http://gar.svn.sourceforge.net/gar/?rev=7830&view=rev Author: dmichelsen Date: 2010-01-02 16:37:07 +0000 (Sat, 02 Jan 2010) Log Message: ----------- libfaad2: Initial commit Modified Paths: -------------- csw/mgar/pkg/libfaad2/trunk/Makefile csw/mgar/pkg/libfaad2/trunk/checksums Added Paths: ----------- csw/mgar/pkg/libfaad2/ csw/mgar/pkg/libfaad2/trunk/files/0001-Remove-iquote-from-CFLAGS-unknown-to-SS.patch Removed Paths: ------------- csw/mgar/pkg/libfaad2/trunk/files/Makefile.am.diff csw/mgar/pkg/libfaad2/trunk/files/Makefile.in.18.diff csw/mgar/pkg/libfaad2/trunk/files/Makefile.in.20.diff csw/mgar/pkg/libfaad2/trunk/files/Makefile.in.common.mp4v2.diff csw/mgar/pkg/libfaad2/trunk/files/Makefile.in.diff csw/mgar/pkg/libfaad2/trunk/files/Makefile.in.frontend.diff csw/mgar/pkg/libfaad2/trunk/files/aacquant.c.diff csw/mgar/pkg/libfaad2/trunk/files/aacquant.h.diff csw/mgar/pkg/libfaad2/trunk/files/config.h.in.diff csw/mgar/pkg/libfaad2/trunk/files/configure.diff csw/mgar/pkg/libfaad2/trunk/files/configure.in.diff csw/mgar/pkg/libfaad2/trunk/files/faac.h.diff csw/mgar/pkg/libfaad2/trunk/files/faaccfg.h.diff csw/mgar/pkg/libfaad2/trunk/files/frame.h.diff csw/mgar/pkg/libfaad2/trunk/files/input.c.diff csw/mgar/pkg/libfaad2/trunk/files/ltp.c.diff csw/mgar/pkg/libfaad2/trunk/files/mp4property.h.diff csw/mgar/pkg/libfaad2/trunk/files/mp4util.h.diff csw/mgar/pkg/libfaad2/trunk/files/mpeg4ip.h.diff csw/mgar/pkg/libfaad2/trunk/files/psych.h.diff Modified: csw/mgar/pkg/libfaad2/trunk/Makefile =================================================================== --- csw/mgar/pkg/libfaac/trunk/Makefile 2009-12-28 14:18:44 UTC (rev 7782) +++ csw/mgar/pkg/libfaad2/trunk/Makefile 2010-01-02 16:37:07 UTC (rev 7830) @@ -1,33 +1,26 @@ -GARNAME = libfaac -GARVERSION = 1.28 +GARNAME = faad2 +GARVERSION = 2.7 CATEGORIES = lib -DESCRIPTION = AAC encoder library and tool +DESCRIPTION = Freeware Advanced Audio (AAC) Decoder including SBR decoding define BLURB - FAAC is an open source MPEG-4 and MPEG-2 AAC encoder + FAAD2 is an open source MPEG-4 and MPEG-2 AAC decoder, it is licensed + under the GPLv2 license. endef SF_PROJ = faac MASTER_SITES = $(SF_MIRRORS) -DISTFILES = $(SF_PROJ)-$(GARVERSION).tar.bz2 -DISTNAME = $(SF_PROJ)-$(GARVERSION) +DISTFILES = $(DISTNAME).tar.bz2 +PATCHFILES = 0001-Remove-iquote-from-CFLAGS-unknown-to-SS.patch -PACKAGES = CSWfaac -CATALOGNAME = $(GARNAME) +PACKAGES = CSWfaad2 +CATALOGNAME = faad2 SPKG_SOURCEURL = http://www.audiocoding.com/ # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(SF_PROJ)-(\d+(?:\.\d+)*).tar.bz2 -#PATCHFILES += Makefile.am.diff Makefile.in.diff Makefile.in.frontend.diff -PATCHFILES += Makefile.in.frontend.diff Makefile.in.common.mp4v2.diff -PATCHFILES += aacquant.c.diff aacquant.h.diff config.h.in.diff -#PATCHFILES += configure.in.diff faac.h.diff faaccfg.h.diff frame.h.diff -PATCHFILES += configure.diff faac.h.diff faaccfg.h.diff frame.h.diff -PATCHFILES += input.c.diff ltp.c.diff mp4property.h.diff mp4util.h.diff -PATCHFILES += mpeg4ip.h.diff psych.h.diff - BUILD64 = 1 NO_ISAEXEC = 1 CONFIGURE_ARGS = $(DIRPATHS) Modified: csw/mgar/pkg/libfaad2/trunk/checksums =================================================================== --- csw/mgar/pkg/libfaac/trunk/checksums 2009-12-28 14:18:44 UTC (rev 7782) +++ csw/mgar/pkg/libfaad2/trunk/checksums 2010-01-02 16:37:07 UTC (rev 7830) @@ -1,16 +1 @@ -3d7c0f7936dcc1c4833d693860720adf Makefile.in.common.mp4v2.diff -eb7e2cee261c71ac4a8d718b5498777e Makefile.in.frontend.diff -19f2eebe3df5300ab4a1a16e43593663 aacquant.c.diff -2af64ce38f023774fb0c8f691b98c564 aacquant.h.diff -ea8508703521e663e637382231d4c13b config.h.in.diff -027ebf052052128c67f0749e610f4acb configure.diff -c5dde68840cefe46532089c9392d1df0 faac-1.28.tar.bz2 -56f2c5e28e1177e3b6956aaf83a10e13 faac.h.diff -268d60a6a1304fa1758a962a20731c1c faaccfg.h.diff -29fe6485d9ebe7fd0892c18ed450bac5 frame.h.diff -a4e382e8b7123a144c1cf1c10a7e1725 input.c.diff -bf65a158a69527826c5e9fff74d10e83 ltp.c.diff -dee39c5250880eb427a11269ececa205 mp4property.h.diff -e97db55385453a0482ab2673056d4022 mp4util.h.diff -ff5300984a0b097a08d66cb39d8a3ef0 mpeg4ip.h.diff -46b44023ce14bce4f0ed981ee5514c5c psych.h.diff +4c332fa23febc0e4648064685a3d4332 faad2-2.7.tar.bz2 Added: csw/mgar/pkg/libfaad2/trunk/files/0001-Remove-iquote-from-CFLAGS-unknown-to-SS.patch =================================================================== --- csw/mgar/pkg/libfaad2/trunk/files/0001-Remove-iquote-from-CFLAGS-unknown-to-SS.patch (rev 0) +++ csw/mgar/pkg/libfaad2/trunk/files/0001-Remove-iquote-from-CFLAGS-unknown-to-SS.patch 2010-01-02 16:37:07 UTC (rev 7830) @@ -0,0 +1,52 @@ +From 3b8b6907983da468e53403b8e7e44b0c92955429 Mon Sep 17 00:00:00 2001 +From: Dagobert Michelsen +Date: Sat, 2 Jan 2010 17:20:29 +0100 +Subject: [PATCH] Remove iquote from CFLAGS unknown to SS + +--- + libfaad/Makefile | 2 +- + libfaad/Makefile.am | 2 +- + libfaad/Makefile.in | 2 +- + 3 files changed, 3 insertions(+), 3 deletions(-) + +diff --git a/libfaad/Makefile b/libfaad/Makefile +index 71c9ec1..13edca2 100644 +--- a/libfaad/Makefile ++++ b/libfaad/Makefile +@@ -195,7 +195,7 @@ sharedstatedir = /opt/csw/share + sysconfdir = /opt/csw/etc + target_alias = + lib_LTLIBRARIES = libfaad.la +-AM_CFLAGS = -iquote $(top_srcdir)/include ++AM_CFLAGS = $(top_srcdir)/include + include_HEADERS = $(top_srcdir)/include/faad.h \ + $(top_srcdir)/include/neaacdec.h + +diff --git a/libfaad/Makefile.am b/libfaad/Makefile.am +index e5ad36d..d355989 100644 +--- a/libfaad/Makefile.am ++++ b/libfaad/Makefile.am +@@ -1,6 +1,6 @@ + lib_LTLIBRARIES = libfaad.la + +-AM_CFLAGS = -iquote $(top_srcdir)/include ++AM_CFLAGS = $(top_srcdir)/include + include_HEADERS = $(top_srcdir)/include/faad.h \ + $(top_srcdir)/include/neaacdec.h + +diff --git a/libfaad/Makefile.in b/libfaad/Makefile.in +index 1b16428..71d0d4c 100644 +--- a/libfaad/Makefile.in ++++ b/libfaad/Makefile.in +@@ -195,7 +195,7 @@ sharedstatedir = @sharedstatedir@ + sysconfdir = @sysconfdir@ + target_alias = @target_alias@ + lib_LTLIBRARIES = libfaad.la +-AM_CFLAGS = -iquote $(top_srcdir)/include ++AM_CFLAGS = $(top_srcdir)/include + include_HEADERS = $(top_srcdir)/include/faad.h \ + $(top_srcdir)/include/neaacdec.h + +-- +1.6.6 + Deleted: csw/mgar/pkg/libfaad2/trunk/files/Makefile.am.diff =================================================================== --- csw/mgar/pkg/libfaac/trunk/files/Makefile.am.diff 2009-12-28 14:18:44 UTC (rev 7782) +++ csw/mgar/pkg/libfaad2/trunk/files/Makefile.am.diff 2010-01-02 16:37:07 UTC (rev 7830) @@ -1,12 +0,0 @@ -diff --speed-large-files --minimal -ru ../build-global/faac-1.28/frontend/Makefile.am faac-1.28/frontend/Makefile.am ---- ../build-global/faac-1.28/frontend/Makefile.am 2008-12-16 01:56:00.000000000 +0100 -+++ faac-1.28/frontend/Makefile.am 2009-03-20 05:38:13.063991192 +0100 -@@ -5,7 +5,7 @@ - - if WITH_MP4V2 - INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/common/mp4v2 --LDADD = $(top_builddir)/libfaac/libfaac.la $(top_srcdir)/common/mp4v2/libmp4v2.a -lm -lstdc++ -+LDADD = $(top_builddir)/libfaac/libfaac.la $(top_srcdir)/common/mp4v2/libmp4v2.a -lm -lCrun -lCstd - else - INCLUDES = -I$(top_srcdir)/include - LDADD = $(top_builddir)/libfaac/libfaac.la -lm Deleted: csw/mgar/pkg/libfaad2/trunk/files/Makefile.in.18.diff =================================================================== --- csw/mgar/pkg/libfaac/trunk/files/Makefile.in.18.diff 2009-12-28 14:18:44 UTC (rev 7782) +++ csw/mgar/pkg/libfaad2/trunk/files/Makefile.in.18.diff 2010-01-02 16:37:07 UTC (rev 7830) @@ -1,398 +0,0 @@ -diff --speed-large-files --minimal -ru ../build-global/faac-1.28/common/mp4v2/mp4property.h faac-1.28/common/mp4v2/mp4property.h ---- ../build-global/faac-1.28/common/mp4v2/mp4property.h 2009-01-25 02:14:34.000000000 +0100 -+++ faac-1.28/common/mp4v2/mp4property.h 2009-03-20 06:08:45.678172744 +0100 -@@ -38,7 +38,7 @@ - StringProperty, - BytesProperty, - TableProperty, -- DescriptorProperty, -+ DescriptorProperty - }; - - class MP4Property { -diff --speed-large-files --minimal -ru ../build-global/faac-1.28/common/mp4v2/mp4util.h faac-1.28/common/mp4v2/mp4util.h ---- ../build-global/faac-1.28/common/mp4v2/mp4util.h 2009-01-25 02:14:34.000000000 +0100 -+++ faac-1.28/common/mp4v2/mp4util.h 2009-03-20 00:14:32.128482807 +0100 -@@ -83,7 +83,7 @@ - } - - static inline void MP4Printf(const char* fmt, ...) --#ifndef _WIN32 -+#if defined(__GNUC__) - __attribute__((format(__printf__, 1, 2))) - #endif - ; -diff --speed-large-files --minimal -ru ../build-global/faac-1.28/common/mp4v2/mpeg4ip.h faac-1.28/common/mp4v2/mpeg4ip.h ---- ../build-global/faac-1.28/common/mp4v2/mpeg4ip.h 2009-01-26 23:42:35.000000000 +0100 -+++ faac-1.28/common/mp4v2/mpeg4ip.h 2009-03-20 06:14:07.133127520 +0100 -@@ -65,7 +65,9 @@ - /***************************************************************************** - * UNIX LIKE DEFINES BELOW THIS POINT - *****************************************************************************/ --#ifdef sun -+#if defined(sun) || defined(__sun) || defined(__sun__) -+#include -+#include - #include - #endif - -@@ -194,12 +196,7 @@ - typedef unsigned int socklen_t; - #endif - --#ifdef sun --#include --#define u_int8_t uint8_t --#define u_int16_t uint16_t --#define u_int32_t uint32_t --#define u_int64_t uint64_t -+#if defined(sun) || defined(__sun) || defined(__sun__) - #define __STRING(expr) #expr - #endif - -@@ -328,7 +325,7 @@ - AUDIO_FMT_U16, - AUDIO_FMT_S16, - AUDIO_FMT_FLOAT, -- AUDIO_FMT_HW_AC3, -+ AUDIO_FMT_HW_AC3 - } audio_format_t; - - #endif /* __MPEG4IP_INCLUDED__ */ -diff --speed-large-files --minimal -ru ../build-global/faac-1.28/config.h.in faac-1.28/config.h.in ---- ../build-global/faac-1.28/config.h.in 2009-02-10 09:36:59.000000000 +0100 -+++ faac-1.28/config.h.in 2009-03-20 05:55:21.041828651 +0100 -@@ -1,5 +1,26 @@ - /* config.h.in. Generated from configure.in by autoheader. */ - -+#ifndef __FAAC_CONFIG_H -+#define __FAAC_CONFIG_H -+ -+#if defined(__SUNPRO_C) || defined(__SUNPRO_CC) -+#include -+#include -+ -+typedef uint8_t u_int8_t; -+typedef uint16_t u_int16_t; -+typedef uint32_t u_int32_t; -+typedef uint64_t u_int64_t; -+ -+#define HAVE_INT16_T 1 -+#define HAVE_INT32_T 1 -+#define HAVE_U_INT32_T 1 -+#define HAVE_U_INT16_T 1 -+ -+#define HAVE_STRUCT_IOVEC 1 -+#endif -+ -+ - /* Define if you want to encode for DRM */ - #undef DRM - -@@ -131,3 +152,5 @@ - - /* Define to `long int' if does not define. */ - #undef off_t -+ -+#endif /* __FAAC_CONFIG_H */ -diff --speed-large-files --minimal -ru ../build-global/faac-1.28/configure.in faac-1.28/configure.in ---- ../build-global/faac-1.28/configure.in 2009-02-05 01:55:38.000000000 +0100 -+++ faac-1.28/configure.in 2009-03-20 06:00:25.906642505 +0100 -@@ -10,7 +10,9 @@ - - AC_DEFUN([MY_DEFINE], [ AC_DEFINE($1, 1, [define if needed]) ]) - --CFLAGS=${CFLAGS:-"-O2 -Wall"} -+CFLAGS=${CFLAGS} -+CPPFLAGS=${CPPFLAGS} -+LDFLAGS=${LDFLAGS} - - AC_PROG_CC - AC_PROG_CXX -@@ -20,10 +22,13 @@ - - AC_CHECK_TYPES(u_int32_t) - AC_CHECK_TYPES(u_int16_t) -+AC_CHECK_TYPES(uint64_t) -+AC_CHECK_TYPES(uint32_t) -+AC_CHECK_TYPES(uint16_t) - AC_CHECK_TYPES(int32_t) - AC_CHECK_TYPES(int16_t) - --AC_CHECK_DECL(strcasecmp, MY_DEFINE(HAVE_STRCASECMP)) -+AC_CHECK_DECL(strcasecmp, AC_DEFINE(HAVE_STRCASECMP, 1, [define if needed]) ) - - AC_CHECK_LIB(gnugetopt, getopt_long) - -@@ -41,7 +46,7 @@ - AC_MSG_NOTICE([*** Building with internal mp4v2 ***]) - AM_CONDITIONAL(WITH_MP4V2, true) - AC_CONFIG_LINKS(common/mp4v2/mpeg4ip_config.h:config.h) -- MY_DEFINE(HAVE_LIBMP4V2) -+ MY_DEFINE(HAVE_LIBMP4V2, 1, [define if needed]) - else - AC_MSG_NOTICE([*** Building WITHOUT mp4v2 ***]) - fi -@@ -61,12 +66,12 @@ - dnl Checks for header files required for mp4.h - AC_HEADER_STDC - AC_SYS_LARGEFILE --AC_CHECK_HEADERS(stdint.h inttypes.h) -+AC_CHECK_HEADERS(sys/types.h stdint.h inttypes.h inttypes_gnucompat.h) - AC_CHECK_HEADERS(mathf.h) - AC_CHECK_HEADERS(float.h) --AC_CHECK_DECL(strchr, MY_DEFINE(HAVE_STRCHR)) --AC_CHECK_DECL(memcpy, MY_DEFINE(HAVE_MEMCPY)) --AC_CHECK_DECL(strsep, MY_DEFINE(HAVE_STRSEP)) -+AC_CHECK_DECL(strchr, AC_DEFINE(HAVE_STRCHR, 1, [define if needed]) ) -+AC_CHECK_DECL(memcpy, AC_DEFINE(HAVE_MEMCPY, 1, [define if needed]) ) -+AC_CHECK_DECL(strsep, AC_DEFINE(HAVE_STRSEP, 1, [define if needed]) ) - AC_CHECK_HEADERS(sys/time.h) - AC_HEADER_TIME - AC_TYPE_OFF_T -diff --speed-large-files --minimal -ru ../build-global/faac-1.28/frontend/Makefile.am faac-1.28/frontend/Makefile.am ---- ../build-global/faac-1.28/frontend/Makefile.am 2008-12-16 01:56:00.000000000 +0100 -+++ faac-1.28/frontend/Makefile.am 2009-03-20 05:38:13.063991192 +0100 -@@ -5,7 +5,7 @@ - - if WITH_MP4V2 - INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/common/mp4v2 --LDADD = $(top_builddir)/libfaac/libfaac.la $(top_srcdir)/common/mp4v2/libmp4v2.a -lm -lstdc++ -+LDADD = $(top_builddir)/libfaac/libfaac.la $(top_srcdir)/common/mp4v2/libmp4v2.a -lm -lCrun -lCstd - else - INCLUDES = -I$(top_srcdir)/include - LDADD = $(top_builddir)/libfaac/libfaac.la -lm -diff --speed-large-files --minimal -ru ../build-global/faac-1.28/frontend/Makefile.in faac-1.28/frontend/Makefile.in ---- ../build-global/faac-1.28/frontend/Makefile.in 2009-02-10 09:37:00.000000000 +0100 -+++ faac-1.28/frontend/Makefile.in 2009-03-20 05:42:58.667425673 +0100 -@@ -68,6 +68,9 @@ - CCLD = $(CC) - LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ - $(AM_LDFLAGS) $(LDFLAGS) -o $@ -+CXXLD = $(CXX) -+CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \ -+ $(AM_LDFLAGS) $(LDFLAGS) -o $@ - SOURCES = $(faac_SOURCES) - DIST_SOURCES = $(faac_SOURCES) - man1dir = $(mandir)/man1 -@@ -132,6 +135,7 @@ - USE_DRM_FALSE = @USE_DRM_FALSE@ - USE_DRM_TRUE = @USE_DRM_TRUE@ - VERSION = @VERSION@ -+AM_CFLAGS = $(CFLAGS) - WITH_MP4V2_FALSE = @WITH_MP4V2_FALSE@ - WITH_MP4V2_TRUE = @WITH_MP4V2_TRUE@ - ac_ct_CC = @ac_ct_CC@ -@@ -186,7 +190,7 @@ - @WITH_MP4V2_FALSE at INCLUDES = -I$(top_srcdir)/include - @WITH_MP4V2_TRUE at INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/common/mp4v2 - @WITH_MP4V2_FALSE at LDADD = $(top_builddir)/libfaac/libfaac.la -lm -- at WITH_MP4V2_TRUE@LDADD = $(top_builddir)/libfaac/libfaac.la $(top_srcdir)/common/mp4v2/libmp4v2.a -lm -lstdc++ -+ at WITH_MP4V2_TRUE@LDADD = $(top_builddir)/libfaac/libfaac.la $(top_srcdir)/common/mp4v2/libmp4v2.a -lm -lCrun -lCstd - all: all-am - - .SUFFIXES: -@@ -200,9 +204,9 @@ - exit 1;; \ - esac; \ - done; \ -- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu frontend/Makefile'; \ -+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign frontend/Makefile'; \ - cd $(top_srcdir) && \ -- $(AUTOMAKE) --gnu frontend/Makefile -+ $(AUTOMAKE) --foreign frontend/Makefile - .PRECIOUS: Makefile - Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status - @case '$?' in \ -@@ -250,7 +254,7 @@ - done - faac$(EXEEXT): $(faac_OBJECTS) $(faac_DEPENDENCIES) - @rm -f faac$(EXEEXT) -- $(LINK) $(faac_LDFLAGS) $(faac_OBJECTS) $(faac_LDADD) $(LIBS) -+ $(CXXLINK) $(faac_LDFLAGS) $(faac_OBJECTS) $(faac_LDADD) $(LIBS) - - mostlyclean-compile: - -rm -f *.$(OBJEXT) -diff --speed-large-files --minimal -ru ../build-global/faac-1.28/frontend/input.c faac-1.28/frontend/input.c ---- ../build-global/faac-1.28/frontend/input.c 2009-01-25 19:50:32.000000000 +0100 -+++ faac-1.28/frontend/input.c 2009-03-20 06:06:22.286495928 +0100 -@@ -27,6 +27,10 @@ - #include - #include - -+#if defined(__SUNPRO_C) || defined(__SUNPRO_CC) -+#include /* for BSWAP_8|BSWAP_16|BSWAP_32|BSWAP_64 */ -+#endif -+ - #ifdef _WIN32 - #include - #include -@@ -34,9 +38,14 @@ - - #include "input.h" - -+#if (defined(__SUNPRO_C) || defined(__SUNPRO_CC)) && defined(__SunOS_5_10) -+#define SWAP32(x) BSWAP_32(x) -+#define SWAP16(x) BSWAP_16(x) -+#else - #define SWAP32(x) (((x & 0xff) << 24) | ((x & 0xff00) << 8) \ - | ((x & 0xff0000) >> 8) | ((x & 0xff000000) >> 24)) - #define SWAP16(x) (((x & 0xff) << 8) | ((x & 0xff00) >> 8)) -+#endif - - #ifdef WORDS_BIGENDIAN - # define UINT32(x) SWAP32(x) -diff --speed-large-files --minimal -ru ../build-global/faac-1.28/include/faac.h faac-1.28/include/faac.h ---- ../build-global/faac-1.28/include/faac.h 2009-01-25 19:50:32.000000000 +0100 -+++ faac-1.28/include/faac.h 2009-03-20 06:01:42.801998112 +0100 -@@ -36,7 +36,11 @@ - # endif - #endif - -+#if defined(__SUNPRO_C) || defined(__SUNPRO_CC) -+#pragma pack() -+#else - #pragma pack(push, 1) -+#endif - - typedef struct { - void *ptr; -@@ -90,7 +94,11 @@ - - - -+#if defined(__SUNPRO_C) || defined(__SUNPRO_CC) -+#pragma pack() -+#else - #pragma pack(pop) -+#endif - - #ifdef __cplusplus - } -diff --speed-large-files --minimal -ru ../build-global/faac-1.28/include/faaccfg.h faac-1.28/include/faaccfg.h ---- ../build-global/faac-1.28/include/faaccfg.h 2004-07-04 14:12:05.000000000 +0200 -+++ faac-1.28/include/faaccfg.h 2009-03-20 06:03:00.833899895 +0100 -@@ -45,7 +45,11 @@ - #define SHORTCTL_NOSHORT 1 - #define SHORTCTL_NOLONG 2 - -+#if defined(__SUNPRO_C) || defined(__SUNPRO_CC) -+#pragma pack() -+#else - #pragma pack(push, 1) -+#endif - typedef struct faacEncConfiguration - { - /* config version */ -@@ -117,6 +121,10 @@ - - } faacEncConfiguration, *faacEncConfigurationPtr; - -+#if defined(__SUNPRO_C) || defined(__SUNPRO_CC) -+#pragma pack() -+#else - #pragma pack(pop) -+#endif - - #endif /* _FAACCFG_H_ */ -diff --speed-large-files --minimal -ru ../build-global/faac-1.28/libfaac/aacquant.c faac-1.28/libfaac/aacquant.c ---- ../build-global/faac-1.28/libfaac/aacquant.c 2008-03-24 00:00:25.000000000 +0100 -+++ faac-1.28/libfaac/aacquant.c 2009-03-20 05:53:00.225604748 +0100 -@@ -281,11 +281,16 @@ - - - #if TAKEHIRO_IEEE754_HACK -- -+#if defined(__SUNPRO_C) || defined(__SUNPRO_CC) -+#pragma pack(8) -+#endif - typedef union { - float f; - int i; - } fi_union; -+#if defined(__SUNPRO_C) || defined(__SUNPRO_CC) -+#pragma pack() -+#endif - - #define MAGIC_FLOAT (65536*(128)) - #define MAGIC_INT 0x4b000000 -diff --speed-large-files --minimal -ru ../build-global/faac-1.28/libfaac/aacquant.h faac-1.28/libfaac/aacquant.h ---- ../build-global/faac-1.28/libfaac/aacquant.h 2003-10-12 18:43:39.000000000 +0200 -+++ faac-1.28/libfaac/aacquant.h 2009-03-20 05:53:52.210350072 +0100 -@@ -37,14 +37,22 @@ - #define POW20(x) pow(2.0,((double)x)*.25) - #define IPOW20(x) pow(2.0,-((double)x)*.1875) - -+#if defined(__SUNPRO_C) || defined(__SUNPRO_CC) -+#pragma pack() -+#else - #pragma pack(push, 1) -+#endif - typedef struct - { - double *pow43; - double *adj43; - double quality; - } AACQuantCfg; -+#if defined(__SUNPRO_C) || defined(__SUNPRO_CC) -+#pragma pack() -+#else - #pragma pack(pop) -+#endif - - void AACQuantizeInit(CoderInfo *coderInfo, unsigned int numChannels, - AACQuantCfg *aacquantCfg); -diff --speed-large-files --minimal -ru ../build-global/faac-1.28/libfaac/frame.h faac-1.28/libfaac/frame.h ---- ../build-global/faac-1.28/libfaac/frame.h 2009-01-25 19:50:32.000000000 +0100 -+++ faac-1.28/libfaac/frame.h 2009-03-20 06:03:57.455266251 +0100 -@@ -60,7 +60,11 @@ - #endif - #endif - -+#if defined(__SUNPRO_C) || defined(__SUNPRO_CC) -+#pragma pack() -+#else - #pragma pack(push, 1) -+#endif - - typedef struct { - psymodel_t *model; -@@ -151,7 +155,11 @@ - int FAACAPI faacEncClose(faacEncHandle hEncoder); - - -+#if defined(__SUNPRO_C) || defined(__SUNPRO_CC) -+#pragma pack() -+#else - #pragma pack(pop) -+#endif - - #ifdef __cplusplus - } -diff --speed-large-files --minimal -ru ../build-global/faac-1.28/libfaac/ltp.c faac-1.28/libfaac/ltp.c ---- ../build-global/faac-1.28/libfaac/ltp.c 2003-06-26 21:20:31.000000000 +0200 -+++ faac-1.28/libfaac/ltp.c 2009-03-20 06:07:27.247999333 +0100 -@@ -38,10 +38,13 @@ - #include "util.h" - - -+#if !defined(__SUNPRO_C) && !defined(__SUNPRO_CC) -+/* why is this define here anyway, it is not used anywhere */ - /* short double_to_int(double sig_in); */ - #define double_to_int(sig_in) \ - ((sig_in) > 32767 ? 32767 : ( \ - (sig_in) < -32768 ? -32768 : (sig_in))) -+#endif - - #define _MDCT_SCALE 512 - -diff --speed-large-files --minimal -ru ../build-global/faac-1.28/libfaac/psych.h faac-1.28/libfaac/psych.h ---- ../build-global/faac-1.28/libfaac/psych.h 2005-04-24 21:16:14.000000000 +0200 -+++ faac-1.28/libfaac/psych.h 2009-03-20 06:14:31.902939182 +0100 -@@ -82,4 +82,4 @@ - } - #endif /* __cplusplus */ - --#endif /* PSYCH_H */ -\ No newline at end of file -+#endif /* PSYCH_H */ Deleted: csw/mgar/pkg/libfaad2/trunk/files/Makefile.in.20.diff =================================================================== --- csw/mgar/pkg/libfaac/trunk/files/Makefile.in.20.diff 2009-12-28 14:18:44 UTC (rev 7782) +++ csw/mgar/pkg/libfaad2/trunk/files/Makefile.in.20.diff 2010-01-02 16:37:07 UTC (rev 7830) @@ -1,398 +0,0 @@ -diff --speed-large-files --minimal -ru ../build-global/faac-1.28/common/mp4v2/mp4property.h faac-1.28/common/mp4v2/mp4property.h ---- ../build-global/faac-1.28/common/mp4v2/mp4property.h 2009-01-25 02:14:34.000000000 +0100 -+++ faac-1.28/common/mp4v2/mp4property.h 2009-03-20 06:08:45.678172744 +0100 -@@ -38,7 +38,7 @@ - StringProperty, - BytesProperty, - TableProperty, -- DescriptorProperty, -+ DescriptorProperty - }; - - class MP4Property { -diff --speed-large-files --minimal -ru ../build-global/faac-1.28/common/mp4v2/mp4util.h faac-1.28/common/mp4v2/mp4util.h ---- ../build-global/faac-1.28/common/mp4v2/mp4util.h 2009-01-25 02:14:34.000000000 +0100 -+++ faac-1.28/common/mp4v2/mp4util.h 2009-03-20 00:14:32.128482807 +0100 -@@ -83,7 +83,7 @@ - } - - static inline void MP4Printf(const char* fmt, ...) --#ifndef _WIN32 -+#if defined(__GNUC__) - __attribute__((format(__printf__, 1, 2))) - #endif - ; -diff --speed-large-files --minimal -ru ../build-global/faac-1.28/common/mp4v2/mpeg4ip.h faac-1.28/common/mp4v2/mpeg4ip.h ---- ../build-global/faac-1.28/common/mp4v2/mpeg4ip.h 2009-01-26 23:42:35.000000000 +0100 -+++ faac-1.28/common/mp4v2/mpeg4ip.h 2009-03-20 06:14:07.133127520 +0100 -@@ -65,7 +65,9 @@ - /***************************************************************************** - * UNIX LIKE DEFINES BELOW THIS POINT - *****************************************************************************/ --#ifdef sun -+#if defined(sun) || defined(__sun) || defined(__sun__) -+#include -+#include - #include - #endif - -@@ -194,12 +196,7 @@ - typedef unsigned int socklen_t; - #endif - --#ifdef sun --#include --#define u_int8_t uint8_t --#define u_int16_t uint16_t --#define u_int32_t uint32_t --#define u_int64_t uint64_t -+#if defined(sun) || defined(__sun) || defined(__sun__) - #define __STRING(expr) #expr - #endif - -@@ -328,7 +325,7 @@ - AUDIO_FMT_U16, - AUDIO_FMT_S16, - AUDIO_FMT_FLOAT, -- AUDIO_FMT_HW_AC3, -+ AUDIO_FMT_HW_AC3 - } audio_format_t; - - #endif /* __MPEG4IP_INCLUDED__ */ -diff --speed-large-files --minimal -ru ../build-global/faac-1.28/config.h.in faac-1.28/config.h.in ---- ../build-global/faac-1.28/config.h.in 2009-02-10 09:36:59.000000000 +0100 -+++ faac-1.28/config.h.in 2009-03-20 05:55:21.041828651 +0100 -@@ -1,5 +1,26 @@ - /* config.h.in. Generated from configure.in by autoheader. */ - -+#ifndef __FAAC_CONFIG_H -+#define __FAAC_CONFIG_H -+ -+#if defined(__SUNPRO_C) || defined(__SUNPRO_CC) -+#include -+#include -+ -+typedef uint8_t u_int8_t; -+typedef uint16_t u_int16_t; -+typedef uint32_t u_int32_t; -+typedef uint64_t u_int64_t; -+ -+#define HAVE_INT16_T 1 -+#define HAVE_INT32_T 1 -+#define HAVE_U_INT32_T 1 -+#define HAVE_U_INT16_T 1 -+ -+#define HAVE_STRUCT_IOVEC 1 -+#endif -+ -+ - /* Define if you want to encode for DRM */ - #undef DRM - -@@ -131,3 +152,5 @@ - - /* Define to `long int' if does not define. */ - #undef off_t -+ -+#endif /* __FAAC_CONFIG_H */ -diff --speed-large-files --minimal -ru ../build-global/faac-1.28/configure.in faac-1.28/configure.in ---- ../build-global/faac-1.28/configure.in 2009-02-05 01:55:38.000000000 +0100 -+++ faac-1.28/configure.in 2009-03-20 06:00:25.906642505 +0100 -@@ -10,7 +10,9 @@ - - AC_DEFUN([MY_DEFINE], [ AC_DEFINE($1, 1, [define if needed]) ]) - --CFLAGS=${CFLAGS:-"-O2 -Wall"} -+CFLAGS=${CFLAGS} -+CPPFLAGS=${CPPFLAGS} -+LDFLAGS=${LDFLAGS} - - AC_PROG_CC - AC_PROG_CXX -@@ -20,10 +22,13 @@ - - AC_CHECK_TYPES(u_int32_t) - AC_CHECK_TYPES(u_int16_t) -+AC_CHECK_TYPES(uint64_t) -+AC_CHECK_TYPES(uint32_t) -+AC_CHECK_TYPES(uint16_t) - AC_CHECK_TYPES(int32_t) - AC_CHECK_TYPES(int16_t) - --AC_CHECK_DECL(strcasecmp, MY_DEFINE(HAVE_STRCASECMP)) -+AC_CHECK_DECL(strcasecmp, AC_DEFINE(HAVE_STRCASECMP, 1, [define if needed]) ) - - AC_CHECK_LIB(gnugetopt, getopt_long) - -@@ -41,7 +46,7 @@ - AC_MSG_NOTICE([*** Building with internal mp4v2 ***]) - AM_CONDITIONAL(WITH_MP4V2, true) - AC_CONFIG_LINKS(common/mp4v2/mpeg4ip_config.h:config.h) -- MY_DEFINE(HAVE_LIBMP4V2) -+ MY_DEFINE(HAVE_LIBMP4V2, 1, [define if needed]) - else - AC_MSG_NOTICE([*** Building WITHOUT mp4v2 ***]) - fi -@@ -61,12 +66,12 @@ - dnl Checks for header files required for mp4.h - AC_HEADER_STDC - AC_SYS_LARGEFILE --AC_CHECK_HEADERS(stdint.h inttypes.h) -+AC_CHECK_HEADERS(sys/types.h stdint.h inttypes.h inttypes_gnucompat.h) - AC_CHECK_HEADERS(mathf.h) - AC_CHECK_HEADERS(float.h) --AC_CHECK_DECL(strchr, MY_DEFINE(HAVE_STRCHR)) --AC_CHECK_DECL(memcpy, MY_DEFINE(HAVE_MEMCPY)) --AC_CHECK_DECL(strsep, MY_DEFINE(HAVE_STRSEP)) -+AC_CHECK_DECL(strchr, AC_DEFINE(HAVE_STRCHR, 1, [define if needed]) ) -+AC_CHECK_DECL(memcpy, AC_DEFINE(HAVE_MEMCPY, 1, [define if needed]) ) -+AC_CHECK_DECL(strsep, AC_DEFINE(HAVE_STRSEP, 1, [define if needed]) ) - AC_CHECK_HEADERS(sys/time.h) - AC_HEADER_TIME - AC_TYPE_OFF_T -diff --speed-large-files --minimal -ru ../build-global/faac-1.28/frontend/Makefile.am faac-1.28/frontend/Makefile.am ---- ../build-global/faac-1.28/frontend/Makefile.am 2008-12-16 01:56:00.000000000 +0100 -+++ faac-1.28/frontend/Makefile.am 2009-03-20 05:38:13.063991192 +0100 -@@ -5,7 +5,7 @@ - - if WITH_MP4V2 - INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/common/mp4v2 --LDADD = $(top_builddir)/libfaac/libfaac.la $(top_srcdir)/common/mp4v2/libmp4v2.a -lm -lstdc++ -+LDADD = $(top_builddir)/libfaac/libfaac.la $(top_srcdir)/common/mp4v2/libmp4v2.a -lm -lCrun -lCstd - else - INCLUDES = -I$(top_srcdir)/include - LDADD = $(top_builddir)/libfaac/libfaac.la -lm -diff --speed-large-files --minimal -ru ../build-global/faac-1.28/frontend/Makefile.in faac-1.28/frontend/Makefile.in ---- ../build-global/faac-1.28/frontend/Makefile.in 2009-02-10 09:37:00.000000000 +0100 -+++ faac-1.28/frontend/Makefile.in 2009-03-20 05:42:58.667425673 +0100 -@@ -68,6 +68,9 @@ - CCLD = $(CC) - LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ - $(AM_LDFLAGS) $(LDFLAGS) -o $@ -+CXXLD = $(CXX) -+CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \ -+ $(AM_LDFLAGS) $(LDFLAGS) -o $@ - SOURCES = $(faac_SOURCES) - DIST_SOURCES = $(faac_SOURCES) - man1dir = $(mandir)/man1 -@@ -132,6 +135,7 @@ - USE_DRM_FALSE = @USE_DRM_FALSE@ - USE_DRM_TRUE = @USE_DRM_TRUE@ - VERSION = @VERSION@ -+AM_CFLAGS = $(CFLAGS) - WITH_MP4V2_FALSE = @WITH_MP4V2_FALSE@ - WITH_MP4V2_TRUE = @WITH_MP4V2_TRUE@ - ac_ct_CC = @ac_ct_CC@ -@@ -186,7 +190,7 @@ - @WITH_MP4V2_FALSE at INCLUDES = -I$(top_srcdir)/include - @WITH_MP4V2_TRUE at INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/common/mp4v2 - @WITH_MP4V2_FALSE at LDADD = $(top_builddir)/libfaac/libfaac.la -lm -- at WITH_MP4V2_TRUE@LDADD = $(top_builddir)/libfaac/libfaac.la $(top_srcdir)/common/mp4v2/libmp4v2.a -lm -lstdc++ -+ at WITH_MP4V2_TRUE@LDADD = $(top_builddir)/libfaac/libfaac.la $(top_srcdir)/common/mp4v2/libmp4v2.a -lm -lCrun -lCstd - all: all-am - - .SUFFIXES: -@@ -200,9 +204,9 @@ - exit 1;; \ - esac; \ - done; \ -- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu frontend/Makefile'; \ -+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign frontend/Makefile'; \ - cd $(top_srcdir) && \ -- $(AUTOMAKE) --gnu frontend/Makefile -+ $(AUTOMAKE) --foreign frontend/Makefile - .PRECIOUS: Makefile - Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status - @case '$?' in \ -@@ -250,7 +254,7 @@ - done - faac$(EXEEXT): $(faac_OBJECTS) $(faac_DEPENDENCIES) - @rm -f faac$(EXEEXT) -- $(LINK) $(faac_LDFLAGS) $(faac_OBJECTS) $(faac_LDADD) $(LIBS) -+ $(CXXLINK) $(faac_LDFLAGS) $(faac_OBJECTS) $(faac_LDADD) $(LIBS) - - mostlyclean-compile: - -rm -f *.$(OBJEXT) -diff --speed-large-files --minimal -ru ../build-global/faac-1.28/frontend/input.c faac-1.28/frontend/input.c ---- ../build-global/faac-1.28/frontend/input.c 2009-01-25 19:50:32.000000000 +0100 -+++ faac-1.28/frontend/input.c 2009-03-20 06:06:22.286495928 +0100 -@@ -27,6 +27,10 @@ - #include - #include - -+#if defined(__SUNPRO_C) || defined(__SUNPRO_CC) -+#include /* for BSWAP_8|BSWAP_16|BSWAP_32|BSWAP_64 */ -+#endif -+ - #ifdef _WIN32 - #include - #include -@@ -34,9 +38,14 @@ - - #include "input.h" - -+#if (defined(__SUNPRO_C) || defined(__SUNPRO_CC)) && defined(__SunOS_5_10) -+#define SWAP32(x) BSWAP_32(x) -+#define SWAP16(x) BSWAP_16(x) -+#else - #define SWAP32(x) (((x & 0xff) << 24) | ((x & 0xff00) << 8) \ - | ((x & 0xff0000) >> 8) | ((x & 0xff000000) >> 24)) - #define SWAP16(x) (((x & 0xff) << 8) | ((x & 0xff00) >> 8)) -+#endif - - #ifdef WORDS_BIGENDIAN - # define UINT32(x) SWAP32(x) -diff --speed-large-files --minimal -ru ../build-global/faac-1.28/include/faac.h faac-1.28/include/faac.h ---- ../build-global/faac-1.28/include/faac.h 2009-01-25 19:50:32.000000000 +0100 -+++ faac-1.28/include/faac.h 2009-03-20 06:01:42.801998112 +0100 -@@ -36,7 +36,11 @@ - # endif - #endif - -+#if defined(__SUNPRO_C) || defined(__SUNPRO_CC) -+#pragma pack() -+#else - #pragma pack(push, 1) -+#endif - - typedef struct { - void *ptr; -@@ -90,7 +94,11 @@ - - - -+#if defined(__SUNPRO_C) || defined(__SUNPRO_CC) -+#pragma pack() -+#else - #pragma pack(pop) -+#endif - - #ifdef __cplusplus - } -diff --speed-large-files --minimal -ru ../build-global/faac-1.28/include/faaccfg.h faac-1.28/include/faaccfg.h ---- ../build-global/faac-1.28/include/faaccfg.h 2004-07-04 14:12:05.000000000 +0200 -+++ faac-1.28/include/faaccfg.h 2009-03-20 06:03:00.833899895 +0100 -@@ -45,7 +45,11 @@ - #define SHORTCTL_NOSHORT 1 - #define SHORTCTL_NOLONG 2 - -+#if defined(__SUNPRO_C) || defined(__SUNPRO_CC) -+#pragma pack() -+#else - #pragma pack(push, 1) -+#endif - typedef struct faacEncConfiguration - { - /* config version */ -@@ -117,6 +121,10 @@ - - } faacEncConfiguration, *faacEncConfigurationPtr; - -+#if defined(__SUNPRO_C) || defined(__SUNPRO_CC) -+#pragma pack() -+#else - #pragma pack(pop) -+#endif - - #endif /* _FAACCFG_H_ */ -diff --speed-large-files --minimal -ru ../build-global/faac-1.28/libfaac/aacquant.c faac-1.28/libfaac/aacquant.c ---- ../build-global/faac-1.28/libfaac/aacquant.c 2008-03-24 00:00:25.000000000 +0100 -+++ faac-1.28/libfaac/aacquant.c 2009-03-20 05:53:00.225604748 +0100 -@@ -281,11 +281,16 @@ - - - #if TAKEHIRO_IEEE754_HACK -- -+#if defined(__SUNPRO_C) || defined(__SUNPRO_CC) -+#pragma pack(8) -+#endif - typedef union { - float f; - int i; - } fi_union; -+#if defined(__SUNPRO_C) || defined(__SUNPRO_CC) -+#pragma pack() -+#endif - - #define MAGIC_FLOAT (65536*(128)) - #define MAGIC_INT 0x4b000000 -diff --speed-large-files --minimal -ru ../build-global/faac-1.28/libfaac/aacquant.h faac-1.28/libfaac/aacquant.h ---- ../build-global/faac-1.28/libfaac/aacquant.h 2003-10-12 18:43:39.000000000 +0200 -+++ faac-1.28/libfaac/aacquant.h 2009-03-20 05:53:52.210350072 +0100 -@@ -37,14 +37,22 @@ - #define POW20(x) pow(2.0,((double)x)*.25) - #define IPOW20(x) pow(2.0,-((double)x)*.1875) - -+#if defined(__SUNPRO_C) || defined(__SUNPRO_CC) -+#pragma pack() -+#else - #pragma pack(push, 1) -+#endif - typedef struct - { - double *pow43; - double *adj43; - double quality; - } AACQuantCfg; -+#if defined(__SUNPRO_C) || defined(__SUNPRO_CC) -+#pragma pack() -+#else - #pragma pack(pop) -+#endif - - void AACQuantizeInit(CoderInfo *coderInfo, unsigned int numChannels, - AACQuantCfg *aacquantCfg); -diff --speed-large-files --minimal -ru ../build-global/faac-1.28/libfaac/frame.h faac-1.28/libfaac/frame.h ---- ../build-global/faac-1.28/libfaac/frame.h 2009-01-25 19:50:32.000000000 +0100 -+++ faac-1.28/libfaac/frame.h 2009-03-20 06:03:57.455266251 +0100 -@@ -60,7 +60,11 @@ - #endif - #endif - -+#if defined(__SUNPRO_C) || defined(__SUNPRO_CC) -+#pragma pack() -+#else - #pragma pack(push, 1) -+#endif - - typedef struct { - psymodel_t *model; -@@ -151,7 +155,11 @@ - int FAACAPI faacEncClose(faacEncHandle hEncoder); - - -+#if defined(__SUNPRO_C) || defined(__SUNPRO_CC) -+#pragma pack() -+#else - #pragma pack(pop) -+#endif - - #ifdef __cplusplus - } -diff --speed-large-files --minimal -ru ../build-global/faac-1.28/libfaac/ltp.c faac-1.28/libfaac/ltp.c ---- ../build-global/faac-1.28/libfaac/ltp.c 2003-06-26 21:20:31.000000000 +0200 -+++ faac-1.28/libfaac/ltp.c 2009-03-20 06:07:27.247999333 +0100 -@@ -38,10 +38,13 @@ - #include "util.h" - - -+#if !defined(__SUNPRO_C) && !defined(__SUNPRO_CC) -+/* why is this define here anyway, it is not used anywhere */ - /* short double_to_int(double sig_in); */ - #define double_to_int(sig_in) \ - ((sig_in) > 32767 ? 32767 : ( \ - (sig_in) < -32768 ? -32768 : (sig_in))) -+#endif - - #define _MDCT_SCALE 512 - -diff --speed-large-files --minimal -ru ../build-global/faac-1.28/libfaac/psych.h faac-1.28/libfaac/psych.h ---- ../build-global/faac-1.28/libfaac/psych.h 2005-04-24 21:16:14.000000000 +0200 -+++ faac-1.28/libfaac/psych.h 2009-03-20 06:14:31.902939182 +0100 -@@ -82,4 +82,4 @@ - } - #endif /* __cplusplus */ - --#endif /* PSYCH_H */ -\ No newline at end of file -+#endif /* PSYCH_H */ Deleted: csw/mgar/pkg/libfaad2/trunk/files/Makefile.in.common.mp4v2.diff =================================================================== --- csw/mgar/pkg/libfaac/trunk/files/Makefile.in.common.mp4v2.diff 2009-12-28 14:18:44 UTC (rev 7782) +++ csw/mgar/pkg/libfaad2/trunk/files/Makefile.in.common.mp4v2.diff 2010-01-02 16:37:07 UTC (rev 7830) @@ -1,13 +0,0 @@ ---- ../build-global/faac-1.28/common/mp4v2/Makefile.in 2009-02-10 09:37:00.000000000 +0100 -+++ faac-1.28/common/mp4v2/Makefile.in 2009-04-05 20:42:49.571593147 +0200 -@@ -205,8 +205,8 @@ - sharedstatedir = @sharedstatedir@ - sysconfdir = @sysconfdir@ - target_alias = @target_alias@ --INCLUDES = -I$(top_srcdir)/include --AM_CXXFLAGS = -Wall -+INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/common/mp4v2 -+AM_CXXFLAGS = $(CXXFLAGS) - noinst_LIBRARIES = libmp4v2.a - noinst_HEADERS = mp4.h mpeg4ip.h mpeg4ip_version.h mpeg4ip_config.h - libmp4v2_a_SOURCES = \ Deleted: csw/mgar/pkg/libfaad2/trunk/files/Makefile.in.diff =================================================================== --- csw/mgar/pkg/libfaac/trunk/files/Makefile.in.diff 2009-12-28 14:18:44 UTC (rev 7782) +++ csw/mgar/pkg/libfaad2/trunk/files/Makefile.in.diff 2010-01-02 16:37:07 UTC (rev 7830) @@ -1,35 +0,0 @@ ---- ../build-global/faac-1.28/Makefile.in 2009-02-10 09:37:01.000000000 +0100 -+++ faac-1.28/Makefile.in 2009-03-20 07:46:47.715986781 +0100 -@@ -183,20 +183,7 @@ - - .SUFFIXES: - am--refresh: -- @: --$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) -- @for dep in $?; do \ -- case '$(am__configure_deps)' in \ -- *$$dep*) \ -- echo ' cd $(srcdir) && $(AUTOMAKE) --gnu '; \ -- cd $(srcdir) && $(AUTOMAKE) --gnu \ -- && exit 0; \ -- exit 1;; \ -- esac; \ -- done; \ -- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu Makefile'; \ -- cd $(top_srcdir) && \ -- $(AUTOMAKE) --gnu Makefile -+ - .PRECIOUS: Makefile - Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status - @case '$?' in \ -@@ -225,10 +212,6 @@ - stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status - @rm -f stamp-h1 - cd $(top_builddir) && $(SHELL) ./config.status config.h --$(srcdir)/config.h.in: $(am__configure_deps) -- cd $(top_srcdir) && $(AUTOHEADER) -- rm -f stamp-h1 -- touch $@ - - distclean-hdr: - -rm -f config.h stamp-h1 Deleted: csw/mgar/pkg/libfaad2/trunk/files/Makefile.in.frontend.diff =================================================================== --- csw/mgar/pkg/libfaac/trunk/files/Makefile.in.frontend.diff 2009-12-28 14:18:44 UTC (rev 7782) +++ csw/mgar/pkg/libfaad2/trunk/files/Makefile.in.frontend.diff 2010-01-02 16:37:07 UTC (rev 7830) @@ -1,51 +0,0 @@ -diff --speed-large-files --minimal -ru ../build-global/faac-1.28/frontend/Makefile.in faac-1.28/frontend/Makefile.in ---- ../build-global/faac-1.28/frontend/Makefile.in 2009-02-10 09:37:00.000000000 +0100 -+++ faac-1.28/frontend/Makefile.in 2009-03-20 05:42:58.667425673 +0100 -@@ -68,6 +68,9 @@ - CCLD = $(CC) - LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ - $(AM_LDFLAGS) $(LDFLAGS) -o $@ -+CXXLD = $(CXX) -+CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \ -+ $(AM_LDFLAGS) $(LDFLAGS) -o $@ - SOURCES = $(faac_SOURCES) - DIST_SOURCES = $(faac_SOURCES) - man1dir = $(mandir)/man1 -@@ -132,6 +135,7 @@ - USE_DRM_FALSE = @USE_DRM_FALSE@ - USE_DRM_TRUE = @USE_DRM_TRUE@ - VERSION = @VERSION@ -+AM_CFLAGS = $(CFLAGS) - WITH_MP4V2_FALSE = @WITH_MP4V2_FALSE@ - WITH_MP4V2_TRUE = @WITH_MP4V2_TRUE@ - ac_ct_CC = @ac_ct_CC@ -@@ -186,7 +190,7 @@ - @WITH_MP4V2_FALSE at INCLUDES = -I$(top_srcdir)/include - @WITH_MP4V2_TRUE at INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/common/mp4v2 - @WITH_MP4V2_FALSE at LDADD = $(top_builddir)/libfaac/libfaac.la -lm -- at WITH_MP4V2_TRUE@LDADD = $(top_builddir)/libfaac/libfaac.la $(top_srcdir)/common/mp4v2/libmp4v2.a -lm -lstdc++ -+ at WITH_MP4V2_TRUE@LDADD = $(top_builddir)/libfaac/libfaac.la $(top_srcdir)/common/mp4v2/libmp4v2.a -lm -lCrun -lCstd - all: all-am - - .SUFFIXES: -@@ -200,9 +204,9 @@ - exit 1;; \ - esac; \ - done; \ -- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu frontend/Makefile'; \ -+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign frontend/Makefile'; \ - cd $(top_srcdir) && \ -- $(AUTOMAKE) --gnu frontend/Makefile -+ $(AUTOMAKE) --foreign frontend/Makefile - .PRECIOUS: Makefile - Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status - @case '$?' in \ -@@ -250,7 +254,7 @@ - done - faac$(EXEEXT): $(faac_OBJECTS) $(faac_DEPENDENCIES) - @rm -f faac$(EXEEXT) -- $(LINK) $(faac_LDFLAGS) $(faac_OBJECTS) $(faac_LDADD) $(LIBS) -+ $(CXXLINK) $(faac_LDFLAGS) $(faac_OBJECTS) $(faac_LDADD) $(LIBS) - - mostlyclean-compile: - -rm -f *.$(OBJEXT) Deleted: csw/mgar/pkg/libfaad2/trunk/files/aacquant.c.diff =================================================================== --- csw/mgar/pkg/libfaac/trunk/files/aacquant.c.diff 2009-12-28 14:18:44 UTC (rev 7782) +++ csw/mgar/pkg/libfaad2/trunk/files/aacquant.c.diff 2010-01-02 16:37:07 UTC (rev 7830) @@ -1,21 +0,0 @@ -diff --speed-large-files --minimal -ru ../build-global/faac-1.28/libfaac/aacquant.c faac-1.28/libfaac/aacquant.c ---- ../build-global/faac-1.28/libfaac/aacquant.c 2008-03-24 00:00:25.000000000 +0100 -+++ faac-1.28/libfaac/aacquant.c 2009-03-20 05:53:00.225604748 +0100 -@@ -281,11 +281,16 @@ - - - #if TAKEHIRO_IEEE754_HACK -- -+#if defined(__SUNPRO_C) || defined(__SUNPRO_CC) -+#pragma pack(8) -+#endif - typedef union { - float f; - int i; - } fi_union; -+#if defined(__SUNPRO_C) || defined(__SUNPRO_CC) -+#pragma pack() -+#endif - - #define MAGIC_FLOAT (65536*(128)) - #define MAGIC_INT 0x4b000000 Deleted: csw/mgar/pkg/libfaad2/trunk/files/aacquant.h.diff =================================================================== --- csw/mgar/pkg/libfaac/trunk/files/aacquant.h.diff 2009-12-28 14:18:44 UTC (rev 7782) +++ csw/mgar/pkg/libfaad2/trunk/files/aacquant.h.diff 2010-01-02 16:37:07 UTC (rev 7830) @@ -1,26 +0,0 @@ -diff --speed-large-files --minimal -ru ../build-global/faac-1.28/libfaac/aacquant.h faac-1.28/libfaac/aacquant.h ---- ../build-global/faac-1.28/libfaac/aacquant.h 2003-10-12 18:43:39.000000000 +0200 -+++ faac-1.28/libfaac/aacquant.h 2009-03-20 05:53:52.210350072 +0100 -@@ -37,14 +37,22 @@ - #define POW20(x) pow(2.0,((double)x)*.25) - #define IPOW20(x) pow(2.0,-((double)x)*.1875) - -+#if defined(__SUNPRO_C) || defined(__SUNPRO_CC) -+#pragma pack() -+#else - #pragma pack(push, 1) -+#endif - typedef struct - { - double *pow43; - double *adj43; - double quality; - } AACQuantCfg; -+#if defined(__SUNPRO_C) || defined(__SUNPRO_CC) -+#pragma pack() -+#else - #pragma pack(pop) -+#endif - - void AACQuantizeInit(CoderInfo *coderInfo, unsigned int numChannels, - AACQuantCfg *aacquantCfg); Deleted: csw/mgar/pkg/libfaad2/trunk/files/config.h.in.diff =================================================================== --- csw/mgar/pkg/libfaac/trunk/files/config.h.in.diff 2009-12-28 14:18:44 UTC (rev 7782) +++ csw/mgar/pkg/libfaad2/trunk/files/config.h.in.diff 2010-01-02 16:37:07 UTC (rev 7830) @@ -1,34 +0,0 @@ ---- ../build-global/faac-1.28/config.h.in 2009-02-10 09:36:59.000000000 +0100 -+++ faac-1.28/config.h.in 2009-04-05 18:56:29.025432723 +0200 -@@ -1,5 +1,25 @@ - /* config.h.in. Generated from configure.in by autoheader. */ - -+#ifndef __FAAC_CONFIG_H -+#define __FAAC_CONFIG_H -+ -+#if defined(__SUNPRO_C) || defined(__SUNPRO_CC) -+#include -+ -+typedef uint8_t u_int8_t; -+typedef uint16_t u_int16_t; -+typedef uint32_t u_int32_t; -+typedef uint64_t u_int64_t; -+ -+#define HAVE_INT16_T 1 -+#define HAVE_INT32_T 1 -+#define HAVE_U_INT32_T 1 -+#define HAVE_U_INT16_T 1 -+ -+#define HAVE_STRUCT_IOVEC 1 -+#endif -+ -+ - /* Define if you want to encode for DRM */ - #undef DRM - -@@ -131,3 +151,5 @@ - - /* Define to `long int' if does not define. */ - #undef off_t -+ -+#endif /* __FAAC_CONFIG_H */ Deleted: csw/mgar/pkg/libfaad2/trunk/files/configure.diff =================================================================== --- csw/mgar/pkg/libfaac/trunk/files/configure.diff 2009-12-28 14:18:44 UTC (rev 7782) +++ csw/mgar/pkg/libfaad2/trunk/files/configure.diff 2010-01-02 16:37:07 UTC (rev 7830) @@ -1,20 +0,0 @@ ---- ../build-global/faac-1.28/configure 2009-02-10 09:36:58.000000000 +0100 -+++ faac-1.28/configure 2009-04-05 20:17:04.647262929 +0200 -@@ -19731,7 +19731,7 @@ - echo $ECHO_N "(cached) $ECHO_C" >&6 - else - ac_check_lib_save_LIBS=$LIBS --LIBS="-lmp4v2 -lstdc++ $LIBS" -+LIBS="-lmp4v2 -lCrun -lCstd $LIBS" - cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ - _ACEOF -@@ -19864,7 +19864,7 @@ - echo $ECHO_N "(cached) $ECHO_C" >&6 - else - ac_check_lib_save_LIBS=$LIBS --LIBS="-lmp4v2 -lstdc++ $LIBS" -+LIBS="-lmp4v2 -lCrun -lCstd $LIBS" - cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ - _ACEOF Deleted: csw/mgar/pkg/libfaad2/trunk/files/configure.in.diff =================================================================== --- csw/mgar/pkg/libfaac/trunk/files/configure.in.diff 2009-12-28 14:18:44 UTC (rev 7782) +++ csw/mgar/pkg/libfaad2/trunk/files/configure.in.diff 2010-01-02 16:37:07 UTC (rev 7830) @@ -1,55 +0,0 @@ -diff --speed-large-files --minimal -ru ../build-global/faac-1.28/configure.in faac-1.28/configure.in ---- ../build-global/faac-1.28/configure.in 2009-02-05 01:55:38.000000000 +0100 -+++ faac-1.28/configure.in 2009-03-20 06:00:25.906642505 +0100 -@@ -10,7 +10,9 @@ - - AC_DEFUN([MY_DEFINE], [ AC_DEFINE($1, 1, [define if needed]) ]) - --CFLAGS=${CFLAGS:-"-O2 -Wall"} -+CFLAGS=${CFLAGS} -+CPPFLAGS=${CPPFLAGS} -+LDFLAGS=${LDFLAGS} - - AC_PROG_CC - AC_PROG_CXX -@@ -20,10 +22,13 @@ - - AC_CHECK_TYPES(u_int32_t) - AC_CHECK_TYPES(u_int16_t) -+AC_CHECK_TYPES(uint64_t) -+AC_CHECK_TYPES(uint32_t) -+AC_CHECK_TYPES(uint16_t) - AC_CHECK_TYPES(int32_t) - AC_CHECK_TYPES(int16_t) - --AC_CHECK_DECL(strcasecmp, MY_DEFINE(HAVE_STRCASECMP)) -+AC_CHECK_DECL(strcasecmp, AC_DEFINE(HAVE_STRCASECMP, 1, [define if needed]) ) - - AC_CHECK_LIB(gnugetopt, getopt_long) - -@@ -41,7 +46,7 @@ - AC_MSG_NOTICE([*** Building with internal mp4v2 ***]) - AM_CONDITIONAL(WITH_MP4V2, true) - AC_CONFIG_LINKS(common/mp4v2/mpeg4ip_config.h:config.h) -- MY_DEFINE(HAVE_LIBMP4V2) -+ MY_DEFINE(HAVE_LIBMP4V2, 1, [define if needed]) - else - AC_MSG_NOTICE([*** Building WITHOUT mp4v2 ***]) - fi -@@ -61,12 +66,12 @@ - dnl Checks for header files required for mp4.h - AC_HEADER_STDC - AC_SYS_LARGEFILE --AC_CHECK_HEADERS(stdint.h inttypes.h) -+AC_CHECK_HEADERS(sys/types.h stdint.h inttypes.h inttypes_gnucompat.h) - AC_CHECK_HEADERS(mathf.h) - AC_CHECK_HEADERS(float.h) --AC_CHECK_DECL(strchr, MY_DEFINE(HAVE_STRCHR)) --AC_CHECK_DECL(memcpy, MY_DEFINE(HAVE_MEMCPY)) --AC_CHECK_DECL(strsep, MY_DEFINE(HAVE_STRSEP)) -+AC_CHECK_DECL(strchr, AC_DEFINE(HAVE_STRCHR, 1, [define if needed]) ) -+AC_CHECK_DECL(memcpy, AC_DEFINE(HAVE_MEMCPY, 1, [define if needed]) ) -+AC_CHECK_DECL(strsep, AC_DEFINE(HAVE_STRSEP, 1, [define if needed]) ) - AC_CHECK_HEADERS(sys/time.h) - AC_HEADER_TIME - AC_TYPE_OFF_T Deleted: csw/mgar/pkg/libfaad2/trunk/files/faac.h.diff =================================================================== --- csw/mgar/pkg/libfaac/trunk/files/faac.h.diff 2009-12-28 14:18:44 UTC (rev 7782) +++ csw/mgar/pkg/libfaad2/trunk/files/faac.h.diff 2010-01-02 16:37:07 UTC (rev 7830) @@ -1,27 +0,0 @@ -diff --speed-large-files --minimal -ru ../build-global/faac-1.28/include/faac.h faac-1.28/include/faac.h ---- ../build-global/faac-1.28/include/faac.h 2009-01-25 19:50:32.000000000 +0100 -+++ faac-1.28/include/faac.h 2009-03-20 06:01:42.801998112 +0100 -@@ -36,7 +36,11 @@ - # endif - #endif - -+#if defined(__SUNPRO_C) || defined(__SUNPRO_CC) -+#pragma pack() -+#else - #pragma pack(push, 1) -+#endif - - typedef struct { - void *ptr; -@@ -90,7 +94,11 @@ - - - -+#if defined(__SUNPRO_C) || defined(__SUNPRO_CC) -+#pragma pack() -+#else - #pragma pack(pop) -+#endif - - #ifdef __cplusplus - } Deleted: csw/mgar/pkg/libfaad2/trunk/files/faaccfg.h.diff =================================================================== --- csw/mgar/pkg/libfaac/trunk/files/faaccfg.h.diff 2009-12-28 14:18:44 UTC (rev 7782) +++ csw/mgar/pkg/libfaad2/trunk/files/faaccfg.h.diff 2010-01-02 16:37:07 UTC (rev 7830) @@ -1,26 +0,0 @@ -diff --speed-large-files --minimal -ru ../build-global/faac-1.28/include/faaccfg.h faac-1.28/include/faaccfg.h ---- ../build-global/faac-1.28/include/faaccfg.h 2004-07-04 14:12:05.000000000 +0200 -+++ faac-1.28/include/faaccfg.h 2009-03-20 06:03:00.833899895 +0100 -@@ -45,7 +45,11 @@ - #define SHORTCTL_NOSHORT 1 - #define SHORTCTL_NOLONG 2 - -+#if defined(__SUNPRO_C) || defined(__SUNPRO_CC) -+#pragma pack() -+#else - #pragma pack(push, 1) -+#endif - typedef struct faacEncConfiguration - { - /* config version */ -@@ -117,6 +121,10 @@ - - } faacEncConfiguration, *faacEncConfigurationPtr; - -+#if defined(__SUNPRO_C) || defined(__SUNPRO_CC) -+#pragma pack() -+#else - #pragma pack(pop) -+#endif - - #endif /* _FAACCFG_H_ */ Deleted: csw/mgar/pkg/libfaad2/trunk/files/frame.h.diff =================================================================== --- csw/mgar/pkg/libfaac/trunk/files/frame.h.diff 2009-12-28 14:18:44 UTC (rev 7782) +++ csw/mgar/pkg/libfaad2/trunk/files/frame.h.diff 2010-01-02 16:37:07 UTC (rev 7830) @@ -1,27 +0,0 @@ -diff --speed-large-files --minimal -ru ../build-global/faac-1.28/libfaac/frame.h faac-1.28/libfaac/frame.h ---- ../build-global/faac-1.28/libfaac/frame.h 2009-01-25 19:50:32.000000000 +0100 -+++ faac-1.28/libfaac/frame.h 2009-03-20 06:03:57.455266251 +0100 -@@ -60,7 +60,11 @@ - #endif - #endif - -+#if defined(__SUNPRO_C) || defined(__SUNPRO_CC) -+#pragma pack() -+#else - #pragma pack(push, 1) -+#endif - - typedef struct { - psymodel_t *model; -@@ -151,7 +155,11 @@ - int FAACAPI faacEncClose(faacEncHandle hEncoder); - - -+#if defined(__SUNPRO_C) || defined(__SUNPRO_CC) -+#pragma pack() -+#else - #pragma pack(pop) -+#endif - - #ifdef __cplusplus - } Deleted: csw/mgar/pkg/libfaad2/trunk/files/input.c.diff =================================================================== --- csw/mgar/pkg/libfaac/trunk/files/input.c.diff 2009-12-28 14:18:44 UTC (rev 7782) +++ csw/mgar/pkg/libfaad2/trunk/files/input.c.diff 2010-01-02 16:37:07 UTC (rev 7830) @@ -1,29 +0,0 @@ -diff --speed-large-files --minimal -ru ../build-global/faac-1.28/frontend/input.c faac-1.28/frontend/input.c ---- ../build-global/faac-1.28/frontend/input.c 2009-01-25 19:50:32.000000000 +0100 -+++ faac-1.28/frontend/input.c 2009-03-20 06:06:22.286495928 +0100 -@@ -27,6 +27,10 @@ - #include - #include - -+#if defined(__SUNPRO_C) || defined(__SUNPRO_CC) -+#include /* for BSWAP_8|BSWAP_16|BSWAP_32|BSWAP_64 */ -+#endif -+ - #ifdef _WIN32 - #include - #include -@@ -34,9 +38,14 @@ - - #include "input.h" - -+#if (defined(__SUNPRO_C) || defined(__SUNPRO_CC)) && defined(__SunOS_5_10) -+#define SWAP32(x) BSWAP_32(x) -+#define SWAP16(x) BSWAP_16(x) -+#else - #define SWAP32(x) (((x & 0xff) << 24) | ((x & 0xff00) << 8) \ - | ((x & 0xff0000) >> 8) | ((x & 0xff000000) >> 24)) - #define SWAP16(x) (((x & 0xff) << 8) | ((x & 0xff00) >> 8)) -+#endif - - #ifdef WORDS_BIGENDIAN - # define UINT32(x) SWAP32(x) Deleted: csw/mgar/pkg/libfaad2/trunk/files/ltp.c.diff =================================================================== --- csw/mgar/pkg/libfaac/trunk/files/ltp.c.diff 2009-12-28 14:18:44 UTC (rev 7782) +++ csw/mgar/pkg/libfaad2/trunk/files/ltp.c.diff 2010-01-02 16:37:07 UTC (rev 7830) @@ -1,17 +0,0 @@ -diff --speed-large-files --minimal -ru ../build-global/faac-1.28/libfaac/ltp.c faac-1.28/libfaac/ltp.c ---- ../build-global/faac-1.28/libfaac/ltp.c 2003-06-26 21:20:31.000000000 +0200 -+++ faac-1.28/libfaac/ltp.c 2009-03-20 06:07:27.247999333 +0100 -@@ -38,10 +38,13 @@ - #include "util.h" - - -+#if !defined(__SUNPRO_C) && !defined(__SUNPRO_CC) -+/* why is this define here anyway, it is not used anywhere */ - /* short double_to_int(double sig_in); */ - #define double_to_int(sig_in) \ - ((sig_in) > 32767 ? 32767 : ( \ - (sig_in) < -32768 ? -32768 : (sig_in))) -+#endif - - #define _MDCT_SCALE 512 - Deleted: csw/mgar/pkg/libfaad2/trunk/files/mp4property.h.diff =================================================================== --- csw/mgar/pkg/libfaac/trunk/files/mp4property.h.diff 2009-12-28 14:18:44 UTC (rev 7782) +++ csw/mgar/pkg/libfaad2/trunk/files/mp4property.h.diff 2010-01-02 16:37:07 UTC (rev 7830) @@ -1,12 +0,0 @@ -diff --speed-large-files --minimal -ru ../build-global/faac-1.28/common/mp4v2/mp4property.h faac-1.28/common/mp4v2/mp4property.h ---- ../build-global/faac-1.28/common/mp4v2/mp4property.h 2009-01-25 02:14:34.000000000 +0100 -+++ faac-1.28/common/mp4v2/mp4property.h 2009-03-20 06:08:45.678172744 +0100 -@@ -38,7 +38,7 @@ - StringProperty, - BytesProperty, - TableProperty, -- DescriptorProperty, -+ DescriptorProperty - }; - - class MP4Property { Deleted: csw/mgar/pkg/libfaad2/trunk/files/mp4util.h.diff =================================================================== --- csw/mgar/pkg/libfaac/trunk/files/mp4util.h.diff 2009-12-28 14:18:44 UTC (rev 7782) +++ csw/mgar/pkg/libfaad2/trunk/files/mp4util.h.diff 2010-01-02 16:37:07 UTC (rev 7830) @@ -1,12 +0,0 @@ -diff --speed-large-files --minimal -ru ../build-global/faac-1.28/common/mp4v2/mp4util.h faac-1.28/common/mp4v2/mp4util.h ---- ../build-global/faac-1.28/common/mp4v2/mp4util.h 2009-01-25 02:14:34.000000000 +0100 -+++ faac-1.28/common/mp4v2/mp4util.h 2009-03-20 00:14:32.128482807 +0100 -@@ -83,7 +83,7 @@ - } - - static inline void MP4Printf(const char* fmt, ...) --#ifndef _WIN32 -+#if defined(__GNUC__) - __attribute__((format(__printf__, 1, 2))) - #endif - ; Deleted: csw/mgar/pkg/libfaad2/trunk/files/mpeg4ip.h.diff =================================================================== --- csw/mgar/pkg/libfaac/trunk/files/mpeg4ip.h.diff 2009-12-28 14:18:44 UTC (rev 7782) +++ csw/mgar/pkg/libfaad2/trunk/files/mpeg4ip.h.diff 2010-01-02 16:37:07 UTC (rev 7830) @@ -1,37 +0,0 @@ -diff --speed-large-files --minimal -ru ../build-global/faac-1.28/common/mp4v2/mpeg4ip.h faac-1.28/common/mp4v2/mpeg4ip.h ---- ../build-global/faac-1.28/common/mp4v2/mpeg4ip.h 2009-01-26 23:42:35.000000000 +0100 -+++ faac-1.28/common/mp4v2/mpeg4ip.h 2009-03-20 06:14:07.133127520 +0100 -@@ -65,7 +65,9 @@ - /***************************************************************************** - * UNIX LIKE DEFINES BELOW THIS POINT - *****************************************************************************/ --#ifdef sun -+#if defined(sun) || defined(__sun) || defined(__sun__) -+#include -+#include - #include - #endif - -@@ -194,12 +196,7 @@ - typedef unsigned int socklen_t; - #endif - --#ifdef sun --#include --#define u_int8_t uint8_t --#define u_int16_t uint16_t --#define u_int32_t uint32_t --#define u_int64_t uint64_t -+#if defined(sun) || defined(__sun) || defined(__sun__) - #define __STRING(expr) #expr - #endif - -@@ -328,7 +325,7 @@ - AUDIO_FMT_U16, - AUDIO_FMT_S16, - AUDIO_FMT_FLOAT, -- AUDIO_FMT_HW_AC3, -+ AUDIO_FMT_HW_AC3 - } audio_format_t; - - #endif /* __MPEG4IP_INCLUDED__ */ Deleted: csw/mgar/pkg/libfaad2/trunk/files/psych.h.diff =================================================================== --- csw/mgar/pkg/libfaac/trunk/files/psych.h.diff 2009-12-28 14:18:44 UTC (rev 7782) +++ csw/mgar/pkg/libfaad2/trunk/files/psych.h.diff 2010-01-02 16:37:07 UTC (rev 7830) @@ -1,10 +0,0 @@ -diff --speed-large-files --minimal -ru ../build-global/faac-1.28/libfaac/psych.h faac-1.28/libfaac/psych.h ---- ../build-global/faac-1.28/libfaac/psych.h 2005-04-24 21:16:14.000000000 +0200 -+++ faac-1.28/libfaac/psych.h 2009-03-20 06:14:31.902939182 +0100 -@@ -82,4 +82,4 @@ - } - #endif /* __cplusplus */ - --#endif /* PSYCH_H */ -\ No newline at end of file -+#endif /* PSYCH_H */ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Sat Jan 2 17:54:31 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Sat, 02 Jan 2010 16:54:31 +0000 Subject: [csw-devel] SF.net SVN: gar:[7831] csw/mgar/pkg/libfaad2/trunk Message-ID: Revision: 7831 http://gar.svn.sourceforge.net/gar/?rev=7831&view=rev Author: dmichelsen Date: 2010-01-02 16:54:31 +0000 (Sat, 02 Jan 2010) Log Message: ----------- libfaad2: Initial commit Modified Paths: -------------- csw/mgar/pkg/libfaad2/trunk/Makefile csw/mgar/pkg/libfaad2/trunk/checksums csw/mgar/pkg/libfaad2/trunk/files/0001-Remove-iquote-from-CFLAGS-unknown-to-SS.patch Added Paths: ----------- csw/mgar/pkg/libfaad2/trunk/files/0002-Use-inline-suitable-for-SS.patch Modified: csw/mgar/pkg/libfaad2/trunk/Makefile =================================================================== --- csw/mgar/pkg/libfaad2/trunk/Makefile 2010-01-02 16:37:07 UTC (rev 7830) +++ csw/mgar/pkg/libfaad2/trunk/Makefile 2010-01-02 16:54:31 UTC (rev 7831) @@ -12,6 +12,7 @@ MASTER_SITES = $(SF_MIRRORS) DISTFILES = $(DISTNAME).tar.bz2 PATCHFILES = 0001-Remove-iquote-from-CFLAGS-unknown-to-SS.patch +PATCHFILES += 0002-Use-inline-suitable-for-SS.patch PACKAGES = CSWfaad2 CATALOGNAME = faad2 Modified: csw/mgar/pkg/libfaad2/trunk/checksums =================================================================== --- csw/mgar/pkg/libfaad2/trunk/checksums 2010-01-02 16:37:07 UTC (rev 7830) +++ csw/mgar/pkg/libfaad2/trunk/checksums 2010-01-02 16:54:31 UTC (rev 7831) @@ -1 +1,3 @@ +03a038258ea594c90c9b58e8572a262b 0001-Remove-iquote-from-CFLAGS-unknown-to-SS.patch +ea595fc8a7759c1ca424bcb226c52975 0002-Use-inline-suitable-for-SS.patch 4c332fa23febc0e4648064685a3d4332 faad2-2.7.tar.bz2 Modified: csw/mgar/pkg/libfaad2/trunk/files/0001-Remove-iquote-from-CFLAGS-unknown-to-SS.patch =================================================================== --- csw/mgar/pkg/libfaad2/trunk/files/0001-Remove-iquote-from-CFLAGS-unknown-to-SS.patch 2010-01-02 16:37:07 UTC (rev 7830) +++ csw/mgar/pkg/libfaad2/trunk/files/0001-Remove-iquote-from-CFLAGS-unknown-to-SS.patch 2010-01-02 16:54:31 UTC (rev 7831) @@ -4,24 +4,10 @@ Subject: [PATCH] Remove iquote from CFLAGS unknown to SS --- - libfaad/Makefile | 2 +- libfaad/Makefile.am | 2 +- libfaad/Makefile.in | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) -diff --git a/libfaad/Makefile b/libfaad/Makefile -index 71c9ec1..13edca2 100644 ---- a/libfaad/Makefile -+++ b/libfaad/Makefile -@@ -195,7 +195,7 @@ sharedstatedir = /opt/csw/share - sysconfdir = /opt/csw/etc - target_alias = - lib_LTLIBRARIES = libfaad.la --AM_CFLAGS = -iquote $(top_srcdir)/include -+AM_CFLAGS = $(top_srcdir)/include - include_HEADERS = $(top_srcdir)/include/faad.h \ - $(top_srcdir)/include/neaacdec.h - diff --git a/libfaad/Makefile.am b/libfaad/Makefile.am index e5ad36d..d355989 100644 --- a/libfaad/Makefile.am @@ -30,7 +16,7 @@ lib_LTLIBRARIES = libfaad.la -AM_CFLAGS = -iquote $(top_srcdir)/include -+AM_CFLAGS = $(top_srcdir)/include ++AM_CFLAGS = -I$(top_srcdir)/include include_HEADERS = $(top_srcdir)/include/faad.h \ $(top_srcdir)/include/neaacdec.h @@ -43,7 +29,7 @@ target_alias = @target_alias@ lib_LTLIBRARIES = libfaad.la -AM_CFLAGS = -iquote $(top_srcdir)/include -+AM_CFLAGS = $(top_srcdir)/include ++AM_CFLAGS = -I$(top_srcdir)/include include_HEADERS = $(top_srcdir)/include/faad.h \ $(top_srcdir)/include/neaacdec.h Added: csw/mgar/pkg/libfaad2/trunk/files/0002-Use-inline-suitable-for-SS.patch =================================================================== --- csw/mgar/pkg/libfaad2/trunk/files/0002-Use-inline-suitable-for-SS.patch (rev 0) +++ csw/mgar/pkg/libfaad2/trunk/files/0002-Use-inline-suitable-for-SS.patch 2010-01-02 16:54:31 UTC (rev 7831) @@ -0,0 +1,25 @@ +From f25a74ff2b2bed01cc6e5ed702f4c80947b7c8c6 Mon Sep 17 00:00:00 2001 +From: Dagobert Michelsen +Date: Sat, 2 Jan 2010 17:40:18 +0100 +Subject: [PATCH] Use inline suitable for SS + +--- + libfaad/common.h | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/libfaad/common.h b/libfaad/common.h +index d3b21c3..6247de6 100644 +--- a/libfaad/common.h ++++ b/libfaad/common.h +@@ -41,7 +41,7 @@ extern "C" { + + #include "neaacdec.h" + +-#if 1 ++#if 0 + #define INLINE __inline + #else + #define INLINE inline +-- +1.6.6 + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Sat Jan 2 20:27:00 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Sat, 02 Jan 2010 19:27:00 +0000 Subject: [csw-devel] SF.net SVN: gar:[7832] csw/mgar/pkg/libfaad2/trunk Message-ID: Revision: 7832 http://gar.svn.sourceforge.net/gar/?rev=7832&view=rev Author: dmichelsen Date: 2010-01-02 19:26:57 +0000 (Sat, 02 Jan 2010) Log Message: ----------- libfaad2: Add another SS patch Modified Paths: -------------- csw/mgar/pkg/libfaad2/trunk/Makefile csw/mgar/pkg/libfaad2/trunk/checksums Added Paths: ----------- csw/mgar/pkg/libfaad2/trunk/files/0003-Use-inttypes-instead-of-stdint.patch Modified: csw/mgar/pkg/libfaad2/trunk/Makefile =================================================================== --- csw/mgar/pkg/libfaad2/trunk/Makefile 2010-01-02 16:54:31 UTC (rev 7831) +++ csw/mgar/pkg/libfaad2/trunk/Makefile 2010-01-02 19:26:57 UTC (rev 7832) @@ -13,6 +13,7 @@ DISTFILES = $(DISTNAME).tar.bz2 PATCHFILES = 0001-Remove-iquote-from-CFLAGS-unknown-to-SS.patch PATCHFILES += 0002-Use-inline-suitable-for-SS.patch +PATCHFILES += 0003-Use-inttypes-instead-of-stdint.patch PACKAGES = CSWfaad2 CATALOGNAME = faad2 Modified: csw/mgar/pkg/libfaad2/trunk/checksums =================================================================== --- csw/mgar/pkg/libfaad2/trunk/checksums 2010-01-02 16:54:31 UTC (rev 7831) +++ csw/mgar/pkg/libfaad2/trunk/checksums 2010-01-02 19:26:57 UTC (rev 7832) @@ -1,3 +1,4 @@ 03a038258ea594c90c9b58e8572a262b 0001-Remove-iquote-from-CFLAGS-unknown-to-SS.patch ea595fc8a7759c1ca424bcb226c52975 0002-Use-inline-suitable-for-SS.patch +548781681ae7b3ad6e3ae9c2ff556f11 0003-Use-inttypes-instead-of-stdint.patch 4c332fa23febc0e4648064685a3d4332 faad2-2.7.tar.bz2 Added: csw/mgar/pkg/libfaad2/trunk/files/0003-Use-inttypes-instead-of-stdint.patch =================================================================== --- csw/mgar/pkg/libfaad2/trunk/files/0003-Use-inttypes-instead-of-stdint.patch (rev 0) +++ csw/mgar/pkg/libfaad2/trunk/files/0003-Use-inttypes-instead-of-stdint.patch 2010-01-02 19:26:57 UTC (rev 7832) @@ -0,0 +1,26 @@ +From c02c28a516d3baecef4253f305af295078c530c8 Mon Sep 17 00:00:00 2001 +From: Dagobert Michelsen +Date: Sat, 2 Jan 2010 17:49:08 +0100 +Subject: [PATCH 3/3] Use inttypes instead of stdint + +--- + common/mp4ff/mp4ff_int_types.h | 3 ++- + 1 files changed, 2 insertions(+), 1 deletions(-) + +diff --git a/common/mp4ff/mp4ff_int_types.h b/common/mp4ff/mp4ff_int_types.h +index 15e7fd6..bf8b0c0 100644 +--- a/common/mp4ff/mp4ff_int_types.h ++++ b/common/mp4ff/mp4ff_int_types.h +@@ -19,7 +19,8 @@ typedef unsigned __int64 uint64_t; + + #else + +-#include ++/* #include */ ++#include + + #endif + +-- +1.6.6 + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Sat Jan 2 21:11:54 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Sat, 02 Jan 2010 20:11:54 +0000 Subject: [csw-devel] SF.net SVN: gar:[7833] csw/mgar/pkg Message-ID: Revision: 7833 http://gar.svn.sourceforge.net/gar/?rev=7833&view=rev Author: dmichelsen Date: 2010-01-02 20:11:50 +0000 (Sat, 02 Jan 2010) Log Message: ----------- mpeg4ip: Initial commit Added Paths: ----------- csw/mgar/pkg/mpeg4ip/ csw/mgar/pkg/mpeg4ip/branches/ csw/mgar/pkg/mpeg4ip/tags/ csw/mgar/pkg/mpeg4ip/trunk/ csw/mgar/pkg/mpeg4ip/trunk/Makefile csw/mgar/pkg/mpeg4ip/trunk/checksums csw/mgar/pkg/mpeg4ip/trunk/files/ Property changes on: csw/mgar/pkg/mpeg4ip/trunk ___________________________________________________________________ Added: svn:ignore + cookies download work Added: svn:externals + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 Added: csw/mgar/pkg/mpeg4ip/trunk/Makefile =================================================================== --- csw/mgar/pkg/mpeg4ip/trunk/Makefile (rev 0) +++ csw/mgar/pkg/mpeg4ip/trunk/Makefile 2010-01-02 20:11:50 UTC (rev 7833) @@ -0,0 +1,23 @@ +GARNAME = mpeg4ip +GARVERSION = 1.6.1 +CATEGORIES = lib + +DESCRIPTION = Libraries for MPEG-4/H.261/MPEG-2/H.263 MP3/AAC/AMR +define BLURB + Provided are a live MPEG-4/H.261/MPEG-2/H.263 MP3/AAC/AMR broadcaster + and file recorder, command line utilities such as an MP4 file creator + and hinter, and an player that can both stream and playback from local file. +endef + +SF_PROJ = mpeg4ip +MASTER_SITES = http://download.m0k.org/handbrake/contrib/ +DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz +DISTNAME = $(GARNAME) + +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + +BUILD64 = 1 +CONFIGURE_ARGS = $(DIRPATHS) + +include gar/category.mk Added: csw/mgar/pkg/mpeg4ip/trunk/checksums =================================================================== --- csw/mgar/pkg/mpeg4ip/trunk/checksums (rev 0) +++ csw/mgar/pkg/mpeg4ip/trunk/checksums 2010-01-02 20:11:50 UTC (rev 7833) @@ -0,0 +1 @@ +cd81b566cf2fafc7318f58be8998182c mpeg4ip-1.6.1.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From hson at users.sourceforge.net Sun Jan 3 00:34:09 2010 From: hson at users.sourceforge.net (hson at users.sourceforge.net) Date: Sat, 02 Jan 2010 23:34:09 +0000 Subject: [csw-devel] SF.net SVN: gar:[7834] csw/mgar/pkg Message-ID: Revision: 7834 http://gar.svn.sourceforge.net/gar/?rev=7834&view=rev Author: hson Date: 2010-01-02 23:34:09 +0000 (Sat, 02 Jan 2010) Log Message: ----------- gtksourceview: Initial commit Added Paths: ----------- csw/mgar/pkg/gtksourceview/ csw/mgar/pkg/gtksourceview/Makefile csw/mgar/pkg/gtksourceview/branches/ csw/mgar/pkg/gtksourceview/tags/ csw/mgar/pkg/gtksourceview/trunk/ csw/mgar/pkg/gtksourceview/trunk/Makefile csw/mgar/pkg/gtksourceview/trunk/checksums csw/mgar/pkg/gtksourceview/trunk/files/ Added: csw/mgar/pkg/gtksourceview/Makefile =================================================================== --- csw/mgar/pkg/gtksourceview/Makefile (rev 0) +++ csw/mgar/pkg/gtksourceview/Makefile 2010-01-02 23:34:09 UTC (rev 7834) @@ -0,0 +1,15 @@ +# vim: ft=make ts=4 sw=4 noet + +default: + @echo "You are in the pkg/ directory." + +%: + $(MAKE) -C trunk $* + +paranoid-%: + $(MAKE) -C trunk $* || exit 2 + +export BUILDLOG ?= $(shell pwd)/buildlog.txt + +report-%: + $(MAKE) -C trunk $* || echo " *** make $* in $$i failed ***" >> $(BUILDLOG) Property changes on: csw/mgar/pkg/gtksourceview/trunk ___________________________________________________________________ Added: svn:ignore + cookies download work Added: svn:externals + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 Added: csw/mgar/pkg/gtksourceview/trunk/Makefile =================================================================== --- csw/mgar/pkg/gtksourceview/trunk/Makefile (rev 0) +++ csw/mgar/pkg/gtksourceview/trunk/Makefile 2010-01-02 23:34:09 UTC (rev 7834) @@ -0,0 +1,59 @@ +GARNAME = gtksourceview +GARVERSION = 2.9.3 +CATEGORIES = gnome + +DESCRIPTION = A text widget with features typical of a source code editor +define BLURB + GtkSourceView is a text widget that extends the standard gtk+ 2.x + text widget GtkTextView. + + It improves GtkTextView by implementing syntax highlighting and other + features typical of a source code editor. +endef + +MASTER_SITES = $(GNOME_MIRROR) +DISTFILES = $(GARNAME)-$(GARVERSION).tar.bz2 +DISTNAME = $(GARNAME)-$(GARVERSION) + +PACKAGES = CSWgtksourceview CSWgtksourceviewdev CSWgtksourceviewdoc +CATALOGNAME_CSWgtksourceview = gtksourceview +CATALOGNAME_CSWgtksourceviewdev = gtksourceview_devel +CATALOGNAME_CSWgtksourceviewdoc = gtksourceview_doc + +SPKG_DESC_CSWgtksourceview += A text widget with features typical of a source code editor +SPKG_DESC_CSWgtksourceviewdev += A text widget with features typical of a source code editor - developer package +SPKG_DESC_CSWgtksourceviewdoc += A text widget with features typical of a source code editor - documentation + +REQUIRED_PKGS_CSWgtksourceview += CSWfconfig CSWftype2 CSWgconf2 CSWggettextrt CSWglib2 +REQUIRED_PKGS_CSWgtksourceview += CSWgtk2 CSWlibatk CSWlibcairo CSWlibxml2 CSWpango +REQUIRED_PKGS_CSWgtksourceviewdev += CSWgtksourceview +REQUIRED_PKGS_CSWgtksourceviewdoc += CSWgtksourceview + +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.bz2 + +SPKG_SOURCEURL = http://live.gnome.org/GtkSourceView + +EXTRA_INC = $(prefix)/X11/include +EXTRA_LIB = $(prefix)/X11/lib +EXTRA_PKG_CONFIG_DIRS = $(prefix)/X11/lib + +#NO_ISAEXEC = 1 +#NOISALIST = 1 +#BUILD64 = 1 + +PKGFILES_CSWgtksourceviewdev = $(PKGFILES_DEVEL) +PKGFILES_CSWgtksourceviewdoc = $(sharedstatedir)/gtk-doc/.* + +ARCHALL_CSWgtksourceviewdoc = 1 + +CONFIGURE_ARGS = $(DIRPATHS) + +# Test fails due to: +# Xlib: extension "Generic Event Extension" missing on display ":0.0". +# +#TEST_TARGET = check +TEST_TARGET = + +include gar/category.mk + +PATH := /opt/csw/gnu:$(PATH) Added: csw/mgar/pkg/gtksourceview/trunk/checksums =================================================================== --- csw/mgar/pkg/gtksourceview/trunk/checksums (rev 0) +++ csw/mgar/pkg/gtksourceview/trunk/checksums 2010-01-02 23:34:09 UTC (rev 7834) @@ -0,0 +1 @@ +14e2a838c0a2e5e602103f6715948084 gtksourceview-2.9.3.tar.bz2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From hson at users.sourceforge.net Sun Jan 3 00:46:25 2010 From: hson at users.sourceforge.net (hson at users.sourceforge.net) Date: Sat, 02 Jan 2010 23:46:25 +0000 Subject: [csw-devel] SF.net SVN: gar:[7835] csw/mgar/pkg Message-ID: Revision: 7835 http://gar.svn.sourceforge.net/gar/?rev=7835&view=rev Author: hson Date: 2010-01-02 23:46:25 +0000 (Sat, 02 Jan 2010) Log Message: ----------- goocanvas: Initial commit Added Paths: ----------- csw/mgar/pkg/goocanvas/ csw/mgar/pkg/goocanvas/Makefile csw/mgar/pkg/goocanvas/branches/ csw/mgar/pkg/goocanvas/tags/ csw/mgar/pkg/goocanvas/trunk/ csw/mgar/pkg/goocanvas/trunk/Makefile csw/mgar/pkg/goocanvas/trunk/checksums csw/mgar/pkg/goocanvas/trunk/files/ Added: csw/mgar/pkg/goocanvas/Makefile =================================================================== --- csw/mgar/pkg/goocanvas/Makefile (rev 0) +++ csw/mgar/pkg/goocanvas/Makefile 2010-01-02 23:46:25 UTC (rev 7835) @@ -0,0 +1,15 @@ +# vim: ft=make ts=4 sw=4 noet + +default: + @echo "You are in the pkg/ directory." + +%: + $(MAKE) -C trunk $* + +paranoid-%: + $(MAKE) -C trunk $* || exit 2 + +export BUILDLOG ?= $(shell pwd)/buildlog.txt + +report-%: + $(MAKE) -C trunk $* || echo " *** make $* in $$i failed ***" >> $(BUILDLOG) Property changes on: csw/mgar/pkg/goocanvas/trunk ___________________________________________________________________ Added: svn:ignore + cookies download work Added: svn:externals + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 Added: csw/mgar/pkg/goocanvas/trunk/Makefile =================================================================== --- csw/mgar/pkg/goocanvas/trunk/Makefile (rev 0) +++ csw/mgar/pkg/goocanvas/trunk/Makefile 2010-01-02 23:46:25 UTC (rev 7835) @@ -0,0 +1,55 @@ +GARNAME = goocanvas +GARVERSION = 0.15 +CATEGORIES = gnome + +DESCRIPTION = A cairo-based canvas widget for GTK +define BLURB + GooCanvas is a canvas widget for GTK that uses the cairo 2D library + for drawing. +endef + +MASTER_SITES = $(GNOME_MIRROR) +DISTFILES = $(GARNAME)-$(GARVERSION).tar.bz2 +DISTNAME = $(GARNAME)-$(GARVERSION) + +PACKAGES = CSWgoocanvas CSWgoocanvasdevel CSWgoocanvasdoc +CATALOGNAME_CSWgoocanvas = goocanvas +CATALOGNAME_CSWgoocanvasdevel = goocanvas_devel +CATALOGNAME_CSWgoocanvasdoc = goocanvas_doc + +SPKG_DESC_CSWgoocanvas += A cairo-based canvas widget for GTK +SPKG_DESC_CSWgoocanvasdevel += A cairo-based canvas widget for GTK - developer package +SPKG_DESC_CSWgoocanvasdoc += A cairo-based canvas widget for GTK - documentation + +REQUIRED_PKGS_CSWgoocanvas += CSWfconfig CSWftype2 CSWggettextrt CSWglib2 +REQUIRED_PKGS_CSWgoocanvas += CSWgtk2 CSWlibatk CSWlibcairo CSWpango +REQUIRED_PKGS_CSWgoocanvasdevel += CSWgoocanvas +REQUIRED_PKGS_CSWgoocanvasdoc += CSWgoocanvas + +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.bz2 + +SPKG_SOURCEURL = http://live.gnome.org/GooCanvas + +EXTRA_INC = $(prefix)/X11/include +EXTRA_LIB = $(prefix)/X11/lib +EXTRA_PKG_CONFIG_DIRS = $(prefix)/X11/lib + +#NO_ISAEXEC = 1 +#NOISALIST = 1 +#BUILD64 = 1 + +PKGFILES_CSWgoocanvasdevel = $(PKGFILES_DEVEL) +PKGFILES_CSWgoocanvasdoc = $(sharedstatedir)/gtk-doc/.* + +ARCHALL_CSWgoocanvasdoc = 1 + +LIBS = -lm +export LIBS + +CONFIGURE_ARGS = $(DIRPATHS) + +TEST_TARGET = check + +include gar/category.mk + +PATH := /opt/csw/gnu:$(PATH) Added: csw/mgar/pkg/goocanvas/trunk/checksums =================================================================== --- csw/mgar/pkg/goocanvas/trunk/checksums (rev 0) +++ csw/mgar/pkg/goocanvas/trunk/checksums 2010-01-02 23:46:25 UTC (rev 7835) @@ -0,0 +1 @@ +3f53c01e6aa958db3463c4ce1a8f5238 goocanvas-0.15.tar.bz2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From hson at users.sourceforge.net Sun Jan 3 00:47:58 2010 From: hson at users.sourceforge.net (hson at users.sourceforge.net) Date: Sat, 02 Jan 2010 23:47:58 +0000 Subject: [csw-devel] SF.net SVN: gar:[7836] csw/mgar/pkg Message-ID: Revision: 7836 http://gar.svn.sourceforge.net/gar/?rev=7836&view=rev Author: hson Date: 2010-01-02 23:47:58 +0000 (Sat, 02 Jan 2010) Log Message: ----------- iso-codes: Initial commit Added Paths: ----------- csw/mgar/pkg/iso-codes/ csw/mgar/pkg/iso-codes/Makefile csw/mgar/pkg/iso-codes/branches/ csw/mgar/pkg/iso-codes/tags/ csw/mgar/pkg/iso-codes/trunk/ csw/mgar/pkg/iso-codes/trunk/Makefile csw/mgar/pkg/iso-codes/trunk/checksums csw/mgar/pkg/iso-codes/trunk/files/ Added: csw/mgar/pkg/iso-codes/Makefile =================================================================== --- csw/mgar/pkg/iso-codes/Makefile (rev 0) +++ csw/mgar/pkg/iso-codes/Makefile 2010-01-02 23:47:58 UTC (rev 7836) @@ -0,0 +1,15 @@ +# vim: ft=make ts=4 sw=4 noet + +default: + @echo "You are in the pkg/ directory." + +%: + $(MAKE) -C trunk $* + +paranoid-%: + $(MAKE) -C trunk $* || exit 2 + +export BUILDLOG ?= $(shell pwd)/buildlog.txt + +report-%: + $(MAKE) -C trunk $* || echo " *** make $* in $$i failed ***" >> $(BUILDLOG) Property changes on: csw/mgar/pkg/iso-codes/trunk ___________________________________________________________________ Added: svn:ignore + cookies download work Added: svn:externals + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 Added: csw/mgar/pkg/iso-codes/trunk/Makefile =================================================================== --- csw/mgar/pkg/iso-codes/trunk/Makefile (rev 0) +++ csw/mgar/pkg/iso-codes/trunk/Makefile 2010-01-02 23:47:58 UTC (rev 7836) @@ -0,0 +1,30 @@ +GARNAME = iso-codes +GARVERSION = 3.9 +CATEGORIES = apps + +DESCRIPTION = Translations for names of various ISO standards +define BLURB + This package provides lists of various ISO standards (e.g. country, + language, language scripts, and currency names) in one place, rather + than repeated in many programs throughout the system +endef + +MASTER_SITES = ftp://pkg-isocodes.alioth.debian.org/pub/pkg-isocodes/ +DISTFILES = $(GARNAME)-$(GARVERSION).tar.bz2 +PACKAGES = CSWiso-codes +CATALOGNAME = iso_codes +SPKG_SOURCEURL = http://alioth.debian.org/projects/pkg-isocodes/ + + +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.bz2 + +CONFIGURE_ARGS = $(DIRPATHS) + +TEST_TARGET = check + +ARCHALL = 1 + +include gar/category.mk + +PATH := /opt/csw/gnu:$(PATH) Added: csw/mgar/pkg/iso-codes/trunk/checksums =================================================================== --- csw/mgar/pkg/iso-codes/trunk/checksums (rev 0) +++ csw/mgar/pkg/iso-codes/trunk/checksums 2010-01-02 23:47:58 UTC (rev 7836) @@ -0,0 +1 @@ +78bd12403eddf4439f5def44b1154337 iso-codes-3.9.tar.bz2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From hson at users.sourceforge.net Sun Jan 3 00:51:10 2010 From: hson at users.sourceforge.net (hson at users.sourceforge.net) Date: Sat, 02 Jan 2010 23:51:10 +0000 Subject: [csw-devel] SF.net SVN: gar:[7837] csw/mgar/pkg Message-ID: Revision: 7837 http://gar.svn.sourceforge.net/gar/?rev=7837&view=rev Author: hson Date: 2010-01-02 23:51:10 +0000 (Sat, 02 Jan 2010) Log Message: ----------- libunique: Initial commit Added Paths: ----------- csw/mgar/pkg/libunique/ csw/mgar/pkg/libunique/Makefile csw/mgar/pkg/libunique/branches/ csw/mgar/pkg/libunique/tags/ csw/mgar/pkg/libunique/trunk/ csw/mgar/pkg/libunique/trunk/Makefile csw/mgar/pkg/libunique/trunk/checksums csw/mgar/pkg/libunique/trunk/files/ Added: csw/mgar/pkg/libunique/Makefile =================================================================== --- csw/mgar/pkg/libunique/Makefile (rev 0) +++ csw/mgar/pkg/libunique/Makefile 2010-01-02 23:51:10 UTC (rev 7837) @@ -0,0 +1,15 @@ +# vim: ft=make ts=4 sw=4 noet + +default: + @echo "You are in the pkg/ directory." + +%: + $(MAKE) -C trunk $* + +paranoid-%: + $(MAKE) -C trunk $* || exit 2 + +export BUILDLOG ?= $(shell pwd)/buildlog.txt + +report-%: + $(MAKE) -C trunk $* || echo " *** make $* in $$i failed ***" >> $(BUILDLOG) Property changes on: csw/mgar/pkg/libunique/trunk ___________________________________________________________________ Added: svn:ignore + cookies download work Added: svn:externals + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 Added: csw/mgar/pkg/libunique/trunk/Makefile =================================================================== --- csw/mgar/pkg/libunique/trunk/Makefile (rev 0) +++ csw/mgar/pkg/libunique/trunk/Makefile 2010-01-02 23:51:10 UTC (rev 7837) @@ -0,0 +1,60 @@ +GARNAME = libunique +GARVERSION = 1.1.6 +CATEGORIES = gnome + +DESCRIPTION = Library for writing single instance application +define BLURB + Unique is a library for writing single instance application. If you launch + a single instance application twice, the second instance will either just + quit or will send a message to the running instance. + + Unique makes it easy to write this kind of applications, by providing a + base class, taking care of all the IPC machinery needed to send messages + to a running instance, and also handling the startup notification side. +endef + +MASTER_SITES = $(GNOME_MIRROR) +DISTFILES = $(GARNAME)-$(GARVERSION).tar.bz2 +DISTNAME = $(GARNAME)-$(GARVERSION) + +PACKAGES = CSWlibunique CSWlibuniquedevel CSWlibuniquedoc +CATALOGNAME_CSWlibunique = libunique +CATALOGNAME_CSWlibuniquedevel = libunique_devel +CATALOGNAME_CSWlibuniquedoc = libunique_doc + +SPKG_DESC_CSWlibunique += Library for writing single instance application +SPKG_DESC_CSWlibuniquedevel += Library for writing single instance application - developer package +SPKG_DESC_CSWlibuniquedoc += Library for writing single instance application - documentation + +REQUIRED_PKGS_CSWlibunique += CSWfconfig CSWftype2 CSWggettextrt CSWglib2 +REQUIRED_PKGS_CSWlibunique += CSWgtk2 CSWlibatk CSWlibcairo CSWlibx11 CSWpango +REQUIRED_PKGS_CSWlibuniquedevel += CSWlibunique +REQUIRED_PKGS_CSWlibuniquedoc += CSWlibunique + +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.bz2 + +SPKG_SOURCEURL = http://live.gnome.org/LibUnique + +EXTRA_INC = $(prefix)/X11/include +EXTRA_LIB = $(prefix)/X11/lib +EXTRA_PKG_CONFIG_DIRS = $(prefix)/X11/lib + +#NO_ISAEXEC = 1 +#NOISALIST = 1 +#BUILD64 = 1 + +PKGFILES_CSWlibuniquedevel = $(PKGFILES_DEVEL) +PKGFILES_CSWlibuniquedoc = $(sharedstatedir)/gtk-doc/.* + +ARCHALL_CSWlibuniquedoc = 1 + +LIBS = -lsocket -lnsl +export LIBS + +CONFIGURE_ARGS = $(DIRPATHS) + +TEST_TARGET = check + +include gar/category.mk + +PATH := /opt/csw/gnu:$(PATH) Added: csw/mgar/pkg/libunique/trunk/checksums =================================================================== --- csw/mgar/pkg/libunique/trunk/checksums (rev 0) +++ csw/mgar/pkg/libunique/trunk/checksums 2010-01-02 23:51:10 UTC (rev 7837) @@ -0,0 +1 @@ +7955769ef31f1bc4f83446dbb3625e6d libunique-1.1.6.tar.bz2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Sun Jan 3 02:08:34 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sun, 03 Jan 2010 01:08:34 +0000 Subject: [csw-devel] SF.net SVN: gar:[7838] csw/mgar/gar/v2-checkpkg/bin/checkpkg Message-ID: Revision: 7838 http://gar.svn.sourceforge.net/gar/?rev=7838&view=rev Author: wahwah Date: 2010-01-03 01:08:33 +0000 (Sun, 03 Jan 2010) Log Message: ----------- mGAR v2-checkpkg: Colors only in terminals Modified Paths: -------------- csw/mgar/gar/v2-checkpkg/bin/checkpkg Modified: csw/mgar/gar/v2-checkpkg/bin/checkpkg =================================================================== --- csw/mgar/gar/v2-checkpkg/bin/checkpkg 2010-01-02 23:51:10 UTC (rev 7837) +++ csw/mgar/gar/v2-checkpkg/bin/checkpkg 2010-01-03 01:08:33 UTC (rev 7838) @@ -31,6 +31,17 @@ readonly CHECKPKG_TMPDIR fi +# Colors only when running interactively +if [[ -t 1 ]]; then + GREEN="\\033[0;32;40m" + RED="\\033[1;31;40m" + COLOR_RESET="\\033[00m" +else + GREEN="" + RED="" + COLOR_RESET="" +fi + # always print out a warning message. (to stderr) # exit script, if quit_on_warn set @@ -555,10 +566,10 @@ printf "TEST: ${plugin} running..." ${plugin} $extra_options -e "${EXTRACTDIR}" ${pkgnames} > "${plugin_log}" 2>&1 if [[ "$?" -ne 0 ]]; then - printf "\rTEST: ${plugin} \\033[1;31;40m[FAIL]\\033[00m \\n" + printf "\rTEST: ${plugin} ${RED}[FAIL]${COLOR_RESET} \\n" test_suite_ok=0 else - printf "\rTEST: ${plugin} \\033[0;32;40m[OK]\\033[00m \\n" + printf "\rTEST: ${plugin} ${GREEN}[OK]${COLOR_RESET} \\n" fi else debugmsg "'${plugin}' is not executable" This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From hson at users.sourceforge.net Sun Jan 3 08:28:19 2010 From: hson at users.sourceforge.net (hson at users.sourceforge.net) Date: Sun, 03 Jan 2010 07:28:19 +0000 Subject: [csw-devel] SF.net SVN: gar:[7839] csw/mgar/pkg/libunique/trunk/Makefile Message-ID: Revision: 7839 http://gar.svn.sourceforge.net/gar/?rev=7839&view=rev Author: hson Date: 2010-01-03 07:28:19 +0000 (Sun, 03 Jan 2010) Log Message: ----------- libunique: Fixed Xext-problem which appeared when building on buildfarm Modified Paths: -------------- csw/mgar/pkg/libunique/trunk/Makefile Modified: csw/mgar/pkg/libunique/trunk/Makefile =================================================================== --- csw/mgar/pkg/libunique/trunk/Makefile 2010-01-03 01:08:33 UTC (rev 7838) +++ csw/mgar/pkg/libunique/trunk/Makefile 2010-01-03 07:28:19 UTC (rev 7839) @@ -28,6 +28,7 @@ REQUIRED_PKGS_CSWlibunique += CSWfconfig CSWftype2 CSWggettextrt CSWglib2 REQUIRED_PKGS_CSWlibunique += CSWgtk2 CSWlibatk CSWlibcairo CSWlibx11 CSWpango +REQUIRED_PKGS_CSWlibunique += CSWdbusglib CSWlibdbus CSWlibxext REQUIRED_PKGS_CSWlibuniquedevel += CSWlibunique REQUIRED_PKGS_CSWlibuniquedoc += CSWlibunique @@ -38,9 +39,16 @@ EXTRA_INC = $(prefix)/X11/include EXTRA_LIB = $(prefix)/X11/lib EXTRA_PKG_CONFIG_DIRS = $(prefix)/X11/lib +#This is ugly, should be EXTRA_LINKER_FLAGS, but due to libtool it doesn't work +EXTRA_LD_FLAGS_isa-i386 = -L/usr/openwin/lib -lXext +EXTRA_LD_FLAGS_isa-sparcv8 = -L/usr/openwin/lib -lXext +EXTRA_LD_FLAGS_isa-amd64 = -L/usr/openwin/lib/amd64 -lXext +EXTRA_LD_FLAGS_isa-sparcv9 = -L/usr/openwin/lib/sparcv9 -lXext +EXTRA_LD_FLAGS += $(EXTRA_LD_FLAGS_$(MODULATION)) #NO_ISAEXEC = 1 #NOISALIST = 1 +# libdbus not 64-bit yet #BUILD64 = 1 PKGFILES_CSWlibuniquedevel = $(PKGFILES_DEVEL) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From hson at users.sourceforge.net Sun Jan 3 09:24:00 2010 From: hson at users.sourceforge.net (hson at users.sourceforge.net) Date: Sun, 03 Jan 2010 08:24:00 +0000 Subject: [csw-devel] SF.net SVN: gar:[7840] csw/mgar/pkg/gtksourceview/trunk/Makefile Message-ID: Revision: 7840 http://gar.svn.sourceforge.net/gar/?rev=7840&view=rev Author: hson Date: 2010-01-03 08:24:00 +0000 (Sun, 03 Jan 2010) Log Message: ----------- gtksourceview: Add STRIP_LIBTOOL Modified Paths: -------------- csw/mgar/pkg/gtksourceview/trunk/Makefile Modified: csw/mgar/pkg/gtksourceview/trunk/Makefile =================================================================== --- csw/mgar/pkg/gtksourceview/trunk/Makefile 2010-01-03 07:28:19 UTC (rev 7839) +++ csw/mgar/pkg/gtksourceview/trunk/Makefile 2010-01-03 08:24:00 UTC (rev 7840) @@ -36,9 +36,16 @@ EXTRA_INC = $(prefix)/X11/include EXTRA_LIB = $(prefix)/X11/lib EXTRA_PKG_CONFIG_DIRS = $(prefix)/X11/lib +#This is ugly, should be EXTRA_LINKER_FLAGS, but due to libtool it doesn't work +EXTRA_LD_FLAGS_isa-i386 = -L/usr/openwin/lib -lXext +EXTRA_LD_FLAGS_isa-sparcv8 = -L/usr/openwin/lib -lXext +EXTRA_LD_FLAGS_isa-amd64 = -L/usr/openwin/lib/amd64 -lXext +EXTRA_LD_FLAGS_isa-sparcv9 = -L/usr/openwin/lib/sparcv9 -lXext +EXTRA_LD_FLAGS += $(EXTRA_LD_FLAGS_$(MODULATION)) #NO_ISAEXEC = 1 #NOISALIST = 1 +# gconf-2 not 64-bit yet #BUILD64 = 1 PKGFILES_CSWgtksourceviewdev = $(PKGFILES_DEVEL) @@ -54,6 +61,8 @@ #TEST_TARGET = check TEST_TARGET = +STRIP_LIBTOOL = 1 + include gar/category.mk PATH := /opt/csw/gnu:$(PATH) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From hson at users.sourceforge.net Sun Jan 3 09:30:23 2010 From: hson at users.sourceforge.net (hson at users.sourceforge.net) Date: Sun, 03 Jan 2010 08:30:23 +0000 Subject: [csw-devel] SF.net SVN: gar:[7841] csw/mgar/pkg/gtksourceview/trunk/Makefile Message-ID: Revision: 7841 http://gar.svn.sourceforge.net/gar/?rev=7841&view=rev Author: hson Date: 2010-01-03 08:30:23 +0000 (Sun, 03 Jan 2010) Log Message: ----------- gtksourceview: Add missing dependency Modified Paths: -------------- csw/mgar/pkg/gtksourceview/trunk/Makefile Modified: csw/mgar/pkg/gtksourceview/trunk/Makefile =================================================================== --- csw/mgar/pkg/gtksourceview/trunk/Makefile 2010-01-03 08:24:00 UTC (rev 7840) +++ csw/mgar/pkg/gtksourceview/trunk/Makefile 2010-01-03 08:30:23 UTC (rev 7841) @@ -24,8 +24,9 @@ SPKG_DESC_CSWgtksourceviewdev += A text widget with features typical of a source code editor - developer package SPKG_DESC_CSWgtksourceviewdoc += A text widget with features typical of a source code editor - documentation -REQUIRED_PKGS_CSWgtksourceview += CSWfconfig CSWftype2 CSWgconf2 CSWggettextrt CSWglib2 -REQUIRED_PKGS_CSWgtksourceview += CSWgtk2 CSWlibatk CSWlibcairo CSWlibxml2 CSWpango +REQUIRED_PKGS_CSWgtksourceview += CSWfconfig CSWftype2 CSWgconf2 CSWggettextrt +REQUIRED_PKGS_CSWgtksourceview += CSWglib2 CSWgtk2 CSWlibatk CSWlibcairo +REQUIRED_PKGS_CSWgtksourceview += CSWlibxml2 CSWpango CSWlibxext REQUIRED_PKGS_CSWgtksourceviewdev += CSWgtksourceview REQUIRED_PKGS_CSWgtksourceviewdoc += CSWgtksourceview This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From rthurner at users.sourceforge.net Sun Jan 3 12:12:01 2010 From: rthurner at users.sourceforge.net (rthurner at users.sourceforge.net) Date: Sun, 03 Jan 2010 11:12:01 +0000 Subject: [csw-devel] SF.net SVN: gar:[7842] csw/mgar/pkg/apr/trunk/files/config.layout Message-ID: Revision: 7842 http://gar.svn.sourceforge.net/gar/?rev=7842&view=rev Author: rthurner Date: 2010-01-03 11:12:01 +0000 (Sun, 03 Jan 2010) Log Message: ----------- remove configuration layout not used any more Removed Paths: ------------- csw/mgar/pkg/apr/trunk/files/config.layout Deleted: csw/mgar/pkg/apr/trunk/files/config.layout =================================================================== --- csw/mgar/pkg/apr/trunk/files/config.layout 2010-01-03 08:30:23 UTC (rev 7841) +++ csw/mgar/pkg/apr/trunk/files/config.layout 2010-01-03 11:12:01 UTC (rev 7842) @@ -1,249 +0,0 @@ -## -## config.layout -- Pre-defined Installation Path Layouts -## -## Hints: -## - layouts can be loaded with configure's --enable-layout=ID option -## - when no --enable-layout option is given, the default layout is `apr' -## - a trailing plus character (`+') on paths is replaced with a -## `/' suffix where is currently hardcoded to 'apr'. -## (This may become a configurable parameter at some point.) -## - -# Classical APR path layout designed for parallel installs. - - prefix: /usr/local/apr - exec_prefix: ${prefix} - bindir: ${exec_prefix}/bin - sbindir: ${exec_prefix}/bin - libdir: ${exec_prefix}/lib - libexecdir: ${exec_prefix}/modules - mandir: ${prefix}/man - sysconfdir: ${prefix}/conf - datadir: ${prefix} - installbuilddir: ${datadir}/build - includedir: ${prefix}/include/apr-${APR_MAJOR_VERSION} - localstatedir: ${prefix} - libsuffix: -${APR_MAJOR_VERSION} - - -# Classical single-installation APR path layout. - - prefix: /usr/local/apr - exec_prefix: ${prefix} - bindir: ${exec_prefix}/bin - sbindir: ${exec_prefix}/bin - libdir: ${exec_prefix}/lib - libexecdir: ${exec_prefix}/modules - mandir: ${prefix}/man - sysconfdir: ${prefix}/conf - datadir: ${prefix} - installbuilddir: ${datadir}/build - includedir: ${prefix}/include - localstatedir: ${prefix} - - -# GNU standards conforming path layout. -# See FSF's GNU project `make-stds' document for details. - - prefix: /usr/local - exec_prefix: ${prefix} - bindir: ${exec_prefix}/bin - sbindir: ${exec_prefix}/sbin - libdir: ${exec_prefix}/lib - libexecdir: ${exec_prefix}/libexec - mandir: ${prefix}/man - sysconfdir: ${prefix}/etc+ - datadir: ${prefix}/share+ - installbuilddir: ${datadir}/build - includedir: ${prefix}/include+ - localstatedir: ${prefix}/var+ - runtimedir: ${localstatedir}/run - - -# Mac OS X Server (Rhapsody) - - prefix: /Local/Library/WebServer - exec_prefix: /usr - bindir: ${exec_prefix}/bin - sbindir: ${exec_prefix}/sbin - libdir: ${exec_prefix}/lib - libexecdir: /System/Library/apr/Modules - mandir: ${exec_prefix}/share/man - sysconfdir: ${prefix}/Configuration - datadir: ${prefix} - installbuilddir: /System/Library/apr/Build - includedir: /System/Library/Frameworks/apr.framework/Versions/2.0/Headers - localstatedir: /var - runtimedir: ${prefix}/Logs - - -# Darwin/Mac OS Layout - - prefix: /usr - exec_prefix: ${prefix} - bindir: ${exec_prefix}/bin - sbindir: ${exec_prefix}/sbin - libdir: ${exec_prefix}/lib - libexecdir: ${exec_prefix}/libexec+ - mandir: ${prefix}/share/man - datadir: /Library/WebServer - sysconfdir: /etc+ - installbuilddir: ${prefix}/share/httpd/build - includedir: ${prefix}/include+ - localstatedir: /var - runtimedir: ${localstatedir}/run - - -# Red Hat Linux 7.x layout - - prefix: /usr - exec_prefix: ${prefix} - bindir: ${prefix}/bin - sbindir: ${prefix}/sbin - libdir: ${prefix}/lib - libexecdir: ${prefix}/lib/apr - mandir: ${prefix}/man - sysconfdir: /etc/httpd/conf - datadir: /var/www - installbuilddir: ${datadir}/build - includedir: ${prefix}/include/apr - localstatedir: /var - runtimedir: ${localstatedir}/run - - -# According to the /opt filesystem conventions - - prefix: /opt/apr - exec_prefix: ${prefix} - bindir: ${exec_prefix}/bin - sbindir: ${exec_prefix}/sbin - libdir: ${exec_prefix}/lib - libexecdir: ${exec_prefix}/libexec - mandir: ${prefix}/man - sysconfdir: /etc${prefix} - datadir: ${prefix}/share - installbuilddir: ${datadir}/build - includedir: ${prefix}/include - localstatedir: /var${prefix} - runtimedir: ${localstatedir}/run - - -# BeOS layout... - - prefix: /boot/home/apr - exec_prefix: ${prefix} - bindir: ${exec_prefix}/bin - sbindir: ${exec_prefix}/bin - libdir: ${exec_prefix}/lib - libexecdir: ${exec_prefix}/libexec - mandir: ${prefix}/man - sysconfdir: ${prefix}/conf - datadir: ${prefix} - installbuilddir: ${datadir}/build - includedir: ${prefix}/include - localstatedir: ${prefix} - runtimedir: ${localstatedir}/logs - - -# SuSE 6.x layout - - prefix: /usr - exec_prefix: ${prefix} - bindir: ${prefix}/bin - sbindir: ${prefix}/sbin - libdir: ${prefix}/lib - libexecdir: ${prefix}/lib/apr - mandir: ${prefix}/share/man - sysconfdir: /etc/httpd - datadir: /usr/local/httpd - installbuilddir: ${datadir}/build - includedir: ${prefix}/include/apr - localstatedir: /var/lib/httpd - runtimedir: /var/run - - -# BSD/OS layout - - prefix: /var/www - exec_prefix: /usr/contrib - bindir: ${exec_prefix}/bin - sbindir: ${exec_prefix}/bin - libdir: ${exec_prefix}/lib - libexecdir: ${exec_prefix}/libexec/apr - mandir: ${exec_prefix}/man - sysconfdir: ${prefix}/conf - datadir: ${prefix} - installbuilddir: ${datadir}/build - includedir: ${exec_prefix}/include/apr - localstatedir: /var - runtimedir: ${localstatedir}/run - - -# Solaris 8 Layout - - prefix: /usr/apr - exec_prefix: ${prefix} - bindir: ${exec_prefix}/bin - sbindir: ${exec_prefix}/bin - libdir: ${exec_prefix}/lib - libexecdir: ${exec_prefix}/libexec - mandir: ${exec_prefix}/man - sysconfdir: /etc/apr - datadir: /var/apr - installbuilddir: ${datadir}/build - includedir: ${exec_prefix}/include - localstatedir: ${prefix} - runtimedir: /var/run - - -# OpenBSD Layout - - prefix: /var/www - exec_prefix: /usr - bindir: ${exec_prefix}/bin - sbindir: ${exec_prefix}/sbin - libdir: ${exec_prefix}/lib - libexecdir: ${exec_prefix}/lib/apr/modules - mandir: ${exec_prefix}/share/man - sysconfdir: ${prefix}/conf - datadir: ${prefix} - installbuilddir: ${prefix}/build - includedir: ${exec_prefix}/lib/apr/include - localstatedir: ${prefix} - runtimedir: ${prefix}/logs - - -# Debian layout - - prefix: - exec_prefix: ${prefix}/usr - bindir: ${exec_prefix}/bin - sbindir: ${exec_prefix}/sbin - libdir: ${exec_prefix}/lib - libexecdir: ${exec_prefix}/lib/apr/modules - mandir: ${exec_prefix}/share/man - datadir: ${exec_prefix}/share/apr - includedir: ${exec_prefix}/include/apr-${APR_MAJOR_VERSION} - localstatedir: ${prefix}/var/run - runtimedir: ${prefix}/var/run - infodir: ${exec_prefix}/share/info - libsuffix: -${APR_MAJOR_VERSION} - - -# csw layout - - prefix: INSTALL_PREFIX - exec_prefix: ${prefix} - bindir: ${exec_prefix}/bin - sbindir: ${exec_prefix}/sbin - libdir: ${exec_prefix}/lib - libexecdir: ${exec_prefix}/lib/apr/modules - mandir: ${exec_prefix}/share/man - datadir: ${exec_prefix}/share/apr - includedir: ${exec_prefix}/include/apr-${APR_MAJOR_VERSION} - localstatedir: ${prefix}/var/run - runtimedir: ${prefix}/var/run - infodir: ${exec_prefix}/share/info - libsuffix: -${APR_MAJOR_VERSION} - - This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Sun Jan 3 13:11:11 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sun, 03 Jan 2010 12:11:11 +0000 Subject: [csw-devel] SF.net SVN: gar:[7843] csw/mgar/pkg/template/trunk Message-ID: Revision: 7843 http://gar.svn.sourceforge.net/gar/?rev=7843&view=rev Author: wahwah Date: 2010-01-03 12:11:11 +0000 (Sun, 03 Jan 2010) Log Message: ----------- template: Reverting to the template Modified Paths: -------------- csw/mgar/pkg/template/trunk/Makefile Property Changed: ---------------- csw/mgar/pkg/template/trunk/ Property changes on: csw/mgar/pkg/template/trunk ___________________________________________________________________ Modified: svn:externals - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2-checkpkg + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 Modified: csw/mgar/pkg/template/trunk/Makefile =================================================================== --- csw/mgar/pkg/template/trunk/Makefile 2010-01-03 11:12:01 UTC (rev 7842) +++ csw/mgar/pkg/template/trunk/Makefile 2010-01-03 12:11:11 UTC (rev 7843) @@ -2,62 +2,184 @@ # Distributed under the terms of the GNU General Public License v2 # $Id$ -GARNAME = oracle -GARVERSION = 10.2.0 -CATEGORIES = apps +## This file contains comments to guide you through various GAR settings. +## Please remove unnecessary comments before committing your code to the code +## repository. The comments to remove are marked with double hashes. +## If you want to remove them all in-place, use: +## gsed -i -e '/^##/d' Makefile +## +## For more information about GAR variables, please see: +## https://sourceforge.net/apps/trac/gar/wiki/GAR%20Variable%20Reference +## +GARNAME = mypkg +GARVERSION = 1.0 +## +## The category that your software fits in. This is not a descriptive field, but +## influences the build process. Depending on the CATEGORIES setting, different +## Makefiles are included from gar/categories/ in your trunk directory, which +## adjust the build settings for the respective category. +## +## Possible settings are: +## apps, cpan, devel, gnome, java, kde, lang, lib, meta, net, python, server, +## utils, x11, xfce, xorg, xtra +CATEGORIES = lib +## +## A one-line description of the package, which will appear in the pkginfo. +DESCRIPTION = +## +## A longer description of the package. This is only for descriptive purposes +## inside the Makefile and is not used elsewhere. define BLURB + endef +## +## Upstream URL that should show up in the VENDOR field as well as on +## http://opencsw.org/packages/. SPKG_SOURCEURL = +## +## Whitespace-separated list of URLs to download the source package from. +## There are presets: $(SF_MIRRORS), $(GNU_MIRRORS) and $(GOOGLE_MIRROR). MASTER_SITES = -DISTFILES = -CONFIGURE_SCRIPTS = -BUILD_SCRIPTS = -INSTALL_SCRIPTS = oracle -TEST_SCRIPTS = +## +## SF_PROJ is required if you set $(MASTER_SITES) to $(SF_MIRRORS) and the +## Sourceforge project name differs from $(GARNAME). Specifies the Sourceforge +## project name of the software you wish to download. +## SF_PROJ = +## +## A list of space separated patch filenames from files/ that are to be applied +## to the extracted software before the ./configure stage. Patches need to be +## included in the DISTFILES variable as well. +## PATCHFILES = +## +## Whitespace-separated list of files which comprise this build. mGAR will look +## for the files in the $(FILEDIR) (trunk/files) directory and on the +## $(MASTER_SITES). +DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz +## +## We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz +## +## Catalog name is the name to be used with pkg{-get,util} -i . +## It is different from the system package name, which by convention is CSWpkgname. +## CATALOGNAME = +## +## Set to 1 to mark the package as architecture-independent. +## ARCHALL = 0 +## +## A list of files / patterns that should be excluded from the package. Amends +## the default list of excluded filenames $(MERGE_EXCLUDE_DEFAULT), which +## contains things like libtool .la files and files with a leading ~. +## EXTRA_MERGE_EXCLUDE_FILES = +## +## A list of space separated package names that should be marked as +## incompatible with the current package. This will go into the depend file. +## When a user has one of the incompatible packages installed and installs +## your package, he will be prompted that the incompatible package must be +## removed. He will however not be prevented to install your package without +## removing the conflicting package first. +## INCOMPATIBLE_PKGS = +## +## The name of the license file that should be included in your package. Defaults +## to COPYING. See http://sourceforge.net/apps/trac/gar/wiki/CopyRightfor details +## on including and displaying licenses. +## LICENSE = +## +## A list of space separated package names that should be produced from your +## Makefile. This is used when a software has different components that can be +## packaged and used individually (think runtime libraries, client tools, server +## files, development headers). You don't need to set this when you just want to +## produce one package. +## +## When you set this variable to include more than one package, you also need to +## set PKGFILES_CSWpkgname for each package (except for the first one in your +## $(PACKAGES) list) to define which files go into each package. The first +## package from $(PACKAGES) one will hold all files that are not matched by +## PKGFILES_ for other packages. +## PACKAGES = +## +## If specified, GAR feeds the almost-final package prototype file to +## $(PROTOTYPE_FILTER) and reads the final package prototype file from it. +## $(PROTOTYPE_FILTER) is usually a sed/awk/perl one-liner, which was mostly used +## to prepare the prototype file for use with cswclassutils (see +## $(SPKG_CLASSES)). Now that there are convenience variables for cswclassutils, +## you will rarely have to use this. A still valid use case would be to change +## the file permissions of a file to be set-UID. +## See http://wiki.opencsw.org/cswclassutils-package for common usage information +## PROTOTYPE_FILTER = +## +## cswclassutils settings +## +## A list of action classes. Possible values are: +## none cswpreserveconf cswcpsampleconf cswpycompile cswusergroup cswinitsmf +## cswinetd cswetcservices +## The class 'cswinitsmf' must be the last class listed. When you use cswclassutils, +## you need to add CSWcswclassutils to REQUIRED_PKGS. +## SPKG_CLASSES = none +## Simplified settings for classes: +## PRESERVECONF = +## SAMPLECONF = +## INITSMF = +## USERGROUP = +## ETCSERVICES = +## INETDCONF = +## A list of runtime package dependencies in the form of CSWfoo. +## REQUIRED_PKGS = +## +## A list of packages necessary to build this package +## PREREQUISITE_PKGS = $(REQUIRED_PKGS) +## +## When using non-empty $(PACKAGES): +## REQUIRED_PKGS_CSWpkgname = +## SPKG_DESC_CSWpkgname = +## PKGFILES_CSWpkgname = +## CATALOGNAME_CSWpkgname = +## +## A list of space separated directories where objects should be stripped in +## addition to the bin/ and sbin/ directories. +## STRIP_DIRS = +## +## Define a custom target for the configure phase. When you set this, the target +## that will be used instead of configure: target, is named +## configure-$(CONFIGURE_SCRIPTS) and you will need to define it in your Makefile +## after including gar/gar.include.mk. If you want to skip the configure phase +## completely (for example when your software doesn't need to be compiled) assign +## this variable an empty value. The procedure works for configure, build, +## install and test steps. +## CONFIGURE_SCRIPTS = +## BUILD_SCRIPTS = +## INSTALL_SCRIPTS = +## TEST_SCRIPTS = +## +## Compilation settings +## +## The build directory. +## WORKSRC = $(WORKDIR)/$(GARNAME)-$(GARVERSION) +## +## BUILD_ARGS is passed as an argument to gmake during the build phase. Use this +## for example, if you need to override Makefile variables. +## BUILD_ARGS = +## +## Arguments passed to the ./configure script. +CONFIGURE_ARGS = $(DIRPATHS) +## +## BUILD64 = +## CONFIGURE_ENV = +## EXTRA_CFLAGS = +## EXTRA_LDFLAGS = +## EXTRA_INC = +## EXTRA_LIB = +## GARFLAVOR = +## INSTALL_ARGS = +## OPT_FLAGS_SOS = -xO3 +## OPT_FLAGS_GCC = -O2 -pipe +## +## The compiler to use. Defaults to SOS11, can be also: SOS12, GCC3, GCC4. +## GARCOMPILER = SOS11 +## +# Remove the following rules and uncomment the +# include before building. +all: .DEFAULT +.DEFAULT: + @true -prefix = /opt/oracle - -PACKAGES = CSWoracle -CATALOGNAME_CSWoracle = oracle -SPKG_DESC_CSWoracle = The Oracle database - -REQUIRED_PKGS = -# Maybe CSWunixodbc, but how would it know how to locate the shared library? - -PROTOTYPE_FILTER = awk '$$$$3 ~/\/extjob$$$$/ \ - { $$$$4 = 3755; $$$$5 = "nobody"; $$$$6 = "nobody" } \ - { print }' - -ORACLE_HOME = $(prefix)/product/$(GARVERSION)/Db_1 - -include gar/category.mk - -install-oracle: - ginstall -m 755 -d $(DESTDIR)$(prefix) - @$(MAKECOOKIE) - -post-merge: - # This takes a really long time. - gtar -cf - -C $(prefix) . | gtar -xpf - -C $(PKGROOT)$(prefix) - # echo foo > $(PKGROOT)$(prefix)/bar - grm -fv $(PKGROOT)$(ORACLE_HOME)/inventory/Templates/perl/lib/5.8.3/sun4-solaris-thread-multi/perllocal.pod - grm -fv $(PKGROOT)$(ORACLE_HOME)/perl/lib/5.8.3/sun4-solaris-thread-multi/perllocal.pod - # Removing shared libraries, because they depend on other shared - # libraries that aren't there. - grm -fv $(PKGROOT)$(ORACLE_HOME)/lib32/libnnzentr10.so - grm -fv $(PKGROOT)$(ORACLE_HOME)/lib/libcxa.so.3 - grm -fv $(PKGROOT)$(ORACLE_HOME)/bin/rtsora32 - grm -fv $(PKGROOT)$(ORACLE_HOME)/lib32/hsdb_inf.so - grm -fv $(PKGROOT)$(ORACLE_HOME)/lib/hsdb_inf.so - grm -fv $(PKGROOT)$(ORACLE_HOME)/lib32/hsdb_syb.so - grm -fv $(PKGROOT)$(ORACLE_HOME)/lib/hsdb_syb.so - grm -fv $(PKGROOT)$(ORACLE_HOME)/jre/1.4.2/lib/sparcv9/libJdbcOdbc.so - grm -fv $(PKGROOT)$(ORACLE_HOME)/jre/1.4.2/lib/sparc/libJdbcOdbc.so - grm -fv $(PKGROOT)$(ORACLE_HOME)/jdk/jre/lib/sparcv9/libJdbcOdbc.so - grm -fv $(PKGROOT)$(ORACLE_HOME)/jdk/jre/lib/sparc/libJdbcOdbc.so - grm -fv $(PKGROOT)$(ORACLE_HOME)/lib/libcoresh10.so - grm -fv $(PKGROOT)$(ORACLE_HOME)/lib32/libsqora.so.10.1 - grm -fv $(PKGROOT)$(ORACLE_HOME)/lib/libsqora.so.10.1 - grm -fv $(PKGROOT)$(ORACLE_HOME)/ctx/lib/libxml4c.so.54.0 - grm -fv $(PKGROOT)$(ORACLE_HOME)/ctx/lib/xmllib.so - @$(MAKECOOKIE) +#include gar/category.mk This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Sun Jan 3 13:12:55 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sun, 03 Jan 2010 12:12:55 +0000 Subject: [csw-devel] SF.net SVN: gar:[7844] csw/mgar/pkg Message-ID: Revision: 7844 http://gar.svn.sourceforge.net/gar/?rev=7844&view=rev Author: wahwah Date: 2010-01-03 12:12:52 +0000 (Sun, 03 Jan 2010) Log Message: ----------- oracle: Initial commit Modified Paths: -------------- csw/mgar/pkg/oracle/trunk/Makefile Added Paths: ----------- csw/mgar/pkg/oracle/ csw/mgar/pkg/oracle/trunk/ csw/mgar/pkg/oracle/trunk/checksums csw/mgar/pkg/oracle/trunk/files/ Removed Paths: ------------- csw/mgar/pkg/oracle/trunk/ csw/mgar/pkg/oracle/trunk/checksums csw/mgar/pkg/oracle/trunk/files/ Modified: csw/mgar/pkg/oracle/trunk/Makefile =================================================================== --- csw/mgar/pkg/template/trunk/Makefile 2010-01-03 12:11:11 UTC (rev 7843) +++ csw/mgar/pkg/oracle/trunk/Makefile 2010-01-03 12:12:52 UTC (rev 7844) @@ -2,184 +2,62 @@ # Distributed under the terms of the GNU General Public License v2 # $Id$ -## This file contains comments to guide you through various GAR settings. -## Please remove unnecessary comments before committing your code to the code -## repository. The comments to remove are marked with double hashes. -## If you want to remove them all in-place, use: -## gsed -i -e '/^##/d' Makefile -## -## For more information about GAR variables, please see: -## https://sourceforge.net/apps/trac/gar/wiki/GAR%20Variable%20Reference -## -GARNAME = mypkg -GARVERSION = 1.0 -## -## The category that your software fits in. This is not a descriptive field, but -## influences the build process. Depending on the CATEGORIES setting, different -## Makefiles are included from gar/categories/ in your trunk directory, which -## adjust the build settings for the respective category. -## -## Possible settings are: -## apps, cpan, devel, gnome, java, kde, lang, lib, meta, net, python, server, -## utils, x11, xfce, xorg, xtra -CATEGORIES = lib -## -## A one-line description of the package, which will appear in the pkginfo. -DESCRIPTION = -## -## A longer description of the package. This is only for descriptive purposes -## inside the Makefile and is not used elsewhere. +GARNAME = oracle +GARVERSION = 10.2.0 +CATEGORIES = apps define BLURB - endef -## -## Upstream URL that should show up in the VENDOR field as well as on -## http://opencsw.org/packages/. SPKG_SOURCEURL = -## -## Whitespace-separated list of URLs to download the source package from. -## There are presets: $(SF_MIRRORS), $(GNU_MIRRORS) and $(GOOGLE_MIRROR). MASTER_SITES = -## -## SF_PROJ is required if you set $(MASTER_SITES) to $(SF_MIRRORS) and the -## Sourceforge project name differs from $(GARNAME). Specifies the Sourceforge -## project name of the software you wish to download. -## SF_PROJ = -## -## A list of space separated patch filenames from files/ that are to be applied -## to the extracted software before the ./configure stage. Patches need to be -## included in the DISTFILES variable as well. -## PATCHFILES = -## -## Whitespace-separated list of files which comprise this build. mGAR will look -## for the files in the $(FILEDIR) (trunk/files) directory and on the -## $(MASTER_SITES). -DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz -## -## We define upstream file regex so we can be notifed of new upstream software release -UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz -## -## Catalog name is the name to be used with pkg{-get,util} -i . -## It is different from the system package name, which by convention is CSWpkgname. -## CATALOGNAME = -## -## Set to 1 to mark the package as architecture-independent. -## ARCHALL = 0 -## -## A list of files / patterns that should be excluded from the package. Amends -## the default list of excluded filenames $(MERGE_EXCLUDE_DEFAULT), which -## contains things like libtool .la files and files with a leading ~. -## EXTRA_MERGE_EXCLUDE_FILES = -## -## A list of space separated package names that should be marked as -## incompatible with the current package. This will go into the depend file. -## When a user has one of the incompatible packages installed and installs -## your package, he will be prompted that the incompatible package must be -## removed. He will however not be prevented to install your package without -## removing the conflicting package first. -## INCOMPATIBLE_PKGS = -## -## The name of the license file that should be included in your package. Defaults -## to COPYING. See http://sourceforge.net/apps/trac/gar/wiki/CopyRightfor details -## on including and displaying licenses. -## LICENSE = -## -## A list of space separated package names that should be produced from your -## Makefile. This is used when a software has different components that can be -## packaged and used individually (think runtime libraries, client tools, server -## files, development headers). You don't need to set this when you just want to -## produce one package. -## -## When you set this variable to include more than one package, you also need to -## set PKGFILES_CSWpkgname for each package (except for the first one in your -## $(PACKAGES) list) to define which files go into each package. The first -## package from $(PACKAGES) one will hold all files that are not matched by -## PKGFILES_ for other packages. -## PACKAGES = -## -## If specified, GAR feeds the almost-final package prototype file to -## $(PROTOTYPE_FILTER) and reads the final package prototype file from it. -## $(PROTOTYPE_FILTER) is usually a sed/awk/perl one-liner, which was mostly used -## to prepare the prototype file for use with cswclassutils (see -## $(SPKG_CLASSES)). Now that there are convenience variables for cswclassutils, -## you will rarely have to use this. A still valid use case would be to change -## the file permissions of a file to be set-UID. -## See http://wiki.opencsw.org/cswclassutils-package for common usage information -## PROTOTYPE_FILTER = -## -## cswclassutils settings -## -## A list of action classes. Possible values are: -## none cswpreserveconf cswcpsampleconf cswpycompile cswusergroup cswinitsmf -## cswinetd cswetcservices -## The class 'cswinitsmf' must be the last class listed. When you use cswclassutils, -## you need to add CSWcswclassutils to REQUIRED_PKGS. -## SPKG_CLASSES = none -## Simplified settings for classes: -## PRESERVECONF = -## SAMPLECONF = -## INITSMF = -## USERGROUP = -## ETCSERVICES = -## INETDCONF = -## A list of runtime package dependencies in the form of CSWfoo. -## REQUIRED_PKGS = -## -## A list of packages necessary to build this package -## PREREQUISITE_PKGS = $(REQUIRED_PKGS) -## -## When using non-empty $(PACKAGES): -## REQUIRED_PKGS_CSWpkgname = -## SPKG_DESC_CSWpkgname = -## PKGFILES_CSWpkgname = -## CATALOGNAME_CSWpkgname = -## -## A list of space separated directories where objects should be stripped in -## addition to the bin/ and sbin/ directories. -## STRIP_DIRS = -## -## Define a custom target for the configure phase. When you set this, the target -## that will be used instead of configure: target, is named -## configure-$(CONFIGURE_SCRIPTS) and you will need to define it in your Makefile -## after including gar/gar.include.mk. If you want to skip the configure phase -## completely (for example when your software doesn't need to be compiled) assign -## this variable an empty value. The procedure works for configure, build, -## install and test steps. -## CONFIGURE_SCRIPTS = -## BUILD_SCRIPTS = -## INSTALL_SCRIPTS = -## TEST_SCRIPTS = -## -## Compilation settings -## -## The build directory. -## WORKSRC = $(WORKDIR)/$(GARNAME)-$(GARVERSION) -## -## BUILD_ARGS is passed as an argument to gmake during the build phase. Use this -## for example, if you need to override Makefile variables. -## BUILD_ARGS = -## -## Arguments passed to the ./configure script. -CONFIGURE_ARGS = $(DIRPATHS) -## -## BUILD64 = -## CONFIGURE_ENV = -## EXTRA_CFLAGS = -## EXTRA_LDFLAGS = -## EXTRA_INC = -## EXTRA_LIB = -## GARFLAVOR = -## INSTALL_ARGS = -## OPT_FLAGS_SOS = -xO3 -## OPT_FLAGS_GCC = -O2 -pipe -## -## The compiler to use. Defaults to SOS11, can be also: SOS12, GCC3, GCC4. -## GARCOMPILER = SOS11 -## -# Remove the following rules and uncomment the -# include before building. -all: .DEFAULT -.DEFAULT: - @true +DISTFILES = +CONFIGURE_SCRIPTS = +BUILD_SCRIPTS = +INSTALL_SCRIPTS = oracle +TEST_SCRIPTS = -#include gar/category.mk +prefix = /opt/oracle + +PACKAGES = CSWoracle +CATALOGNAME_CSWoracle = oracle +SPKG_DESC_CSWoracle = The Oracle database + +REQUIRED_PKGS = +# Maybe CSWunixodbc, but how would it know how to locate the shared library? + +PROTOTYPE_FILTER = awk '$$$$3 ~/\/extjob$$$$/ \ + { $$$$4 = 3755; $$$$5 = "nobody"; $$$$6 = "nobody" } \ + { print }' + +ORACLE_HOME = $(prefix)/product/$(GARVERSION)/Db_1 + +include gar/category.mk + +install-oracle: + ginstall -m 755 -d $(DESTDIR)$(prefix) + @$(MAKECOOKIE) + +post-merge: + # This takes a really long time. + gtar -cf - -C $(prefix) . | gtar -xpf - -C $(PKGROOT)$(prefix) + # echo foo > $(PKGROOT)$(prefix)/bar + grm -fv $(PKGROOT)$(ORACLE_HOME)/inventory/Templates/perl/lib/5.8.3/sun4-solaris-thread-multi/perllocal.pod + grm -fv $(PKGROOT)$(ORACLE_HOME)/perl/lib/5.8.3/sun4-solaris-thread-multi/perllocal.pod + # Removing shared libraries, because they depend on other shared + # libraries that aren't there. + grm -fv $(PKGROOT)$(ORACLE_HOME)/lib32/libnnzentr10.so + grm -fv $(PKGROOT)$(ORACLE_HOME)/lib/libcxa.so.3 + grm -fv $(PKGROOT)$(ORACLE_HOME)/bin/rtsora32 + grm -fv $(PKGROOT)$(ORACLE_HOME)/lib32/hsdb_inf.so + grm -fv $(PKGROOT)$(ORACLE_HOME)/lib/hsdb_inf.so + grm -fv $(PKGROOT)$(ORACLE_HOME)/lib32/hsdb_syb.so + grm -fv $(PKGROOT)$(ORACLE_HOME)/lib/hsdb_syb.so + grm -fv $(PKGROOT)$(ORACLE_HOME)/jre/1.4.2/lib/sparcv9/libJdbcOdbc.so + grm -fv $(PKGROOT)$(ORACLE_HOME)/jre/1.4.2/lib/sparc/libJdbcOdbc.so + grm -fv $(PKGROOT)$(ORACLE_HOME)/jdk/jre/lib/sparcv9/libJdbcOdbc.so + grm -fv $(PKGROOT)$(ORACLE_HOME)/jdk/jre/lib/sparc/libJdbcOdbc.so + grm -fv $(PKGROOT)$(ORACLE_HOME)/lib/libcoresh10.so + grm -fv $(PKGROOT)$(ORACLE_HOME)/lib32/libsqora.so.10.1 + grm -fv $(PKGROOT)$(ORACLE_HOME)/lib/libsqora.so.10.1 + grm -fv $(PKGROOT)$(ORACLE_HOME)/ctx/lib/libxml4c.so.54.0 + grm -fv $(PKGROOT)$(ORACLE_HOME)/ctx/lib/xmllib.so + @$(MAKECOOKIE) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Sun Jan 3 14:41:40 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sun, 03 Jan 2010 13:41:40 +0000 Subject: [csw-devel] SF.net SVN: gar:[7845] csw/mgar/pkg/examples Message-ID: Revision: 7845 http://gar.svn.sourceforge.net/gar/?rev=7845&view=rev Author: wahwah Date: 2010-01-03 13:41:40 +0000 (Sun, 03 Jan 2010) Log Message: ----------- examples/users-and-groups: Initial commit Modified Paths: -------------- csw/mgar/pkg/examples/users-and-groups/trunk/Makefile Added Paths: ----------- csw/mgar/pkg/examples/users-and-groups/ csw/mgar/pkg/examples/users-and-groups/trunk/ csw/mgar/pkg/examples/users-and-groups/trunk/checksums csw/mgar/pkg/examples/users-and-groups/trunk/files/ Removed Paths: ------------- csw/mgar/pkg/examples/users-and-groups/trunk/ csw/mgar/pkg/examples/users-and-groups/trunk/checksums csw/mgar/pkg/examples/users-and-groups/trunk/files/ Modified: csw/mgar/pkg/examples/users-and-groups/trunk/Makefile =================================================================== --- csw/mgar/pkg/template/trunk/Makefile 2010-01-03 12:11:11 UTC (rev 7843) +++ csw/mgar/pkg/examples/users-and-groups/trunk/Makefile 2010-01-03 13:41:40 UTC (rev 7845) @@ -2,184 +2,50 @@ # Distributed under the terms of the GNU General Public License v2 # $Id$ -## This file contains comments to guide you through various GAR settings. -## Please remove unnecessary comments before committing your code to the code -## repository. The comments to remove are marked with double hashes. -## If you want to remove them all in-place, use: -## gsed -i -e '/^##/d' Makefile -## -## For more information about GAR variables, please see: -## https://sourceforge.net/apps/trac/gar/wiki/GAR%20Variable%20Reference -## -GARNAME = mypkg -GARVERSION = 1.0 -## -## The category that your software fits in. This is not a descriptive field, but -## influences the build process. Depending on the CATEGORIES setting, different -## Makefiles are included from gar/categories/ in your trunk directory, which -## adjust the build settings for the respective category. -## -## Possible settings are: -## apps, cpan, devel, gnome, java, kde, lang, lib, meta, net, python, server, -## utils, x11, xfce, xorg, xtra +# => Installing CSWusers-and-groups-0.1,REV=2010.01.03 +# pkgadd: ERROR: unable to create package object . +# pathname does not exist +# group name not found in group table(s) +# owner name not found in passwd table(s) +# ERROR: attribute verification of failed +# group name not found in group table(s) +# owner name not found in passwd table(s) +# Installing class ... +# Group cswgroup has been added +# User cswuser has been added + + +GARNAME = users_and_groups +GARVERSION = 0.1 CATEGORIES = lib -## -## A one-line description of the package, which will appear in the pkginfo. -DESCRIPTION = -## -## A longer description of the package. This is only for descriptive purposes -## inside the Makefile and is not used elsewhere. +DESCRIPTION = An example build adding users, groups and files owned by them define BLURB - endef -## -## Upstream URL that should show up in the VENDOR field as well as on -## http://opencsw.org/packages/. -SPKG_SOURCEURL = -## -## Whitespace-separated list of URLs to download the source package from. -## There are presets: $(SF_MIRRORS), $(GNU_MIRRORS) and $(GOOGLE_MIRROR). MASTER_SITES = -## -## SF_PROJ is required if you set $(MASTER_SITES) to $(SF_MIRRORS) and the -## Sourceforge project name differs from $(GARNAME). Specifies the Sourceforge -## project name of the software you wish to download. -## SF_PROJ = -## -## A list of space separated patch filenames from files/ that are to be applied -## to the extracted software before the ./configure stage. Patches need to be -## included in the DISTFILES variable as well. -## PATCHFILES = -## -## Whitespace-separated list of files which comprise this build. mGAR will look -## for the files in the $(FILEDIR) (trunk/files) directory and on the -## $(MASTER_SITES). -DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz -## -## We define upstream file regex so we can be notifed of new upstream software release -UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz -## -## Catalog name is the name to be used with pkg{-get,util} -i . -## It is different from the system package name, which by convention is CSWpkgname. -## CATALOGNAME = -## -## Set to 1 to mark the package as architecture-independent. -## ARCHALL = 0 -## -## A list of files / patterns that should be excluded from the package. Amends -## the default list of excluded filenames $(MERGE_EXCLUDE_DEFAULT), which -## contains things like libtool .la files and files with a leading ~. -## EXTRA_MERGE_EXCLUDE_FILES = -## -## A list of space separated package names that should be marked as -## incompatible with the current package. This will go into the depend file. -## When a user has one of the incompatible packages installed and installs -## your package, he will be prompted that the incompatible package must be -## removed. He will however not be prevented to install your package without -## removing the conflicting package first. -## INCOMPATIBLE_PKGS = -## -## The name of the license file that should be included in your package. Defaults -## to COPYING. See http://sourceforge.net/apps/trac/gar/wiki/CopyRightfor details -## on including and displaying licenses. -## LICENSE = -## -## A list of space separated package names that should be produced from your -## Makefile. This is used when a software has different components that can be -## packaged and used individually (think runtime libraries, client tools, server -## files, development headers). You don't need to set this when you just want to -## produce one package. -## -## When you set this variable to include more than one package, you also need to -## set PKGFILES_CSWpkgname for each package (except for the first one in your -## $(PACKAGES) list) to define which files go into each package. The first -## package from $(PACKAGES) one will hold all files that are not matched by -## PKGFILES_ for other packages. -## PACKAGES = -## -## If specified, GAR feeds the almost-final package prototype file to -## $(PROTOTYPE_FILTER) and reads the final package prototype file from it. -## $(PROTOTYPE_FILTER) is usually a sed/awk/perl one-liner, which was mostly used -## to prepare the prototype file for use with cswclassutils (see -## $(SPKG_CLASSES)). Now that there are convenience variables for cswclassutils, -## you will rarely have to use this. A still valid use case would be to change -## the file permissions of a file to be set-UID. -## See http://wiki.opencsw.org/cswclassutils-package for common usage information -## PROTOTYPE_FILTER = -## -## cswclassutils settings -## -## A list of action classes. Possible values are: -## none cswpreserveconf cswcpsampleconf cswpycompile cswusergroup cswinitsmf -## cswinetd cswetcservices -## The class 'cswinitsmf' must be the last class listed. When you use cswclassutils, -## you need to add CSWcswclassutils to REQUIRED_PKGS. -## SPKG_CLASSES = none -## Simplified settings for classes: -## PRESERVECONF = -## SAMPLECONF = -## INITSMF = -## USERGROUP = -## ETCSERVICES = -## INETDCONF = -## A list of runtime package dependencies in the form of CSWfoo. -## REQUIRED_PKGS = -## -## A list of packages necessary to build this package -## PREREQUISITE_PKGS = $(REQUIRED_PKGS) -## -## When using non-empty $(PACKAGES): -## REQUIRED_PKGS_CSWpkgname = -## SPKG_DESC_CSWpkgname = -## PKGFILES_CSWpkgname = -## CATALOGNAME_CSWpkgname = -## -## A list of space separated directories where objects should be stripped in -## addition to the bin/ and sbin/ directories. -## STRIP_DIRS = -## -## Define a custom target for the configure phase. When you set this, the target -## that will be used instead of configure: target, is named -## configure-$(CONFIGURE_SCRIPTS) and you will need to define it in your Makefile -## after including gar/gar.include.mk. If you want to skip the configure phase -## completely (for example when your software doesn't need to be compiled) assign -## this variable an empty value. The procedure works for configure, build, -## install and test steps. -## CONFIGURE_SCRIPTS = -## BUILD_SCRIPTS = -## INSTALL_SCRIPTS = -## TEST_SCRIPTS = -## -## Compilation settings -## -## The build directory. -## WORKSRC = $(WORKDIR)/$(GARNAME)-$(GARVERSION) -## -## BUILD_ARGS is passed as an argument to gmake during the build phase. Use this -## for example, if you need to override Makefile variables. -## BUILD_ARGS = -## -## Arguments passed to the ./configure script. -CONFIGURE_ARGS = $(DIRPATHS) -## -## BUILD64 = -## CONFIGURE_ENV = -## EXTRA_CFLAGS = -## EXTRA_LDFLAGS = -## EXTRA_INC = -## EXTRA_LIB = -## GARFLAVOR = -## INSTALL_ARGS = -## OPT_FLAGS_SOS = -xO3 -## OPT_FLAGS_GCC = -O2 -pipe -## -## The compiler to use. Defaults to SOS11, can be also: SOS12, GCC3, GCC4. -## GARCOMPILER = SOS11 -## -# Remove the following rules and uncomment the -# include before building. -all: .DEFAULT -.DEFAULT: - @true +CONFIGURE_SCRIPTS = +BUILD_SCRIPTS = +INSTALL_SCRIPTS = example +TEST_SCRIPTS = -#include gar/category.mk +MAIN_PKGNAME = CSWusers-and-groups +PACKAGES = $(MAIN_PKGNAME) +CATALOGNAME_$(MAIN_PKGNAME) = users_and_groups +USERGROUP = /etc/opt/csw/pkg/$(MAIN_PKGNAME)/cswusergroup + +PROTOTYPE_MODIFIERS = example +PROTOTYPE_FILES_example = $(datadir)/$(GARNAME) +PROTOTYPE_USER_example = cswuser +PROTOTYPE_GROUP_example = cswgroup +PROTOTYPE_PERMS_example = 0700 +PROTOTYPE_CLASS_example = ugfiles + +SPKG_CLASSES = none ugfiles + +include gar/category.mk + +install-example: + ginstall -m 755 -d $(DESTDIR)/etc/opt/csw/pkg/$(MAIN_PKGNAME) + ginstall -m 644 $(FILEDIR)/cswusergroup $(DESTDIR)/etc/opt/csw/pkg/$(MAIN_PKGNAME) + +post-merge: + ginstall -m 755 -d $(PKGROOT)$(datadir)/$(GARNAME) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Sun Jan 3 15:17:52 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sun, 03 Jan 2010 14:17:52 +0000 Subject: [csw-devel] SF.net SVN: gar:[7846] csw/mgar/gar/v2/gar.pkg.mk Message-ID: Revision: 7846 http://gar.svn.sourceforge.net/gar/?rev=7846&view=rev Author: wahwah Date: 2010-01-03 14:17:52 +0000 (Sun, 03 Jan 2010) Log Message: ----------- mGAR v2: Adding ugfiles automatically after 'cswusergroup' when USERGROUP is used Modified Paths: -------------- csw/mgar/gar/v2/gar.pkg.mk Modified: csw/mgar/gar/v2/gar.pkg.mk =================================================================== --- csw/mgar/gar/v2/gar.pkg.mk 2010-01-03 13:41:40 UTC (rev 7845) +++ csw/mgar/gar/v2/gar.pkg.mk 2010-01-03 14:17:52 UTC (rev 7846) @@ -199,7 +199,7 @@ _CSWCLASSES = cswmigrateconf cswcpsampleconf cswpreserveconf _CSWCLASSES += cswetcservices -_CSWCLASSES += cswusergroup +_CSWCLASSES += cswusergroup ugfiles _CSWCLASSES += cswcrontab _CSWCLASSES += cswpycompile _CSWCLASSES += cswinetd This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Sun Jan 3 15:41:05 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sun, 03 Jan 2010 14:41:05 +0000 Subject: [csw-devel] SF.net SVN: gar:[7847] csw/mgar/pkg/mysql5/branches/mysql-5.0.x Message-ID: Revision: 7847 http://gar.svn.sourceforge.net/gar/?rev=7847&view=rev Author: wahwah Date: 2010-01-03 14:41:04 +0000 (Sun, 03 Jan 2010) Log Message: ----------- mysql-5.0.x: Configuring and starting the database during installation Modified Paths: -------------- csw/mgar/pkg/mysql5/branches/mysql-5.0.x/checksums csw/mgar/pkg/mysql5/branches/mysql-5.0.x/files/CSWmysql5.postinstall csw/mgar/pkg/mysql5/branches/mysql-5.0.x/files/quick_start-csw Property Changed: ---------------- csw/mgar/pkg/mysql5/branches/mysql-5.0.x/ Property changes on: csw/mgar/pkg/mysql5/branches/mysql-5.0.x ___________________________________________________________________ Modified: svn:externals - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2-checkpkg + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 Modified: csw/mgar/pkg/mysql5/branches/mysql-5.0.x/checksums =================================================================== --- csw/mgar/pkg/mysql5/branches/mysql-5.0.x/checksums 2010-01-03 14:17:52 UTC (rev 7846) +++ csw/mgar/pkg/mysql5/branches/mysql-5.0.x/checksums 2010-01-03 14:41:04 UTC (rev 7847) @@ -2,11 +2,11 @@ 1414d06fab1530484a508927a0de4154 0002-cast-user_info-pw_gid-to-gid_t.patch 5415f365f1b0f7a179d1efc25f45bbee 0003-OpenCSW-perl-for-tests.patch 8ab232cd4d232b3cda3bbced93f80237 0004-basedir-and-datadir-in-the-cnf-files.patch -747637bc4be42207974ae845d832ae65 CSWmysql5.postinstall +8cfe94c6a9c0e43d17de20b551e15837 CSWmysql5.postinstall 60162ea667507a6a487027e7c389ca55 CSWmysql5.preinstall e691b0cf00a3925ac55c1844045d6e30 ChangeLog e42afb5ec1b1ab02d2ec3b46d0922636 README.CSW aaca748fc044834e71ad544ab293c494 cswmysql5 67228e1f096fe08a94f4267439a4ec36 cswusergroup 65e6229cc98b6a8d4c5206d7fe16c7be mysql-5.0.87.tar.gz -90b7cfcd11ab56e021a195a6a085fa21 quick_start-csw +4313c963657ac820a20eea2a50be27f3 quick_start-csw Modified: csw/mgar/pkg/mysql5/branches/mysql-5.0.x/files/CSWmysql5.postinstall =================================================================== --- csw/mgar/pkg/mysql5/branches/mysql-5.0.x/files/CSWmysql5.postinstall 2010-01-03 14:17:52 UTC (rev 7846) +++ csw/mgar/pkg/mysql5/branches/mysql-5.0.x/files/CSWmysql5.postinstall 2010-01-03 14:41:04 UTC (rev 7847) @@ -1,15 +1,95 @@ -#!/bin/sh +#!/bin/ksh -p # # $Id$ # +# initial version for blastwave.org by Alex Moore 2006.02.25 +# Revised 2006.03.25 - see bug report 0001542 +# +# This script creates a default database with the small-memory footprint. +# Input may be provided for DATADIR and DEFAULTS_FILE +# +BASEDIR=/opt/csw/mysql5 +MYSQL_VAR=/var/opt/csw/mysql5 +DEFAULTS_FILE=$BASEDIR/my.cnf +SAVE_DEFAULTS_FILE=$MYSQL_VAR/my.cnf +MYSQLD_USER=mysql +# Provide the default data directory +MYSQLD_DATADIR=$MYSQL_VAR -MYSQLDATADIR=/var/opt/csw/mysql5 -if [ ! -d "${MYSQLDATADIR}/mysql" ] ; then - echo "No database directory found in the default location:" - echo "${MYSQLDATADIR}/mysql" - echo "If you need to build the initial database directory," - echo " see /opt/csw/mysql5/share/mysql/quick_start-csw" - echo "If you are using a non-default database directory location," - echo " please start mysql manually." - exit 0 +# http://bugs.mysql.com/bug.php?id=31164 +# ERROR: 1004 Can't create file '/var/tmp//installRJaiQ3/#sql6fee_1_0.frm' (errno: 13) +unset TMPDIR + +if [ ! -f "$DEFAULTS_FILE" ]; then + IN_DEFAULTS_FILE=$BASEDIR/share/mysql/my-small.cnf + echo "Using $IN_DEFAULTS_FILE to create the options file." +else + IN_DEFAULTS_FILE=$DEFAULTS_FILE + echo "Using $DEFAULTS_FILE as the options file." fi + +if [ -d "$MYSQLD_DATADIR/mysql" ]; then + echo "mysql database already exists." + echo "Leaving script without initializing a database." + exit 0 +fi + +echo "Setting up the database" +# Create the database directory and set the permissions if needed +if [ ! -d "$MYSQLD_DATADIR" ] ; then + mkdir -p $MYSQLD_DATADIR + chown -R mysql:mysql $MYSQLD_DATADIR + chmod 0700 $MYSQLD_DATADIR +fi +# +# copy the configuration file if not exists. +CNFCOPIED=no +if [ ! -f "$DEFAULTS_FILE" ] ; then + cp -p $IN_DEFAULTS_FILE $DEFAULTS_FILE + CNFCOPIED=yes +fi +# +# Run the mysql script to create the database +echo "Creating MySQL core database in $MYSQLD_DATADIR" +echo +echo "### The following messages are from mysql_install_db." +$BASEDIR/bin/mysql_install_db \ + --defaults-extra-file="$DEFAULTS_FILE" \ + --user="$MYSQLD_USER" \ + --basedir="$BASEDIR" \ + --datadir="$MYSQLD_DATADIR" + +# Fix permissions on the data directory, since mysql_install_db was run as +# root. +chown -R mysql:mysql $MYSQLD_DATADIR + +# Update --datadir in the cnf file with the correct value if file was copied +if [ x"$CNFCOPIED" = xyes ]; then + sed -e "s|/var/opt/csw/mysql5|$MYSQLD_DATADIR|g" $DEFAULTS_FILE >$DEFAULTS_FILE.new + mv $DEFAULTS_FILE.new $DEFAULTS_FILE +fi + +# Ending message +echo +echo "### The following messages are from $0." +echo "See /opt/csw/mysql5/share/mysql/doc/README.CSW for packaging changes." +echo "Please ignore references to starting mysqld_safe in the messages above." +echo " These messages are from mysql_install_db. See the following" +echo " for starting CSWmysql5." +smf=no +if [ -f /usr/sbin/svccfg -a -f /usr/sbin/svcadm ] ; then smf=yes ; fi +if [ $smf = yes ] +then + echo "Running \`svcadm enable cswmysql5\` start to start the database." + # First, we clear the status, since it's likely to be 'maintenance'. + svcadm disable cswmysql5 + svcadm clear cswmysql5 + svcadm enable cswmysql5 +else + echo "Running \`/etc/opt/csw/init.d/cswmysql\` start to start the database." + /etc/opt/csw/init.d/cswmysql start +fi + +exit 0 + +# vim:set ts=2 sw=2 sts=2 expandtab: Modified: csw/mgar/pkg/mysql5/branches/mysql-5.0.x/files/quick_start-csw =================================================================== --- csw/mgar/pkg/mysql5/branches/mysql-5.0.x/files/quick_start-csw 2010-01-03 14:17:52 UTC (rev 7846) +++ csw/mgar/pkg/mysql5/branches/mysql-5.0.x/files/quick_start-csw 2010-01-03 14:41:04 UTC (rev 7847) @@ -2,12 +2,14 @@ # # $Id$ # -# initial version for blastwave.org by Alex Moore 2006.02.25 -# Revised 2006.03.25 - see bug report 0001542 +# initial version for blastwave.org by Alex Moore 2006.02.25 Revised 2006.03.25 +# - see bug report 0001542 # # This script creates a default database with the small-memory footprint. # Input may be provided for DATADIR and DEFAULTS_FILE # +# TODO: This file should be integrated with CSWmysql5.postinstall file. + BASEDIR=/opt/csw/mysql5 MYSQL_VAR=/var/opt/csw/mysql5 DEFAULTS_FILE=$BASEDIR/my.cnf This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Sun Jan 3 15:47:00 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sun, 03 Jan 2010 14:47:00 +0000 Subject: [csw-devel] SF.net SVN: gar:[7848] csw/mgar/pkg/mysql5/branches/mysql-5.0.x/checksums Message-ID: Revision: 7848 http://gar.svn.sourceforge.net/gar/?rev=7848&view=rev Author: wahwah Date: 2010-01-03 14:47:00 +0000 (Sun, 03 Jan 2010) Log Message: ----------- myusql-5.0.x: Updating checksums of files with the Id tags Modified Paths: -------------- csw/mgar/pkg/mysql5/branches/mysql-5.0.x/checksums Modified: csw/mgar/pkg/mysql5/branches/mysql-5.0.x/checksums =================================================================== --- csw/mgar/pkg/mysql5/branches/mysql-5.0.x/checksums 2010-01-03 14:41:04 UTC (rev 7847) +++ csw/mgar/pkg/mysql5/branches/mysql-5.0.x/checksums 2010-01-03 14:47:00 UTC (rev 7848) @@ -2,11 +2,11 @@ 1414d06fab1530484a508927a0de4154 0002-cast-user_info-pw_gid-to-gid_t.patch 5415f365f1b0f7a179d1efc25f45bbee 0003-OpenCSW-perl-for-tests.patch 8ab232cd4d232b3cda3bbced93f80237 0004-basedir-and-datadir-in-the-cnf-files.patch -8cfe94c6a9c0e43d17de20b551e15837 CSWmysql5.postinstall +a723d7b35d76794c910daa20e6f86158 CSWmysql5.postinstall 60162ea667507a6a487027e7c389ca55 CSWmysql5.preinstall e691b0cf00a3925ac55c1844045d6e30 ChangeLog e42afb5ec1b1ab02d2ec3b46d0922636 README.CSW aaca748fc044834e71ad544ab293c494 cswmysql5 67228e1f096fe08a94f4267439a4ec36 cswusergroup 65e6229cc98b6a8d4c5206d7fe16c7be mysql-5.0.87.tar.gz -4313c963657ac820a20eea2a50be27f3 quick_start-csw +0d083f6dab0bc083fd302ef1375e3d59 quick_start-csw This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From hson at users.sourceforge.net Sun Jan 3 16:27:58 2010 From: hson at users.sourceforge.net (hson at users.sourceforge.net) Date: Sun, 03 Jan 2010 15:27:58 +0000 Subject: [csw-devel] SF.net SVN: gar:[7849] csw/mgar/pkg/goocanvas/trunk/Makefile Message-ID: Revision: 7849 http://gar.svn.sourceforge.net/gar/?rev=7849&view=rev Author: hson Date: 2010-01-03 15:27:58 +0000 (Sun, 03 Jan 2010) Log Message: ----------- goocanvas: Add STRIP_LIBTOOL Modified Paths: -------------- csw/mgar/pkg/goocanvas/trunk/Makefile Modified: csw/mgar/pkg/goocanvas/trunk/Makefile =================================================================== --- csw/mgar/pkg/goocanvas/trunk/Makefile 2010-01-03 14:47:00 UTC (rev 7848) +++ csw/mgar/pkg/goocanvas/trunk/Makefile 2010-01-03 15:27:58 UTC (rev 7849) @@ -33,10 +33,15 @@ EXTRA_INC = $(prefix)/X11/include EXTRA_LIB = $(prefix)/X11/lib EXTRA_PKG_CONFIG_DIRS = $(prefix)/X11/lib +EXTRA_LINKER_FLAGS_isa-i386 = /usr/openwin/lib/libXext.so +EXTRA_LINKER_FLAGS_isa-sparcv8 = /usr/openwin/lib/libXext.so +EXTRA_LINKER_FLAGS_isa-amd64 = /usr/openwin/lib/amd64/libXext.so +EXTRA_LINKER_FLAGS_isa-sparcv9 = /usr/openwin/lib/sparcv9/libXext.so +EXTRA_LINKER_FLAGS += $(EXTRA_LINKER_FLAGS_$(MODULATION)) #NO_ISAEXEC = 1 #NOISALIST = 1 -#BUILD64 = 1 +BUILD64 = 1 PKGFILES_CSWgoocanvasdevel = $(PKGFILES_DEVEL) PKGFILES_CSWgoocanvasdoc = $(sharedstatedir)/gtk-doc/.* @@ -46,6 +51,8 @@ LIBS = -lm export LIBS +STRIP_LIBTOOL = 1 + CONFIGURE_ARGS = $(DIRPATHS) TEST_TARGET = check This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From hson at users.sourceforge.net Sun Jan 3 17:11:21 2010 From: hson at users.sourceforge.net (hson at users.sourceforge.net) Date: Sun, 03 Jan 2010 16:11:21 +0000 Subject: [csw-devel] SF.net SVN: gar:[7850] csw/mgar/pkg/libunique/trunk/Makefile Message-ID: Revision: 7850 http://gar.svn.sourceforge.net/gar/?rev=7850&view=rev Author: hson Date: 2010-01-03 16:11:21 +0000 (Sun, 03 Jan 2010) Log Message: ----------- libunique: Add STRIP_LIBTOOL Modified Paths: -------------- csw/mgar/pkg/libunique/trunk/Makefile Modified: csw/mgar/pkg/libunique/trunk/Makefile =================================================================== --- csw/mgar/pkg/libunique/trunk/Makefile 2010-01-03 15:27:58 UTC (rev 7849) +++ csw/mgar/pkg/libunique/trunk/Makefile 2010-01-03 16:11:21 UTC (rev 7850) @@ -59,6 +59,8 @@ LIBS = -lsocket -lnsl export LIBS +STRIP_LIBTOOL = 1 + CONFIGURE_ARGS = $(DIRPATHS) TEST_TARGET = check This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Sun Jan 3 18:25:25 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sun, 03 Jan 2010 17:25:25 +0000 Subject: [csw-devel] SF.net SVN: gar:[7851] csw/mgar/pkg/mysql5/branches/mysql-5.0.x/Makefile Message-ID: Revision: 7851 http://gar.svn.sourceforge.net/gar/?rev=7851&view=rev Author: wahwah Date: 2010-01-03 17:25:21 +0000 (Sun, 03 Jan 2010) Log Message: ----------- mysql-5.0.x: Removing the explicit reference to ugfiles in SPKG_CLASSES, it breaks the installation. Modified Paths: -------------- csw/mgar/pkg/mysql5/branches/mysql-5.0.x/Makefile Modified: csw/mgar/pkg/mysql5/branches/mysql-5.0.x/Makefile =================================================================== --- csw/mgar/pkg/mysql5/branches/mysql-5.0.x/Makefile 2010-01-03 16:11:21 UTC (rev 7850) +++ csw/mgar/pkg/mysql5/branches/mysql-5.0.x/Makefile 2010-01-03 17:25:21 UTC (rev 7851) @@ -169,8 +169,6 @@ PROTOTYPE_PERMS_dbdir = 0700 PROTOTYPE_CLASS_dbdir = ugfiles -SPKG_CLASSES = none ugfiles - include gar/category.mk CFLAGS := $(filter-out -I%,$(CFLAGS)) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From hson at users.sourceforge.net Sun Jan 3 18:48:34 2010 From: hson at users.sourceforge.net (hson at users.sourceforge.net) Date: Sun, 03 Jan 2010 17:48:34 +0000 Subject: [csw-devel] SF.net SVN: gar:[7852] csw/mgar/pkg Message-ID: Revision: 7852 http://gar.svn.sourceforge.net/gar/?rev=7852&view=rev Author: hson Date: 2010-01-03 17:48:33 +0000 (Sun, 03 Jan 2010) Log Message: ----------- Add intermediate Makefile Added Paths: ----------- csw/mgar/pkg/gobject-introspection/Makefile csw/mgar/pkg/json-glib/Makefile csw/mgar/pkg/libmcrypt/Makefile csw/mgar/pkg/pxlib/Makefile csw/mgar/pkg/wireshark/Makefile Added: csw/mgar/pkg/gobject-introspection/Makefile =================================================================== --- csw/mgar/pkg/gobject-introspection/Makefile (rev 0) +++ csw/mgar/pkg/gobject-introspection/Makefile 2010-01-03 17:48:33 UTC (rev 7852) @@ -0,0 +1,15 @@ +# vim: ft=make ts=4 sw=4 noet + +default: + @echo "You are in the pkg/ directory." + +%: + $(MAKE) -C trunk $* + +paranoid-%: + $(MAKE) -C trunk $* || exit 2 + +export BUILDLOG ?= $(shell pwd)/buildlog.txt + +report-%: + $(MAKE) -C trunk $* || echo " *** make $* in $$i failed ***" >> $(BUILDLOG) Added: csw/mgar/pkg/json-glib/Makefile =================================================================== --- csw/mgar/pkg/json-glib/Makefile (rev 0) +++ csw/mgar/pkg/json-glib/Makefile 2010-01-03 17:48:33 UTC (rev 7852) @@ -0,0 +1,15 @@ +# vim: ft=make ts=4 sw=4 noet + +default: + @echo "You are in the pkg/ directory." + +%: + $(MAKE) -C trunk $* + +paranoid-%: + $(MAKE) -C trunk $* || exit 2 + +export BUILDLOG ?= $(shell pwd)/buildlog.txt + +report-%: + $(MAKE) -C trunk $* || echo " *** make $* in $$i failed ***" >> $(BUILDLOG) Added: csw/mgar/pkg/libmcrypt/Makefile =================================================================== --- csw/mgar/pkg/libmcrypt/Makefile (rev 0) +++ csw/mgar/pkg/libmcrypt/Makefile 2010-01-03 17:48:33 UTC (rev 7852) @@ -0,0 +1,15 @@ +# vim: ft=make ts=4 sw=4 noet + +default: + @echo "You are in the pkg/ directory." + +%: + $(MAKE) -C trunk $* + +paranoid-%: + $(MAKE) -C trunk $* || exit 2 + +export BUILDLOG ?= $(shell pwd)/buildlog.txt + +report-%: + $(MAKE) -C trunk $* || echo " *** make $* in $$i failed ***" >> $(BUILDLOG) Added: csw/mgar/pkg/pxlib/Makefile =================================================================== --- csw/mgar/pkg/pxlib/Makefile (rev 0) +++ csw/mgar/pkg/pxlib/Makefile 2010-01-03 17:48:33 UTC (rev 7852) @@ -0,0 +1,15 @@ +# vim: ft=make ts=4 sw=4 noet + +default: + @echo "You are in the pkg/ directory." + +%: + $(MAKE) -C trunk $* + +paranoid-%: + $(MAKE) -C trunk $* || exit 2 + +export BUILDLOG ?= $(shell pwd)/buildlog.txt + +report-%: + $(MAKE) -C trunk $* || echo " *** make $* in $$i failed ***" >> $(BUILDLOG) Added: csw/mgar/pkg/wireshark/Makefile =================================================================== --- csw/mgar/pkg/wireshark/Makefile (rev 0) +++ csw/mgar/pkg/wireshark/Makefile 2010-01-03 17:48:33 UTC (rev 7852) @@ -0,0 +1,15 @@ +# vim: ft=make ts=4 sw=4 noet + +default: + @echo "You are in the pkg/ directory." + +%: + $(MAKE) -C trunk $* + +paranoid-%: + $(MAKE) -C trunk $* || exit 2 + +export BUILDLOG ?= $(shell pwd)/buildlog.txt + +report-%: + $(MAKE) -C trunk $* || echo " *** make $* in $$i failed ***" >> $(BUILDLOG) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From hson at users.sourceforge.net Sun Jan 3 23:22:45 2010 From: hson at users.sourceforge.net (hson at users.sourceforge.net) Date: Sun, 03 Jan 2010 22:22:45 +0000 Subject: [csw-devel] SF.net SVN: gar:[7853] csw/mgar/pkg Message-ID: Revision: 7853 http://gar.svn.sourceforge.net/gar/?rev=7853&view=rev Author: hson Date: 2010-01-03 22:22:45 +0000 (Sun, 03 Jan 2010) Log Message: ----------- tiff: Initial commit Added Paths: ----------- csw/mgar/pkg/tiff/ csw/mgar/pkg/tiff/Makefile csw/mgar/pkg/tiff/branches/ csw/mgar/pkg/tiff/tags/ csw/mgar/pkg/tiff/trunk/ csw/mgar/pkg/tiff/trunk/Makefile csw/mgar/pkg/tiff/trunk/checksums csw/mgar/pkg/tiff/trunk/files/ Added: csw/mgar/pkg/tiff/Makefile =================================================================== --- csw/mgar/pkg/tiff/Makefile (rev 0) +++ csw/mgar/pkg/tiff/Makefile 2010-01-03 22:22:45 UTC (rev 7853) @@ -0,0 +1,15 @@ +# vim: ft=make ts=4 sw=4 noet + +default: + @echo "You are in the pkg/ directory." + +%: + $(MAKE) -C trunk $* + +paranoid-%: + $(MAKE) -C trunk $* || exit 2 + +export BUILDLOG ?= $(shell pwd)/buildlog.txt + +report-%: + $(MAKE) -C trunk $* || echo " *** make $* in $$i failed ***" >> $(BUILDLOG) Property changes on: csw/mgar/pkg/tiff/trunk ___________________________________________________________________ Added: svn:ignore + cookies download work Added: svn:externals + gar https://gar.svn.sf.net/svnroot/gar/csw/mgar/gar/v2 Added: csw/mgar/pkg/tiff/trunk/Makefile =================================================================== --- csw/mgar/pkg/tiff/trunk/Makefile (rev 0) +++ csw/mgar/pkg/tiff/trunk/Makefile 2010-01-03 22:22:45 UTC (rev 7853) @@ -0,0 +1,51 @@ +GARNAME = tiff +GARVERSION = 3.9.2 +CATEGORIES = lib + +DESCRIPTION = lib and tools for Tag Image File Format +define BLURB +endef + +MASTER_SITES = http://download.osgeo.org/libtiff/ +DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz +DISTNAME = $(GARNAME)-$(GARVERSION) + +PACKAGES = CSWtiff CSWtiffdevel CSWtiffdoc +CATALOGNAME_CSWtiff = tiff +CATALOGNAME_CSWtiffdevel = tiff_devel +CATALOGNAME_CSWtiffdoc = tiff_doc + +SPKG_DESC_CSWtiff += Library for writing single instance application +SPKG_DESC_CSWtiffdevel += Library for writing single instance application - developer package +SPKG_DESC_CSWtiffdoc += Library for writing single instance application - documentation + +REQUIRED_PKGS_CSWtiff += CSWjbigkit CSWjpeg CSWzlib +REQUIRED_PKGS_CSWtiffdevel += CSWtiff +REQUIRED_PKGS_CSWtiffdoc += CSWtiff + +PKGFILES_CSWtiffdevel = $(PKGFILES_DEVEL) +PKGFILES_CSWtiffdoc = $(sharedstatedir)/doc/.* + +ARCHALL_CSWtiffdoc = 1 + +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.bz2 + +SPKG_SOURCEURL = http://www.remotesensing.org/libtiff/ + +BUILD64 = 1 + +STRIP_LIBTOOL = 1 + +EXTRA_INC = $(prefix)/X11/include +EXTRA_LIB = $(prefix)/X11/lib +EXTRA_PKG_CONFIG_DIRS = $(prefix)/X11/lib + +CONFIGURE_ARGS = $(DIRPATHS) +CONFIGURE_ARGS += --with-zlib-include-dir=/opt/csw/include +CONFIGURE_ARGS += --with-zlib-lib-dir=/opt/csw/lib +CONFIGURE_ARGS += --with-jpeg-include-dir=/opt/csw/include +CONFIGURE_ARGS += --with-jpeg-lib-dir=/opt/csw/lib +CONFIGURE_ARGS += --with-jbig-include-dir=/opt/csw/include +CONFIGURE_ARGS += --with-jbig-lib-dir=/opt/csw/lib + +include gar/category.mk Added: csw/mgar/pkg/tiff/trunk/checksums =================================================================== --- csw/mgar/pkg/tiff/trunk/checksums (rev 0) +++ csw/mgar/pkg/tiff/trunk/checksums 2010-01-03 22:22:45 UTC (rev 7853) @@ -0,0 +1 @@ +93e56e421679c591de7552db13384cb8 tiff-3.9.2.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Mon Jan 4 00:03:17 2010 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Sun, 03 Jan 2010 23:03:17 +0000 Subject: [csw-devel] SF.net SVN: gar:[7854] csw/mgar/pkg/asciidoc/trunk Message-ID: Revision: 7854 http://gar.svn.sourceforge.net/gar/?rev=7854&view=rev Author: bdwalton Date: 2010-01-03 23:03:17 +0000 (Sun, 03 Jan 2010) Log Message: ----------- asciidoc: version bump to 8.5.2 Modified Paths: -------------- csw/mgar/pkg/asciidoc/trunk/Makefile csw/mgar/pkg/asciidoc/trunk/checksums Modified: csw/mgar/pkg/asciidoc/trunk/Makefile =================================================================== --- csw/mgar/pkg/asciidoc/trunk/Makefile 2010-01-03 22:22:45 UTC (rev 7853) +++ csw/mgar/pkg/asciidoc/trunk/Makefile 2010-01-03 23:03:17 UTC (rev 7854) @@ -1,5 +1,5 @@ GARNAME = asciidoc -GARVERSION = 8.4.5 +GARVERSION = 8.5.2 CATEGORIES = utils DESCRIPTION = An Documentation Generator Modified: csw/mgar/pkg/asciidoc/trunk/checksums =================================================================== --- csw/mgar/pkg/asciidoc/trunk/checksums 2010-01-03 22:22:45 UTC (rev 7853) +++ csw/mgar/pkg/asciidoc/trunk/checksums 2010-01-03 23:03:17 UTC (rev 7854) @@ -1,3 +1,3 @@ 62c15a6f036ca40ad0dffb0b14ad6630 add-csw-gnu-path-to-a2x.patch -9f21d6e352b3ab668f9def3eb7497da2 asciidoc-8.4.5.tar.gz +3ed69184645b233b83a52f8a722d1461 asciidoc-8.5.2.tar.gz ec48eeea1eafdaa7e507bc11327f6eae handle-csw-etc-paths.patch This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From hson at users.sourceforge.net Mon Jan 4 04:57:35 2010 From: hson at users.sourceforge.net (hson at users.sourceforge.net) Date: Mon, 04 Jan 2010 03:57:35 +0000 Subject: [csw-devel] SF.net SVN: gar:[7855] csw/mgar/pkg/ilmbase/trunk Message-ID: Revision: 7855 http://gar.svn.sourceforge.net/gar/?rev=7855&view=rev Author: hson Date: 2010-01-04 03:57:34 +0000 (Mon, 04 Jan 2010) Log Message: ----------- Split package in two 64-bit fixes Modified Paths: -------------- csw/mgar/pkg/ilmbase/trunk/Makefile csw/mgar/pkg/ilmbase/trunk/checksums Added Paths: ----------- csw/mgar/pkg/ilmbase/trunk/files/ltmain.sh.patch Modified: csw/mgar/pkg/ilmbase/trunk/Makefile =================================================================== --- csw/mgar/pkg/ilmbase/trunk/Makefile 2010-01-03 23:03:17 UTC (rev 7854) +++ csw/mgar/pkg/ilmbase/trunk/Makefile 2010-01-04 03:57:34 UTC (rev 7855) @@ -29,41 +29,65 @@ DISTFILES += libImath.so.2.0.2.i DISTFILES += libImath.so.2.0.2.s +PACKAGES = CSWilmbase CSWilmbasedevel +CATALOGNAME_CSWilmbase = ilmbase +CATALOGNAME_CSWilmbasedevel = ilmbase_devel + +SPKG_DESC_CSWilmbase += Base libraries used by OpenEXR +SPKG_DESC_CSWilmbasedevel += Base libraries used by OpenEXR - developer package + +PKGFILES_CSWilmbasedevel = $(PKGFILES_DEVEL) + +REQUIRED_PKGS_CSWilmbase += +REQUIRED_PKGS_CSWilmbasedevel += CSWilmbase + SPKG_SOURCEURL = http://www.openexr.com LICENSE = LICENSE -# We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz +UPSTREAM_MASTER_SITES = http://download.savannah.nongnu.org/releases/openexr/ -# If the url used to check for software update is different of MASTER_SITES, then -# uncomment the next line. Otherwise it is set by default to the value of MASTER_SITES -# UPSTREAM_MASTER_SITES = - CONFIGURE_ARGS = $(DIRPATHS) PATCHFILES = ImathMath.patch +PATCHFILES += ltmain.sh.patch LIBS += -lCstd -lCrun -lc -lm export LIBS -TEST_TARGET = check +BUILD64 = 1 +# Check fails if library isn't installed /opt/csw/lib and until a 64-bit +#TEST_TARGET = check +TEST_TARGET = + +STRIP_LIBTOOL = 1 + include gar/category.mk +#pre-configure-modulated: +# @echo " ==> Regenerating build tools..." +# @(cd $(WORKSRC) ; \ +# aclocal && \ +# autoconf && \ +# libtoolize --automake --force && \ +# aclocal && \ +# automake -a ) +# @$(MAKECOOKIE) post-install-isa-sparcv8: @cp $(FILEDIR)/libHalf.so.2.0.2.s $(INSTALLISADIR)/opt/csw/lib/libHalf.so.2.0.2 @cp $(FILEDIR)/libIex.so.2.0.2.s $(INSTALLISADIR)/opt/csw/lib/libIex.so.2.0.2 @cp $(FILEDIR)/libImath.so.2.0.2.s $(INSTALLISADIR)/opt/csw/lib/libImath.so.2.0.2 - @ln -s libHalf.so.2.0.2 $(INSTALLISADIR)/opt/csw/lib/libHalf.so.2 - @ln -s libIex.so.2.0.2 $(INSTALLISADIR)/opt/csw/lib/libIex.so.2 - @ln -s libImath.so.2.0.2 $(INSTALLISADIR)/opt/csw/lib/libImath.so.2 + @( if [ ! -r $(INSTALLISADIR)$(libdir)/libHalf.so.2 ] ; then ln -s libHalf.so.2.0.2 $(INSTALLISADIR)/opt/csw/lib/libHalf.so.2 ; fi ) + @( if [ ! -r $(INSTALLISADIR)$(libdir)/libIex.so.2 ] ; then ln -s libIex.so.2.0.2 $(INSTALLISADIR)/opt/csw/lib/libIex.so.2 ; fi ) + @( if [ ! -r $(INSTALLISADIR)$(libdir)/libImath.so.2 ] ; then ln -s libImath.so.2.0.2 $(INSTALLISADIR)/opt/csw/lib/libImath.so.2 ; fi ) post-install-isa-i386: @cp $(FILEDIR)/libHalf.so.2.0.2.i $(INSTALLISADIR)/opt/csw/lib/libHalf.so.2.0.2 @cp $(FILEDIR)/libIex.so.2.0.2.i $(INSTALLISADIR)/opt/csw/lib/libIex.so.2.0.2 @cp $(FILEDIR)/libImath.so.2.0.2.i $(INSTALLISADIR)/opt/csw/lib/libImath.so.2.0.2 - @ln -s libHalf.so.2.0.2 $(INSTALLISADIR)/opt/csw/lib/libHalf.so.2 - @ln -s libIex.so.2.0.2 $(INSTALLISADIR)/opt/csw/lib/libIex.so.2 - @ln -s libImath.so.2.0.2 $(INSTALLISADIR)/opt/csw/lib/libImath.so.2 + @( if [ ! -r $(INSTALLISADIR)$(libdir)/libHalf.so.2 ] ; then ln -s libHalf.so.2.0.2 $(INSTALLISADIR)/opt/csw/lib/libHalf.so.2 ; fi ) + @( if [ ! -r $(INSTALLISADIR)$(libdir)/libIex.so.2 ] ; then ln -s libIex.so.2.0.2 $(INSTALLISADIR)/opt/csw/lib/libIex.so.2 ; fi ) + @( if [ ! -r $(INSTALLISADIR)$(libdir)/libImath.so.2 ] ; then ln -s libImath.so.2.0.2 $(INSTALLISADIR)/opt/csw/lib/libImath.so.2 ; fi ) Modified: csw/mgar/pkg/ilmbase/trunk/checksums =================================================================== --- csw/mgar/pkg/ilmbase/trunk/checksums 2010-01-03 23:03:17 UTC (rev 7854) +++ csw/mgar/pkg/ilmbase/trunk/checksums 2010-01-04 03:57:34 UTC (rev 7855) @@ -1,8 +1,9 @@ -f76f094e69a6079b0beb93d97e2a217e download/ilmbase-1.0.1.tar.gz -b7daafc6a6c92a3cf9dfb47e24fa630f download/libHalf.so.2.0.2.i -cdce2f2b1c7d00dc76124ecb5418b9a2 download/libHalf.so.2.0.2.s -1b589f5b747846688c27f55de9b1ec7a download/libIex.so.2.0.2.i -ddf913c9000dc4580ad330b9dd938826 download/libIex.so.2.0.2.s -756523f803ce1be3e125b6ce63e3183c download/libImath.so.2.0.2.i -ce47a211381deadfc38722f5abda54d7 download/libImath.so.2.0.2.s -6873969f50e5d1c43ec93a90a65d85bd download/ImathMath.patch +6873969f50e5d1c43ec93a90a65d85bd ImathMath.patch +f76f094e69a6079b0beb93d97e2a217e ilmbase-1.0.1.tar.gz +b7daafc6a6c92a3cf9dfb47e24fa630f libHalf.so.2.0.2.i +cdce2f2b1c7d00dc76124ecb5418b9a2 libHalf.so.2.0.2.s +1b589f5b747846688c27f55de9b1ec7a libIex.so.2.0.2.i +ddf913c9000dc4580ad330b9dd938826 libIex.so.2.0.2.s +756523f803ce1be3e125b6ce63e3183c libImath.so.2.0.2.i +ce47a211381deadfc38722f5abda54d7 libImath.so.2.0.2.s +f1016498bff3cce0c722108f4603e6c5 ltmain.sh.patch Added: csw/mgar/pkg/ilmbase/trunk/files/ltmain.sh.patch =================================================================== --- csw/mgar/pkg/ilmbase/trunk/files/ltmain.sh.patch (rev 0) +++ csw/mgar/pkg/ilmbase/trunk/files/ltmain.sh.patch 2010-01-04 03:57:34 UTC (rev 7855) @@ -0,0 +1,24 @@ +--- ilmbase-1.0.1.orig/ltmain.sh 2006-12-16 00:23:48.000000000 +0100 ++++ ilmbase-1.0.1/ltmain.sh 2010-01-04 03:01:58.123927193 +0100 +@@ -1553,9 +1553,10 @@ + esac + compile_command="$compile_command $arg" + finalize_command="$finalize_command $arg" +- if test "$with_gcc" = "yes" ; then ++# Fix for 64-bit CC ++# if test "$with_gcc" = "yes" ; then + compiler_flags="$compiler_flags $arg" +- fi ++# fi + continue + ;; + +@@ -4015,7 +4016,7 @@ + save_ifs="$IFS"; IFS='~' + for cmd in $cmds; do + IFS="$save_ifs" +- eval cmd=\"$cmd\" ++ eval cmd=\"$cmd -norunpath\" + $show "$cmd" + $run eval "$cmd" || exit $? + done This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Mon Jan 4 11:28:16 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Mon, 04 Jan 2010 10:28:16 +0000 Subject: [csw-devel] SF.net SVN: gar:[7856] csw/mgar/gar/v2 Message-ID: Revision: 7856 http://gar.svn.sourceforge.net/gar/?rev=7856&view=rev Author: wahwah Date: 2010-01-04 10:28:15 +0000 (Mon, 04 Jan 2010) Log Message: ----------- mGAR v2: Merging the v2-checkpkg branch in Modified Paths: -------------- csw/mgar/gar/v2/bin/checkpkg Added Paths: ----------- csw/mgar/gar/v2/bin/checkpkg.d/ csw/mgar/gar/v2/bin/checkpkg.d/checkpkg-dummy.py csw/mgar/gar/v2/bin/checkpkg.d/checkpkg-libs.py csw/mgar/gar/v2/bin/checkpkg.d/checkpkg-obsolete-deps.py csw/mgar/gar/v2/bin/checkpkg.d/checkpkg.py csw/mgar/gar/v2/bin/checkpkg.d/checkpkg_test.py csw/mgar/gar/v2/bin/checkpkg.d/testdata/ csw/mgar/gar/v2/bin/checkpkg.d/testdata/__init__.py csw/mgar/gar/v2/bin/checkpkg.d/testdata/checkpkg_test_data_CSWlibpq_84.py csw/mgar/gar/v2/bin/checkpkg.d/testdata/checkpkg_test_data_CSWmysql51.py csw/mgar/gar/v2/bin/checkpkg.d/testdata/checkpkg_test_data_CSWmysql51client.py csw/mgar/gar/v2/bin/checkpkg.d/testdata/checkpkg_test_data_CSWmysql51devel.py csw/mgar/gar/v2/bin/checkpkg.d/testdata/checkpkg_test_data_CSWmysql51rt.py csw/mgar/gar/v2/bin/checkpkg.d/testdata/checkpkg_test_data_CSWmysql5client_8x.py csw/mgar/gar/v2/bin/checkpkg.d/testdata/dump_output_1.py csw/mgar/gar/v2/bin/checkpkg.d/testdata/dump_output_2.py Removed Paths: ------------- csw/mgar/gar/v2/bin/checkpkg.d/checkpkg-dummy.py csw/mgar/gar/v2/bin/checkpkg.d/checkpkg-libs.py csw/mgar/gar/v2/bin/checkpkg.d/checkpkg-obsolete-deps.py csw/mgar/gar/v2/bin/checkpkg.d/checkpkg.py csw/mgar/gar/v2/bin/checkpkg.d/checkpkg_test.py csw/mgar/gar/v2/bin/checkpkg.d/testdata/ csw/mgar/gar/v2/bin/checkpkg.d/testdata/__init__.py csw/mgar/gar/v2/bin/checkpkg.d/testdata/checkpkg_test_data_CSWlibpq_84.py csw/mgar/gar/v2/bin/checkpkg.d/testdata/checkpkg_test_data_CSWmysql51.py csw/mgar/gar/v2/bin/checkpkg.d/testdata/checkpkg_test_data_CSWmysql51client.py csw/mgar/gar/v2/bin/checkpkg.d/testdata/checkpkg_test_data_CSWmysql51devel.py csw/mgar/gar/v2/bin/checkpkg.d/testdata/checkpkg_test_data_CSWmysql51rt.py csw/mgar/gar/v2/bin/checkpkg.d/testdata/checkpkg_test_data_CSWmysql5client_8x.py csw/mgar/gar/v2/bin/checkpkg.d/testdata/dump_output_1.py csw/mgar/gar/v2/bin/checkpkg.d/testdata/dump_output_2.py Property Changed: ---------------- csw/mgar/gar/v2/ csw/mgar/gar/v2/bin/checkpkg csw/mgar/gar/v2/pkglib/csw/depend Property changes on: csw/mgar/gar/v2 ___________________________________________________________________ Modified: svn:mergeinfo - /csw/mgar/gar/v2:4936-6678 /csw/mgar/gar/v2-collapsed-modulations:6895 /csw/mgar/gar/v2-migrateconf:7082-7211 /csw/mgar/gar/v2-skayser:6087-6132 + /csw/mgar/gar/v2:4936-6678 /csw/mgar/gar/v2-checkpkg:7722-7855 /csw/mgar/gar/v2-collapsed-modulations:6895 /csw/mgar/gar/v2-migrateconf:7082-7211 /csw/mgar/gar/v2-skayser:6087-6132 Modified: csw/mgar/gar/v2/bin/checkpkg =================================================================== --- csw/mgar/gar/v2/bin/checkpkg 2010-01-04 03:57:34 UTC (rev 7855) +++ csw/mgar/gar/v2/bin/checkpkg 2010-01-04 10:28:15 UTC (rev 7856) @@ -1,6 +1,13 @@ #!/bin/ksh -p - -# checkpkg 1.50 (diff to 1.46a: check multiple package files) +# +# $Id$ +# +# checkpkg 1.51 +# +# diff to 1.46a +# - check multiple package files +# - checkpkg.d plugin support +# # This script examines a package that has been put together # for submittal to the CSW archive at opencsw.org # @@ -18,7 +25,22 @@ PATH=$PATH:/usr/sbin LOCAL_ARCH=`uname -p` +if [[ -z "${CHECKPKG_TMPDIR}" ]]; then + readonly CHECKPKG_TMPDIR="/var/tmp" +else + readonly CHECKPKG_TMPDIR +fi +# Colors only when running interactively +if [[ -t 1 ]]; then + GREEN="\\033[0;32;40m" + RED="\\033[1;31;40m" + COLOR_RESET="\\033[00m" +else + GREEN="" + RED="" + COLOR_RESET="" +fi # always print out a warning message. (to stderr) # exit script, if quit_on_warn set @@ -28,11 +50,17 @@ if [[ -d "$EXTRACTDIR" ]] ; then rm -rf $EXTRACTDIR fi - if [[ "$TMPARCHIVE" != "" ]] ; then - [ -f "$TMPARCHIVE" ] && rm $TMPARCHIVE - fi + cleantmparchives } +cleantmparchives() { + for TMPARCHIVE in $tmparchives; do + if [[ "$TMPARCHIVE" != "" ]]; then + [ -f "$TMPARCHIVE" ] && rm $TMPARCHIVE + fi + done +} + cleanupset(){ if [ "`echo $SETINF*`" != "$SETINF*" ]; then rm $SETINF* @@ -54,6 +82,33 @@ exit 1 } +debugmsg() { + if [[ "${DEBUG}" != "" ]]; then + print "DEBUG: $*" > /dev/fd/2 + fi +} + +set_variables_for_individual_package_check() { + f=$1 + file $f |sed 's/^.*://' |grep gzip >/dev/null + if [ $? -eq 0 ] ; then + TMPARCHIVE=$CHECKPKG_TMPDIR/`basename $f` + if [[ -f $TMPARCHIVE ]] ; then + print ERROR: $TMPARCHIVE already exists + + fi + gzcat $f >$TMPARCHIVE || exit 1 + f=$TMPARCHIVE + fi + pkgname=`nawk 'NR == 2 {print $1; exit;}' $f` + pkgnames="$pkgnames $pkgname" +} + +if [[ "$1" == "-d" ]] ; then + DEBUG=1 + shift +fi + if [[ "$1" == "-e" ]] ; then quit_on_warn=1; shift @@ -65,11 +120,19 @@ fi # a unique filename for the list of package deps and libs we see in a 'set' -SETINF=/tmp/checkpkg.$$.`date +%Y%m%d%H%M%S` +SETINF=$CHECKPKG_TMPDIR/checkpkg.$$.`date +%Y%m%d%H%M%S` SETLIBS=$SETINF.libs SETDEPS=$SETINF.deps +pkgnames="" +tmparchives="" +EXTRACTDIR=$CHECKPKG_TMPDIR/dissect.$$ +if [ -d $EXTRACTDIR ] ; then + print ERROR: $EXTRACTDIR already exists + exit 1 +fi + for f in "$@" do @@ -82,9 +145,6 @@ case $f in - cswutils-*) - : - ;; *) print Examining $f @@ -111,30 +171,13 @@ done esac -print Extracting files for more detailed inspection... +print Extracting all files for more detailed inspection... -file $f |sed 's/^.*://' |grep gzip >/dev/null -if [ $? -eq 0 ] ; then - TMPARCHIVE=/tmp/`basename $f` - if [[ -f $TMPARCHIVE ]] ; then - print ERROR: $TMPARCHIVE already exists - - fi - gzcat $f >$TMPARCHIVE || exit 1 - f=$TMPARCHIVE -fi +set_variables_for_individual_package_check "$f" -pkgname=`nawk 'NR == 2 {print $1; exit;}' $f` - -EXTRACTDIR=/tmp/dissect.$$ - -if [ -d $EXTRACTDIR ] ; then - print ERROR: $EXTRACTDIR already exists - exit 1 -fi - mkdir $EXTRACTDIR +# FIXME: This doesn't support multiple packages TMPFILE=$EXTRACTDIR/pkginfo @@ -304,7 +347,6 @@ print Extracing pkg for examination of files... pkgtrans $f $EXTRACTDIR $pkgname - ############################################################# # We now have the package expanded, in "directory" form, in # $EXTRACTDIR/$pkgname @@ -406,7 +448,7 @@ #cat $EXTRACTDIR/elflist| xargs ldd 2>/dev/null |fgrep '.so' | # sed 's:^.*=>[^/]*::' | nawk '{print $1}' |sort -u >$EXTRACTDIR/liblist - cat $EXTRACTDIR/elflist| xargs dump -Lv |nawk '$2=="NEEDED"{print $3}' | + cat $EXTRACTDIR/elflist| xargs /usr/ccs/bin/dump -Lv |nawk '$2=="NEEDED"{print $3}' | sort -u | egrep -v $EXTRACTDIR >$EXTRACTDIR/liblist @@ -443,13 +485,12 @@ exit 1 fi -# Verify that there are no double depends +# Verify that there are no multiple depends repeated_depends="$(awk '{print $2}' $EXTRACTDIR/$pkgname/install/depend \ | sort | uniq -c | awk '{print $1}' | sort | uniq | wc -l)" if [[ "$repeated_depends" -gt 1 ]]; then cat $EXTRACTDIR/$pkgname/install/depend - print ERROR: $pkgname has double depends - exit 1 + errmsg "$pkgname has multiple depends" fi #to retain a record of all packages currently being examined from $@ @@ -474,47 +515,6 @@ fi done -egrep -v 'SUNWbcp|SUNWowbcp|SUNWucb' /var/sadm/install/contents | - fgrep -f $EXTRACTDIR/liblist >$EXTRACTDIR/shortcatalog - - - -for lib in `cat $EXTRACTDIR/liblist` ; do - grep "[/=]$lib[ =]" $EXTRACTDIR/$pkgname/pkgmap - if [[ $? -eq 0 ]] ; then - echo $lib provided by package itself - continue - else - grep "[/=]$lib[ =]" $SETLIBS - if [[ $? -eq 0 ]]; then - echo "$lib provided by package set being evaluated." - continue - fi - fi - - libpkg=`grep /$lib $EXTRACTDIR/shortcatalog | - sed 's/^.* \([^ ]*\)$/\1/' |sort -u` - - if [[ -z "$libpkg" ]] ; then - echo "$lib $pkgname" >> $SETLIBS.missing - print Cannot find package providing $lib. Storing for delayed validation. - else - print $libpkg | fmt -1 >>$EXTRACTDIR/libpkgs - fi -done - -sort -u $EXTRACTDIR/libpkgs >$EXTRACTDIR/libpkgs.x -mv $EXTRACTDIR/libpkgs.x $EXTRACTDIR/libpkgs - -diff $EXTRACTDIR/deppkgs $EXTRACTDIR/libpkgs >/dev/null -if [[ $? -ne 0 ]] ; then - print SUGGESTION: you may want to add some or all of the following as depends: - print ' (Feel free to ignore SUNW or SPRO packages)' - diff $EXTRACTDIR/deppkgs $EXTRACTDIR/libpkgs | fgrep '>' -fi - - - if [[ "$basedir" != "" ]] ; then print if [[ -f $EXTRACTDIR/elflist ]] ; then @@ -530,13 +530,78 @@ fi fi +# Plugin section. +# +# Plugins should live in checkpkg.d subdirectory in the same directory in which +# checkpkg is. Each plugin file name should be an executable and begin with +# "checkpkg-". -cleanup +tmparchives="$tmparchives $TMPARCHIVE" +done -print "" +# All packages have been extracted. +# Now running all the plugin checks + +set_variables_for_individual_package_check "$f" + +echo "Running the experimental plugin infrastructure." +test_suite_ok=1 +checkpkg_scriptname=`basename $0` +checkpkg_basedir=${0%/${checkpkg_scriptname}} +plugindir=${checkpkg_basedir}/checkpkg.d +if [[ "${DEBUG}" != "" ]]; then + extra_options="--debug" +fi +debugmsg "plugindir: '$plugindir'" +log_files="" +if [[ -d "$plugindir" ]]; then + # echo plugin dir exists + for plugin in "${plugindir}"/checkpkg-*; do + if [[ -x "${plugin}" ]]; then + debugmsg "Executing: ${plugin} $extra_options -e \"${EXTRACTDIR}\" ${pkgnames}" + plugin_base_name=`basename ${plugin}` + plugin_log="${EXTRACTDIR}/${plugin_base_name}.log" + log_files="${log_files} ${plugin_log}" + printf "TEST: ${plugin} running..." + ${plugin} $extra_options -e "${EXTRACTDIR}" ${pkgnames} > "${plugin_log}" 2>&1 + if [[ "$?" -ne 0 ]]; then + printf "\rTEST: ${plugin} ${RED}[FAIL]${COLOR_RESET} \\n" + test_suite_ok=0 + else + printf "\rTEST: ${plugin} ${GREEN}[OK]${COLOR_RESET} \\n" + fi + else + debugmsg "'${plugin}' is not executable" + fi + done +else + debugmsg "plugin dir does not exist" +fi + +echo +for log_file in ${log_files}; do + if [[ -s "${log_file}" ]]; then + echo "LOG START: ${log_file}" + echo + cat "${log_file}" + echo + echo "LOG END: ${log_file}" + fi done +echo +if [[ ${test_suite_ok} -ne 1 ]]; then + errmsg "One or more tests have failed." +else + print "All tests were successful." +fi + +print "" + +# Cleaning up after all packages +cleanup + if [ -s $SETDEPS.missing ]; then print "Doing late evaluations of package dependencies." while read mdep; do @@ -551,19 +616,4 @@ done < $SETDEPS.missing fi -if [ -s $SETLIBS.missing ]; then - print "Doing late evaluations of package library dependencies." - while read ldep; do - lib=`echo $ldep | nawk '{print $1}'` - [ "$lib" = "libm.so.2" ] && continue - pkg=`echo $ldep | nawk '{print $2}'` - /usr/bin/grep "[/=]$lib[ =]" $SETLIBS >/dev/null - if [ $? -ne 0 ]; then - errmsg "Couldn't find a package providing $lib" - else - print "A package in the set being evaluated provides $lib" - fi - done < $SETLIBS.missing -fi - cleanupset Property changes on: csw/mgar/gar/v2/bin/checkpkg ___________________________________________________________________ Added: svn:keywords + Id Deleted: csw/mgar/gar/v2/bin/checkpkg.d/checkpkg-dummy.py =================================================================== --- csw/mgar/gar/v2-checkpkg/bin/checkpkg.d/checkpkg-dummy.py 2010-01-04 03:57:34 UTC (rev 7855) +++ csw/mgar/gar/v2/bin/checkpkg.d/checkpkg-dummy.py 2010-01-04 10:28:15 UTC (rev 7856) @@ -1,21 +0,0 @@ -#!/opt/csw/bin/python2.6 -# $Id$ - -import checkpkg -import os.path -import logging - -def main(): - options, args = checkpkg.GetOptions() - if not os.path.isdir(options.extractdir): - raise checkpkg.PackageError("The extract base directory doesn't exist: %s" % options.extractdir) - for pkgname in args: - pkgpath = os.path.join(options.extractdir, pkgname) - if not os.path.isdir(pkgpath): - raise checkpkg.PackageError("The package directory doesn't exist: %s" % pkgpath) - logging.debug("Dummy plugin says the package %s is extracted to %s", - pkgname, options.extractdir) - - -if __name__ == '__main__': - main() Copied: csw/mgar/gar/v2/bin/checkpkg.d/checkpkg-dummy.py (from rev 7855, csw/mgar/gar/v2-checkpkg/bin/checkpkg.d/checkpkg-dummy.py) =================================================================== --- csw/mgar/gar/v2/bin/checkpkg.d/checkpkg-dummy.py (rev 0) +++ csw/mgar/gar/v2/bin/checkpkg.d/checkpkg-dummy.py 2010-01-04 10:28:15 UTC (rev 7856) @@ -0,0 +1,21 @@ +#!/opt/csw/bin/python2.6 +# $Id$ + +import checkpkg +import os.path +import logging + +def main(): + options, args = checkpkg.GetOptions() + if not os.path.isdir(options.extractdir): + raise checkpkg.PackageError("The extract base directory doesn't exist: %s" % options.extractdir) + for pkgname in args: + pkgpath = os.path.join(options.extractdir, pkgname) + if not os.path.isdir(pkgpath): + raise checkpkg.PackageError("The package directory doesn't exist: %s" % pkgpath) + logging.debug("Dummy plugin says the package %s is extracted to %s", + pkgname, options.extractdir) + + +if __name__ == '__main__': + main() Deleted: csw/mgar/gar/v2/bin/checkpkg.d/checkpkg-libs.py =================================================================== --- csw/mgar/gar/v2-checkpkg/bin/checkpkg.d/checkpkg-libs.py 2010-01-04 03:57:34 UTC (rev 7855) +++ csw/mgar/gar/v2/bin/checkpkg.d/checkpkg-libs.py 2010-01-04 10:28:15 UTC (rev 7856) @@ -1,225 +0,0 @@ -#!/opt/csw/bin/python2.6 -# -# $Id$ -# -# A check for dependencies between shared libraries. -# -# This is currently more of a prototype than a mature program, but it has some -# unit tests and it appears to be working. The main problem is that it's not -# divided into smaller testable sections. - -import checkpkg -import os -import os.path -import copy -import re -import subprocess -import logging -import sys -import textwrap - -DUMP_BIN = "/usr/ccs/bin/dump" - -def GetIsalist(): - args = ["isalist"] - isalist_proc = subprocess.Popen(args, stdout=subprocess.PIPE) - stdout, stderr = isalist_proc.communicate() - ret = isalist_proc.wait() - if ret: - logging.error("Calling isalist has failed.") - isalist = re.split(r"\s+", stdout.strip()) - return isalist - - -def main(): - result_ok = True - errors = [] - options, args = checkpkg.GetOptions() - pkgnames = args - if options.debug: - logging.basicConfig(level=logging.DEBUG) - else: - logging.basicConfig(level=logging.INFO) - checkers = [] - for pkgname in pkgnames: - checker = checkpkg.CheckpkgBase(options.extractdir, pkgname) - checkers.append(checker) - binaries = [] - binaries_by_pkgname = {} - sonames_by_pkgname = {} - pkg_by_any_filename = {} - for checker in checkers: - pkg_binary_paths = checker.ListBinaries() - binaries_base = [os.path.split(x)[1] for x in pkg_binary_paths] - binaries_by_pkgname[checker.pkgname] = binaries_base - binaries.extend(pkg_binary_paths) - for filename in checker.GetAllFilenames(): - pkg_by_any_filename[filename] = checker.pkgname - # Making the binaries unique - binaries = set(binaries) - ws_re = re.compile(r"\s+") - - # man ld.so.1 for more info on this hack - env = copy.copy(os.environ) - env["LD_NOAUXFLTR"] = "1" - needed_sonames_by_binary = {} - filenames_by_soname = {} - # Assembling a data structure with the data about binaries. - # { - # : { checkpkg.NEEDED_SONAMES: [...], - # checkpkg.RUNPATH: [...]}, - # : ..., - # ... - # } - # - for binary in binaries: - binary_base_name = binary.split("/")[-1] - args = [DUMP_BIN, "-Lv", binary] - dump_proc = subprocess.Popen(args, stdout=subprocess.PIPE, env=env) - stdout, stderr = dump_proc.communicate() - ret = dump_proc.wait() - binary_data = checkpkg.ParseDumpOutput(stdout) - needed_sonames_by_binary[binary_base_name] = binary_data - if checkpkg.SONAME not in binary_data: - logging.info("The %s shared library doesn't provide a SONAME.", - binary_base_name) - # The shared library doesn't tell its SONAME. We're guessing it's the - # same as the base file name. - binary_data[checkpkg.SONAME] = binary_base_name - filenames_by_soname[binary_data[checkpkg.SONAME]] = binary_base_name - - isalist = GetIsalist() - - # Building indexes by soname to simplify further processing - # These are indexes "by soname". - (needed_sonames, - binaries_by_soname, - runpath_by_needed_soname) = checkpkg.BuildIndexesBySoname( - needed_sonames_by_binary) - - pkgmap = checkpkg.SystemPkgmap() - logging.debug("Determining the soname-package relationships.") - # lines by soname is an equivalent of $EXTRACTDIR/shortcatalog - lines_by_soname = checkpkg.GetLinesBySoname( - pkgmap, needed_sonames, runpath_by_needed_soname, isalist) - - # Creating a map from files to packages. - pkgs_by_filename = {} - for soname, line in lines_by_soname.iteritems(): - # TODO: Find all the packages, not just the last field. - fields = re.split(ws_re, line.strip()) - # For now, we'll assume that the last field is the package. - pkgname = fields[-1] - pkgs_by_filename[soname] = pkgname - - # A shared object dependency/provisioning report, plus checking. - # - # This section is somewhat overlapping with checkpkg.AnalyzeDependencies(), - # it has a different purpose: it reports the relationships between shared - # libraries, binaries using them and packages providing them. Ideally, the - # same bit of code with do checking and reporting. - # - # TODO: Rewrite this using cheetah templates - if needed_sonames: - print "Analysis of sonames needed by the package set:" - binaries_with_missing_sonames = set([]) - for soname in needed_sonames: - logging.debug("Analyzing: %s", soname) - if soname in filenames_by_soname: - print "%s is provided by the package itself" % soname - elif soname in lines_by_soname: - print ("%s is provided by %s and required by:" - % (soname, - repr(pkgs_by_filename[soname]))) - filename_lines = " ".join(sorted(binaries_by_soname[soname])) - for line in textwrap.wrap(filename_lines, 70): - print " ", line - else: - print ("%s is required by %s, but we don't know what provides it." - % (soname, binaries_by_soname[soname])) - for binary in binaries_by_soname[soname]: - binaries_with_missing_sonames.add(binary) - if soname in checkpkg.ALLOWED_ORPHAN_SONAMES: - print "However, it's a whitelisted soname." - else: - errors.append( - checkpkg.Error("%s is required by %s, but " - "we don't know what provides it." - % (soname, binaries_by_soname[soname]))) - if binaries_with_missing_sonames: - print "The following are binaries with missing sonames:" - binary_lines = " ".join(sorted(binaries_with_missing_sonames)) - for line in textwrap.wrap(binary_lines, 70): - print " ", line - print - - dependent_pkgs = {} - for checker in checkers: - pkgname = checker.pkgname - declared_dependencies = checker.GetDependencies() - if options.debug: - sanitized_pkgname = pkgname.replace("-", "_") - data_file_name = "/var/tmp/checkpkg_test_data_%s.py" % sanitized_pkgname - logging.warn("Saving test data to %s." % repr(data_file_name)) - test_fd = open(data_file_name, "w") - print >>test_fd, "# Testing data for %s" % pkgname - print >>test_fd, "# $Id$" - print >>test_fd, "DATA_PKGNAME =", repr(pkgname) - print >>test_fd, "DATA_DECLARED_DEPENDENCIES =", repr(declared_dependencies) - print >>test_fd, "DATA_BINARIES_BY_PKGNAME =", repr(binaries_by_pkgname) - print >>test_fd, "DATA_NEEDED_SONAMES_BY_BINARY =", repr(needed_sonames_by_binary) - print >>test_fd, "DATA_PKGS_BY_FILENAME =", repr(pkgs_by_filename) - print >>test_fd, "DATA_FILENAMES_BY_SONAME =", repr(filenames_by_soname) - print >>test_fd, "DATA_PKG_BY_ANY_FILENAME =", repr(pkg_by_any_filename) - print >>test_fd, "DATA_LINES_BY_SONAME =", repr(lines_by_soname) - print >>test_fd, "DATA_PKGMAP_CACHE =", repr(pkgmap.cache) - print >>test_fd, "DATA_BINARIES_BY_SONAME =", repr(binaries_by_soname) - print >>test_fd, "DATA_ISALIST =", repr(isalist) - test_fd.close() - - missing_deps, surplus_deps, orphan_sonames = checkpkg.AnalyzeDependencies( - pkgname, - declared_dependencies, - binaries_by_pkgname, - needed_sonames_by_binary, - pkgs_by_filename, - filenames_by_soname, - pkg_by_any_filename) - - # TODO: Rewrite this using cheetah templates. - print "%s:" % pkgname - msg_printed = False - if missing_deps: - print "SUGGESTION: you may want to add some or all of the following as depends:" - print " (Feel free to ignore SUNW or SPRO packages)" - for dep_pkgname in sorted(missing_deps): - print ">", dep_pkgname - msg_printed = True - if surplus_deps: - print "The following packages might be unnecessary dependencies:" - for dep_pkgname in surplus_deps: - print "? ", dep_pkgname - msg_printed = True - if orphan_sonames: - print "The following sonames don't belong to any package:" - for soname in sorted(orphan_sonames): - errors.append(checkpkg.Error("The following soname does't belong to " - "any package: %s" % soname)) - print "! ", soname - msg_printed = True - if not msg_printed: - print "+ Dependencies of %s look good." % pkgname - print - - if errors: - for error in errors: - logging.error(error) - sys.exit(1) - else: - sys.exit(0) - - -if __name__ == '__main__': - main() - -# vim:set sw=2 ts=2 sts=2 expandtab: Copied: csw/mgar/gar/v2/bin/checkpkg.d/checkpkg-libs.py (from rev 7855, csw/mgar/gar/v2-checkpkg/bin/checkpkg.d/checkpkg-libs.py) =================================================================== --- csw/mgar/gar/v2/bin/checkpkg.d/checkpkg-libs.py (rev 0) +++ csw/mgar/gar/v2/bin/checkpkg.d/checkpkg-libs.py 2010-01-04 10:28:15 UTC (rev 7856) @@ -0,0 +1,225 @@ +#!/opt/csw/bin/python2.6 +# +# $Id$ +# +# A check for dependencies between shared libraries. +# +# This is currently more of a prototype than a mature program, but it has some +# unit tests and it appears to be working. The main problem is that it's not +# divided into smaller testable sections. + +import checkpkg +import os +import os.path +import copy +import re +import subprocess +import logging +import sys +import textwrap + +DUMP_BIN = "/usr/ccs/bin/dump" + +def GetIsalist(): + args = ["isalist"] + isalist_proc = subprocess.Popen(args, stdout=subprocess.PIPE) + stdout, stderr = isalist_proc.communicate() + ret = isalist_proc.wait() + if ret: + logging.error("Calling isalist has failed.") + isalist = re.split(r"\s+", stdout.strip()) + return isalist + + +def main(): + result_ok = True + errors = [] + options, args = checkpkg.GetOptions() + pkgnames = args + if options.debug: + logging.basicConfig(level=logging.DEBUG) + else: + logging.basicConfig(level=logging.INFO) + checkers = [] + for pkgname in pkgnames: + checker = checkpkg.CheckpkgBase(options.extractdir, pkgname) + checkers.append(checker) + binaries = [] + binaries_by_pkgname = {} + sonames_by_pkgname = {} + pkg_by_any_filename = {} + for checker in checkers: + pkg_binary_paths = checker.ListBinaries() + binaries_base = [os.path.split(x)[1] for x in pkg_binary_paths] + binaries_by_pkgname[checker.pkgname] = binaries_base + binaries.extend(pkg_binary_paths) + for filename in checker.GetAllFilenames(): + pkg_by_any_filename[filename] = checker.pkgname + # Making the binaries unique + binaries = set(binaries) + ws_re = re.compile(r"\s+") + + # man ld.so.1 for more info on this hack + env = copy.copy(os.environ) + env["LD_NOAUXFLTR"] = "1" + needed_sonames_by_binary = {} + filenames_by_soname = {} + # Assembling a data structure with the data about binaries. + # { + # : { checkpkg.NEEDED_SONAMES: [...], + # checkpkg.RUNPATH: [...]}, + # : ..., + # ... + # } + # + for binary in binaries: + binary_base_name = binary.split("/")[-1] + args = [DUMP_BIN, "-Lv", binary] + dump_proc = subprocess.Popen(args, stdout=subprocess.PIPE, env=env) + stdout, stderr = dump_proc.communicate() + ret = dump_proc.wait() + binary_data = checkpkg.ParseDumpOutput(stdout) + needed_sonames_by_binary[binary_base_name] = binary_data + if checkpkg.SONAME not in binary_data: + logging.info("The %s shared library doesn't provide a SONAME.", + binary_base_name) + # The shared library doesn't tell its SONAME. We're guessing it's the + # same as the base file name. + binary_data[checkpkg.SONAME] = binary_base_name + filenames_by_soname[binary_data[checkpkg.SONAME]] = binary_base_name + + isalist = GetIsalist() + + # Building indexes by soname to simplify further processing + # These are indexes "by soname". + (needed_sonames, + binaries_by_soname, + runpath_by_needed_soname) = checkpkg.BuildIndexesBySoname( + needed_sonames_by_binary) + + pkgmap = checkpkg.SystemPkgmap() + logging.debug("Determining the soname-package relationships.") + # lines by soname is an equivalent of $EXTRACTDIR/shortcatalog + lines_by_soname = checkpkg.GetLinesBySoname( + pkgmap, needed_sonames, runpath_by_needed_soname, isalist) + + # Creating a map from files to packages. + pkgs_by_filename = {} + for soname, line in lines_by_soname.iteritems(): + # TODO: Find all the packages, not just the last field. + fields = re.split(ws_re, line.strip()) + # For now, we'll assume that the last field is the package. + pkgname = fields[-1] + pkgs_by_filename[soname] = pkgname + + # A shared object dependency/provisioning report, plus checking. + # + # This section is somewhat overlapping with checkpkg.AnalyzeDependencies(), + # it has a different purpose: it reports the relationships between shared + # libraries, binaries using them and packages providing them. Ideally, the + # same bit of code with do checking and reporting. + # + # TODO: Rewrite this using cheetah templates + if needed_sonames: + print "Analysis of sonames needed by the package set:" + binaries_with_missing_sonames = set([]) + for soname in needed_sonames: + logging.debug("Analyzing: %s", soname) + if soname in filenames_by_soname: + print "%s is provided by the package itself" % soname + elif soname in lines_by_soname: + print ("%s is provided by %s and required by:" + % (soname, + repr(pkgs_by_filename[soname]))) + filename_lines = " ".join(sorted(binaries_by_soname[soname])) + for line in textwrap.wrap(filename_lines, 70): + print " ", line + else: + print ("%s is required by %s, but we don't know what provides it." + % (soname, binaries_by_soname[soname])) + for binary in binaries_by_soname[soname]: + binaries_with_missing_sonames.add(binary) + if soname in checkpkg.ALLOWED_ORPHAN_SONAMES: + print "However, it's a whitelisted soname." + else: + errors.append( + checkpkg.Error("%s is required by %s, but " + "we don't know what provides it." + % (soname, binaries_by_soname[soname]))) + if binaries_with_missing_sonames: + print "The following are binaries with missing sonames:" + binary_lines = " ".join(sorted(binaries_with_missing_sonames)) + for line in textwrap.wrap(binary_lines, 70): + print " ", line + print + + dependent_pkgs = {} + for checker in checkers: + pkgname = checker.pkgname + declared_dependencies = checker.GetDependencies() + if options.debug: + sanitized_pkgname = pkgname.replace("-", "_") + data_file_name = "/var/tmp/checkpkg_test_data_%s.py" % sanitized_pkgname + logging.warn("Saving test data to %s." % repr(data_file_name)) + test_fd = open(data_file_name, "w") + print >>test_fd, "# Testing data for %s" % pkgname + print >>test_fd, "# $Id$" + print >>test_fd, "DATA_PKGNAME =", repr(pkgname) + print >>test_fd, "DATA_DECLARED_DEPENDENCIES =", repr(declared_dependencies) + print >>test_fd, "DATA_BINARIES_BY_PKGNAME =", repr(binaries_by_pkgname) + print >>test_fd, "DATA_NEEDED_SONAMES_BY_BINARY =", repr(needed_sonames_by_binary) + print >>test_fd, "DATA_PKGS_BY_FILENAME =", repr(pkgs_by_filename) + print >>test_fd, "DATA_FILENAMES_BY_SONAME =", repr(filenames_by_soname) + print >>test_fd, "DATA_PKG_BY_ANY_FILENAME =", repr(pkg_by_any_filename) + print >>test_fd, "DATA_LINES_BY_SONAME =", repr(lines_by_soname) + print >>test_fd, "DATA_PKGMAP_CACHE =", repr(pkgmap.cache) + print >>test_fd, "DATA_BINARIES_BY_SONAME =", repr(binaries_by_soname) + print >>test_fd, "DATA_ISALIST =", repr(isalist) + test_fd.close() + + missing_deps, surplus_deps, orphan_sonames = checkpkg.AnalyzeDependencies( + pkgname, + declared_dependencies, + binaries_by_pkgname, + needed_sonames_by_binary, + pkgs_by_filename, + filenames_by_soname, + pkg_by_any_filename) + + # TODO: Rewrite this using cheetah templates. + print "%s:" % pkgname + msg_printed = False + if missing_deps: + print "SUGGESTION: you may want to add some or all of the following as depends:" + print " (Feel free to ignore SUNW or SPRO packages)" + for dep_pkgname in sorted(missing_deps): + print ">", dep_pkgname + msg_printed = True + if surplus_deps: + print "The following packages might be unnecessary dependencies:" + for dep_pkgname in surplus_deps: + print "? ", dep_pkgname + msg_printed = True + if orphan_sonames: + print "The following sonames don't belong to any package:" + for soname in sorted(orphan_sonames): + errors.append(checkpkg.Error("The following soname does't belong to " + "any package: %s" % soname)) + print "! ", soname + msg_printed = True + if not msg_printed: + print "+ Dependencies of %s look good." % pkgname + print + + if errors: + for error in errors: + logging.error(error) + sys.exit(1) + else: + sys.exit(0) + + +if __name__ == '__main__': + main() + +# vim:set sw=2 ts=2 sts=2 expandtab: Deleted: csw/mgar/gar/v2/bin/checkpkg.d/checkpkg-obsolete-deps.py =================================================================== --- csw/mgar/gar/v2-checkpkg/bin/checkpkg.d/checkpkg-obsolete-deps.py 2010-01-04 03:57:34 UTC (rev 7855) +++ csw/mgar/gar/v2/bin/checkpkg.d/checkpkg-obsolete-deps.py 2010-01-04 10:28:15 UTC (rev 7856) @@ -1,43 +0,0 @@ -#!/opt/csw/bin/python2.6 -# $Id$ - -import checkpkg -import logging -import os.path -import sys - -OBSOLETE_DEPS = { - # "CSWfoo": { - # "hint": "Do this...", - # "url": "http://www.opencsw.org/bugtrack/view.php?id=..." - # }, - "CSWpython-rt": { - "hint": "CSWpython-rt is deprecated, use CSWpython instead.", - "url": "http://www.opencsw.org/bugtrack/view.php?id=4031" - }, -} - -def main(): - options, args = checkpkg.GetOptions() - ok = True - for pkgname in args: - pkgpath = os.path.join(options.extractdir, pkgname) - checker = checkpkg.CheckpkgBase(options.extractdir, pkgname) - deps = set(checker.GetDependencies()) - obsolete_pkg_deps = deps.intersection(set(OBSOLETE_DEPS)) - if obsolete_pkg_deps: - ok = False - for pkg in obsolete_pkg_deps: - print ("ERROR: Package %s should not depend on %s." - % (checker.pkgname, pkg)) - if "hint" in OBSOLETE_DEPS[pkg]: - print "Hint:", OBSOLETE_DEPS[pkg]["hint"] - if "url" in OBSOLETE_DEPS[pkg]: - print "URL:", OBSOLETE_DEPS[pkg]["url"] - if ok: - sys.exit(0) - else: - sys.exit(1) - -if __name__ == '__main__': - main() Copied: csw/mgar/gar/v2/bin/checkpkg.d/checkpkg-obsolete-deps.py (from rev 7855, csw/mgar/gar/v2-checkpkg/bin/checkpkg.d/checkpkg-obsolete-deps.py) =================================================================== --- csw/mgar/gar/v2/bin/checkpkg.d/checkpkg-obsolete-deps.py (rev 0) +++ csw/mgar/gar/v2/bin/checkpkg.d/checkpkg-obsolete-deps.py 2010-01-04 10:28:15 UTC (rev 7856) @@ -0,0 +1,43 @@ +#!/opt/csw/bin/python2.6 +# $Id$ + +import checkpkg +import logging +import os.path +import sys + +OBSOLETE_DEPS = { + # "CSWfoo": { + # "hint": "Do this...", + # "url": "http://www.opencsw.org/bugtrack/view.php?id=..." + # }, + "CSWpython-rt": { + "hint": "CSWpython-rt is deprecated, use CSWpython instead.", + "url": "http://www.opencsw.org/bugtrack/view.php?id=4031" + }, +} + +def main(): + options, args = checkpkg.GetOptions() + ok = True + for pkgname in args: + pkgpath = os.path.join(options.extractdir, pkgname) + checker = checkpkg.CheckpkgBase(options.extractdir, pkgname) + deps = set(checker.GetDependencies()) + obsolete_pkg_deps = deps.intersection(set(OBSOLETE_DEPS)) + if obsolete_pkg_deps: + ok = False + for pkg in obsolete_pkg_deps: + print ("ERROR: Package %s should not depend on %s." + % (checker.pkgname, pkg)) + if "hint" in OBSOLETE_DEPS[pkg]: + print "Hint:", OBSOLETE_DEPS[pkg]["hint"] + if "url" in OBSOLETE_DEPS[pkg]: + print "URL:", OBSOLETE_DEPS[pkg]["url"] + if ok: + sys.exit(0) + else: + sys.exit(1) + +if __name__ == '__main__': + main() Deleted: csw/mgar/gar/v2/bin/checkpkg.d/checkpkg.py =================================================================== --- csw/mgar/gar/v2-checkpkg/bin/checkpkg.d/checkpkg.py 2010-01-04 03:57:34 UTC (rev 7855) +++ csw/mgar/gar/v2/bin/checkpkg.d/checkpkg.py 2010-01-04 10:28:15 UTC (rev 7856) @@ -1,486 +0,0 @@ -# $Id$ -# -# This is the checkpkg library, common for all checkpkg tests written in -# Python. - -import itertools -import logging -import optparse -import os -import os.path -import re -import socket -import sqlite3 -import subprocess - -SYSTEM_PKGMAP = "/var/sadm/install/contents" -WS_RE = re.compile(r"\s+") -NEEDED_SONAMES = "needed sonames" -RUNPATH = "runpath" -SONAME = "soname" -CONFIG_MTIME = "mtime" -DO_NOT_REPORT_SURPLUS = set([u"CSWcommon", u"CSWcswclassutils", u"CSWisaexec"]) -DO_NOT_REPORT_MISSING = set([u"SUNWlibC", u"SUNWcsl", u"SUNWlibms", - u"*SUNWcslr", u"*SUNWlibC", u"*SUNWlibms"]) - -# This shared library is present on Solaris 10 on amd64, but it's missing on -# Solaris 8 on i386. It's okay if it's missing. -ALLOWED_ORPHAN_SONAMES = set([u"libm.so.2"]) - -class Error(Exception): - pass - - -class ConfigurationError(Error): - pass - - -class PackageError(Error): - pass - - -def GetOptions(): - parser = optparse.OptionParser() - parser.add_option("-e", dest="extractdir", - help="The directory into which the package has been extracted") - parser.add_option("-d", "--debug", dest="debug", - default=False, action="store_true", - help="Turn on debugging messages") - (options, args) = parser.parse_args() - if not options.extractdir: - raise ConfigurationError("ERROR: -e option is missing.") - # Using set() to make the arguments unique. - return options, set(args) - - -class CheckpkgBase(object): - """This class has functionality overlapping with DirectoryFormatPackage - from the opencsw.py library. The classes should be merged. - """ - - def __init__(self, extractdir, pkgname): - self.extractdir = extractdir - self.pkgname = pkgname - self.pkgpath = os.path.join(self.extractdir, self.pkgname) - - def CheckPkgpathExists(self): - if not os.path.isdir(self.pkgpath): - raise PackageError("%s does not exist or is not a directory" - % self.pkgpath) - - def ListBinaries(self): - """Shells out to list all the binaries from a given package. - - Original checkpkg code: - - # ######################################### - # # find all executables and dynamic libs,and list their filenames. - # listbinaries() { - # if [ ! -d $1 ] ; then - # print errmsg $1 not a directory - # rm -rf $EXTRACTDIR - # exit 1 - # fi - # - # find $1 -print | xargs file |grep ELF |nawk -F: '{print $1}' - # } - """ - self.CheckPkgpathExists() - find_tmpl = "find %s -print | xargs file | grep ELF | nawk -F: '{print $1}'" - find_proc = subprocess.Popen(find_tmpl % self.pkgpath, - shell=True, stdout=subprocess.PIPE) - stdout, stderr = find_proc.communicate() - ret = find_proc.wait() - if ret: - logging.error("The find command returned an error.") - return stdout.splitlines() - - def GetAllFilenames(self): - self.CheckPkgpathExists() - file_basenames = [] - for root, dirs, files in os.walk(self.pkgpath): - file_basenames.extend(files) - return file_basenames - - def GetDependencies(self): - fd = open(os.path.join(self.pkgpath, "install", "depend"), "r") - depends = {} - for line in fd: - fields = re.split(WS_RE, line) - if fields[0] == "P": - depends[fields[1]] = " ".join(fields[1:]) - fd.close() - return depends - - -class SystemPkgmap(object): - """A class to hold and manipulate the /var/sadm/install/contents file. - - TODO: Implement timestamp checking and refreshing the cache. - """ - - STOP_PKGS = ["SUNWbcp", "SUNWowbcp", "SUNWucb"] - CHECKPKG_DIR = ".checkpkg" - SQLITE3_DBNAME_TMPL = "var-sadm-install-contents-cache-%s" - - def __init__(self): - """There is no need to re-parse it each time. - - Read it slowly the first time and cache it for later.""" - self.cache = {} - self.checkpkg_dir = os.path.join(os.environ["HOME"], self.CHECKPKG_DIR) - self.fqdn = socket.getfqdn() - self.db_path = os.path.join(self.checkpkg_dir, - self.SQLITE3_DBNAME_TMPL % self.fqdn) - self.file_mtime = None - self.cache_mtime = None - if os.path.exists(self.db_path): - logging.debug("Connecting to the %s database.", self.db_path) - self.conn = sqlite3.connect(self.db_path) - if not self.IsDatabaseUpToDate(): - self.PurgeDatabase() - self.PopulateDatabase() - else: - print "Building a cache of /var/sadm/install/contents." - print "The cache will be kept in %s." % self.db_path - if not os.path.exists(self.checkpkg_dir): - logging.debug("Creating %s", self.checkpkg_dir) - os.mkdir(self.checkpkg_dir) - self.conn = sqlite3.connect(self.db_path) - c = self.conn.cursor() - c.execute(""" - CREATE TABLE systempkgmap ( - id INTEGER PRIMARY KEY, - basename TEXT, - path TEXT, - line TEXT - ); - """) - logging.debug("Creating the config table.") - c.execute(""" - CREATE TABLE config ( - key VARCHAR(255) PRIMARY KEY, - float_value FLOAT, - str_value VARCHAR(255) - ); - """) - self.PopulateDatabase() - - def PopulateDatabase(self): - """Imports data into the database. - - Original bit of code from checkpkg: - - egrep -v 'SUNWbcp|SUNWowbcp|SUNWucb' /var/sadm/install/contents | - fgrep -f $EXTRACTDIR/liblist >$EXTRACTDIR/shortcatalog - """ - - system_pkgmap_fd = open(SYSTEM_PKGMAP, "r") - stop_re = re.compile("(%s)" % "|".join(self.STOP_PKGS)) - # Creating a data structure: - # soname - {: , : , ...} - logging.debug("Building sqlite3 cache db of the %s file", - SYSTEM_PKGMAP) - c = self.conn.cursor() - count = itertools.count() - for line in system_pkgmap_fd: - i = count.next() - if not i % 1000: - print "\r%s" % i, - if stop_re.search(line): - continue - fields = re.split(WS_RE, line) - pkgmap_entry_path = fields[0].split("=")[0] - pkgmap_entry_dir, pkgmap_entry_base_name = os.path.split(pkgmap_entry_path) - sql = "INSERT INTO systempkgmap (basename, path, line) VALUES (?, ?, ?);" - c.execute(sql, (pkgmap_entry_base_name, pkgmap_entry_dir, line.strip())) - print - print "Creating the main database index." - sql = "CREATE INDEX basename_idx ON systempkgmap(basename);" - c.execute(sql) - self.SetDatabaseMtime() - self.conn.commit() - - def SetDatabaseMtime(self): - c = self.conn.cursor() - sql = "DELETE FROM config WHERE key = ?;" - c.execute(sql, [CONFIG_MTIME]) - mtime = self.GetFileMtime() - logging.debug("Inserting the mtime (%s) into the database.", mtime) - sql = """ - INSERT INTO config (key, float_value) - VALUES (?, ?); - """ - c.execute(sql, [CONFIG_MTIME, mtime]) - - def GetPkgmapLineByBasename(self, filename): - if filename in self.cache: - return self.cache[filename] - sql = "SELECT path, line FROM systempkgmap WHERE basename = ?;" - c = self.conn.cursor() - c.execute(sql, [filename]) - lines = {} - for row in c: - lines[row[0]] = row[1] - if len(lines) == 0: - logging.debug("Cache doesn't contain filename %s", filename) - self.cache[filename] = lines - return lines - - def GetDatabaseMtime(self): - if not self.cache_mtime: - sql = """ - SELECT float_value FROM config - WHERE key = ?; - """ - c = self.conn.cursor() - c.execute(sql, [CONFIG_MTIME]) - row = c.fetchone() - if not row: - # raise ConfigurationError("Could not find the mtime setting") - self.cache_mtime = 1 - else: - self.cache_mtime = row[0] - return self.cache_mtime - - def GetFileMtime(self): - if not self.file_mtime: - stat_data = os.stat(SYSTEM_PKGMAP) - self.file_mtime = stat_data.st_mtime - return self.file_mtime - - def IsDatabaseUpToDate(self): - f_mtime = self.GetFileMtime() - d_mtime = self.GetDatabaseMtime() - logging.debug("f_mtime", f_mtime, "d_time", d_mtime) - return self.GetFileMtime() <= self.GetDatabaseMtime() - - def PurgeDatabase(self): - c = self.conn.cursor() - sql = "DELETE FROM config;" - c.execute(sql) - sql = "DELETE FROM systempkgmap;" - c.execute(sql) - sql = "DROP INDEX basename_idx;" - try: - c.execute(sql) - except sqlite3.OperationalError, e: - logging.warn(e) - -def SharedObjectDependencies(pkgname, - binaries_by_pkgname, - needed_sonames_by_binary, - pkgs_by_soname, - filenames_by_soname, - pkg_by_any_filename): - """This is one of the more obscure and more important pieces of code. - - I tried to make it simpler, but given that the operations here involve - whole sets of packages, it's not easy. - """ - so_dependencies = set() - orphan_sonames = set() - self_provided = set() - for binary in binaries_by_pkgname[pkgname]: - needed_sonames = needed_sonames_by_binary[binary][NEEDED_SONAMES] - for soname in needed_sonames: - if soname in filenames_by_soname: - filename = filenames_by_soname[soname] - pkg = pkg_by_any_filename[filename] - self_provided.add(soname) - so_dependencies.add(pkg) - elif soname in pkgs_by_soname: - so_dependencies.add(pkgs_by_soname[soname]) - else: - orphan_sonames.add(soname) - return so_dependencies, self_provided, orphan_sonames - - -def GuessDepsByFilename(pkgname, pkg_by_any_filename): - """Guesses dependencies based on filename regexes.""" - guessed_deps = set() - patterns = ( - (r".*\.py", u"CSWpython"), - (r".*\.pl", u"CSWperl"), - (r".*\.rb", u"CSWruby"), - ) - for pattern, dep_pkgname in patterns: - # If any file name matches, add the dep, go to the next pattern/pkg - # combination. - pattern_re = re.compile("^%s$" % pattern) - for filename in pkg_by_any_filename: - if (re.match(pattern_re, filename) - and - pkgname == pkg_by_any_filename[filename]): - guessed_deps.add(dep_pkgname) - break - return guessed_deps - - -def GuessDepsByPkgname(pkgname, pkg_by_any_filename): - # More guessed dependencies: If one package is a substring of another, it - # might be a hint. For example, CSWmysql51test should depend on CSWmysql51. - # However, the rt (runtime) packages should not want to depend on the main - # package. - guessed_deps = set() - all_other_pkgs = set(pkg_by_any_filename.values()) - for other_pkg in all_other_pkgs: - other_pkg = unicode(other_pkg) - if pkgname == other_pkg: - continue - if pkgname.startswith(other_pkg): - endings = ["devel", "test", "bench", "dev"] - for ending in endings: - if pkgname.endswith(ending): - guessed_deps.add(other_pkg) - return guessed_deps - - -def AnalyzeDependencies(pkgname, - declared_dependencies, - binaries_by_pkgname, - needed_sonames_by_binary, - pkgs_by_soname, - filenames_by_soname, - pkg_by_any_filename): - """Gathers and merges dependency results from other functions. - - declared_dependencies: Dependencies that the package in question claims to - have. - - binaries_by_pkgname: A dictionary mapping pkgnames (CSWfoo) to binary names - (without paths) - - needed_sonames_by_binary: A dictionary mapping binary file name to - a dictionary containing: "needed sonames", - "soname", "rpath". Based on examining the binary - files within the packages. - - pkgs_by_soname: A dictionary mapping sonames to pkgnames, based on the - contents of the system wide pkgmap - (/var/sadm/install/contents) - - filenames_by_soname: A dictionary mapping shared library sonames to filenames, - based on files within packages - - pkg_by_any_filename: Mapping from file names to packages names, based on the - contents of the packages under examination. - """ - declared_dependencies_set = set(declared_dependencies) - - so_dependencies, self_provided, orphan_sonames = SharedObjectDependencies( - pkgname, - binaries_by_pkgname, - needed_sonames_by_binary, - pkgs_by_soname, - filenames_by_soname, - pkg_by_any_filename) - auto_dependencies = reduce(lambda x, y: x.union(y), - [ - so_dependencies, - GuessDepsByFilename(pkgname, pkg_by_any_filename), - GuessDepsByPkgname(pkgname, pkg_by_any_filename), - ]) - missing_deps = auto_dependencies.difference(declared_dependencies_set) - # Don't report itself as a suggested dependency. - missing_deps = missing_deps.difference(set([pkgname])) - missing_deps = missing_deps.difference(set(DO_NOT_REPORT_MISSING)) - surplus_deps = declared_dependencies_set.difference(auto_dependencies) - surplus_deps = surplus_deps.difference(DO_NOT_REPORT_SURPLUS) - orphan_sonames = orphan_sonames.difference(ALLOWED_ORPHAN_SONAMES) - return missing_deps, surplus_deps, orphan_sonames - - -def ExpandRunpath(runpath, isalist): - # Emulating $ISALIST expansion - if '$ISALIST' in runpath: - expanded_list = [runpath.replace('$ISALIST', isa) for isa in isalist] - else: - expanded_list = [runpath] - return expanded_list - -def Emulate64BitSymlinks(runpath_list): - """Need to emulate the 64 -> amd64, 64 -> sparcv9 symlink - - Since we don't know the architecture, we'll adding both amd64 and sparcv9. - It should be safe. - """ - symlinked_list = [] - for runpath in runpath_list: - if "/64" in runpath: - symlinked_list.append(runpath.replace("/64", "/amd64")) - symlinked_list.append(runpath.replace("/64", "/sparcv9")) - else: - symlinked_list.append(runpath) - return symlinked_list - - -def GetLinesBySoname(pkgmap, needed_sonames, runpath_by_needed_soname, isalist): - """Works out which system pkgmap lines correspond to given sonames.""" - lines_by_soname = {} - for soname in needed_sonames: - # This is the critical part of the algorithm: it iterates over the - # runpath and finds the first matching one. - runpath_found = False - for runpath in runpath_by_needed_soname[soname]: - runpath_list = ExpandRunpath(runpath, isalist) - runpath_list = Emulate64BitSymlinks(runpath_list) - soname_runpath_data = pkgmap.GetPkgmapLineByBasename(soname) - logging.debug("%s: will be looking for %s in %s" % - (soname, runpath_list, soname_runpath_data.keys())) - for runpath_expanded in runpath_list: - if runpath_expanded in soname_runpath_data: - lines_by_soname[soname] = soname_runpath_data[runpath_expanded] - runpath_found = True - # This break only goes out of the inner loop, - # need another one below to finish the outer loop. - break - if runpath_found: - break - return lines_by_soname - - -def BuildIndexesBySoname(needed_sonames_by_binary): - """Builds data structures indexed by soname. - - Building indexes - {"foo.so": ["/opt/csw/lib/gcc4", "/opt/csw/lib", ...], - ... - } - """ - needed_sonames = set() - binaries_by_soname = {} - runpath_by_needed_soname = {} - for binary_name, data in needed_sonames_by_binary.iteritems(): - for soname in data[NEEDED_SONAMES]: - needed_sonames.add(soname) - if soname not in runpath_by_needed_soname: - runpath_by_needed_soname[soname] = [] - runpath_by_needed_soname[soname].extend(data[RUNPATH]) - if soname not in binaries_by_soname: - binaries_by_soname[soname] = set() - binaries_by_soname[soname].add(binary_name) - return needed_sonames, binaries_by_soname, runpath_by_needed_soname - - -def ParseDumpOutput(dump_output): - binary_data = {RUNPATH: [], - NEEDED_SONAMES: []} - for line in dump_output.splitlines(): - fields = re.split(WS_RE, line) - # TODO: Make it a unit test - # logging.debug("%s says: %s", DUMP_BIN, fields) - if len(fields) < 3: - continue - if fields[1] == "NEEDED": - binary_data[NEEDED_SONAMES].append(fields[2]) - elif fields[1] == "RUNPATH": - binary_data[RUNPATH].extend(fields[2].split(":")) - elif fields[1] == "SONAME": - binary_data[SONAME] = fields[2] - # Adding the default runtime path search option. - binary_data[RUNPATH].append("/usr/lib/$ISALIST") - binary_data[RUNPATH].append("/usr/lib") - binary_data[RUNPATH].append("/lib/$ISALIST") - binary_data[RUNPATH].append("/lib") - return binary_data Copied: csw/mgar/gar/v2/bin/checkpkg.d/checkpkg.py (from rev 7855, csw/mgar/gar/v2-checkpkg/bin/checkpkg.d/checkpkg.py) =================================================================== --- csw/mgar/gar/v2/bin/checkpkg.d/checkpkg.py (rev 0) +++ csw/mgar/gar/v2/bin/checkpkg.d/checkpkg.py 2010-01-04 10:28:15 UTC (rev 7856) @@ -0,0 +1,486 @@ +# $Id$ +# +# This is the checkpkg library, common for all checkpkg tests written in +# Python. + +import itertools +import logging +import optparse +import os +import os.path +import re +import socket +import sqlite3 +import subprocess + +SYSTEM_PKGMAP = "/var/sadm/install/contents" +WS_RE = re.compile(r"\s+") +NEEDED_SONAMES = "needed sonames" +RUNPATH = "runpath" +SONAME = "soname" +CONFIG_MTIME = "mtime" +DO_NOT_REPORT_SURPLUS = set([u"CSWcommon", u"CSWcswclassutils", u"CSWisaexec"]) +DO_NOT_REPORT_MISSING = set([u"SUNWlibC", u"SUNWcsl", u"SUNWlibms", + u"*SUNWcslr", u"*SUNWlibC", u"*SUNWlibms"]) + +# This shared library is present on Solaris 10 on amd64, but it's missing on +# Solaris 8 on i386. It's okay if it's missing. +ALLOWED_ORPHAN_SONAMES = set([u"libm.so.2"]) + +class Error(Exception): + pass + + +class ConfigurationError(Error): + pass + + +class PackageError(Error): + pass + + +def GetOptions(): + parser = optparse.OptionParser() + parser.add_option("-e", dest="extractdir", + help="The directory into which the package has been extracted") + parser.add_option("-d", "--debug", dest="debug", + default=False, action="store_true", + help="Turn on debugging messages") + (options, args) = parser.parse_args() + if not options.extractdir: + raise ConfigurationError("ERROR: -e option is missing.") + # Using set() to make the arguments unique. + return options, set(args) + + +class CheckpkgBase(object): + """This class has functionality overlapping with DirectoryFormatPackage + from the opencsw.py library. The classes should be merged. + """ + + def __init__(self, extractdir, pkgname): + self.extractdir = extractdir + self.pkgname = pkgname + self.pkgpath = os.path.join(self.extractdir, self.pkgname) + + def CheckPkgpathExists(self): + if not os.path.isdir(self.pkgpath): + raise PackageError("%s does not exist or is not a directory" + % self.pkgpath) + + def ListBinaries(self): + """Shells out to list all the binaries from a given package. + + Original checkpkg code: + + # ######################################### + # # find all executables and dynamic libs,and list their filenames. + # listbinaries() { + # if [ ! -d $1 ] ; then + # print errmsg $1 not a directory + # rm -rf $EXTRACTDIR + # exit 1 + # fi + # + # find $1 -print | xargs file |grep ELF |nawk -F: '{print $1}' + # } + """ + self.CheckPkgpathExists() + find_tmpl = "find %s -print | xargs file | grep ELF | nawk -F: '{print $1}'" + find_proc = subprocess.Popen(find_tmpl % self.pkgpath, + shell=True, stdout=subprocess.PIPE) + stdout, stderr = find_proc.communicate() + ret = find_proc.wait() + if ret: + logging.error("The find command returned an error.") + return stdout.splitlines() + + def GetAllFilenames(self): + self.CheckPkgpathExists() + file_basenames = [] + for root, dirs, files in os.walk(self.pkgpath): + file_basenames.extend(files) + return file_basenames + + def GetDependencies(self): + fd = open(os.path.join(self.pkgpath, "install", "depend"), "r") + depends = {} + for line in fd: + fields = re.split(WS_RE, line) + if fields[0] == "P": + depends[fields[1]] = " ".join(fields[1:]) + fd.close() + return depends + + +class SystemPkgmap(object): + """A class to hold and manipulate the /var/sadm/install/contents file. + + TODO: Implement timestamp checking and refreshing the cache. + """ + + STOP_PKGS = ["SUNWbcp", "SUNWowbcp", "SUNWucb"] + CHECKPKG_DIR = ".checkpkg" + SQLITE3_DBNAME_TMPL = "var-sadm-install-contents-cache-%s" + + def __init__(self): + """There is no need to re-parse it each time. + + Read it slowly the first time and cache it for later.""" + self.cache = {} + self.checkpkg_dir = os.path.join(os.environ["HOME"], self.CHECKPKG_DIR) + self.fqdn = socket.getfqdn() + self.db_path = os.path.join(self.checkpkg_dir, + self.SQLITE3_DBNAME_TMPL % self.fqdn) + self.file_mtime = None + self.cache_mtime = None + if os.path.exists(self.db_path): + logging.debug("Connecting to the %s database.", self.db_path) + self.conn = sqlite3.connect(self.db_path) + if not self.IsDatabaseUpToDate(): + self.PurgeDatabase() + self.PopulateDatabase() + else: + print "Building a cache of /var/sadm/install/contents." + print "The cache will be kept in %s." % self.db_path + if not os.path.exists(self.checkpkg_dir): + logging.debug("Creating %s", self.checkpkg_dir) + os.mkdir(self.checkpkg_dir) + self.conn = sqlite3.connect(self.db_path) + c = self.conn.cursor() + c.execute(""" + CREATE TABLE systempkgmap ( + id INTEGER PRIMARY KEY, + basename TEXT, + path TEXT, + line TEXT + ); + """) + logging.debug("Creating the config table.") + c.execute(""" + CREATE TABLE config ( + key VARCHAR(255) PRIMARY KEY, + float_value FLOAT, + str_value VARCHAR(255) + ); + """) + self.PopulateDatabase() + + def PopulateDatabase(self): + """Imports data into the database. + + Original bit of code from checkpkg: + + egrep -v 'SUNWbcp|SUNWowbcp|SUNWucb' /var/sadm/install/contents | + fgrep -f $EXTRACTDIR/liblist >$EXTRACTDIR/shortcatalog + """ + + system_pkgmap_fd = open(SYSTEM_PKGMAP, "r") + stop_re = re.compile("(%s)" % "|".join(self.STOP_PKGS)) + # Creating a data structure: + # soname - {: , : , ...} + logging.debug("Building sqlite3 cache db of the %s file", + SYSTEM_PKGMAP) + c = self.conn.cursor() + count = itertools.count() + for line in system_pkgmap_fd: + i = count.next() + if not i % 1000: + print "\r%s" % i, + if stop_re.search(line): + continue + fields = re.split(WS_RE, line) + pkgmap_entry_path = fields[0].split("=")[0] + pkgmap_entry_dir, pkgmap_entry_base_name = os.path.split(pkgmap_entry_path) + sql = "INSERT INTO systempkgmap (basename, path, line) VALUES (?, ?, ?);" + c.execute(sql, (pkgmap_entry_base_name, pkgmap_entry_dir, line.strip())) + print + print "Creating the main database index." + sql = "CREATE INDEX basename_idx ON systempkgmap(basename);" + c.execute(sql) + self.SetDatabaseMtime() + self.conn.commit() + + def SetDatabaseMtime(self): + c = self.conn.cursor() + sql = "DELETE FROM config WHERE key = ?;" + c.execute(sql, [CONFIG_MTIME]) + mtime = self.GetFileMtime() + logging.debug("Inserting the mtime (%s) into the database.", mtime) + sql = """ + INSERT INTO config (key, float_value) + VALUES (?, ?); + """ + c.execute(sql, [CONFIG_MTIME, mtime]) + + def GetPkgmapLineByBasename(self, filename): + if filename in self.cache: + return self.cache[filename] + sql = "SELECT path, line FROM systempkgmap WHERE basename = ?;" + c = self.conn.cursor() + c.execute(sql, [filename]) + lines = {} + for row in c: + lines[row[0]] = row[1] + if len(lines) == 0: + logging.debug("Cache doesn't contain filename %s", filename) + self.cache[filename] = lines + return lines + + def GetDatabaseMtime(self): + if not self.cache_mtime: + sql = """ + SELECT float_value FROM config + WHERE key = ?; + """ + c = self.conn.cursor() + c.execute(sql, [CONFIG_MTIME]) + row = c.fetchone() + if not row: + # raise ConfigurationError("Could not find the mtime setting") + self.cache_mtime = 1 + else: + self.cache_mtime = row[0] + return self.cache_mtime + + def GetFileMtime(self): + if not self.file_mtime: + stat_data = os.stat(SYSTEM_PKGMAP) + self.file_mtime = stat_data.st_mtime + return self.file_mtime + + def IsDatabaseUpToDate(self): + f_mtime = self.GetFileMtime() + d_mtime = self.GetDatabaseMtime() + logging.debug("f_mtime", f_mtime, "d_time", d_mtime) + return self.GetFileMtime() <= self.GetDatabaseMtime() + + def PurgeDatabase(self): + c = self.conn.cursor() + sql = "DELETE FROM config;" + c.execute(sql) + sql = "DELETE FROM systempkgmap;" + c.execute(sql) + sql = "DROP INDEX basename_idx;" + try: + c.execute(sql) + except sqlite3.OperationalError, e: + logging.warn(e) + +def SharedObjectDependencies(pkgname, + binaries_by_pkgname, + needed_sonames_by_binary, + pkgs_by_soname, + filenames_by_soname, + pkg_by_any_filename): + """This is one of the more obscure and more important pieces of code. + + I tried to make it simpler, but given that the operations here involve + whole sets of packages, it's not easy. + """ + so_dependencies = set() + orphan_sonames = set() + self_provided = set() + for binary in binaries_by_pkgname[pkgname]: + needed_sonames = needed_sonames_by_binary[binary][NEEDED_SONAMES] + for soname in needed_sonames: + if soname in filenames_by_soname: + filename = filenames_by_soname[soname] + pkg = pkg_by_any_filename[filename] + self_provided.add(soname) + so_dependencies.add(pkg) + elif soname in pkgs_by_soname: + so_dependencies.add(pkgs_by_soname[soname]) + else: + orphan_sonames.add(soname) + return so_dependencies, self_provided, orphan_sonames + + +def GuessDepsByFilename(pkgname, pkg_by_any_filename): + """Guesses dependencies based on filename regexes.""" + guessed_deps = set() + patterns = ( + (r".*\.py", u"CSWpython"), + (r".*\.pl", u"CSWperl"), + (r".*\.rb", u"CSWruby"), + ) + for pattern, dep_pkgname in patterns: + # If any file name matches, add the dep, go to the next pattern/pkg + # combination. + pattern_re = re.compile("^%s$" % pattern) + for filename in pkg_by_any_filename: + if (re.match(pattern_re, filename) + and + pkgname == pkg_by_any_filename[filename]): + guessed_deps.add(dep_pkgname) + break + return guessed_deps + + +def GuessDepsByPkgname(pkgname, pkg_by_any_filename): + # More guessed dependencies: If one package is a substring of another, it + # might be a hint. For example, CSWmysql51test should depend on CSWmysql51. + # However, the rt (runtime) packages should not want to depend on the main + # package. + guessed_deps = set() + all_other_pkgs = set(pkg_by_any_filename.values()) + for other_pkg in all_other_pkgs: + other_pkg = unicode(other_pkg) + if pkgname == other_pkg: + continue + if pkgname.startswith(other_pkg): + endings = ["devel", "test", "bench", "dev"] + for ending in endings: + if pkgname.endswith(ending): + guessed_deps.add(other_pkg) + return guessed_deps + + +def AnalyzeDependencies(pkgname, + declared_dependencies, + binaries_by_pkgname, + needed_sonames_by_binary, + pkgs_by_soname, + filenames_by_soname, + pkg_by_any_filename): + """Gathers and merges dependency results from other functions. + + declared_dependencies: Dependencies that the package in question claims to + have. + + binaries_by_pkgname: A dictionary mapping pkgnames (CSWfoo) to binary names + (without paths) + + needed_sonames_by_binary: A dictionary mapping binary file name to + a dictionary containing: "needed sonames", + "soname", "rpath". Based on examining the binary + files within the packages. + + pkgs_by_soname: A dictionary mapping sonames to pkgnames, based on the + contents of the system wide pkgmap + (/var/sadm/install/contents) + + filenames_by_soname: A dictionary mapping shared library sonames to filenames, + based on files within packages + + pkg_by_any_filename: Mapping from file names to packages names, based on the + contents of the packages under examination. + """ + declared_dependencies_set = set(declared_dependencies) + + so_dependencies, self_provided, orphan_sonames = SharedObjectDependencies( + pkgname, + binaries_by_pkgname, + needed_sonames_by_binary, + pkgs_by_soname, + filenames_by_soname, + pkg_by_any_filename) + auto_dependencies = reduce(lambda x, y: x.union(y), + [ + so_dependencies, + GuessDepsByFilename(pkgname, pkg_by_any_filename), + GuessDepsByPkgname(pkgname, pkg_by_any_filename), + ]) + missing_deps = auto_dependencies.difference(declared_dependencies_set) + # Don't report itself as a suggested dependency. + missing_deps = missing_deps.difference(set([pkgname])) + missing_deps = missing_deps.difference(set(DO_NOT_REPORT_MISSING)) + surplus_deps = declared_dependencies_set.difference(auto_dependencies) + surplus_deps = surplus_deps.difference(DO_NOT_REPORT_SURPLUS) + orphan_sonames = orphan_sonames.difference(ALLOWED_ORPHAN_SONAMES) + return missing_deps, surplus_deps, orphan_sonames + + +def ExpandRunpath(runpath, isalist): + # Emulating $ISALIST expansion + if '$ISALIST' in runpath: + expanded_list = [runpath.replace('$ISALIST', isa) for isa in isalist] + else: + expanded_list = [runpath] + return expanded_list + +def Emulate64BitSymlinks(runpath_list): + """Need to emulate the 64 -> amd64, 64 -> sparcv9 symlink + + Since we don't know the architecture, we'll adding both amd64 and sparcv9. + It should be safe. + """ + symlinked_list = [] + for runpath in runpath_list: + if "/64" in runpath: + symlinked_list.append(runpath.replace("/64", "/amd64")) + symlinked_list.append(runpath.replace("/64", "/sparcv9")) + else: + symlinked_list.append(runpath) + return symlinked_list + + +def GetLinesBySoname(pkgmap, needed_sonames, runpath_by_needed_soname, isalist): + """Works out which system pkgmap lines correspond to given sonames.""" + lines_by_soname = {} + for soname in needed_sonames: + # This is the critical part of the algorithm: it iterates over the + # runpath and finds the first matching one. + runpath_found = False + for runpath in runpath_by_needed_soname[soname]: + runpath_list = ExpandRunpath(runpath, isalist) + runpath_list = Emulate64BitSymlinks(runpath_list) + soname_runpath_data = pkgmap.GetPkgmapLineByBasename(soname) + logging.debug("%s: will be looking for %s in %s" % + (soname, runpath_list, soname_runpath_data.keys())) + for runpath_expanded in runpath_list: + if runpath_expanded in soname_runpath_data: + lines_by_soname[soname] = soname_runpath_data[runpath_expanded] + runpath_found = True + # This break only goes out of the inner loop, + # need another one below to finish the outer loop. + break + if runpath_found: + break + return lines_by_soname + + +def BuildIndexesBySoname(needed_sonames_by_binary): + """Builds data structures indexed by soname. + + Building indexes + {"foo.so": ["/opt/csw/lib/gcc4", "/opt/csw/lib", ...], + ... + } + """ + needed_sonames = set() + binaries_by_soname = {} + runpath_by_needed_soname = {} + for binary_name, data in needed_sonames_by_binary.iteritems(): + for soname in data[NEEDED_SONAMES]: + needed_sonames.add(soname) + if soname not in runpath_by_needed_soname: + runpath_by_needed_soname[soname] = [] + runpath_by_needed_soname[soname].extend(data[RUNPATH]) + if soname not in binaries_by_soname: + binaries_by_soname[soname] = set() + binaries_by_soname[soname].add(binary_name) + return needed_sonames, binaries_by_soname, runpath_by_needed_soname + + +def ParseDumpOutput(dump_output): + binary_data = {RUNPATH: [], + NEEDED_SONAMES: []} + for line in dump_output.splitlines(): + fields = re.split(WS_RE, line) + # TODO: Make it a unit test + # logging.debug("%s says: %s", DUMP_BIN, fields) + if len(fields) < 3: + continue + if fields[1] == "NEEDED": + binary_data[NEEDED_SONAMES].append(fields[2]) + elif fields[1] == "RUNPATH": + binary_data[RUNPATH].extend(fields[2].split(":")) + elif fields[1] == "SONAME": + binary_data[SONAME] = fields[2] + # Adding the default runtime path search option. + binary_data[RUNPATH].append("/usr/lib/$ISALIST") + binary_data[RUNPATH].append("/usr/lib") + binary_data[RUNPATH].append("/lib/$ISALIST") + binary_data[RUNPATH].append("/lib") + return binary_data Deleted: csw/mgar/gar/v2/bin/checkpkg.d/checkpkg_test.py =================================================================== --- csw/mgar/gar/v2-checkpkg/bin/checkpkg.d/checkpkg_test.py 2010-01-04 03:57:34 UTC (rev 7855) +++ csw/mgar/gar/v2/bin/checkpkg.d/checkpkg_test.py 2010-01-04 10:28:15 UTC (rev 7856) @@ -1,438 +0,0 @@ -#!/opt/csw/bin/python2.6 -# $Id$ - -import unittest -import mox -import checkpkg -import testdata.checkpkg_test_data_CSWmysql51rt as d1 -import testdata.checkpkg_test_data_CSWmysql51client as d2 -import testdata.checkpkg_test_data_CSWmysql51 as d3 -import testdata.checkpkg_test_data_CSWmysql51devel as d4 -import testdata.checkpkg_test_data_CSWlibpq_84 as d5 -import testdata.checkpkg_test_data_CSWmysql5client_8x as d6 -import testdata.dump_output_1 as dump_1 -import testdata.dump_output_2 as dump_2 - -"""A set of unit tests for the library checking code. - -A bunch of lines to test in the interactive Python shell. - -import sys -sys.path.append("gar/bin/checkpkg.d") -import checkpkg -import testdata.checkpkg_test_data_CSWmysql5client_8x as d6 - -checkpkg.SharedObjectDependencies("CSWmysql5client", -d6.DATA_BINARIES_BY_PKGNAME, d6.DATA_NEEDED_SONAMES_BY_BINARY, -d6.DATA_PKGS_BY_FILENAME, d6.DATA_FILENAMES_BY_SONAME, -d6.DATA_PKG_BY_ANY_FILENAME) - -sqlite3 ~/.checkpkg/var-sadm-install-contents-cache-build8x -SELECT * FROM systempkgmap WHERE basename = 'libncursesw.so.5'; -""" - -class DependenciesUnitTest_1(unittest.TestCase): - - def setUp(self): - self.missing_deps, self.surplus_deps, self.orphan_sonames = checkpkg.AnalyzeDependencies( - d1.DATA_PKGNAME, - d1.DATA_DECLARED_DEPENDENCIES, - d1.DATA_BINARIES_BY_PKGNAME, - d1.DATA_NEEDED_SONAMES_BY_BINARY, - d1.DATA_PKGS_BY_FILENAME, - d1.DATA_FILENAMES_BY_SONAME, - d1.DATA_PKG_BY_ANY_FILENAME, - ) - - def testSurplusDeps(self): - self.assertEquals(set([]), self.surplus_deps) - - def testOrphanSonames(self): - self.assertEquals(set([]), self.orphan_sonames) - - def testMissingDeps(self): - expected = set([]) - self.assertEquals(expected, self.missing_deps) - - -class DependenciesUnitTest_2(unittest.TestCase): - - def setUp(self): - self.missing_deps, self.surplus_deps, self.orphan_sonames = checkpkg.AnalyzeDependencies( - d2.DATA_PKGNAME, - d2.DATA_DECLARED_DEPENDENCIES, - d2.DATA_BINARIES_BY_PKGNAME, - d2.DATA_NEEDED_SONAMES_BY_BINARY, - d2.DATA_PKGS_BY_FILENAME, - d2.DATA_FILENAMES_BY_SONAME, - d2.DATA_PKG_BY_ANY_FILENAME, - ) - - def testSurplusDeps(self): - self.assertEquals(set([]), self.surplus_deps) - - def testOrphanSonames(self): - self.assertEquals(set([]), self.orphan_sonames) - - def testMissingDeps(self): - expected = set([]) - self.assertEquals(expected, self.missing_deps) - - -class DependenciesUnitTest_3(unittest.TestCase): - - def setUp(self): - self.missing_deps, self.surplus_deps, self.orphan_sonames = checkpkg.AnalyzeDependencies( - d3.DATA_PKGNAME, - d3.DATA_DECLARED_DEPENDENCIES, - d3.DATA_BINARIES_BY_PKGNAME, - d3.DATA_NEEDED_SONAMES_BY_BINARY, - d3.DATA_PKGS_BY_FILENAME, - d3.DATA_FILENAMES_BY_SONAME, - d3.DATA_PKG_BY_ANY_FILENAME, - ) - - def testSurplusDeps(self): - self.assertEquals(set([u'CSWmysql51client']), self.surplus_deps) - - def testOrphanSonames(self): - self.assertEquals(set([]), self.orphan_sonames) - - def testMissingDeps(self): - expected = set(['CSWmysql51rt']) - self.assertEquals(expected, self.missing_deps) - - -class DependenciesUnitTest_4(unittest.TestCase): - - def setUp(self): - self.missing_deps, self.surplus_deps, self.orphan_sonames = checkpkg.AnalyzeDependencies( - d4.DATA_PKGNAME, - d4.DATA_DECLARED_DEPENDENCIES, - d4.DATA_BINARIES_BY_PKGNAME, - d4.DATA_NEEDED_SONAMES_BY_BINARY, - d4.DATA_PKGS_BY_FILENAME, - d4.DATA_FILENAMES_BY_SONAME, - d4.DATA_PKG_BY_ANY_FILENAME, - ) - - def testSurplusDeps(self): - self.assertEquals(set([]), self.surplus_deps) - - def testOrphanSonames(self): - self.assertEquals(set([]), self.orphan_sonames) - - def testMissingDeps(self): - expected = set([]) - self.assertEquals(expected, self.missing_deps) - - -class DependenciesUnitTest_5(unittest.TestCase): - - def setUp(self): - self.missing_deps, self.surplus_deps, self.orphan_sonames = checkpkg.AnalyzeDependencies( - d5.DATA_PKGNAME, - d5.DATA_DECLARED_DEPENDENCIES, - d5.DATA_BINARIES_BY_PKGNAME, - d5.DATA_NEEDED_SONAMES_BY_BINARY, - d5.DATA_PKGS_BY_FILENAME, - d5.DATA_FILENAMES_BY_SONAME, - d5.DATA_PKG_BY_ANY_FILENAME, - ) - - def testSurplusDeps(self): - self.assertEquals(set([]), self.surplus_deps) - - def testOrphanSonames(self): - self.assertEquals(set([]), self.orphan_sonames) - - def testMissingDeps(self): - # This tends to report itself... - expected = set([u'SUNWgss']) - self.assertEquals(expected, self.missing_deps) - - -class DependenciesUnitTest_6(unittest.TestCase): - - def setUp(self): - (self.missing_deps, - self.surplus_deps, - self.orphan_sonames) = checkpkg.AnalyzeDependencies( - d6.DATA_PKGNAME, - d6.DATA_DECLARED_DEPENDENCIES, - d6.DATA_BINARIES_BY_PKGNAME, - d6.DATA_NEEDED_SONAMES_BY_BINARY, - d6.DATA_PKGS_BY_FILENAME, - d6.DATA_FILENAMES_BY_SONAME, - d6.DATA_PKG_BY_ANY_FILENAME, - ) - - def testSurplusDeps(self): - self.assertEquals(set([]), self.surplus_deps) - - def testOrphanSonames(self): - self.assertEquals(set([]), self.orphan_sonames) - - def testMissingDeps(self): - expected = set([]) - self.assertEquals(expected, self.missing_deps) - - -class GuessDepsUnitTest(unittest.TestCase): - - def testGuessDepsByFilename1(self): - expected = set([u"CSWpython"]) - pkgname = u"CSWfoo" - pkg_by_filename = { - "/opt/csw/bin/bar": u"CSWfoo", - "/opt/csw/lib/python/site-packages/foo.py": u"CSWfoo", - } - self.assertEqual(expected, - checkpkg.GuessDepsByFilename(pkgname, pkg_by_filename)) - - def testGuessDepsByFilename2(self): - expected = set([]) - pkgname = u"CSWfoo" - pkg_by_filename = { - "/opt/csw/bin/bar": u"CSWfoo", - "/opt/csw/lib/python/site-packages/foo.py": u"CSWbar", - } - self.assertEqual(expected, - checkpkg.GuessDepsByFilename(pkgname, pkg_by_filename)) - - def testGuessDepsByPkgname1(self): - expected = set([u"CSWfoo"]) - pkgname = u"CSWfoo-devel" - pkg_by_filename = { - "/opt/csw/bin/bar": u"CSWfoo", - "/opt/csw/bin/barfoo": u"CSWfoobar", - "/opt/csw/lib/python/site-packages/foo.py": u"CSWfoo", - } - self.assertEqual(expected, - checkpkg.GuessDepsByPkgname(pkgname, pkg_by_filename)) - - def testGuessDepsByPkgname2(self): - expected = set([]) - pkgname = u"CSWzfoo-devel" - pkg_by_filename = { - "/opt/csw/bin/bar": u"CSWfoo", - "/opt/csw/bin/barfoo": u"CSWfoobar", - "/opt/csw/lib/python/site-packages/foo.py": u"CSWfoo", - } - self.assertEqual(expected, - checkpkg.GuessDepsByPkgname(pkgname, pkg_by_filename)) - - def testGuessDepsByPkgname3(self): - self.assertEqual(set([u"CSWmysql51"]), - checkpkg.GuessDepsByPkgname(u"CSWmysql51devel", - d4.DATA_PKG_BY_ANY_FILENAME)) - - def testGuessDepsByPkgname4(self): - data1 = set(['CSWmysql51', 'CSWmysql51rt', 'CSWmysql51test', - 'CSWmysql51client', 'CSWmysql51bench', 'CSWmysql51devel']) - data2 = dict(((x, x) for x in data1)) - self.assertEqual(set([u"CSWmysql51"]), checkpkg.GuessDepsByPkgname(u"CSWmysql51devel", data2)) - - def testGuessDepsByPkgname4(self): - data1 = set(['CSWmysql51', 'CSWmysql51rt', 'CSWmysql51test', - 'CSWmysql51client', 'CSWmysql51bench', 'CSWmysql51devel']) - data2 = dict(((x, x) for x in data1)) - self.assertEqual(set([]), checkpkg.GuessDepsByPkgname(u"CSWmysql51rt", data2)) - - -class GetLinesBySonameUnitTest(unittest.TestCase): - - class PkgmapStub(object): - - def __init__(self, cache): - self.cache = cache - - def GetPkgmapLineByBasename(self, soname): - return self.cache[soname] - - def setUp(self): - self.pkgmap_mocker = mox.Mox() - - def testExpandRunpath_1(self): - isalist = ["foo", "bar"] - runpath = "/opt/csw/lib/$ISALIST" - expected = ["/opt/csw/lib/foo", "/opt/csw/lib/bar"] - self.assertEquals(expected, checkpkg.ExpandRunpath(runpath, isalist)) - - def testExpandRunpath_2(self): - isalist = ["foo", "bar"] - runpath = "/opt/csw/mysql5/lib/$ISALIST/mysql" - expected = ["/opt/csw/mysql5/lib/foo/mysql", "/opt/csw/mysql5/lib/bar/mysql"] - self.assertEquals(expected, checkpkg.ExpandRunpath(runpath, isalist)) - - def testEmulate64BitSymlinks_1(self): - runpath_list = ["/opt/csw/mysql5/lib/foo/mysql/64"] - expected = "/opt/csw/mysql5/lib/foo/mysql/amd64" - self.assertTrue(expected in checkpkg.Emulate64BitSymlinks(runpath_list)) - - def testEmulate64BitSymlinks_2(self): - runpath_list = ["/opt/csw/mysql5/lib/64/mysql/foo"] - expected = "/opt/csw/mysql5/lib/amd64/mysql/foo" - result = checkpkg.Emulate64BitSymlinks(runpath_list) - self.assertTrue(expected in result, "%s not in %s" % (expected, result)) - - def testGetLinesBySoname(self): - expected = {'foo.so.1': '/opt/csw/lib/isa-value-1/foo.so.1 foo'} - pkgmap = self.pkgmap_mocker.CreateMock(checkpkg.SystemPkgmap) - pkgmap.GetPkgmapLineByBasename("foo") - lines1 = {"/opt/csw/lib/isa-value-1": "/opt/csw/lib/isa-value-1/foo.so.1 foo", - "/usr/lib": "/usr/lib/foo.so.1 foo"} - # pkgmap.GetPkgmapLineByBasename("foo.so.1").AndReturn(lines1) - pkgmap.GetPkgmapLineByBasename("foo.so.1").AndReturn(lines1) - self.pkgmap_mocker.ReplayAll() - pkgmap.GetPkgmapLineByBasename("foo") - needed_sonames = set(["foo.so.1"]) - runpath_by_needed_soname = {"foo.so.1": ["/opt/csw/lib/$ISALIST", "/usr/lib"]} - isalist = ["isa-value-1", "isa-value-2"] - result = checkpkg.GetLinesBySoname(pkgmap, needed_sonames, runpath_by_needed_soname, isalist) - self.pkgmap_mocker.VerifyAll() - self.assertEqual(expected, result) - - def testGetLinesBySoname_3(self): - expected = {'foo.so.1': '/opt/csw/lib/isa-value-1/foo.so.1 foo'} - pkgmap = self.pkgmap_mocker.CreateMock(checkpkg.SystemPkgmap) - pkgmap.GetPkgmapLineByBasename("foo") - lines1 = { - "/opt/csw/lib/isa-value-1": "/opt/csw/lib/isa-value-1/foo.so.1 foo", - "/opt/csw/lib": "/opt/csw/lib/foo.so.1 foo", - "/usr/lib": "/usr/lib/foo.so.1 foo"} - # pkgmap.GetPkgmapLineByBasename("foo.so.1").AndReturn(lines1) - pkgmap.GetPkgmapLineByBasename("foo.so.1").AndReturn(lines1) - self.pkgmap_mocker.ReplayAll() - pkgmap.GetPkgmapLineByBasename("foo") - needed_sonames = set(["foo.so.1"]) - runpath_by_needed_soname = { - "foo.so.1": ["/opt/csw/lib/$ISALIST", "/usr/lib"]} - isalist = ["isa-value-1", "isa-value-2"] - result = checkpkg.GetLinesBySoname( - pkgmap, needed_sonames, runpath_by_needed_soname, isalist) - self.pkgmap_mocker.VerifyAll() - self.assertEqual(expected, result) - - def testGetLinesBySoname_4(self): - """A more complex test, four ISAs.""" - expected = {'foo.so.1': '/opt/csw/lib/isa-value-1/foo.so.1 foo'} - pkgmap = self.pkgmap_mocker.CreateMock(checkpkg.SystemPkgmap) - pkgmap.GetPkgmapLineByBasename("foo") - lines1 = { - "/opt/csw/lib/isa-value-1": - "/opt/csw/lib/isa-value-1/foo.so.1 foo", - "/opt/csw/mysql5/lib/isa-value-2": - "/opt/csw/mysql5/lib/isa-value-2/foo.so.1 foo", - "/opt/csw/mysql5/lib/isa-value-1": - "/opt/csw/mysql5/lib/isa-value-1/foo.so.1 foo", - "/opt/csw/lib": - "/opt/csw/lib/foo.so.1 foo", - "/usr/lib": - "/usr/lib/foo.so.1 foo"} - pkgmap.GetPkgmapLineByBasename("foo.so.1").AndReturn(lines1) - pkgmap.GetPkgmapLineByBasename("foo.so.1").AndReturn(lines1) - self.pkgmap_mocker.ReplayAll() - pkgmap.GetPkgmapLineByBasename("foo") - needed_sonames = set(["foo.so.1"]) - runpath_by_needed_soname = { - "foo.so.1": ["/opt/csw/mysql5/lib/$ISALIST/mysql", - "/opt/csw/lib/$ISALIST", - "/usr/lib"]} - isalist = ["isa-value-1", "isa-value-2"] - result = checkpkg.GetLinesBySoname( - pkgmap, needed_sonames, runpath_by_needed_soname, isalist) - self.pkgmap_mocker.VerifyAll() - self.assertEqual(expected, result) - - def testGetLinesBySoname_5(self): - """Based on CSWmysql5client on build8x.""" - soname = u'libm.so.1' - expected = {u'libm.so.1': u'/usr/lib/libm.so.1 f none 0755 root bin ' - u'99844 3884 1050525375 SUNWlibms\n'} - - pkgmap_stub = self.PkgmapStub(d6.DATA_PKGMAP_CACHE) - (needed_sonames, - binaries_by_soname, - runpath_by_needed_soname) = checkpkg.BuildIndexesBySoname( - d6.DATA_NEEDED_SONAMES_BY_BINARY) - result = checkpkg.GetLinesBySoname( - pkgmap_stub, - set([soname]), - runpath_by_needed_soname, - d6.DATA_ISALIST) - self.assertEqual(expected, result) - - def testGetLinesBySoname_6(self): - """Based on CSWmysql5client on build8x.""" - soname = u'libz.so.1' - expected = {u'libz.so.1': u'/opt/csw/lib/pentium_pro+mmx/libz.so.1=libz.so.1.2.3 ' - u's none CSWzlib\n'} - pkgmap_stub = self.PkgmapStub(d6.DATA_PKGMAP_CACHE) - (needed_sonames, - binaries_by_soname, - runpath_by_needed_soname) = checkpkg.BuildIndexesBySoname( - d6.DATA_NEEDED_SONAMES_BY_BINARY) - result = checkpkg.GetLinesBySoname( - pkgmap_stub, - set([soname]), - runpath_by_needed_soname, - d6.DATA_ISALIST) - self.assertEqual(expected, result) - - def testGetLinesBySoname_7(self): - """A test for 64-bit symlink expansion.""" - soname = u'libncursesw.so.5' - # To test the 64-bit symlink expansion - expected = { - u'libncursesw.so.5': - u'/opt/csw/lib/amd64/libncursesw.so.5=libncursesw.so.5.7 ' - u's none CSWncurses\n'} - pkgmap_stub = self.PkgmapStub(d6.DATA_PKGMAP_CACHE) - (needed_sonames, - binaries_by_soname, - runpath_by_needed_soname) = checkpkg.BuildIndexesBySoname( - d6.DATA_NEEDED_SONAMES_BY_BINARY) - result = checkpkg.GetLinesBySoname( - pkgmap_stub, - set([soname]), - runpath_by_needed_soname, - d6.DATA_ISALIST) - self.assertEqual(expected, result) - - -class ParseDumpOutputUnitTest(unittest.TestCase): - - def test_1(self): - expected = { - 'soname': 'libmysqlclient.so.15', - 'runpath': ['/opt/csw/lib/$ISALIST', - '/opt/csw/lib', - '/opt/csw/mysql5/lib/$ISALIST', - '/opt/csw/mysql5/lib', - '/opt/csw/mysql5/lib/$ISALIST/mysql', - # These four are artificially appended - '/usr/lib/$ISALIST', - '/usr/lib', - '/lib/$ISALIST', - '/lib'], - 'needed sonames': ['librt.so.1', - 'libresolv.so.2', - 'libc.so.1', - 'libgen.so.1', - 'libsocket.so.1', - 'libnsl.so.1', - 'libm.so.1', - 'libz.so.1']} - self.assertEqual(expected, - checkpkg.ParseDumpOutput(dump_1.DATA_DUMP_OUTPUT)) - - def test_2(self): - expected_runpath = ['/usr/lib/$ISALIST', '/usr/lib', '/lib/$ISALIST', '/lib'] - self.assertEqual( - expected_runpath, - checkpkg.ParseDumpOutput(dump_2.DATA_DUMP_OUTPUT)["runpath"]) - - -if __name__ == '__main__': - unittest.main() Copied: csw/mgar/gar/v2/bin/checkpkg.d/checkpkg_test.py (from rev 7855, csw/mgar/gar/v2-checkpkg/bin/checkpkg.d/checkpkg_test.py) =================================================================== --- csw/mgar/gar/v2/bin/checkpkg.d/checkpkg_test.py (rev 0) +++ csw/mgar/gar/v2/bin/checkpkg.d/checkpkg_test.py 2010-01-04 10:28:15 UTC (rev 7856) @@ -0,0 +1,438 @@ +#!/opt/csw/bin/python2.6 +# $Id$ + +import unittest +import mox +import checkpkg +import testdata.checkpkg_test_data_CSWmysql51rt as d1 +import testdata.checkpkg_test_data_CSWmysql51client as d2 +import testdata.checkpkg_test_data_CSWmysql51 as d3 +import testdata.checkpkg_test_data_CSWmysql51devel as d4 +import testdata.checkpkg_test_data_CSWlibpq_84 as d5 +import testdata.checkpkg_test_data_CSWmysql5client_8x as d6 +import testdata.dump_output_1 as dump_1 +import testdata.dump_output_2 as dump_2 + +"""A set of unit tests for the library checking code. + +A bunch of lines to test in the interactive Python shell. + +import sys +sys.path.append("gar/bin/checkpkg.d") +import checkpkg +import testdata.checkpkg_test_data_CSWmysql5client_8x as d6 + +checkpkg.SharedObjectDependencies("CSWmysql5client", +d6.DATA_BINARIES_BY_PKGNAME, d6.DATA_NEEDED_SONAMES_BY_BINARY, +d6.DATA_PKGS_BY_FILENAME, d6.DATA_FILENAMES_BY_SONAME, +d6.DATA_PKG_BY_ANY_FILENAME) + +sqlite3 ~/.checkpkg/var-sadm-install-contents-cache-build8x +SELECT * FROM systempkgmap WHERE basename = 'libncursesw.so.5'; +""" + +class DependenciesUnitTest_1(unittest.TestCase): + + def setUp(self): + self.missing_deps, self.surplus_deps, self.orphan_sonames = checkpkg.AnalyzeDependencies( + d1.DATA_PKGNAME, + d1.DATA_DECLARED_DEPENDENCIES, + d1.DATA_BINARIES_BY_PKGNAME, + d1.DATA_NEEDED_SONAMES_BY_BINARY, + d1.DATA_PKGS_BY_FILENAME, + d1.DATA_FILENAMES_BY_SONAME, + d1.DATA_PKG_BY_ANY_FILENAME, + ) + + def testSurplusDeps(self): + self.assertEquals(set([]), self.surplus_deps) + + def testOrphanSonames(self): + self.assertEquals(set([]), self.orphan_sonames) + + def testMissingDeps(self): + expected = set([]) + self.assertEquals(expected, self.missing_deps) + + +class DependenciesUnitTest_2(unittest.TestCase): + + def setUp(self): + self.missing_deps, self.surplus_deps, self.orphan_sonames = checkpkg.AnalyzeDependencies( + d2.DATA_PKGNAME, + d2.DATA_DECLARED_DEPENDENCIES, + d2.DATA_BINARIES_BY_PKGNAME, + d2.DATA_NEEDED_SONAMES_BY_BINARY, + d2.DATA_PKGS_BY_FILENAME, + d2.DATA_FILENAMES_BY_SONAME, + d2.DATA_PKG_BY_ANY_FILENAME, + ) + + def testSurplusDeps(self): + self.assertEquals(set([]), self.surplus_deps) + + def testOrphanSonames(self): + self.assertEquals(set([]), self.orphan_sonames) + + def testMissingDeps(self): + expected = set([]) + self.assertEquals(expected, self.missing_deps) + + +class DependenciesUnitTest_3(unittest.TestCase): + + def setUp(self): + self.missing_deps, self.surplus_deps, self.orphan_sonames = checkpkg.AnalyzeDependencies( + d3.DATA_PKGNAME, + d3.DATA_DECLARED_DEPENDENCIES, + d3.DATA_BINARIES_BY_PKGNAME, + d3.DATA_NEEDED_SONAMES_BY_BINARY, + d3.DATA_PKGS_BY_FILENAME, + d3.DATA_FILENAMES_BY_SONAME, + d3.DATA_PKG_BY_ANY_FILENAME, + ) + + def testSurplusDeps(self): + self.assertEquals(set([u'CSWmysql51client']), self.surplus_deps) + + def testOrphanSonames(self): + self.assertEquals(set([]), self.orphan_sonames) + + def testMissingDeps(self): + expected = set(['CSWmysql51rt']) + self.assertEquals(expected, self.missing_deps) + + +class DependenciesUnitTest_4(unittest.TestCase): + + def setUp(self): + self.missing_deps, self.surplus_deps, self.orphan_sonames = checkpkg.AnalyzeDependencies( + d4.DATA_PKGNAME, + d4.DATA_DECLARED_DEPENDENCIES, + d4.DATA_BINARIES_BY_PKGNAME, + d4.DATA_NEEDED_SONAMES_BY_BINARY, + d4.DATA_PKGS_BY_FILENAME, + d4.DATA_FILENAMES_BY_SONAME, + d4.DATA_PKG_BY_ANY_FILENAME, + ) + + def testSurplusDeps(self): + self.assertEquals(set([]), self.surplus_deps) + + def testOrphanSonames(self): + self.assertEquals(set([]), self.orphan_sonames) + + def testMissingDeps(self): + expected = set([]) + self.assertEquals(expected, self.missing_deps) + + +class DependenciesUnitTest_5(unittest.TestCase): + + def setUp(self): + self.missing_deps, self.surplus_deps, self.orphan_sonames = checkpkg.AnalyzeDependencies( + d5.DATA_PKGNAME, + d5.DATA_DECLARED_DEPENDENCIES, + d5.DATA_BINARIES_BY_PKGNAME, + d5.DATA_NEEDED_SONAMES_BY_BINARY, + d5.DATA_PKGS_BY_FILENAME, + d5.DATA_FILENAMES_BY_SONAME, + d5.DATA_PKG_BY_ANY_FILENAME, + ) + + def testSurplusDeps(self): + self.assertEquals(set([]), self.surplus_deps) + + def testOrphanSonames(self): + self.assertEquals(set([]), self.orphan_sonames) + + def testMissingDeps(self): + # This tends to report itself... + expected = set([u'SUNWgss']) + self.assertEquals(expected, self.missing_deps) + + +class DependenciesUnitTest_6(unittest.TestCase): + + def setUp(self): + (self.missing_deps, + self.surplus_deps, + self.orphan_sonames) = checkpkg.AnalyzeDependencies( + d6.DATA_PKGNAME, + d6.DATA_DECLARED_DEPENDENCIES, + d6.DATA_BINARIES_BY_PKGNAME, + d6.DATA_NEEDED_SONAMES_BY_BINARY, + d6.DATA_PKGS_BY_FILENAME, + d6.DATA_FILENAMES_BY_SONAME, + d6.DATA_PKG_BY_ANY_FILENAME, + ) + + def testSurplusDeps(self): + self.assertEquals(set([]), self.surplus_deps) + + def testOrphanSonames(self): + self.assertEquals(set([]), self.orphan_sonames) + + def testMissingDeps(self): + expected = set([]) + self.assertEquals(expected, self.missing_deps) + + +class GuessDepsUnitTest(unittest.TestCase): + + def testGuessDepsByFilename1(self): + expected = set([u"CSWpython"]) + pkgname = u"CSWfoo" + pkg_by_filename = { + "/opt/csw/bin/bar": u"CSWfoo", + "/opt/csw/lib/python/site-packages/foo.py": u"CSWfoo", + } + self.assertEqual(expected, + checkpkg.GuessDepsByFilename(pkgname, pkg_by_filename)) + + def testGuessDepsByFilename2(self): + expected = set([]) + pkgname = u"CSWfoo" + pkg_by_filename = { + "/opt/csw/bin/bar": u"CSWfoo", + "/opt/csw/lib/python/site-packages/foo.py": u"CSWbar", + } + self.assertEqual(expected, + checkpkg.GuessDepsByFilename(pkgname, pkg_by_filename)) + + def testGuessDepsByPkgname1(self): + expected = set([u"CSWfoo"]) + pkgname = u"CSWfoo-devel" + pkg_by_filename = { + "/opt/csw/bin/bar": u"CSWfoo", + "/opt/csw/bin/barfoo": u"CSWfoobar", + "/opt/csw/lib/python/site-packages/foo.py": u"CSWfoo", + } + self.assertEqual(expected, + checkpkg.GuessDepsByPkgname(pkgname, pkg_by_filename)) + + def testGuessDepsByPkgname2(self): + expected = set([]) + pkgname = u"CSWzfoo-devel" + pkg_by_filename = { + "/opt/csw/bin/bar": u"CSWfoo", + "/opt/csw/bin/barfoo": u"CSWfoobar", + "/opt/csw/lib/python/site-packages/foo.py": u"CSWfoo", + } + self.assertEqual(expected, + checkpkg.GuessDepsByPkgname(pkgname, pkg_by_filename)) + + def testGuessDepsByPkgname3(self): + self.assertEqual(set([u"CSWmysql51"]), + checkpkg.GuessDepsByPkgname(u"CSWmysql51devel", + d4.DATA_PKG_BY_ANY_FILENAME)) + + def testGuessDepsByPkgname4(self): + data1 = set(['CSWmysql51', 'CSWmysql51rt', 'CSWmysql51test', + 'CSWmysql51client', 'CSWmysql51bench', 'CSWmysql51devel']) + data2 = dict(((x, x) for x in data1)) + self.assertEqual(set([u"CSWmysql51"]), checkpkg.GuessDepsByPkgname(u"CSWmysql51devel", data2)) + + def testGuessDepsByPkgname4(self): + data1 = set(['CSWmysql51', 'CSWmysql51rt', 'CSWmysql51test', + 'CSWmysql51client', 'CSWmysql51bench', 'CSWmysql51devel']) + data2 = dict(((x, x) for x in data1)) + self.assertEqual(set([]), checkpkg.GuessDepsByPkgname(u"CSWmysql51rt", data2)) + + +class GetLinesBySonameUnitTest(unittest.TestCase): + + class PkgmapStub(object): + + def __init__(self, cache): + self.cache = cache + + def GetPkgmapLineByBasename(self, soname): + return self.cache[soname] + + def setUp(self): + self.pkgmap_mocker = mox.Mox() + + def testExpandRunpath_1(self): + isalist = ["foo", "bar"] + runpath = "/opt/csw/lib/$ISALIST" + expected = ["/opt/csw/lib/foo", "/opt/csw/lib/bar"] + self.assertEquals(expected, checkpkg.ExpandRunpath(runpath, isalist)) + + def testExpandRunpath_2(self): + isalist = ["foo", "bar"] + runpath = "/opt/csw/mysql5/lib/$ISALIST/mysql" + expected = ["/opt/csw/mysql5/lib/foo/mysql", "/opt/csw/mysql5/lib/bar/mysql"] + self.assertEquals(expected, checkpkg.ExpandRunpath(runpath, isalist)) + + def testEmulate64BitSymlinks_1(self): + runpath_list = ["/opt/csw/mysql5/lib/foo/mysql/64"] + expected = "/opt/csw/mysql5/lib/foo/mysql/amd64" + self.assertTrue(expected in checkpkg.Emulate64BitSymlinks(runpath_list)) + + def testEmulate64BitSymlinks_2(self): + runpath_list = ["/opt/csw/mysql5/lib/64/mysql/foo"] + expected = "/opt/csw/mysql5/lib/amd64/mysql/foo" + result = checkpkg.Emulate64BitSymlinks(runpath_list) + self.assertTrue(expected in result, "%s not in %s" % (expected, result)) + + def testGetLinesBySoname(self): + expected = {'foo.so.1': '/opt/csw/lib/isa-value-1/foo.so.1 foo'} + pkgmap = self.pkgmap_mocker.CreateMock(checkpkg.SystemPkgmap) + pkgmap.GetPkgmapLineByBasename("foo") + lines1 = {"/opt/csw/lib/isa-value-1": "/opt/csw/lib/isa-value-1/foo.so.1 foo", + "/usr/lib": "/usr/lib/foo.so.1 foo"} + # pkgmap.GetPkgmapLineByBasename("foo.so.1").AndReturn(lines1) + pkgmap.GetPkgmapLineByBasename("foo.so.1").AndReturn(lines1) + self.pkgmap_mocker.ReplayAll() + pkgmap.GetPkgmapLineByBasename("foo") + needed_sonames = set(["foo.so.1"]) + runpath_by_needed_soname = {"foo.so.1": ["/opt/csw/lib/$ISALIST", "/usr/lib"]} + isalist = ["isa-value-1", "isa-value-2"] + result = checkpkg.GetLinesBySoname(pkgmap, needed_sonames, runpath_by_needed_soname, isalist) + self.pkgmap_mocker.VerifyAll() + self.assertEqual(expected, result) + + def testGetLinesBySoname_3(self): + expected = {'foo.so.1': '/opt/csw/lib/isa-value-1/foo.so.1 foo'} + pkgmap = self.pkgmap_mocker.CreateMock(checkpkg.SystemPkgmap) + pkgmap.GetPkgmapLineByBasename("foo") + lines1 = { + "/opt/csw/lib/isa-value-1": "/opt/csw/lib/isa-value-1/foo.so.1 foo", + "/opt/csw/lib": "/opt/csw/lib/foo.so.1 foo", + "/usr/lib": "/usr/lib/foo.so.1 foo"} + # pkgmap.GetPkgmapLineByBasename("foo.so.1").AndReturn(lines1) + pkgmap.GetPkgmapLineByBasename("foo.so.1").AndReturn(lines1) + self.pkgmap_mocker.ReplayAll() + pkgmap.GetPkgmapLineByBasename("foo") + needed_sonames = set(["foo.so.1"]) + runpath_by_needed_soname = { + "foo.so.1": ["/opt/csw/lib/$ISALIST", "/usr/lib"]} + isalist = ["isa-value-1", "isa-value-2"] + result = checkpkg.GetLinesBySoname( + pkgmap, needed_sonames, runpath_by_needed_soname, isalist) + self.pkgmap_mocker.VerifyAll() + self.assertEqual(expected, result) + + def testGetLinesBySoname_4(self): + """A more complex test, four ISAs.""" + expected = {'foo.so.1': '/opt/csw/lib/isa-value-1/foo.so.1 foo'} + pkgmap = self.pkgmap_mocker.CreateMock(checkpkg.SystemPkgmap) + pkgmap.GetPkgmapLineByBasename("foo") + lines1 = { + "/opt/csw/lib/isa-value-1": + "/opt/csw/lib/isa-value-1/foo.so.1 foo", + "/opt/csw/mysql5/lib/isa-value-2": + "/opt/csw/mysql5/lib/isa-value-2/foo.so.1 foo", + "/opt/csw/mysql5/lib/isa-value-1": + "/opt/csw/mysql5/lib/isa-value-1/foo.so.1 foo", + "/opt/csw/lib": + "/opt/csw/lib/foo.so.1 foo", + "/usr/lib": + "/usr/lib/foo.so.1 foo"} + pkgmap.GetPkgmapLineByBasename("foo.so.1").AndReturn(lines1) + pkgmap.GetPkgmapLineByBasename("foo.so.1").AndReturn(lines1) + self.pkgmap_mocker.ReplayAll() + pkgmap.GetPkgmapLineByBasename("foo") + needed_sonames = set(["foo.so.1"]) + runpath_by_needed_soname = { + "foo.so.1": ["/opt/csw/mysql5/lib/$ISALIST/mysql", + "/opt/csw/lib/$ISALIST", + "/usr/lib"]} + isalist = ["isa-value-1", "isa-value-2"] + result = checkpkg.GetLinesBySoname( + pkgmap, needed_sonames, runpath_by_needed_soname, isalist) + self.pkgmap_mocker.VerifyAll() + self.assertEqual(expected, result) + + def testGetLinesBySoname_5(self): + """Based on CSWmysql5client on build8x.""" + soname = u'libm.so.1' + expected = {u'libm.so.1': u'/usr/lib/libm.so.1 f none 0755 root bin ' + u'99844 3884 1050525375 SUNWlibms\n'} + + pkgmap_stub = self.PkgmapStub(d6.DATA_PKGMAP_CACHE) + (needed_sonames, + binaries_by_soname, + runpath_by_needed_soname) = checkpkg.BuildIndexesBySoname( + d6.DATA_NEEDED_SONAMES_BY_BINARY) + result = checkpkg.GetLinesBySoname( + pkgmap_stub, + set([soname]), + runpath_by_needed_soname, + d6.DATA_ISALIST) + self.assertEqual(expected, result) + + def testGetLinesBySoname_6(self): + """Based on CSWmysql5client on build8x.""" + soname = u'libz.so.1' + expected = {u'libz.so.1': u'/opt/csw/lib/pentium_pro+mmx/libz.so.1=libz.so.1.2.3 ' + u's none CSWzlib\n'} + pkgmap_stub = self.PkgmapStub(d6.DATA_PKGMAP_CACHE) + (needed_sonames, + binaries_by_soname, + runpath_by_needed_soname) = checkpkg.BuildIndexesBySoname( + d6.DATA_NEEDED_SONAMES_BY_BINARY) + result = checkpkg.GetLinesBySoname( + pkgmap_stub, + set([soname]), + runpath_by_needed_soname, + d6.DATA_ISALIST) + self.assertEqual(expected, result) + + def testGetLinesBySoname_7(self): + """A test for 64-bit symlink expansion.""" + soname = u'libncursesw.so.5' + # To test the 64-bit symlink expansion + expected = { + u'libncursesw.so.5': + u'/opt/csw/lib/amd64/libncursesw.so.5=libncursesw.so.5.7 ' + u's none CSWncurses\n'} + pkgmap_stub = self.PkgmapStub(d6.DATA_PKGMAP_CACHE) + (needed_sonames, + binaries_by_soname, + runpath_by_needed_soname) = checkpkg.BuildIndexesBySoname( + d6.DATA_NEEDED_SONAMES_BY_BINARY) + result = checkpkg.GetLinesBySoname( + pkgmap_stub, + set([soname]), + runpath_by_needed_soname, + d6.DATA_ISALIST) + self.assertEqual(expected, result) + + +class ParseDumpOutputUnitTest(unittest.TestCase): + + def test_1(self): + expected = { + 'soname': 'libmysqlclient.so.15', + 'runpath': ['/opt/csw/lib/$ISALIST', + '/opt/csw/lib', + '/opt/csw/mysql5/lib/$ISALIST', + '/opt/csw/mysql5/lib', + '/opt/csw/mysql5/lib/$ISALIST/mysql', + # These four are artificially appended + '/usr/lib/$ISALIST', + '/usr/lib', + '/lib/$ISALIST', + '/lib'], + 'needed sonames': ['librt.so.1', + 'libresolv.so.2', + 'libc.so.1', + 'libgen.so.1', + 'libsocket.so.1', + 'libnsl.so.1', + 'libm.so.1', + 'libz.so.1']} + self.assertEqual(expected, + checkpkg.ParseDumpOutput(dump_1.DATA_DUMP_OUTPUT)) + + def test_2(self): + expected_runpath = ['/usr/lib/$ISALIST', '/usr/lib', '/lib/$ISALIST', '/lib'] + self.assertEqual( + expected_runpath, + checkpkg.ParseDumpOutput(dump_2.DATA_DUMP_OUTPUT)["runpath"]) + + +if __name__ == '__main__': + unittest.main() Deleted: csw/mgar/gar/v2/bin/checkpkg.d/testdata/checkpkg_test_data_CSWlibpq_84.py =================================================================== --- csw/mgar/gar/v2-checkpkg/bin/checkpkg.d/testdata/checkpkg_test_data_CSWlibpq_84.py 2010-01-04 03:57:34 UTC (rev 7855) +++ csw/mgar/gar/v2/bin/checkpkg.d/testdata/checkpkg_test_data_CSWlibpq_84.py 2010-01-04 10:28:15 UTC (rev 7856) @@ -1,10 +0,0 @@ -# Testing data for CSWlibpq-84 -# $Id$ -DATA_PKGNAME = 'CSWlibpq-84' -DATA_DECLARED_DEPENDENCIES = {'CSWlibxml2': 'CSWlibxml2 libxml2 - XML Parser Library ', 'CSWkrb5lib': 'CSWkrb5lib krb5_lib - MIT Kerberos 5 core libraries ', 'CSWlibxslt': 'CSWlibxslt libxslt - XSLT engine runtime package ', 'CSWcommon': 'CSWcommon common - common files and dirs for CSW packages ', 'CSWisaexec': 'CSWisaexec isaexec - sneaky wrapper around Sun isaexec ', 'CSWzlib': 'CSWzlib zlib - Zlib Data Compression Library ', 'CSWosslrt': 'CSWosslrt openssl_rt - Openssl runtime libraries '} @@ Diff output truncated at 100000 characters. @@ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Mon Jan 4 12:52:35 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Mon, 04 Jan 2010 11:52:35 +0000 Subject: [csw-devel] SF.net SVN: gar:[7857] csw/mgar/pkg/mpeg4ip Message-ID: Revision: 7857 http://gar.svn.sourceforge.net/gar/?rev=7857&view=rev Author: dmichelsen Date: 2010-01-04 11:52:34 +0000 (Mon, 04 Jan 2010) Log Message: ----------- mpeg4ip: Add patch from Murray Jensen Modified Paths: -------------- csw/mgar/pkg/mpeg4ip/trunk/Makefile csw/mgar/pkg/mpeg4ip/trunk/checksums Added Paths: ----------- csw/mgar/pkg/mpeg4ip/tags/legacy/ csw/mgar/pkg/mpeg4ip/tags/legacy/mjj_build csw/mgar/pkg/mpeg4ip/tags/legacy/mjj_setup csw/mgar/pkg/mpeg4ip/tags/legacy/mpeg4ip-1.6.1-mjj.patch csw/mgar/pkg/mpeg4ip/tags/legacy/pkghelper.pl csw/mgar/pkg/mpeg4ip/trunk/files/mpeg4ip-1.6.1-mjj.patch Added: csw/mgar/pkg/mpeg4ip/tags/legacy/mjj_build =================================================================== --- csw/mgar/pkg/mpeg4ip/tags/legacy/mjj_build (rev 0) +++ csw/mgar/pkg/mpeg4ip/tags/legacy/mjj_build 2010-01-04 11:52:34 UTC (rev 7857) @@ -0,0 +1,13 @@ +#!/bin/echo ERROR_you_must_source_this_file + +if [ ! -s ${cfgmarker:-"Makefile"} ]; then + eval ${cfgprogram:-"$SHELL ./configure"} ${cfgflags:-"--prefix=/opt/csw"} +fi + +eval "$MAKE MAKE=$MAKE $mkflags" || exit + +mkdir -p $buildroot || exit + +rootvar=${rootvar:-DESTDIR} + +eval "$MAKE MAKE=$MAKE $rootvar=$buildroot $instflags install" || exit Added: csw/mgar/pkg/mpeg4ip/tags/legacy/mjj_setup =================================================================== --- csw/mgar/pkg/mpeg4ip/tags/legacy/mjj_setup (rev 0) +++ csw/mgar/pkg/mpeg4ip/tags/legacy/mjj_setup 2010-01-04 11:52:34 UTC (rev 7857) @@ -0,0 +1,93 @@ +#!/bin/echo ERROR_you_must_source_this_file + +[ -n "$LD_LIBRARY_PATH" ] && unset LD_LIBRARY_PATH + +SHELL=bash +CONFIG_SHELL=bash +MAKE=gmake + +PATH=/opt/csw/bin:/usr/openwin/bin:/usr/ccs/bin:/usr/sbin:/usr/xpg4/bin:/usr/bin + +CPPFLAGS="-D_FILE_OFFSET_BITS=64 -D_REENTRANT -I/opt/csw/include" +CFLAGS="-g" +CXXFLAGS="-g" +LDFLAGS="-g -L/opt/csw/lib" +if [ -n "$nozdefs" ]; then + LD_OPTIONS="-R/opt/csw/lib -L/opt/csw/lib" +else + LD_OPTIONS="-z defs -R/opt/csw/lib -L/opt/csw/lib" +fi + +case `uname -p` in + +sparc) + gccopt="-O3 -mcpu=v8" + ccopt="-fast -xarch=v8" + ;; + +i386) + gccopt="-O3 -march=i486" + ccopt="-fast -xarch=386" + ;; + +*) + echo huh\? 1>&2 + exit 1 + ;; + +esac + +case ${compiler-ss8} in + +gcc[34]) + base=/opt/csw/${compiler} + gccver=`$base/bin/gcc -dumpversion` + PATH=$base/bin:$PATH + CPPFLAGS="-I$base/include -I$base/include/c++/$gccver $CPPFLAGS" + CFLAGS="$gccopt $CFLAGS" + CXXFLAGS="$gccopt $CXXFLAGS" + LD_OPTIONS="-L$base/lib $LD_OPTIONS" + CC=${CC-"gcc"} + CXX=${CXX-"g++"} + PICFLAG=${PICFLAG-"-fPIC"} + SHLDFLAG=${SHLDFLAG-"-shared"} + [ -n "$noztext" ] && SHLDFLAG="$SHLDFLAG -mimpure-text" + ;; + +gcc2) + CFLAGS="$gccopt $CFLAGS" + CXXFLAGS="$gccopt $CXXFLAGS" + CC=${CC-"gcc"} + CXX=${CXX-"g++"} + PICFLAG=${PICFLAG-"-fPIC"} + SHLDFLAG=${SHLDFLAG-"-shared"} + [ -n "$noztext" ] && SHLDFLAG="$SHLDFLAG -mimpure-text" + ;; + +ss8|cc|ss10|ss11) + case ${compiler-ss8} in + ss8|cc) base=/opt/SUNWspro ;; + ss10) base=/opt/studio10/SUNWspro ;; + ss11) base=/opt/studio11/SUNWspro ;; + *) echo huh\? 1>&2; exit 1 ;; + esac + PATH="$base/bin:$PATH" + CFLAGS="$ccopt $CFLAGS" + CXXFLAGS="$ccopt $CXXFLAGS" + LD_OPTIONS="-L$base/lib $LD_OPTIONS" + CC=${CC-"cc"} + CXX=${CXX-"CC"} + PICFLAG=${PICFLAG-"-KPIC"} + SHLDFLAG=${SHLDFLAG-"-G"} + ;; + +esac + +export PATH SHELL CONFIG_SHELL MAKE CPPFLAGS CC CFLAGS CXX CXXFLAGS +export LDFLAGS LD_OPTIONS PICFLAG SHLDFLAG + +# configure sometimes gets this wrong ... the csw +# gcc is set up to use system as/ld/etc from /usr/ccs +lt_cv_path_LD=/usr/ccs/bin/ld; export lt_cv_path_LD +# speed up +lt_cv_sys_max_cmd_len=262144; export lt_cv_sys_max_cmd_len Added: csw/mgar/pkg/mpeg4ip/tags/legacy/mpeg4ip-1.6.1-mjj.patch =================================================================== --- csw/mgar/pkg/mpeg4ip/tags/legacy/mpeg4ip-1.6.1-mjj.patch (rev 0) +++ csw/mgar/pkg/mpeg4ip/tags/legacy/mpeg4ip-1.6.1-mjj.patch 2010-01-04 11:52:34 UTC (rev 7857) @@ -0,0 +1,304 @@ +Index: mpeg4ip-1.6.1/common/video/iso-mpeg4/src/Makefile.am +=================================================================== +--- mpeg4ip-1.6.1.orig/common/video/iso-mpeg4/src/Makefile.am 2006-02-10 04:57:29.000000000 +1100 ++++ mpeg4ip-1.6.1/common/video/iso-mpeg4/src/Makefile.am 2008-03-28 13:20:24.083621000 +1100 +@@ -1,5 +1,5 @@ + +-AM_CXXFLAGS = -D__TRACE_AND_STATS_ -D__DOUBLE_PRECISION_ -D_REENTRANT -DNOCONTROLS -fexceptions -Wall -Werror -D_OBSS_ @BILLS_CPPWARNINGS@ ++AM_CXXFLAGS = -D__TRACE_AND_STATS_ -D__DOUBLE_PRECISION_ -D_REENTRANT -DNOCONTROLS -fexceptions -Wall -D_OBSS_ @BILLS_CPPWARNINGS@ + + INCLUDES = -I$(srcdir)/../include + +Index: mpeg4ip-1.6.1/common/video/iso-mpeg4/src/Makefile.in +=================================================================== +--- mpeg4ip-1.6.1.orig/common/video/iso-mpeg4/src/Makefile.in 2007-04-27 09:59:31.000000000 +1000 ++++ mpeg4ip-1.6.1/common/video/iso-mpeg4/src/Makefile.in 2008-03-27 01:55:41.267172000 +1100 +@@ -106,7 +106,7 @@ + am__quote = @am__quote@ + install_sh = @install_sh@ + +-AM_CXXFLAGS = -D__TRACE_AND_STATS_ -D__DOUBLE_PRECISION_ -D_REENTRANT -DNOCONTROLS -fexceptions -Wall -Werror -D_OBSS_ @BILLS_CPPWARNINGS@ ++AM_CXXFLAGS = -D__TRACE_AND_STATS_ -D__DOUBLE_PRECISION_ -D_REENTRANT -DNOCONTROLS -fexceptions -Wall -D_OBSS_ @BILLS_CPPWARNINGS@ + + INCLUDES = -I$(srcdir)/../include + +Index: mpeg4ip-1.6.1/common/video/mpeg4-2000/app/convertpar/Makefile.am +=================================================================== +--- mpeg4ip-1.6.1.orig/common/video/mpeg4-2000/app/convertpar/Makefile.am 2003-05-06 07:07:21.000000000 +1000 ++++ mpeg4ip-1.6.1/common/video/mpeg4-2000/app/convertpar/Makefile.am 2008-03-28 13:20:43.452101000 +1100 +@@ -1,6 +1,6 @@ + # + +-AM_CXXFLAGS = -D__TRACE_AND_STATS_ -D__DOUBLE_PRECISION_ -D_REENTRANT -DNOCONTROLS -fexceptions -Wall -Werror -D_OBSS_ ++AM_CXXFLAGS = -D__TRACE_AND_STATS_ -D__DOUBLE_PRECISION_ -D_REENTRANT -DNOCONTROLS -fexceptions -Wall -D_OBSS_ + + check_PROGRAMS = convertpar + +Index: mpeg4ip-1.6.1/common/video/mpeg4-2000/idct/Makefile.am +=================================================================== +--- mpeg4ip-1.6.1.orig/common/video/mpeg4-2000/idct/Makefile.am 2003-11-14 09:08:37.000000000 +1100 ++++ mpeg4ip-1.6.1/common/video/mpeg4-2000/idct/Makefile.am 2008-03-28 13:21:08.940124000 +1100 +@@ -1,6 +1,6 @@ + AM_CFLAGS = -D__TRACE_AND_STATS_ -D__DOUBLE_PRECISION_ -D_OBSS_ -DFGSPOSTCLIP -Wall -Wpointer-arith -Wcast-align -Wmissing-prototypes -fexceptions + +-AM_CXXFLAGS = -D__TRACE_AND_STATS_ -D__DOUBLE_PRECISION_ -D_OBSS_ -DFGSPOSTCLIP -D_REENTRANT -DNOCONTROLS -fexceptions -Wall -Werror ++AM_CXXFLAGS = -D__TRACE_AND_STATS_ -D__DOUBLE_PRECISION_ -D_OBSS_ -DFGSPOSTCLIP -D_REENTRANT -DNOCONTROLS -fexceptions -Wall + + noinst_LTLIBRARIES = libobj_idct.la + +Index: mpeg4ip-1.6.1/configure.in +=================================================================== +--- mpeg4ip-1.6.1.orig/configure.in 2007-11-12 04:39:13.000000000 +1100 ++++ mpeg4ip-1.6.1/configure.in 2008-06-17 22:13:47.888186000 +1000 +@@ -237,7 +237,7 @@ + [have_mpeg2=false]) + if test x$have_mpeg2 = xtrue; then + AC_MSG_CHECKING([libmpeg2 version]) +- AC_COMPILE_IFELSE([#include ++ AC_COMPILE_IFELSE([$ac_includes_default + #include + + #ifndef MPEG2_VERSION +@@ -513,9 +513,9 @@ + AC_DEFINE(HAVE_FFMPEG_INSTALLED, 1, [defined if ffmpeg is installed]) + FFMPEG_INC= + FFMPEG_LIB="-lavcodec -lz $ffmpeg_add_libs" +- AC_CHECK_TYPES([AVRational], , , [#include ]) +- AC_CHECK_MEMBERS(AVCodecContext.time_base, , , [#include ]) +- AC_CHECK_DECLS([avcodec_decode_audio2], , ,[#include ]) ++ AC_CHECK_TYPES([AVRational], , , [#include ]) ++ AC_CHECK_MEMBERS(AVCodecContext.time_base, , , [#include ]) ++ AC_CHECK_DECLS([avcodec_decode_audio2], , ,[#include ]) + AC_DEFINE(HAVE_FFMPEG, 1, [enable ffmpeg for mp4live]) + AC_CHECK_LIB(amrnb, VADxEncoder_Interface_init, + [have_amr_nb=true], [have_amr_nb=false]) +@@ -769,7 +769,7 @@ + + if test x$USENASM = xtrue; then + AC_MSG_CHECKING(nasm version...) +- BILLSNASM_arg=`nasm -r | tr '.' ' '` ++ BILLSNASM_arg=`nasm -v | tr '.' ' '` + BILLSNASM_ret=`util/testnasm.sh $BILLSNASM_arg` + if test x$BILLSNASM_ret = x"yes"; then + USENASM=true +Index: mpeg4ip-1.6.1/cvs_bootstrap +=================================================================== +--- mpeg4ip-1.6.1.orig/cvs_bootstrap 2007-04-27 09:38:03.000000000 +1000 ++++ mpeg4ip-1.6.1/cvs_bootstrap 2008-03-27 15:09:40.972209000 +1100 +@@ -6,7 +6,7 @@ + + # Check that we can find libtool + # Frequently it hasn't been installed +-if glibtool --version > /dev/null 2> /dev/null ++if (glibtool --version >/dev/null 2>/dev/null) + then + libtool=glibtool + if libtoolize --version > /dev/null +@@ -87,19 +87,19 @@ + + # + # This tries to find all the aclocal files that we need +-for dir in /usr/local /usr/contrib /opt/gnome /usr /opt/local +-do +- if test -d $dir/share/aclocal -a `which aclocal` != $dir/bin/aclocal +- then +- ACLOCAL_FLAGS="-I $dir/share/aclocal $ACLOCAL_FLAGS" +- fi +-done +- +-if test $target_system != "CYGWIN_NT-5.1"; then +-ERRCMD=--enable-warns-as-err +-else ++#for dir in /usr/local /usr/contrib /opt/gnome /usr /opt/local ++#do ++# if test -d $dir/share/aclocal -a `which aclocal` != $dir/bin/aclocal ++# then ++# ACLOCAL_FLAGS="-I $dir/share/aclocal $ACLOCAL_FLAGS" ++# fi ++#done ++ ++#if test $target_system != "CYGWIN_NT-5.1"; then ++#ERRCMD=--enable-warns-as-err ++#else + ERRCMD= +-fi ++#fi + + pwd=`pwd` + if test $target_system != "Darwin"; then +Index: mpeg4ip-1.6.1/lib/SDLAudio/configure.in +=================================================================== +--- mpeg4ip-1.6.1.orig/lib/SDLAudio/configure.in 2005-01-18 07:46:07.000000000 +1100 ++++ mpeg4ip-1.6.1/lib/SDLAudio/configure.in 2008-03-27 15:13:02.326777000 +1100 +@@ -45,6 +45,7 @@ + + dnl Check for tools + ++AM_PROG_AS + AC_LIBTOOL_WIN32_DLL + AM_PROG_LIBTOOL + AC_PROG_MAKE_SET +Index: mpeg4ip-1.6.1/lib/gnu/Makefile.am +=================================================================== +--- mpeg4ip-1.6.1.orig/lib/gnu/Makefile.am 2007-11-12 04:39:19.000000000 +1100 ++++ mpeg4ip-1.6.1/lib/gnu/Makefile.am 2008-03-28 13:21:33.278293000 +1100 +@@ -12,5 +12,5 @@ + EXTRA_DIST = libmissing60.dsp libmissing.vcproj \ + need_for_win32.c + +-AM_CFLAGS = -D_REENTRANT -Werror -Wall -Wcast-align -Wstrict-prototypes -Wmissing-prototypes ++AM_CFLAGS = -D_REENTRANT -Wall -Wcast-align -Wstrict-prototypes -Wmissing-prototypes + +Index: mpeg4ip-1.6.1/lib/gnu/Makefile.in +=================================================================== +--- mpeg4ip-1.6.1.orig/lib/gnu/Makefile.in 2007-11-12 05:04:47.000000000 +1100 ++++ mpeg4ip-1.6.1/lib/gnu/Makefile.in 2008-03-27 01:56:56.241400000 +1100 +@@ -141,7 +141,7 @@ + need_for_win32.c + + +-AM_CFLAGS = -D_REENTRANT -Werror -Wall -Wcast-align -Wstrict-prototypes -Wmissing-prototypes ++AM_CFLAGS = -D_REENTRANT -Wall -Wcast-align -Wstrict-prototypes -Wmissing-prototypes + subdir = lib/gnu + mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs + CONFIG_HEADER = $(top_builddir)/mpeg4ip_config.h +Index: mpeg4ip-1.6.1/lib/rtp/Makefile.am +=================================================================== +--- mpeg4ip-1.6.1.orig/lib/rtp/Makefile.am 2007-11-12 04:39:25.000000000 +1100 ++++ mpeg4ip-1.6.1/lib/rtp/Makefile.am 2008-03-28 13:23:26.489602000 +1100 +@@ -74,7 +74,7 @@ + + check_PROGRAMS = test_rtp_client test_rtp_server + +-AM_CFLAGS = -DDEBUG -Wall -Werror ++AM_CFLAGS = -DDEBUG -Wall + test_rtp_client_SOURCES = test_rtp_client.c + test_rtp_client_LDADD = libuclmmbase.la \ + $(top_builddir)/lib/utils/libmutex.la \ +Index: mpeg4ip-1.6.1/lib/rtp/Makefile.in +=================================================================== +--- mpeg4ip-1.6.1.orig/lib/rtp/Makefile.in 2007-11-12 05:04:25.000000000 +1100 ++++ mpeg4ip-1.6.1/lib/rtp/Makefile.in 2008-03-27 01:54:27.572853000 +1100 +@@ -202,7 +202,7 @@ + + check_PROGRAMS = test_rtp_client test_rtp_server + +-AM_CFLAGS = -DDEBUG -Wall -Werror ++AM_CFLAGS = -DDEBUG -Wall + test_rtp_client_SOURCES = test_rtp_client.c + test_rtp_client_LDADD = libuclmmbase.la \ + $(top_builddir)/lib/utils/libmutex.la \ +Index: mpeg4ip-1.6.1/lib/rtp/configure.in +=================================================================== +--- mpeg4ip-1.6.1.orig/lib/rtp/configure.in 2006-03-21 10:13:25.000000000 +1100 ++++ mpeg4ip-1.6.1/lib/rtp/configure.in 2008-03-28 13:22:21.554566000 +1100 +@@ -275,7 +275,7 @@ + [AC_MSG_NOTICE([compiler warnings will not be errs])]) + + BILLS_CWARNINGS="$BASE_ERR" +-CFLAGS="$CFLAGS -Wall -Werror" ++CFLAGS="$CFLAGS -Wall" + MY_CHECK_CC_OPT_SET([-Wmissing-prototypes], BILLS_CWARNINGS, [c compiler]) + MY_CHECK_CC_OPT_SET([-Wmissing-declarations], BILLS_CWARNINGS, [c compiler]) + MY_CHECK_CC_OPT_SET([-Wbad-function-cast], BILLS_CWARNINGS, [c compiler]) +Index: mpeg4ip-1.6.1/lib/rtp/rtp.c +=================================================================== +--- mpeg4ip-1.6.1.orig/lib/rtp/rtp.c 2007-01-23 04:31:08.000000000 +1100 ++++ mpeg4ip-1.6.1/lib/rtp/rtp.c 2008-03-27 01:54:27.582899000 +1100 +@@ -2489,6 +2489,9 @@ + buffer_len += iov[i].iov_len; + } + if (buffer_len > session->m_output_buffer_size) { ++#ifndef MAX ++#define MAX(a,b) (((a)>(b))?(a):(b)) ++#endif + session->m_output_buffer = (uint8_t *)xrealloc(session->m_output_buffer, + MAX(buffer_len, 1500)); + session->m_output_buffer_size = MAX(buffer_len, 1500); +Index: mpeg4ip-1.6.1/player/lib/audio/faad/Makefile.in +=================================================================== +--- mpeg4ip-1.6.1.orig/player/lib/audio/faad/Makefile.in 2007-11-12 05:03:57.000000000 +1100 ++++ mpeg4ip-1.6.1/player/lib/audio/faad/Makefile.in 2008-03-27 01:57:58.796587000 +1100 +@@ -161,7 +161,7 @@ + util.h + + INCLUDES = -I$(top_srcdir)/include +-AM_CFLAGS = -O2 -Werror -Wall -fexceptions -fno-strict-aliasing ++AM_CFLAGS = -O2 -Wall -fexceptions -fno-strict-aliasing + + EXTRA_DIST = COPYING libfaad60.dsp README libfaad.vcproj + subdir = player/lib/audio/faad +Index: mpeg4ip-1.6.1/player/plugin/audio/ffmpeg/ffmpeg.h +=================================================================== +--- mpeg4ip-1.6.1.orig/player/plugin/audio/ffmpeg/ffmpeg.h 2007-11-12 04:39:28.000000000 +1100 ++++ mpeg4ip-1.6.1/player/plugin/audio/ffmpeg/ffmpeg.h 2008-06-17 22:11:13.309632000 +1000 +@@ -26,7 +26,7 @@ + #include "codec_plugin.h" + extern "C" { + #ifdef HAVE_FFMPEG_INSTALLED +-#include ++#include + #else + #include + #endif +Index: mpeg4ip-1.6.1/player/plugin/video/ffmpeg/ffmpeg.h +=================================================================== +--- mpeg4ip-1.6.1.orig/player/plugin/video/ffmpeg/ffmpeg.h 2007-11-12 04:39:30.000000000 +1100 ++++ mpeg4ip-1.6.1/player/plugin/video/ffmpeg/ffmpeg.h 2008-06-17 22:11:20.199119000 +1000 +@@ -27,7 +27,7 @@ + #include "codec_plugin.h" + extern "C" { + #ifdef HAVE_FFMPEG_INSTALLED +-#include ++#include + #else + #include + #endif +Index: mpeg4ip-1.6.1/server/mp4live/audio_ffmpeg.h +=================================================================== +--- mpeg4ip-1.6.1.orig/server/mp4live/audio_ffmpeg.h 2007-11-12 04:39:33.000000000 +1100 ++++ mpeg4ip-1.6.1/server/mp4live/audio_ffmpeg.h 2008-06-17 22:11:24.108828000 +1000 +@@ -25,7 +25,7 @@ + #include "audio_encoder.h" + extern "C" { + #ifdef HAVE_FFMPEG_INSTALLED +-#include ++#include + #else + #include + #endif +Index: mpeg4ip-1.6.1/server/mp4live/video_encoder_class.cpp +=================================================================== +--- mpeg4ip-1.6.1.orig/server/mp4live/video_encoder_class.cpp 2007-11-12 04:39:33.000000000 +1100 ++++ mpeg4ip-1.6.1/server/mp4live/video_encoder_class.cpp 2008-06-17 22:11:28.738579000 +1000 +@@ -27,7 +27,7 @@ + #ifdef HAVE_FFMPEG + extern "C" { + #ifdef HAVE_FFMPEG_INSTALLED +-#include ++#include + #else + #include + #endif +Index: mpeg4ip-1.6.1/server/mp4live/video_ffmpeg.h +=================================================================== +--- mpeg4ip-1.6.1.orig/server/mp4live/video_ffmpeg.h 2007-11-12 04:39:33.000000000 +1100 ++++ mpeg4ip-1.6.1/server/mp4live/video_ffmpeg.h 2008-06-17 22:11:32.758184000 +1000 +@@ -25,7 +25,7 @@ + #include "video_encoder.h" + extern "C" { + #ifdef HAVE_FFMPEG_INSTALLED +-#include ++#include + #else + #include + #endif +Index: mpeg4ip-1.6.1/server/util/mp4encode/Makefile.am +=================================================================== +--- mpeg4ip-1.6.1.orig/server/util/mp4encode/Makefile.am 2004-08-18 07:38:06.000000000 +1000 ++++ mpeg4ip-1.6.1/server/util/mp4encode/Makefile.am 2008-03-27 01:54:27.592870000 +1100 +@@ -1 +1,3 @@ +-EXTRA_DIST = mp4encode mp4venc_template.par ++EXTRA_DIST = mp4venc_template.par ++ ++bin_SCRIPTS = mp4encode Added: csw/mgar/pkg/mpeg4ip/tags/legacy/pkghelper.pl =================================================================== --- csw/mgar/pkg/mpeg4ip/tags/legacy/pkghelper.pl (rev 0) +++ csw/mgar/pkg/mpeg4ip/tags/legacy/pkghelper.pl 2010-01-04 11:52:34 UTC (rev 7857) @@ -0,0 +1,894 @@ +#!/opt/csw/bin/perl -w +use strict; +use warnings FATAL => 'uninitialized'; + +use FindBin qw($RealBin $RealScript); +use File::Basename; +use Getopt::Long; + +my @csw_ignore = qw( +opt/csw +opt/csw/bin +opt/csw/bin/sparcv8 +opt/csw/bin/sparcv8plus +opt/csw/bin/sparcv8plus+vis +opt/csw/bin/sparcv9 +opt/csw/etc +opt/csw/include +opt/csw/lib +opt/csw/lib/X11 +opt/csw/lib/X11/app-defaults +opt/csw/lib/sparcv8plus +opt/csw/lib/sparcv8plus+vis +opt/csw/lib/sparcv9 +opt/csw/libexec +opt/csw/sbin +opt/csw/share +opt/csw/share/doc +opt/csw/share/info +opt/csw/share/info/dir +opt/csw/share/locale +opt/csw/share/locale/az +opt/csw/share/locale/az/LC_MESSAGES +opt/csw/share/locale/be +opt/csw/share/locale/be/LC_MESSAGES +opt/csw/share/locale/bg +opt/csw/share/locale/bg/LC_MESSAGES +opt/csw/share/locale/ca +opt/csw/share/locale/ca/LC_MESSAGES +opt/csw/share/locale/cs +opt/csw/share/locale/cs/LC_MESSAGES +opt/csw/share/locale/da +opt/csw/share/locale/da/LC_MESSAGES +opt/csw/share/locale/de +opt/csw/share/locale/de/LC_MESSAGES +opt/csw/share/locale/el +opt/csw/share/locale/el/LC_MESSAGES +opt/csw/share/locale/en\@boldquot +opt/csw/share/locale/en\@boldquot/LC_MESSAGES +opt/csw/share/locale/en\@quot +opt/csw/share/locale/en\@quot/LC_MESSAGES +opt/csw/share/locale/es +opt/csw/share/locale/es/LC_MESSAGES +opt/csw/share/locale/et +opt/csw/share/locale/et/LC_MESSAGES +opt/csw/share/locale/eu +opt/csw/share/locale/eu/LC_MESSAGES +opt/csw/share/locale/fi +opt/csw/share/locale/fi/LC_MESSAGES +opt/csw/share/locale/fr +opt/csw/share/locale/fr/LC_MESSAGES +opt/csw/share/locale/ga +opt/csw/share/locale/ga/LC_MESSAGES +opt/csw/share/locale/gl +opt/csw/share/locale/gl/LC_MESSAGES +opt/csw/share/locale/he +opt/csw/share/locale/he/LC_MESSAGES +opt/csw/share/locale/hr +opt/csw/share/locale/hr/LC_MESSAGES +opt/csw/share/locale/hu +opt/csw/share/locale/hu/LC_MESSAGES +opt/csw/share/locale/id +opt/csw/share/locale/id/LC_MESSAGES +opt/csw/share/locale/it +opt/csw/share/locale/it/LC_MESSAGES +opt/csw/share/locale/ja +opt/csw/share/locale/ja/LC_MESSAGES +opt/csw/share/locale/ko +opt/csw/share/locale/ko/LC_MESSAGES +opt/csw/share/locale/locale.alias +opt/csw/share/locale/lt +opt/csw/share/locale/lt/LC_MESSAGES +opt/csw/share/locale/nl +opt/csw/share/locale/nl/LC_MESSAGES +opt/csw/share/locale/nn +opt/csw/share/locale/nn/LC_MESSAGES +opt/csw/share/locale/no +opt/csw/share/locale/no/LC_MESSAGES +opt/csw/share/locale/pl +opt/csw/share/locale/pl/LC_MESSAGES +opt/csw/share/locale/pt +opt/csw/share/locale/pt/LC_MESSAGES +opt/csw/share/locale/pt_BR +opt/csw/share/locale/pt_BR/LC_MESSAGES +opt/csw/share/locale/ro +opt/csw/share/locale/ro/LC_MESSAGES +opt/csw/share/locale/ru +opt/csw/share/locale/ru/LC_MESSAGES +opt/csw/share/locale/sk +opt/csw/share/locale/sk/LC_MESSAGES +opt/csw/share/locale/sl +opt/csw/share/locale/sl/LC_MESSAGES +opt/csw/share/locale/sp +opt/csw/share/locale/sp/LC_MESSAGES +opt/csw/share/locale/sr +opt/csw/share/locale/sr/LC_MESSAGES +opt/csw/share/locale/sv +opt/csw/share/locale/sv/LC_MESSAGES +opt/csw/share/locale/tr +opt/csw/share/locale/tr/LC_MESSAGES +opt/csw/share/locale/uk +opt/csw/share/locale/uk/LC_MESSAGES +opt/csw/share/locale/vi +opt/csw/share/locale/vi/LC_MESSAGES +opt/csw/share/locale/wa +opt/csw/share/locale/wa/LC_MESSAGES +opt/csw/share/locale/zh +opt/csw/share/locale/zh/LC_MESSAGES +opt/csw/share/locale/zh_CN +opt/csw/share/locale/zh_CN/LC_MESSAGES +opt/csw/share/locale/zh_CN.GB2312 +opt/csw/share/locale/zh_CN.GB2312/LC_MESSAGES +opt/csw/share/locale/zh_TW +opt/csw/share/locale/zh_TW/LC_MESSAGES +opt/csw/share/locale/zh_TW.Big5 +opt/csw/share/locale/zh_TW.Big5/LC_MESSAGES +opt/csw/share/man +opt/csw/share/man/man1 +opt/csw/share/man/man2 +opt/csw/share/man/man3 +opt/csw/share/man/man4 +opt/csw/share/man/man5 +opt/csw/share/man/man6 +opt/csw/share/man/man7 +opt/csw/share/man/man8 +opt/csw/var +etc +etc/dt +etc/dt/appconfig +etc/dt/appconfig/icons +etc/dt/appconfig/icons/C +etc/dt/appconfig/types +etc/dt/appconfig/types/C +etc/dt/appconfig/appmanager +etc/dt/appconfig/appmanager/C +etc/dt/appconfig/help +etc/dt/config +etc/dt/config/C +etc/dt/config/C/Xresources.d +etc/dt/config/ar +etc/dt/config/ar/Xresources.d +etc/dt/config/ar_EG.UTF-8 +etc/dt/config/ar_EG.UTF-8/Xresources.d +etc/dt/config/cs_CZ.ISO8859-2 +etc/dt/config/cs_CZ.ISO8859-2/Xresources.d +etc/dt/config/de +etc/dt/config/de/Xresources.d +etc/dt/config/de.ISO8859-15 +etc/dt/config/de.ISO8859-15/Xresources.d +etc/dt/config/de.UTF-8 +etc/dt/config/de.UTF-8/Xresources.d +etc/dt/config/de_AT.ISO8859-15 +etc/dt/config/de_AT.ISO8859-15/Xresources.d +etc/dt/config/en_GB.ISO8859-15 +etc/dt/config/en_GB.ISO8859-15/Xresources.d +etc/dt/config/en_IE.ISO8859-15 +etc/dt/config/en_IE.ISO8859-15/Xresources.d +etc/dt/config/en_US.ISO8859-15 +etc/dt/config/en_US.ISO8859-15/Xresources.d +etc/dt/config/en_US.UTF-8 +etc/dt/config/en_US.UTF-8/Xresources.d +etc/dt/config/es +etc/dt/config/es/Xresources.d +etc/dt/config/es.ISO8859-15 +etc/dt/config/es.ISO8859-15/Xresources.d +etc/dt/config/es.UTF-8 +etc/dt/config/es.UTF-8/Xresources.d +etc/dt/config/fr +etc/dt/config/fr/Xresources.d +etc/dt/config/fr.ISO8859-15 +etc/dt/config/fr.ISO8859-15/Xresources.d +etc/dt/config/fr.UTF-8 +etc/dt/config/fr.UTF-8/Xresources.d +etc/dt/config/fr_BE.ISO8859-15 +etc/dt/config/fr_BE.ISO8859-15/Xresources.d +etc/dt/config/he +etc/dt/config/he/Xresources.d +etc/dt/config/he_IL.UTF-8 +etc/dt/config/he_IL.UTF-8/Xresources.d +etc/dt/config/hu_HU.ISO8859-2 +etc/dt/config/hu_HU.ISO8859-2/Xresources.d +etc/dt/config/it +etc/dt/config/it/Xresources.d +etc/dt/config/it.ISO8859-15 +etc/dt/config/it.ISO8859-15/Xresources.d +etc/dt/config/it.UTF-8 +etc/dt/config/it.UTF-8/Xresources.d +etc/dt/config/ja +etc/dt/config/ja/Xresources.d +etc/dt/config/ja_JP.PCK +etc/dt/config/ja_JP.PCK/Xresources.d +etc/dt/config/ja_JP.UTF-8 +etc/dt/config/ja_JP.UTF-8/Xresources.d +etc/dt/config/ja_JP.eucJP +etc/dt/config/ja_JP.eucJP/Xresources.d +etc/dt/config/ko +etc/dt/config/ko/Xresources.d +etc/dt/config/ko.UTF-8 +etc/dt/config/ko.UTF-8/Xresources.d +etc/dt/config/pl_PL.ISO8859-2 +etc/dt/config/pl_PL.ISO8859-2/Xresources.d +etc/dt/config/pl_PL.UTF-8 +etc/dt/config/pl_PL.UTF-8/Xresources.d +etc/dt/config/pt_BR +etc/dt/config/pt_BR/Xresources.d +etc/dt/config/pt_BR.ISO8859-1 +etc/dt/config/pt_BR.ISO8859-1/Xresources.d +etc/dt/config/pt_BR.UTF-8 +etc/dt/config/pt_BR.UTF-8/Xresources.d +etc/dt/config/ru_RU.ISO8859-5 +etc/dt/config/ru_RU.ISO8859-5/Xresources.d +etc/dt/config/ru_RU.UTF-8 +etc/dt/config/ru_RU.UTF-8/Xresources.d +etc/dt/config/sk_SK.ISO8859-2 +etc/dt/config/sk_SK.ISO8859-2/Xresources.d +etc/dt/config/sv +etc/dt/config/sv/Xresources.d +etc/dt/config/sv.ISO8859-15 +etc/dt/config/sv.ISO8859-15/Xresources.d +etc/dt/config/sv.UTF-8 +etc/dt/config/sv.UTF-8/Xresources.d +etc/dt/config/th_TH +etc/dt/config/th_TH/Xresources.d +etc/dt/config/th_TH.ISO8859-11 +etc/dt/config/th_TH.ISO8859-11/Xresources.d +etc/dt/config/th_TH.TIS620 +etc/dt/config/th_TH.TIS620/Xresources.d +etc/dt/config/th_TH.UTF-8 +etc/dt/config/th_TH.UTF-8/Xresources.d +etc/dt/config/zh +etc/dt/config/zh/Xresources.d +etc/dt/config/zh.GBK +etc/dt/config/zh.GBK/Xresources.d +etc/dt/config/zh.UTF-8 +etc/dt/config/zh.UTF-8/Xresources.d +etc/dt/config/zh_HK.BIG5HK +etc/dt/config/zh_HK.BIG5HK/Xresources.d +etc/dt/config/zh_TW +etc/dt/config/zh_TW/Xresources.d +etc/dt/config/zh_TW.BIG5 +etc/dt/config/zh_TW.BIG5/Xresources.d +etc/dt/config/zh_TW.UTF-8 +etc/dt/config/zh_TW.UTF-8/Xresources.d +.*/perllocal.pod +.*\\.a +); + +my @csw_dirs = qw( +etc/init.d +etc/rc0.d +etc/rc1.d +etc/rc2.d +etc/rc3.d +etc/rcS.d +opt/csw +opt/csw/etc +opt/csw/bin +opt/csw/bin/sparcv8 +opt/csw/bin/sparcv8plus +opt/csw/bin/sparcv8plus+vis +opt/csw/bin/sparcv9 +opt/csw/sbin +opt/csw/share +opt/csw/share/doc +opt/csw/share/locale +opt/csw/share/man +opt/csw/share/man/man1 +opt/csw/share/man/man2 +opt/csw/share/man/man3 +opt/csw/share/man/man4 +opt/csw/share/man/man5 +opt/csw/share/man/man6 +opt/csw/share/man/man7 +opt/csw/share/man/man8 +opt/csw/share/info +opt/csw/lib +opt/csw/lib/X11 +opt/csw/lib/X11/app-defaults +opt/csw/include +opt/csw/libexec +opt/csw/var +); + +my @possible_scripts = qw(request checkinstall preinstall postinstall preremove postremove i.smfno i.smfyes space); + +my @sunwsprolocs = ('/opt/forte8/SUNWspro/bin', '/opt/SUNWspro/bin', '/opt/studio11/SUNWspro/bin'); +my $builddir = $ENV{'BUILDDIR'} || '/var/tmp/sithglan-pkg'; +my $packagedir = $ENV{'PACKAGEDIR'} || "${RealBin}/../packages"; +my $content = "/var/sadm/install/contents"; +my %options; # getopt + +# variables defined via eval +my $progname = undef; +my $version = undef; +my $buildroot = undef; +my $category = undef; +my $vendor = undef; +my $hotline = 'http://www.opencsw.org/bugtrack/'; +my $email = 'thomas at opencsw.org'; +my @sources = undef; +my $prepatch = undef; +my @patches = (); # default to no patches +my $copyright = undef; +my $build = undef; +my $suffix = undef; +my $rev = undef; +my $defarch = undef; +my $osversion = undef; +my @packages = undef; +my @isaexecs = (); +my $sunwspropath = undef; +my %attributes = (); +my %seenpaths = (); +my %contents = (); +my $prototypeadd = undef; + +# helper applications +my $tar = '/opt/csw/bin/gtar'; +my $svn = '/opt/csw/bin/svn'; + +sub +system_dieonfail +{ + my $cmd = shift; + system($cmd) == 0 or die "system '$cmd' failed: $?" +} + +sub +prepare +{ + chdir($builddir) || die("can't change to $builddir"); + + foreach my $source (@sources) { + if (($source =~ /tar\.gz$/) + ||($source =~ /tgz$/) + ||($source =~ /tar\.Z$/)) { + system_dieonfail("/bin/gzcat ${RealBin}/../sources/${source} | ${tar} xf -"); + + } elsif ($source =~ /tar\.bz2$/) { + system_dieonfail("LD_LIBRARY_PATH= /bin/bzcat ${RealBin}/../sources/${source} | ${tar} xf -"); + + } elsif ($source =~ /tar$/) { + system_dieonfail("${tar} xf ${RealBin}/../sources/${source}"); + + } elsif (my @svn_subs = ($source =~ /^svn:\/\/([^\/]+)([^\?]+)(\?(.*))?/)) { + my $svn_host = shift @svn_subs; + my $svn_path = shift @svn_subs; + + my $svn_dir = ""; + my $svn_rev = ""; + my $svn_proto = ""; + + if ($#svn_subs == 1) { + my @svn_prms = split(/\&/, $svn_subs[1]); + + foreach my $svn_prm (@svn_prms) { + my @svn_pair = split(/=/, $svn_prm); + + if ($svn_pair[0] eq "dir") { + $svn_dir = $svn_pair[1]; + } elsif ($svn_pair[0] eq "rev") { + $svn_rev = $svn_pair[1]; + } elsif ($svn_pair[0] eq "proto") { + $svn_proto = $svn_pair[1]; + } else { + die("huh? name='$svn_pair[0]' value='$svn_pair[1]'"); + } + } + } + + if ($svn_dir eq "") { + $svn_dir = $svn_path; + $svn_dir =~ s/^.+\///; + } + + if ($svn_rev eq "") { + $svn_rev = "HEAD"; + } + + if ($svn_proto eq "") { + $svn_proto = "svn"; + } + + system_dieonfail("${svn} checkout --quiet --non-interactive --revision ${svn_rev} ${svn_proto}://${svn_host}${svn_path} ${svn_dir}"); + } else { + die("don't know how to extrace ${source}"); + } + } + + if (defined($prepatch)) { + open(PREPATCH, "> $builddir/prepatch") || die ("can't create $builddir/prepatch: $!"); + print PREPATCH $prepatch; + close(PREPATCH); + system_dieonfail("chmod +x $builddir/prepatch"); + system_dieonfail("/bin/bash -x $builddir/prepatch"); + unlink("$builddir/prepatch"); + } + + foreach my $patch (@patches) { + chdir("$builddir/@{$patch}[1]") || die("can't change to $builddir/@{$patch}[1]"); + system_dieonfail("gpatch @{$patch}[2] < ${RealBin}/../sources/@{$patch}[0]"); + } +} + +sub probe_directory +{ + while (my $dir = shift) { + -d $dir && return $dir; + } + + return undef; +} + + +sub +isaexec +{ + foreach my $exec (@isaexecs) { + open(ISA, "> ${builddir}/isaexec.c") || die("can't create ${builddir}/isaexec.c for overwrite: $!"); + print ISA <<"EOF"; +#include + +int +main(int argc, char *argv[], char *envp[]) +{ + return (isaexec("${exec}", argv, envp)); +} +EOF + close(ISA); + system_dieonfail("${sunwspropath}/cc -o ${buildroot}${exec} ${builddir}/isaexec.c"); + unlink("${builddir}/isaexec.c"); + } +} + +sub +build +{ + my $buildscript = "${builddir}/${progname}-${version}-buildscript"; + + chdir($builddir) || die("can't change to $builddir"); + + open(BUILD, "> $buildscript") || die ("can't create $buildscript: $!"); + print BUILD $build; + close(BUILD); + system_dieonfail("chmod +x $buildscript"); + system_dieonfail("/bin/bash -xe $buildscript"); + # unlink("$buildscript"); + isaexec(); + strip(); +} + +sub +compute_ownership +{ + my $path = shift; + my $perm = shift; + my $user = 'root'; + my $group = 'bin'; + + if (%attributes) { + $perm = $attributes{$path}->{perm} || $perm; + $user = $attributes{$path}->{user} || $user; + $group = $attributes{$path}->{group} || $group; + } + + return "$perm $user $group\n"; +} + +# This functions purpose is to get sure that all directories in /path/to/file +# are also in file list. It also accounts which filename was packaged in what +# package. So that it possible to warn the user if a file has been packaed in +# more than one package. + +sub +verify_path +{ + my $r = shift; + my $prototype = shift; + my $path = shift; + + push(@{$seenpaths{$path}}, "CSW$r->{pkgname}"); + + # Handle symlinks in the art of etc/rcS.d/K03cswsamba=../init.d + $path =~ s/=.*$//; + + while ('.' ne ($path = dirname($path))) { + if (! grep($_ =~ /^d none \/\Q${path}\E\s+/, @$prototype)) { + pkgproto($r, $prototype, `echo ${path} | pkgproto`); + } + } +} + +sub +pkgproto +{ + my $r = shift; + my $prototype = shift; + + while (my $line = shift) { + my @fields = split(/\s+/, $line); + if ((! ($fields[2] =~ /\//) ) || (grep(eval "\$fields[2] =~ m|^$_\$|", @csw_ignore))) { + # skip certain paths (opt, etc, ...) + # print STDERR "WARNING: Ignoring prototype path <$fields[2] ($fields[0])>\n"; + next; + } + if ($fields[0] eq 'd') { + # d none opt/csw 0755 sithglan icipguru + if (grep($fields[2] eq $_, @csw_dirs)) { + unshift(@$prototype, "$fields[0] $fields[1] /$fields[2] ? ? ?\n"); + } else { + unshift(@$prototype, "$fields[0] $fields[1] /$fields[2] " . compute_ownership("/$fields[2]", "$fields[3]")); + } + + } elsif ($fields[0] eq 'f') { + # f none opt/csw 0755 sithglan icipguru + push(@$prototype, "$fields[0] $fields[1] /$fields[2] " . compute_ownership("/$fields[2]", "$fields[3]")); + verify_path($r, $prototype, $fields[2]); + + } elsif ( ($fields[0] eq 's') + ||($fields[0] eq 'l')) { + push(@$prototype, "$fields[0] $fields[1] /$fields[2]\n"); + verify_path($r, $prototype, $fields[2]); + } else { + die ("unknown line: <$line>"); + } + } +} + +sub +generate_prototype +{ + my $r = shift; + + my @prototype = (); + + chdir($buildroot) || die("can't change to ${buildroot}: $!"); + push(@prototype, "i pkginfo\n"); + push(@prototype, "i depend\n"); + if (defined(${copyright})) { + -f "$builddir/${copyright}" || die("can't find copyrightfile: $!"); + system_dieonfail("cp $builddir/${copyright} copyright"); + push(@prototype, "i copyright\n"); + } + foreach my $file (@possible_scripts) { + if (defined($r->{"$file"})) { + -f "${RealBin}/../sources/$r->{$file}" || die("can't find $file: $!"); + system_dieonfail("cp -f ${RealBin}/../sources/$r->{$file} $file"); + push(@prototype, "i $file\n"); + } + } + + my @dirs = `gfind @{$r->{filelist}} -type d | sort | uniq | pkgproto`; + pkgproto($r, \@prototype, @dirs); + my @links = `gfind @{$r->{filelist}} -type l | sort | uniq | pkgproto`; + pkgproto($r, \@prototype, @links); + my @files = `gfind @{$r->{filelist}} -type f | sort | uniq | pkgproto`; + pkgproto($r, \@prototype, @files); + + open(PROTOTYPE, "> ${buildroot}/prototype") || die("can't open ${buildroot}/prototype for overwrite: $!"); + print PROTOTYPE @prototype; + if (defined(${prototypeadd})) { + print PROTOTYPE $prototypeadd; + } + close(PROTOTYPE); +} + +sub +uniq +{ + my %hash; @hash{@_} = (); + return sort keys %hash; +} + +sub +write_dependencies +{ + my $r = shift || die("one reference expected"); + + my @out = `pkginfo`; + my %pkg = (); + foreach my $line (@out) { + if ($line =~ /^[^\s]+\s+([^\s]+)\s+([^\s].*)/) { + $pkg{$1} = "$2"; + } + } + + open(DEP, '> depend') || die("can't open depend file: $!"); + + foreach my $dep (@{$r->{dependencies}}) { + if (! defined($pkg{$dep})) { + print STDERR "WARNING: FAKEING dependency for <$dep>\n"; + $pkg{$dep} = 'common - THIS IS A FAKE DEPENDENCY'; + } + print DEP "P $dep $pkg{$dep}\n"; + } + + if (defined($r->{incompatibilities})) { + foreach my $inc (@{$r->{incompatibilities}}) { + if (! defined($pkg{$inc})) { + print STDERR "WARNING: FAKEING incompatibiltie for <$inc>\n"; + $pkg{$inc} = 'common - THIS IS A FAKE INCOMPATIBILTY'; + } + print DEP "I $inc $pkg{$inc}\n"; + } + } + + close(DEP); +} + +sub +resolve_link +{ + my $file = shift || die ("one argument expected"); + my $count = 0; + + chomp($file); + + while ((-l $file) + && ($count < 10)) { + my $dirname = dirname($file); + $file = readlink($file); + if(! ($file =~ /^\//)) { + $file = $dirname . '/' . $file; + } + $count++; + } + + return $file; +} + +sub +a1minusa2 +{ + my ($a1,$a2) = @_; + my %h; + @h{@$a2} = (1) x @$a2; + return grep {!exists $h{$_}} @$a1; +} + +sub +populate_contents +{ + open(FILE, ${content}) || die("can't open ${content}: $!"); + for my $line () { + # /etc/cron.d/queuedefs f none 0644 root sys 17 1164 1018133064 SUNWcsr + # 0 1 2 3 4 5 6 7 8 9 + my @array = split(/\s+/, $line); + my ($file, $type, @packages) = @array[0, 1, 9 ... $#array]; + if ($type =~ /^f$/) { + push(@{$contents{$file}}, @packages); + } + } + close(FILE); +} + +sub +find_dependencies +{ + my $r = shift || die("one reference expected"); + populate_contents(); + + chdir(${buildroot}) || die("can't change to ${buildroot}: $!"); + # look for shared libaries + my @deps = `gfind @{$r->{filelist}} \\( \\( -type f -perm +111 \\) -o -name \\*.so\\* \\) | xargs ldd 2> /dev/null | grep -v 'file not found' 2> /dev/null | grep '=>' | awk '{print \$3}'`; + + # look for bangs + my @files = `gfind @{$r->{filelist}} -type f -perm +111`; + foreach my $file (@possible_scripts) { + -f "${buildroot}/${file}" && push(@files, "${buildroot}/${file}"); + } + foreach my $file (@files) { + chomp($file); + open(FILE, $file) || die("can't open ${file}: $!"); + my $firstline = ; + if ($firstline =~ /^#!\s?([^\s]+)/) { + push(@deps, "$1\n"); + } + close(FILE); + } + + # resolve symlinks / substitute + @deps = uniq(@deps); + for my $element (@deps) { + # /bin and /lib are packages in /usr/{bin,lib} + $element =~ s#^/bin#/usr/bin#; + $element =~ s#^/lib#/usr/lib#; + # /opt/csw/lib/sparcv8 is a symlink to . + $element =~ s#^/opt/csw/lib/sparcv8#/opt/csw/lib#; + # Resolve links if necessary + $element = resolve_link($element); + } + + # get dependencies + my @newdeps = (); + foreach my $dep (@deps) { + # + $dep =~ s#\w+\/\.\.##g; + + if (defined($contents{$dep})) { + push(@newdeps, @{$contents{$dep}}); + } + } + + # exclude anything that starts with SUNW (but only from discovered + # list, not from the list specified in the spec file) + @newdeps = grep(!/^SUNW/, @newdeps); + push(@{$r->{dependencies}}, @newdeps); + + # make them uniq and don't include a dependency to the packet itself + @{$r->{dependencies}} = grep("CSW$r->{pkgname}" ne $_, uniq(@{$r->{dependencies}})); + + if (defined($r->{exclude_dependencies})) { + @{$r->{dependencies}} = a1minusa2($r->{dependencies}, $r->{exclude_dependencies}); + } + + write_dependencies($r); +} + +sub +strip +{ + system("/usr/ccs/bin/strip ${buildroot}/opt/csw/bin/* ${buildroot}/opt/csw/bin/sparcv8/* ${buildroot}/opt/csw/bin/sparcv8plus/* ${buildroot}/opt/csw/bin/sparcv8plus+vis/* ${buildroot}/opt/csw/bin/sparcv9/* 2> /dev/null"); +} + +sub +generate_pkginfo +{ + my $r = shift || die("one reference expected"); + my $a = $r->{arch} || $defarch; + my $p = $r->{pstamp} || undef; + + chdir(${buildroot}) || die("can't change to ${buildroot}: $!"); + open(PKGINFO, '> pkginfo'); + +print PKGINFO <<"EOF"; +PKG=CSW$r->{pkgname} +NAME=$r->{name} +ARCH=$a +CATEGORY=${category} +VERSION=${version} +VENDOR=${vendor} +HOTLINE=${hotline} +EMAIL=${email} +EOF +print PKGINFO "PSTAMP=$p\n" if ($p); +# DESC=[Optional extra info about software. Omit this line if you wish] + close(PKGINFO); +} + +sub +actually_package +{ + my $r = shift || die("one reference expected"); + my $a = $r->{arch} || $defarch; + + my $filename="$r->{filename}-${version}-SunOS${osversion}-$a-CSW.pkg"; + + chdir(${buildroot}) || die("can't change to ${buildroot}: $!"); + system_dieonfail("/usr/bin/pkgmk -o -r ${buildroot}"); + system_dieonfail("/usr/bin/pkgtrans -s /var/spool/pkg ${packagedir}/$filename CSW$r->{pkgname}"); + unlink("${packagedir}/${filename}.gz"); + system_dieonfail("/usr/bin/gzip ${packagedir}/$filename"); + system("rm -rf /var/spool/pkg/CSW$r->{pkgname}"); + system_dieonfail("/opt/csw/bin/checkpkg ${packagedir}/${filename}.gz"); +} + +# This function makes all files not readable by me readable. This is because +# the bang checker and pkgmk needs this. The correct permissions are allready +# in pkginfo file so everything is as it should be. + +sub +make_all_files_readable_by_user +{ + my $r = shift || die("one reference expected"); + + chdir(${buildroot}) || die("can't change to ${buildroot}: $!"); + system_dieonfail("gfind @{$r->{filelist}} \\( -perm -400 -o -print \\) | xargs -x -n 1 chmod u+r"); +} + +sub +mkpackage +{ + foreach my $r (@packages) { + generate_prototype($r); + make_all_files_readable_by_user($r); + generate_pkginfo($r); + find_dependencies($r); + actually_package($r); + } + + foreach my $key (keys(%seenpaths)) { + if (1 < @{$seenpaths{$key}}) { + print "$key -> @{$seenpaths{$key}}\n"; + } + } +} + +if (! (-d $builddir)) { + mkdir("$builddir", 0755) || die("can't create $builddir: $!"); +} + +#main +# { + +if (! GetOptions(\%options, "p", "b", "c", "s", "u", "rev=s")) { + print <<"__EOF__"; +${RealBin}/${RealScript} [-p] [-b] [-c] [-s] specfile ... + + -p prepare: extract and patch sources + -b build: build and install sources into destenation + -c create: create package + -s show: show build script and exit (high precedence!) + -u cleanUp: remove ${builddir} + -rev use instead of current date + + If no parameter is specified. The given specfile is processed. (eg. + prepared, build and packaged) +__EOF__ + exit(1); +} + +# Unset makeflags +$ENV{'MFLAGS'} = ''; +$ENV{'MAKEFLAGS'} = ''; + +my $infile = shift || die('one argument expected'); + +if (! defined($defarch)) { + $defarch = `/bin/uname -p` || die("can't get arch: $!"); + chomp($defarch); +} + +$sunwspropath = probe_directory(@sunwsprolocs) || die ("couldn't find SUNWspro"); + +eval `/bin/cat $infile`; + +if (! defined($rev)) { + $rev = $options{'rev'} || $ENV{'REV'} || `/bin/date '+20%y.%m.%d'`; +} +chomp ($rev); + +$version .= ',REV=' . ${rev}; + +if (defined($suffix)) { + $version .= $suffix; +} + +if (! defined($osversion)) { + $osversion = `/bin/uname -r`; + chomp($osversion); +} + +if (! -d "${packagedir}") { + system("/bin/mkdir -p ${packagedir}"); +} + +if (! keys(%options)) { + prepare(); + build(); + mkpackage(); + exit(); +} + +if (defined($options{'s'})) { + print $build; + exit(); +} + +if (defined($options{'p'})) { + prepare(); +} + +if (defined($options{'b'})) { + build(); +} + +if (defined($options{'c'})) { + mkpackage(); +} + +if (defined($options{'u'})) { + system("/bin/rm -rf ${builddir}"); +} + +# } Modified: csw/mgar/pkg/mpeg4ip/trunk/Makefile =================================================================== --- csw/mgar/pkg/mpeg4ip/trunk/Makefile 2010-01-04 10:28:15 UTC (rev 7856) +++ csw/mgar/pkg/mpeg4ip/trunk/Makefile 2010-01-04 11:52:34 UTC (rev 7857) @@ -10,9 +10,12 @@ endef SF_PROJ = mpeg4ip +# SF doesn't have the latest version as it was removed due to some breakage +# So we get it from another place and patch the flaw away MASTER_SITES = http://download.m0k.org/handbrake/contrib/ DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz DISTNAME = $(GARNAME) +PATCHFILES = mpeg4ip-1.6.1-mjj.patch # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz Modified: csw/mgar/pkg/mpeg4ip/trunk/checksums =================================================================== --- csw/mgar/pkg/mpeg4ip/trunk/checksums 2010-01-04 10:28:15 UTC (rev 7856) +++ csw/mgar/pkg/mpeg4ip/trunk/checksums 2010-01-04 11:52:34 UTC (rev 7857) @@ -1 +1,2 @@ +0ae174e13da77a783e636aa2904b7c90 mpeg4ip-1.6.1-mjj.patch cd81b566cf2fafc7318f58be8998182c mpeg4ip-1.6.1.tar.gz Added: csw/mgar/pkg/mpeg4ip/trunk/files/mpeg4ip-1.6.1-mjj.patch =================================================================== --- csw/mgar/pkg/mpeg4ip/trunk/files/mpeg4ip-1.6.1-mjj.patch (rev 0) +++ csw/mgar/pkg/mpeg4ip/trunk/files/mpeg4ip-1.6.1-mjj.patch 2010-01-04 11:52:34 UTC (rev 7857) @@ -0,0 +1,304 @@ +Index: mpeg4ip-1.6.1/common/video/iso-mpeg4/src/Makefile.am +=================================================================== +--- mpeg4ip-1.6.1.orig/common/video/iso-mpeg4/src/Makefile.am 2006-02-10 04:57:29.000000000 +1100 ++++ mpeg4ip-1.6.1/common/video/iso-mpeg4/src/Makefile.am 2008-03-28 13:20:24.083621000 +1100 +@@ -1,5 +1,5 @@ + +-AM_CXXFLAGS = -D__TRACE_AND_STATS_ -D__DOUBLE_PRECISION_ -D_REENTRANT -DNOCONTROLS -fexceptions -Wall -Werror -D_OBSS_ @BILLS_CPPWARNINGS@ ++AM_CXXFLAGS = -D__TRACE_AND_STATS_ -D__DOUBLE_PRECISION_ -D_REENTRANT -DNOCONTROLS -fexceptions -Wall -D_OBSS_ @BILLS_CPPWARNINGS@ + + INCLUDES = -I$(srcdir)/../include + +Index: mpeg4ip-1.6.1/common/video/iso-mpeg4/src/Makefile.in +=================================================================== +--- mpeg4ip-1.6.1.orig/common/video/iso-mpeg4/src/Makefile.in 2007-04-27 09:59:31.000000000 +1000 ++++ mpeg4ip-1.6.1/common/video/iso-mpeg4/src/Makefile.in 2008-03-27 01:55:41.267172000 +1100 +@@ -106,7 +106,7 @@ + am__quote = @am__quote@ + install_sh = @install_sh@ + +-AM_CXXFLAGS = -D__TRACE_AND_STATS_ -D__DOUBLE_PRECISION_ -D_REENTRANT -DNOCONTROLS -fexceptions -Wall -Werror -D_OBSS_ @BILLS_CPPWARNINGS@ ++AM_CXXFLAGS = -D__TRACE_AND_STATS_ -D__DOUBLE_PRECISION_ -D_REENTRANT -DNOCONTROLS -fexceptions -Wall -D_OBSS_ @BILLS_CPPWARNINGS@ + + INCLUDES = -I$(srcdir)/../include + +Index: mpeg4ip-1.6.1/common/video/mpeg4-2000/app/convertpar/Makefile.am +=================================================================== +--- mpeg4ip-1.6.1.orig/common/video/mpeg4-2000/app/convertpar/Makefile.am 2003-05-06 07:07:21.000000000 +1000 ++++ mpeg4ip-1.6.1/common/video/mpeg4-2000/app/convertpar/Makefile.am 2008-03-28 13:20:43.452101000 +1100 +@@ -1,6 +1,6 @@ + # + +-AM_CXXFLAGS = -D__TRACE_AND_STATS_ -D__DOUBLE_PRECISION_ -D_REENTRANT -DNOCONTROLS -fexceptions -Wall -Werror -D_OBSS_ ++AM_CXXFLAGS = -D__TRACE_AND_STATS_ -D__DOUBLE_PRECISION_ -D_REENTRANT -DNOCONTROLS -fexceptions -Wall -D_OBSS_ + + check_PROGRAMS = convertpar + +Index: mpeg4ip-1.6.1/common/video/mpeg4-2000/idct/Makefile.am +=================================================================== +--- mpeg4ip-1.6.1.orig/common/video/mpeg4-2000/idct/Makefile.am 2003-11-14 09:08:37.000000000 +1100 ++++ mpeg4ip-1.6.1/common/video/mpeg4-2000/idct/Makefile.am 2008-03-28 13:21:08.940124000 +1100 +@@ -1,6 +1,6 @@ + AM_CFLAGS = -D__TRACE_AND_STATS_ -D__DOUBLE_PRECISION_ -D_OBSS_ -DFGSPOSTCLIP -Wall -Wpointer-arith -Wcast-align -Wmissing-prototypes -fexceptions + +-AM_CXXFLAGS = -D__TRACE_AND_STATS_ -D__DOUBLE_PRECISION_ -D_OBSS_ -DFGSPOSTCLIP -D_REENTRANT -DNOCONTROLS -fexceptions -Wall -Werror ++AM_CXXFLAGS = -D__TRACE_AND_STATS_ -D__DOUBLE_PRECISION_ -D_OBSS_ -DFGSPOSTCLIP -D_REENTRANT -DNOCONTROLS -fexceptions -Wall + + noinst_LTLIBRARIES = libobj_idct.la + +Index: mpeg4ip-1.6.1/configure.in +=================================================================== +--- mpeg4ip-1.6.1.orig/configure.in 2007-11-12 04:39:13.000000000 +1100 ++++ mpeg4ip-1.6.1/configure.in 2008-06-17 22:13:47.888186000 +1000 +@@ -237,7 +237,7 @@ + [have_mpeg2=false]) + if test x$have_mpeg2 = xtrue; then + AC_MSG_CHECKING([libmpeg2 version]) +- AC_COMPILE_IFELSE([#include ++ AC_COMPILE_IFELSE([$ac_includes_default + #include + + #ifndef MPEG2_VERSION +@@ -513,9 +513,9 @@ + AC_DEFINE(HAVE_FFMPEG_INSTALLED, 1, [defined if ffmpeg is installed]) + FFMPEG_INC= + FFMPEG_LIB="-lavcodec -lz $ffmpeg_add_libs" +- AC_CHECK_TYPES([AVRational], , , [#include ]) +- AC_CHECK_MEMBERS(AVCodecContext.time_base, , , [#include ]) +- AC_CHECK_DECLS([avcodec_decode_audio2], , ,[#include ]) ++ AC_CHECK_TYPES([AVRational], , , [#include ]) ++ AC_CHECK_MEMBERS(AVCodecContext.time_base, , , [#include ]) ++ AC_CHECK_DECLS([avcodec_decode_audio2], , ,[#include ]) + AC_DEFINE(HAVE_FFMPEG, 1, [enable ffmpeg for mp4live]) + AC_CHECK_LIB(amrnb, VADxEncoder_Interface_init, + [have_amr_nb=true], [have_amr_nb=false]) +@@ -769,7 +769,7 @@ + + if test x$USENASM = xtrue; then + AC_MSG_CHECKING(nasm version...) +- BILLSNASM_arg=`nasm -r | tr '.' ' '` ++ BILLSNASM_arg=`nasm -v | tr '.' ' '` + BILLSNASM_ret=`util/testnasm.sh $BILLSNASM_arg` + if test x$BILLSNASM_ret = x"yes"; then + USENASM=true +Index: mpeg4ip-1.6.1/cvs_bootstrap +=================================================================== +--- mpeg4ip-1.6.1.orig/cvs_bootstrap 2007-04-27 09:38:03.000000000 +1000 ++++ mpeg4ip-1.6.1/cvs_bootstrap 2008-03-27 15:09:40.972209000 +1100 +@@ -6,7 +6,7 @@ + + # Check that we can find libtool + # Frequently it hasn't been installed +-if glibtool --version > /dev/null 2> /dev/null ++if (glibtool --version >/dev/null 2>/dev/null) + then + libtool=glibtool + if libtoolize --version > /dev/null +@@ -87,19 +87,19 @@ + + # + # This tries to find all the aclocal files that we need +-for dir in /usr/local /usr/contrib /opt/gnome /usr /opt/local +-do +- if test -d $dir/share/aclocal -a `which aclocal` != $dir/bin/aclocal +- then +- ACLOCAL_FLAGS="-I $dir/share/aclocal $ACLOCAL_FLAGS" +- fi +-done +- +-if test $target_system != "CYGWIN_NT-5.1"; then +-ERRCMD=--enable-warns-as-err +-else ++#for dir in /usr/local /usr/contrib /opt/gnome /usr /opt/local ++#do ++# if test -d $dir/share/aclocal -a `which aclocal` != $dir/bin/aclocal ++# then ++# ACLOCAL_FLAGS="-I $dir/share/aclocal $ACLOCAL_FLAGS" ++# fi ++#done ++ ++#if test $target_system != "CYGWIN_NT-5.1"; then ++#ERRCMD=--enable-warns-as-err ++#else + ERRCMD= +-fi ++#fi + + pwd=`pwd` + if test $target_system != "Darwin"; then +Index: mpeg4ip-1.6.1/lib/SDLAudio/configure.in +=================================================================== +--- mpeg4ip-1.6.1.orig/lib/SDLAudio/configure.in 2005-01-18 07:46:07.000000000 +1100 ++++ mpeg4ip-1.6.1/lib/SDLAudio/configure.in 2008-03-27 15:13:02.326777000 +1100 +@@ -45,6 +45,7 @@ + + dnl Check for tools + ++AM_PROG_AS + AC_LIBTOOL_WIN32_DLL + AM_PROG_LIBTOOL + AC_PROG_MAKE_SET +Index: mpeg4ip-1.6.1/lib/gnu/Makefile.am +=================================================================== +--- mpeg4ip-1.6.1.orig/lib/gnu/Makefile.am 2007-11-12 04:39:19.000000000 +1100 ++++ mpeg4ip-1.6.1/lib/gnu/Makefile.am 2008-03-28 13:21:33.278293000 +1100 +@@ -12,5 +12,5 @@ + EXTRA_DIST = libmissing60.dsp libmissing.vcproj \ + need_for_win32.c + +-AM_CFLAGS = -D_REENTRANT -Werror -Wall -Wcast-align -Wstrict-prototypes -Wmissing-prototypes ++AM_CFLAGS = -D_REENTRANT -Wall -Wcast-align -Wstrict-prototypes -Wmissing-prototypes + +Index: mpeg4ip-1.6.1/lib/gnu/Makefile.in +=================================================================== +--- mpeg4ip-1.6.1.orig/lib/gnu/Makefile.in 2007-11-12 05:04:47.000000000 +1100 ++++ mpeg4ip-1.6.1/lib/gnu/Makefile.in 2008-03-27 01:56:56.241400000 +1100 +@@ -141,7 +141,7 @@ + need_for_win32.c + + +-AM_CFLAGS = -D_REENTRANT -Werror -Wall -Wcast-align -Wstrict-prototypes -Wmissing-prototypes ++AM_CFLAGS = -D_REENTRANT -Wall -Wcast-align -Wstrict-prototypes -Wmissing-prototypes + subdir = lib/gnu + mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs + CONFIG_HEADER = $(top_builddir)/mpeg4ip_config.h +Index: mpeg4ip-1.6.1/lib/rtp/Makefile.am +=================================================================== +--- mpeg4ip-1.6.1.orig/lib/rtp/Makefile.am 2007-11-12 04:39:25.000000000 +1100 ++++ mpeg4ip-1.6.1/lib/rtp/Makefile.am 2008-03-28 13:23:26.489602000 +1100 +@@ -74,7 +74,7 @@ + + check_PROGRAMS = test_rtp_client test_rtp_server + +-AM_CFLAGS = -DDEBUG -Wall -Werror ++AM_CFLAGS = -DDEBUG -Wall + test_rtp_client_SOURCES = test_rtp_client.c + test_rtp_client_LDADD = libuclmmbase.la \ + $(top_builddir)/lib/utils/libmutex.la \ +Index: mpeg4ip-1.6.1/lib/rtp/Makefile.in +=================================================================== +--- mpeg4ip-1.6.1.orig/lib/rtp/Makefile.in 2007-11-12 05:04:25.000000000 +1100 ++++ mpeg4ip-1.6.1/lib/rtp/Makefile.in 2008-03-27 01:54:27.572853000 +1100 +@@ -202,7 +202,7 @@ + + check_PROGRAMS = test_rtp_client test_rtp_server + +-AM_CFLAGS = -DDEBUG -Wall -Werror ++AM_CFLAGS = -DDEBUG -Wall + test_rtp_client_SOURCES = test_rtp_client.c + test_rtp_client_LDADD = libuclmmbase.la \ + $(top_builddir)/lib/utils/libmutex.la \ +Index: mpeg4ip-1.6.1/lib/rtp/configure.in +=================================================================== +--- mpeg4ip-1.6.1.orig/lib/rtp/configure.in 2006-03-21 10:13:25.000000000 +1100 ++++ mpeg4ip-1.6.1/lib/rtp/configure.in 2008-03-28 13:22:21.554566000 +1100 +@@ -275,7 +275,7 @@ + [AC_MSG_NOTICE([compiler warnings will not be errs])]) + + BILLS_CWARNINGS="$BASE_ERR" +-CFLAGS="$CFLAGS -Wall -Werror" ++CFLAGS="$CFLAGS -Wall" + MY_CHECK_CC_OPT_SET([-Wmissing-prototypes], BILLS_CWARNINGS, [c compiler]) + MY_CHECK_CC_OPT_SET([-Wmissing-declarations], BILLS_CWARNINGS, [c compiler]) + MY_CHECK_CC_OPT_SET([-Wbad-function-cast], BILLS_CWARNINGS, [c compiler]) +Index: mpeg4ip-1.6.1/lib/rtp/rtp.c +=================================================================== +--- mpeg4ip-1.6.1.orig/lib/rtp/rtp.c 2007-01-23 04:31:08.000000000 +1100 ++++ mpeg4ip-1.6.1/lib/rtp/rtp.c 2008-03-27 01:54:27.582899000 +1100 +@@ -2489,6 +2489,9 @@ + buffer_len += iov[i].iov_len; + } + if (buffer_len > session->m_output_buffer_size) { ++#ifndef MAX ++#define MAX(a,b) (((a)>(b))?(a):(b)) ++#endif + session->m_output_buffer = (uint8_t *)xrealloc(session->m_output_buffer, + MAX(buffer_len, 1500)); + session->m_output_buffer_size = MAX(buffer_len, 1500); +Index: mpeg4ip-1.6.1/player/lib/audio/faad/Makefile.in +=================================================================== +--- mpeg4ip-1.6.1.orig/player/lib/audio/faad/Makefile.in 2007-11-12 05:03:57.000000000 +1100 ++++ mpeg4ip-1.6.1/player/lib/audio/faad/Makefile.in 2008-03-27 01:57:58.796587000 +1100 +@@ -161,7 +161,7 @@ + util.h + + INCLUDES = -I$(top_srcdir)/include +-AM_CFLAGS = -O2 -Werror -Wall -fexceptions -fno-strict-aliasing ++AM_CFLAGS = -O2 -Wall -fexceptions -fno-strict-aliasing + + EXTRA_DIST = COPYING libfaad60.dsp README libfaad.vcproj + subdir = player/lib/audio/faad +Index: mpeg4ip-1.6.1/player/plugin/audio/ffmpeg/ffmpeg.h +=================================================================== +--- mpeg4ip-1.6.1.orig/player/plugin/audio/ffmpeg/ffmpeg.h 2007-11-12 04:39:28.000000000 +1100 ++++ mpeg4ip-1.6.1/player/plugin/audio/ffmpeg/ffmpeg.h 2008-06-17 22:11:13.309632000 +1000 +@@ -26,7 +26,7 @@ + #include "codec_plugin.h" + extern "C" { + #ifdef HAVE_FFMPEG_INSTALLED +-#include ++#include + #else + #include + #endif +Index: mpeg4ip-1.6.1/player/plugin/video/ffmpeg/ffmpeg.h +=================================================================== +--- mpeg4ip-1.6.1.orig/player/plugin/video/ffmpeg/ffmpeg.h 2007-11-12 04:39:30.000000000 +1100 ++++ mpeg4ip-1.6.1/player/plugin/video/ffmpeg/ffmpeg.h 2008-06-17 22:11:20.199119000 +1000 +@@ -27,7 +27,7 @@ + #include "codec_plugin.h" + extern "C" { + #ifdef HAVE_FFMPEG_INSTALLED +-#include ++#include + #else + #include + #endif +Index: mpeg4ip-1.6.1/server/mp4live/audio_ffmpeg.h +=================================================================== +--- mpeg4ip-1.6.1.orig/server/mp4live/audio_ffmpeg.h 2007-11-12 04:39:33.000000000 +1100 ++++ mpeg4ip-1.6.1/server/mp4live/audio_ffmpeg.h 2008-06-17 22:11:24.108828000 +1000 +@@ -25,7 +25,7 @@ + #include "audio_encoder.h" + extern "C" { + #ifdef HAVE_FFMPEG_INSTALLED +-#include ++#include + #else + #include + #endif +Index: mpeg4ip-1.6.1/server/mp4live/video_encoder_class.cpp +=================================================================== +--- mpeg4ip-1.6.1.orig/server/mp4live/video_encoder_class.cpp 2007-11-12 04:39:33.000000000 +1100 ++++ mpeg4ip-1.6.1/server/mp4live/video_encoder_class.cpp 2008-06-17 22:11:28.738579000 +1000 +@@ -27,7 +27,7 @@ + #ifdef HAVE_FFMPEG + extern "C" { + #ifdef HAVE_FFMPEG_INSTALLED +-#include ++#include + #else + #include + #endif +Index: mpeg4ip-1.6.1/server/mp4live/video_ffmpeg.h +=================================================================== +--- mpeg4ip-1.6.1.orig/server/mp4live/video_ffmpeg.h 2007-11-12 04:39:33.000000000 +1100 ++++ mpeg4ip-1.6.1/server/mp4live/video_ffmpeg.h 2008-06-17 22:11:32.758184000 +1000 +@@ -25,7 +25,7 @@ + #include "video_encoder.h" + extern "C" { + #ifdef HAVE_FFMPEG_INSTALLED +-#include ++#include + #else + #include + #endif +Index: mpeg4ip-1.6.1/server/util/mp4encode/Makefile.am +=================================================================== +--- mpeg4ip-1.6.1.orig/server/util/mp4encode/Makefile.am 2004-08-18 07:38:06.000000000 +1000 ++++ mpeg4ip-1.6.1/server/util/mp4encode/Makefile.am 2008-03-27 01:54:27.592870000 +1100 +@@ -1 +1,3 @@ +-EXTRA_DIST = mp4encode mp4venc_template.par ++EXTRA_DIST = mp4venc_template.par ++ ++bin_SCRIPTS = mp4encode This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Mon Jan 4 14:38:21 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Mon, 04 Jan 2010 13:38:21 +0000 Subject: [csw-devel] SF.net SVN: gar:[7858] csw/mgar/gar/v2/bin/checkpkg.d/testdata/README Message-ID: Revision: 7858 http://gar.svn.sourceforge.net/gar/?rev=7858&view=rev Author: wahwah Date: 2010-01-04 13:38:20 +0000 (Mon, 04 Jan 2010) Log Message: ----------- mGAR v2: Adding a readme file for the test data Added Paths: ----------- csw/mgar/gar/v2/bin/checkpkg.d/testdata/README Added: csw/mgar/gar/v2/bin/checkpkg.d/testdata/README =================================================================== --- csw/mgar/gar/v2/bin/checkpkg.d/testdata/README (rev 0) +++ csw/mgar/gar/v2/bin/checkpkg.d/testdata/README 2010-01-04 13:38:20 UTC (rev 7858) @@ -0,0 +1,4 @@ +$Id$ + +This directory holds unit test input data. There currently is no better place +to put them, so they have to be distributed together with the main GAR code. Property changes on: csw/mgar/gar/v2/bin/checkpkg.d/testdata/README ___________________________________________________________________ Added: svn:keywords + Id This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Mon Jan 4 15:00:16 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Mon, 04 Jan 2010 14:00:16 +0000 Subject: [csw-devel] SF.net SVN: gar:[7859] csw/mgar/gar/v2/bin/checkpkg.d/README Message-ID: Revision: 7859 http://gar.svn.sourceforge.net/gar/?rev=7859&view=rev Author: wahwah Date: 2010-01-04 14:00:16 +0000 (Mon, 04 Jan 2010) Log Message: ----------- mGAR v2: Adding checkpkg.d-level README file Added Paths: ----------- csw/mgar/gar/v2/bin/checkpkg.d/README Added: csw/mgar/gar/v2/bin/checkpkg.d/README =================================================================== --- csw/mgar/gar/v2/bin/checkpkg.d/README (rev 0) +++ csw/mgar/gar/v2/bin/checkpkg.d/README 2010-01-04 14:00:16 UTC (rev 7859) @@ -0,0 +1,11 @@ +$Id$ + +This directory contains modular checks. Each check is an executable file, +written in any language, accepting specific command line options and returning +the result as a status exit code. + +To see the required flags, issue: + +./checkpkg-dummy.py -h + +Each test's file name must begin with "checkpkg-". Property changes on: csw/mgar/gar/v2/bin/checkpkg.d/README ___________________________________________________________________ Added: svn:keywords + Id This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Mon Jan 4 15:59:02 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Mon, 04 Jan 2010 14:59:02 +0000 Subject: [csw-devel] SF.net SVN: gar:[7860] csw/mgar/pkg/mpeg4ip/trunk Message-ID: Revision: 7860 http://gar.svn.sourceforge.net/gar/?rev=7860&view=rev Author: dmichelsen Date: 2010-01-04 14:59:02 +0000 (Mon, 04 Jan 2010) Log Message: ----------- mpeg4ip: Commit patches Modified Paths: -------------- csw/mgar/pkg/mpeg4ip/trunk/Makefile csw/mgar/pkg/mpeg4ip/trunk/checksums Added Paths: ----------- csw/mgar/pkg/mpeg4ip/trunk/files/0001-Bootstrap-again.patch Modified: csw/mgar/pkg/mpeg4ip/trunk/Makefile =================================================================== --- csw/mgar/pkg/mpeg4ip/trunk/Makefile 2010-01-04 14:00:16 UTC (rev 7859) +++ csw/mgar/pkg/mpeg4ip/trunk/Makefile 2010-01-04 14:59:02 UTC (rev 7860) @@ -15,7 +15,8 @@ MASTER_SITES = http://download.m0k.org/handbrake/contrib/ DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz DISTNAME = $(GARNAME) -PATCHFILES = mpeg4ip-1.6.1-mjj.patch +# PATCHFILES = mpeg4ip-1.6.1-mjj.patch +PATCHFILES += 0001-Bootstrap-again.patch # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz Modified: csw/mgar/pkg/mpeg4ip/trunk/checksums =================================================================== --- csw/mgar/pkg/mpeg4ip/trunk/checksums 2010-01-04 14:00:16 UTC (rev 7859) +++ csw/mgar/pkg/mpeg4ip/trunk/checksums 2010-01-04 14:59:02 UTC (rev 7860) @@ -1,2 +1,2 @@ -0ae174e13da77a783e636aa2904b7c90 mpeg4ip-1.6.1-mjj.patch +68f13fa229cb7e3cc9bd8b4b693766be 0001-Bootstrap-again.patch cd81b566cf2fafc7318f58be8998182c mpeg4ip-1.6.1.tar.gz Added: csw/mgar/pkg/mpeg4ip/trunk/files/0001-Bootstrap-again.patch =================================================================== --- csw/mgar/pkg/mpeg4ip/trunk/files/0001-Bootstrap-again.patch (rev 0) +++ csw/mgar/pkg/mpeg4ip/trunk/files/0001-Bootstrap-again.patch 2010-01-04 14:59:02 UTC (rev 7860) @@ -0,0 +1,149274 @@ +From 55f208309fcf9f18267158f26058a8630721d28f Mon Sep 17 00:00:00 2001 +From: Dagobert Michelsen +Date: Mon, 4 Jan 2010 14:38:17 +0100 +Subject: [PATCH] Bootstrap again + +--- + common/video/iso-mpeg4/config.guess | 1502 ++- + common/video/iso-mpeg4/config.sub | 1706 +++- + common/video/iso-mpeg4/depcomp | 631 +- + common/video/iso-mpeg4/install-sh | 521 +- + common/video/iso-mpeg4/libtool | 8978 ++++++++----- + common/video/iso-mpeg4/ltmain.sh | 8407 +++++++++++- + common/video/iso-mpeg4/missing | 377 +- + common/video/iso-mpeg4/mkinstalldirs | 163 +- + common/video/iso-mpeg4/mpeg4-2000.h | 18 +- + config.guess | 1502 ++- + config.sub | 1706 +++- + configure | 2 +- + configure.in | 2 +- + depcomp | 631 +- + install-sh | 521 +- + lib/SDLAudio/INSTALL | 365 + + lib/SDLAudio/Makefile.in | 788 ++ + lib/SDLAudio/aclocal.m4 | 8920 ++++++++++++ + lib/SDLAudio/autom4te.cache/output.0 |20944 ++++++++++++++++++++++++++++ + lib/SDLAudio/autom4te.cache/output.1 |20940 +++++++++++++++++++++++++++ + lib/SDLAudio/autom4te.cache/requests | 278 + + lib/SDLAudio/autom4te.cache/traces.0 | 2968 ++++ + lib/SDLAudio/autom4te.cache/traces.1 | 1142 ++ + lib/SDLAudio/configure |20940 +++++++++++++++++++++++++++ + lib/SDLAudio/include/Makefile.in | 414 + + lib/SDLAudio/libtool | 9061 ++++++++++++ + lib/SDLAudio/src/Makefile.in | 726 + + lib/SDLAudio/src/audio/Makefile.in | 726 + + lib/SDLAudio/src/audio/alsa/Makefile.in | 526 + + lib/SDLAudio/src/audio/arts/Makefile.in | 527 + + lib/SDLAudio/src/audio/baudio/Makefile.in | 536 + + lib/SDLAudio/src/audio/dc/Makefile.in | 530 + + lib/SDLAudio/src/audio/disk/Makefile.in | 527 + + lib/SDLAudio/src/audio/dma/Makefile.in | 527 + + lib/SDLAudio/src/audio/dmedia/Makefile.in | 527 + + lib/SDLAudio/src/audio/dsp/Makefile.in | 527 + + lib/SDLAudio/src/audio/esd/Makefile.in | 527 + + lib/SDLAudio/src/audio/macrom/Makefile.in | 527 + + lib/SDLAudio/src/audio/mint/Makefile.in | 573 + + lib/SDLAudio/src/audio/mme/Makefile.in | 527 + + lib/SDLAudio/src/audio/nas/Makefile.in | 527 + + lib/SDLAudio/src/audio/nto/Makefile.in | 527 + + lib/SDLAudio/src/audio/openbsd/Makefile.in | 527 + + lib/SDLAudio/src/audio/paudio/Makefile.in | 527 + + lib/SDLAudio/src/audio/riscos/Makefile.in | 527 + + lib/SDLAudio/src/audio/sun/Makefile.in | 527 + + lib/SDLAudio/src/audio/ums/Makefile.in | 527 + + lib/SDLAudio/src/audio/windib/Makefile.in | 527 + + lib/SDLAudio/src/audio/windx5/Makefile.in | 527 + + libtool | 8978 ++++++++----- + ltmain.sh | 8407 +++++++++++- + missing | 377 +- + mkinstalldirs | 163 +- + mpeg4ip-config | 4 +- + mpeg4ip_config.h | 24 +- + 55 files changed, 136901 insertions(+), 7055 deletions(-) + mode change 120000 => 100755 common/video/iso-mpeg4/config.guess + mode change 120000 => 100755 common/video/iso-mpeg4/config.sub + mode change 120000 => 100755 common/video/iso-mpeg4/depcomp + mode change 120000 => 100755 common/video/iso-mpeg4/install-sh + mode change 120000 => 100755 common/video/iso-mpeg4/ltmain.sh + mode change 120000 => 100755 common/video/iso-mpeg4/missing + mode change 120000 => 100755 common/video/iso-mpeg4/mkinstalldirs + mode change 120000 => 100755 config.guess + mode change 120000 => 100755 config.sub + mode change 120000 => 100755 depcomp + mode change 120000 => 100755 install-sh + create mode 100644 lib/SDLAudio/AUTHORS + create mode 100644 lib/SDLAudio/ChangeLog + create mode 100644 lib/SDLAudio/INSTALL + create mode 100644 lib/SDLAudio/Makefile.in + create mode 100644 lib/SDLAudio/NEWS + create mode 100644 lib/SDLAudio/aclocal.m4 + create mode 100644 lib/SDLAudio/autom4te.cache/output.0 + create mode 100644 lib/SDLAudio/autom4te.cache/output.1 + create mode 100644 lib/SDLAudio/autom4te.cache/requests + create mode 100644 lib/SDLAudio/autom4te.cache/traces.0 + create mode 100644 lib/SDLAudio/autom4te.cache/traces.1 + create mode 100755 lib/SDLAudio/configure + create mode 100644 lib/SDLAudio/include/Makefile.in + create mode 100755 lib/SDLAudio/libtool + create mode 100644 lib/SDLAudio/src/Makefile.in + create mode 100644 lib/SDLAudio/src/audio/Makefile.in + create mode 100644 lib/SDLAudio/src/audio/alsa/Makefile.in + create mode 100644 lib/SDLAudio/src/audio/arts/Makefile.in + create mode 100644 lib/SDLAudio/src/audio/baudio/Makefile.in + create mode 100644 lib/SDLAudio/src/audio/dc/Makefile.in + create mode 100644 lib/SDLAudio/src/audio/disk/Makefile.in + create mode 100644 lib/SDLAudio/src/audio/dma/Makefile.in + create mode 100644 lib/SDLAudio/src/audio/dmedia/Makefile.in + create mode 100644 lib/SDLAudio/src/audio/dsp/Makefile.in + create mode 100644 lib/SDLAudio/src/audio/esd/Makefile.in + create mode 100644 lib/SDLAudio/src/audio/macrom/Makefile.in + create mode 100644 lib/SDLAudio/src/audio/mint/Makefile.in + create mode 100644 lib/SDLAudio/src/audio/mme/Makefile.in + create mode 100644 lib/SDLAudio/src/audio/nas/Makefile.in + create mode 100644 lib/SDLAudio/src/audio/nto/Makefile.in + create mode 100644 lib/SDLAudio/src/audio/openbsd/Makefile.in + create mode 100644 lib/SDLAudio/src/audio/paudio/Makefile.in + create mode 100644 lib/SDLAudio/src/audio/riscos/Makefile.in + create mode 100644 lib/SDLAudio/src/audio/sun/Makefile.in + create mode 100644 lib/SDLAudio/src/audio/ums/Makefile.in + create mode 100644 lib/SDLAudio/src/audio/windib/Makefile.in + create mode 100644 lib/SDLAudio/src/audio/windx5/Makefile.in + mode change 120000 => 100755 ltmain.sh + mode change 120000 => 100755 missing + mode change 120000 => 100755 mkinstalldirs + +diff --git a/common/video/iso-mpeg4/config.guess b/common/video/iso-mpeg4/config.guess +deleted file mode 120000 +index d0bb19b..0000000 +--- a/common/video/iso-mpeg4/config.guess ++++ /dev/null +@@ -1 +0,0 @@ +-/usr/share/libtool/config.guess +\ No newline at end of file +diff --git a/common/video/iso-mpeg4/config.guess b/common/video/iso-mpeg4/config.guess +new file mode 100755 +index 0000000..dc84c68 +--- /dev/null ++++ b/common/video/iso-mpeg4/config.guess +@@ -0,0 +1,1501 @@ ++#! /bin/sh ++# Attempt to guess a canonical system name. ++# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, ++# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 ++# Free Software Foundation, Inc. ++ ++timestamp='2009-11-20' ++ ++# This file is free software; you can redistribute it and/or modify it ++# under the terms of the GNU General Public License as published by ++# the Free Software Foundation; either version 2 of the License, or ++# (at your option) any later version. ++# ++# This program is distributed in the hope that it will be useful, but ++# WITHOUT ANY WARRANTY; without even the implied warranty of ++# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ++# General Public License for more details. ++# ++# You should have received a copy of the GNU General Public License ++# along with this program; if not, write to the Free Software ++# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA ++# 02110-1301, USA. ++# ++# As a special exception to the GNU General Public License, if you ++# distribute this file as part of a program that contains a ++# configuration script generated by Autoconf, you may include it under ++# the same distribution terms that you use for the rest of that program. ++ ++ ++# Originally written by Per Bothner. Please send patches (context ++# diff format) to and include a ChangeLog ++# entry. ++# ++# This script attempts to guess a canonical system name similar to ++# config.sub. If it succeeds, it prints the system name on stdout, and ++# exits with 0. Otherwise, it exits with 1. ++# ++# You can get the latest version of this script from: ++# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD ++ ++me=`echo "$0" | sed -e 's,.*/,,'` ++ ++usage="\ ++Usage: $0 [OPTION] ++ ++Output the configuration name of the system \`$me' is run on. ++ ++Operation modes: ++ -h, --help print this help, then exit ++ -t, --time-stamp print date of last modification, then exit ++ -v, --version print version number, then exit ++ ++Report bugs and patches to ." ++ ++version="\ ++GNU config.guess ($timestamp) ++ ++Originally written by Per Bothner. ++Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, ++2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. ++ ++This is free software; see the source for copying conditions. There is NO ++warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." ++ ++help=" ++Try \`$me --help' for more information." ++ ++# Parse command line ++while test $# -gt 0 ; do ++ case $1 in ++ --time-stamp | --time* | -t ) ++ echo "$timestamp" ; exit ;; ++ --version | -v ) ++ echo "$version" ; exit ;; ++ --help | --h* | -h ) ++ echo "$usage"; exit ;; ++ -- ) # Stop option processing ++ shift; break ;; ++ - ) # Use stdin as input. ++ break ;; ++ -* ) ++ echo "$me: invalid option $1$help" >&2 ++ exit 1 ;; ++ * ) ++ break ;; ++ esac ++done ++ ++if test $# != 0; then ++ echo "$me: too many arguments$help" >&2 ++ exit 1 ++fi ++ ++trap 'exit 1' 1 2 15 ++ ++# CC_FOR_BUILD -- compiler used by this script. Note that the use of a ++# compiler to aid in system detection is discouraged as it requires ++# temporary files to be created and, as you can see below, it is a ++# headache to deal with in a portable fashion. ++ ++# Historically, `CC_FOR_BUILD' used to be named `HOST_CC'. We still ++# use `HOST_CC' if defined, but it is deprecated. ++ ++# Portable tmp directory creation inspired by the Autoconf team. ++ ++set_cc_for_build=' ++trap "exitcode=\$?; (rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null) && exit \$exitcode" 0 ; ++trap "rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null; exit 1" 1 2 13 15 ; ++: ${TMPDIR=/tmp} ; ++ { tmp=`(umask 077 && mktemp -d "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } || ++ { test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir $tmp) ; } || ++ { tmp=$TMPDIR/cg-$$ && (umask 077 && mkdir $tmp) && echo "Warning: creating insecure temp directory" >&2 ; } || ++ { echo "$me: cannot create a temporary directory in $TMPDIR" >&2 ; exit 1 ; } ; ++dummy=$tmp/dummy ; ++tmpfiles="$dummy.c $dummy.o $dummy.rel $dummy" ; ++case $CC_FOR_BUILD,$HOST_CC,$CC in ++ ,,) echo "int x;" > $dummy.c ; ++ for c in cc gcc c89 c99 ; do ++ if ($c -c -o $dummy.o $dummy.c) >/dev/null 2>&1 ; then ++ CC_FOR_BUILD="$c"; break ; ++ fi ; ++ done ; ++ if test x"$CC_FOR_BUILD" = x ; then ++ CC_FOR_BUILD=no_compiler_found ; ++ fi ++ ;; ++ ,,*) CC_FOR_BUILD=$CC ;; ++ ,*,*) CC_FOR_BUILD=$HOST_CC ;; ++esac ; set_cc_for_build= ;' ++ ++# This is needed to find uname on a Pyramid OSx when run in the BSD universe. ++# (ghazi at noc.rutgers.edu 1994-08-24) ++if (test -f /.attbin/uname) >/dev/null 2>&1 ; then ++ PATH=$PATH:/.attbin ; export PATH ++fi ++ ++UNAME_MACHINE=`(uname -m) 2>/dev/null` || UNAME_MACHINE=unknown ++UNAME_RELEASE=`(uname -r) 2>/dev/null` || UNAME_RELEASE=unknown ++UNAME_SYSTEM=`(uname -s) 2>/dev/null` || UNAME_SYSTEM=unknown ++UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown ++ ++# Note: order is significant - the case branches are not exclusive. ++ ++case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in ++ *:NetBSD:*:*) ++ # NetBSD (nbsd) targets should (where applicable) match one or ++ # more of the tupples: *-*-netbsdelf*, *-*-netbsdaout*, ++ # *-*-netbsdecoff* and *-*-netbsd*. For targets that recently ++ # switched to ELF, *-*-netbsd* would select the old ++ # object file format. This provides both forward ++ # compatibility and a consistent mechanism for selecting the ++ # object file format. ++ # ++ # Note: NetBSD doesn't particularly care about the vendor ++ # portion of the name. We always set it to "unknown". ++ sysctl="sysctl -n hw.machine_arch" ++ UNAME_MACHINE_ARCH=`(/sbin/$sysctl 2>/dev/null || \ ++ /usr/sbin/$sysctl 2>/dev/null || echo unknown)` ++ case "${UNAME_MACHINE_ARCH}" in ++ armeb) machine=armeb-unknown ;; ++ arm*) machine=arm-unknown ;; ++ sh3el) machine=shl-unknown ;; ++ sh3eb) machine=sh-unknown ;; ++ sh5el) machine=sh5le-unknown ;; ++ *) machine=${UNAME_MACHINE_ARCH}-unknown ;; ++ esac ++ # The Operating System including object format, if it has switched ++ # to ELF recently, or will in the future. ++ case "${UNAME_MACHINE_ARCH}" in ++ arm*|i386|m68k|ns32k|sh3*|sparc|vax) ++ eval $set_cc_for_build ++ if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \ ++ | grep -q __ELF__ ++ then ++ # Once all utilities can be ECOFF (netbsdecoff) or a.out (netbsdaout). ++ # Return netbsd for either. FIX? ++ os=netbsd ++ else ++ os=netbsdelf ++ fi ++ ;; ++ *) ++ os=netbsd ++ ;; ++ esac ++ # The OS release ++ # Debian GNU/NetBSD machines have a different userland, and ++ # thus, need a distinct triplet. However, they do not need ++ # kernel version information, so it can be replaced with a ++ # suitable tag, in the style of linux-gnu. ++ case "${UNAME_VERSION}" in ++ Debian*) ++ release='-gnu' ++ ;; ++ *) ++ release=`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'` ++ ;; ++ esac ++ # Since CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM: ++ # contains redundant information, the shorter form: ++ # CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used. ++ echo "${machine}-${os}${release}" ++ exit ;; ++ *:OpenBSD:*:*) ++ UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'` ++ echo ${UNAME_MACHINE_ARCH}-unknown-openbsd${UNAME_RELEASE} ++ exit ;; ++ *:ekkoBSD:*:*) ++ echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE} ++ exit ;; ++ *:SolidBSD:*:*) ++ echo ${UNAME_MACHINE}-unknown-solidbsd${UNAME_RELEASE} ++ exit ;; ++ macppc:MirBSD:*:*) ++ echo powerpc-unknown-mirbsd${UNAME_RELEASE} ++ exit ;; ++ *:MirBSD:*:*) ++ echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE} ++ exit ;; ++ alpha:OSF1:*:*) ++ case $UNAME_RELEASE in ++ *4.0) ++ UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'` ++ ;; ++ *5.*) ++ UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'` ++ ;; ++ esac ++ # According to Compaq, /usr/sbin/psrinfo has been available on ++ # OSF/1 and Tru64 systems produced since 1995. I hope that ++ # covers most systems running today. This code pipes the CPU ++ # types through head -n 1, so we only detect the type of CPU 0. ++ ALPHA_CPU_TYPE=`/usr/sbin/psrinfo -v | sed -n -e 's/^ The alpha \(.*\) processor.*$/\1/p' | head -n 1` ++ case "$ALPHA_CPU_TYPE" in ++ "EV4 (21064)") ++ UNAME_MACHINE="alpha" ;; ++ "EV4.5 (21064)") ++ UNAME_MACHINE="alpha" ;; ++ "LCA4 (21066/21068)") ++ UNAME_MACHINE="alpha" ;; ++ "EV5 (21164)") ++ UNAME_MACHINE="alphaev5" ;; ++ "EV5.6 (21164A)") ++ UNAME_MACHINE="alphaev56" ;; ++ "EV5.6 (21164PC)") ++ UNAME_MACHINE="alphapca56" ;; ++ "EV5.7 (21164PC)") ++ UNAME_MACHINE="alphapca57" ;; ++ "EV6 (21264)") ++ UNAME_MACHINE="alphaev6" ;; ++ "EV6.7 (21264A)") ++ UNAME_MACHINE="alphaev67" ;; ++ "EV6.8CB (21264C)") ++ UNAME_MACHINE="alphaev68" ;; ++ "EV6.8AL (21264B)") ++ UNAME_MACHINE="alphaev68" ;; ++ "EV6.8CX (21264D)") ++ UNAME_MACHINE="alphaev68" ;; ++ "EV6.9A (21264/EV69A)") ++ UNAME_MACHINE="alphaev69" ;; ++ "EV7 (21364)") ++ UNAME_MACHINE="alphaev7" ;; ++ "EV7.9 (21364A)") ++ UNAME_MACHINE="alphaev79" ;; ++ esac ++ # A Pn.n version is a patched version. ++ # A Vn.n version is a released version. ++ # A Tn.n version is a released field test version. ++ # A Xn.n version is an unreleased experimental baselevel. ++ # 1.2 uses "1.2" for uname -r. ++ echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` ++ exit ;; ++ Alpha\ *:Windows_NT*:*) ++ # How do we know it's Interix rather than the generic POSIX subsystem? ++ # Should we change UNAME_MACHINE based on the output of uname instead ++ # of the specific Alpha model? ++ echo alpha-pc-interix ++ exit ;; ++ 21064:Windows_NT:50:3) ++ echo alpha-dec-winnt3.5 ++ exit ;; ++ Amiga*:UNIX_System_V:4.0:*) ++ echo m68k-unknown-sysv4 ++ exit ;; ++ *:[Aa]miga[Oo][Ss]:*:*) ++ echo ${UNAME_MACHINE}-unknown-amigaos ++ exit ;; ++ *:[Mm]orph[Oo][Ss]:*:*) ++ echo ${UNAME_MACHINE}-unknown-morphos ++ exit ;; ++ *:OS/390:*:*) ++ echo i370-ibm-openedition ++ exit ;; ++ *:z/VM:*:*) ++ echo s390-ibm-zvmoe ++ exit ;; ++ *:OS400:*:*) ++ echo powerpc-ibm-os400 ++ exit ;; ++ arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*) ++ echo arm-acorn-riscix${UNAME_RELEASE} ++ exit ;; ++ arm:riscos:*:*|arm:RISCOS:*:*) ++ echo arm-unknown-riscos ++ exit ;; ++ SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*) ++ echo hppa1.1-hitachi-hiuxmpp ++ exit ;; ++ Pyramid*:OSx*:*:* | MIS*:OSx*:*:* | MIS*:SMP_DC-OSx*:*:*) ++ # akee at wpdis03.wpafb.af.mil (Earle F. Ake) contributed MIS and NILE. ++ if test "`(/bin/universe) 2>/dev/null`" = att ; then ++ echo pyramid-pyramid-sysv3 ++ else ++ echo pyramid-pyramid-bsd ++ fi ++ exit ;; ++ NILE*:*:*:dcosx) ++ echo pyramid-pyramid-svr4 ++ exit ;; ++ DRS?6000:unix:4.0:6*) ++ echo sparc-icl-nx6 ++ exit ;; ++ DRS?6000:UNIX_SV:4.2*:7* | DRS?6000:isis:4.2*:7*) ++ case `/usr/bin/uname -p` in ++ sparc) echo sparc-icl-nx7; exit ;; ++ esac ;; ++ s390x:SunOS:*:*) ++ echo ${UNAME_MACHINE}-ibm-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` ++ exit ;; ++ sun4H:SunOS:5.*:*) ++ echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` ++ exit ;; ++ sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*) ++ echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` ++ exit ;; ++ i86pc:AuroraUX:5.*:* | i86xen:AuroraUX:5.*:*) ++ echo i386-pc-auroraux${UNAME_RELEASE} ++ exit ;; ++ i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*) ++ eval $set_cc_for_build ++ SUN_ARCH="i386" ++ # If there is a compiler, see if it is configured for 64-bit objects. ++ # Note that the Sun cc does not turn __LP64__ into 1 like gcc does. ++ # This test works for both compilers. ++ if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then ++ if (echo '#ifdef __amd64'; echo IS_64BIT_ARCH; echo '#endif') | \ ++ (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \ ++ grep IS_64BIT_ARCH >/dev/null ++ then ++ SUN_ARCH="x86_64" ++ fi ++ fi ++ echo ${SUN_ARCH}-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` ++ exit ;; ++ sun4*:SunOS:6*:*) ++ # According to config.sub, this is the proper way to canonicalize ++ # SunOS6. Hard to guess exactly what SunOS6 will be like, but ++ # it's likely to be more like Solaris than SunOS4. ++ echo sparc-sun-solaris3`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` ++ exit ;; ++ sun4*:SunOS:*:*) ++ case "`/usr/bin/arch -k`" in ++ Series*|S4*) ++ UNAME_RELEASE=`uname -v` ++ ;; ++ esac ++ # Japanese Language versions have a version number like `4.1.3-JL'. ++ echo sparc-sun-sunos`echo ${UNAME_RELEASE}|sed -e 's/-/_/'` ++ exit ;; ++ sun3*:SunOS:*:*) ++ echo m68k-sun-sunos${UNAME_RELEASE} ++ exit ;; ++ sun*:*:4.2BSD:*) ++ UNAME_RELEASE=`(sed 1q /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null` ++ test "x${UNAME_RELEASE}" = "x" && UNAME_RELEASE=3 ++ case "`/bin/arch`" in ++ sun3) ++ echo m68k-sun-sunos${UNAME_RELEASE} ++ ;; ++ sun4) ++ echo sparc-sun-sunos${UNAME_RELEASE} ++ ;; ++ esac ++ exit ;; ++ aushp:SunOS:*:*) ++ echo sparc-auspex-sunos${UNAME_RELEASE} ++ exit ;; ++ # The situation for MiNT is a little confusing. The machine name ++ # can be virtually everything (everything which is not ++ # "atarist" or "atariste" at least should have a processor ++ # > m68000). The system name ranges from "MiNT" over "FreeMiNT" ++ # to the lowercase version "mint" (or "freemint"). Finally ++ # the system name "TOS" denotes a system which is actually not ++ # MiNT. But MiNT is downward compatible to TOS, so this should ++ # be no problem. ++ atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*) ++ echo m68k-atari-mint${UNAME_RELEASE} ++ exit ;; ++ atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*) ++ echo m68k-atari-mint${UNAME_RELEASE} ++ exit ;; ++ *falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*) ++ echo m68k-atari-mint${UNAME_RELEASE} ++ exit ;; ++ milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*) ++ echo m68k-milan-mint${UNAME_RELEASE} ++ exit ;; ++ hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*) ++ echo m68k-hades-mint${UNAME_RELEASE} ++ exit ;; ++ *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*) ++ echo m68k-unknown-mint${UNAME_RELEASE} ++ exit ;; ++ m68k:machten:*:*) ++ echo m68k-apple-machten${UNAME_RELEASE} ++ exit ;; ++ powerpc:machten:*:*) ++ echo powerpc-apple-machten${UNAME_RELEASE} ++ exit ;; ++ RISC*:Mach:*:*) ++ echo mips-dec-mach_bsd4.3 ++ exit ;; ++ RISC*:ULTRIX:*:*) ++ echo mips-dec-ultrix${UNAME_RELEASE} ++ exit ;; ++ VAX*:ULTRIX*:*:*) ++ echo vax-dec-ultrix${UNAME_RELEASE} ++ exit ;; ++ 2020:CLIX:*:* | 2430:CLIX:*:*) ++ echo clipper-intergraph-clix${UNAME_RELEASE} ++ exit ;; ++ mips:*:*:UMIPS | mips:*:*:RISCos) ++ eval $set_cc_for_build ++ sed 's/^ //' << EOF >$dummy.c ++#ifdef __cplusplus ++#include /* for printf() prototype */ ++ int main (int argc, char *argv[]) { ++#else ++ int main (argc, argv) int argc; char *argv[]; { ++#endif ++ #if defined (host_mips) && defined (MIPSEB) ++ #if defined (SYSTYPE_SYSV) ++ printf ("mips-mips-riscos%ssysv\n", argv[1]); exit (0); ++ #endif ++ #if defined (SYSTYPE_SVR4) ++ printf ("mips-mips-riscos%ssvr4\n", argv[1]); exit (0); ++ #endif ++ #if defined (SYSTYPE_BSD43) || defined(SYSTYPE_BSD) ++ printf ("mips-mips-riscos%sbsd\n", argv[1]); exit (0); ++ #endif ++ #endif ++ exit (-1); ++ } ++EOF ++ $CC_FOR_BUILD -o $dummy $dummy.c && ++ dummyarg=`echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` && ++ SYSTEM_NAME=`$dummy $dummyarg` && ++ { echo "$SYSTEM_NAME"; exit; } ++ echo mips-mips-riscos${UNAME_RELEASE} ++ exit ;; ++ Motorola:PowerMAX_OS:*:*) ++ echo powerpc-motorola-powermax ++ exit ;; ++ Motorola:*:4.3:PL8-*) ++ echo powerpc-harris-powermax ++ exit ;; ++ Night_Hawk:*:*:PowerMAX_OS | Synergy:PowerMAX_OS:*:*) ++ echo powerpc-harris-powermax ++ exit ;; ++ Night_Hawk:Power_UNIX:*:*) ++ echo powerpc-harris-powerunix ++ exit ;; ++ m88k:CX/UX:7*:*) ++ echo m88k-harris-cxux7 ++ exit ;; ++ m88k:*:4*:R4*) ++ echo m88k-motorola-sysv4 ++ exit ;; ++ m88k:*:3*:R3*) ++ echo m88k-motorola-sysv3 ++ exit ;; ++ AViiON:dgux:*:*) ++ # DG/UX returns AViiON for all architectures ++ UNAME_PROCESSOR=`/usr/bin/uname -p` ++ if [ $UNAME_PROCESSOR = mc88100 ] || [ $UNAME_PROCESSOR = mc88110 ] ++ then ++ if [ ${TARGET_BINARY_INTERFACE}x = m88kdguxelfx ] || \ ++ [ ${TARGET_BINARY_INTERFACE}x = x ] ++ then ++ echo m88k-dg-dgux${UNAME_RELEASE} ++ else ++ echo m88k-dg-dguxbcs${UNAME_RELEASE} ++ fi ++ else ++ echo i586-dg-dgux${UNAME_RELEASE} ++ fi ++ exit ;; ++ M88*:DolphinOS:*:*) # DolphinOS (SVR3) ++ echo m88k-dolphin-sysv3 ++ exit ;; ++ M88*:*:R3*:*) ++ # Delta 88k system running SVR3 ++ echo m88k-motorola-sysv3 ++ exit ;; ++ XD88*:*:*:*) # Tektronix XD88 system running UTekV (SVR3) ++ echo m88k-tektronix-sysv3 ++ exit ;; ++ Tek43[0-9][0-9]:UTek:*:*) # Tektronix 4300 system running UTek (BSD) ++ echo m68k-tektronix-bsd ++ exit ;; ++ *:IRIX*:*:*) ++ echo mips-sgi-irix`echo ${UNAME_RELEASE}|sed -e 's/-/_/g'` ++ exit ;; ++ ????????:AIX?:[12].1:2) # AIX 2.2.1 or AIX 2.1.1 is RT/PC AIX. ++ echo romp-ibm-aix # uname -m gives an 8 hex-code CPU id ++ exit ;; # Note that: echo "'`uname -s`'" gives 'AIX ' ++ i*86:AIX:*:*) ++ echo i386-ibm-aix ++ exit ;; ++ ia64:AIX:*:*) ++ if [ -x /usr/bin/oslevel ] ; then ++ IBM_REV=`/usr/bin/oslevel` ++ else ++ IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE} ++ fi ++ echo ${UNAME_MACHINE}-ibm-aix${IBM_REV} ++ exit ;; ++ *:AIX:2:3) ++ if grep bos325 /usr/include/stdio.h >/dev/null 2>&1; then ++ eval $set_cc_for_build ++ sed 's/^ //' << EOF >$dummy.c ++ #include ++ ++ main() ++ { ++ if (!__power_pc()) ++ exit(1); ++ puts("powerpc-ibm-aix3.2.5"); ++ exit(0); ++ } ++EOF ++ if $CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy` ++ then ++ echo "$SYSTEM_NAME" ++ else ++ echo rs6000-ibm-aix3.2.5 ++ fi ++ elif grep bos324 /usr/include/stdio.h >/dev/null 2>&1; then ++ echo rs6000-ibm-aix3.2.4 ++ else ++ echo rs6000-ibm-aix3.2 ++ fi ++ exit ;; ++ *:AIX:*:[456]) ++ IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'` ++ if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then ++ IBM_ARCH=rs6000 ++ else ++ IBM_ARCH=powerpc ++ fi ++ if [ -x /usr/bin/oslevel ] ; then ++ IBM_REV=`/usr/bin/oslevel` ++ else ++ IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE} ++ fi ++ echo ${IBM_ARCH}-ibm-aix${IBM_REV} ++ exit ;; ++ *:AIX:*:*) ++ echo rs6000-ibm-aix ++ exit ;; ++ ibmrt:4.4BSD:*|romp-ibm:BSD:*) ++ echo romp-ibm-bsd4.4 ++ exit ;; ++ ibmrt:*BSD:*|romp-ibm:BSD:*) # covers RT/PC BSD and ++ echo romp-ibm-bsd${UNAME_RELEASE} # 4.3 with uname added to ++ exit ;; # report: romp-ibm BSD 4.3 ++ *:BOSX:*:*) ++ echo rs6000-bull-bosx ++ exit ;; ++ DPX/2?00:B.O.S.:*:*) ++ echo m68k-bull-sysv3 ++ exit ;; ++ 9000/[34]??:4.3bsd:1.*:*) ++ echo m68k-hp-bsd ++ exit ;; ++ hp300:4.4BSD:*:* | 9000/[34]??:4.3bsd:2.*:*) ++ echo m68k-hp-bsd4.4 ++ exit ;; ++ 9000/[34678]??:HP-UX:*:*) ++ HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'` ++ case "${UNAME_MACHINE}" in ++ 9000/31? ) HP_ARCH=m68000 ;; ++ 9000/[34]?? ) HP_ARCH=m68k ;; ++ 9000/[678][0-9][0-9]) ++ if [ -x /usr/bin/getconf ]; then ++ sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null` ++ sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null` ++ case "${sc_cpu_version}" in ++ 523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0 ++ 528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1 ++ 532) # CPU_PA_RISC2_0 ++ case "${sc_kernel_bits}" in ++ 32) HP_ARCH="hppa2.0n" ;; ++ 64) HP_ARCH="hppa2.0w" ;; ++ '') HP_ARCH="hppa2.0" ;; # HP-UX 10.20 ++ esac ;; ++ esac ++ fi ++ if [ "${HP_ARCH}" = "" ]; then ++ eval $set_cc_for_build ++ sed 's/^ //' << EOF >$dummy.c ++ ++ #define _HPUX_SOURCE ++ #include ++ #include ++ ++ int main () ++ { ++ #if defined(_SC_KERNEL_BITS) ++ long bits = sysconf(_SC_KERNEL_BITS); ++ #endif ++ long cpu = sysconf (_SC_CPU_VERSION); ++ ++ switch (cpu) ++ { ++ case CPU_PA_RISC1_0: puts ("hppa1.0"); break; ++ case CPU_PA_RISC1_1: puts ("hppa1.1"); break; ++ case CPU_PA_RISC2_0: ++ #if defined(_SC_KERNEL_BITS) ++ switch (bits) ++ { ++ case 64: puts ("hppa2.0w"); break; ++ case 32: puts ("hppa2.0n"); break; ++ default: puts ("hppa2.0"); break; ++ } break; ++ #else /* !defined(_SC_KERNEL_BITS) */ ++ puts ("hppa2.0"); break; ++ #endif ++ default: puts ("hppa1.0"); break; ++ } ++ exit (0); ++ } ++EOF ++ (CCOPTS= $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy` ++ test -z "$HP_ARCH" && HP_ARCH=hppa ++ fi ;; ++ esac ++ if [ ${HP_ARCH} = "hppa2.0w" ] ++ then ++ eval $set_cc_for_build ++ ++ # hppa2.0w-hp-hpux* has a 64-bit kernel and a compiler generating ++ # 32-bit code. hppa64-hp-hpux* has the same kernel and a compiler ++ # generating 64-bit code. GNU and HP use different nomenclature: ++ # ++ # $ CC_FOR_BUILD=cc ./config.guess ++ # => hppa2.0w-hp-hpux11.23 ++ # $ CC_FOR_BUILD="cc +DA2.0w" ./config.guess ++ # => hppa64-hp-hpux11.23 ++ ++ if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | ++ grep -q __LP64__ ++ then ++ HP_ARCH="hppa2.0w" ++ else ++ HP_ARCH="hppa64" ++ fi ++ fi ++ echo ${HP_ARCH}-hp-hpux${HPUX_REV} ++ exit ;; ++ ia64:HP-UX:*:*) ++ HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'` ++ echo ia64-hp-hpux${HPUX_REV} ++ exit ;; ++ 3050*:HI-UX:*:*) ++ eval $set_cc_for_build ++ sed 's/^ //' << EOF >$dummy.c ++ #include ++ int ++ main () ++ { ++ long cpu = sysconf (_SC_CPU_VERSION); ++ /* The order matters, because CPU_IS_HP_MC68K erroneously returns ++ true for CPU_PA_RISC1_0. CPU_IS_PA_RISC returns correct ++ results, however. */ ++ if (CPU_IS_PA_RISC (cpu)) ++ { ++ switch (cpu) ++ { ++ case CPU_PA_RISC1_0: puts ("hppa1.0-hitachi-hiuxwe2"); break; ++ case CPU_PA_RISC1_1: puts ("hppa1.1-hitachi-hiuxwe2"); break; ++ case CPU_PA_RISC2_0: puts ("hppa2.0-hitachi-hiuxwe2"); break; ++ default: puts ("hppa-hitachi-hiuxwe2"); break; ++ } ++ } ++ else if (CPU_IS_HP_MC68K (cpu)) ++ puts ("m68k-hitachi-hiuxwe2"); ++ else puts ("unknown-hitachi-hiuxwe2"); ++ exit (0); ++ } ++EOF ++ $CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy` && ++ { echo "$SYSTEM_NAME"; exit; } ++ echo unknown-hitachi-hiuxwe2 ++ exit ;; ++ 9000/7??:4.3bsd:*:* | 9000/8?[79]:4.3bsd:*:* ) ++ echo hppa1.1-hp-bsd ++ exit ;; ++ 9000/8??:4.3bsd:*:*) ++ echo hppa1.0-hp-bsd ++ exit ;; ++ *9??*:MPE/iX:*:* | *3000*:MPE/iX:*:*) ++ echo hppa1.0-hp-mpeix ++ exit ;; ++ hp7??:OSF1:*:* | hp8?[79]:OSF1:*:* ) ++ echo hppa1.1-hp-osf ++ exit ;; ++ hp8??:OSF1:*:*) ++ echo hppa1.0-hp-osf ++ exit ;; ++ i*86:OSF1:*:*) ++ if [ -x /usr/sbin/sysversion ] ; then ++ echo ${UNAME_MACHINE}-unknown-osf1mk ++ else ++ echo ${UNAME_MACHINE}-unknown-osf1 ++ fi ++ exit ;; ++ parisc*:Lites*:*:*) ++ echo hppa1.1-hp-lites ++ exit ;; ++ C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*) ++ echo c1-convex-bsd ++ exit ;; ++ C2*:ConvexOS:*:* | convex:ConvexOS:C2*:*) ++ if getsysinfo -f scalar_acc ++ then echo c32-convex-bsd ++ else echo c2-convex-bsd ++ fi ++ exit ;; ++ C34*:ConvexOS:*:* | convex:ConvexOS:C34*:*) ++ echo c34-convex-bsd ++ exit ;; ++ C38*:ConvexOS:*:* | convex:ConvexOS:C38*:*) ++ echo c38-convex-bsd ++ exit ;; ++ C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*) ++ echo c4-convex-bsd ++ exit ;; ++ CRAY*Y-MP:*:*:*) ++ echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' ++ exit ;; ++ CRAY*[A-Z]90:*:*:*) ++ echo ${UNAME_MACHINE}-cray-unicos${UNAME_RELEASE} \ ++ | sed -e 's/CRAY.*\([A-Z]90\)/\1/' \ ++ -e y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/ \ ++ -e 's/\.[^.]*$/.X/' ++ exit ;; ++ CRAY*TS:*:*:*) ++ echo t90-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' ++ exit ;; ++ CRAY*T3E:*:*:*) ++ echo alphaev5-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' ++ exit ;; ++ CRAY*SV1:*:*:*) ++ echo sv1-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' ++ exit ;; ++ *:UNICOS/mp:*:*) ++ echo craynv-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' ++ exit ;; ++ F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*) ++ FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` ++ FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` ++ FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'` ++ echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" ++ exit ;; ++ 5000:UNIX_System_V:4.*:*) ++ FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` ++ FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'` ++ echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" ++ exit ;; ++ i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*) ++ echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE} ++ exit ;; ++ sparc*:BSD/OS:*:*) ++ echo sparc-unknown-bsdi${UNAME_RELEASE} ++ exit ;; ++ *:BSD/OS:*:*) ++ echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE} ++ exit ;; ++ *:FreeBSD:*:*) ++ case ${UNAME_MACHINE} in ++ pc98) ++ echo i386-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; ++ amd64) ++ echo x86_64-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; ++ *) ++ echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; ++ esac ++ exit ;; ++ i*:CYGWIN*:*) ++ echo ${UNAME_MACHINE}-pc-cygwin ++ exit ;; ++ *:MINGW*:*) ++ echo ${UNAME_MACHINE}-pc-mingw32 ++ exit ;; ++ i*:windows32*:*) ++ # uname -m includes "-pc" on this system. ++ echo ${UNAME_MACHINE}-mingw32 ++ exit ;; ++ i*:PW*:*) ++ echo ${UNAME_MACHINE}-pc-pw32 ++ exit ;; ++ *:Interix*:*) ++ case ${UNAME_MACHINE} in ++ x86) ++ echo i586-pc-interix${UNAME_RELEASE} ++ exit ;; ++ authenticamd | genuineintel | EM64T) ++ echo x86_64-unknown-interix${UNAME_RELEASE} ++ exit ;; ++ IA64) ++ echo ia64-unknown-interix${UNAME_RELEASE} ++ exit ;; ++ esac ;; ++ [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*) ++ echo i${UNAME_MACHINE}-pc-mks ++ exit ;; ++ 8664:Windows_NT:*) ++ echo x86_64-pc-mks ++ exit ;; ++ i*:Windows_NT*:* | Pentium*:Windows_NT*:*) ++ # How do we know it's Interix rather than the generic POSIX subsystem? ++ # It also conflicts with pre-2.0 versions of AT&T UWIN. Should we ++ # UNAME_MACHINE based on the output of uname instead of i386? ++ echo i586-pc-interix ++ exit ;; ++ i*:UWIN*:*) ++ echo ${UNAME_MACHINE}-pc-uwin ++ exit ;; ++ amd64:CYGWIN*:*:* | x86_64:CYGWIN*:*:*) ++ echo x86_64-unknown-cygwin ++ exit ;; ++ p*:CYGWIN*:*) ++ echo powerpcle-unknown-cygwin ++ exit ;; ++ prep*:SunOS:5.*:*) ++ echo powerpcle-unknown-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` ++ exit ;; ++ *:GNU:*:*) ++ # the GNU system ++ echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'` ++ exit ;; ++ *:GNU/*:*:*) ++ # other systems with GNU libc and userland ++ echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-gnu ++ exit ;; ++ i*86:Minix:*:*) ++ echo ${UNAME_MACHINE}-pc-minix ++ exit ;; ++ alpha:Linux:*:*) ++ case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in ++ EV5) UNAME_MACHINE=alphaev5 ;; ++ EV56) UNAME_MACHINE=alphaev56 ;; ++ PCA56) UNAME_MACHINE=alphapca56 ;; ++ PCA57) UNAME_MACHINE=alphapca56 ;; ++ EV6) UNAME_MACHINE=alphaev6 ;; ++ EV67) UNAME_MACHINE=alphaev67 ;; ++ EV68*) UNAME_MACHINE=alphaev68 ;; ++ esac ++ objdump --private-headers /bin/sh | grep -q ld.so.1 ++ if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi ++ echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC} ++ exit ;; ++ arm*:Linux:*:*) ++ eval $set_cc_for_build ++ if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \ ++ | grep -q __ARM_EABI__ ++ then ++ echo ${UNAME_MACHINE}-unknown-linux-gnu ++ else ++ echo ${UNAME_MACHINE}-unknown-linux-gnueabi ++ fi ++ exit ;; ++ avr32*:Linux:*:*) ++ echo ${UNAME_MACHINE}-unknown-linux-gnu ++ exit ;; ++ cris:Linux:*:*) ++ echo cris-axis-linux-gnu ++ exit ;; ++ crisv32:Linux:*:*) ++ echo crisv32-axis-linux-gnu ++ exit ;; ++ frv:Linux:*:*) ++ echo frv-unknown-linux-gnu ++ exit ;; ++ i*86:Linux:*:*) ++ LIBC=gnu ++ eval $set_cc_for_build ++ sed 's/^ //' << EOF >$dummy.c ++ #ifdef __dietlibc__ ++ LIBC=dietlibc ++ #endif ++EOF ++ eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC'` ++ echo "${UNAME_MACHINE}-pc-linux-${LIBC}" ++ exit ;; ++ ia64:Linux:*:*) ++ echo ${UNAME_MACHINE}-unknown-linux-gnu ++ exit ;; ++ m32r*:Linux:*:*) ++ echo ${UNAME_MACHINE}-unknown-linux-gnu ++ exit ;; ++ m68*:Linux:*:*) ++ echo ${UNAME_MACHINE}-unknown-linux-gnu ++ exit ;; ++ mips:Linux:*:* | mips64:Linux:*:*) ++ eval $set_cc_for_build ++ sed 's/^ //' << EOF >$dummy.c ++ #undef CPU ++ #undef ${UNAME_MACHINE} ++ #undef ${UNAME_MACHINE}el ++ #if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL) ++ CPU=${UNAME_MACHINE}el ++ #else ++ #if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB) ++ CPU=${UNAME_MACHINE} ++ #else ++ CPU= ++ #endif ++ #endif ++EOF ++ eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'` ++ test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; } ++ ;; ++ or32:Linux:*:*) ++ echo or32-unknown-linux-gnu ++ exit ;; ++ padre:Linux:*:*) ++ echo sparc-unknown-linux-gnu ++ exit ;; ++ parisc64:Linux:*:* | hppa64:Linux:*:*) ++ echo hppa64-unknown-linux-gnu ++ exit ;; ++ parisc:Linux:*:* | hppa:Linux:*:*) ++ # Look for CPU level ++ case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in ++ PA7*) echo hppa1.1-unknown-linux-gnu ;; ++ PA8*) echo hppa2.0-unknown-linux-gnu ;; ++ *) echo hppa-unknown-linux-gnu ;; ++ esac ++ exit ;; ++ ppc64:Linux:*:*) ++ echo powerpc64-unknown-linux-gnu ++ exit ;; ++ ppc:Linux:*:*) ++ echo powerpc-unknown-linux-gnu ++ exit ;; ++ s390:Linux:*:* | s390x:Linux:*:*) ++ echo ${UNAME_MACHINE}-ibm-linux ++ exit ;; ++ sh64*:Linux:*:*) ++ echo ${UNAME_MACHINE}-unknown-linux-gnu ++ exit ;; ++ sh*:Linux:*:*) ++ echo ${UNAME_MACHINE}-unknown-linux-gnu ++ exit ;; ++ sparc:Linux:*:* | sparc64:Linux:*:*) ++ echo ${UNAME_MACHINE}-unknown-linux-gnu ++ exit ;; ++ vax:Linux:*:*) ++ echo ${UNAME_MACHINE}-dec-linux-gnu ++ exit ;; ++ x86_64:Linux:*:*) ++ echo x86_64-unknown-linux-gnu ++ exit ;; ++ xtensa*:Linux:*:*) ++ echo ${UNAME_MACHINE}-unknown-linux-gnu ++ exit ;; ++ i*86:DYNIX/ptx:4*:*) ++ # ptx 4.0 does uname -s correctly, with DYNIX/ptx in there. ++ # earlier versions are messed up and put the nodename in both ++ # sysname and nodename. ++ echo i386-sequent-sysv4 ++ exit ;; ++ i*86:UNIX_SV:4.2MP:2.*) ++ # Unixware is an offshoot of SVR4, but it has its own version ++ # number series starting with 2... ++ # I am not positive that other SVR4 systems won't match this, ++ # I just have to hope. -- rms. ++ # Use sysv4.2uw... so that sysv4* matches it. ++ echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION} ++ exit ;; ++ i*86:OS/2:*:*) ++ # If we were able to find `uname', then EMX Unix compatibility ++ # is probably installed. ++ echo ${UNAME_MACHINE}-pc-os2-emx ++ exit ;; ++ i*86:XTS-300:*:STOP) ++ echo ${UNAME_MACHINE}-unknown-stop ++ exit ;; ++ i*86:atheos:*:*) ++ echo ${UNAME_MACHINE}-unknown-atheos ++ exit ;; ++ i*86:syllable:*:*) ++ echo ${UNAME_MACHINE}-pc-syllable ++ exit ;; ++ i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.[02]*:*) ++ echo i386-unknown-lynxos${UNAME_RELEASE} ++ exit ;; ++ i*86:*DOS:*:*) ++ echo ${UNAME_MACHINE}-pc-msdosdjgpp ++ exit ;; ++ i*86:*:4.*:* | i*86:SYSTEM_V:4.*:*) ++ UNAME_REL=`echo ${UNAME_RELEASE} | sed 's/\/MP$//'` ++ if grep Novell /usr/include/link.h >/dev/null 2>/dev/null; then ++ echo ${UNAME_MACHINE}-univel-sysv${UNAME_REL} ++ else ++ echo ${UNAME_MACHINE}-pc-sysv${UNAME_REL} ++ fi ++ exit ;; ++ i*86:*:5:[678]*) ++ # UnixWare 7.x, OpenUNIX and OpenServer 6. ++ case `/bin/uname -X | grep "^Machine"` in ++ *486*) UNAME_MACHINE=i486 ;; ++ *Pentium) UNAME_MACHINE=i586 ;; ++ *Pent*|*Celeron) UNAME_MACHINE=i686 ;; ++ esac ++ echo ${UNAME_MACHINE}-unknown-sysv${UNAME_RELEASE}${UNAME_SYSTEM}${UNAME_VERSION} ++ exit ;; ++ i*86:*:3.2:*) ++ if test -f /usr/options/cb.name; then ++ UNAME_REL=`sed -n 's/.*Version //p' /dev/null >/dev/null ; then ++ UNAME_REL=`(/bin/uname -X|grep Release|sed -e 's/.*= //')` ++ (/bin/uname -X|grep i80486 >/dev/null) && UNAME_MACHINE=i486 ++ (/bin/uname -X|grep '^Machine.*Pentium' >/dev/null) \ ++ && UNAME_MACHINE=i586 ++ (/bin/uname -X|grep '^Machine.*Pent *II' >/dev/null) \ ++ && UNAME_MACHINE=i686 ++ (/bin/uname -X|grep '^Machine.*Pentium Pro' >/dev/null) \ ++ && UNAME_MACHINE=i686 ++ echo ${UNAME_MACHINE}-pc-sco$UNAME_REL ++ else ++ echo ${UNAME_MACHINE}-pc-sysv32 ++ fi ++ exit ;; ++ pc:*:*:*) ++ # Left here for compatibility: ++ # uname -m prints for DJGPP always 'pc', but it prints nothing about ++ # the processor, so we play safe by assuming i586. ++ # Note: whatever this is, it MUST be the same as what config.sub ++ # prints for the "djgpp" host, or else GDB configury will decide that ++ # this is a cross-build. ++ echo i586-pc-msdosdjgpp ++ exit ;; ++ Intel:Mach:3*:*) ++ echo i386-pc-mach3 ++ exit ;; ++ paragon:*:*:*) ++ echo i860-intel-osf1 ++ exit ;; ++ i860:*:4.*:*) # i860-SVR4 ++ if grep Stardent /usr/include/sys/uadmin.h >/dev/null 2>&1 ; then ++ echo i860-stardent-sysv${UNAME_RELEASE} # Stardent Vistra i860-SVR4 ++ else # Add other i860-SVR4 vendors below as they are discovered. ++ echo i860-unknown-sysv${UNAME_RELEASE} # Unknown i860-SVR4 ++ fi ++ exit ;; ++ mini*:CTIX:SYS*5:*) ++ # "miniframe" ++ echo m68010-convergent-sysv ++ exit ;; ++ mc68k:UNIX:SYSTEM5:3.51m) ++ echo m68k-convergent-sysv ++ exit ;; ++ M680?0:D-NIX:5.3:*) ++ echo m68k-diab-dnix ++ exit ;; ++ M68*:*:R3V[5678]*:*) ++ test -r /sysV68 && { echo 'm68k-motorola-sysv'; exit; } ;; ++ 3[345]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 3[34]??/*:*:4.0:3.0 | 4400:*:4.0:3.0 | 4850:*:4.0:3.0 | SKA40:*:4.0:3.0 | SDS2:*:4.0:3.0 | SHG2:*:4.0:3.0 | S7501*:*:4.0:3.0) ++ OS_REL='' ++ test -r /etc/.relid \ ++ && OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid` ++ /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ ++ && { echo i486-ncr-sysv4.3${OS_REL}; exit; } ++ /bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \ ++ && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;; ++ 3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*) ++ /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ ++ && { echo i486-ncr-sysv4; exit; } ;; ++ NCR*:*:4.2:* | MPRAS*:*:4.2:*) ++ OS_REL='.3' ++ test -r /etc/.relid \ ++ && OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid` ++ /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ ++ && { echo i486-ncr-sysv4.3${OS_REL}; exit; } ++ /bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \ ++ && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ++ /bin/uname -p 2>/dev/null | /bin/grep pteron >/dev/null \ ++ && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;; ++ m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*) ++ echo m68k-unknown-lynxos${UNAME_RELEASE} ++ exit ;; ++ mc68030:UNIX_System_V:4.*:*) ++ echo m68k-atari-sysv4 ++ exit ;; ++ TSUNAMI:LynxOS:2.*:*) ++ echo sparc-unknown-lynxos${UNAME_RELEASE} ++ exit ;; ++ rs6000:LynxOS:2.*:*) ++ echo rs6000-unknown-lynxos${UNAME_RELEASE} ++ exit ;; ++ PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.[02]*:*) ++ echo powerpc-unknown-lynxos${UNAME_RELEASE} ++ exit ;; ++ SM[BE]S:UNIX_SV:*:*) ++ echo mips-dde-sysv${UNAME_RELEASE} ++ exit ;; ++ RM*:ReliantUNIX-*:*:*) ++ echo mips-sni-sysv4 ++ exit ;; ++ RM*:SINIX-*:*:*) ++ echo mips-sni-sysv4 ++ exit ;; ++ *:SINIX-*:*:*) ++ if uname -p 2>/dev/null >/dev/null ; then ++ UNAME_MACHINE=`(uname -p) 2>/dev/null` ++ echo ${UNAME_MACHINE}-sni-sysv4 ++ else ++ echo ns32k-sni-sysv ++ fi ++ exit ;; ++ PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort ++ # says ++ echo i586-unisys-sysv4 ++ exit ;; ++ *:UNIX_System_V:4*:FTX*) ++ # From Gerald Hewes . ++ # How about differentiating between stratus architectures? -djm ++ echo hppa1.1-stratus-sysv4 ++ exit ;; ++ *:*:*:FTX*) ++ # From seanf at swdc.stratus.com. ++ echo i860-stratus-sysv4 ++ exit ;; ++ i*86:VOS:*:*) ++ # From Paul.Green at stratus.com. ++ echo ${UNAME_MACHINE}-stratus-vos ++ exit ;; ++ *:VOS:*:*) ++ # From Paul.Green at stratus.com. ++ echo hppa1.1-stratus-vos ++ exit ;; ++ mc68*:A/UX:*:*) ++ echo m68k-apple-aux${UNAME_RELEASE} ++ exit ;; ++ news*:NEWS-OS:6*:*) ++ echo mips-sony-newsos6 ++ exit ;; ++ R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*) ++ if [ -d /usr/nec ]; then ++ echo mips-nec-sysv${UNAME_RELEASE} ++ else ++ echo mips-unknown-sysv${UNAME_RELEASE} ++ fi ++ exit ;; ++ BeBox:BeOS:*:*) # BeOS running on hardware made by Be, PPC only. ++ echo powerpc-be-beos ++ exit ;; ++ BeMac:BeOS:*:*) # BeOS running on Mac or Mac clone, PPC only. ++ echo powerpc-apple-beos ++ exit ;; ++ BePC:BeOS:*:*) # BeOS running on Intel PC compatible. ++ echo i586-pc-beos ++ exit ;; ++ BePC:Haiku:*:*) # Haiku running on Intel PC compatible. ++ echo i586-pc-haiku ++ exit ;; ++ SX-4:SUPER-UX:*:*) ++ echo sx4-nec-superux${UNAME_RELEASE} ++ exit ;; ++ SX-5:SUPER-UX:*:*) ++ echo sx5-nec-superux${UNAME_RELEASE} ++ exit ;; ++ SX-6:SUPER-UX:*:*) ++ echo sx6-nec-superux${UNAME_RELEASE} ++ exit ;; ++ SX-7:SUPER-UX:*:*) ++ echo sx7-nec-superux${UNAME_RELEASE} ++ exit ;; ++ SX-8:SUPER-UX:*:*) ++ echo sx8-nec-superux${UNAME_RELEASE} ++ exit ;; ++ SX-8R:SUPER-UX:*:*) ++ echo sx8r-nec-superux${UNAME_RELEASE} ++ exit ;; ++ Power*:Rhapsody:*:*) ++ echo powerpc-apple-rhapsody${UNAME_RELEASE} ++ exit ;; ++ *:Rhapsody:*:*) ++ echo ${UNAME_MACHINE}-apple-rhapsody${UNAME_RELEASE} ++ exit ;; ++ *:Darwin:*:*) ++ UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown ++ case $UNAME_PROCESSOR in ++ i386) ++ eval $set_cc_for_build ++ if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then ++ if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \ ++ (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \ ++ grep IS_64BIT_ARCH >/dev/null ++ then ++ UNAME_PROCESSOR="x86_64" ++ fi ++ fi ;; ++ unknown) UNAME_PROCESSOR=powerpc ;; ++ esac ++ echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE} ++ exit ;; ++ *:procnto*:*:* | *:QNX:[0123456789]*:*) ++ UNAME_PROCESSOR=`uname -p` ++ if test "$UNAME_PROCESSOR" = "x86"; then ++ UNAME_PROCESSOR=i386 ++ UNAME_MACHINE=pc ++ fi ++ echo ${UNAME_PROCESSOR}-${UNAME_MACHINE}-nto-qnx${UNAME_RELEASE} ++ exit ;; ++ *:QNX:*:4*) ++ echo i386-pc-qnx ++ exit ;; ++ NSE-?:NONSTOP_KERNEL:*:*) ++ echo nse-tandem-nsk${UNAME_RELEASE} ++ exit ;; ++ NSR-?:NONSTOP_KERNEL:*:*) ++ echo nsr-tandem-nsk${UNAME_RELEASE} ++ exit ;; ++ *:NonStop-UX:*:*) ++ echo mips-compaq-nonstopux ++ exit ;; ++ BS2000:POSIX*:*:*) ++ echo bs2000-siemens-sysv ++ exit ;; ++ DS/*:UNIX_System_V:*:*) ++ echo ${UNAME_MACHINE}-${UNAME_SYSTEM}-${UNAME_RELEASE} ++ exit ;; ++ *:Plan9:*:*) ++ # "uname -m" is not consistent, so use $cputype instead. 386 ++ # is converted to i386 for consistency with other x86 ++ # operating systems. ++ if test "$cputype" = "386"; then ++ UNAME_MACHINE=i386 ++ else ++ UNAME_MACHINE="$cputype" ++ fi ++ echo ${UNAME_MACHINE}-unknown-plan9 ++ exit ;; ++ *:TOPS-10:*:*) ++ echo pdp10-unknown-tops10 ++ exit ;; ++ *:TENEX:*:*) ++ echo pdp10-unknown-tenex ++ exit ;; ++ KS10:TOPS-20:*:* | KL10:TOPS-20:*:* | TYPE4:TOPS-20:*:*) ++ echo pdp10-dec-tops20 ++ exit ;; ++ XKL-1:TOPS-20:*:* | TYPE5:TOPS-20:*:*) ++ echo pdp10-xkl-tops20 ++ exit ;; ++ *:TOPS-20:*:*) ++ echo pdp10-unknown-tops20 ++ exit ;; ++ *:ITS:*:*) ++ echo pdp10-unknown-its ++ exit ;; ++ SEI:*:*:SEIUX) ++ echo mips-sei-seiux${UNAME_RELEASE} ++ exit ;; ++ *:DragonFly:*:*) ++ echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ++ exit ;; ++ *:*VMS:*:*) ++ UNAME_MACHINE=`(uname -p) 2>/dev/null` ++ case "${UNAME_MACHINE}" in ++ A*) echo alpha-dec-vms ; exit ;; ++ I*) echo ia64-dec-vms ; exit ;; ++ V*) echo vax-dec-vms ; exit ;; ++ esac ;; ++ *:XENIX:*:SysV) ++ echo i386-pc-xenix ++ exit ;; ++ i*86:skyos:*:*) ++ echo ${UNAME_MACHINE}-pc-skyos`echo ${UNAME_RELEASE}` | sed -e 's/ .*$//' ++ exit ;; ++ i*86:rdos:*:*) ++ echo ${UNAME_MACHINE}-pc-rdos ++ exit ;; ++ i*86:AROS:*:*) ++ echo ${UNAME_MACHINE}-pc-aros ++ exit ;; ++esac ++ ++#echo '(No uname command or uname output not recognized.)' 1>&2 ++#echo "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" 1>&2 ++ ++eval $set_cc_for_build ++cat >$dummy.c < ++# include ++#endif ++main () ++{ ++#if defined (sony) ++#if defined (MIPSEB) ++ /* BFD wants "bsd" instead of "newsos". Perhaps BFD should be changed, ++ I don't know.... */ ++ printf ("mips-sony-bsd\n"); exit (0); ++#else ++#include ++ printf ("m68k-sony-newsos%s\n", ++#ifdef NEWSOS4 ++ "4" ++#else ++ "" ++#endif ++ ); exit (0); ++#endif ++#endif ++ ++#if defined (__arm) && defined (__acorn) && defined (__unix) ++ printf ("arm-acorn-riscix\n"); exit (0); ++#endif ++ ++#if defined (hp300) && !defined (hpux) ++ printf ("m68k-hp-bsd\n"); exit (0); ++#endif ++ ++#if defined (NeXT) ++#if !defined (__ARCHITECTURE__) ++#define __ARCHITECTURE__ "m68k" ++#endif ++ int version; ++ version=`(hostinfo | sed -n 's/.*NeXT Mach \([0-9]*\).*/\1/p') 2>/dev/null`; ++ if (version < 4) ++ printf ("%s-next-nextstep%d\n", __ARCHITECTURE__, version); ++ else ++ printf ("%s-next-openstep%d\n", __ARCHITECTURE__, version); ++ exit (0); ++#endif ++ ++#if defined (MULTIMAX) || defined (n16) ++#if defined (UMAXV) ++ printf ("ns32k-encore-sysv\n"); exit (0); ++#else ++#if defined (CMU) ++ printf ("ns32k-encore-mach\n"); exit (0); ++#else ++ printf ("ns32k-encore-bsd\n"); exit (0); ++#endif ++#endif ++#endif ++ ++#if defined (__386BSD__) ++ printf ("i386-pc-bsd\n"); exit (0); ++#endif ++ ++#if defined (sequent) ++#if defined (i386) ++ printf ("i386-sequent-dynix\n"); exit (0); ++#endif ++#if defined (ns32000) ++ printf ("ns32k-sequent-dynix\n"); exit (0); ++#endif ++#endif ++ ++#if defined (_SEQUENT_) ++ struct utsname un; ++ ++ uname(&un); ++ ++ if (strncmp(un.version, "V2", 2) == 0) { ++ printf ("i386-sequent-ptx2\n"); exit (0); ++ } ++ if (strncmp(un.version, "V1", 2) == 0) { /* XXX is V1 correct? */ ++ printf ("i386-sequent-ptx1\n"); exit (0); ++ } ++ printf ("i386-sequent-ptx\n"); exit (0); ++ ++#endif ++ ++#if defined (vax) ++# if !defined (ultrix) ++# include ++# if defined (BSD) ++# if BSD == 43 ++ printf ("vax-dec-bsd4.3\n"); exit (0); ++# else ++# if BSD == 199006 ++ printf ("vax-dec-bsd4.3reno\n"); exit (0); ++# else ++ printf ("vax-dec-bsd\n"); exit (0); ++# endif ++# endif ++# else ++ printf ("vax-dec-bsd\n"); exit (0); ++# endif ++# else ++ printf ("vax-dec-ultrix\n"); exit (0); ++# endif ++#endif ++ ++#if defined (alliant) && defined (i860) ++ printf ("i860-alliant-bsd\n"); exit (0); ++#endif ++ ++ exit (1); ++} ++EOF ++ ++$CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null && SYSTEM_NAME=`$dummy` && ++ { echo "$SYSTEM_NAME"; exit; } ++ ++# Apollos put the system type in the environment. ++ ++test -d /usr/apollo && { echo ${ISP}-apollo-${SYSTYPE}; exit; } ++ ++# Convex versions that predate uname can use getsysinfo(1) ++ ++if [ -x /usr/convex/getsysinfo ] ++then ++ case `getsysinfo -f cpu_type` in ++ c1*) ++ echo c1-convex-bsd ++ exit ;; ++ c2*) ++ if getsysinfo -f scalar_acc ++ then echo c32-convex-bsd ++ else echo c2-convex-bsd ++ fi ++ exit ;; ++ c34*) ++ echo c34-convex-bsd ++ exit ;; ++ c38*) ++ echo c38-convex-bsd ++ exit ;; ++ c4*) ++ echo c4-convex-bsd ++ exit ;; ++ esac ++fi ++ ++cat >&2 < in order to provide the needed ++information to handle your system. ++ ++config.guess timestamp = $timestamp ++ ++uname -m = `(uname -m) 2>/dev/null || echo unknown` ++uname -r = `(uname -r) 2>/dev/null || echo unknown` ++uname -s = `(uname -s) 2>/dev/null || echo unknown` ++uname -v = `(uname -v) 2>/dev/null || echo unknown` ++ ++/usr/bin/uname -p = `(/usr/bin/uname -p) 2>/dev/null` ++/bin/uname -X = `(/bin/uname -X) 2>/dev/null` ++ ++hostinfo = `(hostinfo) 2>/dev/null` ++/bin/universe = `(/bin/universe) 2>/dev/null` ++/usr/bin/arch -k = `(/usr/bin/arch -k) 2>/dev/null` ++/bin/arch = `(/bin/arch) 2>/dev/null` ++/usr/bin/oslevel = `(/usr/bin/oslevel) 2>/dev/null` ++/usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null` ++ ++UNAME_MACHINE = ${UNAME_MACHINE} ++UNAME_RELEASE = ${UNAME_RELEASE} ++UNAME_SYSTEM = ${UNAME_SYSTEM} ++UNAME_VERSION = ${UNAME_VERSION} ++EOF ++ ++exit 1 ++ ++# Local variables: ++# eval: (add-hook 'write-file-hooks 'time-stamp) ++# time-stamp-start: "timestamp='" ++# time-stamp-format: "%:y-%02m-%02d" ++# time-stamp-end: "'" ++# End: +diff --git a/common/video/iso-mpeg4/config.sub b/common/video/iso-mpeg4/config.sub +deleted file mode 120000 +index 31a57ca..0000000 +--- a/common/video/iso-mpeg4/config.sub ++++ /dev/null +@@ -1 +0,0 @@ +-/usr/share/libtool/config.sub +\ No newline at end of file +diff --git a/common/video/iso-mpeg4/config.sub b/common/video/iso-mpeg4/config.sub +new file mode 100755 +index 0000000..2a55a50 +--- /dev/null ++++ b/common/video/iso-mpeg4/config.sub +@@ -0,0 +1,1705 @@ ++#! /bin/sh ++# Configuration validation subroutine script. ++# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, ++# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 ++# Free Software Foundation, Inc. ++ ++timestamp='2009-11-20' ++ ++# This file is (in principle) common to ALL GNU software. ++# The presence of a machine in this file suggests that SOME GNU software ++# can handle that machine. It does not imply ALL GNU software can. ++# ++# This file is free software; you can redistribute it and/or modify ++# it under the terms of the GNU General Public License as published by ++# the Free Software Foundation; either version 2 of the License, or ++# (at your option) any later version. ++# ++# This program is distributed in the hope that it will be useful, ++# but WITHOUT ANY WARRANTY; without even the implied warranty of ++# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++# GNU General Public License for more details. ++# ++# You should have received a copy of the GNU General Public License ++# along with this program; if not, write to the Free Software ++# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA ++# 02110-1301, USA. ++# ++# As a special exception to the GNU General Public License, if you ++# distribute this file as part of a program that contains a ++# configuration script generated by Autoconf, you may include it under ++# the same distribution terms that you use for the rest of that program. ++ ++ ++# Please send patches to . Submit a context ++# diff and a properly formatted GNU ChangeLog entry. ++# ++# Configuration subroutine to validate and canonicalize a configuration type. ++# Supply the specified configuration type as an argument. ++# If it is invalid, we print an error message on stderr and exit with code 1. ++# Otherwise, we print the canonical config type on stdout and succeed. ++ ++# You can get the latest version of this script from: ++# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD ++ ++# This file is supposed to be the same for all GNU packages ++# and recognize all the CPU types, system types and aliases ++# that are meaningful with *any* GNU software. ++# Each package is responsible for reporting which valid configurations ++# it does not support. The user should be able to distinguish ++# a failure to support a valid configuration from a meaningless ++# configuration. ++ ++# The goal of this file is to map all the various variations of a given ++# machine specification into a single specification in the form: ++# CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM ++# or in some cases, the newer four-part form: ++# CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM ++# It is wrong to echo any other type of specification. ++ ++me=`echo "$0" | sed -e 's,.*/,,'` ++ ++usage="\ ++Usage: $0 [OPTION] CPU-MFR-OPSYS ++ $0 [OPTION] ALIAS ++ ++Canonicalize a configuration name. ++ ++Operation modes: ++ -h, --help print this help, then exit ++ -t, --time-stamp print date of last modification, then exit ++ -v, --version print version number, then exit ++ ++Report bugs and patches to ." ++ ++version="\ ++GNU config.sub ($timestamp) ++ ++Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, ++2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. ++ ++This is free software; see the source for copying conditions. There is NO ++warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." ++ ++help=" ++Try \`$me --help' for more information." ++ ++# Parse command line ++while test $# -gt 0 ; do ++ case $1 in ++ --time-stamp | --time* | -t ) ++ echo "$timestamp" ; exit ;; ++ --version | -v ) ++ echo "$version" ; exit ;; ++ --help | --h* | -h ) ++ echo "$usage"; exit ;; ++ -- ) # Stop option processing ++ shift; break ;; ++ - ) # Use stdin as input. ++ break ;; ++ -* ) ++ echo "$me: invalid option $1$help" ++ exit 1 ;; ++ ++ *local*) ++ # First pass through any local machine types. ++ echo $1 ++ exit ;; ++ ++ * ) ++ break ;; ++ esac ++done ++ ++case $# in ++ 0) echo "$me: missing argument$help" >&2 ++ exit 1;; ++ 1) ;; ++ *) echo "$me: too many arguments$help" >&2 ++ exit 1;; ++esac ++ ++# Separate what the user gave into CPU-COMPANY and OS or KERNEL-OS (if any). ++# Here we must recognize all the valid KERNEL-OS combinations. ++maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'` ++case $maybe_os in ++ nto-qnx* | linux-gnu* | linux-dietlibc | linux-newlib* | linux-uclibc* | \ ++ uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | \ ++ kopensolaris*-gnu* | \ ++ storm-chaos* | os2-emx* | rtmk-nova*) ++ os=-$maybe_os ++ basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'` ++ ;; ++ *) ++ basic_machine=`echo $1 | sed 's/-[^-]*$//'` ++ if [ $basic_machine != $1 ] ++ then os=`echo $1 | sed 's/.*-/-/'` ++ else os=; fi ++ ;; ++esac ++ ++### Let's recognize common machines as not being operating systems so ++### that things like config.sub decstation-3100 work. We also ++### recognize some manufacturers as not being operating systems, so we ++### can provide default operating systems below. ++case $os in ++ -sun*os*) ++ # Prevent following clause from handling this invalid input. ++ ;; ++ -dec* | -mips* | -sequent* | -encore* | -pc532* | -sgi* | -sony* | \ ++ -att* | -7300* | -3300* | -delta* | -motorola* | -sun[234]* | \ ++ -unicom* | -ibm* | -next | -hp | -isi* | -apollo | -altos* | \ ++ -convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\ ++ -c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \ ++ -harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \ ++ -apple | -axis | -knuth | -cray | -microblaze) ++ os= ++ basic_machine=$1 ++ ;; ++ -bluegene*) ++ os=-cnk ++ ;; ++ -sim | -cisco | -oki | -wec | -winbond) ++ os= ++ basic_machine=$1 ++ ;; ++ -scout) ++ ;; ++ -wrs) ++ os=-vxworks ++ basic_machine=$1 ++ ;; ++ -chorusos*) ++ os=-chorusos ++ basic_machine=$1 ++ ;; ++ -chorusrdb) ++ os=-chorusrdb ++ basic_machine=$1 ++ ;; ++ -hiux*) ++ os=-hiuxwe2 ++ ;; ++ -sco6) ++ os=-sco5v6 ++ basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` ++ ;; ++ -sco5) ++ os=-sco3.2v5 ++ basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` ++ ;; ++ -sco4) ++ os=-sco3.2v4 ++ basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` ++ ;; ++ -sco3.2.[4-9]*) ++ os=`echo $os | sed -e 's/sco3.2./sco3.2v/'` ++ basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` ++ ;; ++ -sco3.2v[4-9]*) ++ # Don't forget version if it is 3.2v4 or newer. ++ basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` ++ ;; ++ -sco5v6*) ++ # Don't forget version if it is 3.2v4 or newer. ++ basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` ++ ;; ++ -sco*) ++ os=-sco3.2v2 ++ basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` ++ ;; ++ -udk*) ++ basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` ++ ;; ++ -isc) ++ os=-isc2.2 ++ basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` ++ ;; ++ -clix*) ++ basic_machine=clipper-intergraph ++ ;; ++ -isc*) ++ basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` ++ ;; ++ -lynx*) ++ os=-lynxos ++ ;; ++ -ptx*) ++ basic_machine=`echo $1 | sed -e 's/86-.*/86-sequent/'` ++ ;; ++ -windowsnt*) ++ os=`echo $os | sed -e 's/windowsnt/winnt/'` ++ ;; ++ -psos*) ++ os=-psos ++ ;; ++ -mint | -mint[0-9]*) ++ basic_machine=m68k-atari ++ os=-mint ++ ;; ++esac ++ ++# Decode aliases for certain CPU-COMPANY combinations. ++case $basic_machine in ++ # Recognize the basic CPU types without company name. ++ # Some are omitted here because they have special meanings below. ++ 1750a | 580 \ ++ | a29k \ ++ | alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \ ++ | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \ ++ | am33_2.0 \ ++ | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr | avr32 \ ++ | bfin \ ++ | c4x | clipper \ ++ | d10v | d30v | dlx | dsp16xx \ ++ | fido | fr30 | frv \ ++ | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \ ++ | i370 | i860 | i960 | ia64 \ ++ | ip2k | iq2000 \ ++ | lm32 \ ++ | m32c | m32r | m32rle | m68000 | m68k | m88k \ ++ | maxq | mb | microblaze | mcore | mep | metag \ ++ | mips | mipsbe | mipseb | mipsel | mipsle \ ++ | mips16 \ ++ | mips64 | mips64el \ ++ | mips64octeon | mips64octeonel \ ++ | mips64orion | mips64orionel \ ++ | mips64r5900 | mips64r5900el \ ++ | mips64vr | mips64vrel \ ++ | mips64vr4100 | mips64vr4100el \ ++ | mips64vr4300 | mips64vr4300el \ ++ | mips64vr5000 | mips64vr5000el \ ++ | mips64vr5900 | mips64vr5900el \ ++ | mipsisa32 | mipsisa32el \ ++ | mipsisa32r2 | mipsisa32r2el \ ++ | mipsisa64 | mipsisa64el \ ++ | mipsisa64r2 | mipsisa64r2el \ ++ | mipsisa64sb1 | mipsisa64sb1el \ ++ | mipsisa64sr71k | mipsisa64sr71kel \ ++ | mipstx39 | mipstx39el \ ++ | mn10200 | mn10300 \ ++ | moxie \ ++ | mt \ ++ | msp430 \ ++ | nios | nios2 \ ++ | ns16k | ns32k \ ++ | or32 \ ++ | pdp10 | pdp11 | pj | pjl \ ++ | powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \ ++ | pyramid \ ++ | rx \ ++ | score \ ++ | sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \ ++ | sh64 | sh64le \ ++ | sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \ ++ | sparcv8 | sparcv9 | sparcv9b | sparcv9v \ ++ | spu | strongarm \ ++ | tahoe | thumb | tic4x | tic80 | tron \ ++ | ubicom32 \ ++ | v850 | v850e \ ++ | we32k \ ++ | x86 | xc16x | xscale | xscalee[bl] | xstormy16 | xtensa \ ++ | z8k | z80) ++ basic_machine=$basic_machine-unknown ++ ;; ++ m6811 | m68hc11 | m6812 | m68hc12 | picochip) ++ # Motorola 68HC11/12. ++ basic_machine=$basic_machine-unknown ++ os=-none ++ ;; ++ m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | v70 | w65 | z8k) ++ ;; ++ ms1) ++ basic_machine=mt-unknown ++ ;; ++ ++ # We use `pc' rather than `unknown' ++ # because (1) that's what they normally are, and ++ # (2) the word "unknown" tends to confuse beginning users. ++ i*86 | x86_64) ++ basic_machine=$basic_machine-pc ++ ;; ++ # Object if more than one company name word. ++ *-*-*) ++ echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2 ++ exit 1 ++ ;; ++ # Recognize the basic CPU types with company name. ++ 580-* \ ++ | a29k-* \ ++ | alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \ ++ | alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \ ++ | alphapca5[67]-* | alpha64pca5[67]-* | arc-* \ ++ | arm-* | armbe-* | armle-* | armeb-* | armv*-* \ ++ | avr-* | avr32-* \ ++ | bfin-* | bs2000-* \ ++ | c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \ ++ | clipper-* | craynv-* | cydra-* \ ++ | d10v-* | d30v-* | dlx-* \ ++ | elxsi-* \ ++ | f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \ ++ | h8300-* | h8500-* \ ++ | hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \ ++ | i*86-* | i860-* | i960-* | ia64-* \ ++ | ip2k-* | iq2000-* \ ++ | lm32-* \ ++ | m32c-* | m32r-* | m32rle-* \ ++ | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \ ++ | m88110-* | m88k-* | maxq-* | mcore-* | metag-* | microblaze-* \ ++ | mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \ ++ | mips16-* \ ++ | mips64-* | mips64el-* \ ++ | mips64octeon-* | mips64octeonel-* \ ++ | mips64orion-* | mips64orionel-* \ ++ | mips64r5900-* | mips64r5900el-* \ ++ | mips64vr-* | mips64vrel-* \ ++ | mips64vr4100-* | mips64vr4100el-* \ ++ | mips64vr4300-* | mips64vr4300el-* \ ++ | mips64vr5000-* | mips64vr5000el-* \ ++ | mips64vr5900-* | mips64vr5900el-* \ ++ | mipsisa32-* | mipsisa32el-* \ ++ | mipsisa32r2-* | mipsisa32r2el-* \ ++ | mipsisa64-* | mipsisa64el-* \ ++ | mipsisa64r2-* | mipsisa64r2el-* \ ++ | mipsisa64sb1-* | mipsisa64sb1el-* \ ++ | mipsisa64sr71k-* | mipsisa64sr71kel-* \ ++ | mipstx39-* | mipstx39el-* \ ++ | mmix-* \ ++ | mt-* \ ++ | msp430-* \ ++ | nios-* | nios2-* \ ++ | none-* | np1-* | ns16k-* | ns32k-* \ ++ | orion-* \ ++ | pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \ ++ | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \ ++ | pyramid-* \ ++ | romp-* | rs6000-* | rx-* \ ++ | sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \ ++ | shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \ ++ | sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \ ++ | sparclite-* \ ++ | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | strongarm-* | sv1-* | sx?-* \ ++ | tahoe-* | thumb-* \ ++ | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* | tile-* \ ++ | tron-* \ ++ | ubicom32-* \ ++ | v850-* | v850e-* | vax-* \ ++ | we32k-* \ ++ | x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \ ++ | xstormy16-* | xtensa*-* \ ++ | ymp-* \ ++ | z8k-* | z80-*) ++ ;; ++ # Recognize the basic CPU types without company name, with glob match. ++ xtensa*) ++ basic_machine=$basic_machine-unknown ++ ;; ++ # Recognize the various machine names and aliases which stand ++ # for a CPU type and a company and sometimes even an OS. ++ 386bsd) ++ basic_machine=i386-unknown ++ os=-bsd ++ ;; ++ 3b1 | 7300 | 7300-att | att-7300 | pc7300 | safari | unixpc) ++ basic_machine=m68000-att ++ ;; ++ 3b*) ++ basic_machine=we32k-att ++ ;; ++ a29khif) ++ basic_machine=a29k-amd ++ os=-udi ++ ;; ++ abacus) ++ basic_machine=abacus-unknown ++ ;; ++ adobe68k) ++ basic_machine=m68010-adobe ++ os=-scout ++ ;; ++ alliant | fx80) ++ basic_machine=fx80-alliant ++ ;; ++ altos | altos3068) ++ basic_machine=m68k-altos ++ ;; ++ am29k) ++ basic_machine=a29k-none ++ os=-bsd ++ ;; ++ amd64) ++ basic_machine=x86_64-pc ++ ;; ++ amd64-*) ++ basic_machine=x86_64-`echo $basic_machine | sed 's/^[^-]*-//'` ++ ;; ++ amdahl) ++ basic_machine=580-amdahl ++ os=-sysv ++ ;; ++ amiga | amiga-*) ++ basic_machine=m68k-unknown ++ ;; ++ amigaos | amigados) ++ basic_machine=m68k-unknown ++ os=-amigaos ++ ;; ++ amigaunix | amix) ++ basic_machine=m68k-unknown ++ os=-sysv4 ++ ;; ++ apollo68) ++ basic_machine=m68k-apollo ++ os=-sysv ++ ;; ++ apollo68bsd) ++ basic_machine=m68k-apollo ++ os=-bsd ++ ;; ++ aros) ++ basic_machine=i386-pc ++ os=-aros ++ ;; ++ aux) ++ basic_machine=m68k-apple ++ os=-aux ++ ;; ++ balance) ++ basic_machine=ns32k-sequent ++ os=-dynix ++ ;; ++ blackfin) ++ basic_machine=bfin-unknown ++ os=-linux ++ ;; ++ blackfin-*) ++ basic_machine=bfin-`echo $basic_machine | sed 's/^[^-]*-//'` ++ os=-linux ++ ;; ++ bluegene*) ++ basic_machine=powerpc-ibm ++ os=-cnk ++ ;; ++ c90) ++ basic_machine=c90-cray ++ os=-unicos ++ ;; ++ cegcc) ++ basic_machine=arm-unknown ++ os=-cegcc ++ ;; ++ convex-c1) ++ basic_machine=c1-convex ++ os=-bsd ++ ;; ++ convex-c2) ++ basic_machine=c2-convex ++ os=-bsd ++ ;; ++ convex-c32) ++ basic_machine=c32-convex ++ os=-bsd ++ ;; ++ convex-c34) ++ basic_machine=c34-convex ++ os=-bsd ++ ;; ++ convex-c38) ++ basic_machine=c38-convex ++ os=-bsd ++ ;; ++ cray | j90) ++ basic_machine=j90-cray ++ os=-unicos ++ ;; ++ craynv) ++ basic_machine=craynv-cray ++ os=-unicosmp ++ ;; ++ cr16) ++ basic_machine=cr16-unknown ++ os=-elf ++ ;; ++ crds | unos) ++ basic_machine=m68k-crds ++ ;; ++ crisv32 | crisv32-* | etraxfs*) ++ basic_machine=crisv32-axis ++ ;; ++ cris | cris-* | etrax*) ++ basic_machine=cris-axis ++ ;; ++ crx) ++ basic_machine=crx-unknown ++ os=-elf ++ ;; ++ da30 | da30-*) ++ basic_machine=m68k-da30 ++ ;; ++ decstation | decstation-3100 | pmax | pmax-* | pmin | dec3100 | decstatn) ++ basic_machine=mips-dec ++ ;; ++ decsystem10* | dec10*) ++ basic_machine=pdp10-dec ++ os=-tops10 ++ ;; ++ decsystem20* | dec20*) ++ basic_machine=pdp10-dec ++ os=-tops20 ++ ;; ++ delta | 3300 | motorola-3300 | motorola-delta \ ++ | 3300-motorola | delta-motorola) ++ basic_machine=m68k-motorola ++ ;; ++ delta88) ++ basic_machine=m88k-motorola ++ os=-sysv3 ++ ;; ++ dicos) ++ basic_machine=i686-pc ++ os=-dicos ++ ;; ++ djgpp) ++ basic_machine=i586-pc ++ os=-msdosdjgpp ++ ;; ++ dpx20 | dpx20-*) ++ basic_machine=rs6000-bull ++ os=-bosx ++ ;; ++ dpx2* | dpx2*-bull) ++ basic_machine=m68k-bull ++ os=-sysv3 ++ ;; ++ ebmon29k) ++ basic_machine=a29k-amd ++ os=-ebmon ++ ;; ++ elxsi) ++ basic_machine=elxsi-elxsi ++ os=-bsd ++ ;; ++ encore | umax | mmax) ++ basic_machine=ns32k-encore ++ ;; ++ es1800 | OSE68k | ose68k | ose | OSE) ++ basic_machine=m68k-ericsson ++ os=-ose ++ ;; ++ fx2800) ++ basic_machine=i860-alliant ++ ;; ++ genix) ++ basic_machine=ns32k-ns ++ ;; ++ gmicro) ++ basic_machine=tron-gmicro ++ os=-sysv ++ ;; ++ go32) ++ basic_machine=i386-pc ++ os=-go32 ++ ;; ++ h3050r* | hiux*) ++ basic_machine=hppa1.1-hitachi ++ os=-hiuxwe2 ++ ;; ++ h8300hms) ++ basic_machine=h8300-hitachi ++ os=-hms ++ ;; ++ h8300xray) ++ basic_machine=h8300-hitachi ++ os=-xray ++ ;; ++ h8500hms) ++ basic_machine=h8500-hitachi ++ os=-hms ++ ;; ++ harris) ++ basic_machine=m88k-harris ++ os=-sysv3 ++ ;; ++ hp300-*) ++ basic_machine=m68k-hp ++ ;; ++ hp300bsd) ++ basic_machine=m68k-hp ++ os=-bsd ++ ;; ++ hp300hpux) ++ basic_machine=m68k-hp ++ os=-hpux ++ ;; ++ hp3k9[0-9][0-9] | hp9[0-9][0-9]) ++ basic_machine=hppa1.0-hp ++ ;; ++ hp9k2[0-9][0-9] | hp9k31[0-9]) ++ basic_machine=m68000-hp ++ ;; ++ hp9k3[2-9][0-9]) ++ basic_machine=m68k-hp ++ ;; ++ hp9k6[0-9][0-9] | hp6[0-9][0-9]) ++ basic_machine=hppa1.0-hp ++ ;; ++ hp9k7[0-79][0-9] | hp7[0-79][0-9]) ++ basic_machine=hppa1.1-hp ++ ;; ++ hp9k78[0-9] | hp78[0-9]) ++ # FIXME: really hppa2.0-hp ++ basic_machine=hppa1.1-hp ++ ;; ++ hp9k8[67]1 | hp8[67]1 | hp9k80[24] | hp80[24] | hp9k8[78]9 | hp8[78]9 | hp9k893 | hp893) ++ # FIXME: really hppa2.0-hp ++ basic_machine=hppa1.1-hp ++ ;; ++ hp9k8[0-9][13679] | hp8[0-9][13679]) ++ basic_machine=hppa1.1-hp ++ ;; ++ hp9k8[0-9][0-9] | hp8[0-9][0-9]) ++ basic_machine=hppa1.0-hp ++ ;; ++ hppa-next) ++ os=-nextstep3 ++ ;; ++ hppaosf) ++ basic_machine=hppa1.1-hp ++ os=-osf ++ ;; ++ hppro) ++ basic_machine=hppa1.1-hp ++ os=-proelf ++ ;; ++ i370-ibm* | ibm*) ++ basic_machine=i370-ibm ++ ;; ++# I'm not sure what "Sysv32" means. Should this be sysv3.2? ++ i*86v32) ++ basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'` ++ os=-sysv32 ++ ;; ++ i*86v4*) ++ basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'` ++ os=-sysv4 ++ ;; ++ i*86v) ++ basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'` ++ os=-sysv ++ ;; ++ i*86sol2) ++ basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'` ++ os=-solaris2 ++ ;; ++ i386mach) ++ basic_machine=i386-mach ++ os=-mach ++ ;; ++ i386-vsta | vsta) ++ basic_machine=i386-unknown ++ os=-vsta ++ ;; ++ iris | iris4d) ++ basic_machine=mips-sgi ++ case $os in ++ -irix*) ++ ;; ++ *) ++ os=-irix4 ++ ;; ++ esac ++ ;; ++ isi68 | isi) ++ basic_machine=m68k-isi ++ os=-sysv ++ ;; ++ m68knommu) ++ basic_machine=m68k-unknown ++ os=-linux ++ ;; ++ m68knommu-*) ++ basic_machine=m68k-`echo $basic_machine | sed 's/^[^-]*-//'` ++ os=-linux ++ ;; ++ m88k-omron*) ++ basic_machine=m88k-omron ++ ;; ++ magnum | m3230) ++ basic_machine=mips-mips ++ os=-sysv ++ ;; ++ merlin) ++ basic_machine=ns32k-utek ++ os=-sysv ++ ;; ++ microblaze) ++ basic_machine=microblaze-xilinx ++ ;; ++ mingw32) ++ basic_machine=i386-pc ++ os=-mingw32 ++ ;; ++ mingw32ce) ++ basic_machine=arm-unknown ++ os=-mingw32ce ++ ;; ++ miniframe) ++ basic_machine=m68000-convergent ++ ;; ++ *mint | -mint[0-9]* | *MiNT | *MiNT[0-9]*) ++ basic_machine=m68k-atari ++ os=-mint ++ ;; ++ mips3*-*) ++ basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'` ++ ;; ++ mips3*) ++ basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`-unknown ++ ;; ++ monitor) ++ basic_machine=m68k-rom68k ++ os=-coff ++ ;; ++ morphos) ++ basic_machine=powerpc-unknown ++ os=-morphos ++ ;; ++ msdos) ++ basic_machine=i386-pc ++ os=-msdos ++ ;; ++ ms1-*) ++ basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'` ++ ;; ++ mvs) ++ basic_machine=i370-ibm ++ os=-mvs ++ ;; ++ ncr3000) ++ basic_machine=i486-ncr ++ os=-sysv4 ++ ;; ++ netbsd386) ++ basic_machine=i386-unknown ++ os=-netbsd ++ ;; ++ netwinder) ++ basic_machine=armv4l-rebel ++ os=-linux ++ ;; ++ news | news700 | news800 | news900) ++ basic_machine=m68k-sony ++ os=-newsos ++ ;; ++ news1000) ++ basic_machine=m68030-sony ++ os=-newsos ++ ;; ++ news-3600 | risc-news) ++ basic_machine=mips-sony ++ os=-newsos ++ ;; ++ necv70) ++ basic_machine=v70-nec ++ os=-sysv ++ ;; ++ next | m*-next ) ++ basic_machine=m68k-next ++ case $os in ++ -nextstep* ) ++ ;; ++ -ns2*) ++ os=-nextstep2 ++ ;; ++ *) ++ os=-nextstep3 ++ ;; ++ esac ++ ;; ++ nh3000) ++ basic_machine=m68k-harris ++ os=-cxux ++ ;; ++ nh[45]000) ++ basic_machine=m88k-harris ++ os=-cxux ++ ;; ++ nindy960) ++ basic_machine=i960-intel ++ os=-nindy ++ ;; ++ mon960) ++ basic_machine=i960-intel ++ os=-mon960 ++ ;; ++ nonstopux) ++ basic_machine=mips-compaq ++ os=-nonstopux ++ ;; ++ np1) ++ basic_machine=np1-gould ++ ;; ++ nsr-tandem) ++ basic_machine=nsr-tandem ++ ;; ++ op50n-* | op60c-*) ++ basic_machine=hppa1.1-oki ++ os=-proelf ++ ;; ++ openrisc | openrisc-*) ++ basic_machine=or32-unknown ++ ;; ++ os400) ++ basic_machine=powerpc-ibm ++ os=-os400 ++ ;; ++ OSE68000 | ose68000) ++ basic_machine=m68000-ericsson ++ os=-ose ++ ;; ++ os68k) ++ basic_machine=m68k-none ++ os=-os68k ++ ;; ++ pa-hitachi) ++ basic_machine=hppa1.1-hitachi ++ os=-hiuxwe2 ++ ;; ++ paragon) ++ basic_machine=i860-intel ++ os=-osf ++ ;; ++ parisc) ++ basic_machine=hppa-unknown ++ os=-linux ++ ;; ++ parisc-*) ++ basic_machine=hppa-`echo $basic_machine | sed 's/^[^-]*-//'` ++ os=-linux ++ ;; ++ pbd) ++ basic_machine=sparc-tti ++ ;; ++ pbb) ++ basic_machine=m68k-tti ++ ;; ++ pc532 | pc532-*) ++ basic_machine=ns32k-pc532 ++ ;; ++ pc98) ++ basic_machine=i386-pc ++ ;; ++ pc98-*) ++ basic_machine=i386-`echo $basic_machine | sed 's/^[^-]*-//'` ++ ;; ++ pentium | p5 | k5 | k6 | nexgen | viac3) ++ basic_machine=i586-pc ++ ;; ++ pentiumpro | p6 | 6x86 | athlon | athlon_*) ++ basic_machine=i686-pc ++ ;; ++ pentiumii | pentium2 | pentiumiii | pentium3) ++ basic_machine=i686-pc ++ ;; ++ pentium4) ++ basic_machine=i786-pc ++ ;; ++ pentium-* | p5-* | k5-* | k6-* | nexgen-* | viac3-*) ++ basic_machine=i586-`echo $basic_machine | sed 's/^[^-]*-//'` ++ ;; ++ pentiumpro-* | p6-* | 6x86-* | athlon-*) ++ basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'` ++ ;; ++ pentiumii-* | pentium2-* | pentiumiii-* | pentium3-*) ++ basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'` ++ ;; ++ pentium4-*) ++ basic_machine=i786-`echo $basic_machine | sed 's/^[^-]*-//'` ++ ;; ++ pn) ++ basic_machine=pn-gould ++ ;; ++ power) basic_machine=power-ibm ++ ;; ++ ppc) basic_machine=powerpc-unknown ++ ;; ++ ppc-*) basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'` ++ ;; ++ ppcle | powerpclittle | ppc-le | powerpc-little) ++ basic_machine=powerpcle-unknown ++ ;; ++ ppcle-* | powerpclittle-*) ++ basic_machine=powerpcle-`echo $basic_machine | sed 's/^[^-]*-//'` ++ ;; ++ ppc64) basic_machine=powerpc64-unknown ++ ;; ++ ppc64-*) basic_machine=powerpc64-`echo $basic_machine | sed 's/^[^-]*-//'` ++ ;; ++ ppc64le | powerpc64little | ppc64-le | powerpc64-little) ++ basic_machine=powerpc64le-unknown ++ ;; ++ ppc64le-* | powerpc64little-*) ++ basic_machine=powerpc64le-`echo $basic_machine | sed 's/^[^-]*-//'` ++ ;; ++ ps2) ++ basic_machine=i386-ibm ++ ;; ++ pw32) ++ basic_machine=i586-unknown ++ os=-pw32 ++ ;; ++ rdos) ++ basic_machine=i386-pc ++ os=-rdos ++ ;; ++ rom68k) ++ basic_machine=m68k-rom68k ++ os=-coff ++ ;; ++ rm[46]00) ++ basic_machine=mips-siemens ++ ;; ++ rtpc | rtpc-*) ++ basic_machine=romp-ibm ++ ;; ++ s390 | s390-*) ++ basic_machine=s390-ibm ++ ;; ++ s390x | s390x-*) ++ basic_machine=s390x-ibm ++ ;; ++ sa29200) ++ basic_machine=a29k-amd ++ os=-udi ++ ;; ++ sb1) ++ basic_machine=mipsisa64sb1-unknown ++ ;; ++ sb1el) ++ basic_machine=mipsisa64sb1el-unknown ++ ;; ++ sde) ++ basic_machine=mipsisa32-sde ++ os=-elf ++ ;; ++ sei) ++ basic_machine=mips-sei ++ os=-seiux ++ ;; ++ sequent) ++ basic_machine=i386-sequent ++ ;; ++ sh) ++ basic_machine=sh-hitachi ++ os=-hms ++ ;; ++ sh5el) ++ basic_machine=sh5le-unknown ++ ;; ++ sh64) ++ basic_machine=sh64-unknown ++ ;; ++ sparclite-wrs | simso-wrs) ++ basic_machine=sparclite-wrs ++ os=-vxworks ++ ;; ++ sps7) ++ basic_machine=m68k-bull ++ os=-sysv2 ++ ;; ++ spur) ++ basic_machine=spur-unknown ++ ;; ++ st2000) ++ basic_machine=m68k-tandem ++ ;; ++ stratus) ++ basic_machine=i860-stratus ++ os=-sysv4 ++ ;; ++ sun2) ++ basic_machine=m68000-sun ++ ;; ++ sun2os3) ++ basic_machine=m68000-sun ++ os=-sunos3 ++ ;; ++ sun2os4) ++ basic_machine=m68000-sun ++ os=-sunos4 ++ ;; ++ sun3os3) ++ basic_machine=m68k-sun ++ os=-sunos3 ++ ;; ++ sun3os4) ++ basic_machine=m68k-sun ++ os=-sunos4 ++ ;; ++ sun4os3) ++ basic_machine=sparc-sun ++ os=-sunos3 ++ ;; ++ sun4os4) ++ basic_machine=sparc-sun ++ os=-sunos4 ++ ;; ++ sun4sol2) ++ basic_machine=sparc-sun ++ os=-solaris2 ++ ;; ++ sun3 | sun3-*) ++ basic_machine=m68k-sun ++ ;; ++ sun4) ++ basic_machine=sparc-sun ++ ;; ++ sun386 | sun386i | roadrunner) ++ basic_machine=i386-sun ++ ;; ++ sv1) ++ basic_machine=sv1-cray ++ os=-unicos ++ ;; ++ symmetry) ++ basic_machine=i386-sequent ++ os=-dynix ++ ;; ++ t3e) ++ basic_machine=alphaev5-cray ++ os=-unicos ++ ;; ++ t90) ++ basic_machine=t90-cray ++ os=-unicos ++ ;; ++ tic54x | c54x*) ++ basic_machine=tic54x-unknown ++ os=-coff ++ ;; ++ tic55x | c55x*) ++ basic_machine=tic55x-unknown ++ os=-coff ++ ;; ++ tic6x | c6x*) ++ basic_machine=tic6x-unknown ++ os=-coff ++ ;; ++ tile*) ++ basic_machine=tile-unknown ++ os=-linux-gnu ++ ;; ++ tx39) ++ basic_machine=mipstx39-unknown ++ ;; ++ tx39el) ++ basic_machine=mipstx39el-unknown ++ ;; ++ toad1) ++ basic_machine=pdp10-xkl ++ os=-tops20 ++ ;; ++ tower | tower-32) ++ basic_machine=m68k-ncr ++ ;; ++ tpf) ++ basic_machine=s390x-ibm ++ os=-tpf ++ ;; ++ udi29k) ++ basic_machine=a29k-amd ++ os=-udi ++ ;; ++ ultra3) ++ basic_machine=a29k-nyu ++ os=-sym1 ++ ;; ++ v810 | necv810) ++ basic_machine=v810-nec ++ os=-none ++ ;; ++ vaxv) ++ basic_machine=vax-dec ++ os=-sysv ++ ;; ++ vms) ++ basic_machine=vax-dec ++ os=-vms ++ ;; ++ vpp*|vx|vx-*) ++ basic_machine=f301-fujitsu ++ ;; ++ vxworks960) ++ basic_machine=i960-wrs ++ os=-vxworks ++ ;; ++ vxworks68) ++ basic_machine=m68k-wrs ++ os=-vxworks ++ ;; ++ vxworks29k) ++ basic_machine=a29k-wrs ++ os=-vxworks ++ ;; ++ w65*) ++ basic_machine=w65-wdc ++ os=-none ++ ;; ++ w89k-*) ++ basic_machine=hppa1.1-winbond ++ os=-proelf ++ ;; ++ xbox) ++ basic_machine=i686-pc ++ os=-mingw32 ++ ;; ++ xps | xps100) ++ basic_machine=xps100-honeywell ++ ;; ++ ymp) ++ basic_machine=ymp-cray ++ os=-unicos ++ ;; ++ z8k-*-coff) ++ basic_machine=z8k-unknown ++ os=-sim ++ ;; ++ z80-*-coff) ++ basic_machine=z80-unknown ++ os=-sim ++ ;; ++ none) ++ basic_machine=none-none ++ os=-none ++ ;; ++ ++# Here we handle the default manufacturer of certain CPU types. It is in ++# some cases the only manufacturer, in others, it is the most popular. ++ w89k) ++ basic_machine=hppa1.1-winbond ++ ;; ++ op50n) ++ basic_machine=hppa1.1-oki ++ ;; ++ op60c) ++ basic_machine=hppa1.1-oki ++ ;; ++ romp) ++ basic_machine=romp-ibm ++ ;; ++ mmix) ++ basic_machine=mmix-knuth ++ ;; ++ rs6000) ++ basic_machine=rs6000-ibm ++ ;; ++ vax) ++ basic_machine=vax-dec ++ ;; ++ pdp10) ++ # there are many clones, so DEC is not a safe bet ++ basic_machine=pdp10-unknown ++ ;; ++ pdp11) ++ basic_machine=pdp11-dec ++ ;; ++ we32k) ++ basic_machine=we32k-att ++ ;; ++ sh[1234] | sh[24]a | sh[24]aeb | sh[34]eb | sh[1234]le | sh[23]ele) ++ basic_machine=sh-unknown ++ ;; ++ sparc | sparcv8 | sparcv9 | sparcv9b | sparcv9v) ++ basic_machine=sparc-sun ++ ;; ++ cydra) ++ basic_machine=cydra-cydrome ++ ;; ++ orion) ++ basic_machine=orion-highlevel ++ ;; ++ orion105) ++ basic_machine=clipper-highlevel ++ ;; ++ mac | mpw | mac-mpw) ++ basic_machine=m68k-apple ++ ;; ++ pmac | pmac-mpw) ++ basic_machine=powerpc-apple ++ ;; ++ *-unknown) ++ # Make sure to match an already-canonicalized machine name. ++ ;; ++ *) ++ echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2 ++ exit 1 ++ ;; ++esac ++ ++# Here we canonicalize certain aliases for manufacturers. ++case $basic_machine in ++ *-digital*) ++ basic_machine=`echo $basic_machine | sed 's/digital.*/dec/'` ++ ;; ++ *-commodore*) ++ basic_machine=`echo $basic_machine | sed 's/commodore.*/cbm/'` ++ ;; ++ *) ++ ;; ++esac ++ ++# Decode manufacturer-specific aliases for certain operating systems. ++ ++if [ x"$os" != x"" ] ++then ++case $os in ++ # First match some system type aliases ++ # that might get confused with valid system types. ++ # -solaris* is a basic system type, with this one exception. ++ -auroraux) ++ os=-auroraux ++ ;; ++ -solaris1 | -solaris1.*) ++ os=`echo $os | sed -e 's|solaris1|sunos4|'` ++ ;; ++ -solaris) ++ os=-solaris2 ++ ;; ++ -svr4*) ++ os=-sysv4 ++ ;; ++ -unixware*) ++ os=-sysv4.2uw ++ ;; ++ -gnu/linux*) ++ os=`echo $os | sed -e 's|gnu/linux|linux-gnu|'` ++ ;; ++ # First accept the basic system types. ++ # The portable systems comes first. ++ # Each alternative MUST END IN A *, to match a version number. ++ # -sysv* is not here because it comes later, after sysvr4. ++ -gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \ ++ | -*vms* | -sco* | -esix* | -isc* | -aix* | -cnk* | -sunos | -sunos[34]*\ ++ | -hpux* | -unos* | -osf* | -luna* | -dgux* | -auroraux* | -solaris* \ ++ | -sym* | -kopensolaris* \ ++ | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \ ++ | -aos* | -aros* \ ++ | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \ ++ | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \ ++ | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \ ++ | -openbsd* | -solidbsd* \ ++ | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \ ++ | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \ ++ | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \ ++ | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \ ++ | -chorusos* | -chorusrdb* | -cegcc* \ ++ | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ ++ | -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \ ++ | -uxpv* | -beos* | -mpeix* | -udk* \ ++ | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \ ++ | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \ ++ | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \ ++ | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \ ++ | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \ ++ | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \ ++ | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es*) ++ # Remember, each alternative MUST END IN *, to match a version number. ++ ;; ++ -qnx*) ++ case $basic_machine in ++ x86-* | i*86-*) ++ ;; ++ *) ++ os=-nto$os ++ ;; ++ esac ++ ;; ++ -nto-qnx*) ++ ;; ++ -nto*) ++ os=`echo $os | sed -e 's|nto|nto-qnx|'` ++ ;; ++ -sim | -es1800* | -hms* | -xray | -os68k* | -none* | -v88r* \ ++ | -windows* | -osx | -abug | -netware* | -os9* | -beos* | -haiku* \ ++ | -macos* | -mpw* | -magic* | -mmixware* | -mon960* | -lnews*) ++ ;; ++ -mac*) ++ os=`echo $os | sed -e 's|mac|macos|'` ++ ;; ++ -linux-dietlibc) ++ os=-linux-dietlibc ++ ;; ++ -linux*) ++ os=`echo $os | sed -e 's|linux|linux-gnu|'` ++ ;; ++ -sunos5*) ++ os=`echo $os | sed -e 's|sunos5|solaris2|'` ++ ;; ++ -sunos6*) ++ os=`echo $os | sed -e 's|sunos6|solaris3|'` ++ ;; ++ -opened*) ++ os=-openedition ++ ;; ++ -os400*) ++ os=-os400 ++ ;; ++ -wince*) ++ os=-wince ++ ;; ++ -osfrose*) ++ os=-osfrose ++ ;; ++ -osf*) ++ os=-osf ++ ;; ++ -utek*) ++ os=-bsd ++ ;; ++ -dynix*) ++ os=-bsd ++ ;; ++ -acis*) ++ os=-aos ++ ;; ++ -atheos*) ++ os=-atheos ++ ;; ++ -syllable*) ++ os=-syllable ++ ;; ++ -386bsd) ++ os=-bsd ++ ;; ++ -ctix* | -uts*) ++ os=-sysv ++ ;; ++ -nova*) ++ os=-rtmk-nova ++ ;; ++ -ns2 ) ++ os=-nextstep2 ++ ;; ++ -nsk*) ++ os=-nsk ++ ;; ++ # Preserve the version number of sinix5. ++ -sinix5.*) ++ os=`echo $os | sed -e 's|sinix|sysv|'` ++ ;; ++ -sinix*) ++ os=-sysv4 ++ ;; ++ -tpf*) ++ os=-tpf ++ ;; ++ -triton*) ++ os=-sysv3 ++ ;; ++ -oss*) ++ os=-sysv3 ++ ;; ++ -svr4) ++ os=-sysv4 ++ ;; ++ -svr3) ++ os=-sysv3 ++ ;; ++ -sysvr4) ++ os=-sysv4 ++ ;; ++ # This must come after -sysvr4. ++ -sysv*) ++ ;; ++ -ose*) ++ os=-ose ++ ;; ++ -es1800*) ++ os=-ose ++ ;; ++ -xenix) ++ os=-xenix ++ ;; ++ -*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*) ++ os=-mint ++ ;; ++ -aros*) ++ os=-aros ++ ;; ++ -kaos*) ++ os=-kaos ++ ;; ++ -zvmoe) ++ os=-zvmoe ++ ;; ++ -dicos*) ++ os=-dicos ++ ;; ++ -none) ++ ;; ++ *) ++ # Get rid of the `-' at the beginning of $os. ++ os=`echo $os | sed 's/[^-]*-//'` ++ echo Invalid configuration \`$1\': system \`$os\' not recognized 1>&2 ++ exit 1 ++ ;; ++esac ++else ++ ++# Here we handle the default operating systems that come with various machines. ++# The value should be what the vendor currently ships out the door with their ++# machine or put another way, the most popular os provided with the machine. ++ ++# Note that if you're going to try to match "-MANUFACTURER" here (say, ++# "-sun"), then you have to tell the case statement up towards the top ++# that MANUFACTURER isn't an operating system. Otherwise, code above ++# will signal an error saying that MANUFACTURER isn't an operating ++# system, and we'll never get to this point. ++ ++case $basic_machine in ++ score-*) ++ os=-elf ++ ;; ++ spu-*) ++ os=-elf ++ ;; ++ *-acorn) ++ os=-riscix1.2 ++ ;; ++ arm*-rebel) ++ os=-linux ++ ;; ++ arm*-semi) ++ os=-aout ++ ;; ++ c4x-* | tic4x-*) ++ os=-coff ++ ;; ++ # This must come before the *-dec entry. ++ pdp10-*) ++ os=-tops20 ++ ;; ++ pdp11-*) ++ os=-none ++ ;; ++ *-dec | vax-*) ++ os=-ultrix4.2 ++ ;; ++ m68*-apollo) ++ os=-domain ++ ;; ++ i386-sun) ++ os=-sunos4.0.2 ++ ;; ++ m68000-sun) ++ os=-sunos3 ++ # This also exists in the configure program, but was not the ++ # default. ++ # os=-sunos4 ++ ;; ++ m68*-cisco) ++ os=-aout ++ ;; ++ mep-*) ++ os=-elf ++ ;; ++ mips*-cisco) ++ os=-elf ++ ;; ++ mips*-*) ++ os=-elf ++ ;; ++ or32-*) ++ os=-coff ++ ;; ++ *-tti) # must be before sparc entry or we get the wrong os. ++ os=-sysv3 ++ ;; ++ sparc-* | *-sun) ++ os=-sunos4.1.1 ++ ;; ++ *-be) ++ os=-beos ++ ;; ++ *-haiku) ++ os=-haiku ++ ;; ++ *-ibm) ++ os=-aix ++ ;; ++ *-knuth) ++ os=-mmixware ++ ;; ++ *-wec) ++ os=-proelf ++ ;; ++ *-winbond) ++ os=-proelf ++ ;; ++ *-oki) ++ os=-proelf ++ ;; ++ *-hp) ++ os=-hpux ++ ;; ++ *-hitachi) ++ os=-hiux ++ ;; ++ i860-* | *-att | *-ncr | *-altos | *-motorola | *-convergent) ++ os=-sysv ++ ;; ++ *-cbm) ++ os=-amigaos ++ ;; ++ *-dg) ++ os=-dgux ++ ;; ++ *-dolphin) ++ os=-sysv3 ++ ;; ++ m68k-ccur) ++ os=-rtu ++ ;; ++ m88k-omron*) ++ os=-luna ++ ;; ++ *-next ) ++ os=-nextstep ++ ;; ++ *-sequent) ++ os=-ptx ++ ;; ++ *-crds) ++ os=-unos ++ ;; ++ *-ns) ++ os=-genix ++ ;; ++ i370-*) ++ os=-mvs ++ ;; ++ *-next) ++ os=-nextstep3 ++ ;; ++ *-gould) ++ os=-sysv ++ ;; ++ *-highlevel) ++ os=-bsd ++ ;; ++ *-encore) ++ os=-bsd ++ ;; ++ *-sgi) ++ os=-irix ++ ;; ++ *-siemens) ++ os=-sysv4 ++ ;; ++ *-masscomp) ++ os=-rtu ++ ;; ++ f30[01]-fujitsu | f700-fujitsu) ++ os=-uxpv ++ ;; ++ *-rom68k) ++ os=-coff ++ ;; ++ *-*bug) ++ os=-coff ++ ;; ++ *-apple) ++ os=-macos ++ ;; ++ *-atari*) ++ os=-mint ++ ;; ++ *) ++ os=-none ++ ;; ++esac ++fi ++ ++# Here we handle the case where we know the os, and the CPU type, but not the ++# manufacturer. We pick the logical manufacturer. ++vendor=unknown ++case $basic_machine in ++ *-unknown) ++ case $os in ++ -riscix*) ++ vendor=acorn ++ ;; ++ -sunos*) ++ vendor=sun ++ ;; ++ -cnk*|-aix*) ++ vendor=ibm ++ ;; ++ -beos*) ++ vendor=be ++ ;; ++ -hpux*) ++ vendor=hp ++ ;; ++ -mpeix*) ++ vendor=hp ++ ;; ++ -hiux*) ++ vendor=hitachi ++ ;; ++ -unos*) ++ vendor=crds ++ ;; ++ -dgux*) ++ vendor=dg ++ ;; ++ -luna*) ++ vendor=omron ++ ;; ++ -genix*) ++ vendor=ns ++ ;; ++ -mvs* | -opened*) ++ vendor=ibm ++ ;; ++ -os400*) ++ vendor=ibm ++ ;; ++ -ptx*) ++ vendor=sequent ++ ;; ++ -tpf*) ++ vendor=ibm ++ ;; ++ -vxsim* | -vxworks* | -windiss*) ++ vendor=wrs ++ ;; ++ -aux*) ++ vendor=apple ++ ;; ++ -hms*) ++ vendor=hitachi ++ ;; ++ -mpw* | -macos*) ++ vendor=apple ++ ;; ++ -*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*) ++ vendor=atari ++ ;; ++ -vos*) ++ vendor=stratus ++ ;; ++ esac ++ basic_machine=`echo $basic_machine | sed "s/unknown/$vendor/"` ++ ;; ++esac ++ ++echo $basic_machine$os ++exit ++ ++# Local variables: ++# eval: (add-hook 'write-file-hooks 'time-stamp) ++# time-stamp-start: "timestamp='" ++# time-stamp-format: "%:y-%02m-%02d" ++# time-stamp-end: "'" ++# End: +diff --git a/common/video/iso-mpeg4/depcomp b/common/video/iso-mpeg4/depcomp +deleted file mode 120000 +index 9d2d67e..0000000 +--- a/common/video/iso-mpeg4/depcomp ++++ /dev/null +@@ -1 +0,0 @@ +-/usr/share/automake-1.6/depcomp +\ No newline at end of file +diff --git a/common/video/iso-mpeg4/depcomp b/common/video/iso-mpeg4/depcomp +new file mode 100755 +index 0000000..df8eea7 +--- /dev/null ++++ b/common/video/iso-mpeg4/depcomp +@@ -0,0 +1,630 @@ ++#! /bin/sh ++# depcomp - compile a program generating dependencies as side-effects ++ ++scriptversion=2009-04-28.21; # UTC ++ ++# Copyright (C) 1999, 2000, 2003, 2004, 2005, 2006, 2007, 2009 Free ++# Software Foundation, Inc. ++ ++# This program is free software; you can redistribute it and/or modify ++# it under the terms of the GNU General Public License as published by ++# the Free Software Foundation; either version 2, or (at your option) ++# any later version. ++ ++# This program is distributed in the hope that it will be useful, ++# but WITHOUT ANY WARRANTY; without even the implied warranty of ++# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++# GNU General Public License for more details. ++ ++# You should have received a copy of the GNU General Public License ++# along with this program. If not, see . ++ ++# As a special exception to the GNU General Public License, if you ++# distribute this file as part of a program that contains a ++# configuration script generated by Autoconf, you may include it under ++# the same distribution terms that you use for the rest of that program. ++ ++# Originally written by Alexandre Oliva . ++ ++case $1 in ++ '') ++ echo "$0: No command. Try \`$0 --help' for more information." 1>&2 ++ exit 1; ++ ;; ++ -h | --h*) ++ cat <<\EOF ++Usage: depcomp [--help] [--version] PROGRAM [ARGS] ++ ++Run PROGRAMS ARGS to compile a file, generating dependencies ++as side-effects. ++ ++Environment variables: ++ depmode Dependency tracking mode. ++ source Source file read by `PROGRAMS ARGS'. ++ object Object file output by `PROGRAMS ARGS'. ++ DEPDIR directory where to store dependencies. ++ depfile Dependency file to output. ++ tmpdepfile Temporary file to use when outputing dependencies. ++ libtool Whether libtool is used (yes/no). ++ ++Report bugs to . ++EOF ++ exit $? ++ ;; ++ -v | --v*) ++ echo "depcomp $scriptversion" ++ exit $? ++ ;; ++esac ++ ++if test -z "$depmode" || test -z "$source" || test -z "$object"; then ++ echo "depcomp: Variables source, object and depmode must be set" 1>&2 ++ exit 1 ++fi ++ ++# Dependencies for sub/bar.o or sub/bar.obj go into sub/.deps/bar.Po. ++depfile=${depfile-`echo "$object" | ++ sed 's|[^\\/]*$|'${DEPDIR-.deps}'/&|;s|\.\([^.]*\)$|.P\1|;s|Pobj$|Po|'`} ++tmpdepfile=${tmpdepfile-`echo "$depfile" | sed 's/\.\([^.]*\)$/.T\1/'`} ++ ++rm -f "$tmpdepfile" ++ ++# Some modes work just like other modes, but use different flags. We ++# parameterize here, but still list the modes in the big case below, ++# to make depend.m4 easier to write. Note that we *cannot* use a case ++# here, because this file can only contain one case statement. ++if test "$depmode" = hp; then ++ # HP compiler uses -M and no extra arg. ++ gccflag=-M ++ depmode=gcc ++fi ++ ++if test "$depmode" = dashXmstdout; then ++ # This is just like dashmstdout with a different argument. ++ dashmflag=-xM ++ depmode=dashmstdout ++fi ++ ++cygpath_u="cygpath -u -f -" ++if test "$depmode" = msvcmsys; then ++ # This is just like msvisualcpp but w/o cygpath translation. ++ # Just convert the backslash-escaped backslashes to single forward ++ # slashes to satisfy depend.m4 ++ cygpath_u="sed s,\\\\\\\\,/,g" ++ depmode=msvisualcpp ++fi ++ ++case "$depmode" in ++gcc3) ++## gcc 3 implements dependency tracking that does exactly what ++## we want. Yay! Note: for some reason libtool 1.4 doesn't like ++## it if -MD -MP comes after the -MF stuff. Hmm. ++## Unfortunately, FreeBSD c89 acceptance of flags depends upon ++## the command line argument order; so add the flags where they ++## appear in depend2.am. Note that the slowdown incurred here ++## affects only configure: in makefiles, %FASTDEP% shortcuts this. ++ for arg ++ do ++ case $arg in ++ -c) set fnord "$@" -MT "$object" -MD -MP -MF "$tmpdepfile" "$arg" ;; ++ *) set fnord "$@" "$arg" ;; ++ esac ++ shift # fnord ++ shift # $arg ++ done ++ "$@" ++ stat=$? ++ if test $stat -eq 0; then : ++ else ++ rm -f "$tmpdepfile" ++ exit $stat ++ fi ++ mv "$tmpdepfile" "$depfile" ++ ;; ++ ++gcc) ++## There are various ways to get dependency output from gcc. Here's ++## why we pick this rather obscure method: ++## - Don't want to use -MD because we'd like the dependencies to end ++## up in a subdir. Having to rename by hand is ugly. ++## (We might end up doing this anyway to support other compilers.) ++## - The DEPENDENCIES_OUTPUT environment variable makes gcc act like ++## -MM, not -M (despite what the docs say). ++## - Using -M directly means running the compiler twice (even worse ++## than renaming). ++ if test -z "$gccflag"; then ++ gccflag=-MD, ++ fi ++ "$@" -Wp,"$gccflag$tmpdepfile" ++ stat=$? ++ if test $stat -eq 0; then : ++ else ++ rm -f "$tmpdepfile" ++ exit $stat ++ fi ++ rm -f "$depfile" ++ echo "$object : \\" > "$depfile" ++ alpha=ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz ++## The second -e expression handles DOS-style file names with drive letters. ++ sed -e 's/^[^:]*: / /' \ ++ -e 's/^['$alpha']:\/[^:]*: / /' < "$tmpdepfile" >> "$depfile" ++## This next piece of magic avoids the `deleted header file' problem. ++## The problem is that when a header file which appears in a .P file ++## is deleted, the dependency causes make to die (because there is ++## typically no way to rebuild the header). We avoid this by adding ++## dummy dependencies for each header file. Too bad gcc doesn't do ++## this for us directly. ++ tr ' ' ' ++' < "$tmpdepfile" | ++## Some versions of gcc put a space before the `:'. On the theory ++## that the space means something, we add a space to the output as ++## well. ++## Some versions of the HPUX 10.20 sed can't process this invocation ++## correctly. Breaking it into two sed invocations is a workaround. ++ sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile" ++ rm -f "$tmpdepfile" ++ ;; ++ ++hp) ++ # This case exists only to let depend.m4 do its work. It works by ++ # looking at the text of this script. This case will never be run, ++ # since it is checked for above. ++ exit 1 ++ ;; ++ ++sgi) ++ if test "$libtool" = yes; then ++ "$@" "-Wp,-MDupdate,$tmpdepfile" ++ else ++ "$@" -MDupdate "$tmpdepfile" ++ fi ++ stat=$? ++ if test $stat -eq 0; then : ++ else ++ rm -f "$tmpdepfile" ++ exit $stat ++ fi ++ rm -f "$depfile" ++ ++ if test -f "$tmpdepfile"; then # yes, the sourcefile depend on other files ++ echo "$object : \\" > "$depfile" ++ ++ # Clip off the initial element (the dependent). Don't try to be ++ # clever and replace this with sed code, as IRIX sed won't handle ++ # lines with more than a fixed number of characters (4096 in ++ # IRIX 6.2 sed, 8192 in IRIX 6.5). We also remove comment lines; ++ # the IRIX cc adds comments like `#:fec' to the end of the ++ # dependency line. ++ tr ' ' ' ++' < "$tmpdepfile" \ ++ | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' | \ ++ tr ' ++' ' ' >> "$depfile" ++ echo >> "$depfile" ++ ++ # The second pass generates a dummy entry for each header file. ++ tr ' ' ' ++' < "$tmpdepfile" \ ++ | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' -e 's/$/:/' \ ++ >> "$depfile" ++ else ++ # The sourcefile does not contain any dependencies, so just ++ # store a dummy comment line, to avoid errors with the Makefile ++ # "include basename.Plo" scheme. ++ echo "#dummy" > "$depfile" ++ fi ++ rm -f "$tmpdepfile" ++ ;; ++ ++aix) ++ # The C for AIX Compiler uses -M and outputs the dependencies ++ # in a .u file. In older versions, this file always lives in the ++ # current directory. Also, the AIX compiler puts `$object:' at the ++ # start of each line; $object doesn't have directory information. ++ # Version 6 uses the directory in both cases. ++ dir=`echo "$object" | sed -e 's|/[^/]*$|/|'` ++ test "x$dir" = "x$object" && dir= ++ base=`echo "$object" | sed -e 's|^.*/||' -e 's/\.o$//' -e 's/\.lo$//'` ++ if test "$libtool" = yes; then ++ tmpdepfile1=$dir$base.u ++ tmpdepfile2=$base.u ++ tmpdepfile3=$dir.libs/$base.u ++ "$@" -Wc,-M ++ else ++ tmpdepfile1=$dir$base.u ++ tmpdepfile2=$dir$base.u ++ tmpdepfile3=$dir$base.u ++ "$@" -M ++ fi ++ stat=$? ++ ++ if test $stat -eq 0; then : ++ else ++ rm -f "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" ++ exit $stat ++ fi ++ ++ for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" ++ do ++ test -f "$tmpdepfile" && break ++ done ++ if test -f "$tmpdepfile"; then @@ Diff output truncated at 100000 characters. @@ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From hson at users.sourceforge.net Mon Jan 4 17:27:16 2010 From: hson at users.sourceforge.net (hson at users.sourceforge.net) Date: Mon, 04 Jan 2010 16:27:16 +0000 Subject: [csw-devel] SF.net SVN: gar:[7861] csw/mgar/pkg/ilmbase/trunk/Makefile Message-ID: Revision: 7861 http://gar.svn.sourceforge.net/gar/?rev=7861&view=rev Author: hson Date: 2010-01-04 16:27:14 +0000 (Mon, 04 Jan 2010) Log Message: ----------- ilmbase: Minor comiler flag fixes to try to get the tests working on 64-bit Modified Paths: -------------- csw/mgar/pkg/ilmbase/trunk/Makefile Modified: csw/mgar/pkg/ilmbase/trunk/Makefile =================================================================== --- csw/mgar/pkg/ilmbase/trunk/Makefile 2010-01-04 14:59:02 UTC (rev 7860) +++ csw/mgar/pkg/ilmbase/trunk/Makefile 2010-01-04 16:27:14 UTC (rev 7861) @@ -53,12 +53,17 @@ PATCHFILES = ImathMath.patch PATCHFILES += ltmain.sh.patch -LIBS += -lCstd -lCrun -lc -lm -export LIBS +EXTRA_LD_FLAGS += -lCstd -lCrun -lc -lm +EXTRA_CXX_FLAGS_isa-i386 = +EXTRA_CXX_FLAGS_isa-sparcv8 = +EXTRA_CXX_FLAGS_isa-amd64 = -KPIC +EXTRA_CXX_FLAGS_isa-sparcv9 = -KPIC +EXTRA_CXX_FLAGS += $(EXTRA_LD_FLAGS_$(MODULATION)) BUILD64 = 1 # Check fails if library isn't installed /opt/csw/lib and until a 64-bit +# lib is installed test has to be disabled #TEST_TARGET = check TEST_TARGET = @@ -66,6 +71,9 @@ include gar/category.mk +# +# Test to see if rebuilding libtool would fix 64-bit problem... +# #pre-configure-modulated: # @echo " ==> Regenerating build tools..." # @(cd $(WORKSRC) ; \ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From hson at users.sourceforge.net Mon Jan 4 20:05:04 2010 From: hson at users.sourceforge.net (hson at users.sourceforge.net) Date: Mon, 04 Jan 2010 19:05:04 +0000 Subject: [csw-devel] SF.net SVN: gar:[7862] csw/mgar/pkg/openexr/trunk Message-ID: Revision: 7862 http://gar.svn.sourceforge.net/gar/?rev=7862&view=rev Author: hson Date: 2010-01-04 19:01:36 +0000 (Mon, 04 Jan 2010) Log Message: ----------- Split package into two Prepare for 64-bit build pending ilmbase install Modified Paths: -------------- csw/mgar/pkg/openexr/trunk/Makefile csw/mgar/pkg/openexr/trunk/checksums Added Paths: ----------- csw/mgar/pkg/openexr/trunk/files/ltmain.sh.patch csw/mgar/pkg/openexr/trunk/files/makePreview.cpp.patch Modified: csw/mgar/pkg/openexr/trunk/Makefile =================================================================== --- csw/mgar/pkg/openexr/trunk/Makefile 2010-01-04 16:27:14 UTC (rev 7861) +++ csw/mgar/pkg/openexr/trunk/Makefile 2010-01-04 19:01:36 UTC (rev 7862) @@ -22,27 +22,52 @@ DISTFILES += libIlmImf.so.2.0.2.i DISTFILES += libIlmImf.so.2.0.2.s +PACKAGES = CSWopenexr CSWopenexrdevel +CATALOGNAME_CSWopenexr = openexr +CATALOGNAME_CSWopenexrdevel = openexr_devel + +SPKG_DESC_CSWopenexr += High dynamic-range (HDR) image file format developed by Industrial Light & Magic +SPKG_DESC_CSWopenexrdevel += High dynamic-range (HDR) image file format developed by Industrial Light & Magic - developer package + +PKGFILES_CSWopenexrdevel = $(PKGFILES_DEVEL) + +REQUIRED_PKGS_CSWopenexr += CSWilmbase CSWzlib +REQUIRED_PKGS_CSWopenexrdevel += CSWopenexr + SPKG_SOURCEURL = http://www.openexr.com + LICENSE = LICENSE -REQUIRED_PKGS += CSWilmbase CSWzlib - -# We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz -CONFIGURE_ARGS = $(DIRPATHS) +PATCHFILES += ltmain.sh.patch +PATCHFILES += makePreview.cpp.patch -LIBS += -lCstd -lCrun -lc -lm -export LIBS +EXTRA_LD_FLAGS += -lCstd -lCrun -lc -lm +EXTRA_CXX_FLAGS_isa-i386 = +EXTRA_CXX_FLAGS_isa-sparcv8 = +EXTRA_CXX_FLAGS_isa-amd64 = -KPIC +EXTRA_CXX_FLAGS_isa-sparcv9 = -KPIC +EXTRA_CXX_FLAGS += $(EXTRA_LD_FLAGS_$(MODULATION)) -TEST_SCRIPTS = +BUILD64 = 1 +# Check fails if library isn't installed /opt/csw/lib and until a 64-bit +# lib is installed test has to be disabled +TEST_TARGET = check +#TEST_TARGET = + +STRIP_LIBTOOL = 1 + +CONFIGURE_ARGS = $(DIRPATHS) + include gar/category.mk +# Until kdeoffice_gcc is rebuilt using new openexr/ilmbase post-install-isa-sparcv8: @cp $(FILEDIR)/libIlmImf.so.2.0.2.s $(INSTALLISADIR)/opt/csw/lib/libIlmImf.so.2.0.2 - @ln -s libIlmImf.so.2.0.2 $(INSTALLISADIR)/opt/csw/lib/libIlmImf.so.2 + @( if [ ! -r $(INSTALLISADIR)$(libdir)/libIlmImf.so.2 ] ; then ln -s libIlmImf.so.2.0.2 $(INSTALLISADIR)/opt/csw/lib/libIlmImf.so.2 ; fi ) post-install-isa-i386: @cp $(FILEDIR)/libIlmImf.so.2.0.2.i $(INSTALLISADIR)/opt/csw/lib/libIlmImf.so.2.0.2 - @ln -s libIlmImf.so.2.0.2 $(INSTALLISADIR)/opt/csw/lib/libIlmImf.so.2 + @( if [ ! -r $(INSTALLISADIR)$(libdir)/libIlmImf.so.2 ] ; then ln -s libIlmImf.so.2.0.2 $(INSTALLISADIR)/opt/csw/lib/libIlmImf.so.2 ; fi ) Modified: csw/mgar/pkg/openexr/trunk/checksums =================================================================== --- csw/mgar/pkg/openexr/trunk/checksums 2010-01-04 16:27:14 UTC (rev 7861) +++ csw/mgar/pkg/openexr/trunk/checksums 2010-01-04 19:01:36 UTC (rev 7862) @@ -1,3 +1,5 @@ -11951f164f9c872b183df75e66de145a download/openexr-1.6.1.tar.gz -0d08a0c9f251d385b5d3c86ac7da84e5 download/libIlmImf.so.2.0.2.i -32dec457461b5d371eb2dd4a2e5d2231 download/libIlmImf.so.2.0.2.s +0d08a0c9f251d385b5d3c86ac7da84e5 libIlmImf.so.2.0.2.i +32dec457461b5d371eb2dd4a2e5d2231 libIlmImf.so.2.0.2.s +aab7ae39a7fc1317192aa5663e0ba3d7 ltmain.sh.patch +462c6cb9708c254261fd1515c1294336 makePreview.cpp.patch +11951f164f9c872b183df75e66de145a openexr-1.6.1.tar.gz Added: csw/mgar/pkg/openexr/trunk/files/ltmain.sh.patch =================================================================== --- csw/mgar/pkg/openexr/trunk/files/ltmain.sh.patch (rev 0) +++ csw/mgar/pkg/openexr/trunk/files/ltmain.sh.patch 2010-01-04 19:01:36 UTC (rev 7862) @@ -0,0 +1,43 @@ +diff -Nru openexr-1.6.1.orig/ltmain.sh openexr-1.6.1/ltmain.sh +--- openexr-1.6.1.orig/ltmain.sh 2004-05-24 20:14:34.000000000 +0200 ++++ openexr-1.6.1/ltmain.sh 2010-01-04 18:01:46.879978336 +0100 +@@ -1382,7 +1382,7 @@ + # but this is not reliable with gcc because gcc may use -mfoo to + # select a different linker, different libraries, etc, while + # -Wl,-mfoo simply passes -mfoo to the linker. +- -m*) ++ -m*|-xarch=*) + # Unknown arguments in both finalize_command and compile_command need + # to be aesthetically quoted because they are evaled later. + arg=`$echo "X$arg" | $Xsed -e "$sed_quote_subst"` +@@ -1393,9 +1393,10 @@ + esac + compile_command="$compile_command $arg" + finalize_command="$finalize_command $arg" +- if test "$with_gcc" = "yes" ; then ++# 64-bit fix for CC ++# if test "$with_gcc" = "yes" ; then + compiler_flags="$compiler_flags $arg" +- fi ++# fi + continue + ;; + +@@ -3890,7 +3891,7 @@ + save_ifs="$IFS"; IFS='~' + for cmd in $cmds; do + IFS="$save_ifs" +- eval cmd=\"$cmd\" ++ eval cmd=\"$cmd -norunpath\" + $show "$cmd" + $run eval "$cmd" || exit $? + done +@@ -4512,7 +4513,7 @@ + $echo "$modename: \`$output' will be relinked during installation" 1>&2 + else + if test "$fast_install" != no; then +- link_command="$finalize_var$compile_command$finalize_rpath" ++ link_command="$finalize_var$compile_command -norunpath" + if test "$fast_install" = yes; then + relink_command=`$echo "X$compile_var$compile_command$compile_rpath" | $Xsed -e 's%@OUTPUT@%\$progdir/\$file%g'` + else Added: csw/mgar/pkg/openexr/trunk/files/makePreview.cpp.patch =================================================================== --- csw/mgar/pkg/openexr/trunk/files/makePreview.cpp.patch (rev 0) +++ csw/mgar/pkg/openexr/trunk/files/makePreview.cpp.patch 2010-01-04 19:01:36 UTC (rev 7862) @@ -0,0 +1,23 @@ +diff -Nru openexr-1.6.1.orig/exrmakepreview/makePreview.cpp openexr-1.6.1/exrmakepreview/makePreview.cpp +--- openexr-1.6.1.orig/exrmakepreview/makePreview.cpp 2006-06-06 07:58:20.000000000 +0200 ++++ openexr-1.6.1/exrmakepreview/makePreview.cpp 2010-01-04 17:58:55.457462356 +0100 +@@ -78,7 +78,8 @@ + // at 0.0, 0.0, and 5.0 respectively. + // + +- float x = max (0.f, h * m); ++ float x = max (0.f, (float)(h * m)); ++ + + if (x > 1) + x = 1 + knee (x - 1, 0.184874f); +@@ -132,7 +133,8 @@ + preview.r = gamma (pixel.r, m); + preview.g = gamma (pixel.g, m); + preview.b = gamma (pixel.b, m); +- preview.a = int (clamp (pixel.a * 255.f, 0.f, 255.f) + .5f); ++ preview.a = int (clamp ((double)(pixel.a * 255.f), (double)0.f, (double)255.f) + .5f); ++ + } + } + } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From hson at users.sourceforge.net Mon Jan 4 20:20:53 2010 From: hson at users.sourceforge.net (hson at users.sourceforge.net) Date: Mon, 04 Jan 2010 19:20:53 +0000 Subject: [csw-devel] SF.net SVN: gar:[7863] csw/mgar/pkg/evolution Message-ID: Revision: 7863 http://gar.svn.sourceforge.net/gar/?rev=7863&view=rev Author: hson Date: 2010-01-04 19:17:34 +0000 (Mon, 04 Jan 2010) Log Message: ----------- evolution: Add Makefile and more in preparation for upgrade to 2.28.2 Added Paths: ----------- csw/mgar/pkg/evolution/branches/ csw/mgar/pkg/evolution/tags/ csw/mgar/pkg/evolution/trunk/Makefile csw/mgar/pkg/evolution/trunk/checksums csw/mgar/pkg/evolution/trunk/files/ Property Changed: ---------------- csw/mgar/pkg/evolution/trunk/ Property changes on: csw/mgar/pkg/evolution/trunk ___________________________________________________________________ Added: svn:ignore + cookies download work Added: svn:externals + gar https://gar.svn.sf.net/svnroot/gar/csw/mgar/gar/v2 Added: csw/mgar/pkg/evolution/trunk/Makefile =================================================================== --- csw/mgar/pkg/evolution/trunk/Makefile (rev 0) +++ csw/mgar/pkg/evolution/trunk/Makefile 2010-01-04 19:17:34 UTC (rev 7863) @@ -0,0 +1,33 @@ +GARNAME = evolution +GARVERSION = 2.28.2 +CATEGORIES = gnome + +DESCRIPTION = GNOME mail client and PIM +define BLURB + Evolution provides integrated mail, addressbook and calendaring + functionality to users of the GNOME desktop +endef + +MASTER_SITES = $(GNOME_MIRROR) +DISTFILES = $(GARNAME)-$(GARVERSION).tar.bz2 +DISTNAME = $(GARNAME)-$(GARVERSION) + +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.bz2 + +SPKG_SOURCEURL = http://projects.gnome.org/evolution/ + +EXTRA_INC = $(prefix)/X11/include +EXTRA_LIB = $(prefix)/X11/lib +EXTRA_PKG_CONFIG_DIRS = $(prefix)/X11/lib + +BUILD64 = 1 + +STRIP_LIBTOOL = 1 + +CONFIGURE_ARGS = $(DIRPATHS) + +TEST_TARGET = check + +include gar/category.mk + +PATH := /opt/csw/gnu:$(PATH) Added: csw/mgar/pkg/evolution/trunk/checksums =================================================================== --- csw/mgar/pkg/evolution/trunk/checksums (rev 0) +++ csw/mgar/pkg/evolution/trunk/checksums 2010-01-04 19:17:34 UTC (rev 7863) @@ -0,0 +1 @@ +2af2e699cd8a46b8f7b9baec3184f685 evolution-2.28.2.tar.bz2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From hson at users.sourceforge.net Mon Jan 4 20:51:37 2010 From: hson at users.sourceforge.net (hson at users.sourceforge.net) Date: Mon, 04 Jan 2010 19:51:37 +0000 Subject: [csw-devel] SF.net SVN: gar:[7864] csw/mgar/pkg/evolution-ds Message-ID: Revision: 7864 http://gar.svn.sourceforge.net/gar/?rev=7864&view=rev Author: hson Date: 2010-01-04 19:51:27 +0000 (Mon, 04 Jan 2010) Log Message: ----------- Add Makefile and more in preparation for upgrade to 2.28.2 Added Paths: ----------- csw/mgar/pkg/evolution-ds/branches/ csw/mgar/pkg/evolution-ds/tags/ csw/mgar/pkg/evolution-ds/trunk/Makefile csw/mgar/pkg/evolution-ds/trunk/checksums csw/mgar/pkg/evolution-ds/trunk/files/ Property Changed: ---------------- csw/mgar/pkg/evolution-ds/trunk/ Property changes on: csw/mgar/pkg/evolution-ds/trunk ___________________________________________________________________ Added: svn:ignore + cookies download work Added: svn:externals + gar https://gar.svn.sf.net/svnroot/gar/csw/mgar/gar/v2 Added: csw/mgar/pkg/evolution-ds/trunk/Makefile =================================================================== --- csw/mgar/pkg/evolution-ds/trunk/Makefile (rev 0) +++ csw/mgar/pkg/evolution-ds/trunk/Makefile 2010-01-04 19:51:27 UTC (rev 7864) @@ -0,0 +1,53 @@ +GARNAME = evolution-data-server +GARVERSION = 2.28.2 +CATEGORIES = gnome + +DESCRIPTION = Evolution database backend server +define BLURB + The data server, called "Evolution Data Server" is responsible for + managing calendar and addressbook information. +endef + +MASTER_SITES = $(GNOME_MIRROR) +DISTFILES = $(GARNAME)-$(GARVERSION).tar.bz2 +DISTNAME = $(GARNAME)-$(GARVERSION) + +PACKAGES = CSWevolution-ds CSWevolution-ds-devel CSWevolution-ds-doc +CATALOGNAME_CSWevolution-ds = evolution_ds +CATALOGNAME_CSWevolution-ds-devel = evolution_ds_devel +CATALOGNAME_CSWevolution-ds-doc = evolution_ds_doc + +SPKG_DESC_CSWevolution-ds += Evolution database backend server +SPKG_DESC_CSWevolution-ds-devel += Evolution database backend server - developer package +SPKG_DESC_CSWevolution-ds-doc += Evolution database backend server - documentation + +REQUIRED_PKGS_CSWevolution-ds += +REQUIRED_PKGS_CSWevolution-ds += +REQUIRED_PKGS_CSWevolution-ds += +REQUIRED_PKGS_CSWevolution-dsdevel += CSWevolution +REQUIRED_PKGS_CSWevolution-dsdoc += CSWevolution + +PKGFILES_CSWevolution-dsdevel = $(PKGFILES_DEVEL) +PKGFILES_CSWevolution-dsdoc = $(sharedstatedir)/gtk-doc/.* + +ARCHALL_CSWevolution-dsdoc = 1 + +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.bz2 + +SPKG_SOURCEURL =http://projects.gnome.org/evolution + +EXTRA_INC = $(prefix)/X11/include +EXTRA_LIB = $(prefix)/X11/lib +EXTRA_PKG_CONFIG_DIRS = $(prefix)/X11/lib + +BUILD64 = 1 + +STRIP_LIBTOOL = 1 + +CONFIGURE_ARGS = $(DIRPATHS) + +TEST_TARGET = check + +include gar/category.mk + +PATH := /opt/csw/gnu:$(PATH) Added: csw/mgar/pkg/evolution-ds/trunk/checksums =================================================================== --- csw/mgar/pkg/evolution-ds/trunk/checksums (rev 0) +++ csw/mgar/pkg/evolution-ds/trunk/checksums 2010-01-04 19:51:27 UTC (rev 7864) @@ -0,0 +1 @@ +416248e60b1bec3f913a6857576cbcb0 evolution-data-server-2.28.2.tar.bz2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From hson at users.sourceforge.net Mon Jan 4 21:31:51 2010 From: hson at users.sourceforge.net (hson at users.sourceforge.net) Date: Mon, 04 Jan 2010 20:31:51 +0000 Subject: [csw-devel] SF.net SVN: gar:[7865] csw/mgar/pkg Message-ID: Revision: 7865 http://gar.svn.sourceforge.net/gar/?rev=7865&view=rev Author: hson Date: 2010-01-04 20:31:50 +0000 (Mon, 04 Jan 2010) Log Message: ----------- evolution-mapi: Initial commit Added Paths: ----------- csw/mgar/pkg/evolution-mapi/ csw/mgar/pkg/evolution-mapi/Makefile csw/mgar/pkg/evolution-mapi/branches/ csw/mgar/pkg/evolution-mapi/tags/ csw/mgar/pkg/evolution-mapi/trunk/ csw/mgar/pkg/evolution-mapi/trunk/Makefile csw/mgar/pkg/evolution-mapi/trunk/checksums csw/mgar/pkg/evolution-mapi/trunk/files/ Added: csw/mgar/pkg/evolution-mapi/Makefile =================================================================== --- csw/mgar/pkg/evolution-mapi/Makefile (rev 0) +++ csw/mgar/pkg/evolution-mapi/Makefile 2010-01-04 20:31:50 UTC (rev 7865) @@ -0,0 +1,15 @@ +# vim: ft=make ts=4 sw=4 noet + +default: + @echo "You are in the pkg/ directory." + +%: + $(MAKE) -C trunk $* + +paranoid-%: + $(MAKE) -C trunk $* || exit 2 + +export BUILDLOG ?= $(shell pwd)/buildlog.txt + +report-%: + $(MAKE) -C trunk $* || echo " *** make $* in $$i failed ***" >> $(BUILDLOG) Property changes on: csw/mgar/pkg/evolution-mapi/trunk ___________________________________________________________________ Added: svn:ignore + cookies download work Added: svn:externals + gar https://gar.svn.sf.net/svnroot/gar/csw/mgar/gar/v2 Added: csw/mgar/pkg/evolution-mapi/trunk/Makefile =================================================================== --- csw/mgar/pkg/evolution-mapi/trunk/Makefile (rev 0) +++ csw/mgar/pkg/evolution-mapi/trunk/Makefile 2010-01-04 20:31:50 UTC (rev 7865) @@ -0,0 +1,53 @@ +GARNAME = evolution-mapi +GARVERSION = 0.28.2 +CATEGORIES = gnome + +DESCRIPTION = Evolution extension for MS Exchange 2007 servers +define BLURB + A provider for Evolution that can connect to Exchange 2007 servers and + also to Exchange 2003, 2000 and 5.5. +endef + +MASTER_SITES = $(GNOME_MIRROR) +DISTFILES = $(GARNAME)-$(GARVERSION).tar.bz2 +DISTNAME = $(GARNAME)-$(GARVERSION) + +PACKAGES = CSWevolutionmapi CSWevolutionmapidev CSWevolutionmapidoc +CATALOGNAME_CSWevolutionmapi = evolution_mapi +CATALOGNAME_CSWevolutionmapidev = evolution_mapi_devel +CATALOGNAME_CSWevolutionmapidoc = evolution_mapi_doc + +SPKG_DESC_CSWevolutionmapi += Evolution extension for MS Exchange 2007 servers +SPKG_DESC_CSWevolutionmapidevel += Evolution extension for MS Exchange 2007 servers - developer package +SPKG_DESC_CSWevolutionmapidoc += Evolution extension for MS Exchange 2007 servers - documentation + +REQUIRED_PKGS_CSWevolutionmapi += +REQUIRED_PKGS_CSWevolutionmapi += +REQUIRED_PKGS_CSWevolutionmapi += +REQUIRED_PKGS_CSWevolutionmapidev += CSWevolutionmapi +REQUIRED_PKGS_CSWevolutionmapidoc += CSWevolutionmapi + +PKGFILES_CSWevolutionmapidev = $(PKGFILES_DEVEL) +PKGFILES_CSWevolutionmapidoc = $(sharedstatedir)/gtk-doc/.* + +ARCHALL_CSWevolutionmapidoc = 1 + +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.bz2 + +SPKG_SOURCEURL = http://projects.gnome.org/evolution + +EXTRA_INC = $(prefix)/X11/include +EXTRA_LIB = $(prefix)/X11/lib +EXTRA_PKG_CONFIG_DIRS = $(prefix)/X11/lib + +BUILD64 = 1 + +STRIP_LIBTOOL = 1 + +CONFIGURE_ARGS = $(DIRPATHS) + +TEST_TARGET = check + +include gar/category.mk + +PATH := /opt/csw/gnu:$(PATH) Added: csw/mgar/pkg/evolution-mapi/trunk/checksums =================================================================== --- csw/mgar/pkg/evolution-mapi/trunk/checksums (rev 0) +++ csw/mgar/pkg/evolution-mapi/trunk/checksums 2010-01-04 20:31:50 UTC (rev 7865) @@ -0,0 +1 @@ +6f1c61b28778983806d39214f717810f evolution-mapi-0.28.2.tar.bz2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Mon Jan 4 22:23:44 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Mon, 04 Jan 2010 21:23:44 +0000 Subject: [csw-devel] SF.net SVN: gar:[7866] csw/mgar/pkg/colordiff/trunk/Makefile Message-ID: Revision: 7866 http://gar.svn.sourceforge.net/gar/?rev=7866&view=rev Author: dmichelsen Date: 2010-01-04 21:23:44 +0000 (Mon, 04 Jan 2010) Log Message: ----------- colordiff: Fix docdir Modified Paths: -------------- csw/mgar/pkg/colordiff/trunk/Makefile Modified: csw/mgar/pkg/colordiff/trunk/Makefile =================================================================== --- csw/mgar/pkg/colordiff/trunk/Makefile 2010-01-04 20:31:50 UTC (rev 7865) +++ csw/mgar/pkg/colordiff/trunk/Makefile 2010-01-04 21:23:44 UTC (rev 7866) @@ -31,8 +31,8 @@ include gar/category.mk install-custom: - ginstall -d $(DESTDIR)$(docdir) - (cd $(WORKSRC) && ginstall BUGS CHANGES INSTALL README TODO $(DESTDIR)$(docdir)) + ginstall -d $(DESTDIR)$(docdir)/colordiff + (cd $(WORKSRC) && ginstall BUGS CHANGES INSTALL README TODO $(DESTDIR)$(docdir)/colordiff) ginstall -d $(DESTDIR)$(mandir)/man1 (cd $(WORKSRC) && ginstall cdiff.1 colordiff.1 $(DESTDIR)$(mandir)/man1) ginstall -d $(DESTDIR)$(sysconfdir) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Mon Jan 4 22:40:39 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Mon, 04 Jan 2010 21:40:39 +0000 Subject: [csw-devel] SF.net SVN: gar:[7867] csw/mgar/pkg/binutils/trunk Message-ID: Revision: 7867 http://gar.svn.sourceforge.net/gar/?rev=7867&view=rev Author: dmichelsen Date: 2010-01-04 21:40:39 +0000 (Mon, 04 Jan 2010) Log Message: ----------- binutils: Update to 2.20, add patches Modified Paths: -------------- csw/mgar/pkg/binutils/trunk/Makefile csw/mgar/pkg/binutils/trunk/checksums Added Paths: ----------- csw/mgar/pkg/binutils/trunk/files/0001-Remove-gcc-specific-warning-no-error.patch csw/mgar/pkg/binutils/trunk/files/0002-Use-func-instead-of-FUNCTION.patch Modified: csw/mgar/pkg/binutils/trunk/Makefile =================================================================== --- csw/mgar/pkg/binutils/trunk/Makefile 2010-01-04 21:23:44 UTC (rev 7866) +++ csw/mgar/pkg/binutils/trunk/Makefile 2010-01-04 21:40:39 UTC (rev 7867) @@ -1,5 +1,5 @@ GARNAME = binutils -GARVERSION = 2.19.1 +GARVERSION = 2.20 CATEGORIES = utils DESCRIPTION = GNU binary utilities: gas, gld, gprof, and others @@ -7,8 +7,13 @@ endef MASTER_SITES = $(GNU_MIRROR) -DISTFILES = $(GARNAME)-$(GARVERSION).tar.bz2 +DISTFILES = $(GARNAME)-$(GARVERSION).tar.bz2 +# These have been reported as +# +PATCHFILES = 0001-Remove-gcc-specific-warning-no-error.patch +PATCHFILES += 0002-Use-func-instead-of-FUNCTION.patch + REQUIRED_PKGS = CSWzlib CSWiconv CSWggettextrt # We define upstream file regex so we can be notifed of new upstream software release @@ -16,7 +21,16 @@ BUILD64 = 1 CONFIGURE_ARGS = $(DIRPATHS) +CONFIGURE_ARGS += --program-prefix=g +ifeq ($(GARCH),i386) +CONFIGURE_ARGS += --enable-targets=i386-pc-solaris2.10,i686-pc-mingw32 +endif + TEST_TARGET = check +# Do not run tests until this is fixed: +# +SKIPTEST ?= 1 + include gar/category.mk Modified: csw/mgar/pkg/binutils/trunk/checksums =================================================================== --- csw/mgar/pkg/binutils/trunk/checksums 2010-01-04 21:23:44 UTC (rev 7866) +++ csw/mgar/pkg/binutils/trunk/checksums 2010-01-04 21:40:39 UTC (rev 7867) @@ -1 +1,3 @@ -09a8c5821a2dfdbb20665bc0bd680791 download/binutils-2.19.1.tar.bz2 +da13e88df454002f329e47f26cc51018 0001-Remove-gcc-specific-warning-no-error.patch +52296e0f180d98a9857913a5d9050907 0002-Use-func-instead-of-FUNCTION.patch +ee2d3e996e9a2d669808713360fa96f8 binutils-2.20.tar.bz2 Added: csw/mgar/pkg/binutils/trunk/files/0001-Remove-gcc-specific-warning-no-error.patch =================================================================== --- csw/mgar/pkg/binutils/trunk/files/0001-Remove-gcc-specific-warning-no-error.patch (rev 0) +++ csw/mgar/pkg/binutils/trunk/files/0001-Remove-gcc-specific-warning-no-error.patch 2010-01-04 21:40:39 UTC (rev 7867) @@ -0,0 +1,63 @@ +From 36557d4e77aaca996e7906ec5c9e9899f8b44135 Mon Sep 17 00:00:00 2001 +From: Dagobert Michelsen +Date: Mon, 4 Jan 2010 10:33:49 +0100 +Subject: [PATCH] Remove gcc specific warning no-error + +--- + binutils/Makefile.am | 8 ++++---- + binutils/Makefile.in | 8 ++++---- + 2 files changed, 8 insertions(+), 8 deletions(-) + +diff --git a/binutils/Makefile.am b/binutils/Makefile.am +index abade21..ff935bc 100644 +--- a/binutils/Makefile.am ++++ b/binutils/Makefile.am +@@ -255,16 +255,16 @@ sysinfo$(EXEEXT_FOR_BUILD): sysinfo.o syslex.o + + syslex.o: syslex.c sysinfo.h config.h + if [ -r syslex.c ]; then \ +- $(CC_FOR_BUILD) -c -I. $(AM_CFLAGS) $(CFLAGS_FOR_BUILD) syslex.c -Wno-error ; \ ++ $(CC_FOR_BUILD) -c -I. $(AM_CFLAGS) $(CFLAGS_FOR_BUILD) syslex.c ; \ + else \ +- $(CC_FOR_BUILD) -c -I. -I$(srcdir) $(AM_CFLAGS) $(CFLAGS_FOR_BUILD) $(srcdir)/syslex.c -Wno-error ;\ ++ $(CC_FOR_BUILD) -c -I. -I$(srcdir) $(AM_CFLAGS) $(CFLAGS_FOR_BUILD) $(srcdir)/syslex.c ;\ + fi + + sysinfo.o: sysinfo.c + if [ -r sysinfo.c ]; then \ +- $(CC_FOR_BUILD) -c -I. $(AM_CFLAGS) $(CFLAGS_FOR_BUILD) sysinfo.c -Wno-error ; \ ++ $(CC_FOR_BUILD) -c -I. $(AM_CFLAGS) $(CFLAGS_FOR_BUILD) sysinfo.c ; \ + else \ +- $(CC_FOR_BUILD) -c -I. $(AM_CFLAGS) $(CFLAGS_FOR_BUILD) $(srcdir)/sysinfo.c -Wno-error ; \ ++ $(CC_FOR_BUILD) -c -I. $(AM_CFLAGS) $(CFLAGS_FOR_BUILD) $(srcdir)/sysinfo.c ; \ + fi + + bin2c$(EXEEXT_FOR_BUILD): +diff --git a/binutils/Makefile.in b/binutils/Makefile.in +index a1f3800..543ab6c 100644 +--- a/binutils/Makefile.in ++++ b/binutils/Makefile.in +@@ -1197,16 +1197,16 @@ sysinfo$(EXEEXT_FOR_BUILD): sysinfo.o syslex.o + + syslex.o: syslex.c sysinfo.h config.h + if [ -r syslex.c ]; then \ +- $(CC_FOR_BUILD) -c -I. $(AM_CFLAGS) $(CFLAGS_FOR_BUILD) syslex.c -Wno-error ; \ ++ $(CC_FOR_BUILD) -c -I. $(AM_CFLAGS) $(CFLAGS_FOR_BUILD) syslex.c ; \ + else \ +- $(CC_FOR_BUILD) -c -I. -I$(srcdir) $(AM_CFLAGS) $(CFLAGS_FOR_BUILD) $(srcdir)/syslex.c -Wno-error ;\ ++ $(CC_FOR_BUILD) -c -I. -I$(srcdir) $(AM_CFLAGS) $(CFLAGS_FOR_BUILD) $(srcdir)/syslex.c ;\ + fi + + sysinfo.o: sysinfo.c + if [ -r sysinfo.c ]; then \ +- $(CC_FOR_BUILD) -c -I. $(AM_CFLAGS) $(CFLAGS_FOR_BUILD) sysinfo.c -Wno-error ; \ ++ $(CC_FOR_BUILD) -c -I. $(AM_CFLAGS) $(CFLAGS_FOR_BUILD) sysinfo.c ; \ + else \ +- $(CC_FOR_BUILD) -c -I. $(AM_CFLAGS) $(CFLAGS_FOR_BUILD) $(srcdir)/sysinfo.c -Wno-error ; \ ++ $(CC_FOR_BUILD) -c -I. $(AM_CFLAGS) $(CFLAGS_FOR_BUILD) $(srcdir)/sysinfo.c ; \ + fi + + bin2c$(EXEEXT_FOR_BUILD): +-- +1.6.6 + Added: csw/mgar/pkg/binutils/trunk/files/0002-Use-func-instead-of-FUNCTION.patch =================================================================== --- csw/mgar/pkg/binutils/trunk/files/0002-Use-func-instead-of-FUNCTION.patch (rev 0) +++ csw/mgar/pkg/binutils/trunk/files/0002-Use-func-instead-of-FUNCTION.patch 2010-01-04 21:40:39 UTC (rev 7867) @@ -0,0 +1,39 @@ +From de1f53ab369be21c59cc9b2dd2e68aee27b19de8 Mon Sep 17 00:00:00 2001 +From: Dagobert Michelsen +Date: Mon, 4 Jan 2010 12:34:30 +0100 +Subject: [PATCH] Use func instead of FUNCTION + +--- + bfd/elf32-i386.c | 2 ++ + bfd/elf64-x86-64.c | 2 ++ + 2 files changed, 4 insertions(+), 0 deletions(-) + +diff --git a/bfd/elf32-i386.c b/bfd/elf32-i386.c +index 9de1a6c..d39fd6e 100644 +--- a/bfd/elf32-i386.c ++++ b/bfd/elf32-i386.c +@@ -29,6 +29,8 @@ + #include "objalloc.h" + #include "hashtab.h" + ++#define __FUNCTION__ __func__ ++ + /* 386 uses REL relocations instead of RELA. */ + #define USE_REL 1 + +diff --git a/bfd/elf64-x86-64.c b/bfd/elf64-x86-64.c +index 4fb325a..4f24260 100644 +--- a/bfd/elf64-x86-64.c ++++ b/bfd/elf64-x86-64.c +@@ -31,6 +31,8 @@ + + #include "elf/x86-64.h" + ++#define __FUNCTION__ __func__ ++ + /* In case we're on a 32-bit machine, construct a 64-bit "-1" value. */ + #define MINUS_ONE (~ (bfd_vma) 0) + +-- +1.6.5.1 + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From hson at users.sourceforge.net Tue Jan 5 02:50:12 2010 From: hson at users.sourceforge.net (hson at users.sourceforge.net) Date: Tue, 05 Jan 2010 01:50:12 +0000 Subject: [csw-devel] SF.net SVN: gar:[7868] csw/mgar/pkg Message-ID: Revision: 7868 http://gar.svn.sourceforge.net/gar/?rev=7868&view=rev Author: hson Date: 2010-01-05 01:50:12 +0000 (Tue, 05 Jan 2010) Log Message: ----------- evolution-webcal: Initial commit Added Paths: ----------- csw/mgar/pkg/evolution-webcal/ csw/mgar/pkg/evolution-webcal/branches/ csw/mgar/pkg/evolution-webcal/tags/ csw/mgar/pkg/evolution-webcal/trunk/ csw/mgar/pkg/evolution-webcal/trunk/Makefile csw/mgar/pkg/evolution-webcal/trunk/files/ Property changes on: csw/mgar/pkg/evolution-webcal/trunk ___________________________________________________________________ Added: svn:ignore + cookies download work Added: svn:externals + gar https://gar.svn.sf.net/svnroot/gar/csw/mgar/gar/v2 Added: csw/mgar/pkg/evolution-webcal/trunk/Makefile =================================================================== --- csw/mgar/pkg/evolution-webcal/trunk/Makefile (rev 0) +++ csw/mgar/pkg/evolution-webcal/trunk/Makefile 2010-01-05 01:50:12 UTC (rev 7868) @@ -0,0 +1,51 @@ +GARNAME = evolution-webcal +GARVERSION = 2.28.0 +CATEGORIES = gnome + +DESCRIPTION = Evolution Web Calendar +define BLURB +endef + +MASTER_SITES = $(GNOME_MIRROR) +DISTFILES = $(GARNAME)-$(GARVERSION).tar.bz2 +DISTNAME = $(GARNAME)-$(GARVERSION) + +PACKAGES = CSWevolutionwebcal CSWevolutionwebcal-devel CSWevolutionwebcal-doc +CATALOGNAME_CSWevolutionwebcal = evolution_webcal +CATALOGNAME_CSWevolutionwebcal-devel = evolution_webcal_devel +CATALOGNAME_CSWevolutionwebcal-doc = evolution_webcal_doc + +SPKG_DESC_CSWevolutionwebcal += Evolution Web Calendar +SPKG_DESC_CSWevolutionwebcal-devel += Evolution Web Calendar - developer package +SPKG_DESC_CSWevolutionwebcal-doc += Evolution Web Calendar - documentation + +REQUIRED_PKGS_CSWevolutionwebcal += +REQUIRED_PKGS_CSWevolutionwebcal += +REQUIRED_PKGS_CSWevolutionwebcal += +REQUIRED_PKGS_CSWevolutionwebcal-devel += CSWevolution +REQUIRED_PKGS_CSWevolutionwebcal-doc += CSWevolution + +PKGFILES_CSWevolutionwebcal-devel = $(PKGFILES_DEVEL) +PKGFILES_CSWevolutionwebcal-doc = $(sharedstatedir)/gtk-doc/.* + +ARCHALL_CSWevolutionwebcal-doc = 1 + +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.bz2 + +SPKG_SOURCEURL =http://projects.gnome.org/evolution-webcal + +EXTRA_INC = $(prefix)/X11/include +EXTRA_LIB = $(prefix)/X11/lib +EXTRA_PKG_CONFIG_DIRS = $(prefix)/X11/lib + +BUILD64 = 1 + +STRIP_LIBTOOL = 1 + +CONFIGURE_ARGS = $(DIRPATHS) + +TEST_TARGET = check + +include gar/category.mk + +PATH := /opt/csw/gnu:$(PATH) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From hson at users.sourceforge.net Tue Jan 5 02:58:24 2010 From: hson at users.sourceforge.net (hson at users.sourceforge.net) Date: Tue, 05 Jan 2010 01:58:24 +0000 Subject: [csw-devel] SF.net SVN: gar:[7869] csw/mgar/pkg/evolution-webcal Message-ID: Revision: 7869 http://gar.svn.sourceforge.net/gar/?rev=7869&view=rev Author: hson Date: 2010-01-05 01:58:24 +0000 (Tue, 05 Jan 2010) Log Message: ----------- evolution-webcal: Add missing files Added Paths: ----------- csw/mgar/pkg/evolution-webcal/Makefile csw/mgar/pkg/evolution-webcal/trunk/checksums Added: csw/mgar/pkg/evolution-webcal/Makefile =================================================================== --- csw/mgar/pkg/evolution-webcal/Makefile (rev 0) +++ csw/mgar/pkg/evolution-webcal/Makefile 2010-01-05 01:58:24 UTC (rev 7869) @@ -0,0 +1,15 @@ +# vim: ft=make ts=4 sw=4 noet + +default: + @echo "You are in the pkg/ directory." + +%: + $(MAKE) -C trunk $* + +paranoid-%: + $(MAKE) -C trunk $* || exit 2 + +export BUILDLOG ?= $(shell pwd)/buildlog.txt + +report-%: + $(MAKE) -C trunk $* || echo " *** make $* in $$i failed ***" >> $(BUILDLOG) Added: csw/mgar/pkg/evolution-webcal/trunk/checksums =================================================================== --- csw/mgar/pkg/evolution-webcal/trunk/checksums (rev 0) +++ csw/mgar/pkg/evolution-webcal/trunk/checksums 2010-01-05 01:58:24 UTC (rev 7869) @@ -0,0 +1 @@ +7b506d06c56b579977d4ebc56463ff23 evolution-webcal-2.28.0.tar.bz2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From hson at users.sourceforge.net Tue Jan 5 04:14:34 2010 From: hson at users.sourceforge.net (hson at users.sourceforge.net) Date: Tue, 05 Jan 2010 03:14:34 +0000 Subject: [csw-devel] SF.net SVN: gar:[7870] csw/mgar/pkg/gnomedesktop Message-ID: Revision: 7870 http://gar.svn.sourceforge.net/gar/?rev=7870&view=rev Author: hson Date: 2010-01-05 03:14:34 +0000 (Tue, 05 Jan 2010) Log Message: ----------- gnomedesktop: Added some missing files Added Paths: ----------- csw/mgar/pkg/gnomedesktop/branches/ csw/mgar/pkg/gnomedesktop/tags/ csw/mgar/pkg/gnomedesktop/trunk/Makefile csw/mgar/pkg/gnomedesktop/trunk/checksums csw/mgar/pkg/gnomedesktop/trunk/files/ Property Changed: ---------------- csw/mgar/pkg/gnomedesktop/trunk/ Property changes on: csw/mgar/pkg/gnomedesktop/trunk ___________________________________________________________________ Added: svn:ignore + echo cookies download work Added: svn:externals + gar https://gar.svn.sf.net/svnroot/gar/csw/mgar/gar/v2 Added: csw/mgar/pkg/gnomedesktop/trunk/Makefile =================================================================== --- csw/mgar/pkg/gnomedesktop/trunk/Makefile (rev 0) +++ csw/mgar/pkg/gnomedesktop/trunk/Makefile 2010-01-05 03:14:34 UTC (rev 7870) @@ -0,0 +1,53 @@ +GARNAME = gnome-desktop +GARVERSION = 2.28.2 +CATEGORIES = gnome + +DESCRIPTION = Evolution database backend server +define BLURB + The data server, called "Evolution Data Server" is responsible for + managing calendar and addressbook information. +endef + +MASTER_SITES = $(GNOME_MIRROR) +DISTFILES = $(GARNAME)-$(GARVERSION).tar.bz2 +DISTNAME = $(GARNAME)-$(GARVERSION) + +PACKAGES = CSWgnomedesktop CSWgnomedesktop-devel CSWgnomedesktop-doc +CATALOGNAME_CSWgnomedesktop = gnomedesktop +CATALOGNAME_CSWgnomedesktop-devel = gnomedesktop_devel +CATALOGNAME_CSWgnomedesktop-doc = gnomedesktop_doc + +SPKG_DESC_CSWgnomedesktop += Evolution database backend server +SPKG_DESC_CSWgnomedesktop-devel += Evolution database backend server - developer package +SPKG_DESC_CSWgnomedesktop-doc += Evolution database backend server - documentation + +REQUIRED_PKGS_CSWgnomedesktop += +REQUIRED_PKGS_CSWgnomedesktop += +REQUIRED_PKGS_CSWgnomedesktop += +REQUIRED_PKGS_CSWgnomedesktopdevel += CSWevolution +REQUIRED_PKGS_CSWgnomedesktopdoc += CSWevolution + +PKGFILES_CSWgnomedesktopdevel = $(PKGFILES_DEVEL) +PKGFILES_CSWgnomedesktopdoc = $(sharedstatedir)/gtk-doc/.* + +ARCHALL_CSWgnomedesktopdoc = 1 + +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.bz2 + +SPKG_SOURCEURL = http://projects.gnome.org/evolution + +EXTRA_INC = $(prefix)/X11/include +EXTRA_LIB = $(prefix)/X11/lib +EXTRA_PKG_CONFIG_DIRS = $(prefix)/X11/lib + +BUILD64 = 1 + +STRIP_LIBTOOL = 1 + +CONFIGURE_ARGS = $(DIRPATHS) + +TEST_TARGET = check + +include gar/category.mk + +PATH := /opt/csw/gnu:$(PATH) Added: csw/mgar/pkg/gnomedesktop/trunk/checksums =================================================================== --- csw/mgar/pkg/gnomedesktop/trunk/checksums (rev 0) +++ csw/mgar/pkg/gnomedesktop/trunk/checksums 2010-01-05 03:14:34 UTC (rev 7870) @@ -0,0 +1 @@ +036423159a3240a258cc3892573f0e0f gnome-desktop-2.28.2.tar.bz2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From hson at users.sourceforge.net Tue Jan 5 10:02:16 2010 From: hson at users.sourceforge.net (hson at users.sourceforge.net) Date: Tue, 05 Jan 2010 09:02:16 +0000 Subject: [csw-devel] SF.net SVN: gar:[7871] csw/mgar/pkg Message-ID: Revision: 7871 http://gar.svn.sourceforge.net/gar/?rev=7871&view=rev Author: hson Date: 2010-01-05 09:02:16 +0000 (Tue, 05 Jan 2010) Log Message: ----------- libfpx: Initial commit Added Paths: ----------- csw/mgar/pkg/libfpx/ csw/mgar/pkg/libfpx/branches/ csw/mgar/pkg/libfpx/tags/ csw/mgar/pkg/libfpx/trunk/ csw/mgar/pkg/libfpx/trunk/Makefile csw/mgar/pkg/libfpx/trunk/checksums csw/mgar/pkg/libfpx/trunk/files/ csw/mgar/pkg/libfpx/trunk/files/olecomm.h.patch Property changes on: csw/mgar/pkg/libfpx/trunk ___________________________________________________________________ Added: svn:ignore + cookies download work Added: svn:externals + gar https://gar.svn.sf.net/svnroot/gar/csw/mgar/gar/v2 Added: csw/mgar/pkg/libfpx/trunk/Makefile =================================================================== --- csw/mgar/pkg/libfpx/trunk/Makefile (rev 0) +++ csw/mgar/pkg/libfpx/trunk/Makefile 2010-01-05 09:02:16 UTC (rev 7871) @@ -0,0 +1,54 @@ +GARNAME = libfpx +GARVERSION = 1.3.0 +GARSUBREV = 1 +CATEGORIES = lib + +DESCRIPTION = FlashPIX library +define BLURB +endef + +MASTER_SITES = ftp://ftp.imagemagick.org/pub/ImageMagick/delegates/ +DISTFILES = $(GARNAME)-$(GARVERSION)-$(GARSUBREV).tar.bz2 + +#PACKAGES = CSWlibfpx CSWlibfpxdevel CSWlibfpxdoc +PACKAGES = CSWlibfpx CSWlibfpxdevel +CATALOGNAME_CSWlibfpx = libfpx +CATALOGNAME_CSWlibfpxdevel = libfpx_devel +#CATALOGNAME_CSWlibfpxdoc = libfpx_doc + +SPKG_DESC_CSWlibfpx += FlashPIX library +SPKG_DESC_CSWlibfpxdevel += FlashPIX library - developer package +#SPKG_DESC_CSWlibfpxdoc += FlashPIX library - documentation + +REQUIRED_PKGS_CSWlibfpx += +REQUIRED_PKGS_CSWlibfpxdevel += CSWlibfpx +#REQUIRED_PKGS_CSWlibfpxdoc += CSWlibfpx + +PKGFILES_CSWlibfpxdevel = $(PKGFILES_DEVEL) +#PKGFILES_CSWlibfpxdoc = $(sharedstatedir)/doc/.* + +#ARCHALL_CSWlibfpxdoc = 1 + +SPKG_SOURCEURL = http://www.imagemagick.org + +PATCHFILES = olecomm.h.patch +#PATCHFILES += tchar.patch + +LICENSE = flashpix.h + +DOCFILES = AUTHORS ChangeLog NEWS README + +UFILES_REGEX = $(GARNAME)-((\d+(?:\.\d+)*)-(\d+)?).tar.bz2 + +CONFIGURE_ARGS = $(DIRPATHS) + +STRIP_LIBTOOL=1 + +TEST_TARGET = check + +BUILD64 = 1 + +# libfpx have some problems with rw/trait +GARCOMPILER = GCC4 + +include gar/category.mk Added: csw/mgar/pkg/libfpx/trunk/checksums =================================================================== --- csw/mgar/pkg/libfpx/trunk/checksums (rev 0) +++ csw/mgar/pkg/libfpx/trunk/checksums 2010-01-05 09:02:16 UTC (rev 7871) @@ -0,0 +1,3 @@ +d65c555aa68a296d6eba384929434d70 libfpx-1.3.0-1.tar.bz2 +d921300d89983df26f66f45b391bdc60 olecomm.h.patch +0e4672051619c7da13f643b8c42560cd tchar.patch Added: csw/mgar/pkg/libfpx/trunk/files/olecomm.h.patch =================================================================== --- csw/mgar/pkg/libfpx/trunk/files/olecomm.h.patch (rev 0) +++ csw/mgar/pkg/libfpx/trunk/files/olecomm.h.patch 2010-01-05 09:02:16 UTC (rev 7871) @@ -0,0 +1,11 @@ +--- libfpx-1.3.0.orig/ole/olecomm.h 2007-11-02 08:10:05.000000000 +0100 ++++ libfpx-1.3.0/ole/olecomm.h 2010-01-05 01:12:45.667877575 +0100 +@@ -68,7 +68,7 @@ + # ifdef __linux__ + # include + # elif defined(__sun) +-# include ++# include + # else + # include + # endif This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From hson at users.sourceforge.net Tue Jan 5 11:49:00 2010 From: hson at users.sourceforge.net (hson at users.sourceforge.net) Date: Tue, 05 Jan 2010 10:49:00 +0000 Subject: [csw-devel] SF.net SVN: gar:[7872] csw/mgar/pkg/tiff/trunk/Makefile Message-ID: Revision: 7872 http://gar.svn.sourceforge.net/gar/?rev=7872&view=rev Author: hson Date: 2010-01-05 10:48:59 +0000 (Tue, 05 Jan 2010) Log Message: ----------- tiff: Disable static build, docdir should be version independent Modified Paths: -------------- csw/mgar/pkg/tiff/trunk/Makefile Modified: csw/mgar/pkg/tiff/trunk/Makefile =================================================================== --- csw/mgar/pkg/tiff/trunk/Makefile 2010-01-05 09:02:16 UTC (rev 7871) +++ csw/mgar/pkg/tiff/trunk/Makefile 2010-01-05 10:48:59 UTC (rev 7872) @@ -41,6 +41,8 @@ EXTRA_PKG_CONFIG_DIRS = $(prefix)/X11/lib CONFIGURE_ARGS = $(DIRPATHS) +CONFIGURE_ARGS += --with-docdir=/opt/csw/share/doc/tiff +CONFIGURE_ARGS += --disable-static CONFIGURE_ARGS += --with-zlib-include-dir=/opt/csw/include CONFIGURE_ARGS += --with-zlib-lib-dir=/opt/csw/lib CONFIGURE_ARGS += --with-jpeg-include-dir=/opt/csw/include This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From hson at users.sourceforge.net Tue Jan 5 11:59:30 2010 From: hson at users.sourceforge.net (hson at users.sourceforge.net) Date: Tue, 05 Jan 2010 10:59:30 +0000 Subject: [csw-devel] SF.net SVN: gar:[7873] csw/mgar/pkg/ImageMagick/trunk Message-ID: Revision: 7873 http://gar.svn.sourceforge.net/gar/?rev=7873&view=rev Author: hson Date: 2010-01-05 10:59:30 +0000 (Tue, 05 Jan 2010) Log Message: ----------- imagemagick: Update to 6.5.8-10 Modified Paths: -------------- csw/mgar/pkg/ImageMagick/trunk/Makefile csw/mgar/pkg/ImageMagick/trunk/checksums Modified: csw/mgar/pkg/ImageMagick/trunk/Makefile =================================================================== --- csw/mgar/pkg/ImageMagick/trunk/Makefile 2010-01-05 10:48:59 UTC (rev 7872) +++ csw/mgar/pkg/ImageMagick/trunk/Makefile 2010-01-05 10:59:30 UTC (rev 7873) @@ -1,6 +1,6 @@ GARNAME = imagemagick GARVERSION = 6.5.8 -GARSUBREV = 6 +GARSUBREV = 10 CATEGORIES = lib DESCRIPTION = A comprehensive package supporting automated and interative manipulation of images @@ -60,11 +60,10 @@ @cp $(FILEDIR)/libMagick.so.10.0.4.s $(INSTALLISADIR)$(libdir)/libMagick.so.10.0.4 @cp $(FILEDIR)/libWand.so.10.0.4.s $(INSTALLISADIR)$(libdir)/libWand.so.10.0.4 @cp $(FILEDIR)/libMagick++.so.10.0.4.s $(INSTALLISADIR)$(libdir)/libMagick++.so.10.0.4 - @ln -s libMagick.so.10.0.4 $(INSTALLISADIR)$(libdir)/libMagick.so.10 - @ln -s libWand.so.10.0.4 $(INSTALLISADIR)$(libdir)/libWand.so.10 - @ln -s libMagick++.so.10.0.4 $(INSTALLISADIR)$(libdir)/libMagick++.so.10 + @( if [ ! -r $(INSTALLISADIR)$(libdir)/libMagick.so.10.0.4 ] ; then ln -s libMagick.so.10.0.4 $(INSTALLISADIR)$(libdir)/libMagick.so.10 ; fi ) + @( if [ ! -r $(INSTALLISADIR)$(libdir)/libWand.so.10.0.4 ] ; then ln -s libWand.so.10.0.4 $(INSTALLISADIR)$(libdir)/libWand.so.10 ; fi ) + @( if [ ! -r $(INSTALLISADIR)$(libdir)/libMagick++.so.10.0.4 ] ; then ln -s libMagick++.so.10.0.4 $(INSTALLISADIR)$(libdir)/libMagick++.so.10 ; fi ) @ln -s ImageMagick-$(GARVERSION) $(INSTALLISADIR)$(docdir)/ImageMagick - echo $(DESTDIR) @( cd $(INSTALLISADIR)$(libdir) ; gzip -dc $(DESTDIR)/../../$(FILEDIR)/lib_6.2.9_s.tar.gz |tar xf -) @mv $(INSTALLISADIR)$(mandir)/man1/compare.1 $(INSTALLISADIR)$(mandir)/man1/compare2.1 @mv $(INSTALLISADIR)$(bindir)/compare $(INSTALLISADIR)$(bindir)/compare2 @@ -74,11 +73,10 @@ @cp $(FILEDIR)/libMagick.so.10.0.4.i $(INSTALLISADIR)$(libdir)/libMagick.so.10.0.4 @cp $(FILEDIR)/libWand.so.10.0.4.i $(INSTALLISADIR)$(libdir)/libWand.so.10.0.4 @cp $(FILEDIR)/libMagick++.so.10.0.4.i $(INSTALLISADIR)$(libdir)/libMagick++.so.10.0.4 - @ln -s libMagick.so.10.0.4 $(INSTALLISADIR)$(libdir)/libMagick.so.10 - @ln -s libWand.so.10.0.4 $(INSTALLISADIR)$(libdir)/libWand.so.10 - @ln -s libMagick++.so.10.0.4 $(INSTALLISADIR)$(libdir)/libMagick++.so.10 + @( if [ ! -r $(INSTALLISADIR)$(libdir)/libMagick.so.10.0.4 ] ; then ln -s libMagick.so.10.0.4 $(INSTALLISADIR)$(libdir)/libMagick.so.10 ; fi ) + @( if [ ! -r $(INSTALLISADIR)$(libdir)/libWand.so.10.0.4 ] ; then ln -s libWand.so.10.0.4 $(INSTALLISADIR)$(libdir)/libWand.so.10 ; fi ) + @( if [ ! -r $(INSTALLISADIR)$(libdir)/libMagick++.so.10.0.4 ] ; then ln -s libMagick++.so.10.0.4 $(INSTALLISADIR)$(libdir)/libMagick++.so.10 ; fi ) @ln -s ImageMagick-$(GARVERSION) $(INSTALLISADIR)$(docdir)/ImageMagick - echo $(DESTDIR) @( cd $(INSTALLISADIR)$(libdir) ; gzip -dc $(DESTDIR)/../../$(FILEDIR)/lib_6.2.9_i.tar.gz |tar xf -) @mv $(INSTALLISADIR)$(mandir)/man1/compare.1 $(INSTALLISADIR)$(mandir)/man1/compare2.1 @mv $(INSTALLISADIR)$(bindir)/compare $(INSTALLISADIR)$(bindir)/compare2 Modified: csw/mgar/pkg/ImageMagick/trunk/checksums =================================================================== --- csw/mgar/pkg/ImageMagick/trunk/checksums 2010-01-05 10:48:59 UTC (rev 7872) +++ csw/mgar/pkg/ImageMagick/trunk/checksums 2010-01-05 10:59:30 UTC (rev 7873) @@ -1,2 +1,2 @@ -7ba3d32af33d716cc0fedb4d4a9e359f ImageMagick-6.5.8-6.tar.bz2 +fc04d56c32bb2eebba7885d0db042f9a ImageMagick-6.5.8-10.tar.bz2 6bd361fe352c7d497d60d8d2cbe7cfd4 Makefile.patch This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Tue Jan 5 14:59:38 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Tue, 05 Jan 2010 13:59:38 +0000 Subject: [csw-devel] SF.net SVN: gar:[7875] csw/mgar/pkg/wgetpaste/trunk/checksums Message-ID: Revision: 7875 http://gar.svn.sourceforge.net/gar/?rev=7875&view=rev Author: wahwah Date: 2010-01-05 13:59:38 +0000 (Tue, 05 Jan 2010) Log Message: ----------- wgetpaste: Checksum update Modified Paths: -------------- csw/mgar/pkg/wgetpaste/trunk/checksums Modified: csw/mgar/pkg/wgetpaste/trunk/checksums =================================================================== --- csw/mgar/pkg/wgetpaste/trunk/checksums 2010-01-05 13:58:17 UTC (rev 7874) +++ csw/mgar/pkg/wgetpaste/trunk/checksums 2010-01-05 13:59:38 UTC (rev 7875) @@ -1,4 +1,4 @@ -0a96eee7e51fe1b7e9054dd302ca0508 download/0001-Using-gwhoami-instead-of-whoami.patch -4ce4101e5be2ea7af5b5ea18be7f8693 download/0002-CSW-bash.patch -f270d87c5ea9939b2818d38f43b51936 download/wgetpaste-2.16.tar.bz2 -67425820c0281729a7f63e3e3339c49f download/wgetpaste.conf +cde06fef294da4cbe91f8945ab53b3e2 0001-Using-gwhoami-instead-of-whoami.patch +4ce4101e5be2ea7af5b5ea18be7f8693 0002-CSW-bash.patch +f270d87c5ea9939b2818d38f43b51936 wgetpaste-2.16.tar.bz2 +67425820c0281729a7f63e3e3339c49f wgetpaste.conf This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Tue Jan 5 15:01:05 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Tue, 05 Jan 2010 14:01:05 +0000 Subject: [csw-devel] SF.net SVN: gar:[7876] csw/mgar/pkg/wgetpaste/trunk Message-ID: Revision: 7876 http://gar.svn.sourceforge.net/gar/?rev=7876&view=rev Author: wahwah Date: 2010-01-05 14:01:04 +0000 (Tue, 05 Jan 2010) Log Message: ----------- wgetpaste: Patch depth update, checksum update Modified Paths: -------------- csw/mgar/pkg/wgetpaste/trunk/checksums csw/mgar/pkg/wgetpaste/trunk/files/0001-Using-gwhoami-instead-of-whoami.patch Modified: csw/mgar/pkg/wgetpaste/trunk/checksums =================================================================== --- csw/mgar/pkg/wgetpaste/trunk/checksums 2010-01-05 13:59:38 UTC (rev 7875) +++ csw/mgar/pkg/wgetpaste/trunk/checksums 2010-01-05 14:01:04 UTC (rev 7876) @@ -1,4 +1,4 @@ -cde06fef294da4cbe91f8945ab53b3e2 0001-Using-gwhoami-instead-of-whoami.patch +ca8e4122a420d95c0cd96d731b5b9777 0001-Using-gwhoami-instead-of-whoami.patch 4ce4101e5be2ea7af5b5ea18be7f8693 0002-CSW-bash.patch f270d87c5ea9939b2818d38f43b51936 wgetpaste-2.16.tar.bz2 67425820c0281729a7f63e3e3339c49f wgetpaste.conf Modified: csw/mgar/pkg/wgetpaste/trunk/files/0001-Using-gwhoami-instead-of-whoami.patch =================================================================== --- csw/mgar/pkg/wgetpaste/trunk/files/0001-Using-gwhoami-instead-of-whoami.patch 2010-01-05 13:59:38 UTC (rev 7875) +++ csw/mgar/pkg/wgetpaste/trunk/files/0001-Using-gwhoami-instead-of-whoami.patch 2010-01-05 14:01:04 UTC (rev 7876) @@ -1,5 +1,5 @@ ---- work/solaris8-sparc/build-isa-sparcv8/wgetpaste-2.16/wgetpaste.orig 2010-01-05 14:42:30.127801164 +0100 -+++ work/solaris8-sparc/build-isa-sparcv8/wgetpaste-2.16/wgetpaste 2010-01-05 14:43:42.007282206 +0100 +--- wgetpaste-2.16/wgetpaste.orig 2010-01-05 14:42:30.127801164 +0100 ++++ wgetpaste-2.16/wgetpaste 2010-01-05 14:43:42.007282206 +0100 @@ -114,7 +114,7 @@ noxclip() { cat <&2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Tue Jan 5 14:58:18 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Tue, 05 Jan 2010 13:58:18 +0000 Subject: [csw-devel] SF.net SVN: gar:[7874] csw/mgar/pkg/wgetpaste/trunk Message-ID: Revision: 7874 http://gar.svn.sourceforge.net/gar/?rev=7874&view=rev Author: wahwah Date: 2010-01-05 13:58:17 +0000 (Tue, 05 Jan 2010) Log Message: ----------- wgetpaste: Version bump to 2.16 Modified Paths: -------------- csw/mgar/pkg/wgetpaste/trunk/Makefile csw/mgar/pkg/wgetpaste/trunk/checksums csw/mgar/pkg/wgetpaste/trunk/files/0001-Using-gwhoami-instead-of-whoami.patch Modified: csw/mgar/pkg/wgetpaste/trunk/Makefile =================================================================== --- csw/mgar/pkg/wgetpaste/trunk/Makefile 2010-01-05 10:59:30 UTC (rev 7873) +++ csw/mgar/pkg/wgetpaste/trunk/Makefile 2010-01-05 13:58:17 UTC (rev 7874) @@ -1,5 +1,5 @@ GARNAME = wgetpaste -GARVERSION = 2.13 +GARVERSION = 2.16 CATEGORIES = utils DESCRIPTION = A command-line utility for text pasting websites. Modified: csw/mgar/pkg/wgetpaste/trunk/checksums =================================================================== --- csw/mgar/pkg/wgetpaste/trunk/checksums 2010-01-05 10:59:30 UTC (rev 7873) +++ csw/mgar/pkg/wgetpaste/trunk/checksums 2010-01-05 13:58:17 UTC (rev 7874) @@ -1,4 +1,4 @@ 0a96eee7e51fe1b7e9054dd302ca0508 download/0001-Using-gwhoami-instead-of-whoami.patch 4ce4101e5be2ea7af5b5ea18be7f8693 download/0002-CSW-bash.patch -a341c778d745b0a7ad11163a4a2c1ea9 download/wgetpaste-2.13.tar.bz2 +f270d87c5ea9939b2818d38f43b51936 download/wgetpaste-2.16.tar.bz2 67425820c0281729a7f63e3e3339c49f download/wgetpaste.conf Modified: csw/mgar/pkg/wgetpaste/trunk/files/0001-Using-gwhoami-instead-of-whoami.patch =================================================================== --- csw/mgar/pkg/wgetpaste/trunk/files/0001-Using-gwhoami-instead-of-whoami.patch 2010-01-05 10:59:30 UTC (rev 7873) +++ csw/mgar/pkg/wgetpaste/trunk/files/0001-Using-gwhoami-instead-of-whoami.patch 2010-01-05 13:58:17 UTC (rev 7874) @@ -1,17 +1,6 @@ -From c98a64ed5f18a50d9d249bd4bd0916374272a597 Mon Sep 17 00:00:00 2001 -From: Maciej Blizinski -Date: Sat, 29 Aug 2009 11:20:28 +0200 -Subject: [PATCH 1/2] Using gwhoami instead of whoami - ---- - wgetpaste | 10 +++++----- - 1 files changed, 5 insertions(+), 5 deletions(-) - -diff --git a/wgetpaste b/wgetpaste -index d4addbd..9b40432 100755 ---- a/wgetpaste -+++ b/wgetpaste -@@ -99,7 +99,7 @@ notreadable() { +--- work/solaris8-sparc/build-isa-sparcv8/wgetpaste-2.16/wgetpaste.orig 2010-01-05 14:42:30.127801164 +0100 ++++ work/solaris8-sparc/build-isa-sparcv8/wgetpaste-2.16/wgetpaste 2010-01-05 14:43:42.007282206 +0100 +@@ -114,7 +114,7 @@ noxclip() { cat <&2 Could not find xclip on your system. In order to use --x$1 you must either @@ -20,7 +9,7 @@ per user in ~/.wgetpaste.conf to use another program (such as e.g. xcut or klipper) to $2 your clipboard. -@@ -288,11 +288,11 @@ Options: +@@ -303,11 +303,11 @@ --debug be *very* verbose (implies -v) -h, --help show this help @@ -34,7 +23,7 @@ ~/.wgetpaste.conf or ~/.wgetpaste.d/*.conf. EOF } -@@ -568,7 +568,7 @@ load_configs() { +@@ -586,7 +586,7 @@ if [[ ! $IGNORECONFIGS ]]; then # compatibility code local f deprecated= @@ -43,15 +32,12 @@ if [[ -f $f ]]; then if [[ -z $deprecated ]]; then echo "The config files for wgetpaste have changed to *.conf.$N" >&2 -@@ -589,7 +589,7 @@ load_configs() { +@@ -607,7 +607,7 @@ } load_configs [[ $SERVICESET ]] && verifyservice "$SERVICESET" && SERVICE=$(escape "$SERVICESET") -DEFAULT_NICK=${DEFAULT_NICK:-$(whoami)} || die "whoami failed" -+DEFAULT_NICK=${DEFAULT_NICK:-$(gwhoami)} || die "whoami failed" - DEFAULT_SERVICE=${DEFAULT_SERVICE:-dpaste} ++DEFAULT_NICK=${DEFAULT_NICK:-$(gwhoami)} || die "gwhoami failed" + DEFAULT_SERVICE=${DEFAULT_SERVICE:-pocoo} DEFAULT_LANGUAGE=${DEFAULT_LANGUAGE:-Plain Text} DEFAULT_EXPIRATION=${DEFAULT_EXPIRATION:-1 month} --- -1.6.3.2 - This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Tue Jan 5 15:09:36 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Tue, 05 Jan 2010 14:09:36 +0000 Subject: [csw-devel] SF.net SVN: gar:[7877] csw/mgar/pkg/wgetpaste/trunk/Makefile Message-ID: Revision: 7877 http://gar.svn.sourceforge.net/gar/?rev=7877&view=rev Author: wahwah Date: 2010-01-05 14:09:35 +0000 (Tue, 05 Jan 2010) Log Message: ----------- wgetpaste: Removed double depends, simplified cswsampleconf invocation, removed unnecessary bits Modified Paths: -------------- csw/mgar/pkg/wgetpaste/trunk/Makefile Modified: csw/mgar/pkg/wgetpaste/trunk/Makefile =================================================================== --- csw/mgar/pkg/wgetpaste/trunk/Makefile 2010-01-05 14:01:04 UTC (rev 7876) +++ csw/mgar/pkg/wgetpaste/trunk/Makefile 2010-01-05 14:09:35 UTC (rev 7877) @@ -12,10 +12,11 @@ DISTFILES = $(GARNAME)-$(GARVERSION).tar.bz2 DISTFILES += wgetpaste.conf -# We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.bz2 -REQUIRED_PKGS = CSWshutils CSWwget CSWcswclassutils CSWbash +REQUIRED_PKGS = CSWbash +REQUIRED_PKGS += CSWshutils +REQUIRED_PKGS += CSWwget PATCHFILES = 0001-Using-gwhoami-instead-of-whoami.patch PATCHFILES += 0002-CSW-bash.patch @@ -24,23 +25,18 @@ sysconfdir = /etc/opt/csw -SPKG_CLASSES = none cswcpsampleconf -PROTOTYPE_FILTER = awk ' \ - $$$$3 ~ /\/wgetpaste.conf.CSW$$$$/ { $$$$2 = "cswcpsampleconf" } \ - { print }' +SAMPLECONF = /etc/opt/csw/wgetpaste\.conf\.CSW - -CONFIGURE_ARGS = $(DIRPATHS) CONFIGURE_SCRIPTS = BUILD_SCRIPTS = INSTALL_SCRIPTS = wgetpaste TEST_SCRIPTS = +include gar/category.mk + install-wgetpaste: ginstall -d $(DESTDIR)$(bindir) ginstall -m 755 $(WORKSRC)/wgetpaste $(DESTDIR)$(bindir) ginstall -d $(DESTDIR)$(sysconfdir) ginstall -m 644 $(FILEDIR)/wgetpaste.conf $(DESTDIR)$(sysconfdir)/wgetpaste.conf.CSW @$(MAKECOOKIE) - -include gar/category.mk This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Tue Jan 5 15:17:41 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 05 Jan 2010 14:17:41 +0000 Subject: [csw-devel] SF.net SVN: gar:[7878] csw/mgar/pkg/libtool/trunk/Makefile Message-ID: Revision: 7878 http://gar.svn.sourceforge.net/gar/?rev=7878&view=rev Author: dmichelsen Date: 2010-01-05 14:17:41 +0000 (Tue, 05 Jan 2010) Log Message: ----------- libtool: Apply patch to correct version Modified Paths: -------------- csw/mgar/pkg/libtool/trunk/Makefile Modified: csw/mgar/pkg/libtool/trunk/Makefile =================================================================== --- csw/mgar/pkg/libtool/trunk/Makefile 2010-01-05 14:09:35 UTC (rev 7877) +++ csw/mgar/pkg/libtool/trunk/Makefile 2010-01-05 14:17:41 UTC (rev 7878) @@ -23,8 +23,8 @@ DISTFILES = $(SOURCEFILES) PATCH_LIBTOOL = patch-libtool.diff -PATCHFILES_POSTINSTALL_isa-i386-garversion-2.2.6-garcompiler-SOS11 = $(PATCH_LIBTOOL) -PATCHFILES_POSTINSTALL_isa-sparcv8-garversion-2.2.6-garcompiler-SOS11 = $(PATCH_LIBTOOL) +PATCHFILES_POSTINSTALL_isa-i386-garversion-2.2.6b-garcompiler-SOS11 = $(PATCH_LIBTOOL) +PATCHFILES_POSTINSTALL_isa-sparcv8-garversion-2.2.6b-garcompiler-SOS11 = $(PATCH_LIBTOOL) DISTFILES += $(PATCH_LIBTOOL) NOEXTRACT = $(filter-out $(GARNAME)-$(GARVERSION).tar.gz,$(SOURCEFILES)) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Tue Jan 5 15:53:27 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 05 Jan 2010 14:53:27 +0000 Subject: [csw-devel] SF.net SVN: gar:[7879] csw/mgar/pkg Message-ID: Revision: 7879 http://gar.svn.sourceforge.net/gar/?rev=7879&view=rev Author: dmichelsen Date: 2010-01-05 14:53:27 +0000 (Tue, 05 Jan 2010) Log Message: ----------- libproxy: Initial commit, doesn't build yet Added Paths: ----------- csw/mgar/pkg/libproxy/ csw/mgar/pkg/libproxy/branches/ csw/mgar/pkg/libproxy/tags/ csw/mgar/pkg/libproxy/trunk/ csw/mgar/pkg/libproxy/trunk/Makefile csw/mgar/pkg/libproxy/trunk/checksums csw/mgar/pkg/libproxy/trunk/files/ csw/mgar/pkg/libproxy/trunk/files/0001-Use-xc99-for-Sun-Studio-compiler.patch csw/mgar/pkg/libproxy/trunk/files/0002-Dont-preset-CFLAGS.patch Property changes on: csw/mgar/pkg/libproxy/trunk ___________________________________________________________________ Added: svn:ignore + cookies download work Added: svn:externals + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 Added: csw/mgar/pkg/libproxy/trunk/Makefile =================================================================== --- csw/mgar/pkg/libproxy/trunk/Makefile (rev 0) +++ csw/mgar/pkg/libproxy/trunk/Makefile 2010-01-05 14:53:27 UTC (rev 7879) @@ -0,0 +1,25 @@ +GARNAME = libproxy +GARVERSION = 0.3.0 +CATEGORIES = lib + +DESCRIPTION = A library that provides automatic proxy configuration management +define BLURB + libproxy exists to answer the question: Given a network resource, how do I + reach it? It handles all the details, enabling you to get back to programming. + GNOME? KDE? Command line? WPAD? PAC? Network changed? It doesn't matter! Just + ask libproxy what proxy to use: you get simple code and your users get correct, + consistant behavior and broad infrastructure compatibility. +endef + +MASTER_SITES = http://libproxy.googlecode.com/files/ +DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz +PATCHFILES = 0001-Use-xc99-for-Sun-Studio-compiler.patch +PATCHFILES += 0002-Dont-preset-CFLAGS.patch + +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + +BUILD64 = 1 +CONFIGURE_ARGS = $(DIRPATHS) + +include gar/category.mk Added: csw/mgar/pkg/libproxy/trunk/checksums =================================================================== --- csw/mgar/pkg/libproxy/trunk/checksums (rev 0) +++ csw/mgar/pkg/libproxy/trunk/checksums 2010-01-05 14:53:27 UTC (rev 7879) @@ -0,0 +1,3 @@ +70b8c804d1e0a5e98a1e708bd3102329 0001-Use-xc99-for-Sun-Studio-compiler.patch +d5847505f454b61bd3ddc32b7f00eb7b 0002-Dont-preset-CFLAGS.patch +6ded75a6c6aef53be657ece207cc26c4 libproxy-0.3.0.tar.gz Added: csw/mgar/pkg/libproxy/trunk/files/0001-Use-xc99-for-Sun-Studio-compiler.patch =================================================================== --- csw/mgar/pkg/libproxy/trunk/files/0001-Use-xc99-for-Sun-Studio-compiler.patch (rev 0) +++ csw/mgar/pkg/libproxy/trunk/files/0001-Use-xc99-for-Sun-Studio-compiler.patch 2010-01-05 14:53:27 UTC (rev 7879) @@ -0,0 +1,91 @@ +From 3ea26b980c8929de2f92a33de49a09dc12f63a68 Mon Sep 17 00:00:00 2001 +From: Dagobert Michelsen +Date: Tue, 5 Jan 2010 15:29:01 +0100 +Subject: [PATCH] Use xc99 for Sun Studio compiler + +--- + src/bin/Makefile.am | 2 +- + src/bin/Makefile.in | 2 +- + src/lib/Makefile.am | 2 +- + src/lib/Makefile.in | 2 +- + src/modules/Makefile.am | 2 +- + src/modules/Makefile.in | 2 +- + 6 files changed, 6 insertions(+), 6 deletions(-) + +diff --git a/src/bin/Makefile.am b/src/bin/Makefile.am +index 0248879..9c7633e 100644 +--- a/src/bin/Makefile.am ++++ b/src/bin/Makefile.am +@@ -2,5 +2,5 @@ bin_PROGRAMS = proxy + + # Command line interface to libproxy + proxy_SOURCES = proxy.c +-proxy_CPPFLAGS = -I$(top_srcdir)/src/lib -std=c99 ++proxy_CPPFLAGS = -I$(top_srcdir)/src/lib -xc99 + proxy_LDADD = ../lib/libproxy.la +diff --git a/src/bin/Makefile.in b/src/bin/Makefile.in +index 625fbb3..ed8cd56 100644 +--- a/src/bin/Makefile.in ++++ b/src/bin/Makefile.in +@@ -239,7 +239,7 @@ xmu_LIBS = @xmu_LIBS@ + + # Command line interface to libproxy + proxy_SOURCES = proxy.c +-proxy_CPPFLAGS = -I$(top_srcdir)/src/lib -std=c99 ++proxy_CPPFLAGS = -I$(top_srcdir)/src/lib -xc99 + proxy_LDADD = ../lib/libproxy.la + all: all-am + +diff --git a/src/lib/Makefile.am b/src/lib/Makefile.am +index 626d1c4..b1c6b80 100644 +--- a/src/lib/Makefile.am ++++ b/src/lib/Makefile.am +@@ -10,7 +10,7 @@ libproxy_la_SOURCES = \ + strdict.c strdict.h \ + url.c url.h + +-libproxy_la_CFLAGS = -DMODULEDIR=\"@MODULEDIR@@DIR_SEPARATOR@\" -DSYSCONFDIR=\"@SYSCONFDIR@@DIR_SEPARATOR@\" -std=c99 -D_POSIX_C_SOURCE=200112L ++libproxy_la_CFLAGS = -DMODULEDIR=\"@MODULEDIR@@DIR_SEPARATOR@\" -DSYSCONFDIR=\"@SYSCONFDIR@@DIR_SEPARATOR@\" -xc99 -D_POSIX_C_SOURCE=200112L + libproxy_la_LDFLAGS = -lpthread -lm -no-undefined + + include_HEADERS = proxy.h +diff --git a/src/lib/Makefile.in b/src/lib/Makefile.in +index 77bb2da..73e087c 100644 +--- a/src/lib/Makefile.in ++++ b/src/lib/Makefile.in +@@ -277,7 +277,7 @@ libproxy_la_SOURCES = \ + strdict.c strdict.h \ + url.c url.h + +-libproxy_la_CFLAGS = -DMODULEDIR=\"@MODULEDIR@@DIR_SEPARATOR@\" -DSYSCONFDIR=\"@SYSCONFDIR@@DIR_SEPARATOR@\" -std=c99 -D_POSIX_C_SOURCE=200112L ++libproxy_la_CFLAGS = -DMODULEDIR=\"@MODULEDIR@@DIR_SEPARATOR@\" -DSYSCONFDIR=\"@SYSCONFDIR@@DIR_SEPARATOR@\" -xc99 -D_POSIX_C_SOURCE=200112L + libproxy_la_LDFLAGS = -lpthread -lm -no-undefined + include_HEADERS = proxy.h + all: all-am +diff --git a/src/modules/Makefile.am b/src/modules/Makefile.am +index 170791b..84bd0b5 100644 +--- a/src/modules/Makefile.am ++++ b/src/modules/Makefile.am +@@ -1,5 +1,5 @@ + moduledir = @MODULEDIR@ +-AM_CFLAGS = -std=c99 ++AM_CFLAGS = -xc99 + AM_LDFLAGS = -module -avoid-version -no-undefined + + +diff --git a/src/modules/Makefile.in b/src/modules/Makefile.in +index 6965056..45c9c57 100644 +--- a/src/modules/Makefile.in ++++ b/src/modules/Makefile.in +@@ -359,7 +359,7 @@ x11_LIBS = @x11_LIBS@ + xmu_CFLAGS = @xmu_CFLAGS@ + xmu_LIBS = @xmu_LIBS@ + moduledir = @MODULEDIR@ +-AM_CFLAGS = -std=c99 ++AM_CFLAGS = -xc99 + AM_LDFLAGS = -module -avoid-version -no-undefined + + # Which modules to build +-- +1.6.6 + Added: csw/mgar/pkg/libproxy/trunk/files/0002-Dont-preset-CFLAGS.patch =================================================================== --- csw/mgar/pkg/libproxy/trunk/files/0002-Dont-preset-CFLAGS.patch (rev 0) +++ csw/mgar/pkg/libproxy/trunk/files/0002-Dont-preset-CFLAGS.patch 2010-01-05 14:53:27 UTC (rev 7879) @@ -0,0 +1,35 @@ +From 6677cc7bc95aeeee76c7741ee9edd03469b7936e Mon Sep 17 00:00:00 2001 +From: Dagobert Michelsen +Date: Tue, 5 Jan 2010 15:35:21 +0100 +Subject: [PATCH 2/2] Initial commit + +--- a/configure ++++ b/configure +@@ -14683,7 +14683,7 @@ fi + + esac + +-CFLAGS="-g -Wall -pedantic $CFLAGS" ++# CFLAGS="-g -Wall -pedantic $CFLAGS" + ac_config_files="$ac_config_files libproxy-1.0.pc Makefile libproxy.spec src/Makefile src/lib/Makefile src/modules/Makefile src/bin/Makefile src/bindings/Makefile src/bindings/python/Makefile src/bindings/java/Makefile src/platform/Makefile src/platform/win32/Makefile src/bindings/dotnet/Makefile src/bindings/dotnet/libproxy-sharp-1.0.pc src/bindings/dotnet/AssemblyInfo.cs" + + cat >confcache <<\_ACEOF +diff --git a/configure.ac b/configure.ac +index c9e0bb9..4139f95 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -238,7 +238,7 @@ case $host in + AC_CHECK_LIB(ws2_32, main) + esac + +-CFLAGS="-g -Wall -pedantic $CFLAGS" ++#CFLAGS="-g -Wall -pedantic $CFLAGS" + AC_CONFIG_FILES([libproxy-1.0.pc Makefile libproxy.spec src/Makefile src/lib/Makefile + src/modules/Makefile src/bin/Makefile src/bindings/Makefile + src/bindings/python/Makefile src/bindings/java/Makefile +diff --git a/src/lib/Makefile b/src/lib/Makefile +index 867b01b..0ba55f6 100644 + +-- +1.6.6 + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Tue Jan 5 21:21:32 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 05 Jan 2010 20:21:32 +0000 Subject: [csw-devel] SF.net SVN: gar:[7880] csw/mgar/pkg/libtool/tags/libtool-2.2.6b, REV=2010.01 .05/ Message-ID: Revision: 7880 http://gar.svn.sourceforge.net/gar/?rev=7880&view=rev Author: dmichelsen Date: 2010-01-05 20:21:32 +0000 (Tue, 05 Jan 2010) Log Message: ----------- libtool: Tag libtool-2.2.6b,REV=2010.01.05 Added Paths: ----------- csw/mgar/pkg/libtool/tags/libtool-2.2.6b,REV=2010.01.05/ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Tue Jan 5 21:43:05 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 05 Jan 2010 20:43:05 +0000 Subject: [csw-devel] SF.net SVN: gar:[7881] csw/mgar/pkg/libproxy/trunk Message-ID: Revision: 7881 http://gar.svn.sourceforge.net/gar/?rev=7881&view=rev Author: dmichelsen Date: 2010-01-05 20:43:05 +0000 (Tue, 05 Jan 2010) Log Message: ----------- libproxy: Add patches Modified Paths: -------------- csw/mgar/pkg/libproxy/trunk/Makefile csw/mgar/pkg/libproxy/trunk/checksums csw/mgar/pkg/libproxy/trunk/files/0001-Use-xc99-for-Sun-Studio-compiler.patch csw/mgar/pkg/libproxy/trunk/files/0002-Dont-preset-CFLAGS.patch Added Paths: ----------- csw/mgar/pkg/libproxy/trunk/files/0001-Use-xc99-for-Sun-Studio-compiler.patch.orig csw/mgar/pkg/libproxy/trunk/files/0002-Dont-preset-CFLAGS.patch.orig Modified: csw/mgar/pkg/libproxy/trunk/Makefile =================================================================== --- csw/mgar/pkg/libproxy/trunk/Makefile 2010-01-05 20:21:32 UTC (rev 7880) +++ csw/mgar/pkg/libproxy/trunk/Makefile 2010-01-05 20:43:05 UTC (rev 7881) @@ -19,7 +19,15 @@ # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz +PACKAGING_PLATFORMS = solaris10-sparc solaris10-i386 + +EXTRA_LINKER_FLAGS = -lnsl BUILD64 = 1 CONFIGURE_ARGS = $(DIRPATHS) +TEST_TARGET = check + include gar/category.mk + +# There is actually the cpp executable in /usr/lib +PATH := $(PATH):/usr/lib Modified: csw/mgar/pkg/libproxy/trunk/checksums =================================================================== --- csw/mgar/pkg/libproxy/trunk/checksums 2010-01-05 20:21:32 UTC (rev 7880) +++ csw/mgar/pkg/libproxy/trunk/checksums 2010-01-05 20:43:05 UTC (rev 7881) @@ -1,3 +1,3 @@ -70b8c804d1e0a5e98a1e708bd3102329 0001-Use-xc99-for-Sun-Studio-compiler.patch -d5847505f454b61bd3ddc32b7f00eb7b 0002-Dont-preset-CFLAGS.patch +ce2d836df293fa8183265176459cf87e 0001-Use-xc99-for-Sun-Studio-compiler.patch +acd3e61f107ff188722fb1335e0ed37c 0002-Dont-preset-CFLAGS.patch 6ded75a6c6aef53be657ece207cc26c4 libproxy-0.3.0.tar.gz Modified: csw/mgar/pkg/libproxy/trunk/files/0001-Use-xc99-for-Sun-Studio-compiler.patch =================================================================== --- csw/mgar/pkg/libproxy/trunk/files/0001-Use-xc99-for-Sun-Studio-compiler.patch 2010-01-05 20:21:32 UTC (rev 7880) +++ csw/mgar/pkg/libproxy/trunk/files/0001-Use-xc99-for-Sun-Studio-compiler.patch 2010-01-05 20:43:05 UTC (rev 7881) @@ -12,17 +12,6 @@ src/modules/Makefile.in | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) -diff --git a/src/bin/Makefile.am b/src/bin/Makefile.am -index 0248879..9c7633e 100644 ---- a/src/bin/Makefile.am -+++ b/src/bin/Makefile.am -@@ -2,5 +2,5 @@ bin_PROGRAMS = proxy - - # Command line interface to libproxy - proxy_SOURCES = proxy.c --proxy_CPPFLAGS = -I$(top_srcdir)/src/lib -std=c99 -+proxy_CPPFLAGS = -I$(top_srcdir)/src/lib -xc99 - proxy_LDADD = ../lib/libproxy.la diff --git a/src/bin/Makefile.in b/src/bin/Makefile.in index 625fbb3..ed8cd56 100644 --- a/src/bin/Makefile.in @@ -36,19 +25,6 @@ proxy_LDADD = ../lib/libproxy.la all: all-am -diff --git a/src/lib/Makefile.am b/src/lib/Makefile.am -index 626d1c4..b1c6b80 100644 ---- a/src/lib/Makefile.am -+++ b/src/lib/Makefile.am -@@ -10,7 +10,7 @@ libproxy_la_SOURCES = \ - strdict.c strdict.h \ - url.c url.h - --libproxy_la_CFLAGS = -DMODULEDIR=\"@MODULEDIR@@DIR_SEPARATOR@\" -DSYSCONFDIR=\"@SYSCONFDIR@@DIR_SEPARATOR@\" -std=c99 -D_POSIX_C_SOURCE=200112L -+libproxy_la_CFLAGS = -DMODULEDIR=\"@MODULEDIR@@DIR_SEPARATOR@\" -DSYSCONFDIR=\"@SYSCONFDIR@@DIR_SEPARATOR@\" -xc99 -D_POSIX_C_SOURCE=200112L - libproxy_la_LDFLAGS = -lpthread -lm -no-undefined - - include_HEADERS = proxy.h diff --git a/src/lib/Makefile.in b/src/lib/Makefile.in index 77bb2da..73e087c 100644 --- a/src/lib/Makefile.in @@ -62,17 +38,6 @@ libproxy_la_LDFLAGS = -lpthread -lm -no-undefined include_HEADERS = proxy.h all: all-am -diff --git a/src/modules/Makefile.am b/src/modules/Makefile.am -index 170791b..84bd0b5 100644 ---- a/src/modules/Makefile.am -+++ b/src/modules/Makefile.am -@@ -1,5 +1,5 @@ - moduledir = @MODULEDIR@ --AM_CFLAGS = -std=c99 -+AM_CFLAGS = -xc99 - AM_LDFLAGS = -module -avoid-version -no-undefined - - diff --git a/src/modules/Makefile.in b/src/modules/Makefile.in index 6965056..45c9c57 100644 --- a/src/modules/Makefile.in Added: csw/mgar/pkg/libproxy/trunk/files/0001-Use-xc99-for-Sun-Studio-compiler.patch.orig =================================================================== --- csw/mgar/pkg/libproxy/trunk/files/0001-Use-xc99-for-Sun-Studio-compiler.patch.orig (rev 0) +++ csw/mgar/pkg/libproxy/trunk/files/0001-Use-xc99-for-Sun-Studio-compiler.patch.orig 2010-01-05 20:43:05 UTC (rev 7881) @@ -0,0 +1,91 @@ +From 3ea26b980c8929de2f92a33de49a09dc12f63a68 Mon Sep 17 00:00:00 2001 +From: Dagobert Michelsen +Date: Tue, 5 Jan 2010 15:29:01 +0100 +Subject: [PATCH] Use xc99 for Sun Studio compiler + +--- + src/bin/Makefile.am | 2 +- + src/bin/Makefile.in | 2 +- + src/lib/Makefile.am | 2 +- + src/lib/Makefile.in | 2 +- + src/modules/Makefile.am | 2 +- + src/modules/Makefile.in | 2 +- + 6 files changed, 6 insertions(+), 6 deletions(-) + +diff --git a/src/bin/Makefile.am b/src/bin/Makefile.am +index 0248879..9c7633e 100644 +--- a/src/bin/Makefile.am ++++ b/src/bin/Makefile.am +@@ -2,5 +2,5 @@ bin_PROGRAMS = proxy + + # Command line interface to libproxy + proxy_SOURCES = proxy.c +-proxy_CPPFLAGS = -I$(top_srcdir)/src/lib -std=c99 ++proxy_CPPFLAGS = -I$(top_srcdir)/src/lib -xc99 + proxy_LDADD = ../lib/libproxy.la +diff --git a/src/bin/Makefile.in b/src/bin/Makefile.in +index 625fbb3..ed8cd56 100644 +--- a/src/bin/Makefile.in ++++ b/src/bin/Makefile.in +@@ -239,7 +239,7 @@ xmu_LIBS = @xmu_LIBS@ + + # Command line interface to libproxy + proxy_SOURCES = proxy.c +-proxy_CPPFLAGS = -I$(top_srcdir)/src/lib -std=c99 ++proxy_CPPFLAGS = -I$(top_srcdir)/src/lib -xc99 + proxy_LDADD = ../lib/libproxy.la + all: all-am + +diff --git a/src/lib/Makefile.am b/src/lib/Makefile.am +index 626d1c4..b1c6b80 100644 +--- a/src/lib/Makefile.am ++++ b/src/lib/Makefile.am +@@ -10,7 +10,7 @@ libproxy_la_SOURCES = \ + strdict.c strdict.h \ + url.c url.h + +-libproxy_la_CFLAGS = -DMODULEDIR=\"@MODULEDIR@@DIR_SEPARATOR@\" -DSYSCONFDIR=\"@SYSCONFDIR@@DIR_SEPARATOR@\" -std=c99 -D_POSIX_C_SOURCE=200112L ++libproxy_la_CFLAGS = -DMODULEDIR=\"@MODULEDIR@@DIR_SEPARATOR@\" -DSYSCONFDIR=\"@SYSCONFDIR@@DIR_SEPARATOR@\" -xc99 -D_POSIX_C_SOURCE=200112L + libproxy_la_LDFLAGS = -lpthread -lm -no-undefined + + include_HEADERS = proxy.h +diff --git a/src/lib/Makefile.in b/src/lib/Makefile.in +index 77bb2da..73e087c 100644 +--- a/src/lib/Makefile.in ++++ b/src/lib/Makefile.in +@@ -277,7 +277,7 @@ libproxy_la_SOURCES = \ + strdict.c strdict.h \ + url.c url.h + +-libproxy_la_CFLAGS = -DMODULEDIR=\"@MODULEDIR@@DIR_SEPARATOR@\" -DSYSCONFDIR=\"@SYSCONFDIR@@DIR_SEPARATOR@\" -std=c99 -D_POSIX_C_SOURCE=200112L ++libproxy_la_CFLAGS = -DMODULEDIR=\"@MODULEDIR@@DIR_SEPARATOR@\" -DSYSCONFDIR=\"@SYSCONFDIR@@DIR_SEPARATOR@\" -xc99 -D_POSIX_C_SOURCE=200112L + libproxy_la_LDFLAGS = -lpthread -lm -no-undefined + include_HEADERS = proxy.h + all: all-am +diff --git a/src/modules/Makefile.am b/src/modules/Makefile.am +index 170791b..84bd0b5 100644 +--- a/src/modules/Makefile.am ++++ b/src/modules/Makefile.am +@@ -1,5 +1,5 @@ + moduledir = @MODULEDIR@ +-AM_CFLAGS = -std=c99 ++AM_CFLAGS = -xc99 + AM_LDFLAGS = -module -avoid-version -no-undefined + + +diff --git a/src/modules/Makefile.in b/src/modules/Makefile.in +index 6965056..45c9c57 100644 +--- a/src/modules/Makefile.in ++++ b/src/modules/Makefile.in +@@ -359,7 +359,7 @@ x11_LIBS = @x11_LIBS@ + xmu_CFLAGS = @xmu_CFLAGS@ + xmu_LIBS = @xmu_LIBS@ + moduledir = @MODULEDIR@ +-AM_CFLAGS = -std=c99 ++AM_CFLAGS = -xc99 + AM_LDFLAGS = -module -avoid-version -no-undefined + + # Which modules to build +-- +1.6.6 + Modified: csw/mgar/pkg/libproxy/trunk/files/0002-Dont-preset-CFLAGS.patch =================================================================== --- csw/mgar/pkg/libproxy/trunk/files/0002-Dont-preset-CFLAGS.patch 2010-01-05 20:21:32 UTC (rev 7880) +++ csw/mgar/pkg/libproxy/trunk/files/0002-Dont-preset-CFLAGS.patch 2010-01-05 20:43:05 UTC (rev 7881) @@ -14,21 +14,6 @@ ac_config_files="$ac_config_files libproxy-1.0.pc Makefile libproxy.spec src/Makefile src/lib/Makefile src/modules/Makefile src/bin/Makefile src/bindings/Makefile src/bindings/python/Makefile src/bindings/java/Makefile src/platform/Makefile src/platform/win32/Makefile src/bindings/dotnet/Makefile src/bindings/dotnet/libproxy-sharp-1.0.pc src/bindings/dotnet/AssemblyInfo.cs" cat >confcache <<\_ACEOF -diff --git a/configure.ac b/configure.ac -index c9e0bb9..4139f95 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -238,7 +238,7 @@ case $host in - AC_CHECK_LIB(ws2_32, main) - esac - --CFLAGS="-g -Wall -pedantic $CFLAGS" -+#CFLAGS="-g -Wall -pedantic $CFLAGS" - AC_CONFIG_FILES([libproxy-1.0.pc Makefile libproxy.spec src/Makefile src/lib/Makefile - src/modules/Makefile src/bin/Makefile src/bindings/Makefile - src/bindings/python/Makefile src/bindings/java/Makefile -diff --git a/src/lib/Makefile b/src/lib/Makefile -index 867b01b..0ba55f6 100644 -- 1.6.6 Added: csw/mgar/pkg/libproxy/trunk/files/0002-Dont-preset-CFLAGS.patch.orig =================================================================== --- csw/mgar/pkg/libproxy/trunk/files/0002-Dont-preset-CFLAGS.patch.orig (rev 0) +++ csw/mgar/pkg/libproxy/trunk/files/0002-Dont-preset-CFLAGS.patch.orig 2010-01-05 20:43:05 UTC (rev 7881) @@ -0,0 +1,35 @@ +From 6677cc7bc95aeeee76c7741ee9edd03469b7936e Mon Sep 17 00:00:00 2001 +From: Dagobert Michelsen +Date: Tue, 5 Jan 2010 15:35:21 +0100 +Subject: [PATCH 2/2] Initial commit + +--- a/configure ++++ b/configure +@@ -14683,7 +14683,7 @@ fi + + esac + +-CFLAGS="-g -Wall -pedantic $CFLAGS" ++# CFLAGS="-g -Wall -pedantic $CFLAGS" + ac_config_files="$ac_config_files libproxy-1.0.pc Makefile libproxy.spec src/Makefile src/lib/Makefile src/modules/Makefile src/bin/Makefile src/bindings/Makefile src/bindings/python/Makefile src/bindings/java/Makefile src/platform/Makefile src/platform/win32/Makefile src/bindings/dotnet/Makefile src/bindings/dotnet/libproxy-sharp-1.0.pc src/bindings/dotnet/AssemblyInfo.cs" + + cat >confcache <<\_ACEOF +diff --git a/configure.ac b/configure.ac +index c9e0bb9..4139f95 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -238,7 +238,7 @@ case $host in + AC_CHECK_LIB(ws2_32, main) + esac + +-CFLAGS="-g -Wall -pedantic $CFLAGS" ++#CFLAGS="-g -Wall -pedantic $CFLAGS" + AC_CONFIG_FILES([libproxy-1.0.pc Makefile libproxy.spec src/Makefile src/lib/Makefile + src/modules/Makefile src/bin/Makefile src/bindings/Makefile + src/bindings/python/Makefile src/bindings/java/Makefile +diff --git a/src/lib/Makefile b/src/lib/Makefile +index 867b01b..0ba55f6 100644 + +-- +1.6.6 + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Tue Jan 5 21:55:17 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 05 Jan 2010 20:55:17 +0000 Subject: [csw-devel] SF.net SVN: gar:[7882] csw/mgar/pkg/mpg123/trunk/Makefile Message-ID: Revision: 7882 http://gar.svn.sourceforge.net/gar/?rev=7882&view=rev Author: dmichelsen Date: 2010-01-05 20:55:17 +0000 (Tue, 05 Jan 2010) Log Message: ----------- mpg123: Do not use assembler optimizations with Sun Studio Modified Paths: -------------- csw/mgar/pkg/mpg123/trunk/Makefile Modified: csw/mgar/pkg/mpg123/trunk/Makefile =================================================================== --- csw/mgar/pkg/mpg123/trunk/Makefile 2010-01-05 20:43:05 UTC (rev 7881) +++ csw/mgar/pkg/mpg123/trunk/Makefile 2010-01-05 20:55:17 UTC (rev 7882) @@ -23,6 +23,7 @@ NO_ISAEXEC = 1 EXTRA_BUILD_ISAS = sparcv8plus+vis pentium CONFIGURE_ARGS = $(DIRPATHS) +CONFIGURE_ARGS += --with-cpu=generic_fpu # When we compile 64 bit largefiles are always on CONFIGURE_ARGS_mm-64 += --disable-largefile This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Tue Jan 5 22:38:12 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Tue, 05 Jan 2010 21:38:12 +0000 Subject: [csw-devel] SF.net SVN: gar:[7883] csw/mgar/pkg/keychain/trunk Message-ID: Revision: 7883 http://gar.svn.sourceforge.net/gar/?rev=7883&view=rev Author: wahwah Date: 2010-01-05 21:38:12 +0000 (Tue, 05 Jan 2010) Log Message: ----------- keychain: Version bump up to 2.7.0 Modified Paths: -------------- csw/mgar/pkg/keychain/trunk/Makefile csw/mgar/pkg/keychain/trunk/checksums Added Paths: ----------- csw/mgar/pkg/keychain/trunk/files/gsed.patch Modified: csw/mgar/pkg/keychain/trunk/Makefile =================================================================== --- csw/mgar/pkg/keychain/trunk/Makefile 2010-01-05 20:55:17 UTC (rev 7882) +++ csw/mgar/pkg/keychain/trunk/Makefile 2010-01-05 21:38:12 UTC (rev 7883) @@ -3,7 +3,7 @@ # $Header$ GARNAME = keychain -GARVERSION = 2.6.8 +GARVERSION = 2.7.0 CATEGORIES = utils DESCRIPTION = Convenient ssh-agent and gpg-agent manager @@ -18,26 +18,34 @@ . ~/.keychain/$$HOSTNAME-sh endef -MASTER_SITES = http://agriffis.n01se.net/keychain/ +MASTER_SITES = http://www.funtoo.org/archive/keychain/ DISTFILES = $(GARNAME)-$(GARVERSION).tar.bz2 +PATCHFILES = gsed.patch -# We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.bz2 ARCHALL = 1 CONFIGURE_SCRIPTS = -BUILD_SCRIPTS = +BUILD_SCRIPTS = keychain INSTALL_SCRIPTS = keychain TEST_SCRIPTS = +PREREQUISITE_PKGS = CSWperl + +include gar/category.mk + +build-keychain: + (cd $(WORKSRC); gmake keychain) + (cd $(WORKSRC); gmake keychain.1) + @$(MAKECOOKIE) + install-keychain: ginstall -d $(DESTDIR)$(bindir_install) ginstall -m 755 $(WORKSRC)/keychain $(DESTDIR)$(bindir_install) ginstall -d $(DESTDIR)$(mandir)/man1 ginstall -m 644 $(WORKSRC)/keychain.1 $(DESTDIR)$(mandir)/man1/ ginstall -d $(DESTDIR)$(docdir)/$(GARNAME) - ginstall $(WORKSRC)/README $(DESTDIR)$(docdir)/$(GARNAME) + ginstall $(WORKSRC)/README.rst $(DESTDIR)$(docdir)/$(GARNAME) ginstall $(WORKSRC)/ChangeLog $(DESTDIR)$(docdir)/$(GARNAME) ginstall $(WORKSRC)/keychain.pod $(DESTDIR)$(docdir)/$(GARNAME) - -include gar/category.mk + @$(MAKECOOKIE) Modified: csw/mgar/pkg/keychain/trunk/checksums =================================================================== --- csw/mgar/pkg/keychain/trunk/checksums 2010-01-05 20:55:17 UTC (rev 7882) +++ csw/mgar/pkg/keychain/trunk/checksums 2010-01-05 21:38:12 UTC (rev 7883) @@ -1 +1,2 @@ -2a23b311e438ecebed5639b568738d28 download/keychain-2.6.8.tar.bz2 +8efbaa227e87387db062f22d371b4157 gsed.patch +c5eecd36130d9e8617a77f96b746982d keychain-2.7.0.tar.bz2 Added: csw/mgar/pkg/keychain/trunk/files/gsed.patch =================================================================== --- csw/mgar/pkg/keychain/trunk/files/gsed.patch (rev 0) +++ csw/mgar/pkg/keychain/trunk/files/gsed.patch 2010-01-05 21:38:12 UTC (rev 7883) @@ -0,0 +1,11 @@ +--- keychain-2.7.0/Makefile.orig 2010-01-05 22:14:32.175890134 +0100 ++++ keychain-2.7.0/Makefile 2010-01-05 22:14:48.137272015 +0100 +@@ -1,7 +1,7 @@ + V:=$(shell /bin/sh keychain.sh --version 2>&1 | \ + awk -F'[ ;]' '/^K/{print $$2; exit}') + D:=$(shell date +'%d %b %Y') +-SED = $(shell sed --version > /dev/null && echo sed || (gsed --version && echo gsed || false)) ++SED = $(shell sed --version > /dev/null && echo sed || gsed --version && echo gsed || false) + TARBALL_CONTENTS=keychain README.rst ChangeLog COPYING keychain.pod keychain.1 \ + keychain.spec + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Tue Jan 5 23:29:07 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Tue, 05 Jan 2010 22:29:07 +0000 Subject: [csw-devel] SF.net SVN: gar:[7884] csw/mgar/pkg/keychain/trunk Message-ID: Revision: 7884 http://gar.svn.sourceforge.net/gar/?rev=7884&view=rev Author: wahwah Date: 2010-01-05 22:29:07 +0000 (Tue, 05 Jan 2010) Log Message: ----------- keychain: A better patch Modified Paths: -------------- csw/mgar/pkg/keychain/trunk/Makefile csw/mgar/pkg/keychain/trunk/checksums csw/mgar/pkg/keychain/trunk/files/gsed.patch Modified: csw/mgar/pkg/keychain/trunk/Makefile =================================================================== --- csw/mgar/pkg/keychain/trunk/Makefile 2010-01-05 21:38:12 UTC (rev 7883) +++ csw/mgar/pkg/keychain/trunk/Makefile 2010-01-05 22:29:07 UTC (rev 7884) @@ -35,8 +35,8 @@ include gar/category.mk build-keychain: - (cd $(WORKSRC); gmake keychain) - (cd $(WORKSRC); gmake keychain.1) + (cd $(WORKSRC); gmake SED=gsed keychain) + (cd $(WORKSRC); gmake SED=gsed keychain.1) @$(MAKECOOKIE) install-keychain: Modified: csw/mgar/pkg/keychain/trunk/checksums =================================================================== --- csw/mgar/pkg/keychain/trunk/checksums 2010-01-05 21:38:12 UTC (rev 7883) +++ csw/mgar/pkg/keychain/trunk/checksums 2010-01-05 22:29:07 UTC (rev 7884) @@ -1,2 +1,2 @@ -8efbaa227e87387db062f22d371b4157 gsed.patch +ad52a3ab14a63ccff22cac5076286bcb gsed.patch c5eecd36130d9e8617a77f96b746982d keychain-2.7.0.tar.bz2 Modified: csw/mgar/pkg/keychain/trunk/files/gsed.patch =================================================================== --- csw/mgar/pkg/keychain/trunk/files/gsed.patch 2010-01-05 21:38:12 UTC (rev 7883) +++ csw/mgar/pkg/keychain/trunk/files/gsed.patch 2010-01-05 22:29:07 UTC (rev 7884) @@ -1,11 +1,27 @@ ---- keychain-2.7.0/Makefile.orig 2010-01-05 22:14:32.175890134 +0100 -+++ keychain-2.7.0/Makefile 2010-01-05 22:14:48.137272015 +0100 -@@ -1,7 +1,7 @@ +--- a/Makefile 2010-01-05 22:40:37.832643496 +0100 ++++ b/Makefile 2010-01-05 23:01:25.428084486 +0100 +@@ -1,19 +1,22 @@ V:=$(shell /bin/sh keychain.sh --version 2>&1 | \ awk -F'[ ;]' '/^K/{print $$2; exit}') D:=$(shell date +'%d %b %Y') --SED = $(shell sed --version > /dev/null && echo sed || (gsed --version && echo gsed || false)) -+SED = $(shell sed --version > /dev/null && echo sed || gsed --version && echo gsed || false) ++ifndef SED ++SED = sed ++endif TARBALL_CONTENTS=keychain README.rst ChangeLog COPYING keychain.pod keychain.1 \ keychain.spec + all: keychain.1.gz keychain keychain.spec + + keychain.spec: keychain.spec.in keychain.sh +- sed 's/KEYCHAIN_VERSION/$V/' keychain.spec.in > keychain.spec ++ $(SED) 's/KEYCHAIN_VERSION/$V/' keychain.spec.in > keychain.spec + + keychain.1: keychain.pod keychain.sh + pod2man --name=keychain --release=$V \ + --center='http://gentoo.org/proj/en/keychain.xml' \ + keychain.pod keychain.1 +- sed -i.orig -e "s/^'br/.br/" keychain.1 ++ $(SED) -i.orig -e "s/^'br/.br/" keychain.1 + + keychain.1.gz: keychain.1 + gzip -9 keychain.1 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From skayser at users.sourceforge.net Wed Jan 6 01:19:47 2010 From: skayser at users.sourceforge.net (skayser at users.sourceforge.net) Date: Wed, 06 Jan 2010 00:19:47 +0000 Subject: [csw-devel] SF.net SVN: gar:[7885] csw/mgar/pkg/mbuffer/trunk Message-ID: Revision: 7885 http://gar.svn.sourceforge.net/gar/?rev=7885&view=rev Author: skayser Date: 2010-01-06 00:19:47 +0000 (Wed, 06 Jan 2010) Log Message: ----------- mbuffer: bumped to 227 (looks good eventually), fixed test suite, switched to isaexec Modified Paths: -------------- csw/mgar/pkg/mbuffer/trunk/Makefile csw/mgar/pkg/mbuffer/trunk/checksums csw/mgar/pkg/mbuffer/trunk/files/changelog.CSW Added Paths: ----------- csw/mgar/pkg/mbuffer/trunk/files/0001-Makefile-put-background-jobs-in-same-shell-as-the-wa.patch Modified: csw/mgar/pkg/mbuffer/trunk/Makefile =================================================================== --- csw/mgar/pkg/mbuffer/trunk/Makefile 2010-01-05 22:29:07 UTC (rev 7884) +++ csw/mgar/pkg/mbuffer/trunk/Makefile 2010-01-06 00:19:47 UTC (rev 7885) @@ -1,8 +1,5 @@ -# STATUS/TODO -# - provide feedback about -xarch=generic64 to upstream -# - verify that tests pass GARNAME = mbuffer -GARVERSION = 20091122 +GARVERSION = 20091227 CATEGORIES = utils DESCRIPTION = A tool for buffering data streams @@ -22,25 +19,26 @@ LICENSE = LICENSE +# The tests use background process and wait, but don't issue the wait +# in the same shell as the background processes were launched in. Fix this. +# Already submitted to upstream, maybe integrated in future versions. +PATCHFILES = 0001-Makefile-put-background-jobs-in-same-shell-as-the-wa.patch + # Required during packaging (for the "test" target) -PREREQUISITE_PKGS = CSWmktemp CSWgcc4core +PREREQUISITE_PKGS = CSWmktemp +PREREQUISITE_PKGS += CSWgcc4core -REQUIRED_PKGS = CSWosslrt CSWlibmhash +REQUIRED_PKGS = CSWlibmhash -# To build the mixed package for x86 you have to do the following -# 1) build8x: gmake merge -# 2) build10x: gmake merge -# 3) build8x: gmake package +# 64-bit build enables buffers >= 2GB (see README). BUILD64 = 1 -# 64-bit isn't thorougly tested by upstream, default to 32-bit, but still -# deliver 64-bit in case someone might want to play around with 2GB+ buffers -# ISAEXEC_BINS = $(bindir)/mbuffer -NO_ISAEXEC = 1 - CONFIGURE_ARGS = $(DIRPATHS) -TEST_SCRIPTS = custom +# While we have IPv6 loopback interfaces on the buildfarm now, build10x +# is missing an localhost IPv6 address entry for /etc/hosts. test3 requires +# one, thus we omit it for the time being. +TEST_TARGET = -o test3 check # Required for updated libmhash (mbuffer builds against it) which allows for # flexible const/non-const definitions. There should be a more intelligent @@ -50,36 +48,10 @@ include gar/category.mk -# The test scripts do file IO and this is so sloooooow when being run -# in a NFS mounted $HOME. The local disk on build8x is no better, so -# just do the testing from /tmp instead. -# -# TODO: -# * Clean up $TMPDIR even when the nested make fails. -# * Somehow assert that the isa-amd64 test is run on build10x -# -test-custom: TMPDIR := $(shell mktemp -d -p /tmp) -test-custom: - echo "Running target test-custom, TMPDIR = $(TMPDIR)" - cp $(WORKSRC)/mbuffer $(WORKSRC)/Makefile $(TMPDIR)/ - - # Target test3 is skipped because it contains IPV6 tests which - # are not supported by the build farm boxes (yet). - $(MAKE) -C $(TMPDIR) -o test3 check || rm -rf $(TMPDIR) && exit 1 - test -d $(TMPDIR) && rm -rf $(TMPDIR) - @$(MAKECOOKIE) - -# mbuffer-20091122 always tries to use -xarch=generic64, -# even for non-64bit builds -post-configure-modulated: - [ "$(GARCH)" -eq "i386" -o "$(GARCH)" -eq "sparcv8" ] && \ - gsed -ie 's/-xarch=generic64//' $(WORKSRC)/Makefile - @$(MAKECOOKIE) - post-install-modulated: DOCS = ChangeLog README AUTHORS post-install-modulated: DOCDEST = $(DESTDIR)$(docdir)/$(GARNAME) post-install-modulated: ginstall -d $(DOCDEST) - $(foreach DOC,$(DOCS),cp $(WORKSRC)/$(DOC) $(DOCDEST);) + cp $(addprefix $(WORKSRC)/,$(DOCS)) $(DOCDEST) cp $(FILEDIR)/changelog.CSW $(DOCDEST) @$(MAKECOOKIE) Modified: csw/mgar/pkg/mbuffer/trunk/checksums =================================================================== --- csw/mgar/pkg/mbuffer/trunk/checksums 2010-01-05 22:29:07 UTC (rev 7884) +++ csw/mgar/pkg/mbuffer/trunk/checksums 2010-01-06 00:19:47 UTC (rev 7885) @@ -1 +1,2 @@ -3f05bd393ac749ed820636e5aaed7848 mbuffer-20091122.tgz +59fc19279af037462bd96279f5580c58 0001-Makefile-put-background-jobs-in-same-shell-as-the-wa.patch +191663396b4b1752d7104803631b9e54 mbuffer-20091227.tgz Added: csw/mgar/pkg/mbuffer/trunk/files/0001-Makefile-put-background-jobs-in-same-shell-as-the-wa.patch =================================================================== --- csw/mgar/pkg/mbuffer/trunk/files/0001-Makefile-put-background-jobs-in-same-shell-as-the-wa.patch (rev 0) +++ csw/mgar/pkg/mbuffer/trunk/files/0001-Makefile-put-background-jobs-in-same-shell-as-the-wa.patch 2010-01-06 00:19:47 UTC (rev 7885) @@ -0,0 +1,50 @@ +From 280c3806583428f2d20718839129ea0758e8cdbc Mon Sep 17 00:00:00 2001 +From: Sebastian Kayser +Date: Tue, 5 Jan 2010 23:19:33 +0100 +Subject: [PATCH] Makefile: put background jobs in same shell as the wait call + +--- + Makefile.in | 20 ++++++++++---------- + 1 files changed, 10 insertions(+), 10 deletions(-) + +diff --git a/Makefile.in b/Makefile.in +index b381ade..bf9953f 100644 +--- a/Makefile.in ++++ b/Makefile.in +@@ -73,11 +73,11 @@ test1: test.md5 + touch $@ + + test2: test.md5 +- ./mbuffer -q -I :8000 -o $@.tar -o - | openssl md5 > $@.md5 & +- sleep 1 +- -rm -f $@.tar +- ./mbuffer -i test.tar -o /dev/null -O localhost:8000 -H +- wait ++ ./mbuffer -q -I :8000 -o $@.tar -o - | openssl md5 > $@.md5 & \ ++ sleep 1; \ ++ rm -f $@.tar; \ ++ ./mbuffer -i test.tar -o /dev/null -O localhost:8000 -H; \ ++ wait + sync + diff $@.md5 test.md5 + rm $@.md5 +@@ -88,11 +88,11 @@ test2: test.md5 + touch $@ + + test3: test.md5 +- ./mbuffer -q -6 -I :8000 | openssl md5 > $@.md5 & +- sleep 1 +- -rm -f $@.tar +- ./mbuffer -i test.tar -o /dev/null -6 -O localhost:8000 -o $@.tar -H +- wait ++ ./mbuffer -q -6 -I :8000 | openssl md5 > $@.md5 & \ ++ sleep 1; \ ++ rm -f $@.tar; \ ++ ./mbuffer -i test.tar -o /dev/null -6 -O localhost:8000 -o $@.tar -H; \ ++ wait + sync + diff $@.md5 test.md5 + rm $@.md5 +-- +1.6.5.1 + Modified: csw/mgar/pkg/mbuffer/trunk/files/changelog.CSW =================================================================== --- csw/mgar/pkg/mbuffer/trunk/files/changelog.CSW 2010-01-05 22:29:07 UTC (rev 7884) +++ csw/mgar/pkg/mbuffer/trunk/files/changelog.CSW 2010-01-06 00:19:47 UTC (rev 7885) @@ -1,3 +1,12 @@ +mbuffer (20091227,REV=2010.01.06) + + * Updated to new upstream release 20091227 (Closes #3912, #3980). + * Links against libmhash instead of openssl_rt for hash creation. + * /opt/csw/bin/mbuffer is now a link to isaexec which automatically + calls the appropriate mbuffer platform binary (32-bit or 64-bit). + + -- Sebastian Kayser Wed, 6 Jan 2010 00:50:20 +0100 + mbuffer (20090215,REV=2009.05.10) * Recompiled with updated GAR build system (Closes: #3561). This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Wed Jan 6 02:13:57 2010 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Wed, 06 Jan 2010 01:13:57 +0000 Subject: [csw-devel] SF.net SVN: gar:[7886] csw/mgar/pkg/asciidoc/trunk Message-ID: Revision: 7886 http://gar.svn.sourceforge.net/gar/?rev=7886&view=rev Author: bdwalton Date: 2010-01-06 01:13:57 +0000 (Wed, 06 Jan 2010) Log Message: ----------- asciidoc: update PATH munging patch for a2x bash -> python conversion Modified Paths: -------------- csw/mgar/pkg/asciidoc/trunk/checksums csw/mgar/pkg/asciidoc/trunk/files/add-csw-gnu-path-to-a2x.patch Modified: csw/mgar/pkg/asciidoc/trunk/checksums =================================================================== --- csw/mgar/pkg/asciidoc/trunk/checksums 2010-01-06 00:19:47 UTC (rev 7885) +++ csw/mgar/pkg/asciidoc/trunk/checksums 2010-01-06 01:13:57 UTC (rev 7886) @@ -1,3 +1,3 @@ -62c15a6f036ca40ad0dffb0b14ad6630 add-csw-gnu-path-to-a2x.patch +0f4502395f72632388628d3720bdfd42 add-csw-gnu-path-to-a2x.patch 3ed69184645b233b83a52f8a722d1461 asciidoc-8.5.2.tar.gz ec48eeea1eafdaa7e507bc11327f6eae handle-csw-etc-paths.patch Modified: csw/mgar/pkg/asciidoc/trunk/files/add-csw-gnu-path-to-a2x.patch =================================================================== --- csw/mgar/pkg/asciidoc/trunk/files/add-csw-gnu-path-to-a2x.patch 2010-01-06 00:19:47 UTC (rev 7885) +++ csw/mgar/pkg/asciidoc/trunk/files/add-csw-gnu-path-to-a2x.patch 2010-01-06 01:13:57 UTC (rev 7886) @@ -1,13 +1,12 @@ -diff --speed-large-files --minimal -Nru asciidoc-8.4.5.orig/a2x asciidoc-8.4.5/a2x ---- asciidoc-8.4.5.orig/a2x 2009-05-12 00:26:16.000000000 +0200 -+++ asciidoc-8.4.5/a2x 2009-09-18 21:32:44.546730245 +0200 -@@ -7,6 +7,9 @@ - # under the terms of the GNU General Public License (GPL). - # +diff -ru asciidoc-8.5.2.orig/a2x.py asciidoc-8.5.2/a2x.py +--- asciidoc-8.5.2.orig/a2x.py 2010-01-06 01:42:35.549886234 +0100 ++++ asciidoc-8.5.2/a2x.py 2010-01-06 01:53:47.076069410 +0100 +@@ -57,6 +57,8 @@ -+PATH=/opt/csw/gnu:/opt/csw/bin:$PATH -+export PATH + OPTIONS = None # These functions read verbose and dry_run command options. + ++os.environ["PATH"] = "/opt/csw/gnu:/opt/csw/bin:" + os.environ["PATH"] + - VERSION=1.0.0 - BASENAME=$(basename "$0") - REALNAME="$0" + def errmsg(msg): + sys.stderr.write('%s: %s\n' % (PROG,msg)) + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From hson at users.sourceforge.net Wed Jan 6 02:57:42 2010 From: hson at users.sourceforge.net (hson at users.sourceforge.net) Date: Wed, 06 Jan 2010 01:57:42 +0000 Subject: [csw-devel] SF.net SVN: gar:[7887] csw/mgar/pkg Message-ID: Revision: 7887 http://gar.svn.sourceforge.net/gar/?rev=7887&view=rev Author: hson Date: 2010-01-06 01:57:42 +0000 (Wed, 06 Jan 2010) Log Message: ----------- evolution-exchange: Initial commit Added Paths: ----------- csw/mgar/pkg/evolution-exchange/ csw/mgar/pkg/evolution-exchange/Makefile csw/mgar/pkg/evolution-exchange/branches/ csw/mgar/pkg/evolution-exchange/tags/ csw/mgar/pkg/evolution-exchange/trunk/ csw/mgar/pkg/evolution-exchange/trunk/Makefile csw/mgar/pkg/evolution-exchange/trunk/checksums csw/mgar/pkg/evolution-exchange/trunk/files/ Added: csw/mgar/pkg/evolution-exchange/Makefile =================================================================== --- csw/mgar/pkg/evolution-exchange/Makefile (rev 0) +++ csw/mgar/pkg/evolution-exchange/Makefile 2010-01-06 01:57:42 UTC (rev 7887) @@ -0,0 +1,15 @@ +# vim: ft=make ts=4 sw=4 noet + +default: + @echo "You are in the pkg/ directory." + +%: + $(MAKE) -C trunk $* + +paranoid-%: + $(MAKE) -C trunk $* || exit 2 + +export BUILDLOG ?= $(shell pwd)/buildlog.txt + +report-%: + $(MAKE) -C trunk $* || echo " *** make $* in $$i failed ***" >> $(BUILDLOG) Property changes on: csw/mgar/pkg/evolution-exchange/trunk ___________________________________________________________________ Added: svn:ignore + cookies download work Added: svn:externals + gar https://gar.svn.sf.net/svnroot/gar/csw/mgar/gar/v2 Added: csw/mgar/pkg/evolution-exchange/trunk/Makefile =================================================================== --- csw/mgar/pkg/evolution-exchange/trunk/Makefile (rev 0) +++ csw/mgar/pkg/evolution-exchange/trunk/Makefile 2010-01-06 01:57:42 UTC (rev 7887) @@ -0,0 +1,53 @@ +GARNAME = evolution-exchange +GARVERSION = 2.28.2 +CATEGORIES = gnome + +DESCRIPTION = Evolution Web Calendar +define BLURB +endef + +MASTER_SITES = $(GNOME_MIRROR) +DISTFILES = $(GARNAME)-$(GARVERSION).tar.bz2 +DISTNAME = $(GARNAME)-$(GARVERSION) + +PACKAGES = CSWevolutionexchange CSWevolutionexchange-devel CSWevolutionexchange-doc +CATALOGNAME_CSWevolutionexchange = evolution_webcal +CATALOGNAME_CSWevolutionexchange-devel = evolution_webcal_devel +CATALOGNAME_CSWevolutionexchange-doc = evolution_webcal_doc + +SPKG_DESC_CSWevolutionexchange += Evolution Web Calendar +SPKG_DESC_CSWevolutionexchange-devel += Evolution Web Calendar - developer package +SPKG_DESC_CSWevolutionexchange-doc += Evolution Web Calendar - documentation + +REQUIRED_PKGS_CSWevolutionexchange += +REQUIRED_PKGS_CSWevolutionexchange += +REQUIRED_PKGS_CSWevolutionexchange += +REQUIRED_PKGS_CSWevolutionexchange-devel += CSWevolution +REQUIRED_PKGS_CSWevolutionexchange-doc += CSWevolution + +PKGFILES_CSWevolutionexchange-devel = $(PKGFILES_DEVEL) +PKGFILES_CSWevolutionexchange-doc = $(sharedstatedir)/gtk-doc/.* + +ARCHALL_CSWevolutionexchange-doc = 1 + +INCOMPATIBLE_PKGS_CSWevolutionexchange = CSWximian-connector + +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.bz2 + +SPKG_SOURCEURL =http://projects.gnome.org/evolution-webcal + +EXTRA_INC = $(prefix)/X11/include +EXTRA_LIB = $(prefix)/X11/lib +EXTRA_PKG_CONFIG_DIRS = $(prefix)/X11/lib + +BUILD64 = 1 + +STRIP_LIBTOOL = 1 + +CONFIGURE_ARGS = $(DIRPATHS) + +TEST_TARGET = check + +include gar/category.mk + +PATH := /opt/csw/gnu:$(PATH) Added: csw/mgar/pkg/evolution-exchange/trunk/checksums =================================================================== --- csw/mgar/pkg/evolution-exchange/trunk/checksums (rev 0) +++ csw/mgar/pkg/evolution-exchange/trunk/checksums 2010-01-06 01:57:42 UTC (rev 7887) @@ -0,0 +1 @@ +82f70761960c7e9efdb24650c1b3229b evolution-exchange-2.28.2.tar.bz2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Wed Jan 6 12:28:36 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 06 Jan 2010 11:28:36 +0000 Subject: [csw-devel] SF.net SVN: gar:[7888] csw/mgar/pkg/wavpack/tags/wavpack-4.60.0, REV=2009.11 .06/ Message-ID: Revision: 7888 http://gar.svn.sourceforge.net/gar/?rev=7888&view=rev Author: dmichelsen Date: 2010-01-06 11:28:36 +0000 (Wed, 06 Jan 2010) Log Message: ----------- wavpack: Tag wavpack-4.60.0,REV=2009.11.06 Added Paths: ----------- csw/mgar/pkg/wavpack/tags/wavpack-4.60.0,REV=2009.11.06/ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Wed Jan 6 12:39:14 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 06 Jan 2010 11:39:14 +0000 Subject: [csw-devel] SF.net SVN: gar:[7889] csw/mgar/pkg/wavpack/trunk Message-ID: Revision: 7889 http://gar.svn.sourceforge.net/gar/?rev=7889&view=rev Author: dmichelsen Date: 2010-01-06 11:39:13 +0000 (Wed, 06 Jan 2010) Log Message: ----------- wavpack: Update to 4.60.1 Modified Paths: -------------- csw/mgar/pkg/wavpack/trunk/Makefile csw/mgar/pkg/wavpack/trunk/checksums Removed Paths: ------------- csw/mgar/pkg/wavpack/trunk/files/0001-Add-support-for-Sun-Studio-compiler.patch Modified: csw/mgar/pkg/wavpack/trunk/Makefile =================================================================== --- csw/mgar/pkg/wavpack/trunk/Makefile 2010-01-06 11:28:36 UTC (rev 7888) +++ csw/mgar/pkg/wavpack/trunk/Makefile 2010-01-06 11:39:13 UTC (rev 7889) @@ -1,5 +1,5 @@ GARNAME = wavpack -GARVERSION = 4.60.0 +GARVERSION = 4.60.1 CATEGORIES = lib DESCRIPTION = Open audio compression format @@ -13,13 +13,14 @@ MASTER_SITES = http://www.wavpack.com/ DISTFILES = $(GARNAME)-$(GARVERSION).tar.bz2 -PATCHFILES += 0001-Add-support-for-Sun-Studio-compiler.patch # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.bz2 REQUIRED_PKGS = CSWiconv +LICENSE = license.txt + BUILD64 = 1 NO_ISAEXEC = 1 CONFIGURE_ARGS = $(DIRPATHS) Modified: csw/mgar/pkg/wavpack/trunk/checksums =================================================================== --- csw/mgar/pkg/wavpack/trunk/checksums 2010-01-06 11:28:36 UTC (rev 7888) +++ csw/mgar/pkg/wavpack/trunk/checksums 2010-01-06 11:39:13 UTC (rev 7889) @@ -1,2 +1 @@ -a8cbb0b205d3865731e359f24341bd7d 0001-Add-support-for-Sun-Studio-compiler.patch -722f90393b292cd1413e8af8250a3783 wavpack-4.60.0.tar.bz2 +7bb1528f910e4d0003426c02db856063 wavpack-4.60.1.tar.bz2 Deleted: csw/mgar/pkg/wavpack/trunk/files/0001-Add-support-for-Sun-Studio-compiler.patch =================================================================== --- csw/mgar/pkg/wavpack/trunk/files/0001-Add-support-for-Sun-Studio-compiler.patch 2010-01-06 11:28:36 UTC (rev 7888) +++ csw/mgar/pkg/wavpack/trunk/files/0001-Add-support-for-Sun-Studio-compiler.patch 2010-01-06 11:39:13 UTC (rev 7889) @@ -1,48 +0,0 @@ -From e4e9a2384beca0d8be8f2742ec5c9b6607b20f10 Mon Sep 17 00:00:00 2001 -From: Dagobert Michelsen -Date: Fri, 6 Nov 2009 13:49:55 +0100 -Subject: [PATCH] Add support for Sun Studio compiler - ---- - cli/utils.c | 4 ++-- - include/wavpack.h | 2 +- - 2 files changed, 3 insertions(+), 3 deletions(-) - -diff --git a/cli/utils.c b/cli/utils.c -index 6094f52..442685b 100644 ---- a/cli/utils.c -+++ b/cli/utils.c -@@ -16,7 +16,7 @@ - #include - #include - #include --#elif defined(__GNUC__) -+#elif defined(__GNUC__) || defined(__sun) - #include - #include - #endif -@@ -164,7 +164,7 @@ char *filespec_ext (char *filespec) - // returned. // - ////////////////////////////////////////////////////////////////////////////// - --#if defined(__GNUC__) && !defined(WIN32) -+#if (defined(__GNUC__) || defined(__sun)) && !defined(WIN32) - - char *filespec_path (char *filespec) - { -diff --git a/include/wavpack.h b/include/wavpack.h -index d264bdc..92caa48 100644 ---- a/include/wavpack.h -+++ b/include/wavpack.h -@@ -33,7 +33,7 @@ typedef float float32_t; - - typedef unsigned char uchar; - --#if !defined(__GNUC__) || defined(WIN32) -+#if (!defined(__GNUC__) && !defined(__sun)) || defined(WIN32) - typedef unsigned short ushort; - typedef unsigned int uint; - #endif --- -1.6.5.1 - This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Wed Jan 6 13:52:54 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 06 Jan 2010 12:52:54 +0000 Subject: [csw-devel] SF.net SVN: gar:[7890] csw/mgar/pkg Message-ID: Revision: 7890 http://gar.svn.sourceforge.net/gar/?rev=7890&view=rev Author: dmichelsen Date: 2010-01-06 12:51:41 +0000 (Wed, 06 Jan 2010) Log Message: ----------- scons: Initial commit Added Paths: ----------- csw/mgar/pkg/scons/ csw/mgar/pkg/scons/branches/ csw/mgar/pkg/scons/tags/ csw/mgar/pkg/scons/trunk/ csw/mgar/pkg/scons/trunk/Makefile csw/mgar/pkg/scons/trunk/checksums csw/mgar/pkg/scons/trunk/files/ Property changes on: csw/mgar/pkg/scons/trunk ___________________________________________________________________ Added: svn:ignore + cookies download work Added: svn:externals + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 Added: csw/mgar/pkg/scons/trunk/Makefile =================================================================== --- csw/mgar/pkg/scons/trunk/Makefile (rev 0) +++ csw/mgar/pkg/scons/trunk/Makefile 2010-01-06 12:51:41 UTC (rev 7890) @@ -0,0 +1,36 @@ +GARNAME = scons +GARVERSION = 1.2.0 +CATEGORIES = devel + +DESCRIPTION = A next-generation build tool +define BLURB + SCons is an Open Source software construction tool - that is, + a next-generation build tool. Think of SCons as an improved, + cross-platform substitute for the classic Make utility with + integrated functionality similar to autoconf/automake and compiler + caches such as ccache. In short, SCons is an easier, more + reliable and faster way to build software. +endef + +SF_PROJ = scons +MASTER_SITES = $(SF_MIRRORS) +DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz + +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + +SPKG_SOURCEURL = http://www.scons.org/ + +LICENSE = LICENSE.txt + +CONFIGURE_SCRIPTS = +BUILD_SCRIPTS = $(WORKSRC)/setup.py +TEST_SCRIPTS = +INSTALL_SCRIPTS = $(WORKSRC)/setup.py +INSTALL_ARGS = --root=$(DESTDIR) + +EXTRA_PAX_ARGS = -s ",\./opt/csw/man,./opt/csw/share/man," + +ARCHALL = 1 + +include gar/category.mk Added: csw/mgar/pkg/scons/trunk/checksums =================================================================== --- csw/mgar/pkg/scons/trunk/checksums (rev 0) +++ csw/mgar/pkg/scons/trunk/checksums 2010-01-06 12:51:41 UTC (rev 7890) @@ -0,0 +1 @@ +53b6aa7281811717a57598e319441cf7 scons-1.2.0.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From chninkel at users.sourceforge.net Wed Jan 6 16:00:16 2010 From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net) Date: Wed, 06 Jan 2010 15:00:16 +0000 Subject: [csw-devel] SF.net SVN: gar:[7891] csw/mgar/pkg/bash/trunk Message-ID: Revision: 7891 http://gar.svn.sourceforge.net/gar/?rev=7891&view=rev Author: chninkel Date: 2010-01-06 15:00:16 +0000 (Wed, 06 Jan 2010) Log Message: ----------- bash: fixed a compilation error caused by vsnprintf redefinition Modified Paths: -------------- csw/mgar/pkg/bash/trunk/Makefile csw/mgar/pkg/bash/trunk/checksums Added Paths: ----------- csw/mgar/pkg/bash/trunk/files/vsnprintf.patch Modified: csw/mgar/pkg/bash/trunk/Makefile =================================================================== --- csw/mgar/pkg/bash/trunk/Makefile 2010-01-06 12:51:41 UTC (rev 7890) +++ csw/mgar/pkg/bash/trunk/Makefile 2010-01-06 15:00:16 UTC (rev 7891) @@ -67,6 +67,8 @@ # opencsw bash use /etc/bash.bashrc and /etc/bash.bash_logout files PATCHFILES += use_system_bashrc_and_logout.patch +# Temporary fix for vsnprintf definition clash +PATCHFILES += vsnprintf.patch ##### Build and installation information ##### Modified: csw/mgar/pkg/bash/trunk/checksums =================================================================== --- csw/mgar/pkg/bash/trunk/checksums 2010-01-06 12:51:41 UTC (rev 7890) +++ csw/mgar/pkg/bash/trunk/checksums 2010-01-06 15:00:16 UTC (rev 7891) @@ -3,3 +3,4 @@ 8b104a3cddca41849186af53c8602eef changelog.CSW 60956e6be20f69dafbb06fcc83bab88e shells 29607316cff22f7427322d8f190cbadf use_system_bashrc_and_logout.patch +f2876ca41b05f236621abddc713af3e7 vsnprintf.patch Added: csw/mgar/pkg/bash/trunk/files/vsnprintf.patch =================================================================== --- csw/mgar/pkg/bash/trunk/files/vsnprintf.patch (rev 0) +++ csw/mgar/pkg/bash/trunk/files/vsnprintf.patch 2010-01-06 15:00:16 UTC (rev 7891) @@ -0,0 +1,47 @@ +diff --speed-large-files -Nur builtins/printf.def builtins/printf.def +--- builtins/printf.def 2010-01-06 15:15:00.498275417 +0100 ++++ builtins/printf.def 2010-01-06 15:13:39.646642489 +0100 +@@ -172,7 +172,9 @@ + #endif + + #if !HAVE_VSNPRINTF +-extern int vsnprintf __P((char *, size_t, const char *, ...)) __attribute__((__format__ (printf, 3, 4))); ++extern int bash_vsnprintf __P((char *, size_t, const char *, ...)) __attribute__((__format__ (printf, 3, 4))); ++#else ++# define bash_vsnprintf vsnprintf + #endif + + static void printf_erange __P((char *)); +@@ -885,7 +887,7 @@ + int blen; + + SH_VA_START (args, format); +- blen = vsnprintf (vbuf + vblen, vbsize - vblen, format, args); ++ blen = bash_vsnprintf (vbuf + vblen, vbsize - vblen, format, args); + va_end (args); + + nlen = vblen + blen + 1; +@@ -894,7 +896,7 @@ + vbsize = ((nlen + 63) >> 6) << 6; + vbuf = (char *)xrealloc (vbuf, vbsize); + SH_VA_START (args, format); +- blen = vsnprintf (vbuf + vblen, vbsize - vblen, format, args); ++ blen = bash_vsnprintf (vbuf + vblen, vbsize - vblen, format, args); + va_end (args); + } + +diff --speed-large-files -Nur lib/sh/snprintf.c lib/sh/snprintf.c +--- lib/sh/snprintf.c 2010-01-06 15:14:47.740952207 +0100 ++++ lib/sh/snprintf.c 2010-01-06 15:14:25.727971179 +0100 +@@ -1655,9 +1655,9 @@ + + int + #if defined (__STDC__) +-vsnprintf(char *string, size_t length, const char *format, va_list args) ++bash_vsnprintf(char *string, size_t length, const char *format, va_list args) + #else +-vsnprintf(string, length, format, args) ++bash_vsnprintf(string, length, format, args) + char *string; + size_t length; + const char *format; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Wed Jan 6 18:14:06 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 06 Jan 2010 17:14:06 +0000 Subject: [csw-devel] SF.net SVN: gar:[7892] csw/mgar/pkg Message-ID: Revision: 7892 http://gar.svn.sourceforge.net/gar/?rev=7892&view=rev Author: dmichelsen Date: 2010-01-06 17:14:06 +0000 (Wed, 06 Jan 2010) Log Message: ----------- unzip: Initial commit, doesnt compile yet Added Paths: ----------- csw/mgar/pkg/unzip/ csw/mgar/pkg/unzip/branches/ csw/mgar/pkg/unzip/tags/ csw/mgar/pkg/unzip/trunk/ csw/mgar/pkg/unzip/trunk/Makefile csw/mgar/pkg/unzip/trunk/checksums csw/mgar/pkg/unzip/trunk/files/ Property changes on: csw/mgar/pkg/unzip/trunk ___________________________________________________________________ Added: svn:ignore + cookies download work Added: svn:externals + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 Added: csw/mgar/pkg/unzip/trunk/Makefile =================================================================== --- csw/mgar/pkg/unzip/trunk/Makefile (rev 0) +++ csw/mgar/pkg/unzip/trunk/Makefile 2010-01-06 17:14:06 UTC (rev 7892) @@ -0,0 +1,30 @@ +GARNAME = unzip +GARVERSION = 6.0 +CATEGORIES = utils + +DESCRIPTION = Info-Zip UnZip extraction utility for archives compressed in .zip format +define BLURB +endef + +SF_PROJ = infozip +MASTER_SITES = $(SF_MIRRORS) +DISTNAME = unzip60 +DISTFILES = $(DISTNAME).tar.gz + +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + +SPKG_SOURCEURL = http://www.info-zip.org/ + +LICENSE = LICENSE + +CONFIGURE_SCRIPTS = $(WORKSRC)/unix/configure +# CONFIGURE_ARGS = $(DIRPATHS) + +BUILD_SCRIPTS = $(WORKSRC)/unix/Makefile +BUILD_ARGS = sunos + +TEST_SCRIPTS = $(WORKSRC)/unix/Makefile +INSTALL_SCRIPTS = $(WORKSRC)/unix/Makefile + +include gar/category.mk Added: csw/mgar/pkg/unzip/trunk/checksums =================================================================== --- csw/mgar/pkg/unzip/trunk/checksums (rev 0) +++ csw/mgar/pkg/unzip/trunk/checksums 2010-01-06 17:14:06 UTC (rev 7892) @@ -0,0 +1 @@ +62b490407489521db863b523a7f86375 unzip60.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Wed Jan 6 22:01:51 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 06 Jan 2010 21:01:51 +0000 Subject: [csw-devel] SF.net SVN: gar:[7894] csw/mgar/pkg/mplayer/tags/mplayer-1.0rc2-jwheeler/ Message-ID: Revision: 7894 http://gar.svn.sourceforge.net/gar/?rev=7894&view=rev Author: dmichelsen Date: 2010-01-06 21:01:51 +0000 (Wed, 06 Jan 2010) Log Message: ----------- mplayer: Tag (unreleased?) 1.0rc2 Added Paths: ----------- csw/mgar/pkg/mplayer/tags/mplayer-1.0rc2-jwheeler/ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From skayser at users.sourceforge.net Wed Jan 6 21:30:08 2010 From: skayser at users.sourceforge.net (skayser at users.sourceforge.net) Date: Wed, 06 Jan 2010 20:30:08 +0000 Subject: [csw-devel] SF.net SVN: gar:[7893] csw/mgar/pkg/watch/trunk Message-ID: Revision: 7893 http://gar.svn.sourceforge.net/gar/?rev=7893&view=rev Author: skayser Date: 2010-01-06 20:30:08 +0000 (Wed, 06 Jan 2010) Log Message: ----------- watch: document character handling flaws/versioning, move back to ncurses Modified Paths: -------------- csw/mgar/pkg/watch/trunk/Makefile csw/mgar/pkg/watch/trunk/files/changelog.CSW Modified: csw/mgar/pkg/watch/trunk/Makefile =================================================================== --- csw/mgar/pkg/watch/trunk/Makefile 2010-01-06 17:14:06 UTC (rev 7892) +++ csw/mgar/pkg/watch/trunk/Makefile 2010-01-06 20:30:08 UTC (rev 7893) @@ -1,8 +1,13 @@ -# TODO -# - Although watch links against ncursesw, non-ASCII character handling -# is broken. German umlauts for example won't display at all. Try: -# python -c 'print u"\u00E4"' vs. watch -d python -c 'print u"\u00E4"' -# Needs further investigation. +# Known issues +# - watch only handles characters on a byte-by-byte basis, as such it +# doesn't cope with wide characters like the ones encoded via UTF-8. +# LATIN SMALL LETTER A WITH DIAERESIS (U+00E4) encoded in UTF-8 +# for example is simply skipped in the output. For the current +# implementation of watch it depends on the result of isprint() +# whether a one byte component of a character is printed. + +# watch doesn't follow the procps versioning. It has a hardcoded +# version in watch.c which is emitted when calling watch -v GARNAME = watch GARVERSION = 0.2.0 CATEGORIES = utils @@ -14,11 +19,12 @@ # Usually we would use $(SF_MIRROR), but the procps folks didn't upload # procps the usual way -SF_PROJ = procps -SF_PROJ_VER = 3.2.8 -MASTER_SITES = http://$(SF_PROJ).sourceforge.net/ -DISTFILES = $(SF_PROJ)-$(SF_PROJ_VER).tar.gz -DISTNAME = $(SF_PROJ)-$(SF_PROJ_VER) +SF_PROJ = procps +SF_PROJ_VER = 3.2.8 +MASTER_SITES = http://$(SF_PROJ).sourceforge.net/ +DISTFILES = $(SF_PROJ)-$(SF_PROJ_VER).tar.gz +DISTNAME = $(SF_PROJ)-$(SF_PROJ_VER) +UFILES_REGEX = $(SF_PROJ)-(\d+(?:\.\d+)*).tar.gz REQUIRED_PKGS = CSWncurses @@ -35,7 +41,7 @@ CONFIGURE_ARGS = $(DIRPATHS) -EXTRA_INC = /opt/csw/include/ncursesw +EXTRA_INC = /opt/csw/include/ncurses include gar/category.mk @@ -62,17 +68,15 @@ CFLAGS := $(CFLAGS) -DHAVE_INTTYPES_H -DHAVE_LOCALE_H -DHAVE_LOCALECONV CFLAGS := $(CFLAGS) -DHAVE_LOCALECONV -DHAVE_UINTMAX_T -DHAVE_VA_COPY -# CURSES and BUILD_ARGS w/ ALL_?FLAGS req. for $(WORKSRC)/Makefile -build-custom: CURSES=-lncursesw +# BUILD_ARGS with ALL_?FLAGS req. for $(WORKSRC)/Makefile build-custom: BUILD_ARGS:=ALL_CFLAGS="$(CFLAGS)" ALL_LDFLAGS="$(LDFLAGS)" build-custom: $(BUILD_ENV) gmake -C $(WORKSRC) $(BUILD_ARGS) snprintf.o $(BUILD_ENV) gmake -C $(WORKSRC) $(BUILD_ARGS) getopt.o $(BUILD_ENV) gmake -C $(WORKSRC) $(BUILD_ARGS) getopt1.o $(BUILD_ENV) gmake -C $(WORKSRC) \ - ALL_CFLAGS="$(CFLAGS) snprintf.o getopt.o getopt1.o" \ - ALL_LDFLAGS="$(LDFLAGS)" \ - CURSES=$(CURSES) watch + ALL_CFLAGS="$(CPPFLAGS) $(CFLAGS) snprintf.o getopt.o getopt1.o" \ + ALL_LDFLAGS="$(LDFLAGS)" watch @$(MAKECOOKIE) install-custom: DOCDEST=$(DESTDIR)$(docdir)/$(GARNAME) @@ -83,4 +87,7 @@ ginstall -m 755 $(WORKSRC)/watch $(DESTDIR)$(bindir) cp $(WORKSRC)/watch.1 $(DESTDIR)$(mandir)/man1 cp $(FILEDIR)/changelog.CSW $(DOCDEST) + printf "This watch version (%s) was taken from procps %s, %s\n" \ + $(GARVERSION) $(SF_PROJ_VER) $(subst sourceforge,sf,$(MASTER_SITES)) \ + >> $(DOCDEST)/README.CSW @$(MAKECOOKIE) Modified: csw/mgar/pkg/watch/trunk/files/changelog.CSW =================================================================== --- csw/mgar/pkg/watch/trunk/files/changelog.CSW 2010-01-06 17:14:06 UTC (rev 7892) +++ csw/mgar/pkg/watch/trunk/files/changelog.CSW 2010-01-06 20:30:08 UTC (rev 7893) @@ -1,3 +1,10 @@ +watch (0.2.0,REV=2010.01.06) + + * Updated upstream version. Fixes 8-bit character handling when using + the -d option. (Closes: #3952). + + -- Sebastian Kayser Wed, 6 Jan 2010 19:28:33 +0100 + watch (0.2.0,REV=2009.05.10) * Recompiled with adjusted GAR build system (Closes: #3603). This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From skayser at users.sourceforge.net Wed Jan 6 23:54:33 2010 From: skayser at users.sourceforge.net (skayser at users.sourceforge.net) Date: Wed, 06 Jan 2010 22:54:33 +0000 Subject: [csw-devel] SF.net SVN: gar:[7895] csw/mgar/pkg/mbuffer/trunk/Makefile Message-ID: Revision: 7895 http://gar.svn.sourceforge.net/gar/?rev=7895&view=rev Author: skayser Date: 2010-01-06 22:54:18 +0000 (Wed, 06 Jan 2010) Log Message: ----------- mbuffer: IPv6 resolution on build boxes fixed, test3 now functional Modified Paths: -------------- csw/mgar/pkg/mbuffer/trunk/Makefile Modified: csw/mgar/pkg/mbuffer/trunk/Makefile =================================================================== --- csw/mgar/pkg/mbuffer/trunk/Makefile 2010-01-06 21:01:51 UTC (rev 7894) +++ csw/mgar/pkg/mbuffer/trunk/Makefile 2010-01-06 22:54:18 UTC (rev 7895) @@ -35,10 +35,7 @@ CONFIGURE_ARGS = $(DIRPATHS) -# While we have IPv6 loopback interfaces on the buildfarm now, build10x -# is missing an localhost IPv6 address entry for /etc/hosts. test3 requires -# one, thus we omit it for the time being. -TEST_TARGET = -o test3 check +TEST_TARGET = check # Required for updated libmhash (mbuffer builds against it) which allows for # flexible const/non-const definitions. There should be a more intelligent This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Thu Jan 7 00:47:07 2010 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Wed, 06 Jan 2010 23:47:07 +0000 Subject: [csw-devel] SF.net SVN: gar:[7896] csw/mgar/pkg/git/trunk/Makefile Message-ID: Revision: 7896 http://gar.svn.sourceforge.net/gar/?rev=7896&view=rev Author: bdwalton Date: 2010-01-06 23:47:07 +0000 (Wed, 06 Jan 2010) Log Message: ----------- git: add/set (new) VENDOR_URL variable; disable scripts until next version bump Modified Paths: -------------- csw/mgar/pkg/git/trunk/Makefile Modified: csw/mgar/pkg/git/trunk/Makefile =================================================================== --- csw/mgar/pkg/git/trunk/Makefile 2010-01-06 22:54:18 UTC (rev 7895) +++ csw/mgar/pkg/git/trunk/Makefile 2010-01-06 23:47:07 UTC (rev 7896) @@ -3,8 +3,10 @@ # PATCHLEVEL = rc2 CATEGORIES = devel +VENDOR_URL = http://git-scm.org/ + # disable tests until next version bump (at the top so it stands out) -TEST_SCRIPTS = +# TEST_SCRIPTS = PACKAGES = CSWgit CSWgitk CSWgitgui CSWgitsvn CSWgitcvs CSWgitemacs CSWgitdoc PACKAGES += CSWgitcompletion CSWgitdevel This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Thu Jan 7 00:52:21 2010 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Wed, 06 Jan 2010 23:52:21 +0000 Subject: [csw-devel] SF.net SVN: gar:[7897] csw/mgar/gar/v2/gar.pkg.mk Message-ID: Revision: 7897 http://gar.svn.sourceforge.net/gar/?rev=7897&view=rev Author: bdwalton Date: 2010-01-06 23:52:20 +0000 (Wed, 06 Jan 2010) Log Message: ----------- gar: Enhance values for SPKG_SOURCEURL (for VENDOR in pkginfo) SPKG_SOURCEURL is now set to the first of VENDOR_URL, MASTER_SITES or GIT_REPOS. It was originally only MASTER_SITES, but this doesn't work when GIT_REPOS but no MASTER_SITES are set. GIT_REPOS on it's own isn't a good stand-in as it's a less 'pretty' url. Allowing an explicit VENDOR_URL gives control to the maintainer, retains backward compatibility by default and extends the old behaviour with a new fallback possibility. Modified Paths: -------------- csw/mgar/gar/v2/gar.pkg.mk Modified: csw/mgar/gar/v2/gar.pkg.mk =================================================================== --- csw/mgar/gar/v2/gar.pkg.mk 2010-01-06 23:47:07 UTC (rev 7896) +++ csw/mgar/gar/v2/gar.pkg.mk 2010-01-06 23:52:20 UTC (rev 7897) @@ -141,7 +141,7 @@ SPKG_DESC ?= $(DESCRIPTION) SPKG_VERSION ?= $(GARVERSION) SPKG_CATEGORY ?= application -SPKG_SOURCEURL ?= $(firstword $(MASTER_SITES)) +SPKG_SOURCEURL ?= $(firstword $(VENDOR_URL) $(MASTER_SITES) $(GIT_REPOS)) SPKG_VENDOR ?= $(SPKG_SOURCEURL) packaged for CSW by $(SPKG_PACKAGER) SPKG_PSTAMP ?= $(LOGNAME)@$(shell hostname)-$(call _REVISION)-$(shell date '+%Y%m%d%H%M%S') SPKG_BASEDIR ?= $(prefix) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Thu Jan 7 08:48:54 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 07 Jan 2010 07:48:54 +0000 Subject: [csw-devel] SF.net SVN: gar:[7898] csw/mgar/pkg Message-ID: Revision: 7898 http://gar.svn.sourceforge.net/gar/?rev=7898&view=rev Author: dmichelsen Date: 2010-01-07 07:48:54 +0000 (Thu, 07 Jan 2010) Log Message: ----------- libcddb: Initial commit, some tests failing Added Paths: ----------- csw/mgar/pkg/libcddb/ csw/mgar/pkg/libcddb/branches/ csw/mgar/pkg/libcddb/tags/ csw/mgar/pkg/libcddb/trunk/ csw/mgar/pkg/libcddb/trunk/Makefile csw/mgar/pkg/libcddb/trunk/checksums csw/mgar/pkg/libcddb/trunk/files/ Property changes on: csw/mgar/pkg/libcddb/trunk ___________________________________________________________________ Added: svn:ignore + cookies download work Added: svn:externals + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 Added: csw/mgar/pkg/libcddb/trunk/Makefile =================================================================== --- csw/mgar/pkg/libcddb/trunk/Makefile (rev 0) +++ csw/mgar/pkg/libcddb/trunk/Makefile 2010-01-07 07:48:54 UTC (rev 7898) @@ -0,0 +1,37 @@ +GARNAME = libcddb +GARVERSION = 1.3.2 +CATEGORIES = lib + +DESCRIPTION = A C library to access data on a CDDB server +define BLURB + Libcddb supports both the custom CDDB protocol and tunnelling the query + and read operations over plain HTTP. It is also possible to use an HTTP + proxy server. If you want to speed things up, you can make use of the + built-in caching facility provided by the library. +endef + +MASTER_SITES = $(SF_MIRROR) +DISTFILES = $(GARNAME)-$(GARVERSION).tar.bz2 + +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.bz2 + +PACKAGES = CSWlibcddb CSWlibcddbutil + +SPKG_DESC_CSWlibcddb = A C library to access data on a CDDB server +SPKG_DESC_CSWlibcddbutil = A CDDB query tool + +REQUIRED_PKGS_CSWlibcddbutil = CSWlibcddb CSWlibcdio + +BUILD64 = 1 +CONFIGURE_ARGS = $(DIRPATHS) + +http_proxy='$(http_proxy)' +EXTRA_TEST_EXPORTS = http_proxy + +export http_proxy +TEST_TARGET = check + +PKGFILES_CSWlibcddbutil = $(bindir)/.* + +include gar/category.mk Added: csw/mgar/pkg/libcddb/trunk/checksums =================================================================== --- csw/mgar/pkg/libcddb/trunk/checksums (rev 0) +++ csw/mgar/pkg/libcddb/trunk/checksums 2010-01-07 07:48:54 UTC (rev 7898) @@ -0,0 +1 @@ +8bb4a6f542197e8e9648ae597cd6bc8a libcddb-1.3.2.tar.bz2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From janholzh at users.sourceforge.net Thu Jan 7 13:42:37 2010 From: janholzh at users.sourceforge.net (janholzh at users.sourceforge.net) Date: Thu, 07 Jan 2010 12:42:37 +0000 Subject: [csw-devel] SF.net SVN: gar:[7899] csw/mgar/pkg/transmission/trunk Message-ID: Revision: 7899 http://gar.svn.sourceforge.net/gar/?rev=7899&view=rev Author: janholzh Date: 2010-01-07 12:42:37 +0000 (Thu, 07 Jan 2010) Log Message: ----------- Updated to 1.76 and splitt of GTK2 part Modified Paths: -------------- csw/mgar/pkg/transmission/trunk/Makefile csw/mgar/pkg/transmission/trunk/checksums Added Paths: ----------- csw/mgar/pkg/transmission/trunk/files/icons-makefile.patch csw/mgar/pkg/transmission/trunk/files/linker-include.patch Modified: csw/mgar/pkg/transmission/trunk/Makefile =================================================================== --- csw/mgar/pkg/transmission/trunk/Makefile 2010-01-07 07:48:54 UTC (rev 7898) +++ csw/mgar/pkg/transmission/trunk/Makefile 2010-01-07 12:42:37 UTC (rev 7899) @@ -1,23 +1,68 @@ GARNAME = transmission -GARVERSION = 1.60 +GARVERSION = 1.76 CATEGORIES = net DESCRIPTION = Fast, easy, and free multi-platform BitTorrent client define BLURB endef - MASTER_SITES = http://mirrors.m0k.org/transmission/files/ DISTFILES = $(GARNAME)-$(GARVERSION).tar.bz2 -DISTFILES += $(call admfiles,CSWtransmission,) +PATCHFILES = icons-makefile.patch +PATCHFILES += linker-include.patch # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = -(\d+(?:\.\d+)*).tar.bz2 -GARCOMPILER = GNU -EXTRA_CFLAGS = -DNO_SYS_QUEUE_H +PACKAGES = CSWtransmisson +PACKAGES += CSWtransmissongtk2 +SPKG_DESC_CSWtransmisson = Fast, easy, and free multi-platform BitTorrent client +SPKG_DESC_CSWtransmissongtk2 = Fast, easy, and free multi-platform BitTorrent client , gtk2 Interface -CONFIGURE_ARGS = $(DIRPATHS) +REQUIRED_PKGS_CSWtransmissongtk2 = CSWcurlrt +REQUIRED_PKGS_CSWtransmissongtk2 += CSWdbusglib +REQUIRED_PKGS_CSWtransmissongtk2 += CSWfconfig +REQUIRED_PKGS_CSWtransmissongtk2 += CSWftype2 +REQUIRED_PKGS_CSWtransmissongtk2 += CSWggettextrt +REQUIRED_PKGS_CSWtransmissongtk2 += CSWglib2 +REQUIRED_PKGS_CSWtransmissongtk2 += CSWgtk2 +REQUIRED_PKGS_CSWtransmissongtk2 += CSWlibatk +REQUIRED_PKGS_CSWtransmissongtk2 += CSWlibcairo +REQUIRED_PKGS_CSWtransmissongtk2 += CSWlibdbus +REQUIRED_PKGS_CSWtransmissongtk2 += CSWlibevent +REQUIRED_PKGS_CSWtransmissongtk2 += CSWlibxext +REQUIRED_PKGS_CSWtransmissongtk2 += CSWosslrt +REQUIRED_PKGS_CSWtransmissongtk2 += CSWpango +REQUIRED_PKGS_CSWtransmissongtk2 += CSWzlib +REQUIRED_PKGS_CSWtransmissongtk2 += CSWdbus +REQUIRED_PKGS_CSWtransmisson = CSWcurlrt +REQUIRED_PKGS_CSWtransmisson += CSWlibevent +REQUIRED_PKGS_CSWtransmisson += CSWggettextrt +REQUIRED_PKGS_CSWtransmisson += CSWosslrt +REQUIRED_PKGS_CSWtransmisson += CSWzlib + + + +REQUIRED_PKGS_CSWtransmissongtk2 += CSWtransmisson + +PKGFILES_CSWtransmisson = /opt/csw/bin/transmissioncli +PKGFILES_CSWtransmisson += /opt/csw/bin/transmission-.* +PKGFILES_CSWtransmisson += /opt/csw/share/locale/.* +PKGFILES_CSWtransmisson += /opt/csw/share/man/.* +PKGFILES_CSWtransmisson += /opt/csw/share/transmission/.* + +CATALOGNAME_CSWtransmisson = transmisson +CATALOGNAME_CSWtransmissongtk2 = transmisson_gtk2 + + +EXTRA_CFLAGS = -DNO_SYS_QUEUE_H -lresolv -mt + +EXTRA_INC = /opt/csw/X11/include +EXTRA_LIB = /opt/csw/X11/lib +EXTRA_PKG_CONFIG_DIRS = $(prefix)/X11/lib + +CONFIGURE_ARGS = $(DIRPATHS) --enable-gtk + TEST_TARGET = check include gar/category.mk Modified: csw/mgar/pkg/transmission/trunk/checksums =================================================================== --- csw/mgar/pkg/transmission/trunk/checksums 2010-01-07 07:48:54 UTC (rev 7898) +++ csw/mgar/pkg/transmission/trunk/checksums 2010-01-07 12:42:37 UTC (rev 7899) @@ -1,2 +1,3 @@ -0b6395df62da35201f8663ceea204f51 download/CSWtransmission.gspec -8b30cf189240f0c50ccd11c618a6906a download/transmission-1.60.tar.bz2 +cbdb5cfaf24b68727042c3828b252534 icons-makefile.patch +7124b4836210a10fe649bba75c706cc9 linker-include.patch +ac44511ba4c203998be3079626126ede transmission-1.76.tar.bz2 Added: csw/mgar/pkg/transmission/trunk/files/icons-makefile.patch =================================================================== --- csw/mgar/pkg/transmission/trunk/files/icons-makefile.patch (rev 0) +++ csw/mgar/pkg/transmission/trunk/files/icons-makefile.patch 2010-01-07 12:42:37 UTC (rev 7899) @@ -0,0 +1,39 @@ +From 450c6c8c49e7992fbca39d4cf5f3920b62540e75 Mon Sep 17 00:00:00 2001 +From: Jan Holzhueter +Date: Wed, 6 Jan 2010 14:26:25 +0100 +Subject: [PATCH] describe your change + +--- + gtk/icons/Makefile.in | 16 ++++++++-------- + 1 files changed, 8 insertions(+), 8 deletions(-) + +diff --git a/gtk/icons/Makefile.in b/gtk/icons/Makefile.in +index 879e4e3..3c7c529 100644 +--- a/gtk/icons/Makefile.in ++++ b/gtk/icons/Makefile.in +@@ -474,14 +474,14 @@ install-icons: + mkdir -p $(DESTDIR)$(datadir)/icons/$$THEME/$$SIZE/$$CONTEXT; \ + $(INSTALL_DATA) $(srcdir)/$$icon $(DESTDIR)$(datadir)/icons/$$THEME/$$SIZE/$$CONTEXT/$$ICONFILE; \ + done; \ +- for icon in $(private_icons); do \ +- THEME=`echo $$icon | cut -d_ -f1`; \ +- CONTEXT=`echo $$icon | cut -d_ -f2`; \ +- SIZE=`echo $$icon | cut -d_ -f3`; \ +- ICONFILE=`echo $$icon | cut -d_ -f4`; \ +- mkdir -p $(DESTDIR)$(pkgdatadir)/icons/$$THEME/$$SIZE/$$CONTEXT; \ +- $(INSTALL_DATA) $(srcdir)/$$icon $(DESTDIR)$(pkgdatadir)/icons/$$THEME/$$SIZE/$$CONTEXT/$$ICONFILE; \ +- done ++# for icon in $(private_icons); do \ ++# THEME=`echo $$icon | cut -d_ -f1`; \ ++# CONTEXT=`echo $$icon | cut -d_ -f2`; \ ++# SIZE=`echo $$icon | cut -d_ -f3`; \ ++# ICONFILE=`echo $$icon | cut -d_ -f4`; \ ++# mkdir -p $(DESTDIR)$(pkgdatadir)/icons/$$THEME/$$SIZE/$$CONTEXT; \ ++# $(INSTALL_DATA) $(srcdir)/$$icon $(DESTDIR)$(pkgdatadir)/icons/$$THEME/$$SIZE/$$CONTEXT/$$ICONFILE; \ ++# done + + uninstall-icons: + -for icon in $(public_icons); do \ +-- +1.6.6 + Added: csw/mgar/pkg/transmission/trunk/files/linker-include.patch =================================================================== --- csw/mgar/pkg/transmission/trunk/files/linker-include.patch (rev 0) +++ csw/mgar/pkg/transmission/trunk/files/linker-include.patch 2010-01-07 12:42:37 UTC (rev 7899) @@ -0,0 +1,25 @@ +From 84469352eccf90852d7d58241516619ad1545272 Mon Sep 17 00:00:00 2001 +From: Jan Holzhueter +Date: Wed, 6 Jan 2010 15:28:43 +0100 +Subject: [PATCH] describe your change + +--- + gtk/Makefile.in | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/gtk/Makefile.in b/gtk/Makefile.in +index 81b4e46..0c145b8 100644 +--- a/gtk/Makefile.in ++++ b/gtk/Makefile.in +@@ -88,7 +88,7 @@ am__v_lt_ = $(am__v_lt_$(AM_DEFAULT_VERBOSITY)) + am__v_lt_0 = --silent + transmission_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ +- $(transmission_LDFLAGS) $(LDFLAGS) -o $@ ++ $(transmission_LDFLAGS) $(LDFLAGS) /usr/openwin/lib/libXext.so -o $@ + DEFAULT_INCLUDES = -I. at am__isrc@ + depcomp = $(SHELL) $(top_srcdir)/depcomp + am__depfiles_maybe = depfiles +-- +1.6.6 + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From janholzh at users.sourceforge.net Thu Jan 7 14:42:05 2010 From: janholzh at users.sourceforge.net (janholzh at users.sourceforge.net) Date: Thu, 07 Jan 2010 13:42:05 +0000 Subject: [csw-devel] SF.net SVN: gar:[7900] csw/mgar/pkg/transmission/trunk/files/ CSWtransmission.gspec Message-ID: Revision: 7900 http://gar.svn.sourceforge.net/gar/?rev=7900&view=rev Author: janholzh Date: 2010-01-07 13:42:05 +0000 (Thu, 07 Jan 2010) Log Message: ----------- removed gspec file Removed Paths: ------------- csw/mgar/pkg/transmission/trunk/files/CSWtransmission.gspec Deleted: csw/mgar/pkg/transmission/trunk/files/CSWtransmission.gspec =================================================================== --- csw/mgar/pkg/transmission/trunk/files/CSWtransmission.gspec 2010-01-07 12:42:37 UTC (rev 7899) +++ csw/mgar/pkg/transmission/trunk/files/CSWtransmission.gspec 2010-01-07 13:42:05 UTC (rev 7900) @@ -1,4 +0,0 @@ -%var bitname transmission -%var pkgname CSWtransmission -%include url file://%{PKGLIB}/csw_dyndepend.gspec -%copyright url file://%{WORKSRC}/LICENSE This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Thu Jan 7 16:02:31 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 07 Jan 2010 15:02:31 +0000 Subject: [csw-devel] SF.net SVN: gar:[7901] csw/mgar/pkg Message-ID: Revision: 7901 http://gar.svn.sourceforge.net/gar/?rev=7901&view=rev Author: dmichelsen Date: 2010-01-07 15:02:30 +0000 (Thu, 07 Jan 2010) Log Message: ----------- remake: Initial commit Added Paths: ----------- csw/mgar/pkg/remake/ csw/mgar/pkg/remake/branches/ csw/mgar/pkg/remake/tags/ csw/mgar/pkg/remake/trunk/ csw/mgar/pkg/remake/trunk/Makefile csw/mgar/pkg/remake/trunk/checksums csw/mgar/pkg/remake/trunk/files/ Property changes on: csw/mgar/pkg/remake/trunk ___________________________________________________________________ Added: svn:ignore + cookies download work Added: svn:externals + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 Added: csw/mgar/pkg/remake/trunk/Makefile =================================================================== --- csw/mgar/pkg/remake/trunk/Makefile (rev 0) +++ csw/mgar/pkg/remake/trunk/Makefile 2010-01-07 15:02:30 UTC (rev 7901) @@ -0,0 +1,22 @@ +GARNAME = remake +GARVERSION = 3.81_dbg_0.2 +CATEGORIES = devel + +DESCRIPTION = GNU Make debugger +define BLURB + remake is a patched and modernized version of GNU make utility that adds + improved error reporting, the ability to trace execution in a comprehensible + way, and a debugger. +endef + +MASTER_SITES = http://cloud.github.com/downloads/rocky/remake/ +DISTFILES = $(GARNAME)-$(GARVERSION).tar.bz2 + +SPKG_SOURCEURL = http://bashdb.sourceforge.net/remake/ + +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.bz2 + +CONFIGURE_ARGS = $(DIRPATHS) + +include gar/category.mk This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Thu Jan 7 16:54:33 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 07 Jan 2010 15:54:33 +0000 Subject: [csw-devel] SF.net SVN: gar:[7902] csw/mgar/pkg/libsndfile/tags/libsndfile-1.0.20, REV= 2009.11.04/ Message-ID: Revision: 7902 http://gar.svn.sourceforge.net/gar/?rev=7902&view=rev Author: dmichelsen Date: 2010-01-07 15:54:33 +0000 (Thu, 07 Jan 2010) Log Message: ----------- libsndfile: Tag libsndfile-1.0.20,REV=2009.11.04 Added Paths: ----------- csw/mgar/pkg/libsndfile/tags/libsndfile-1.0.20,REV=2009.11.04/ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Thu Jan 7 16:55:05 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 07 Jan 2010 15:55:05 +0000 Subject: [csw-devel] SF.net SVN: gar:[7903] csw/mgar/pkg Message-ID: Revision: 7903 http://gar.svn.sourceforge.net/gar/?rev=7903&view=rev Author: dmichelsen Date: 2010-01-07 15:55:05 +0000 (Thu, 07 Jan 2010) Log Message: ----------- twolame: Initial commit, doesnt build due to missing C99 standard of Solaris 8/9 again Added Paths: ----------- csw/mgar/pkg/twolame/ csw/mgar/pkg/twolame/branches/ csw/mgar/pkg/twolame/tags/ csw/mgar/pkg/twolame/trunk/ csw/mgar/pkg/twolame/trunk/Makefile csw/mgar/pkg/twolame/trunk/checksums csw/mgar/pkg/twolame/trunk/files/ Property changes on: csw/mgar/pkg/twolame/trunk ___________________________________________________________________ Added: svn:ignore + cookies download work Added: svn:externals + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 Added: csw/mgar/pkg/twolame/trunk/Makefile =================================================================== --- csw/mgar/pkg/twolame/trunk/Makefile (rev 0) +++ csw/mgar/pkg/twolame/trunk/Makefile 2010-01-07 15:55:05 UTC (rev 7903) @@ -0,0 +1,21 @@ +GARNAME = twolame +GARVERSION = 0.3.12 +CATEGORIES = utils + +DESCRIPTION = An optimised MPEG Audio Layer 2 (MP2) encoder based on tooLAME +define BLURB +endef + +SF_PROJ = twolame +MASTER_SITES = $(SF_MIRRORS) +DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz + +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + +BUILD64 = 1 +CONFIGURE_ARGS = $(DIRPATHS) + +MERGE_DIRS_isa-extra = $(libdir) + +include gar/category.mk Added: csw/mgar/pkg/twolame/trunk/checksums =================================================================== --- csw/mgar/pkg/twolame/trunk/checksums (rev 0) +++ csw/mgar/pkg/twolame/trunk/checksums 2010-01-07 15:55:05 UTC (rev 7903) @@ -0,0 +1 @@ +d38c3ead5ac49b7425c1a9ef91126a35 twolame-0.3.12.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Thu Jan 7 17:07:27 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 07 Jan 2010 16:07:27 +0000 Subject: [csw-devel] SF.net SVN: gar:[7904] csw/mgar/pkg/libsndfile/trunk Message-ID: Revision: 7904 http://gar.svn.sourceforge.net/gar/?rev=7904&view=rev Author: dmichelsen Date: 2010-01-07 16:07:24 +0000 (Thu, 07 Jan 2010) Log Message: ----------- libsndfile: Update to 1.0.21 Modified Paths: -------------- csw/mgar/pkg/libsndfile/trunk/Makefile csw/mgar/pkg/libsndfile/trunk/checksums Modified: csw/mgar/pkg/libsndfile/trunk/Makefile =================================================================== --- csw/mgar/pkg/libsndfile/trunk/Makefile 2010-01-07 15:55:05 UTC (rev 7903) +++ csw/mgar/pkg/libsndfile/trunk/Makefile 2010-01-07 16:07:24 UTC (rev 7904) @@ -3,7 +3,7 @@ # $Id$ GARNAME = libsndfile -GARVERSION = 1.0.20 +GARVERSION = 1.0.21 CATEGORIES = lib @@ -30,7 +30,7 @@ writing new sound file formats. endef -MASTER_SITES = http://www.mega-nerd.com/libsndfile/ +MASTER_SITES = http://www.mega-nerd.com/libsndfile/files/ DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz PATCHFILES = 0001-Add-lrintf-workaround-to-regtest.patch Modified: csw/mgar/pkg/libsndfile/trunk/checksums =================================================================== --- csw/mgar/pkg/libsndfile/trunk/checksums 2010-01-07 15:55:05 UTC (rev 7903) +++ csw/mgar/pkg/libsndfile/trunk/checksums 2010-01-07 16:07:24 UTC (rev 7904) @@ -2,4 +2,4 @@ ab0c6ea20d4bda60f6f6dd4fa4c26871 0002-Add-workaround-for-missing-libm-function-lrint-and-l.patch 599bd5f64872bbddf993ce0815d28417 0003-Workaround-mising-stdint.h-and-Sun-Studio-shortcomin.patch 732c648739e94cb5fd2e70d983390318 0004-Disable-stop-on-error-until-cpp_test-refcount-error-.patch -e0553e12c7a467af44693e95e2eac668 libsndfile-1.0.20.tar.gz +880a40ec636ab2185b97f8927299b292 libsndfile-1.0.21.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From chninkel at users.sourceforge.net Thu Jan 7 17:10:39 2010 From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net) Date: Thu, 07 Jan 2010 16:10:39 +0000 Subject: [csw-devel] SF.net SVN: gar:[7905] csw/mgar/pkg/bash/trunk Message-ID: Revision: 7905 http://gar.svn.sourceforge.net/gar/?rev=7905&view=rev Author: chninkel Date: 2010-01-07 16:10:39 +0000 (Thu, 07 Jan 2010) Log Message: ----------- bash: updated vsnprintf.patch following upstream advice Modified Paths: -------------- csw/mgar/pkg/bash/trunk/Makefile csw/mgar/pkg/bash/trunk/checksums csw/mgar/pkg/bash/trunk/files/changelog.CSW csw/mgar/pkg/bash/trunk/files/vsnprintf.patch Modified: csw/mgar/pkg/bash/trunk/Makefile =================================================================== --- csw/mgar/pkg/bash/trunk/Makefile 2010-01-07 16:07:24 UTC (rev 7904) +++ csw/mgar/pkg/bash/trunk/Makefile 2010-01-07 16:10:39 UTC (rev 7905) @@ -67,7 +67,7 @@ # opencsw bash use /etc/bash.bashrc and /etc/bash.bash_logout files PATCHFILES += use_system_bashrc_and_logout.patch -# Temporary fix for vsnprintf definition clash +# Temporary fix for vsnprintf definition PATCHFILES += vsnprintf.patch ##### Build and installation information ##### Modified: csw/mgar/pkg/bash/trunk/checksums =================================================================== --- csw/mgar/pkg/bash/trunk/checksums 2010-01-07 16:07:24 UTC (rev 7904) +++ csw/mgar/pkg/bash/trunk/checksums 2010-01-07 16:10:39 UTC (rev 7905) @@ -1,6 +1,6 @@ f93b41b44ce6b023df65b72f00386ac5 CSWbash.prototype 9800d8724815fd84994d9be65ab5e7b8 bash-4.1.tar.gz -8b104a3cddca41849186af53c8602eef changelog.CSW +c2f23fbca9f119574b933d4f335a838d changelog.CSW 60956e6be20f69dafbb06fcc83bab88e shells 29607316cff22f7427322d8f190cbadf use_system_bashrc_and_logout.patch -f2876ca41b05f236621abddc713af3e7 vsnprintf.patch +44859f2b196b79f037134d32c4ee79ea vsnprintf.patch Modified: csw/mgar/pkg/bash/trunk/files/changelog.CSW =================================================================== --- csw/mgar/pkg/bash/trunk/files/changelog.CSW 2010-01-07 16:07:24 UTC (rev 7904) +++ csw/mgar/pkg/bash/trunk/files/changelog.CSW 2010-01-07 16:10:39 UTC (rev 7905) @@ -1,6 +1,7 @@ -bash (4.1,REV=2010.01.02) unstable +bash (4.1,REV=2010.01.07) unstable * New upstream release. + * Added patch vsnprintf.patch to fix bash vsnprintf declaration. -- Yann Rouillard Sat, 02 Jan 2010 14:12:18 +0100 Modified: csw/mgar/pkg/bash/trunk/files/vsnprintf.patch =================================================================== --- csw/mgar/pkg/bash/trunk/files/vsnprintf.patch 2010-01-07 16:07:24 UTC (rev 7904) +++ csw/mgar/pkg/bash/trunk/files/vsnprintf.patch 2010-01-07 16:10:39 UTC (rev 7905) @@ -1,47 +1,15 @@ -diff --speed-large-files -Nur builtins/printf.def builtins/printf.def ---- builtins/printf.def 2010-01-06 15:15:00.498275417 +0100 -+++ builtins/printf.def 2010-01-06 15:13:39.646642489 +0100 -@@ -172,7 +172,9 @@ - #endif - - #if !HAVE_VSNPRINTF --extern int vsnprintf __P((char *, size_t, const char *, ...)) __attribute__((__format__ (printf, 3, 4))); -+extern int bash_vsnprintf __P((char *, size_t, const char *, ...)) __attribute__((__format__ (printf, 3, 4))); -+#else -+# define bash_vsnprintf vsnprintf - #endif - - static void printf_erange __P((char *)); -@@ -885,7 +887,7 @@ - int blen; - - SH_VA_START (args, format); -- blen = vsnprintf (vbuf + vblen, vbsize - vblen, format, args); -+ blen = bash_vsnprintf (vbuf + vblen, vbsize - vblen, format, args); - va_end (args); - - nlen = vblen + blen + 1; -@@ -894,7 +896,7 @@ - vbsize = ((nlen + 63) >> 6) << 6; - vbuf = (char *)xrealloc (vbuf, vbsize); - SH_VA_START (args, format); -- blen = vsnprintf (vbuf + vblen, vbsize - vblen, format, args); -+ blen = bash_vsnprintf (vbuf + vblen, vbsize - vblen, format, args); - va_end (args); - } - -diff --speed-large-files -Nur lib/sh/snprintf.c lib/sh/snprintf.c ---- lib/sh/snprintf.c 2010-01-06 15:14:47.740952207 +0100 -+++ lib/sh/snprintf.c 2010-01-06 15:14:25.727971179 +0100 -@@ -1655,9 +1655,9 @@ - - int - #if defined (__STDC__) --vsnprintf(char *string, size_t length, const char *format, va_list args) -+bash_vsnprintf(char *string, size_t length, const char *format, va_list args) - #else --vsnprintf(string, length, format, args) -+bash_vsnprintf(string, length, format, args) - char *string; - size_t length; - const char *format; +*** ../bash-4.1/builtins/printf.def 2009-11-20 15:31:23.000000000 -0500 +--- builtins/printf.def 2010-01-07 08:50:06.000000000 -0500 +*************** +*** 173,177 **** + + #if !HAVE_VSNPRINTF +! extern int vsnprintf __P((char *, size_t, const char *, ...)) __attribute__((__format__ (printf, 3, 4))); + #endif + +--- 173,177 ---- + + #if !HAVE_VSNPRINTF +! extern int vsnprintf __P((char *, size_t, const char *, va_list)) __attribute__((__format__ (printf, 3, 0))); + #endif + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From janholzh at users.sourceforge.net Thu Jan 7 17:25:20 2010 From: janholzh at users.sourceforge.net (janholzh at users.sourceforge.net) Date: Thu, 07 Jan 2010 16:25:20 +0000 Subject: [csw-devel] SF.net SVN: gar:[7906] csw/mgar/pkg/transmission/trunk/Makefile Message-ID: Revision: 7906 http://gar.svn.sourceforge.net/gar/?rev=7906&view=rev Author: janholzh Date: 2010-01-07 16:25:20 +0000 (Thu, 07 Jan 2010) Log Message: ----------- correct spelling Modified Paths: -------------- csw/mgar/pkg/transmission/trunk/Makefile Modified: csw/mgar/pkg/transmission/trunk/Makefile =================================================================== --- csw/mgar/pkg/transmission/trunk/Makefile 2010-01-07 16:10:39 UTC (rev 7905) +++ csw/mgar/pkg/transmission/trunk/Makefile 2010-01-07 16:25:20 UTC (rev 7906) @@ -1,4 +1,4 @@ -GARNAME = transmission +GARNAME = transmission GARVERSION = 1.76 CATEGORIES = net @@ -13,46 +13,46 @@ # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = -(\d+(?:\.\d+)*).tar.bz2 -PACKAGES = CSWtransmisson -PACKAGES += CSWtransmissongtk2 -SPKG_DESC_CSWtransmisson = Fast, easy, and free multi-platform BitTorrent client -SPKG_DESC_CSWtransmissongtk2 = Fast, easy, and free multi-platform BitTorrent client , gtk2 Interface +PACKAGES = CSWtransmission +PACKAGES += CSWtransmissiongtk2 +SPKG_DESC_CSWtransmission = Fast, easy, and free multi-platform BitTorrent client +SPKG_DESC_CSWtransmissiongtk2 = Fast, easy, and free multi-platform BitTorrent client , gtk2 Interface -REQUIRED_PKGS_CSWtransmissongtk2 = CSWcurlrt -REQUIRED_PKGS_CSWtransmissongtk2 += CSWdbusglib -REQUIRED_PKGS_CSWtransmissongtk2 += CSWfconfig -REQUIRED_PKGS_CSWtransmissongtk2 += CSWftype2 -REQUIRED_PKGS_CSWtransmissongtk2 += CSWggettextrt -REQUIRED_PKGS_CSWtransmissongtk2 += CSWglib2 -REQUIRED_PKGS_CSWtransmissongtk2 += CSWgtk2 -REQUIRED_PKGS_CSWtransmissongtk2 += CSWlibatk -REQUIRED_PKGS_CSWtransmissongtk2 += CSWlibcairo -REQUIRED_PKGS_CSWtransmissongtk2 += CSWlibdbus -REQUIRED_PKGS_CSWtransmissongtk2 += CSWlibevent -REQUIRED_PKGS_CSWtransmissongtk2 += CSWlibxext -REQUIRED_PKGS_CSWtransmissongtk2 += CSWosslrt -REQUIRED_PKGS_CSWtransmissongtk2 += CSWpango -REQUIRED_PKGS_CSWtransmissongtk2 += CSWzlib -REQUIRED_PKGS_CSWtransmissongtk2 += CSWdbus +REQUIRED_PKGS_CSWtransmissiongtk2 = CSWcurlrt +REQUIRED_PKGS_CSWtransmissiongtk2 += CSWdbusglib +REQUIRED_PKGS_CSWtransmissiongtk2 += CSWfconfig +REQUIRED_PKGS_CSWtransmissiongtk2 += CSWftype2 +REQUIRED_PKGS_CSWtransmissiongtk2 += CSWggettextrt +REQUIRED_PKGS_CSWtransmissiongtk2 += CSWglib2 +REQUIRED_PKGS_CSWtransmissiongtk2 += CSWgtk2 +REQUIRED_PKGS_CSWtransmissiongtk2 += CSWlibatk +REQUIRED_PKGS_CSWtransmissiongtk2 += CSWlibcairo +REQUIRED_PKGS_CSWtransmissiongtk2 += CSWlibdbus +REQUIRED_PKGS_CSWtransmissiongtk2 += CSWlibevent +REQUIRED_PKGS_CSWtransmissiongtk2 += CSWlibxext +REQUIRED_PKGS_CSWtransmissiongtk2 += CSWosslrt +REQUIRED_PKGS_CSWtransmissiongtk2 += CSWpango +REQUIRED_PKGS_CSWtransmissiongtk2 += CSWzlib +REQUIRED_PKGS_CSWtransmissiongtk2 += CSWdbus -REQUIRED_PKGS_CSWtransmisson = CSWcurlrt -REQUIRED_PKGS_CSWtransmisson += CSWlibevent -REQUIRED_PKGS_CSWtransmisson += CSWggettextrt -REQUIRED_PKGS_CSWtransmisson += CSWosslrt -REQUIRED_PKGS_CSWtransmisson += CSWzlib +REQUIRED_PKGS_CSWtransmission = CSWcurlrt +REQUIRED_PKGS_CSWtransmission += CSWlibevent +REQUIRED_PKGS_CSWtransmission += CSWggettextrt +REQUIRED_PKGS_CSWtransmission += CSWosslrt +REQUIRED_PKGS_CSWtransmission += CSWzlib -REQUIRED_PKGS_CSWtransmissongtk2 += CSWtransmisson +REQUIRED_PKGS_CSWtransmissiongtk2 += CSWtransmission -PKGFILES_CSWtransmisson = /opt/csw/bin/transmissioncli -PKGFILES_CSWtransmisson += /opt/csw/bin/transmission-.* -PKGFILES_CSWtransmisson += /opt/csw/share/locale/.* -PKGFILES_CSWtransmisson += /opt/csw/share/man/.* -PKGFILES_CSWtransmisson += /opt/csw/share/transmission/.* +PKGFILES_CSWtransmission = /opt/csw/bin/transmissioncli +PKGFILES_CSWtransmission += /opt/csw/bin/transmission-.* +PKGFILES_CSWtransmission += /opt/csw/share/locale/.* +PKGFILES_CSWtransmission += /opt/csw/share/man/.* +PKGFILES_CSWtransmission += /opt/csw/share/transmission/.* -CATALOGNAME_CSWtransmisson = transmisson -CATALOGNAME_CSWtransmissongtk2 = transmisson_gtk2 +CATALOGNAME_CSWtransmission = transmission +CATALOGNAME_CSWtransmissiongtk2 = transmission_gtk2 EXTRA_CFLAGS = -DNO_SYS_QUEUE_H -lresolv -mt This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From janholzh at users.sourceforge.net Thu Jan 7 17:36:01 2010 From: janholzh at users.sourceforge.net (janholzh at users.sourceforge.net) Date: Thu, 07 Jan 2010 16:36:01 +0000 Subject: [csw-devel] SF.net SVN: gar:[7907] csw/mgar/pkg/transmission/trunk/Makefile Message-ID: Revision: 7907 http://gar.svn.sourceforge.net/gar/?rev=7907&view=rev Author: janholzh Date: 2010-01-07 16:36:01 +0000 (Thu, 07 Jan 2010) Log Message: ----------- correct error Modified Paths: -------------- csw/mgar/pkg/transmission/trunk/Makefile Modified: csw/mgar/pkg/transmission/trunk/Makefile =================================================================== --- csw/mgar/pkg/transmission/trunk/Makefile 2010-01-07 16:25:20 UTC (rev 7906) +++ csw/mgar/pkg/transmission/trunk/Makefile 2010-01-07 16:36:01 UTC (rev 7907) @@ -1,4 +1,4 @@ -GARNAME = transmission +GARNAME = transmission GARVERSION = 1.76 CATEGORIES = net This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From hson at users.sourceforge.net Thu Jan 7 17:39:38 2010 From: hson at users.sourceforge.net (hson at users.sourceforge.net) Date: Thu, 07 Jan 2010 16:39:38 +0000 Subject: [csw-devel] SF.net SVN: gar:[7908] csw/mgar/pkg/lcms/trunk Message-ID: Revision: 7908 http://gar.svn.sourceforge.net/gar/?rev=7908&view=rev Author: hson Date: 2010-01-07 16:39:38 +0000 (Thu, 07 Jan 2010) Log Message: ----------- Split package in two, lib and developer Make 64-bit targets Update to 1.19 Modified Paths: -------------- csw/mgar/pkg/lcms/trunk/Makefile csw/mgar/pkg/lcms/trunk/checksums Modified: csw/mgar/pkg/lcms/trunk/Makefile =================================================================== --- csw/mgar/pkg/lcms/trunk/Makefile 2010-01-07 16:36:01 UTC (rev 7907) +++ csw/mgar/pkg/lcms/trunk/Makefile 2010-01-07 16:39:38 UTC (rev 7908) @@ -1,6 +1,6 @@ GARNAME = lcms -GARVERSION = 1.18 -GARSUBREV = a +GARVERSION = 1.19 +GARSUBREV = CATEGORIES = lib DESCRIPTION = The little color management system and tools @@ -16,9 +16,20 @@ MASTER_SITES = $(SF_MIRRORS) DISTFILES = $(GARNAME)-$(GARVERSION)$(GARSUBREV).tar.gz +#DISTFILES = $(GARNAME)-$(GARVERSION)$(GARSUBREV).tar.gz -REQUIRED_PKGS += CSWjpeg CSWtiff CSWzlib +PACKAGES = CSWlcms CSWlcmsdevel +CATALOGNAME_CSWlcms = lcms +CATALOGNAME_CSWlcmsdevel = lcms_devel +SPKG_DESC_CSWlcms += The little color management system and tools +SPKG_DESC_CSWlcmsdevel += The little color management system and tools - developer package + +REQUIRED_PKGS_CSWlcms += CSWjpeg CSWtiff CSWzlib +REQUIRED_PKGS_CSWlcmsdevel += CSWlcms + +PKGFILES_CSWlcmsdevel = $(PKGFILES_DEVEL) + SPKG_SOURCEURL = http://www.littlecms.com LICENSE = COPYING @@ -34,8 +45,10 @@ CONFIGURE_ARGS = $(DIRPATHS) +BUILD64 = 1 + TEST_TARGET = check include gar/category.mk -SPKG_REVSTAMP := $(SPKG_REVSTAMP)_rev=$(GARSUBREV) +#SPKG_REVSTAMP := $(SPKG_REVSTAMP)_rev=$(GARSUBREV) Modified: csw/mgar/pkg/lcms/trunk/checksums =================================================================== --- csw/mgar/pkg/lcms/trunk/checksums 2010-01-07 16:36:01 UTC (rev 7907) +++ csw/mgar/pkg/lcms/trunk/checksums 2010-01-07 16:39:38 UTC (rev 7908) @@ -1 +1 @@ -f4abfe1c57ea3f633c2e9d034e74e3e8 download/lcms-1.18a.tar.gz +8af94611baf20d9646c7c2c285859818 lcms-1.19.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From idogan23 at users.sourceforge.net Thu Jan 7 19:33:27 2010 From: idogan23 at users.sourceforge.net (idogan23 at users.sourceforge.net) Date: Thu, 07 Jan 2010 18:33:27 +0000 Subject: [csw-devel] SF.net SVN: gar:[7909] csw/mgar/pkg/nsd/trunk Message-ID: Revision: 7909 http://gar.svn.sourceforge.net/gar/?rev=7909&view=rev Author: idogan23 Date: 2010-01-07 18:33:27 +0000 (Thu, 07 Jan 2010) Log Message: ----------- nsd: bump version to 3.2.4 Modified Paths: -------------- csw/mgar/pkg/nsd/trunk/Makefile csw/mgar/pkg/nsd/trunk/checksums Modified: csw/mgar/pkg/nsd/trunk/Makefile =================================================================== --- csw/mgar/pkg/nsd/trunk/Makefile 2010-01-07 16:39:38 UTC (rev 7908) +++ csw/mgar/pkg/nsd/trunk/Makefile 2010-01-07 18:33:27 UTC (rev 7909) @@ -1,5 +1,5 @@ GARNAME = nsd -GARVERSION = 3.2.3 +GARVERSION = 3.2.4 CATEGORIES = server DESCRIPTION = An authoritative only non-recursive name server @@ -8,7 +8,8 @@ authoritative DNS nameserver. endef -MASTER_SITES = http://www.nlnetlabs.nl/projects/nsd/ +MASTER_SITES = http://www.nlnetlabs.nl/downloads/nsd/ +SPKG_SOURCE_URL = http://www.nlnetlabs.nl/projects/nsd/ # If the url used to check for software update is different of MASTER_SITES, then # uncomment the next line. Otherwise it is set by default to the value of MASTER_SITES @@ -18,7 +19,7 @@ UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz PACKAGES = CSWnsd -REQUIRED_PKGS = CSWcswclassutils CSWosslrt +REQUIRED_PKGS = CSWosslrt CATALOGNAME = nsd SPKG_DESC = An authoritative only non-recursive name server Modified: csw/mgar/pkg/nsd/trunk/checksums =================================================================== --- csw/mgar/pkg/nsd/trunk/checksums 2010-01-07 16:39:38 UTC (rev 7908) +++ csw/mgar/pkg/nsd/trunk/checksums 2010-01-07 18:33:27 UTC (rev 7909) @@ -1,4 +1,3 @@ -bc1f6a6a33f1204454cf013273f0521c download/Makefile.in.diff -0eece57abde9d1cef8a962461b453d03 download/cswnsd -7a7560acb5d56847ea16fb8cd77b6ca5 download/cswusergroup -5ddb35dfb7da0defb82cda4f7388cba2 download/nsd-3.2.3.tar.gz +0eece57abde9d1cef8a962461b453d03 cswnsd +7a7560acb5d56847ea16fb8cd77b6ca5 cswusergroup +0c394fd713d194bde24a1035e56d5a79 nsd-3.2.4.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Fri Jan 8 00:08:06 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Thu, 07 Jan 2010 23:08:06 +0000 Subject: [csw-devel] SF.net SVN: gar:[7910] csw/mgar/gar/v2/gar.conf.mk Message-ID: Revision: 7910 http://gar.svn.sourceforge.net/gar/?rev=7910&view=rev Author: wahwah Date: 2010-01-07 23:08:06 +0000 (Thu, 07 Jan 2010) Log Message: ----------- mGAR v2: Adding CSWpython and CSWpy-cheetah to DEF_BASE_PKGS Modified Paths: -------------- csw/mgar/gar/v2/gar.conf.mk Modified: csw/mgar/gar/v2/gar.conf.mk =================================================================== --- csw/mgar/gar/v2/gar.conf.mk 2010-01-07 18:33:27 UTC (rev 7909) +++ csw/mgar/gar/v2/gar.conf.mk 2010-01-07 23:08:06 UTC (rev 7910) @@ -168,7 +168,21 @@ COMMON_PKG_DEPENDS ?= CSWcommon # These are the core packages which must be installed for GAR to function correctly -DEF_BASE_PKGS = CSWgmake CSWgtar CSWggrep CSWdiffutils CSWgfile CSWtextutils CSWwget CSWfindutils CSWgsed CSWgawk CSWbzip2 + +DEF_BASE_PKGS += CSWbzip2 +DEF_BASE_PKGS += CSWdiffutils +DEF_BASE_PKGS += CSWfindutils +DEF_BASE_PKGS += CSWgawk +DEF_BASE_PKGS += CSWgfile +DEF_BASE_PKGS += CSWggrep +DEF_BASE_PKGS += CSWgmake +DEF_BASE_PKGS += CSWgsed +DEF_BASE_PKGS += CSWgtar +DEF_BASE_PKGS += CSWpy-cheetah +DEF_BASE_PKGS += CSWpython +DEF_BASE_PKGS += CSWtextutils +DEF_BASE_PKGS += CSWwget + ifdef GIT_REPOS # netcat and bash are for the gitproxy script. DEF_BASE_PKGS += CSWgit CSWnetcat This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Fri Jan 8 00:34:57 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Thu, 07 Jan 2010 23:34:57 +0000 Subject: [csw-devel] SF.net SVN: gar:[7911] csw/mgar/gar/v2/bin/checkpkg.d/checkpkg-libs.py Message-ID: Revision: 7911 http://gar.svn.sourceforge.net/gar/?rev=7911&view=rev Author: wahwah Date: 2010-01-07 23:34:57 +0000 (Thu, 07 Jan 2010) Log Message: ----------- mGAR v2: checkpkg-libs.py, skayser's suggestions from http://lists.opencsw.org/pipermail/maintainers/2010-January/005375.html Modified Paths: -------------- csw/mgar/gar/v2/bin/checkpkg.d/checkpkg-libs.py Modified: csw/mgar/gar/v2/bin/checkpkg.d/checkpkg-libs.py =================================================================== --- csw/mgar/gar/v2/bin/checkpkg.d/checkpkg-libs.py 2010-01-07 23:08:06 UTC (rev 7910) +++ csw/mgar/gar/v2/bin/checkpkg.d/checkpkg-libs.py 2010-01-07 23:34:57 UTC (rev 7911) @@ -81,7 +81,8 @@ binary_data = checkpkg.ParseDumpOutput(stdout) needed_sonames_by_binary[binary_base_name] = binary_data if checkpkg.SONAME not in binary_data: - logging.info("The %s shared library doesn't provide a SONAME.", + logging.debug("The %s binary doesn't provide a SONAME. " + "(It might be an executable)", binary_base_name) # The shared library doesn't tell its SONAME. We're guessing it's the # same as the base file name. @@ -130,7 +131,7 @@ elif soname in lines_by_soname: print ("%s is provided by %s and required by:" % (soname, - repr(pkgs_by_filename[soname]))) + pkgs_by_filename[soname])) filename_lines = " ".join(sorted(binaries_by_soname[soname])) for line in textwrap.wrap(filename_lines, 70): print " ", line This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Fri Jan 8 01:37:22 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Fri, 08 Jan 2010 00:37:22 +0000 Subject: [csw-devel] SF.net SVN: gar:[7912] csw/mgar/gar/v2/bin/checkpkg.d Message-ID: Revision: 7912 http://gar.svn.sourceforge.net/gar/?rev=7912&view=rev Author: wahwah Date: 2010-01-08 00:37:22 +0000 (Fri, 08 Jan 2010) Log Message: ----------- mGAR v2: Part of output formatting moved to a function Modified Paths: -------------- csw/mgar/gar/v2/bin/checkpkg.d/checkpkg-libs.py csw/mgar/gar/v2/bin/checkpkg.d/checkpkg.py csw/mgar/gar/v2/bin/checkpkg.d/checkpkg_test.py Modified: csw/mgar/gar/v2/bin/checkpkg.d/checkpkg-libs.py =================================================================== --- csw/mgar/gar/v2/bin/checkpkg.d/checkpkg-libs.py 2010-01-07 23:34:57 UTC (rev 7911) +++ csw/mgar/gar/v2/bin/checkpkg.d/checkpkg-libs.py 2010-01-08 00:37:22 UTC (rev 7912) @@ -186,31 +186,13 @@ pkgs_by_filename, filenames_by_soname, pkg_by_any_filename) + print checker.FormatDepsReport(missing_deps, + surplus_deps, + orphan_sonames) - # TODO: Rewrite this using cheetah templates. - print "%s:" % pkgname - msg_printed = False - if missing_deps: - print "SUGGESTION: you may want to add some or all of the following as depends:" - print " (Feel free to ignore SUNW or SPRO packages)" - for dep_pkgname in sorted(missing_deps): - print ">", dep_pkgname - msg_printed = True - if surplus_deps: - print "The following packages might be unnecessary dependencies:" - for dep_pkgname in surplus_deps: - print "? ", dep_pkgname - msg_printed = True - if orphan_sonames: - print "The following sonames don't belong to any package:" - for soname in sorted(orphan_sonames): - errors.append(checkpkg.Error("The following soname does't belong to " - "any package: %s" % soname)) - print "! ", soname - msg_printed = True - if not msg_printed: - print "+ Dependencies of %s look good." % pkgname - print + for soname in orphan_sonames: + errors.append(checkpkg.Error("The following soname does't belong to " + "any package: %s" % checker.soname)) if errors: for error in errors: Modified: csw/mgar/gar/v2/bin/checkpkg.d/checkpkg.py =================================================================== --- csw/mgar/gar/v2/bin/checkpkg.d/checkpkg.py 2010-01-07 23:34:57 UTC (rev 7911) +++ csw/mgar/gar/v2/bin/checkpkg.d/checkpkg.py 2010-01-08 00:37:22 UTC (rev 7912) @@ -12,6 +12,7 @@ import socket import sqlite3 import subprocess +import StringIO SYSTEM_PKGMAP = "/var/sadm/install/contents" WS_RE = re.compile(r"\s+") @@ -112,7 +113,33 @@ fd.close() return depends + def FormatDepsReport(self, missing_deps, surplus_deps, orphan_sonames): + """A intermediate version in which StringIO is used.""" + s = StringIO.StringIO() + print >>s, "%s:" % self.pkgname + msg_printed = False + if missing_deps: + print >>s, "SUGGESTION: you may want to add some or all of the following as depends:" + print >>s, " (Feel free to ignore SUNW or SPRO packages)" + for dep_pkgname in sorted(missing_deps): + print >>s, ">", dep_pkgname + msg_printed = True + if surplus_deps: + print >>s, "The following packages might be unnecessary dependencies:" + for dep_pkgname in surplus_deps: + print >>s, "? ", dep_pkgname + msg_printed = True + if orphan_sonames: + print >>s, "The following sonames don't belong to any package:" + for soname in sorted(orphan_sonames): + print >>s, "! ", soname + msg_printed = True + if not msg_printed: + print >>s, "+ Dependencies of %s look good." % self.pkgname + s.seek(0) + return s.read() + class SystemPkgmap(object): """A class to hold and manipulate the /var/sadm/install/contents file. Modified: csw/mgar/gar/v2/bin/checkpkg.d/checkpkg_test.py =================================================================== --- csw/mgar/gar/v2/bin/checkpkg.d/checkpkg_test.py 2010-01-07 23:34:57 UTC (rev 7911) +++ csw/mgar/gar/v2/bin/checkpkg.d/checkpkg_test.py 2010-01-08 00:37:22 UTC (rev 7912) @@ -3,6 +3,7 @@ import unittest import mox +import difflib import checkpkg import testdata.checkpkg_test_data_CSWmysql51rt as d1 import testdata.checkpkg_test_data_CSWmysql51client as d2 @@ -434,5 +435,30 @@ checkpkg.ParseDumpOutput(dump_2.DATA_DUMP_OUTPUT)["runpath"]) +class FormatDepsReportUnitTest(unittest.TestCase): + + def AssertTextEqual(self, text1, text2): + difference = "\n".join(difflib.context_diff(text2.splitlines(), text1.splitlines())) + self.assertEqual(text1, text2, difference) + + def test_1(self): + missing_deps = set([u'SUNWgss', u'*SUNWlxsl']) + surplus_deps = set(['CSWsudo', 'CSWlibxslt']) + orphan_sonames = set([]) + testdata = (missing_deps, surplus_deps, orphan_sonames) + checker = checkpkg.CheckpkgBase("/tmp/nonexistent", "CSWfoo") + expected = u"""CSWfoo: +SUGGESTION: you may want to add some or all of the following as depends: + (Feel free to ignore SUNW or SPRO packages) +> *SUNWlxsl +> SUNWgss +The following packages might be unnecessary dependencies: +? CSWsudo +? CSWlibxslt +""" + result = checker.FormatDepsReport(*testdata) + self.AssertTextEqual(result, expected) + + if __name__ == '__main__': unittest.main() This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Fri Jan 8 01:42:28 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Fri, 08 Jan 2010 00:42:28 +0000 Subject: [csw-devel] SF.net SVN: gar:[7913] csw/mgar/pkg/mysql5/branches/mysql-5.0.x Message-ID: Revision: 7913 http://gar.svn.sourceforge.net/gar/?rev=7913&view=rev Author: wahwah Date: 2010-01-08 00:42:27 +0000 (Fri, 08 Jan 2010) Log Message: ----------- mysql5.0.x: Added --enable-thread-safe-client Modified Paths: -------------- csw/mgar/pkg/mysql5/branches/mysql-5.0.x/Makefile csw/mgar/pkg/mysql5/branches/mysql-5.0.x/checksums csw/mgar/pkg/mysql5/branches/mysql-5.0.x/files/CSWmysql5.postinstall Modified: csw/mgar/pkg/mysql5/branches/mysql-5.0.x/Makefile =================================================================== --- csw/mgar/pkg/mysql5/branches/mysql-5.0.x/Makefile 2010-01-08 00:37:22 UTC (rev 7912) +++ csw/mgar/pkg/mysql5/branches/mysql-5.0.x/Makefile 2010-01-08 00:42:27 UTC (rev 7913) @@ -144,15 +144,16 @@ # Set ./configure options CONFIGURE_ARGS = $(DIRPATHS) CONFIGURE_ARGS += --disable-assembler -CONFIGURE_ARGS += --without-docs CONFIGURE_ARGS += --enable-local-infile +CONFIGURE_ARGS += --enable-thread-safe-client CONFIGURE_ARGS += --with-extra-charsets=all CONFIGURE_ARGS += --with-low-memory +CONFIGURE_ARGS += --with-plugins=max-no-ndb CONFIGURE_ARGS += --with-pthread CONFIGURE_ARGS += --with-readline +CONFIGURE_ARGS += --with-ssl=/opt/csw CONFIGURE_ARGS += --with-zlib-dir=/opt/csw -CONFIGURE_ARGS += --with-ssl=/opt/csw -CONFIGURE_ARGS += --with-plugins=max-no-ndb +CONFIGURE_ARGS += --without-docs CONFIGURE_ARGS_DBG = --with-debug CONFIGURE_ARGS += $(CONFIGURE_ARGS_$(GARFLAVOR)) Modified: csw/mgar/pkg/mysql5/branches/mysql-5.0.x/checksums =================================================================== --- csw/mgar/pkg/mysql5/branches/mysql-5.0.x/checksums 2010-01-08 00:37:22 UTC (rev 7912) +++ csw/mgar/pkg/mysql5/branches/mysql-5.0.x/checksums 2010-01-08 00:42:27 UTC (rev 7913) @@ -2,7 +2,7 @@ 1414d06fab1530484a508927a0de4154 0002-cast-user_info-pw_gid-to-gid_t.patch 5415f365f1b0f7a179d1efc25f45bbee 0003-OpenCSW-perl-for-tests.patch 8ab232cd4d232b3cda3bbced93f80237 0004-basedir-and-datadir-in-the-cnf-files.patch -a723d7b35d76794c910daa20e6f86158 CSWmysql5.postinstall +a441f22d615222a04118805d3976a248 CSWmysql5.postinstall 60162ea667507a6a487027e7c389ca55 CSWmysql5.preinstall e691b0cf00a3925ac55c1844045d6e30 ChangeLog e42afb5ec1b1ab02d2ec3b46d0922636 README.CSW Modified: csw/mgar/pkg/mysql5/branches/mysql-5.0.x/files/CSWmysql5.postinstall =================================================================== --- csw/mgar/pkg/mysql5/branches/mysql-5.0.x/files/CSWmysql5.postinstall 2010-01-08 00:37:22 UTC (rev 7912) +++ csw/mgar/pkg/mysql5/branches/mysql-5.0.x/files/CSWmysql5.postinstall 2010-01-08 00:42:27 UTC (rev 7913) @@ -86,8 +86,8 @@ svcadm clear cswmysql5 svcadm enable cswmysql5 else - echo "Running \`/etc/opt/csw/init.d/cswmysql\` start to start the database." - /etc/opt/csw/init.d/cswmysql start + echo "Running \`/etc/opt/csw/init.d/cswmysql\` start to start the database." + /etc/opt/csw/init.d/cswmysql start fi exit 0 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Fri Jan 8 01:43:07 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Fri, 08 Jan 2010 00:43:07 +0000 Subject: [csw-devel] SF.net SVN: gar:[7914] csw/mgar/pkg/mysql5/branches/mysql-5.0.x/checksums Message-ID: Revision: 7914 http://gar.svn.sourceforge.net/gar/?rev=7914&view=rev Author: wahwah Date: 2010-01-08 00:43:06 +0000 (Fri, 08 Jan 2010) Log Message: ----------- mysql5.0.x: Updating checksum for files with the $Id$ tag Modified Paths: -------------- csw/mgar/pkg/mysql5/branches/mysql-5.0.x/checksums Modified: csw/mgar/pkg/mysql5/branches/mysql-5.0.x/checksums =================================================================== --- csw/mgar/pkg/mysql5/branches/mysql-5.0.x/checksums 2010-01-08 00:42:27 UTC (rev 7913) +++ csw/mgar/pkg/mysql5/branches/mysql-5.0.x/checksums 2010-01-08 00:43:06 UTC (rev 7914) @@ -2,7 +2,7 @@ 1414d06fab1530484a508927a0de4154 0002-cast-user_info-pw_gid-to-gid_t.patch 5415f365f1b0f7a179d1efc25f45bbee 0003-OpenCSW-perl-for-tests.patch 8ab232cd4d232b3cda3bbced93f80237 0004-basedir-and-datadir-in-the-cnf-files.patch -a441f22d615222a04118805d3976a248 CSWmysql5.postinstall +bd7647733a5cc2e6e3dd7e7d4b8d311f CSWmysql5.postinstall 60162ea667507a6a487027e7c389ca55 CSWmysql5.preinstall e691b0cf00a3925ac55c1844045d6e30 ChangeLog e42afb5ec1b1ab02d2ec3b46d0922636 README.CSW This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Fri Jan 8 12:02:14 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Fri, 08 Jan 2010 11:02:14 +0000 Subject: [csw-devel] SF.net SVN: gar:[7915] csw/mgar/gar/v2/bin/checkpkg.d Message-ID: Revision: 7915 http://gar.svn.sourceforge.net/gar/?rev=7915&view=rev Author: wahwah Date: 2010-01-08 11:02:13 +0000 (Fri, 08 Jan 2010) Log Message: ----------- mGAR v2: Rewrote part of output formatting to use a template Modified Paths: -------------- csw/mgar/gar/v2/bin/checkpkg.d/checkpkg.py csw/mgar/gar/v2/bin/checkpkg.d/checkpkg_test.py Modified: csw/mgar/gar/v2/bin/checkpkg.d/checkpkg.py =================================================================== --- csw/mgar/gar/v2/bin/checkpkg.d/checkpkg.py 2010-01-08 00:43:06 UTC (rev 7914) +++ csw/mgar/gar/v2/bin/checkpkg.d/checkpkg.py 2010-01-08 11:02:13 UTC (rev 7915) @@ -13,6 +13,7 @@ import sqlite3 import subprocess import StringIO +from Cheetah import Template SYSTEM_PKGMAP = "/var/sadm/install/contents" WS_RE = re.compile(r"\s+") @@ -28,6 +29,31 @@ # Solaris 8 on i386. It's okay if it's missing. ALLOWED_ORPHAN_SONAMES = set([u"libm.so.2"]) +REPORT_TMPL = u"""$pkgname: +#if $missing_deps +SUGGESTION: you may want to add some or all of the following as depends: + (Feel free to ignore SUNW or SPRO packages) +#for $pkg in $sorted($missing_deps) +> $pkg +#end for +#end if +#if $surplus_deps +The following packages might be unnecessary dependencies: +#for $pkg in $sorted($surplus_deps) +? $pkg +#end for +#end if +#if $orphan_sonames +The following sonames don't belong to any package: +#for $soname in $sorted($orphan_sonames) +! $soname +#end for +#end if +#if not $missing_deps and not $surplus_deps and not $orphan_sonames ++ Dependencies of $pkgname look good. +#end if +""" + class Error(Exception): pass @@ -115,29 +141,14 @@ def FormatDepsReport(self, missing_deps, surplus_deps, orphan_sonames): """A intermediate version in which StringIO is used.""" - s = StringIO.StringIO() - print >>s, "%s:" % self.pkgname - msg_printed = False - if missing_deps: - print >>s, "SUGGESTION: you may want to add some or all of the following as depends:" - print >>s, " (Feel free to ignore SUNW or SPRO packages)" - for dep_pkgname in sorted(missing_deps): - print >>s, ">", dep_pkgname - msg_printed = True - if surplus_deps: - print >>s, "The following packages might be unnecessary dependencies:" - for dep_pkgname in surplus_deps: - print >>s, "? ", dep_pkgname - msg_printed = True - if orphan_sonames: - print >>s, "The following sonames don't belong to any package:" - for soname in sorted(orphan_sonames): - print >>s, "! ", soname - msg_printed = True - if not msg_printed: - print >>s, "+ Dependencies of %s look good." % self.pkgname - s.seek(0) - return s.read() + namespace = { + "pkgname": self.pkgname, + "missing_deps": missing_deps, + "surplus_deps": surplus_deps, + "orphan_sonames": orphan_sonames, + } + t = Template.Template(REPORT_TMPL, searchList=[namespace]) + return unicode(t) class SystemPkgmap(object): Modified: csw/mgar/gar/v2/bin/checkpkg.d/checkpkg_test.py =================================================================== --- csw/mgar/gar/v2/bin/checkpkg.d/checkpkg_test.py 2010-01-08 00:43:06 UTC (rev 7914) +++ csw/mgar/gar/v2/bin/checkpkg.d/checkpkg_test.py 2010-01-08 11:02:13 UTC (rev 7915) @@ -441,10 +441,10 @@ difference = "\n".join(difflib.context_diff(text2.splitlines(), text1.splitlines())) self.assertEqual(text1, text2, difference) - def test_1(self): + def testAll(self): missing_deps = set([u'SUNWgss', u'*SUNWlxsl']) surplus_deps = set(['CSWsudo', 'CSWlibxslt']) - orphan_sonames = set([]) + orphan_sonames = set([u'libm.so.2']) testdata = (missing_deps, surplus_deps, orphan_sonames) checker = checkpkg.CheckpkgBase("/tmp/nonexistent", "CSWfoo") expected = u"""CSWfoo: @@ -453,12 +453,26 @@ > *SUNWlxsl > SUNWgss The following packages might be unnecessary dependencies: -? CSWsudo -? CSWlibxslt +? CSWlibxslt +? CSWsudo +The following sonames don't belong to any package: +! libm.so.2 """ result = checker.FormatDepsReport(*testdata) self.AssertTextEqual(result, expected) + def testNone(self): + missing_deps = set([]) + surplus_deps = set([]) + orphan_sonames = set([]) + testdata = (missing_deps, surplus_deps, orphan_sonames) + checker = checkpkg.CheckpkgBase("/tmp/nonexistent", "CSWfoo") + expected = u"""CSWfoo: ++ Dependencies of CSWfoo look good. +""" + result = checker.FormatDepsReport(*testdata) + self.AssertTextEqual(result, expected) + if __name__ == '__main__': unittest.main() This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Fri Jan 8 23:37:23 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Fri, 08 Jan 2010 22:37:23 +0000 Subject: [csw-devel] SF.net SVN: gar:[7916] csw/mgar/pkg Message-ID: Revision: 7916 http://gar.svn.sourceforge.net/gar/?rev=7916&view=rev Author: wahwah Date: 2010-01-08 22:37:07 +0000 (Fri, 08 Jan 2010) Log Message: ----------- rhythmbox: Initial commit, some preliminary work Modified Paths: -------------- csw/mgar/pkg/rhythmbox/trunk/Makefile csw/mgar/pkg/rhythmbox/trunk/checksums Added Paths: ----------- csw/mgar/pkg/rhythmbox/ csw/mgar/pkg/rhythmbox/trunk/files/0001-ggettext-for-intltool.patch csw/mgar/pkg/rhythmbox/trunk/files/0002-Adding-ACLOCAL_AMFLAGS-I-macros-to-Makefile.am.patch csw/mgar/pkg/rhythmbox/trunk/files/0003-autoreconf-results.patch Modified: csw/mgar/pkg/rhythmbox/trunk/Makefile =================================================================== --- csw/mgar/pkg/template/trunk/Makefile 2010-01-08 11:02:13 UTC (rev 7915) +++ csw/mgar/pkg/rhythmbox/trunk/Makefile 2010-01-08 22:37:07 UTC (rev 7916) @@ -2,184 +2,21 @@ # Distributed under the terms of the GNU General Public License v2 # $Id$ -## This file contains comments to guide you through various GAR settings. -## Please remove unnecessary comments before committing your code to the code -## repository. The comments to remove are marked with double hashes. -## If you want to remove them all in-place, use: -## gsed -i -e '/^##/d' Makefile -## -## For more information about GAR variables, please see: -## https://sourceforge.net/apps/trac/gar/wiki/GAR%20Variable%20Reference -## -GARNAME = mypkg -GARVERSION = 1.0 -## -## The category that your software fits in. This is not a descriptive field, but -## influences the build process. Depending on the CATEGORIES setting, different -## Makefiles are included from gar/categories/ in your trunk directory, which -## adjust the build settings for the respective category. -## -## Possible settings are: -## apps, cpan, devel, gnome, java, kde, lang, lib, meta, net, python, server, -## utils, x11, xfce, xorg, xtra -CATEGORIES = lib -## -## A one-line description of the package, which will appear in the pkginfo. -DESCRIPTION = -## -## A longer description of the package. This is only for descriptive purposes -## inside the Makefile and is not used elsewhere. +GARNAME = rhythmbox +GARVERSION = 0.12.6 +CATEGORIES = apps +DESCRIPTION = an integrated music management application define BLURB - endef -## -## Upstream URL that should show up in the VENDOR field as well as on -## http://opencsw.org/packages/. -SPKG_SOURCEURL = -## -## Whitespace-separated list of URLs to download the source package from. -## There are presets: $(SF_MIRRORS), $(GNU_MIRRORS) and $(GOOGLE_MIRROR). -MASTER_SITES = -## -## SF_PROJ is required if you set $(MASTER_SITES) to $(SF_MIRRORS) and the -## Sourceforge project name differs from $(GARNAME). Specifies the Sourceforge -## project name of the software you wish to download. -## SF_PROJ = -## -## A list of space separated patch filenames from files/ that are to be applied -## to the extracted software before the ./configure stage. Patches need to be -## included in the DISTFILES variable as well. -## PATCHFILES = -## -## Whitespace-separated list of files which comprise this build. mGAR will look -## for the files in the $(FILEDIR) (trunk/files) directory and on the -## $(MASTER_SITES). -DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz -## -## We define upstream file regex so we can be notifed of new upstream software release -UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz -## -## Catalog name is the name to be used with pkg{-get,util} -i . -## It is different from the system package name, which by convention is CSWpkgname. -## CATALOGNAME = -## -## Set to 1 to mark the package as architecture-independent. -## ARCHALL = 0 -## -## A list of files / patterns that should be excluded from the package. Amends -## the default list of excluded filenames $(MERGE_EXCLUDE_DEFAULT), which -## contains things like libtool .la files and files with a leading ~. -## EXTRA_MERGE_EXCLUDE_FILES = -## -## A list of space separated package names that should be marked as -## incompatible with the current package. This will go into the depend file. -## When a user has one of the incompatible packages installed and installs -## your package, he will be prompted that the incompatible package must be -## removed. He will however not be prevented to install your package without -## removing the conflicting package first. -## INCOMPATIBLE_PKGS = -## -## The name of the license file that should be included in your package. Defaults -## to COPYING. See http://sourceforge.net/apps/trac/gar/wiki/CopyRightfor details -## on including and displaying licenses. -## LICENSE = -## -## A list of space separated package names that should be produced from your -## Makefile. This is used when a software has different components that can be -## packaged and used individually (think runtime libraries, client tools, server -## files, development headers). You don't need to set this when you just want to -## produce one package. -## -## When you set this variable to include more than one package, you also need to -## set PKGFILES_CSWpkgname for each package (except for the first one in your -## $(PACKAGES) list) to define which files go into each package. The first -## package from $(PACKAGES) one will hold all files that are not matched by -## PKGFILES_ for other packages. -## PACKAGES = -## -## If specified, GAR feeds the almost-final package prototype file to -## $(PROTOTYPE_FILTER) and reads the final package prototype file from it. -## $(PROTOTYPE_FILTER) is usually a sed/awk/perl one-liner, which was mostly used -## to prepare the prototype file for use with cswclassutils (see -## $(SPKG_CLASSES)). Now that there are convenience variables for cswclassutils, -## you will rarely have to use this. A still valid use case would be to change -## the file permissions of a file to be set-UID. -## See http://wiki.opencsw.org/cswclassutils-package for common usage information -## PROTOTYPE_FILTER = -## -## cswclassutils settings -## -## A list of action classes. Possible values are: -## none cswpreserveconf cswcpsampleconf cswpycompile cswusergroup cswinitsmf -## cswinetd cswetcservices -## The class 'cswinitsmf' must be the last class listed. When you use cswclassutils, -## you need to add CSWcswclassutils to REQUIRED_PKGS. -## SPKG_CLASSES = none -## Simplified settings for classes: -## PRESERVECONF = -## SAMPLECONF = -## INITSMF = -## USERGROUP = -## ETCSERVICES = -## INETDCONF = -## A list of runtime package dependencies in the form of CSWfoo. -## REQUIRED_PKGS = -## -## A list of packages necessary to build this package -## PREREQUISITE_PKGS = $(REQUIRED_PKGS) -## -## When using non-empty $(PACKAGES): -## REQUIRED_PKGS_CSWpkgname = -## SPKG_DESC_CSWpkgname = -## PKGFILES_CSWpkgname = -## CATALOGNAME_CSWpkgname = -## -## A list of space separated directories where objects should be stripped in -## addition to the bin/ and sbin/ directories. -## STRIP_DIRS = -## -## Define a custom target for the configure phase. When you set this, the target -## that will be used instead of configure: target, is named -## configure-$(CONFIGURE_SCRIPTS) and you will need to define it in your Makefile -## after including gar/gar.include.mk. If you want to skip the configure phase -## completely (for example when your software doesn't need to be compiled) assign -## this variable an empty value. The procedure works for configure, build, -## install and test steps. -## CONFIGURE_SCRIPTS = -## BUILD_SCRIPTS = -## INSTALL_SCRIPTS = -## TEST_SCRIPTS = -## -## Compilation settings -## -## The build directory. -## WORKSRC = $(WORKDIR)/$(GARNAME)-$(GARVERSION) -## -## BUILD_ARGS is passed as an argument to gmake during the build phase. Use this -## for example, if you need to override Makefile variables. -## BUILD_ARGS = -## -## Arguments passed to the ./configure script. +SPKG_SOURCEURL = http://projects.gnome.org/rhythmbox/ +MASTER_SITES = http://ftp.gnome.org/pub/gnome/sources/rhythmbox/0.12/ +PATCHFILES = 0001-ggettext-for-intltool.patch +PATCHFILES += 0002-Adding-ACLOCAL_AMFLAGS-I-macros-to-Makefile.am.patch +PATCHFILES += 0003-autoreconf-results.patch +DISTFILES = $(GARNAME)-$(GARVERSION).tar.bz2 +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.bz2 CONFIGURE_ARGS = $(DIRPATHS) -## -## BUILD64 = -## CONFIGURE_ENV = -## EXTRA_CFLAGS = -## EXTRA_LDFLAGS = -## EXTRA_INC = -## EXTRA_LIB = -## GARFLAVOR = -## INSTALL_ARGS = -## OPT_FLAGS_SOS = -xO3 -## OPT_FLAGS_GCC = -O2 -pipe -## -## The compiler to use. Defaults to SOS11, can be also: SOS12, GCC3, GCC4. -## GARCOMPILER = SOS11 -## -# Remove the following rules and uncomment the -# include before building. -all: .DEFAULT -.DEFAULT: - @true -#include gar/category.mk +EXTRA_PKG_CONFIG_DIRS = /opt/csw/X11/lib + +include gar/category.mk Modified: csw/mgar/pkg/rhythmbox/trunk/checksums =================================================================== --- csw/mgar/pkg/template/trunk/checksums 2010-01-08 11:02:13 UTC (rev 7915) +++ csw/mgar/pkg/rhythmbox/trunk/checksums 2010-01-08 22:37:07 UTC (rev 7916) @@ -0,0 +1 @@ +c22ff476c956afeb7f694e5d1a59cfb9 rhythmbox-0.12.6.tar.bz2 Added: csw/mgar/pkg/rhythmbox/trunk/files/0001-ggettext-for-intltool.patch =================================================================== --- csw/mgar/pkg/rhythmbox/trunk/files/0001-ggettext-for-intltool.patch (rev 0) +++ csw/mgar/pkg/rhythmbox/trunk/files/0001-ggettext-for-intltool.patch 2010-01-08 22:37:07 UTC (rev 7916) @@ -0,0 +1,29 @@ +From df579a7309602f91fb62b338e31db413580139f3 Mon Sep 17 00:00:00 2001 +From: Maciej Blizinski +Date: Fri, 8 Jan 2010 23:32:53 +0100 +Subject: [PATCH 1/3] ggettext for intltool + +--- + macros/intltool.m4 | 6 +++--- + 1 files changed, 3 insertions(+), 3 deletions(-) + +diff --git a/macros/intltool.m4 b/macros/intltool.m4 +index 122d773..1b9d7af 100644 +--- a/macros/intltool.m4 ++++ b/macros/intltool.m4 +@@ -96,9 +96,9 @@ _IT_SUBST(INTLTOOL_SERVICE_RULE) + _IT_SUBST(INTLTOOL_POLICY_RULE) + + # Check the gettext tools to make sure they are GNU +-AC_PATH_PROG(XGETTEXT, xgettext) +-AC_PATH_PROG(MSGMERGE, msgmerge) +-AC_PATH_PROG(MSGFMT, msgfmt) ++AC_PATH_PROG(XGETTEXT, gxgettext) ++AC_PATH_PROG(MSGMERGE, gmsgmerge) ++AC_PATH_PROG(MSGFMT, gmsgfmt) + AC_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT) + if test -z "$XGETTEXT" -o -z "$MSGMERGE" -o -z "$MSGFMT"; then + AC_MSG_ERROR([GNU gettext tools not found; required for intltool]) +-- +1.6.6 + Added: csw/mgar/pkg/rhythmbox/trunk/files/0002-Adding-ACLOCAL_AMFLAGS-I-macros-to-Makefile.am.patch =================================================================== --- csw/mgar/pkg/rhythmbox/trunk/files/0002-Adding-ACLOCAL_AMFLAGS-I-macros-to-Makefile.am.patch (rev 0) +++ csw/mgar/pkg/rhythmbox/trunk/files/0002-Adding-ACLOCAL_AMFLAGS-I-macros-to-Makefile.am.patch 2010-01-08 22:37:07 UTC (rev 7916) @@ -0,0 +1,25 @@ +From caf9941527c6dccd00746778f8f115ba8fe6fe7c Mon Sep 17 00:00:00 2001 +From: Maciej Blizinski +Date: Sat, 9 Jan 2010 00:11:11 +0100 +Subject: [PATCH 2/3] Adding ACLOCAL_AMFLAGS = -I macros to Makefile.am + +--- + Makefile.am | 2 ++ + 1 files changed, 2 insertions(+), 0 deletions(-) + +diff --git a/Makefile.am b/Makefile.am +index c8fea86..63ac9a5 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -2,6 +2,8 @@ + + AUTOMAKE_OPTIONS = 1.7 + ++ACLOCAL_AMFLAGS = -I macros ++ + DISTCHECK_CONFIGURE_FLAGS = --disable-schemas-install --enable-gtk-doc --disable-scrollkeeper + distuninstallcheck_listfiles = find . -type f -print | grep -v '^\./var/scrollkeeper' + +-- +1.6.6 + Added: csw/mgar/pkg/rhythmbox/trunk/files/0003-autoreconf-results.patch =================================================================== --- csw/mgar/pkg/rhythmbox/trunk/files/0003-autoreconf-results.patch (rev 0) +++ csw/mgar/pkg/rhythmbox/trunk/files/0003-autoreconf-results.patch 2010-01-08 22:37:07 UTC (rev 7916) @@ -0,0 +1,4320 @@ +From 248d9e77494156217abdf698446163e09690ab8e Mon Sep 17 00:00:00 2001 +From: Maciej Blizinski +Date: Sat, 9 Jan 2010 00:12:02 +0100 +Subject: [PATCH 3/3] autoreconf results + +--- + INSTALL | 97 ++- + Makefile.in | 19 +- + aclocal.m4 | 65 +- + backends/Makefile.in | 6 +- + backends/gstreamer/Makefile.in | 2 +- + bindings/Makefile.in | 6 +- + bindings/python/Makefile.in | 2 +- + bindings/vala/Makefile.in | 2 +- + config.guess | 142 ++-- + config.sub | 30 +- + configure | 968 +++++++++++------------ + data/Makefile.in | 6 +- + data/icons/Makefile.in | 6 +- + data/icons/hicolor/16x16/Makefile.in | 6 +- + data/icons/hicolor/16x16/actions/Makefile.in | 2 +- + data/icons/hicolor/16x16/apps/Makefile.in | 2 +- + data/icons/hicolor/16x16/places/Makefile.in | 2 +- + data/icons/hicolor/16x16/status/Makefile.in | 2 +- + data/icons/hicolor/22x22/Makefile.in | 6 +- + data/icons/hicolor/22x22/actions/Makefile.in | 2 +- + data/icons/hicolor/22x22/apps/Makefile.in | 2 +- + data/icons/hicolor/22x22/places/Makefile.in | 2 +- + data/icons/hicolor/22x22/status/Makefile.in | 2 +- + data/icons/hicolor/24x24/Makefile.in | 6 +- + data/icons/hicolor/24x24/apps/Makefile.in | 2 +- + data/icons/hicolor/32x32/Makefile.in | 6 +- + data/icons/hicolor/32x32/actions/Makefile.in | 2 +- + data/icons/hicolor/32x32/apps/Makefile.in | 2 +- + data/icons/hicolor/32x32/places/Makefile.in | 2 +- + data/icons/hicolor/32x32/status/Makefile.in | 2 +- + data/icons/hicolor/48x48/Makefile.in | 6 +- + data/icons/hicolor/48x48/apps/Makefile.in | 2 +- + data/icons/hicolor/Makefile.in | 6 +- + data/icons/hicolor/scalable/Makefile.in | 6 +- + data/icons/hicolor/scalable/actions/Makefile.in | 2 +- + data/icons/hicolor/scalable/apps/Makefile.in | 2 +- + data/icons/hicolor/scalable/places/Makefile.in | 2 +- + data/icons/hicolor/scalable/status/Makefile.in | 2 +- + data/ui/Makefile.in | 2 +- + doc/Makefile.in | 6 +- + doc/reference/Makefile.in | 2 +- + help/Makefile.in | 2 +- + lib/Makefile.in | 6 +- + lib/libmediaplayerid/Makefile.in | 2 +- + ltmain.sh | 37 +- + macros/Makefile.in | 2 +- + macros/libtool.m4 | 27 +- + macros/ltversion.m4 | 10 +- + metadata/Makefile.in | 6 +- + plugins/Makefile.in | 6 +- + plugins/artdisplay/Makefile.in | 6 +- + plugins/artdisplay/artdisplay/Makefile.in | 2 +- + plugins/audiocd/Makefile.in | 2 +- + plugins/audioscrobbler/Makefile.in | 2 +- + plugins/brasero-disc-recorder/Makefile.in | 2 +- + plugins/cd-recorder/Makefile.in | 2 +- + plugins/coherence/Makefile.in | 6 +- + plugins/coherence/upnp_coherence/Makefile.in | 2 +- + plugins/context/Makefile.in | 6 +- + plugins/context/context/Makefile.in | 2 +- + plugins/daap/Makefile.in | 2 +- + plugins/fmradio/Makefile.in | 2 +- + plugins/generic-player/Makefile.in | 2 +- + plugins/im-status/Makefile.in | 2 +- + plugins/ipod/Makefile.in | 2 +- + plugins/iradio/Makefile.in | 2 +- + plugins/jamendo/Makefile.in | 6 +- + plugins/jamendo/jamendo/Makefile.in | 2 +- + plugins/lirc/Makefile.in | 2 +- + plugins/lyrics/Makefile.in | 6 +- + plugins/lyrics/lyrics/Makefile.in | 2 +- + plugins/magnatune/Makefile.in | 6 +- + plugins/magnatune/magnatune/Makefile.in | 2 +- + plugins/mmkeys/Makefile.in | 2 +- + plugins/mtpdevice/Makefile.in | 2 +- + plugins/power-manager/Makefile.in | 2 +- + plugins/pythonconsole/Makefile.in | 2 +- + plugins/rb/Makefile.in | 2 +- + plugins/sample-python/Makefile.in | 2 +- + plugins/sample-vala/Makefile.in | 2 +- + plugins/sample/Makefile.in | 2 +- + plugins/status-icon/Makefile.in | 2 +- + plugins/visualizer/Makefile.in | 2 +- + podcast/Makefile.in | 2 +- + remote/Makefile.in | 6 +- + remote/dbus/Makefile.in | 2 +- + rhythmdb/Makefile.in | 2 +- + shell/Makefile.in | 2 +- + sources/Makefile.in | 2 +- + tests/Makefile.in | 2 +- + widgets/Makefile.in | 6 +- + widgets/libsexy/Makefile.in | 2 +- + 92 files changed, 812 insertions(+), 841 deletions(-) + +diff --git a/INSTALL b/INSTALL +index 2550dab..7d1c323 100644 +--- a/INSTALL ++++ b/INSTALL +@@ -4,8 +4,10 @@ Installation Instructions + Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005, + 2006, 2007, 2008, 2009 Free Software Foundation, Inc. + +- This file is free documentation; the Free Software Foundation gives +-unlimited permission to copy, distribute and modify it. ++ Copying and distribution of this file, with or without modification, ++are permitted in any medium without royalty provided the copyright ++notice and this notice are preserved. This file is offered as-is, ++without warranty of any kind. + + Basic Installation + ================== +@@ -13,7 +15,11 @@ Basic Installation + Briefly, the shell commands `./configure; make; make install' should + configure, build, and install this package. The following + more-detailed instructions are generic; see the `README' file for +-instructions specific to this package. ++instructions specific to this package. Some packages provide this ++`INSTALL' file but do not implement all of the features documented ++below. The lack of an optional feature in a given package is not ++necessarily a bug. More recommendations for GNU packages can be found ++in *note Makefile Conventions: (standards)Makefile Conventions. + + The `configure' shell script attempts to guess correct values for + various system-dependent variables used during compilation. It uses +@@ -42,7 +48,7 @@ may remove or edit it. + you want to change it or regenerate `configure' using a newer version + of `autoconf'. + +-The simplest way to compile this package is: ++ The simplest way to compile this package is: + + 1. `cd' to the directory containing the package's source code and type + `./configure' to configure the package for your system. +@@ -53,12 +59,22 @@ The simplest way to compile this package is: + 2. Type `make' to compile the package. + + 3. Optionally, type `make check' to run any self-tests that come with +- the package. ++ the package, generally using the just-built uninstalled binaries. + + 4. Type `make install' to install the programs and any data files and +- documentation. +- +- 5. You can remove the program binaries and object files from the ++ documentation. When installing into a prefix owned by root, it is ++ recommended that the package be configured and built as a regular ++ user, and only the `make install' phase executed with root ++ privileges. ++ ++ 5. Optionally, type `make installcheck' to repeat any self-tests, but ++ this time using the binaries in their final installed location. ++ This target does not install anything. Running this target as a ++ regular user, particularly if the prior `make install' required ++ root privileges, verifies that the installation completed ++ correctly. ++ ++ 6. You can remove the program binaries and object files from the + source code directory by typing `make clean'. To also remove the + files that `configure' created (so you can compile the package for + a different kind of computer), type `make distclean'. There is +@@ -67,8 +83,15 @@ The simplest way to compile this package is: + all sorts of other programs in order to regenerate files that came + with the distribution. + +- 6. Often, you can also type `make uninstall' to remove the installed +- files again. ++ 7. Often, you can also type `make uninstall' to remove the installed ++ files again. In practice, not all packages have tested that ++ uninstallation works correctly, even though it is required by the ++ GNU Coding Standards. ++ ++ 8. Some packages, particularly those that use Automake, provide `make ++ distcheck', which can by used by developers to test that all other ++ targets like `make install' and `make uninstall' work correctly. ++ This target is generally not run by end users. + + Compilers and Options + ===================== +@@ -93,7 +116,8 @@ same time, by placing the object files for each architecture in their + own directory. To do this, you can use GNU `make'. `cd' to the + directory where you want the object files and executables to go and run + the `configure' script. `configure' automatically checks for the +-source code in the directory that `configure' is in and in `..'. ++source code in the directory that `configure' is in and in `..'. This ++is known as a "VPATH" build. + + With a non-GNU `make', it is safer to compile the package for one + architecture at a time in the source code directory. After you have +@@ -120,7 +144,8 @@ Installation Names + By default, `make install' installs the package's commands under + `/usr/local/bin', include files under `/usr/local/include', etc. You + can specify an installation prefix other than `/usr/local' by giving +-`configure' the option `--prefix=PREFIX'. ++`configure' the option `--prefix=PREFIX', where PREFIX must be an ++absolute file name. + + You can specify separate installation prefixes for + architecture-specific files and architecture-independent files. If you +@@ -131,15 +156,46 @@ Documentation and other data files still use the regular prefix. + In addition, if you use an unusual directory layout you can give + options like `--bindir=DIR' to specify different values for particular + kinds of files. Run `configure --help' for a list of the directories +-you can set and what kinds of files go in them. ++you can set and what kinds of files go in them. In general, the ++default for these options is expressed in terms of `${prefix}', so that ++specifying just `--prefix' will affect all of the other directory ++specifications that were not explicitly provided. ++ ++ The most portable way to affect installation locations is to pass the ++correct locations to `configure'; however, many packages provide one or ++both of the following shortcuts of passing variable assignments to the ++`make install' command line to change installation locations without ++having to reconfigure or recompile. ++ ++ The first method involves providing an override variable for each ++affected directory. For example, `make install ++prefix=/alternate/directory' will choose an alternate location for all ++directory configuration variables that were expressed in terms of ++`${prefix}'. Any directories that were specified during `configure', ++but not in terms of `${prefix}', must each be overridden at install ++time for the entire installation to be relocated. The approach of ++makefile variable overrides for each directory variable is required by ++the GNU Coding Standards, and ideally causes no recompilation. ++However, some platforms have known limitations with the semantics of ++shared libraries that end up requiring recompilation when using this ++method, particularly noticeable in packages that use GNU Libtool. ++ ++ The second method involves providing the `DESTDIR' variable. For ++example, `make install DESTDIR=/alternate/directory' will prepend ++`/alternate/directory' before all installation names. The approach of ++`DESTDIR' overrides is not required by the GNU Coding Standards, and ++does not work on platforms that have drive letters. On the other hand, ++it does better at avoiding recompilation issues, and works well even ++when some directory options were not specified in terms of `${prefix}' ++at `configure' time. ++ ++Optional Features ++================= + + If the package supports it, you can cause programs to be installed + with an extra prefix or suffix on their names by giving `configure' the + option `--program-prefix=PREFIX' or `--program-suffix=SUFFIX'. + +-Optional Features +-================= +- + Some packages pay attention to `--enable-FEATURE' options to + `configure', where FEATURE indicates an optional part of the package. + They may also pay attention to `--with-PACKAGE' options, where PACKAGE +@@ -152,6 +208,13 @@ find the X include and library files automatically, but if it doesn't, + you can use the `configure' options `--x-includes=DIR' and + `--x-libraries=DIR' to specify their locations. + ++ Some packages offer the ability to configure how verbose the ++execution of `make' will be. For these packages, running `./configure ++--enable-silent-rules' sets the default to minimal output, which can be ++overridden with `make V=1'; while running `./configure ++--disable-silent-rules' sets the default to verbose, which can be ++overridden with `make V=0'. ++ + Particular systems + ================== + +@@ -288,7 +351,7 @@ operates. + `configure' can determine that directory automatically. + + `--prefix=DIR' +- Use DIR as the installation prefix. *Note Installation Names:: ++ Use DIR as the installation prefix. *note Installation Names:: + for more details, including other options available for fine-tuning + the installation locations. + +diff --git a/Makefile.in b/Makefile.in +index 834112b..511d23a 100644 +--- a/Makefile.in ++++ b/Makefile.in +@@ -1,4 +1,4 @@ +-# Makefile.in generated by automake 1.11 from Makefile.am. ++# Makefile.in generated by automake 1.11.1 from Makefile.am. + # @configure_input@ + + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +@@ -115,7 +115,7 @@ GZIP_ENV = --best + DIST_ARCHIVES = $(distdir).tar.bz2 + distcleancheck_listfiles = find . -type f -print + ACLOCAL = @ACLOCAL@ +-ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@ ++ACLOCAL_AMFLAGS = -I macros + ALL_LINGUAS = @ALL_LINGUAS@ + AMTAR = @AMTAR@ + AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ +@@ -435,7 +435,7 @@ distclean-libtool: + # (which will cause the Makefiles to be regenerated when you run `make'); + # (2) otherwise, pass the desired values on the `make' command line. + $(RECURSIVE_TARGETS): +- @failcom='exit 1'; \ ++ @fail= failcom='exit 1'; \ + for f in x $$MAKEFLAGS; do \ + case $$f in \ + *=* | --[!k]*);; \ +@@ -460,7 +460,7 @@ $(RECURSIVE_TARGETS): + fi; test -z "$$fail" + + $(RECURSIVE_CLEAN_TARGETS): +- @failcom='exit 1'; \ ++ @fail= failcom='exit 1'; \ + for f in x $$MAKEFLAGS; do \ + case $$f in \ + *=* | --[!k]*);; \ +@@ -624,7 +624,8 @@ distdir: $(DISTFILES) + fi; \ + done + -test -n "$(am__skip_mode_fix)" \ +- || find "$(distdir)" -type d ! -perm -777 -exec chmod a+rwx {} \; -o \ ++ || find "$(distdir)" -type d ! -perm -755 \ ++ -exec chmod u+rwx,go+rx {} \; -o \ + ! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \ + ! -type d ! -perm -400 -exec chmod a+r {} \; -o \ + ! -type d ! -perm -444 -exec $(install_sh) -c -m a+r {} {} \; \ +@@ -667,17 +668,17 @@ dist dist-all: distdir + distcheck: dist + case '$(DIST_ARCHIVES)' in \ + *.tar.gz*) \ +- GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(am__untar) ;;\ ++ GZIP=$(GZIP_ENV) gzip -dc $(distdir).tar.gz | $(am__untar) ;;\ + *.tar.bz2*) \ +- bunzip2 -c $(distdir).tar.bz2 | $(am__untar) ;;\ ++ bzip2 -dc $(distdir).tar.bz2 | $(am__untar) ;;\ + *.tar.lzma*) \ +- unlzma -c $(distdir).tar.lzma | $(am__untar) ;;\ ++ lzma -dc $(distdir).tar.lzma | $(am__untar) ;;\ + *.tar.xz*) \ + xz -dc $(distdir).tar.xz | $(am__untar) ;;\ + *.tar.Z*) \ + uncompress -c $(distdir).tar.Z | $(am__untar) ;;\ + *.shar.gz*) \ +- GZIP=$(GZIP_ENV) gunzip -c $(distdir).shar.gz | unshar ;;\ ++ GZIP=$(GZIP_ENV) gzip -dc $(distdir).shar.gz | unshar ;;\ + *.zip*) \ + unzip $(distdir).zip ;;\ + esac +diff --git a/aclocal.m4 b/aclocal.m4 +index 5c6c2cb..85a1d8e 100644 +--- a/aclocal.m4 ++++ b/aclocal.m4 +@@ -1,4 +1,4 @@ +-# generated automatically by aclocal 1.11 -*- Autoconf -*- ++# generated automatically by aclocal 1.11.1 -*- Autoconf -*- + + # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, + # 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc. +@@ -13,8 +13,8 @@ + + m4_ifndef([AC_AUTOCONF_VERSION], + [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl +-m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.64],, +-[m4_warning([this file was generated for autoconf 2.64. ++m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.65],, ++[m4_warning([this file was generated for autoconf 2.65. + You have another version of autoconf. It may work, but is not guaranteed to. + If you have problems, you may need to regenerate the build system entirely. + To do so, use the procedure documented by the package, typically `autoreconf'.])]) +@@ -34,10 +34,8 @@ AC_DEFUN([AM_GCONF_SOURCE_2], + GCONF_SCHEMA_CONFIG_SOURCE=$GCONF_SCHEMA_INSTALL_SOURCE + fi + +- AC_ARG_WITH([gconf-source], +- AC_HELP_STRING([--with-gconf-source=sourceaddress], +- [Config database for installing schema files.]), +- [GCONF_SCHEMA_CONFIG_SOURCE="$withval"],) ++ AC_ARG_WITH(gconf-source, ++ [ --with-gconf-source=sourceaddress Config database for installing schema files.],GCONF_SCHEMA_CONFIG_SOURCE="$withval",) + + AC_SUBST(GCONF_SCHEMA_CONFIG_SOURCE) + AC_MSG_RESULT([Using config source $GCONF_SCHEMA_CONFIG_SOURCE for schema installation]) +@@ -46,20 +44,17 @@ AC_DEFUN([AM_GCONF_SOURCE_2], + GCONF_SCHEMA_FILE_DIR='$(sysconfdir)/gconf/schemas' + fi + +- AC_ARG_WITH([gconf-schema-file-dir], +- AC_HELP_STRING([--with-gconf-schema-file-dir=dir], +- [Directory for installing schema files.]), +- [GCONF_SCHEMA_FILE_DIR="$withval"],) ++ AC_ARG_WITH(gconf-schema-file-dir, ++ [ --with-gconf-schema-file-dir=dir Directory for installing schema files.],GCONF_SCHEMA_FILE_DIR="$withval",) + + AC_SUBST(GCONF_SCHEMA_FILE_DIR) + AC_MSG_RESULT([Using $GCONF_SCHEMA_FILE_DIR as install directory for schema files]) + + AC_ARG_ENABLE(schemas-install, +- AC_HELP_STRING([--disable-schemas-install], +- [Disable the schemas installation]), ++ [ --disable-schemas-install Disable the schemas installation], + [case ${enableval} in + yes|no) ;; +- *) AC_MSG_ERROR([bad value ${enableval} for --enable-schemas-install]) ;; ++ *) AC_MSG_ERROR(bad value ${enableval} for --enable-schemas-install) ;; + esac]) + AM_CONDITIONAL([GCONF_SCHEMAS_INSTALL], [test "$enable_schemas_install" != no]) + ]) +@@ -597,16 +592,14 @@ fi]) + # _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES]) + # --------------------------------------------- + m4_define([_PKG_CONFIG], +-[if test -n "$PKG_CONFIG"; then +- if test -n "$$1"; then +- pkg_cv_[]$1="$$1" +- else +- PKG_CHECK_EXISTS([$3], +- [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`], +- [pkg_failed=yes]) +- fi +-else +- pkg_failed=untried ++[if test -n "$$1"; then ++ pkg_cv_[]$1="$$1" ++ elif test -n "$PKG_CONFIG"; then ++ PKG_CHECK_EXISTS([$3], ++ [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`], ++ [pkg_failed=yes]) ++ else ++ pkg_failed=untried + fi[]dnl + ])# _PKG_CONFIG + +@@ -650,9 +643,9 @@ See the pkg-config man page for more details.]) + if test $pkg_failed = yes; then + _PKG_SHORT_ERRORS_SUPPORTED + if test $_pkg_short_errors_supported = yes; then +- $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "$2"` ++ $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "$2" 2>&1` + else +- $1[]_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$2"` ++ $1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors "$2" 2>&1` + fi + # Put the nasty error message in config.log where it belongs + echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD +@@ -702,7 +695,7 @@ AC_DEFUN([AM_AUTOMAKE_VERSION], + [am__api_version='1.11' + dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to + dnl require some minimum version. Point them to the right macro. +-m4_if([$1], [1.11], [], ++m4_if([$1], [1.11.1], [], + [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl + ]) + +@@ -718,7 +711,7 @@ m4_define([_AM_AUTOCONF_VERSION], []) + # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced. + # This function is AC_REQUIREd by AM_INIT_AUTOMAKE. + AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], +-[AM_AUTOMAKE_VERSION([1.11])dnl ++[AM_AUTOMAKE_VERSION([1.11.1])dnl + m4_ifndef([AC_AUTOCONF_VERSION], + [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl + _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))]) +@@ -1586,6 +1579,14 @@ python2.1 python2.0]) + am__strip_prefix=`echo "$am_py_prefix" | sed 's|.|.|g'` + am_cv_python_pythondir=`echo "$am_cv_python_pythondir" | sed "s,^$am__strip_prefix,$PYTHON_PREFIX,"` + ;; ++ *) ++ case $am_py_prefix in ++ /usr|/System*) ;; ++ *) ++ am_cv_python_pythondir=$PYTHON_PREFIX/lib/python$PYTHON_VERSION/site-packages ++ ;; ++ esac ++ ;; + esac + ]) + AC_SUBST([pythondir], [$am_cv_python_pythondir]) +@@ -1616,6 +1617,14 @@ python2.1 python2.0]) + am__strip_prefix=`echo "$am_py_exec_prefix" | sed 's|.|.|g'` + am_cv_python_pyexecdir=`echo "$am_cv_python_pyexecdir" | sed "s,^$am__strip_prefix,$PYTHON_EXEC_PREFIX,"` + ;; ++ *) ++ case $am_py_exec_prefix in ++ /usr|/System*) ;; ++ *) ++ am_cv_python_pyexecdir=$PYTHON_EXEC_PREFIX/lib/python$PYTHON_VERSION/site-packages ++ ;; ++ esac ++ ;; + esac + ]) + AC_SUBST([pyexecdir], [$am_cv_python_pyexecdir]) +diff --git a/backends/Makefile.in b/backends/Makefile.in +index 0f540b8..4d91f29 100644 +--- a/backends/Makefile.in ++++ b/backends/Makefile.in +@@ -1,4 +1,4 @@ +-# Makefile.in generated by automake 1.11 from Makefile.am. ++# Makefile.in generated by automake 1.11.1 from Makefile.am. + # @configure_input@ + + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +@@ -488,7 +488,7 @@ clean-libtool: + # (which will cause the Makefiles to be regenerated when you run `make'); + # (2) otherwise, pass the desired values on the `make' command line. + $(RECURSIVE_TARGETS): +- @failcom='exit 1'; \ ++ @fail= failcom='exit 1'; \ + for f in x $$MAKEFLAGS; do \ + case $$f in \ + *=* | --[!k]*);; \ +@@ -513,7 +513,7 @@ $(RECURSIVE_TARGETS): + fi; test -z "$$fail" + + $(RECURSIVE_CLEAN_TARGETS): +- @failcom='exit 1'; \ ++ @fail= failcom='exit 1'; \ + for f in x $$MAKEFLAGS; do \ + case $$f in \ + *=* | --[!k]*);; \ +diff --git a/backends/gstreamer/Makefile.in b/backends/gstreamer/Makefile.in +index be98d7f..434782b 100644 +--- a/backends/gstreamer/Makefile.in ++++ b/backends/gstreamer/Makefile.in +@@ -1,4 +1,4 @@ +-# Makefile.in generated by automake 1.11 from Makefile.am. ++# Makefile.in generated by automake 1.11.1 from Makefile.am. + # @configure_input@ + + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +diff --git a/bindings/Makefile.in b/bindings/Makefile.in +index 885d20f..84d232d 100644 +--- a/bindings/Makefile.in ++++ b/bindings/Makefile.in +@@ -1,4 +1,4 @@ +-# Makefile.in generated by automake 1.11 from Makefile.am. ++# Makefile.in generated by automake 1.11.1 from Makefile.am. + # @configure_input@ + + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +@@ -375,7 +375,7 @@ clean-libtool: + # (which will cause the Makefiles to be regenerated when you run `make'); + # (2) otherwise, pass the desired values on the `make' command line. + $(RECURSIVE_TARGETS): +- @failcom='exit 1'; \ ++ @fail= failcom='exit 1'; \ + for f in x $$MAKEFLAGS; do \ + case $$f in \ + *=* | --[!k]*);; \ +@@ -400,7 +400,7 @@ $(RECURSIVE_TARGETS): + fi; test -z "$$fail" + + $(RECURSIVE_CLEAN_TARGETS): +- @failcom='exit 1'; \ ++ @fail= failcom='exit 1'; \ + for f in x $$MAKEFLAGS; do \ + case $$f in \ + *=* | --[!k]*);; \ +diff --git a/bindings/python/Makefile.in b/bindings/python/Makefile.in +index 5301ded..2747295 100644 +--- a/bindings/python/Makefile.in ++++ b/bindings/python/Makefile.in +@@ -1,4 +1,4 @@ +-# Makefile.in generated by automake 1.11 from Makefile.am. ++# Makefile.in generated by automake 1.11.1 from Makefile.am. + # @configure_input@ + + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +diff --git a/bindings/vala/Makefile.in b/bindings/vala/Makefile.in +index 58595d5..7165e63 100644 +--- a/bindings/vala/Makefile.in ++++ b/bindings/vala/Makefile.in +@@ -1,4 +1,4 @@ +-# Makefile.in generated by automake 1.11 from Makefile.am. ++# Makefile.in generated by automake 1.11.1 from Makefile.am. + # @configure_input@ + + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +diff --git a/config.guess b/config.guess +index e3a2116..dc84c68 100755 +--- a/config.guess ++++ b/config.guess +@@ -4,7 +4,7 @@ + # 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 + # Free Software Foundation, Inc. + +-timestamp='2009-06-10' ++timestamp='2009-11-20' + + # This file is free software; you can redistribute it and/or modify it + # under the terms of the GNU General Public License as published by +@@ -27,16 +27,16 @@ timestamp='2009-06-10' + # the same distribution terms that you use for the rest of that program. + + +-# Originally written by Per Bothner . +-# Please send patches to . Submit a context +-# diff and a properly formatted ChangeLog entry. ++# Originally written by Per Bothner. Please send patches (context ++# diff format) to and include a ChangeLog ++# entry. + # + # This script attempts to guess a canonical system name similar to + # config.sub. If it succeeds, it prints the system name on stdout, and + # exits with 0. Otherwise, it exits with 1. + # +-# The plan is that this can be called by configure scripts if you +-# don't specify an explicit build system type. ++# You can get the latest version of this script from: ++# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD + + me=`echo "$0" | sed -e 's,.*/,,'` + +@@ -333,6 +333,9 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in + sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*) + echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` + exit ;; ++ i86pc:AuroraUX:5.*:* | i86xen:AuroraUX:5.*:*) ++ echo i386-pc-auroraux${UNAME_RELEASE} ++ exit ;; + i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*) + eval $set_cc_for_build + SUN_ARCH="i386" +@@ -807,12 +810,12 @@ EOF + i*:PW*:*) + echo ${UNAME_MACHINE}-pc-pw32 + exit ;; +- *:Interix*:[3456]*) ++ *:Interix*:*) + case ${UNAME_MACHINE} in + x86) + echo i586-pc-interix${UNAME_RELEASE} + exit ;; +- EM64T | authenticamd | genuineintel) ++ authenticamd | genuineintel | EM64T) + echo x86_64-unknown-interix${UNAME_RELEASE} + exit ;; + IA64) +@@ -854,6 +857,20 @@ EOF + i*86:Minix:*:*) + echo ${UNAME_MACHINE}-pc-minix + exit ;; ++ alpha:Linux:*:*) ++ case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in ++ EV5) UNAME_MACHINE=alphaev5 ;; ++ EV56) UNAME_MACHINE=alphaev56 ;; ++ PCA56) UNAME_MACHINE=alphapca56 ;; ++ PCA57) UNAME_MACHINE=alphapca56 ;; ++ EV6) UNAME_MACHINE=alphaev6 ;; ++ EV67) UNAME_MACHINE=alphaev67 ;; ++ EV68*) UNAME_MACHINE=alphaev68 ;; ++ esac ++ objdump --private-headers /bin/sh | grep -q ld.so.1 ++ if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi ++ echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC} ++ exit ;; + arm*:Linux:*:*) + eval $set_cc_for_build + if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \ +@@ -876,6 +893,17 @@ EOF + frv:Linux:*:*) + echo frv-unknown-linux-gnu + exit ;; ++ i*86:Linux:*:*) ++ LIBC=gnu ++ eval $set_cc_for_build ++ sed 's/^ //' << EOF >$dummy.c ++ #ifdef __dietlibc__ ++ LIBC=dietlibc ++ #endif ++EOF ++ eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC'` ++ echo "${UNAME_MACHINE}-pc-linux-${LIBC}" ++ exit ;; + ia64:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-gnu + exit ;; +@@ -901,39 +929,18 @@ EOF + #endif + #endif + EOF +- eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n ' +- /^CPU/{ +- s: ::g +- p +- }'`" ++ eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'` + test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; } + ;; + or32:Linux:*:*) + echo or32-unknown-linux-gnu + exit ;; +- ppc:Linux:*:*) +- echo powerpc-unknown-linux-gnu +- exit ;; +- ppc64:Linux:*:*) +- echo powerpc64-unknown-linux-gnu +- exit ;; +- alpha:Linux:*:*) +- case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in +- EV5) UNAME_MACHINE=alphaev5 ;; +- EV56) UNAME_MACHINE=alphaev56 ;; +- PCA56) UNAME_MACHINE=alphapca56 ;; +- PCA57) UNAME_MACHINE=alphapca56 ;; +- EV6) UNAME_MACHINE=alphaev6 ;; +- EV67) UNAME_MACHINE=alphaev67 ;; +- EV68*) UNAME_MACHINE=alphaev68 ;; +- esac +- objdump --private-headers /bin/sh | grep -q ld.so.1 +- if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi +- echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC} +- exit ;; + padre:Linux:*:*) + echo sparc-unknown-linux-gnu + exit ;; ++ parisc64:Linux:*:* | hppa64:Linux:*:*) ++ echo hppa64-unknown-linux-gnu ++ exit ;; + parisc:Linux:*:* | hppa:Linux:*:*) + # Look for CPU level + case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in +@@ -942,8 +949,11 @@ EOF + *) echo hppa-unknown-linux-gnu ;; + esac + exit ;; +- parisc64:Linux:*:* | hppa64:Linux:*:*) +- echo hppa64-unknown-linux-gnu ++ ppc64:Linux:*:*) ++ echo powerpc64-unknown-linux-gnu ++ exit ;; ++ ppc:Linux:*:*) ++ echo powerpc-unknown-linux-gnu + exit ;; + s390:Linux:*:* | s390x:Linux:*:*) + echo ${UNAME_MACHINE}-ibm-linux +@@ -966,58 +976,6 @@ EOF + xtensa*:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-gnu + exit ;; +- i*86:Linux:*:*) +- # The BFD linker knows what the default object file format is, so +- # first see if it will tell us. cd to the root directory to prevent +- # problems with other programs or directories called `ld' in the path. +- # Set LC_ALL=C to ensure ld outputs messages in English. +- ld_supported_targets=`cd /; LC_ALL=C ld --help 2>&1 \ +- | sed -ne '/supported targets:/!d +- s/[ ][ ]*/ /g +- s/.*supported targets: *// +- s/ .*// +- p'` +- case "$ld_supported_targets" in +- elf32-i386) +- TENTATIVE="${UNAME_MACHINE}-pc-linux-gnu" +- ;; +- esac +- # Determine whether the default compiler is a.out or elf +- eval $set_cc_for_build +- sed 's/^ //' << EOF >$dummy.c +- #include +- #ifdef __ELF__ +- # ifdef __GLIBC__ +- # if __GLIBC__ >= 2 +- LIBC=gnu +- # else +- LIBC=gnulibc1 +- # endif +- # else +- LIBC=gnulibc1 +- # endif +- #else +- #if defined(__INTEL_COMPILER) || defined(__PGI) || defined(__SUNPRO_C) || defined(__SUNPRO_CC) +- LIBC=gnu +- #else +- LIBC=gnuaout +- #endif +- #endif +- #ifdef __dietlibc__ +- LIBC=dietlibc +- #endif +-EOF +- eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n ' +- /^LIBC/{ +- s: ::g +- p +- }'`" +- test x"${LIBC}" != x && { +- echo "${UNAME_MACHINE}-pc-linux-${LIBC}" +- exit +- } +- test x"${TENTATIVE}" != x && { echo "${TENTATIVE}"; exit; } +- ;; + i*86:DYNIX/ptx:4*:*) + # ptx 4.0 does uname -s correctly, with DYNIX/ptx in there. + # earlier versions are messed up and put the nodename in both +@@ -1247,6 +1205,16 @@ EOF + *:Darwin:*:*) + UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown + case $UNAME_PROCESSOR in ++ i386) ++ eval $set_cc_for_build ++ if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then ++ if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \ ++ (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \ ++ grep IS_64BIT_ARCH >/dev/null ++ then ++ UNAME_PROCESSOR="x86_64" ++ fi ++ fi ;; + unknown) UNAME_PROCESSOR=powerpc ;; + esac + echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE} +diff --git a/config.sub b/config.sub +index eb0389a..2a55a50 100755 +--- a/config.sub ++++ b/config.sub +@@ -4,7 +4,7 @@ + # 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 + # Free Software Foundation, Inc. + +-timestamp='2009-06-11' ++timestamp='2009-11-20' + + # This file is (in principle) common to ALL GNU software. + # The presence of a machine in this file suggests that SOME GNU software +@@ -32,13 +32,16 @@ timestamp='2009-06-11' + + + # Please send patches to . Submit a context +-# diff and a properly formatted ChangeLog entry. ++# diff and a properly formatted GNU ChangeLog entry. + # + # Configuration subroutine to validate and canonicalize a configuration type. + # Supply the specified configuration type as an argument. + # If it is invalid, we print an error message on stderr and exit with code 1. + # Otherwise, we print the canonical config type on stdout and succeed. + ++# You can get the latest version of this script from: ++# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD ++ + # This file is supposed to be the same for all GNU packages + # and recognize all the CPU types, system types and aliases + # that are meaningful with *any* GNU software. +@@ -149,7 +152,7 @@ case $os in + -convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\ + -c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \ + -harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \ +- -apple | -axis | -knuth | -cray) ++ -apple | -axis | -knuth | -cray | -microblaze) + os= + basic_machine=$1 + ;; +@@ -284,6 +287,7 @@ case $basic_machine in + | pdp10 | pdp11 | pj | pjl \ + | powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \ + | pyramid \ ++ | rx \ + | score \ + | sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \ + | sh64 | sh64le \ +@@ -291,13 +295,14 @@ case $basic_machine in + | sparcv8 | sparcv9 | sparcv9b | sparcv9v \ + | spu | strongarm \ + | tahoe | thumb | tic4x | tic80 | tron \ ++ | ubicom32 \ + | v850 | v850e \ + | we32k \ + | x86 | xc16x | xscale | xscalee[bl] | xstormy16 | xtensa \ + | z8k | z80) + basic_machine=$basic_machine-unknown + ;; +- m6811 | m68hc11 | m6812 | m68hc12) ++ m6811 | m68hc11 | m6812 | m68hc12 | picochip) + # Motorola 68HC11/12. + basic_machine=$basic_machine-unknown + os=-none +@@ -340,7 +345,7 @@ case $basic_machine in + | lm32-* \ + | m32c-* | m32r-* | m32rle-* \ + | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \ +- | m88110-* | m88k-* | maxq-* | mcore-* | metag-* \ ++ | m88110-* | m88k-* | maxq-* | mcore-* | metag-* | microblaze-* \ + | mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \ + | mips16-* \ + | mips64-* | mips64el-* \ +@@ -368,7 +373,7 @@ case $basic_machine in + | pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \ + | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \ + | pyramid-* \ +- | romp-* | rs6000-* \ ++ | romp-* | rs6000-* | rx-* \ + | sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \ + | shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \ + | sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \ +@@ -377,6 +382,7 @@ case $basic_machine in + | tahoe-* | thumb-* \ + | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* | tile-* \ + | tron-* \ ++ | ubicom32-* \ + | v850-* | v850e-* | vax-* \ + | we32k-* \ + | x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \ +@@ -726,6 +732,9 @@ case $basic_machine in + basic_machine=ns32k-utek + os=-sysv + ;; ++ microblaze) ++ basic_machine=microblaze-xilinx ++ ;; + mingw32) + basic_machine=i386-pc + os=-mingw32 +@@ -1247,6 +1256,9 @@ case $os in + # First match some system type aliases + # that might get confused with valid system types. + # -solaris* is a basic system type, with this one exception. ++ -auroraux) ++ os=-auroraux ++ ;; + -solaris1 | -solaris1.*) + os=`echo $os | sed -e 's|solaris1|sunos4|'` + ;; +@@ -1268,8 +1280,8 @@ case $os in + # -sysv* is not here because it comes later, after sysvr4. + -gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \ + | -*vms* | -sco* | -esix* | -isc* | -aix* | -cnk* | -sunos | -sunos[34]*\ +- | -hpux* | -unos* | -osf* | -luna* | -dgux* | -solaris* | -sym* \ +- | -kopensolaris* \ ++ | -hpux* | -unos* | -osf* | -luna* | -dgux* | -auroraux* | -solaris* \ ++ | -sym* | -kopensolaris* \ + | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \ + | -aos* | -aros* \ + | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \ +@@ -1290,7 +1302,7 @@ case $os in + | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \ + | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \ + | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \ +- | -skyos* | -haiku* | -rdos* | -toppers* | -drops*) ++ | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es*) + # Remember, each alternative MUST END IN *, to match a version number. + ;; + -qnx*) +diff --git a/configure b/configure +index 5b20f98..8f4c200 100755 +--- a/configure ++++ b/configure +@@ -1,12 +1,14 @@ + #! /bin/sh + # Guess values for system-dependent variables and create Makefiles. +-# Generated by GNU Autoconf 2.64 for rhythmbox 0.12.6. ++# Generated by GNU Autoconf 2.65 for rhythmbox 0.12.6. + # + # Report bugs to . + # ++# + # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, +-# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software +-# Foundation, Inc. ++# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, ++# Inc. ++# + # + # This configure script is free software; the Free Software Foundation + # gives unlimited permission to copy, distribute and modify it. +@@ -677,7 +679,8 @@ fi + + + +-exec 7<&0 &1 ++test -n "$DJDIR" || exec 7<&0 &1 + + # Name of the host. + # hostname on some systems (SVR3.2, Linux) returns a bogus exit status, +@@ -1782,13 +1785,12 @@ Optional Features: + --disable-libnotify Disable libnotify support + --disable-musicbrainz don't build with MusicBrainz support + --disable-mmkeys don't build with Multimedia Keys support +- --disable-schemas-install +- Disable the schemas installation ++ --disable-schemas-install Disable the schemas installation + --enable-lirc enable lirc support + --enable-uninstalled-build + Search for files in build directory as well + --enable-more-warnings Maximum compiler warnings +- --enable-gtk-doc use gtk-doc to build documentation [default=no] ++ --enable-gtk-doc use gtk-doc to build documentation [[default=no]] + --disable-scrollkeeper do not make updates to the scrollkeeper database + --enable-python Enable python support + --enable-vala Enable Vala plugin support +@@ -1814,10 +1816,8 @@ Optional Packages: + --with-x use the X Window System + --with-libbrasero-media Build with libbrasero-media support + --with-libnautilus-burn Build with libnautilus-burn support +- --with-gconf-source=sourceaddress +- Config database for installing schema files. +- --with-gconf-schema-file-dir=dir +- Directory for installing schema files. ++ --with-gconf-source=sourceaddress Config database for installing schema files. ++ --with-gconf-schema-file-dir=dir Directory for installing schema files. + --with-internal-libsexy Build using internal libsexy library + --with-html-dir=PATH path to installed docs + --with-help-dir=DIR path to help docs +@@ -1831,7 +1831,7 @@ Some influential environment variables: + LDFLAGS linker flags, e.g. -L if you have libraries in a + nonstandard directory + LIBS libraries to pass to the linker, e.g. -l +- CPPFLAGS C/C++/Objective C preprocessor flags, e.g. -I if ++ CPPFLAGS (Objective) C/C++ preprocessor flags, e.g. -I if + you have headers in a nonstandard directory + CPP C preprocessor + PKG_CONFIG path to pkg-config utility +@@ -1975,7 +1975,7 @@ test -n "$ac_init_help" && exit $ac_status + if $ac_init_version; then + cat <<\_ACEOF + rhythmbox configure 0.12.6 +-generated by GNU Autoconf 2.64 ++generated by GNU Autoconf 2.65 + + Copyright (C) 2009 Free Software Foundation, Inc. + This configure script is free software; the Free Software Foundation +@@ -2022,7 +2022,7 @@ sed 's/^/| /' conftest.$ac_ext >&5 + ac_retval=1 + fi + eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} +- return $ac_retval ++ as_fn_set_status $ac_retval + + } # ac_fn_c_try_compile + +@@ -2068,7 +2068,7 @@ fi + # left behind by Apple's compiler. We do this before executing the actions. + rm -rf conftest.dSYM conftest_ipa8_conftest.oo + eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} +- return $ac_retval ++ as_fn_set_status $ac_retval + + } # ac_fn_c_try_link + +@@ -2172,7 +2172,7 @@ sed 's/^/| /' conftest.$ac_ext >&5 + ac_retval=1 + fi + eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} +- return $ac_retval ++ as_fn_set_status $ac_retval + + } # ac_fn_c_try_cpp + +@@ -2214,7 +2214,7 @@ sed 's/^/| /' conftest.$ac_ext >&5 + fi + rm -rf conftest.dSYM conftest_ipa8_conftest.oo + eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} +- return $ac_retval ++ as_fn_set_status $ac_retval + + } # ac_fn_c_try_run + +@@ -2423,7 +2423,7 @@ rm -f conftest.val + + fi + eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} +- return $ac_retval ++ as_fn_set_status $ac_retval + + } # ac_fn_c_compute_int + +@@ -2524,7 +2524,7 @@ This file contains any messages produced by compilers while + running configure, to aid debugging if configure makes a mistake. + + It was created by rhythmbox $as_me 0.12.6, which was +-generated by GNU Autoconf 2.64. Invocation command line was ++generated by GNU Autoconf 2.65. Invocation command line was + + $ $0 $@ + +@@ -2777,7 +2777,7 @@ fi + for ac_site_file in "$ac_site_file1" "$ac_site_file2" + do + test "x$ac_site_file" = xNONE && continue +- if test -r "$ac_site_file"; then ++ if test /dev/null != "$ac_site_file" && test -r "$ac_site_file"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: loading site script $ac_site_file" >&5 + $as_echo "$as_me: loading site script $ac_site_file" >&6;} + sed 's/^/| /' "$ac_site_file" >&5 +@@ -2786,9 +2786,9 @@ $as_echo "$as_me: loading site script $ac_site_file" >&6;} + done + + if test -r "$cache_file"; then +- # Some versions of bash will fail to source /dev/null (special +- # files actually), so we avoid doing that. +- if test -f "$cache_file"; then ++ # Some versions of bash will fail to source /dev/null (special files ++ # actually), so we avoid doing that. DJGPP emulates it as a regular file. ++ if test /dev/null != "$cache_file" && test -f "$cache_file"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: loading cache $cache_file" >&5 + $as_echo "$as_me: loading cache $cache_file" >&6;} + case $cache_file in +@@ -3210,6 +3210,7 @@ IFS=$as_save_IFS + + fi + ++ test -d ./--version && rmdir ./--version + if test "${ac_cv_path_mkdir+set}" = set; then + MKDIR_P="$ac_cv_path_mkdir -p" + else +@@ -3217,7 +3218,6 @@ fi + # value for MKDIR_P within a source directory, because that will + # break other packages using the cache if that directory is + # removed, or if the value is a relative name. +- test -d ./--version && rmdir ./--version + MKDIR_P="$ac_install_sh -d" + fi + fi +@@ -3816,32 +3816,30 @@ $as_echo "$ac_try_echo"; } >&5 + ... rest of stderr output deleted ... + 10q' conftest.err >conftest.er1 + cat conftest.er1 >&5 +- rm -f conftest.er1 conftest.err + fi ++ rm -f conftest.er1 conftest.err + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } + done + + cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ +-#include ++ + int + main () + { +-FILE *f = fopen ("conftest.out", "w"); +- return ferror (f) || fclose (f) != 0; + + ; + return 0; + } + _ACEOF + ac_clean_files_save=$ac_clean_files +-ac_clean_files="$ac_clean_files a.out a.out.dSYM a.exe b.out conftest.out" ++ac_clean_files="$ac_clean_files a.out a.out.dSYM a.exe b.out" + # Try to create an executable without -o first, disregard a.out. + # It will help us diagnose broken compilers, and finding out an intuition + # of exeext. +-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler default output file name" >&5 +-$as_echo_n "checking for C compiler default output file name... " >&6; } ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler works" >&5 ++$as_echo_n "checking whether the C compiler works... " >&6; } + ac_link_default=`$as_echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'` + + # The possible output files: +@@ -3903,10 +3901,10 @@ test "$ac_cv_exeext" = no && ac_cv_exeext= + else + ac_file='' + fi +-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_file" >&5 +-$as_echo "$ac_file" >&6; } + if test -z "$ac_file"; then : +- $as_echo "$as_me: failed program was:" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 ++$as_echo "no" >&6; } ++$as_echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +@@ -3914,51 +3912,18 @@ $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} + { as_fn_set_status 77 + as_fn_error "C compiler cannot create executables + See \`config.log' for more details." "$LINENO" 5; }; } ++else ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 ++$as_echo "yes" >&6; } + fi ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler default output file name" >&5 ++$as_echo_n "checking for C compiler default output file name... " >&6; } ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_file" >&5 ++$as_echo "$ac_file" >&6; } + ac_exeext=$ac_cv_exeext + +-# Check that the compiler produces executables we can run. If not, either +-# the compiler is broken, or we cross compile. +-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler works" >&5 +-$as_echo_n "checking whether the C compiler works... " >&6; } +-# If not cross compiling, check that we can run a simple program. +-if test "$cross_compiling" != yes; then +- if { ac_try='./$ac_file' +- { { case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +-$as_echo "$ac_try_echo"; } >&5 +- (eval "$ac_try") 2>&5 +- ac_status=$? +- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 +- test $ac_status = 0; }; }; then +- cross_compiling=no +- else +- if test "$cross_compiling" = maybe; then +- cross_compiling=yes +- else +- { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +-as_fn_error "cannot run C compiled programs. +-If you meant to cross compile, use \`--host'. +-See \`config.log' for more details." "$LINENO" 5; } +- fi +- fi +-fi +-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +-$as_echo "yes" >&6; } +- +-rm -f -r a.out a.out.dSYM a.exe conftest$ac_cv_exeext b.out conftest.out ++rm -f -r a.out a.out.dSYM a.exe conftest$ac_cv_exeext b.out + ac_clean_files=$ac_clean_files_save +-# Check that the compiler produces executables we can run. If not, either +-# the compiler is broken, or we cross compile. +-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are cross compiling" >&5 +-$as_echo_n "checking whether we are cross compiling... " >&6; } +-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $cross_compiling" >&5 +-$as_echo "$cross_compiling" >&6; } +- + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of executables" >&5 + $as_echo_n "checking for suffix of executables... " >&6; } + if { { ac_try="$ac_link" +@@ -3991,13 +3956,72 @@ $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} + as_fn_error "cannot compute suffix of executables: cannot compile and link + See \`config.log' for more details." "$LINENO" 5; } + fi +-rm -f conftest$ac_cv_exeext ++rm -f conftest conftest$ac_cv_exeext + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5 + $as_echo "$ac_cv_exeext" >&6; } + + rm -f conftest.$ac_ext + EXEEXT=$ac_cv_exeext + ac_exeext=$EXEEXT ++cat confdefs.h - <<_ACEOF >conftest.$ac_ext ++/* end confdefs.h. */ ++#include ++int ++main () ++{ ++FILE *f = fopen ("conftest.out", "w"); ++ return ferror (f) || fclose (f) != 0; ++ ++ ; ++ return 0; ++} ++_ACEOF ++ac_clean_files="$ac_clean_files conftest.out" ++# Check that the compiler produces executables we can run. If not, either ++# the compiler is broken, or we cross compile. ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are cross compiling" >&5 ++$as_echo_n "checking whether we are cross compiling... " >&6; } ++if test "$cross_compiling" != yes; then ++ { { ac_try="$ac_link" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" ++$as_echo "$ac_try_echo"; } >&5 ++ (eval "$ac_link") 2>&5 ++ ac_status=$? ++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 ++ test $ac_status = 0; } ++ if { ac_try='./conftest$ac_cv_exeext' ++ { { case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" ++$as_echo "$ac_try_echo"; } >&5 ++ (eval "$ac_try") 2>&5 ++ ac_status=$? ++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 ++ test $ac_status = 0; }; }; then ++ cross_compiling=no ++ else ++ if test "$cross_compiling" = maybe; then ++ cross_compiling=yes ++ else ++ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 ++$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} ++as_fn_error "cannot run C compiled programs. ++If you meant to cross compile, use \`--host'. ++See \`config.log' for more details." "$LINENO" 5; } ++ fi ++ fi ++fi ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $cross_compiling" >&5 ++$as_echo "$cross_compiling" >&6; } ++ ++rm -f conftest.$ac_ext conftest$ac_cv_exeext conftest.out ++ac_clean_files=$ac_clean_files_save + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of object files" >&5 + $as_echo_n "checking for suffix of object files... " >&6; } + if test "${ac_cv_objext+set}" = set; then : +@@ -4654,8 +4678,8 @@ INTLTOOL_SOUNDLIST_RULE='%.soundlist: %.soundlist.in $(INTLTOOL_MERGE) $(wildcar + + + # Check the gettext tools to make sure they are GNU +-# Extract the first word of "xgettext", so it can be a program name with args. +-set dummy xgettext; ac_word=$2 ++# Extract the first word of "gxgettext", so it can be a program name with args. ++set dummy gxgettext; ac_word=$2 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 + $as_echo_n "checking for $ac_word... " >&6; } + if test "${ac_cv_path_XGETTEXT+set}" = set; then : +@@ -4694,8 +4718,8 @@ $as_echo "no" >&6; } + fi + + +-# Extract the first word of "msgmerge", so it can be a program name with args. +-set dummy msgmerge; ac_word=$2 ++# Extract the first word of "gmsgmerge", so it can be a program name with args. ++set dummy gmsgmerge; ac_word=$2 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 + $as_echo_n "checking for $ac_word... " >&6; } + if test "${ac_cv_path_MSGMERGE+set}" = set; then : +@@ -4734,8 +4758,8 @@ $as_echo "no" >&6; } + fi + + +-# Extract the first word of "msgfmt", so it can be a program name with args. +-set dummy msgfmt; ac_word=$2 ++# Extract the first word of "gmsgfmt", so it can be a program name with args. ++set dummy gmsgfmt; ac_word=$2 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 + $as_echo_n "checking for $ac_word... " >&6; } + if test "${ac_cv_path_MSGFMT+set}" = set; then : +@@ -5312,8 +5336,8 @@ $as_echo "$ac_try_echo"; } >&5 + ... rest of stderr output deleted ... + 10q' conftest.err >conftest.er1 + cat conftest.er1 >&5 +- rm -f conftest.er1 conftest.err + fi ++ rm -f conftest.er1 conftest.err + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } + done +@@ -6045,8 +6069,8 @@ esac + + + +-macro_version='2.2.6' +-macro_revision='1.3012' ++macro_version='2.2.6b' ++macro_revision='1.3017' + + + +@@ -6587,13 +6611,13 @@ if test "${lt_cv_nm_interface+set}" = set; then : + else + lt_cv_nm_interface="BSD nm" + echo "int some_variable = 0;" > conftest.$ac_ext +- (eval echo "\"\$as_me:6590: $ac_compile\"" >&5) ++ (eval echo "\"\$as_me:6614: $ac_compile\"" >&5) + (eval "$ac_compile" 2>conftest.err) + cat conftest.err >&5 +- (eval echo "\"\$as_me:6593: $NM \\\"conftest.$ac_objext\\\"\"" >&5) ++ (eval echo "\"\$as_me:6617: $NM \\\"conftest.$ac_objext\\\"\"" >&5) + (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out) + cat conftest.err >&5 +- (eval echo "\"\$as_me:6596: output\"" >&5) ++ (eval echo "\"\$as_me:6620: output\"" >&5) + cat conftest.out >&5 + if $GREP 'External.*some_variable' conftest.out > /dev/null; then + lt_cv_nm_interface="MS dumpbin" +@@ -7063,7 +7087,7 @@ linux* | k*bsd*-gnu) + lt_cv_deplibs_check_method=pass_all + ;; + +-netbsd* | netbsdelf*-gnu) ++netbsd*) + if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then + lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$' + else +@@ -7798,7 +7822,7 @@ ia64-*-hpux*) + ;; + *-*-irix6*) + # Find out which ABI we are using. +- echo '#line 7801 "configure"' > conftest.$ac_ext ++ echo '#line 7825 "configure"' > conftest.$ac_ext + if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +@@ -9078,11 +9102,11 @@ else + -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ + -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ + -e 's:$: $lt_compiler_flag:'` +- (eval echo "\"\$as_me:9081: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:9105: $lt_compile\"" >&5) + (eval "$lt_compile" 2>conftest.err) + ac_status=$? + cat conftest.err >&5 +- echo "$as_me:9085: \$? = $ac_status" >&5 ++ echo "$as_me:9109: \$? = $ac_status" >&5 + if (exit $ac_status) && test -s "$ac_outfile"; then + # The compiler can only warn and ignore the option if not recognized + # So say no if there are warnings other than the usual output. +@@ -9417,11 +9441,11 @@ else + -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ + -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ + -e 's:$: $lt_compiler_flag:'` +- (eval echo "\"\$as_me:9420: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:9444: $lt_compile\"" >&5) + (eval "$lt_compile" 2>conftest.err) + ac_status=$? + cat conftest.err >&5 +- echo "$as_me:9424: \$? = $ac_status" >&5 ++ echo "$as_me:9448: \$? = $ac_status" >&5 + if (exit $ac_status) && test -s "$ac_outfile"; then + # The compiler can only warn and ignore the option if not recognized + # So say no if there are warnings other than the usual output. +@@ -9522,11 +9546,11 @@ else + -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ + -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ + -e 's:$: $lt_compiler_flag:'` +- (eval echo "\"\$as_me:9525: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:9549: $lt_compile\"" >&5) + (eval "$lt_compile" 2>out/conftest.err) + ac_status=$? + cat out/conftest.err >&5 +- echo "$as_me:9529: \$? = $ac_status" >&5 ++ echo "$as_me:9553: \$? = $ac_status" >&5 + if (exit $ac_status) && test -s out/conftest2.$ac_objext + then + # The compiler can only warn and ignore the option if not recognized +@@ -9577,11 +9601,11 @@ else + -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ + -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ + -e 's:$: $lt_compiler_flag:'` +- (eval echo "\"\$as_me:9580: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:9604: $lt_compile\"" >&5) + (eval "$lt_compile" 2>out/conftest.err) + ac_status=$? + cat out/conftest.err >&5 +- echo "$as_me:9584: \$? = $ac_status" >&5 ++ echo "$as_me:9608: \$? = $ac_status" >&5 + if (exit $ac_status) && test -s out/conftest2.$ac_objext + then + # The compiler can only warn and ignore the option if not recognized +@@ -9696,9 +9720,6 @@ $as_echo_n "checking whether the $compiler linker ($LD) supports shared librarie + openbsd*) + with_gnu_ld=no + ;; +- linux* | k*bsd*-gnu) +- link_all_deplibs=no +- ;; + esac + + ld_shlibs=yes +@@ -9881,7 +9902,7 @@ _LT_EOF + fi + ;; + +- netbsd* | netbsdelf*-gnu) ++ netbsd*) + if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then + archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' + wlarc= +@@ -10056,7 +10077,6 @@ _LT_EOF + if test "$aix_use_runtimelinking" = yes; then + shared_flag="$shared_flag "'${wl}-G' + fi +- link_all_deplibs=no + else + # not using gcc + if test "$host_cpu" = ia64; then +@@ -10383,7 +10403,7 @@ rm -f core conftest.err conftest.$ac_objext \ + link_all_deplibs=yes + ;; + +- netbsd* | netbsdelf*-gnu) ++ netbsd*) + if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then + archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out + else +@@ -11328,18 +11348,6 @@ rm -f core conftest.err conftest.$ac_objext \ + dynamic_linker='GNU/Linux ld.so' + ;; + +-netbsdelf*-gnu) +- version_type=linux +- need_lib_prefix=no +- need_version=no +- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' +- soname_spec='${libname}${release}${shared_ext}$major' +- shlibpath_var=LD_LIBRARY_PATH +- shlibpath_overrides_runpath=no +- hardcode_into_libs=yes +- dynamic_linker='NetBSD ld.elf_so' +- ;; +- + netbsd*) + version_type=sunos + need_lib_prefix=no +@@ -11960,7 +11968,7 @@ else + lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 + lt_status=$lt_dlunknown + cat > conftest.$ac_ext <<_LT_EOF +-#line 11963 "configure" ++#line 11971 "configure" + #include "confdefs.h" + + #if HAVE_DLFCN_H +@@ -12056,7 +12064,7 @@ else + lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 + lt_status=$lt_dlunknown + cat > conftest.$ac_ext <<_LT_EOF +-#line 12059 "configure" ++#line 12067 "configure" + #include "confdefs.h" + + #if HAVE_DLFCN_H +@@ -12696,7 +12704,7 @@ Report bugs to ." + + lt_cl_version="\ + rhythmbox config.lt 0.12.6 +-configured by $0, generated by GNU Autoconf 2.64. ++configured by $0, generated by GNU Autoconf 2.65. + + Copyright (C) 2008 Free Software Foundation, Inc. + This config.lt script is free software; the Free Software Foundation +@@ -14092,11 +14100,10 @@ pkg_failed=no + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for RB_CLIENT" >&5 + $as_echo_n "checking for RB_CLIENT... " >&6; } + +-if test -n "$PKG_CONFIG"; then +- if test -n "$RB_CLIENT_CFLAGS"; then +- pkg_cv_RB_CLIENT_CFLAGS="$RB_CLIENT_CFLAGS" +- else +- if test -n "$PKG_CONFIG" && \ ++if test -n "$RB_CLIENT_CFLAGS"; then ++ pkg_cv_RB_CLIENT_CFLAGS="$RB_CLIENT_CFLAGS" ++ elif test -n "$PKG_CONFIG"; then ++ if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= \$GLIB_REQS gio-2.0 >= \$GLIB_REQS\""; } >&5 + ($PKG_CONFIG --exists --print-errors "glib-2.0 >= $GLIB_REQS gio-2.0 >= $GLIB_REQS") 2>&5 + ac_status=$? +@@ -14106,15 +14113,13 @@ if test -n "$PKG_CONFIG"; then + else + pkg_failed=yes + fi +- fi +-else +- pkg_failed=untried ++ else ++ pkg_failed=untried + fi +-if test -n "$PKG_CONFIG"; then +- if test -n "$RB_CLIENT_LIBS"; then +- pkg_cv_RB_CLIENT_LIBS="$RB_CLIENT_LIBS" +- else +- if test -n "$PKG_CONFIG" && \ ++if test -n "$RB_CLIENT_LIBS"; then ++ pkg_cv_RB_CLIENT_LIBS="$RB_CLIENT_LIBS" ++ elif test -n "$PKG_CONFIG"; then ++ if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= \$GLIB_REQS gio-2.0 >= \$GLIB_REQS\""; } >&5 + ($PKG_CONFIG --exists --print-errors "glib-2.0 >= $GLIB_REQS gio-2.0 >= $GLIB_REQS") 2>&5 + ac_status=$? +@@ -14124,9 +14129,8 @@ if test -n "$PKG_CONFIG"; then + else + pkg_failed=yes + fi +- fi +-else +- pkg_failed=untried ++ else ++ pkg_failed=untried + fi + + +@@ -14139,9 +14143,9 @@ else + _pkg_short_errors_supported=no + fi + if test $_pkg_short_errors_supported = yes; then +- RB_CLIENT_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "glib-2.0 >= $GLIB_REQS gio-2.0 >= $GLIB_REQS"` ++ RB_CLIENT_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "glib-2.0 >= $GLIB_REQS gio-2.0 >= $GLIB_REQS" 2>&1` + else +- RB_CLIENT_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "glib-2.0 >= $GLIB_REQS gio-2.0 >= $GLIB_REQS"` ++ RB_CLIENT_PKG_ERRORS=`$PKG_CONFIG --print-errors "glib-2.0 >= $GLIB_REQS gio-2.0 >= $GLIB_REQS" 2>&1` + fi + # Put the nasty error message in config.log where it belongs + echo "$RB_CLIENT_PKG_ERRORS" >&5 +@@ -14221,11 +14225,10 @@ pkg_failed=no + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for RHYTHMBOX" >&5 + $as_echo_n "checking for RHYTHMBOX... " >&6; } + +-if test -n "$PKG_CONFIG"; then +- if test -n "$RHYTHMBOX_CFLAGS"; then +- pkg_cv_RHYTHMBOX_CFLAGS="$RHYTHMBOX_CFLAGS" +- else +- if test -n "$PKG_CONFIG" && \ ++if test -n "$RHYTHMBOX_CFLAGS"; then ++ pkg_cv_RHYTHMBOX_CFLAGS="$RHYTHMBOX_CFLAGS" ++ elif test -n "$PKG_CONFIG"; then ++ if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\\ + gtk+-2.0 >= \$GTK_REQS \\ + glib-2.0 >= \$GLIB_REQS \\ +@@ -14259,15 +14262,13 @@ if test -n "$PKG_CONFIG"; then + else + pkg_failed=yes + fi +- fi +-else +- pkg_failed=untried ++ else ++ pkg_failed=untried + fi +-if test -n "$PKG_CONFIG"; then +- if test -n "$RHYTHMBOX_LIBS"; then +- pkg_cv_RHYTHMBOX_LIBS="$RHYTHMBOX_LIBS" +- else +- if test -n "$PKG_CONFIG" && \ ++if test -n "$RHYTHMBOX_LIBS"; then ++ pkg_cv_RHYTHMBOX_LIBS="$RHYTHMBOX_LIBS" ++ elif test -n "$PKG_CONFIG"; then ++ if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\\ + gtk+-2.0 >= \$GTK_REQS \\ + glib-2.0 >= \$GLIB_REQS \\ +@@ -14301,9 +14302,8 @@ if test -n "$PKG_CONFIG"; then + else + pkg_failed=yes + fi +- fi +-else +- pkg_failed=untried ++ else ++ pkg_failed=untried + fi + + +@@ -14316,7 +14316,7 @@ else + _pkg_short_errors_supported=no + fi + if test $_pkg_short_errors_supported = yes; then +- RHYTHMBOX_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "\ ++ RHYTHMBOX_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "\ + gtk+-2.0 >= $GTK_REQS \ + glib-2.0 >= $GLIB_REQS \ + gio-2.0 >= $GLIB_REQS \ +@@ -14324,9 +14324,9 @@ fi + gnome-media-profiles >= $GNOME_MEDIA_PROFILES_REQS \ + libsoup-2.4 >= $LIBSOUP_REQS \ + libsoup-gnome-2.4 >= $LIBSOUP_REQS \ +- $LIBGNOME_REQS"` ++ $LIBGNOME_REQS" 2>&1` + else +- RHYTHMBOX_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "\ ++ RHYTHMBOX_PKG_ERRORS=`$PKG_CONFIG --print-errors "\ + gtk+-2.0 >= $GTK_REQS \ + glib-2.0 >= $GLIB_REQS \ + gio-2.0 >= $GLIB_REQS \ +@@ -14334,7 +14334,7 @@ fi + gnome-media-profiles >= $GNOME_MEDIA_PROFILES_REQS \ + libsoup-2.4 >= $LIBSOUP_REQS \ + libsoup-gnome-2.4 >= $LIBSOUP_REQS \ +- $LIBGNOME_REQS"` ++ $LIBGNOME_REQS" 2>&1` + fi + # Put the nasty error message in config.log where it belongs + echo "$RHYTHMBOX_PKG_ERRORS" >&5 +@@ -14384,11 +14384,10 @@ pkg_failed=no + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for TOTEM_PLPARSER" >&5 + $as_echo_n "checking for TOTEM_PLPARSER... " >&6; } + +-if test -n "$PKG_CONFIG"; then +- if test -n "$TOTEM_PLPARSER_CFLAGS"; then +- pkg_cv_TOTEM_PLPARSER_CFLAGS="$TOTEM_PLPARSER_CFLAGS" +- else +- if test -n "$PKG_CONFIG" && \ ++if test -n "$TOTEM_PLPARSER_CFLAGS"; then ++ pkg_cv_TOTEM_PLPARSER_CFLAGS="$TOTEM_PLPARSER_CFLAGS" ++ elif test -n "$PKG_CONFIG"; then ++ if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"totem-plparser >= \$TOTEM_PLPARSER_REQS\""; } >&5 + ($PKG_CONFIG --exists --print-errors "totem-plparser >= $TOTEM_PLPARSER_REQS") 2>&5 + ac_status=$? +@@ -14398,15 +14397,13 @@ if test -n "$PKG_CONFIG"; then + else + pkg_failed=yes + fi +- fi +-else +- pkg_failed=untried ++ else ++ pkg_failed=untried + fi +-if test -n "$PKG_CONFIG"; then +- if test -n "$TOTEM_PLPARSER_LIBS"; then +- pkg_cv_TOTEM_PLPARSER_LIBS="$TOTEM_PLPARSER_LIBS" +- else +- if test -n "$PKG_CONFIG" && \ ++if test -n "$TOTEM_PLPARSER_LIBS"; then ++ pkg_cv_TOTEM_PLPARSER_LIBS="$TOTEM_PLPARSER_LIBS" ++ elif test -n "$PKG_CONFIG"; then ++ if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"totem-plparser >= \$TOTEM_PLPARSER_REQS\""; } >&5 + ($PKG_CONFIG --exists --print-errors "totem-plparser >= $TOTEM_PLPARSER_REQS") 2>&5 + ac_status=$? +@@ -14416,9 +14413,8 @@ if test -n "$PKG_CONFIG"; then + else + pkg_failed=yes + fi +- fi +-else +- pkg_failed=untried ++ else ++ pkg_failed=untried + fi + + +@@ -14431,9 +14427,9 @@ else + _pkg_short_errors_supported=no + fi + if test $_pkg_short_errors_supported = yes; then +- TOTEM_PLPARSER_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "totem-plparser >= $TOTEM_PLPARSER_REQS"` ++ TOTEM_PLPARSER_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "totem-plparser >= $TOTEM_PLPARSER_REQS" 2>&1` + else +- TOTEM_PLPARSER_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "totem-plparser >= $TOTEM_PLPARSER_REQS"` ++ TOTEM_PLPARSER_PKG_ERRORS=`$PKG_CONFIG --print-errors "totem-plparser >= $TOTEM_PLPARSER_REQS" 2>&1` + fi + # Put the nasty error message in config.log where it belongs + echo "$TOTEM_PLPARSER_PKG_ERRORS" >&5 +@@ -14472,11 +14468,10 @@ pkg_failed=no + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GUDEV" >&5 + $as_echo_n "checking for GUDEV... " >&6; } + +-if test -n "$PKG_CONFIG"; then +- if test -n "$GUDEV_CFLAGS"; then +- pkg_cv_GUDEV_CFLAGS="$GUDEV_CFLAGS" +- else +- if test -n "$PKG_CONFIG" && \ ++if test -n "$GUDEV_CFLAGS"; then ++ pkg_cv_GUDEV_CFLAGS="$GUDEV_CFLAGS" ++ elif test -n "$PKG_CONFIG"; then ++ if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gudev-1.0 >= \$GUDEV_REQS\""; } >&5 + ($PKG_CONFIG --exists --print-errors "gudev-1.0 >= $GUDEV_REQS") 2>&5 + ac_status=$? +@@ -14486,15 +14481,13 @@ if test -n "$PKG_CONFIG"; then + else + pkg_failed=yes + fi +- fi +-else +- pkg_failed=untried ++ else ++ pkg_failed=untried + fi +-if test -n "$PKG_CONFIG"; then +- if test -n "$GUDEV_LIBS"; then +- pkg_cv_GUDEV_LIBS="$GUDEV_LIBS" +- else +- if test -n "$PKG_CONFIG" && \ ++if test -n "$GUDEV_LIBS"; then ++ pkg_cv_GUDEV_LIBS="$GUDEV_LIBS" ++ elif test -n "$PKG_CONFIG"; then ++ if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gudev-1.0 >= \$GUDEV_REQS\""; } >&5 + ($PKG_CONFIG --exists --print-errors "gudev-1.0 >= $GUDEV_REQS") 2>&5 + ac_status=$? +@@ -14504,9 +14497,8 @@ if test -n "$PKG_CONFIG"; then + else + pkg_failed=yes + fi +- fi +-else +- pkg_failed=untried ++ else ++ pkg_failed=untried + fi + + +@@ -14519,9 +14511,9 @@ else + _pkg_short_errors_supported=no + fi + if test $_pkg_short_errors_supported = yes; then +- GUDEV_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "gudev-1.0 >= $GUDEV_REQS"` ++ GUDEV_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "gudev-1.0 >= $GUDEV_REQS" 2>&1` + else +- GUDEV_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "gudev-1.0 >= $GUDEV_REQS"` ++ GUDEV_PKG_ERRORS=`$PKG_CONFIG --print-errors "gudev-1.0 >= $GUDEV_REQS" 2>&1` + fi + # Put the nasty error message in config.log where it belongs + echo "$GUDEV_PKG_ERRORS" >&5 +@@ -14575,11 +14567,10 @@ pkg_failed=no + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for HAL" >&5 + $as_echo_n "checking for HAL... " >&6; } + +-if test -n "$PKG_CONFIG"; then +- if test -n "$HAL_CFLAGS"; then +- pkg_cv_HAL_CFLAGS="$HAL_CFLAGS" +- else +- if test -n "$PKG_CONFIG" && \ ++if test -n "$HAL_CFLAGS"; then ++ pkg_cv_HAL_CFLAGS="$HAL_CFLAGS" ++ elif test -n "$PKG_CONFIG"; then ++ if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"hal >= 0.5 hal < 0.6\""; } >&5 + ($PKG_CONFIG --exists --print-errors "hal >= 0.5 hal < 0.6") 2>&5 + ac_status=$? +@@ -14589,15 +14580,13 @@ if test -n "$PKG_CONFIG"; then + else + pkg_failed=yes + fi +- fi +-else +- pkg_failed=untried ++ else ++ pkg_failed=untried + fi +-if test -n "$PKG_CONFIG"; then +- if test -n "$HAL_LIBS"; then +- pkg_cv_HAL_LIBS="$HAL_LIBS" +- else +- if test -n "$PKG_CONFIG" && \ ++if test -n "$HAL_LIBS"; then ++ pkg_cv_HAL_LIBS="$HAL_LIBS" ++ elif test -n "$PKG_CONFIG"; then ++ if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"hal >= 0.5 hal < 0.6\""; } >&5 + ($PKG_CONFIG --exists --print-errors "hal >= 0.5 hal < 0.6") 2>&5 + ac_status=$? +@@ -14607,9 +14596,8 @@ if test -n "$PKG_CONFIG"; then + else + pkg_failed=yes + fi +- fi +-else +- pkg_failed=untried ++ else ++ pkg_failed=untried + fi + + +@@ -14622,9 +14610,9 @@ else + _pkg_short_errors_supported=no + fi + if test $_pkg_short_errors_supported = yes; then +- HAL_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "hal >= 0.5 hal < 0.6"` ++ HAL_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "hal >= 0.5 hal < 0.6" 2>&1` + else +- HAL_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "hal >= 0.5 hal < 0.6"` ++ HAL_PKG_ERRORS=`$PKG_CONFIG --print-errors "hal >= 0.5 hal < 0.6" 2>&1` + fi + # Put the nasty error message in config.log where it belongs + echo "$HAL_PKG_ERRORS" >&5 +@@ -14677,11 +14665,10 @@ pkg_failed=no + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for IPOD" >&5 + $as_echo_n "checking for IPOD... " >&6; } + +-if test -n "$PKG_CONFIG"; then +- if test -n "$IPOD_CFLAGS"; then +- pkg_cv_IPOD_CFLAGS="$IPOD_CFLAGS" +- else +- if test -n "$PKG_CONFIG" && \ ++if test -n "$IPOD_CFLAGS"; then ++ pkg_cv_IPOD_CFLAGS="$IPOD_CFLAGS" ++ elif test -n "$PKG_CONFIG"; then ++ if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libgpod-1.0 >= \$LIBGPOD_REQS\""; } >&5 + ($PKG_CONFIG --exists --print-errors "libgpod-1.0 >= $LIBGPOD_REQS") 2>&5 + ac_status=$? +@@ -14691,15 +14678,13 @@ if test -n "$PKG_CONFIG"; then + else + pkg_failed=yes + fi +- fi +-else +- pkg_failed=untried ++ else ++ pkg_failed=untried + fi +-if test -n "$PKG_CONFIG"; then +- if test -n "$IPOD_LIBS"; then +- pkg_cv_IPOD_LIBS="$IPOD_LIBS" +- else +- if test -n "$PKG_CONFIG" && \ ++if test -n "$IPOD_LIBS"; then ++ pkg_cv_IPOD_LIBS="$IPOD_LIBS" ++ elif test -n "$PKG_CONFIG"; then ++ if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libgpod-1.0 >= \$LIBGPOD_REQS\""; } >&5 + ($PKG_CONFIG --exists --print-errors "libgpod-1.0 >= $LIBGPOD_REQS") 2>&5 + ac_status=$? +@@ -14709,9 +14694,8 @@ if test -n "$PKG_CONFIG"; then + else + pkg_failed=yes + fi +- fi +-else +- pkg_failed=untried ++ else ++ pkg_failed=untried + fi + + +@@ -14724,9 +14708,9 @@ else + _pkg_short_errors_supported=no + fi + if test $_pkg_short_errors_supported = yes; then +- IPOD_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "libgpod-1.0 >= $LIBGPOD_REQS"` ++ IPOD_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "libgpod-1.0 >= $LIBGPOD_REQS" 2>&1` + else +- IPOD_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libgpod-1.0 >= $LIBGPOD_REQS"` ++ IPOD_PKG_ERRORS=`$PKG_CONFIG --print-errors "libgpod-1.0 >= $LIBGPOD_REQS" 2>&1` + fi + # Put the nasty error message in config.log where it belongs + echo "$IPOD_PKG_ERRORS" >&5 +@@ -14780,11 +14764,10 @@ pkg_failed=no + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for MTP" >&5 + $as_echo_n "checking for MTP... " >&6; } + +-if test -n "$PKG_CONFIG"; then +- if test -n "$MTP_CFLAGS"; then +- pkg_cv_MTP_CFLAGS="$MTP_CFLAGS" +- else +- if test -n "$PKG_CONFIG" && \ ++if test -n "$MTP_CFLAGS"; then ++ pkg_cv_MTP_CFLAGS="$MTP_CFLAGS" ++ elif test -n "$PKG_CONFIG"; then ++ if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libmtp >= \$LIBMTP_REQS\""; } >&5 + ($PKG_CONFIG --exists --print-errors "libmtp >= $LIBMTP_REQS") 2>&5 + ac_status=$? +@@ -14794,15 +14777,13 @@ if test -n "$PKG_CONFIG"; then + else + pkg_failed=yes + fi +- fi +-else +- pkg_failed=untried ++ else ++ pkg_failed=untried + fi +-if test -n "$PKG_CONFIG"; then +- if test -n "$MTP_LIBS"; then +- pkg_cv_MTP_LIBS="$MTP_LIBS" +- else +- if test -n "$PKG_CONFIG" && \ ++if test -n "$MTP_LIBS"; then ++ pkg_cv_MTP_LIBS="$MTP_LIBS" ++ elif test -n "$PKG_CONFIG"; then ++ if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libmtp >= \$LIBMTP_REQS\""; } >&5 + ($PKG_CONFIG --exists --print-errors "libmtp >= $LIBMTP_REQS") 2>&5 + ac_status=$? +@@ -14812,9 +14793,8 @@ if test -n "$PKG_CONFIG"; then + else + pkg_failed=yes + fi +- fi +-else +- pkg_failed=untried ++ else ++ pkg_failed=untried + fi + + +@@ -14827,9 +14807,9 @@ else + _pkg_short_errors_supported=no + fi + if test $_pkg_short_errors_supported = yes; then +- MTP_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "libmtp >= $LIBMTP_REQS"` ++ MTP_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "libmtp >= $LIBMTP_REQS" 2>&1` + else +- MTP_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libmtp >= $LIBMTP_REQS"` ++ MTP_PKG_ERRORS=`$PKG_CONFIG --print-errors "libmtp >= $LIBMTP_REQS" 2>&1` + fi + # Put the nasty error message in config.log where it belongs + echo "$MTP_PKG_ERRORS" >&5 +@@ -14886,11 +14866,10 @@ pkg_failed=no + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNOME_KEYRING" >&5 + $as_echo_n "checking for GNOME_KEYRING... " >&6; } + +-if test -n "$PKG_CONFIG"; then +- if test -n "$GNOME_KEYRING_CFLAGS"; then +- pkg_cv_GNOME_KEYRING_CFLAGS="$GNOME_KEYRING_CFLAGS" +- else +- if test -n "$PKG_CONFIG" && \ ++if test -n "$GNOME_KEYRING_CFLAGS"; then ++ pkg_cv_GNOME_KEYRING_CFLAGS="$GNOME_KEYRING_CFLAGS" ++ elif test -n "$PKG_CONFIG"; then ++ if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gnome-keyring-1\""; } >&5 + ($PKG_CONFIG --exists --print-errors "gnome-keyring-1") 2>&5 + ac_status=$? +@@ -14900,15 +14879,13 @@ if test -n "$PKG_CONFIG"; then + else + pkg_failed=yes + fi +- fi +-else +- pkg_failed=untried ++ else ++ pkg_failed=untried + fi +-if test -n "$PKG_CONFIG"; then +- if test -n "$GNOME_KEYRING_LIBS"; then +- pkg_cv_GNOME_KEYRING_LIBS="$GNOME_KEYRING_LIBS" +- else +- if test -n "$PKG_CONFIG" && \ ++if test -n "$GNOME_KEYRING_LIBS"; then ++ pkg_cv_GNOME_KEYRING_LIBS="$GNOME_KEYRING_LIBS" ++ elif test -n "$PKG_CONFIG"; then ++ if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gnome-keyring-1\""; } >&5 + ($PKG_CONFIG --exists --print-errors "gnome-keyring-1") 2>&5 + ac_status=$? +@@ -14918,9 +14895,8 @@ if test -n "$PKG_CONFIG"; then + else + pkg_failed=yes + fi +- fi +-else +- pkg_failed=untried ++ else ++ pkg_failed=untried + fi + + +@@ -14933,9 +14909,9 @@ else + _pkg_short_errors_supported=no + fi + if test $_pkg_short_errors_supported = yes; then +- GNOME_KEYRING_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "gnome-keyring-1"` ++ GNOME_KEYRING_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "gnome-keyring-1" 2>&1` + else +- GNOME_KEYRING_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "gnome-keyring-1"` ++ GNOME_KEYRING_PKG_ERRORS=`$PKG_CONFIG --print-errors "gnome-keyring-1" 2>&1` + fi + # Put the nasty error message in config.log where it belongs + echo "$GNOME_KEYRING_PKG_ERRORS" >&5 +@@ -15022,11 +14998,10 @@ pkg_failed=no + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GSTREAMER_0_10" >&5 + $as_echo_n "checking for GSTREAMER_0_10... " >&6; } + +-if test -n "$PKG_CONFIG"; then +- if test -n "$GSTREAMER_0_10_CFLAGS"; then +- pkg_cv_GSTREAMER_0_10_CFLAGS="$GSTREAMER_0_10_CFLAGS" +- else +- if test -n "$PKG_CONFIG" && \ ++if test -n "$GSTREAMER_0_10_CFLAGS"; then ++ pkg_cv_GSTREAMER_0_10_CFLAGS="$GSTREAMER_0_10_CFLAGS" ++ elif test -n "$PKG_CONFIG"; then ++ if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\\ + gstreamer-0.10 >= \$GST_0_10_REQS + gstreamer-base-0.10 >= \$GST_0_10_REQS +@@ -15045,15 +15020,13 @@ if test -n "$PKG_CONFIG"; then + else + pkg_failed=yes + fi +- fi +-else +- pkg_failed=untried ++ else ++ pkg_failed=untried + fi +-if test -n "$PKG_CONFIG"; then +- if test -n "$GSTREAMER_0_10_LIBS"; then +- pkg_cv_GSTREAMER_0_10_LIBS="$GSTREAMER_0_10_LIBS" +- else +- if test -n "$PKG_CONFIG" && \ ++if test -n "$GSTREAMER_0_10_LIBS"; then ++ pkg_cv_GSTREAMER_0_10_LIBS="$GSTREAMER_0_10_LIBS" ++ elif test -n "$PKG_CONFIG"; then ++ if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\\ + gstreamer-0.10 >= \$GST_0_10_REQS + gstreamer-base-0.10 >= \$GST_0_10_REQS +@@ -15072,9 +15045,8 @@ if test -n "$PKG_CONFIG"; then + else + pkg_failed=yes + fi +- fi +-else +- pkg_failed=untried ++ else ++ pkg_failed=untried + fi + + +@@ -15087,15 +15059,15 @@ else + _pkg_short_errors_supported=no + fi + if test $_pkg_short_errors_supported = yes; then +- GSTREAMER_0_10_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "\ ++ GSTREAMER_0_10_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "\ + gstreamer-0.10 >= $GST_0_10_REQS + gstreamer-base-0.10 >= $GST_0_10_REQS +- gstreamer-plugins-base-0.10 >= $GST_0_10_REQS"` ++ gstreamer-plugins-base-0.10 >= $GST_0_10_REQS" 2>&1` + else +- GSTREAMER_0_10_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "\ ++ GSTREAMER_0_10_PKG_ERRORS=`$PKG_CONFIG --print-errors "\ + gstreamer-0.10 >= $GST_0_10_REQS + gstreamer-base-0.10 >= $GST_0_10_REQS +- gstreamer-plugins-base-0.10 >= $GST_0_10_REQS"` ++ gstreamer-plugins-base-0.10 >= $GST_0_10_REQS" 2>&1` + fi + # Put the nasty error message in config.log where it belongs + echo "$GSTREAMER_0_10_PKG_ERRORS" >&5 +@@ -15162,11 +15134,10 @@ pkg_failed=no + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for AVAHI" >&5 + $as_echo_n "checking for AVAHI... " >&6; } + +-if test -n "$PKG_CONFIG"; then +- if test -n "$AVAHI_CFLAGS"; then +- pkg_cv_AVAHI_CFLAGS="$AVAHI_CFLAGS" +- else +- if test -n "$PKG_CONFIG" && \ ++if test -n "$AVAHI_CFLAGS"; then ++ pkg_cv_AVAHI_CFLAGS="$AVAHI_CFLAGS" ++ elif test -n "$PKG_CONFIG"; then ++ if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"avahi-client >= \$AVAHI_REQS + avahi-glib >= \$AVAHI_REQS\""; } >&5 + ($PKG_CONFIG --exists --print-errors "avahi-client >= $AVAHI_REQS +@@ -15179,15 +15150,13 @@ if test -n "$PKG_CONFIG"; then + else + pkg_failed=yes + fi +- fi +-else +- pkg_failed=untried ++ else ++ pkg_failed=untried + fi +-if test -n "$PKG_CONFIG"; then +- if test -n "$AVAHI_LIBS"; then +- pkg_cv_AVAHI_LIBS="$AVAHI_LIBS" +- else +- if test -n "$PKG_CONFIG" && \ ++if test -n "$AVAHI_LIBS"; then ++ pkg_cv_AVAHI_LIBS="$AVAHI_LIBS" ++ elif test -n "$PKG_CONFIG"; then ++ if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"avahi-client >= \$AVAHI_REQS + avahi-glib >= \$AVAHI_REQS\""; } >&5 + ($PKG_CONFIG --exists --print-errors "avahi-client >= $AVAHI_REQS +@@ -15200,9 +15169,8 @@ if test -n "$PKG_CONFIG"; then + else + pkg_failed=yes + fi +- fi +-else +- pkg_failed=untried ++ else ++ pkg_failed=untried + fi + + +@@ -15215,11 +15183,11 @@ else + _pkg_short_errors_supported=no + fi + if test $_pkg_short_errors_supported = yes; then +- AVAHI_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "avahi-client >= $AVAHI_REQS +- avahi-glib >= $AVAHI_REQS"` ++ AVAHI_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "avahi-client >= $AVAHI_REQS ++ avahi-glib >= $AVAHI_REQS" 2>&1` + else +- AVAHI_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "avahi-client >= $AVAHI_REQS +- avahi-glib >= $AVAHI_REQS"` ++ AVAHI_PKG_ERRORS=`$PKG_CONFIG --print-errors "avahi-client >= $AVAHI_REQS ++ avahi-glib >= $AVAHI_REQS" 2>&1` + fi + # Put the nasty error message in config.log where it belongs + echo "$AVAHI_PKG_ERRORS" >&5 +@@ -15275,11 +15243,10 @@ pkg_failed=no + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for NOTIFY" >&5 + $as_echo_n "checking for NOTIFY... " >&6; } + +-if test -n "$PKG_CONFIG"; then +- if test -n "$NOTIFY_CFLAGS"; then +- pkg_cv_NOTIFY_CFLAGS="$NOTIFY_CFLAGS" +- else +- if test -n "$PKG_CONFIG" && \ ++if test -n "$NOTIFY_CFLAGS"; then ++ pkg_cv_NOTIFY_CFLAGS="$NOTIFY_CFLAGS" ++ elif test -n "$PKG_CONFIG"; then ++ if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\\ + libnotify >= \$LIBNOTIFY_REQS\""; } >&5 + ($PKG_CONFIG --exists --print-errors "\ +@@ -15292,15 +15259,13 @@ if test -n "$PKG_CONFIG"; then + else + pkg_failed=yes + fi +- fi +-else +- pkg_failed=untried ++ else ++ pkg_failed=untried + fi +-if test -n "$PKG_CONFIG"; then +- if test -n "$NOTIFY_LIBS"; then +- pkg_cv_NOTIFY_LIBS="$NOTIFY_LIBS" +- else +- if test -n "$PKG_CONFIG" && \ ++if test -n "$NOTIFY_LIBS"; then ++ pkg_cv_NOTIFY_LIBS="$NOTIFY_LIBS" ++ elif test -n "$PKG_CONFIG"; then ++ if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\\ + libnotify >= \$LIBNOTIFY_REQS\""; } >&5 + ($PKG_CONFIG --exists --print-errors "\ +@@ -15313,9 +15278,8 @@ if test -n "$PKG_CONFIG"; then + else + pkg_failed=yes + fi +- fi +-else +- pkg_failed=untried ++ else ++ pkg_failed=untried + fi + + +@@ -15328,11 +15292,11 @@ else + _pkg_short_errors_supported=no + fi + if test $_pkg_short_errors_supported = yes; then +- NOTIFY_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "\ +- libnotify >= $LIBNOTIFY_REQS"` ++ NOTIFY_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "\ ++ libnotify >= $LIBNOTIFY_REQS" 2>&1` + else +- NOTIFY_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "\ +- libnotify >= $LIBNOTIFY_REQS"` ++ NOTIFY_PKG_ERRORS=`$PKG_CONFIG --print-errors "\ ++ libnotify >= $LIBNOTIFY_REQS" 2>&1` + fi + # Put the nasty error message in config.log where it belongs + echo "$NOTIFY_PKG_ERRORS" >&5 +@@ -15466,11 +15430,10 @@ pkg_failed=no + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GSTCDDA" >&5 + $as_echo_n "checking for GSTCDDA... " >&6; } + +-if test -n "$PKG_CONFIG"; then +- if test -n "$GSTCDDA_CFLAGS"; then +- pkg_cv_GSTCDDA_CFLAGS="$GSTCDDA_CFLAGS" +- else +- if test -n "$PKG_CONFIG" && \ ++if test -n "$GSTCDDA_CFLAGS"; then ++ pkg_cv_GSTCDDA_CFLAGS="$GSTCDDA_CFLAGS" ++ elif test -n "$PKG_CONFIG"; then ++ if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gstreamer-cdda-0.10\""; } >&5 + ($PKG_CONFIG --exists --print-errors "gstreamer-cdda-0.10") 2>&5 + ac_status=$? +@@ -15480,15 +15443,13 @@ if test -n "$PKG_CONFIG"; then + else + pkg_failed=yes + fi +- fi +-else +- pkg_failed=untried ++ else ++ pkg_failed=untried + fi +-if test -n "$PKG_CONFIG"; then +- if test -n "$GSTCDDA_LIBS"; then +- pkg_cv_GSTCDDA_LIBS="$GSTCDDA_LIBS" +- else +- if test -n "$PKG_CONFIG" && \ ++if test -n "$GSTCDDA_LIBS"; then ++ pkg_cv_GSTCDDA_LIBS="$GSTCDDA_LIBS" ++ elif test -n "$PKG_CONFIG"; then ++ if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gstreamer-cdda-0.10\""; } >&5 + ($PKG_CONFIG --exists --print-errors "gstreamer-cdda-0.10") 2>&5 + ac_status=$? +@@ -15498,9 +15459,8 @@ if test -n "$PKG_CONFIG"; then + else + pkg_failed=yes + fi +- fi +-else +- pkg_failed=untried ++ else ++ pkg_failed=untried + fi + + +@@ -15513,9 +15473,9 @@ else + _pkg_short_errors_supported=no + fi + if test $_pkg_short_errors_supported = yes; then +- GSTCDDA_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "gstreamer-cdda-0.10"` ++ GSTCDDA_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "gstreamer-cdda-0.10" 2>&1` + else +- GSTCDDA_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "gstreamer-cdda-0.10"` ++ GSTCDDA_PKG_ERRORS=`$PKG_CONFIG --print-errors "gstreamer-cdda-0.10" 2>&1` + fi + # Put the nasty error message in config.log where it belongs + echo "$GSTCDDA_PKG_ERRORS" >&5 +@@ -15566,11 +15526,10 @@ pkg_failed=no + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for MUSICBRAINZ3" >&5 + $as_echo_n "checking for MUSICBRAINZ3... " >&6; } + +-if test -n "$PKG_CONFIG"; then +- if test -n "$MUSICBRAINZ3_CFLAGS"; then +- pkg_cv_MUSICBRAINZ3_CFLAGS="$MUSICBRAINZ3_CFLAGS" +- else +- if test -n "$PKG_CONFIG" && \ ++if test -n "$MUSICBRAINZ3_CFLAGS"; then ++ pkg_cv_MUSICBRAINZ3_CFLAGS="$MUSICBRAINZ3_CFLAGS" ++ elif test -n "$PKG_CONFIG"; then ++ if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libmusicbrainz3 >= \$MUSICBRAINZ3_REQS\""; } >&5 + ($PKG_CONFIG --exists --print-errors "libmusicbrainz3 >= $MUSICBRAINZ3_REQS") 2>&5 + ac_status=$? +@@ -15580,15 +15539,13 @@ if test -n "$PKG_CONFIG"; then + else + pkg_failed=yes + fi +- fi +-else +- pkg_failed=untried ++ else ++ pkg_failed=untried + fi +-if test -n "$PKG_CONFIG"; then +- if test -n "$MUSICBRAINZ3_LIBS"; then +- pkg_cv_MUSICBRAINZ3_LIBS="$MUSICBRAINZ3_LIBS" +- else +- if test -n "$PKG_CONFIG" && \ ++if test -n "$MUSICBRAINZ3_LIBS"; then ++ pkg_cv_MUSICBRAINZ3_LIBS="$MUSICBRAINZ3_LIBS" ++ elif test -n "$PKG_CONFIG"; then ++ if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libmusicbrainz3 >= \$MUSICBRAINZ3_REQS\""; } >&5 + ($PKG_CONFIG --exists --print-errors "libmusicbrainz3 >= $MUSICBRAINZ3_REQS") 2>&5 + ac_status=$? +@@ -15598,9 +15555,8 @@ if test -n "$PKG_CONFIG"; then + else + pkg_failed=yes + fi +- fi +-else +- pkg_failed=untried ++ else ++ pkg_failed=untried + fi + + @@ Diff output truncated at 100000 characters. @@ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From hson at users.sourceforge.net Sat Jan 9 01:21:59 2010 From: hson at users.sourceforge.net (hson at users.sourceforge.net) Date: Sat, 09 Jan 2010 00:21:59 +0000 Subject: [csw-devel] SF.net SVN: gar:[7917] csw/mgar/pkg Message-ID: Revision: 7917 http://gar.svn.sourceforge.net/gar/?rev=7917&view=rev Author: hson Date: 2010-01-09 00:21:59 +0000 (Sat, 09 Jan 2010) Log Message: ----------- djvulibre: Initial commit Added Paths: ----------- csw/mgar/pkg/djvulibre/ csw/mgar/pkg/djvulibre/Makefile csw/mgar/pkg/djvulibre/branches/ csw/mgar/pkg/djvulibre/tags/ csw/mgar/pkg/djvulibre/trunk/ csw/mgar/pkg/djvulibre/trunk/Makefile csw/mgar/pkg/djvulibre/trunk/files/ csw/mgar/pkg/djvulibre/trunk/files/ddjvu.cpp.patch Added: csw/mgar/pkg/djvulibre/Makefile =================================================================== --- csw/mgar/pkg/djvulibre/Makefile (rev 0) +++ csw/mgar/pkg/djvulibre/Makefile 2010-01-09 00:21:59 UTC (rev 7917) @@ -0,0 +1,15 @@ +# vim: ft=make ts=4 sw=4 noet + +default: + @echo "You are in the pkg/ directory." + +%: + $(MAKE) -C trunk $* + +paranoid-%: + $(MAKE) -C trunk $* || exit 2 + +export BUILDLOG ?= $(shell pwd)/buildlog.txt + +report-%: + $(MAKE) -C trunk $* || echo " *** make $* in $$i failed ***" >> $(BUILDLOG) Property changes on: csw/mgar/pkg/djvulibre/trunk ___________________________________________________________________ Added: svn:ignore + cookies download work Added: svn:externals + gar https://gar.svn.sf.net/svnroot/gar/csw/mgar/gar/v2 Added: csw/mgar/pkg/djvulibre/trunk/Makefile =================================================================== --- csw/mgar/pkg/djvulibre/trunk/Makefile (rev 0) +++ csw/mgar/pkg/djvulibre/trunk/Makefile 2010-01-09 00:21:59 UTC (rev 7917) @@ -0,0 +1,67 @@ +GARNAME = djvulibre +GARVERSION = 3.5.22 +CATEGORIES = apps + +DESCRIPTION = DjVu standalone viewer, browser plug-in, command line tools +define BLURB +endef + +SF_PROJ = djvu +MASTER_SITES = $(SF_MIRRORS)/DjVuLibre/$(GARVERSION)/ +DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz + +PACKAGES = CSWdjvulibre CSWdjvulibrert CSWdjvulibredevel +CATALOGNAME_CSWdjvulibre = djvulibre +CATALOGNAME_CSWdjvulibrert = djvulibre_rt +CATALOGNAME_CSWdjvulibredevel = djvulibre_devel + +SPKG_DESC_CSWdjvulibre += DjVu standalone viewer, browser plug-in, command linetools +SPKG_DESC_CSWdjvulibrert += DjVu standalone viewer, browser plug-in, command line tools - runtime package +SPKG_DESC_CSWdjvulibredevel += DjVu standalone viewer, browser plug-in, commandline tools - developer package + +REQUIRED_PKGS_CSWdjvulibre += CSWdjvulibrert +REQUIRED_PKGS_CSWdjvulibrert += +REQUIRED_PKGS_CSWdjvulibredevel += CSWdjvulibre + +PKGFILES_CSWdjvulibrert = $(PKGFILES_RT) +PKGFILES_CSWdjvulibredevel = $(PKGFILES_DEVEL) + +SPKG_SOURCEURL = http://djvu.sourceforge.net/ + +LICENSE = COPYING + +PATCHFILES += ddjvu.cpp.patch + +# We define upstream file regex so we can be notifed of new upstream software re +lease +UPSTREAM_MASTER_SITES = $(SF_PROJECT_SHOWFILE)=32953 +UPSTREAM_USE_SF = 1 +UFILES_REGEX = (\d+(?:\.\d+)*) + +OPTS='-DNDEBUG' +EXTRA_COMMON_EXPORTS += OPTS + +PTHREAD_LIBS = -lpthread +PTHREAD_CFLAGS = -D_REENTRANT +EXTRA_COMMON_EXPORTS += PTHREAD_LIBS +EXTRA_COMMON_EXPORTS += PTHREAD_CFLAGS + + +EXTRA_INC = $(prefix)/X11/include +EXTRA_LIB = $(prefix)/X11/lib +EXTRA_PKG_CONFIG_DIRS = $(prefix)/X11/lib + +X_CFLAGS = -I$(prefix)/X11/include +X_LIBS = -L$(prefix)/X11/lib -R$(prefix)/X11/lib +EXTRA_COMMON_EXPORTS += X_CFLAGS +EXTRA_COMMON_EXPORTS += X_LIBS + +CONFIGURE_ARGS = $(DIRPATHS) +CONFIGURE_ARGS += --with-extra-includes=$(prefix)/X11/include +CONFIGURE_ARGS += --with-extra-libraries=$(prefix)/X11/lib + +BUILD64 = 1 + +TEST_TARGET = + +include gar/category.mk Added: csw/mgar/pkg/djvulibre/trunk/files/ddjvu.cpp.patch =================================================================== --- csw/mgar/pkg/djvulibre/trunk/files/ddjvu.cpp.patch (rev 0) +++ csw/mgar/pkg/djvulibre/trunk/files/ddjvu.cpp.patch 2010-01-09 00:21:59 UTC (rev 7917) @@ -0,0 +1,13 @@ +--- djvulibre-3.5.22.orig/tools/ddjvu.cpp 2009-02-13 10:46:27.000000000 +0100 ++++ djvulibre-3.5.22/tools/ddjvu.cpp 2010-01-07 17:45:43.925544787 +0100 +@@ -66,6 +66,10 @@ + + #include + #include ++#if (defined(__SUNPRO_CC) && ( defined(__SunOS_5_8) || defined(__SunOS_5_9))) && !defined(__sparcv9) ++using std::__flsbuf; ++using std::__filbuf; ++#endif + #include + #include + #include This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From hson at users.sourceforge.net Sat Jan 9 01:47:24 2010 From: hson at users.sourceforge.net (hson at users.sourceforge.net) Date: Sat, 09 Jan 2010 00:47:24 +0000 Subject: [csw-devel] SF.net SVN: gar:[7918] csw/mgar/pkg/djvulibre/trunk/Makefile Message-ID: Revision: 7918 http://gar.svn.sourceforge.net/gar/?rev=7918&view=rev Author: hson Date: 2010-01-09 00:47:18 +0000 (Sat, 09 Jan 2010) Log Message: ----------- djvulibre: Copy paste error Modified Paths: -------------- csw/mgar/pkg/djvulibre/trunk/Makefile Modified: csw/mgar/pkg/djvulibre/trunk/Makefile =================================================================== --- csw/mgar/pkg/djvulibre/trunk/Makefile 2010-01-09 00:21:59 UTC (rev 7917) +++ csw/mgar/pkg/djvulibre/trunk/Makefile 2010-01-09 00:47:18 UTC (rev 7918) @@ -32,8 +32,6 @@ PATCHFILES += ddjvu.cpp.patch -# We define upstream file regex so we can be notifed of new upstream software re -lease UPSTREAM_MASTER_SITES = $(SF_PROJECT_SHOWFILE)=32953 UPSTREAM_USE_SF = 1 UFILES_REGEX = (\d+(?:\.\d+)*) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From hson at users.sourceforge.net Sat Jan 9 02:11:43 2010 From: hson at users.sourceforge.net (hson at users.sourceforge.net) Date: Sat, 09 Jan 2010 01:11:43 +0000 Subject: [csw-devel] SF.net SVN: gar:[7919] csw/mgar/pkg/djvulibre/trunk/Makefile Message-ID: Revision: 7919 http://gar.svn.sourceforge.net/gar/?rev=7919&view=rev Author: hson Date: 2010-01-09 01:11:43 +0000 (Sat, 09 Jan 2010) Log Message: ----------- djvulibre: Add some dependencies Modified Paths: -------------- csw/mgar/pkg/djvulibre/trunk/Makefile Modified: csw/mgar/pkg/djvulibre/trunk/Makefile =================================================================== --- csw/mgar/pkg/djvulibre/trunk/Makefile 2010-01-09 00:47:18 UTC (rev 7918) +++ csw/mgar/pkg/djvulibre/trunk/Makefile 2010-01-09 01:11:43 UTC (rev 7919) @@ -19,8 +19,8 @@ SPKG_DESC_CSWdjvulibrert += DjVu standalone viewer, browser plug-in, command line tools - runtime package SPKG_DESC_CSWdjvulibredevel += DjVu standalone viewer, browser plug-in, commandline tools - developer package -REQUIRED_PKGS_CSWdjvulibre += CSWdjvulibrert -REQUIRED_PKGS_CSWdjvulibrert += +REQUIRED_PKGS_CSWdjvulibre += CSWdjvulibrert CSWjpeg CSWtiff CSWzlib +REQUIRED_PKGS_CSWdjvulibrert += CSWjpeg REQUIRED_PKGS_CSWdjvulibredevel += CSWdjvulibre PKGFILES_CSWdjvulibrert = $(PKGFILES_RT) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From hson at users.sourceforge.net Sat Jan 9 02:23:42 2010 From: hson at users.sourceforge.net (hson at users.sourceforge.net) Date: Sat, 09 Jan 2010 01:23:42 +0000 Subject: [csw-devel] SF.net SVN: gar:[7920] csw/mgar/pkg Message-ID: Revision: 7920 http://gar.svn.sourceforge.net/gar/?rev=7920&view=rev Author: hson Date: 2010-01-09 01:23:42 +0000 (Sat, 09 Jan 2010) Log Message: ----------- ghostscript: Initial commit Added Paths: ----------- csw/mgar/pkg/ghostscript/ csw/mgar/pkg/ghostscript/Makefile csw/mgar/pkg/ghostscript/branches/ csw/mgar/pkg/ghostscript/tags/ csw/mgar/pkg/ghostscript/trunk/ csw/mgar/pkg/ghostscript/trunk/Makefile csw/mgar/pkg/ghostscript/trunk/checksums csw/mgar/pkg/ghostscript/trunk/files/ Added: csw/mgar/pkg/ghostscript/Makefile =================================================================== --- csw/mgar/pkg/ghostscript/Makefile (rev 0) +++ csw/mgar/pkg/ghostscript/Makefile 2010-01-09 01:23:42 UTC (rev 7920) @@ -0,0 +1,15 @@ +# vim: ft=make ts=4 sw=4 noet + +default: + @echo "You are in the pkg/ directory." + +%: + $(MAKE) -C trunk $* + +paranoid-%: + $(MAKE) -C trunk $* || exit 2 + +export BUILDLOG ?= $(shell pwd)/buildlog.txt + +report-%: + $(MAKE) -C trunk $* || echo " *** make $* in $$i failed ***" >> $(BUILDLOG) Property changes on: csw/mgar/pkg/ghostscript/trunk ___________________________________________________________________ Added: svn:ignore + cookies download work Added: svn:externals + gar https://gar.svn.sf.net/svnroot/gar/csw/mgar/gar/v2 Added: csw/mgar/pkg/ghostscript/trunk/Makefile =================================================================== --- csw/mgar/pkg/ghostscript/trunk/Makefile (rev 0) +++ csw/mgar/pkg/ghostscript/trunk/Makefile 2010-01-09 01:23:42 UTC (rev 7920) @@ -0,0 +1,27 @@ +GARNAME = ghostscript +GARVERSION = 8.70 +CATEGORIES = apps + +DESCRIPTION = EXIF Tag Parsing Library +define BLURB + libexif is a library for parsing, editing, and saving EXIF data. It is + intended to replace lots of redundant implementations in command-line + utilities and programs with GUIs. +endef + +MASTER_SITES = $(SF_MIRRORS) +DISTFILES = $(GARNAME)-$(GARVERSION).tar.bz2 + +SPKG_SOURCEURL = http://www.ghostscript.com + +LICENSE = COPYING + +REQUIRED_PKGS += + +UPSTREAM_MASTER_SITES = $(SF_PROJECT_SHOWFILE)= +UPSTREAM_USE_SF = 1 +UFILES_REGEX = (\d+(?:\.\d+)*) + +CONFIGURE_ARGS = $(DIRPATHS) + +include gar/category.mk Added: csw/mgar/pkg/ghostscript/trunk/checksums =================================================================== --- csw/mgar/pkg/ghostscript/trunk/checksums (rev 0) +++ csw/mgar/pkg/ghostscript/trunk/checksums 2010-01-09 01:23:42 UTC (rev 7920) @@ -0,0 +1 @@ +526366f8cb4fda0d3d293597cc5b984b ghostscript-8.70.tar.bz2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From hson at users.sourceforge.net Sat Jan 9 04:35:00 2010 From: hson at users.sourceforge.net (hson at users.sourceforge.net) Date: Sat, 09 Jan 2010 03:35:00 +0000 Subject: [csw-devel] SF.net SVN: gar:[7921] csw/mgar/pkg Message-ID: Revision: 7921 http://gar.svn.sourceforge.net/gar/?rev=7921&view=rev Author: hson Date: 2010-01-09 03:34:54 +0000 (Sat, 09 Jan 2010) Log Message: ----------- jpeg: Initial commit Added Paths: ----------- csw/mgar/pkg/jpeg/ csw/mgar/pkg/jpeg/branches/ csw/mgar/pkg/jpeg/tags/ csw/mgar/pkg/jpeg/trunk/ csw/mgar/pkg/jpeg/trunk/Makefile csw/mgar/pkg/jpeg/trunk/checksums csw/mgar/pkg/jpeg/trunk/files/ Property changes on: csw/mgar/pkg/jpeg/trunk ___________________________________________________________________ Added: svn:ignore + cookies download work Added: svn:externals + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 Added: csw/mgar/pkg/jpeg/trunk/Makefile =================================================================== --- csw/mgar/pkg/jpeg/trunk/Makefile (rev 0) +++ csw/mgar/pkg/jpeg/trunk/Makefile 2010-01-09 03:34:54 UTC (rev 7921) @@ -0,0 +1,23 @@ +GARNAME = jpeg +GARVERSION = 6 +CATEGORIES = lib + +DESCRIPTION = JPEG library and tools by the Independent JPEG Group +define BLURB + Long description +endef + +MASTER_SITES = http://www.ijg.org/files/ +DISTFILES = $(GARNAME)src.v$(GARVERSION).tar.gz + +CONFIGURE_ARGS = $(DIRPATHS) +CONFIGURE_ARGS += --enable-shared + +EXTRA_CC_FLAGS = -g -w +EXTRA_CXX_FLAGS = -g -w +EXTRA_LD_FLAGS = -g +OPT_FLAGS_SOS = + +STRIP_LIBTOOL = 1 + +include gar/category.mk Added: csw/mgar/pkg/jpeg/trunk/checksums =================================================================== --- csw/mgar/pkg/jpeg/trunk/checksums (rev 0) +++ csw/mgar/pkg/jpeg/trunk/checksums 2010-01-09 03:34:54 UTC (rev 7921) @@ -0,0 +1 @@ +382ef33b339c299b56baf1296cda9785 jpegsrc.v7.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From hson at users.sourceforge.net Sat Jan 9 05:43:32 2010 From: hson at users.sourceforge.net (hson at users.sourceforge.net) Date: Sat, 09 Jan 2010 04:43:32 +0000 Subject: [csw-devel] SF.net SVN: gar:[7922] csw/mgar/pkg Message-ID: Revision: 7922 http://gar.svn.sourceforge.net/gar/?rev=7922&view=rev Author: hson Date: 2010-01-09 04:43:32 +0000 (Sat, 09 Jan 2010) Log Message: ----------- libpaper: Initial commit Added Paths: ----------- csw/mgar/pkg/libpaper/ csw/mgar/pkg/libpaper/Makefile csw/mgar/pkg/libpaper/branches/ csw/mgar/pkg/libpaper/tags/ csw/mgar/pkg/libpaper/trunk/ csw/mgar/pkg/libpaper/trunk/Makefile csw/mgar/pkg/libpaper/trunk/checksums csw/mgar/pkg/libpaper/trunk/files/ Added: csw/mgar/pkg/libpaper/Makefile =================================================================== --- csw/mgar/pkg/libpaper/Makefile (rev 0) +++ csw/mgar/pkg/libpaper/Makefile 2010-01-09 04:43:32 UTC (rev 7922) @@ -0,0 +1,15 @@ +# vim: ft=make ts=4 sw=4 noet + +default: + @echo "You are in the pkg/ directory." + +%: + $(MAKE) -C trunk $* + +paranoid-%: + $(MAKE) -C trunk $* || exit 2 + +export BUILDLOG ?= $(shell pwd)/buildlog.txt + +report-%: + $(MAKE) -C trunk $* || echo " *** make $* in $$i failed ***" >> $(BUILDLOG) Property changes on: csw/mgar/pkg/libpaper/trunk ___________________________________________________________________ Added: svn:ignore + cookies download work Added: svn:externals + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 Added: csw/mgar/pkg/libpaper/trunk/Makefile =================================================================== --- csw/mgar/pkg/libpaper/trunk/Makefile (rev 0) +++ csw/mgar/pkg/libpaper/trunk/Makefile 2010-01-09 04:43:32 UTC (rev 7922) @@ -0,0 +1,36 @@ +GARNAME = libpaper +GARVERSION = 1.1.23 +GARSUBREV = nmu1 +CATEGORIES = lib + +DESCRIPTION = Library and tools for handling papersize +define BLURB + Long description +endef + +MASTER_SITES = http://ftp.us.debian.org/debian/pool/main/libp/libpaper/ +DISTFILES = $(GARNAME)_$(GARVERSION)+$(GARSUBREV).tar.gz +DISTNAME = $(GARNAME)-$(GARVERSION)+$(GARSUBREV) + +PACKAGES = CSWlibpaper CSWlibpaperdevel +CATALOGNAME_CSWlibpaper = libpaper +CATALOGNAME_CSWlibpaperdevel = libpaper_devel + +SPKG_DESC_CSWlibpaper += Library and tools for handling papersize +SPKG_DESC_CSWlibpaperdevel += Library and tools for handling papersize - developer package + +REQUIRED_PKGS_CSWlibpaper = +REQUIRED_PKGS_CSWlibpaperdevel += CSWlibpaper + +PKGFILES_CSWlibpaperdevel = $(PKGFILES_DEVEL) + +UFILES_REGEX = $(GARNAME)_(\d+(?:\.\d+)*).tar.gz +UPSTREAM_MASTER_SITES = $(MASTER_SITES) + +EXTRA_CFLAGS = -Xc + +CONFIGURE_ARGS = $(DIRPATHS) + +TEST_TARGET = check + +include gar/category.mk Added: csw/mgar/pkg/libpaper/trunk/checksums =================================================================== --- csw/mgar/pkg/libpaper/trunk/checksums (rev 0) +++ csw/mgar/pkg/libpaper/trunk/checksums 2010-01-09 04:43:32 UTC (rev 7922) @@ -0,0 +1 @@ +fb6c57fbad2e691b54210fad43745f4f libpaper_1.1.23+nmu1.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From hson at users.sourceforge.net Sat Jan 9 06:36:44 2010 From: hson at users.sourceforge.net (hson at users.sourceforge.net) Date: Sat, 09 Jan 2010 05:36:44 +0000 Subject: [csw-devel] SF.net SVN: gar:[7923] csw/mgar/pkg/ghostscript/trunk Message-ID: Revision: 7923 http://gar.svn.sourceforge.net/gar/?rev=7923&view=rev Author: hson Date: 2010-01-09 05:36:44 +0000 (Sat, 09 Jan 2010) Log Message: ----------- ghostscript: First attempt to get it to build properly Modified Paths: -------------- csw/mgar/pkg/ghostscript/trunk/Makefile csw/mgar/pkg/ghostscript/trunk/checksums Added Paths: ----------- csw/mgar/pkg/ghostscript/trunk/files/0001-Support-libjpeg7.patch csw/mgar/pkg/ghostscript/trunk/files/0002-Rearrange-compiler-flags.patch csw/mgar/pkg/ghostscript/trunk/files/0003-Change-gcc-flags-to-sun.patch Modified: csw/mgar/pkg/ghostscript/trunk/Makefile =================================================================== --- csw/mgar/pkg/ghostscript/trunk/Makefile 2010-01-09 04:43:32 UTC (rev 7922) +++ csw/mgar/pkg/ghostscript/trunk/Makefile 2010-01-09 05:36:44 UTC (rev 7923) @@ -2,11 +2,8 @@ GARVERSION = 8.70 CATEGORIES = apps -DESCRIPTION = EXIF Tag Parsing Library +DESCRIPTION = Ghostscript, a PostScript and PDF interpreter for previewing, conversion and printing define BLURB - libexif is a library for parsing, editing, and saving EXIF data. It is - intended to replace lots of redundant implementations in command-line - utilities and programs with GUIs. endef MASTER_SITES = $(SF_MIRRORS) @@ -22,6 +19,24 @@ UPSTREAM_USE_SF = 1 UFILES_REGEX = (\d+(?:\.\d+)*) -CONFIGURE_ARGS = $(DIRPATHS) +#PATCHFILES += 0001-Support-libjpeg7.patch +PATCHFILES += 0002-Rearrange-compiler-flags.patch +PATCHFILES += 0003-Change-gcc-flags-to-sun.patch +#BUILD64 = 1 + +EXTRA_INC = $(prefix)/X11/include +EXTRA_LIB = $(prefix)/X11/lib +EXTRA_PKG_CONFIG_DIRS = $(prefix)/X11/lib + +CONFIGURE_ARGS = $(DIRPATHS) +CONFIGURE_ARGS += --enable-dynamic +CONFIGURE_ARGS += --x-includes=$(prefix)/X11/include +CONFIGURE_ARGS += --x-libraries=$(prefix)/X11/lib + include gar/category.mk + +pre-configure-$(MODULATION): + @(echo "~~~ Removing bundled jpeglib ~~~") + @rm -rf $(WORKSRC)/jpeg +# @rm -rf $(WORKSRC)/jasper Modified: csw/mgar/pkg/ghostscript/trunk/checksums =================================================================== --- csw/mgar/pkg/ghostscript/trunk/checksums 2010-01-09 04:43:32 UTC (rev 7922) +++ csw/mgar/pkg/ghostscript/trunk/checksums 2010-01-09 05:36:44 UTC (rev 7923) @@ -1 +1,3 @@ +5ebe8476ccc2170e4f2d620fe284f875 0002-Rearrange-compiler-flags.patch +5c142b23f91c2b2f48ba1f354e26346f 0003-Change-gcc-flags-to-sun.patch 526366f8cb4fda0d3d293597cc5b984b ghostscript-8.70.tar.bz2 Added: csw/mgar/pkg/ghostscript/trunk/files/0001-Support-libjpeg7.patch =================================================================== --- csw/mgar/pkg/ghostscript/trunk/files/0001-Support-libjpeg7.patch (rev 0) +++ csw/mgar/pkg/ghostscript/trunk/files/0001-Support-libjpeg7.patch 2010-01-09 05:36:44 UTC (rev 7923) @@ -0,0 +1,14 @@ +--- ghostscript-8.70.orig/jpeg/jcinit.c 2010-01-09 03:15:02.698411311 +0100 ++++ ghostscript-8.70/jpeg/jcinit.c 2010-01-09 03:46:28.021317069 +0100 +@@ -42,7 +42,11 @@ + jinit_forward_dct(cinfo); + /* Entropy encoding: either Huffman or arithmetic coding. */ + if (cinfo->arith_code) { ++#ifdef JERR_ARITH_NOTIMPL + ERREXIT(cinfo, JERR_ARITH_NOTIMPL); ++#else ++ jinit_arith_encoder(cinfo); ++#endif + } else { + if (cinfo->progressive_mode) { + #ifdef C_PROGRESSIVE_SUPPORTED Added: csw/mgar/pkg/ghostscript/trunk/files/0002-Rearrange-compiler-flags.patch =================================================================== --- csw/mgar/pkg/ghostscript/trunk/files/0002-Rearrange-compiler-flags.patch (rev 0) +++ csw/mgar/pkg/ghostscript/trunk/files/0002-Rearrange-compiler-flags.patch 2010-01-09 05:36:44 UTC (rev 7923) @@ -0,0 +1,23 @@ +--- ghostscript-8.70.orig/base/jasper.mak 2008-04-11 00:08:20.000000000 +0200 ++++ ghostscript-8.70/base/jasper.mak 2010-01-09 06:04:15.251525415 +0100 +@@ -159,7 +159,8 @@ + $(D_)EXCLUDE_PNG_SUPPORT$(_D_)1$(_D) + + # define our specific compiler +-JAS_CC=$(CC_) $(I_)$(JASGEN) $(II)$(JPXI_)$(_I) $(JPXCF_) $(JAS_EXCF_) ++#JAS_CC=$(CC_) $(I_)$(JASGEN) $(II)$(JPXI_)$(_I) $(JPXCF_) $(JAS_EXCF_) ++JAS_CC=$(CC) $(I_)$(JASGEN) $(II)$(JPXI_)$(_I) $(JPXCF_) $(JAS_EXCF_) $(CFLAGS) + JASO_=$(O_)$(JASOBJ) + + # switch in the selected .dev +--- ghostscript-8.70.orig/base/lib.mak 2009-07-22 23:09:42.000000000 +0200 ++++ ghostscript-8.70/base/lib.mak 2010-01-09 06:15:47.023956040 +0100 +@@ -30,7 +30,7 @@ + GLJCC=$(CC_) $(I_)$(GLI_) $(II)$(JI_)$(_I) $(JCF_) $(GLF_) + GLZCC=$(CC_) $(I_)$(GLI_) $(II)$(ZI_)$(_I) $(ZCF_) $(GLF_) + GLJBIG2CC=$(CC_) $(I_)$(GLI_) $(II)$(JB2I_)$(_I) $(JB2CF_) $(GLF_) +-GLJASCC=$(CC_) $(I_)$(JPXI_) $(II)$(GLI_)$(_I) $(JPXCF_) $(GLF_) ++GLJASCC=$(CC) $(I_)$(JPXI_) $(II)$(GLI_)$(_I) $(JPXCF_) $(GLF_) $(CFLAGS) + GLLDFJB2CC=$(CC_) $(I_)$(LDF_JB2I_) $(II)$(GLI_)$(_I) $(JB2CF_) $(GLF_) + GLLWFJPXCC=$(CC_) $(I_)$(LWF_JPXI_) $(II)$(GLI_)$(_I) $(JPXCF_) $(GLF_) + GLCCSHARED=$(CC_SHARED) $(GLCCFLAGS) Added: csw/mgar/pkg/ghostscript/trunk/files/0003-Change-gcc-flags-to-sun.patch =================================================================== --- csw/mgar/pkg/ghostscript/trunk/files/0003-Change-gcc-flags-to-sun.patch (rev 0) +++ csw/mgar/pkg/ghostscript/trunk/files/0003-Change-gcc-flags-to-sun.patch 2010-01-09 05:36:44 UTC (rev 7923) @@ -0,0 +1,24 @@ +--- /home/hson/tmp/ghostscript-8.70/base/devs.mak 2009-02-14 01:46:58.000000000 +0100 ++++ ghostscript-8.70/base/devs.mak 2010-01-09 06:42:04.053689304 +0100 +@@ -418,10 +418,10 @@ + ### NON PORTABLE, ONLY UNIX WITH GCC SUPPORT + + $(GLOBJ)lvga256.so : $(lvga256_) +- $(CCLD) $(LDFLAGS) -shared -o $(GLOBJ)lvga256.so $(lvga256_) -lvga -lvgagl ++ $(CCLD) $(LDFLAGS) -G -o $(GLOBJ)lvga256.so $(lvga256_) -lvga -lvgagl + + $(GLOBJ)vgalib.so : $(vgalib_) +- $(CCLD) $(LDFLAGS) -shared -o $(GLOBJ)vgalib.so $(vgalib_) -lvga -lvgagl ++ $(CCLD) $(LDFLAGS) -G -o $(GLOBJ)vgalib.so $(vgalib_) -lvga -lvgagl + + ### -------------------------- The X11 device -------------------------- ### + +@@ -524,7 +524,7 @@ + ### NON PORTABLE, ONLY UNIX WITH GCC SUPPORT + + $(GLOBJ)X11.so : $(x11alt_) $(x11_) +- $(CCLD) $(LDFLAGS) -shared -o $(GLOBJ)X11.so $(x11alt_) $(x11_) -L/usr/X11R6/lib -lXt -lSM -lICE -lXext -lX11 $(XLIBDIRS) ++ $(CCLD) $(LDFLAGS) -G -o $(GLOBJ)X11.so $(x11alt_) $(x11_) -L/usr/X11R6/lib -lXt -lSM -lICE -lXext -lX11 $(XLIBDIRS) + + ###### --------------- Memory-buffered printer devices --------------- ###### + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From chninkel at users.sourceforge.net Sat Jan 9 13:49:27 2010 From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net) Date: Sat, 09 Jan 2010 12:49:27 +0000 Subject: [csw-devel] SF.net SVN: gar:[7924] csw/mgar/pkg/rlwrap/trunk Message-ID: Revision: 7924 http://gar.svn.sourceforge.net/gar/?rev=7924&view=rev Author: chninkel Date: 2010-01-09 12:49:27 +0000 (Sat, 09 Jan 2010) Log Message: ----------- rlwrap: updated to 0.35 Modified Paths: -------------- csw/mgar/pkg/rlwrap/trunk/Makefile csw/mgar/pkg/rlwrap/trunk/checksums csw/mgar/pkg/rlwrap/trunk/files/changelog.CSW Modified: csw/mgar/pkg/rlwrap/trunk/Makefile =================================================================== --- csw/mgar/pkg/rlwrap/trunk/Makefile 2010-01-09 05:36:44 UTC (rev 7923) +++ csw/mgar/pkg/rlwrap/trunk/Makefile 2010-01-09 12:49:27 UTC (rev 7924) @@ -13,7 +13,7 @@ ###### Package information ####### GARNAME = rlwrap -GARVERSION = 0.34 +GARVERSION = 0.35 CATEGORIES = utils DESCRIPTION = A readline wrapper Modified: csw/mgar/pkg/rlwrap/trunk/checksums =================================================================== --- csw/mgar/pkg/rlwrap/trunk/checksums 2010-01-09 05:36:44 UTC (rev 7923) +++ csw/mgar/pkg/rlwrap/trunk/checksums 2010-01-09 12:49:27 UTC (rev 7924) @@ -1,2 +1,2 @@ -4fc3209edf432acc97c2457887e525e4 changelog.CSW -c0972f1803db4d45a047da6301ad1633 rlwrap-0.34.tar.gz +055ee01142d68026506ec4cd991d65b4 changelog.CSW +d9459defe4dbfb191d9332386141952d rlwrap-0.35.tar.gz Modified: csw/mgar/pkg/rlwrap/trunk/files/changelog.CSW =================================================================== --- csw/mgar/pkg/rlwrap/trunk/files/changelog.CSW 2010-01-09 05:36:44 UTC (rev 7923) +++ csw/mgar/pkg/rlwrap/trunk/files/changelog.CSW 2010-01-09 12:49:27 UTC (rev 7924) @@ -1,3 +1,9 @@ +rlwrap (0.35,REV=2010.01.09) unstable + + * New upstream release. + + -- Yann Rouillard Sat, 09 Jan 2010 13:48:33 +0100 + rlwrap (0.34,REV=2009.12.29) unstable * New upstream release. This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Sat Jan 9 15:02:07 2010 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Sat, 09 Jan 2010 14:02:07 +0000 Subject: [csw-devel] SF.net SVN: gar:[7925] csw/mgar/pkg/coreutils/trunk Message-ID: Revision: 7925 http://gar.svn.sourceforge.net/gar/?rev=7925&view=rev Author: bdwalton Date: 2010-01-09 14:02:03 +0000 (Sat, 09 Jan 2010) Log Message: ----------- coreutils: bump to 8.3 Modified Paths: -------------- csw/mgar/pkg/coreutils/trunk/Makefile csw/mgar/pkg/coreutils/trunk/checksums Modified: csw/mgar/pkg/coreutils/trunk/Makefile =================================================================== --- csw/mgar/pkg/coreutils/trunk/Makefile 2010-01-09 12:49:27 UTC (rev 7924) +++ csw/mgar/pkg/coreutils/trunk/Makefile 2010-01-09 14:02:03 UTC (rev 7925) @@ -1,5 +1,5 @@ GARNAME = coreutils -GARVERSION = 8.2 +GARVERSION = 8.3 CATEGORIES = utils # seq has issues related to the handling of long double's with -O2. Modified: csw/mgar/pkg/coreutils/trunk/checksums =================================================================== --- csw/mgar/pkg/coreutils/trunk/checksums 2010-01-09 12:49:27 UTC (rev 7924) +++ csw/mgar/pkg/coreutils/trunk/checksums 2010-01-09 14:02:03 UTC (rev 7925) @@ -1,3 +1,2 @@ 0fde2b11f34c49995765566acf6cd5b4 0001-Fix-solaris-acl-support-breakage.patch -acbd08eef41092a7b348d03206dad625 0002-Add-lintl-to-xalloc-die-LDADD-flags.patch -dfb0d3dbc5f555386339f4f74621cda0 coreutils-8.2.tar.gz +3961aee7ac96434a1831580e0b7ad227 coreutils-8.3.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Sat Jan 9 16:03:59 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sat, 09 Jan 2010 15:03:59 +0000 Subject: [csw-devel] SF.net SVN: gar:[7926] csw/mgar/pkg/glib2/trunk Message-ID: Revision: 7926 http://gar.svn.sourceforge.net/gar/?rev=7926&view=rev Author: wahwah Date: 2010-01-09 15:03:58 +0000 (Sat, 09 Jan 2010) Log Message: ----------- glib2: Version bump to 2.23.1, unfortunately at least one test fails Modified Paths: -------------- csw/mgar/pkg/glib2/trunk/Makefile csw/mgar/pkg/glib2/trunk/checksums Added Paths: ----------- csw/mgar/pkg/glib2/trunk/files/CMSG_LEN.patch csw/mgar/pkg/glib2/trunk/files/FIXED_STR.patch csw/mgar/pkg/glib2/trunk/files/gconverter.patch Removed Paths: ------------- csw/mgar/pkg/glib2/trunk/files/checksum-test.patch Modified: csw/mgar/pkg/glib2/trunk/Makefile =================================================================== --- csw/mgar/pkg/glib2/trunk/Makefile 2010-01-09 14:02:03 UTC (rev 7925) +++ csw/mgar/pkg/glib2/trunk/Makefile 2010-01-09 15:03:58 UTC (rev 7926) @@ -1,5 +1,5 @@ GARNAME = glib -GARVERSION = 2.20.0 +GARVERSION = 2.23.1 CATEGORIES = lib DESCRIPTION = The GLib library of C routines. @@ -20,8 +20,10 @@ DISTFILES = $(GARNAME)-$(GARVERSION).tar.bz2 PATCHFILES = glib-typedetect.patch -PATCHFILES += checksum-test.patch +PATCHFILES += FIXED_STR.patch PATCHFILES += gsize.patch +PATCHFILES += gconverter.patch +PATCHFILES += CMSG_LEN.patch CONFIGURE_ARGS = $(DIRPATHS) CONFIGURE_ARGS += --with-libiconv=gnu @@ -32,10 +34,18 @@ BUILD64 = 1 NO_ISAEXEC = 1 -REQUIRED_PKGS_CSWglib2 = CSWggettextrt CSWiconv -REQUIRED_PKGS_CSWglib2devel = CSWglib2 CSWggettextrt CSWiconv +REQUIRED_PKGS_CSWglib2 += CSWggettextrt +REQUIRED_PKGS_CSWglib2 += CSWiconv +REQUIRED_PKGS_CSWglib2 += CSWzlib +REQUIRED_PKGS_CSWglib2devel += CSWfam +REQUIRED_PKGS_CSWglib2devel += CSWggettextrt +REQUIRED_PKGS_CSWglib2devel += CSWglib2 +REQUIRED_PKGS_CSWglib2devel += CSWiconv +REQUIRED_PKGS_CSWglib2devel += CSWpython +REQUIRED_PKGS_CSWglib2devel += CSWzlib TEST_TARGET = check +SKIPTEST ?= 0 #provided by iconv MERGE_EXCLUDE_FILES = .*/charset.alias @@ -43,4 +53,6 @@ PKGFILES_CSWglib2 = $(PKGFILES_RT) PKGFILES_CSWglib2 += /opt/csw/share/locale/.* +EXTRA_LDFLAGS = -lsocket + include gar/category.mk Modified: csw/mgar/pkg/glib2/trunk/checksums =================================================================== --- csw/mgar/pkg/glib2/trunk/checksums 2010-01-09 14:02:03 UTC (rev 7925) +++ csw/mgar/pkg/glib2/trunk/checksums 2010-01-09 15:03:58 UTC (rev 7926) @@ -1,4 +1,6 @@ -05188e560dbd8bddd568e24ce10dd003 download/glib-2.20.0.tar.bz2 -8f683820d9ecab1abd9dbe81997ab9eb download/glib-typedetect.patch -f1f3c182f64be06ab57d8b01016af074 download/checksum-test.patch -bb2fb8eef43c995fea6c08563487ace6 download/gsize.patch +9f66027a275eb34d80a68ec8927bf66e CMSG_LEN.patch +f1f3c182f64be06ab57d8b01016af074 FIXED_STR.patch +ed4a6616a70705b56babe709787431d4 gconverter.patch +fb637f6122690254097d0b6d470f6ed3 glib-2.23.1.tar.bz2 +8f683820d9ecab1abd9dbe81997ab9eb glib-typedetect.patch +bb2fb8eef43c995fea6c08563487ace6 gsize.patch Added: csw/mgar/pkg/glib2/trunk/files/CMSG_LEN.patch =================================================================== --- csw/mgar/pkg/glib2/trunk/files/CMSG_LEN.patch (rev 0) +++ csw/mgar/pkg/glib2/trunk/files/CMSG_LEN.patch 2010-01-09 15:03:58 UTC (rev 7926) @@ -0,0 +1,25 @@ +--- glib-2.23.1/gio/gio.h.orig 2010-01-09 15:33:51.097448405 +0100 ++++ glib-2.23.1/gio/gio.h 2010-01-09 15:34:37.201482946 +0100 +@@ -97,6 +97,22 @@ + #include + #include + ++#ifndef CMSG_ALIGN ++# ifdef __sun__ ++# define CMSG_ALIGN _CMSG_DATA_ALIGN ++# else ++# define CMSG_ALIGN(len) (((len)+sizeof(long)-1) & ~(sizeof(long)-1)) ++# endif ++#endif ++ ++#ifndef CMSG_SPACE ++# define CMSG_SPACE(len) (CMSG_ALIGN(sizeof(struct cmsghdr))+CMSG_ALIGN(len)) ++#endif ++ ++#ifndef CMSG_LEN ++# define CMSG_LEN(len) (CMSG_ALIGN(sizeof(struct cmsghdr))+(len)) ++#endif ++ + #undef __GIO_GIO_H_INSIDE__ + + #endif /* __G_IO_H__ */ Copied: csw/mgar/pkg/glib2/trunk/files/FIXED_STR.patch (from rev 7923, csw/mgar/pkg/glib2/trunk/files/checksum-test.patch) =================================================================== --- csw/mgar/pkg/glib2/trunk/files/FIXED_STR.patch (rev 0) +++ csw/mgar/pkg/glib2/trunk/files/FIXED_STR.patch 2010-01-09 15:03:58 UTC (rev 7926) @@ -0,0 +1,11 @@ +--- glib-2.18.4/tests/checksum-test.c.o 2009-02-04 19:53:27.782844898 -0600 ++++ glib-2.18.4/tests/checksum-test.c 2009-02-04 21:22:05.475677071 -0600 +@@ -18,7 +18,7 @@ + * string is intentionally more than twice that length. + */ + +-#define FIXED_STR "The quick brown fox jumps over the lazy dog. Jackdaws love my big sphinx of quartz. Pack my box with five dozen liquor jugs. How razorback-jumping frogs can level six piqued gymnasts!" ++const char FIXED_STR[] = {"The quick brown fox jumps over the lazy dog. Jackdaws love my big sphinx of quartz. Pack my box with five dozen liquor jugs. How razorback-jumping frogs can level six piqued gymnasts!"}; + #define FIXED_LEN (strlen (FIXED_STR)) + + const char *MD5_sums[] = { Deleted: csw/mgar/pkg/glib2/trunk/files/checksum-test.patch =================================================================== --- csw/mgar/pkg/glib2/trunk/files/checksum-test.patch 2010-01-09 14:02:03 UTC (rev 7925) +++ csw/mgar/pkg/glib2/trunk/files/checksum-test.patch 2010-01-09 15:03:58 UTC (rev 7926) @@ -1,11 +0,0 @@ ---- glib-2.18.4/tests/checksum-test.c.o 2009-02-04 19:53:27.782844898 -0600 -+++ glib-2.18.4/tests/checksum-test.c 2009-02-04 21:22:05.475677071 -0600 -@@ -18,7 +18,7 @@ - * string is intentionally more than twice that length. - */ - --#define FIXED_STR "The quick brown fox jumps over the lazy dog. Jackdaws love my big sphinx of quartz. Pack my box with five dozen liquor jugs. How razorback-jumping frogs can level six piqued gymnasts!" -+const char FIXED_STR[] = {"The quick brown fox jumps over the lazy dog. Jackdaws love my big sphinx of quartz. Pack my box with five dozen liquor jugs. How razorback-jumping frogs can level six piqued gymnasts!"}; - #define FIXED_LEN (strlen (FIXED_STR)) - - const char *MD5_sums[] = { Added: csw/mgar/pkg/glib2/trunk/files/gconverter.patch =================================================================== --- csw/mgar/pkg/glib2/trunk/files/gconverter.patch (rev 0) +++ csw/mgar/pkg/glib2/trunk/files/gconverter.patch 2010-01-09 15:03:58 UTC (rev 7926) @@ -0,0 +1,11 @@ +--- glib-2.23.1/gio/gconverter.c.orig 2010-01-09 14:52:05.980181068 +0100 ++++ glib-2.23.1/gio/gconverter.c 2010-01-09 14:52:36.590266103 +0100 +@@ -227,7 +227,7 @@ + + iface = G_CONVERTER_GET_IFACE (converter); + +- return (* iface->reset) (converter); ++ /* return (* iface->reset) (converter); */ + } + + #define __G_CONVERTER_C__ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From hson at users.sourceforge.net Sat Jan 9 18:03:46 2010 From: hson at users.sourceforge.net (hson at users.sourceforge.net) Date: Sat, 09 Jan 2010 17:03:46 +0000 Subject: [csw-devel] SF.net SVN: gar:[7927] csw/mgar/pkg/libcairo/trunk/Makefile Message-ID: Revision: 7927 http://gar.svn.sourceforge.net/gar/?rev=7927&view=rev Author: hson Date: 2010-01-09 17:03:45 +0000 (Sat, 09 Jan 2010) Log Message: ----------- libcairo: Fixes to get rid of dependency on /usr/openwin/lib/libX11.so.4 Modified Paths: -------------- csw/mgar/pkg/libcairo/trunk/Makefile Modified: csw/mgar/pkg/libcairo/trunk/Makefile =================================================================== --- csw/mgar/pkg/libcairo/trunk/Makefile 2010-01-09 15:03:58 UTC (rev 7926) +++ csw/mgar/pkg/libcairo/trunk/Makefile 2010-01-09 17:03:45 UTC (rev 7927) @@ -28,7 +28,7 @@ PKGFILES_CSWlibcairodoc = $(sharedstatedir)/gtk-doc.* PKGFILES_CSWlibcairodoc += $(docdir)/libcairo_doc/.* -PREREQUISITE_PKGS = CSWrenderdev +PREREQUISITE_PKGS = CSWlibxrenderdevel REQUIRED_PKGS_CSWlibcairo = CSWfconfig REQUIRED_PKGS_CSWlibcairo += CSWftype2 @@ -52,10 +52,20 @@ EXTRA_INC = $(prefix)/X11/include EXTRA_LIB = $(prefix)/X11/lib EXTRA_PKG_CONFIG_DIRS = $(prefix)/X11/lib +# We want libcairo to be linked with Xrender from $(prefix)/X11/lib not +# $(prefix)/lib since the latter is linked to /usr/openwin/lib/libX11.so.4 +EXTRA_SOS_LD_FLAGS = -L$(abspath $(prefix)/X11/lib/$(MM_LIBDIR)) +# imagediff in testsuite needs -lsocket +EXTRA_LDFLAGS = -lsocket -lnsl CONFIGURE_ARGS = $(DIRPATHS) CONFIGURE_ARGS += --disable-full-testing --enable-xlib=yes --enable-xlib-xrender=yes --enable-ft=yes --with-x CONFIGURE_ARGS += --enable-png=yes --enable-ps=yes --enable-pdf=yes --enable-svg=yes --enable-xcb=yes CONFIGURE_ARGS += --enable-gtk-doc --enable-test-surfaces=yes +CONFIGURE_ARGS += --x-includes=$(prefix)/X11/include +CONFIGURE_ARGS += --x-libraries=$(abspath $(prefix)/X11/lib/$(MM_LIBDIR)) include gar/category.mk + +# configure have problems with non-gnu utilities +PATH := /opt/csw/gnu:$(PATH) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From hson at users.sourceforge.net Sat Jan 9 18:33:54 2010 From: hson at users.sourceforge.net (hson at users.sourceforge.net) Date: Sat, 09 Jan 2010 17:33:54 +0000 Subject: [csw-devel] SF.net SVN: gar:[7928] csw/mgar/pkg/wmf/trunk/Makefile Message-ID: Revision: 7928 http://gar.svn.sourceforge.net/gar/?rev=7928&view=rev Author: hson Date: 2010-01-09 17:33:54 +0000 (Sat, 09 Jan 2010) Log Message: ----------- wmf: Split package, add 64-bit build Modified Paths: -------------- csw/mgar/pkg/wmf/trunk/Makefile Modified: csw/mgar/pkg/wmf/trunk/Makefile =================================================================== --- csw/mgar/pkg/wmf/trunk/Makefile 2010-01-09 17:03:45 UTC (rev 7927) +++ csw/mgar/pkg/wmf/trunk/Makefile 2010-01-09 17:33:54 UTC (rev 7928) @@ -13,16 +13,35 @@ SF_PROJ = wvware MASTER_SITES = $(SF_MIRRORS) DISTFILES = libwmf-$(GARVERSION).tar.gz - DISTNAME = libwmf-$(GARVERSION) SPKG_SOURCEURL = http://wvware.sourceforge.net -LICENSE = COPYING +PACKAGES = CSWwmf CSWwmfdevel CSWwmfdoc +CATALOGNAME_CSWwmf = wmf +CATALOGNAME_CSWwmfdevel = wmf_devel +CATALOGNAME_CSWwmfdoc = wmf_doc -REQUIRED_PKGS += CSWexpat CSWftype2 CSWggettextrt CSWglib2 CSWgtk2 CSWjpeg -REQUIRED_PKGS += CSWpng CSWzlib +SPKG_DESC_CSWwmf += Library and tools for manipulating Windows metafiles +SPKG_DESC_CSWwmfdevel += Library and tools for manipulating Windows metafiles - developer package +SPKG_DESC_CSWwmfdoc += Library and tools for manipulating Windows metafiles - documentation +REQUIRED_PKGS_CSWwmf += CSWexpat CSWftype2 CSWggettextrt CSWglib2 CSWgtk2 +REQUIRED_PKGS_CSWwmf += CSWjpeg CSWlibx11 CSWpng CSWzlib +REQUIRED_PKGS_CSWwmfdevel += CSWwmf +REQUIRED_PKGS_CSWwmfdoc += CSWwmf + +PKGFILES_CSWwmfdevel = $(PKGFILES_DEVEL) +PKGFILES_CSWwmfdoc = $(sharedstatedir)/doc/.* + +ARCHALL_CSWwmfdoc = 1 + +BUILD64 = 1 + +EXTRA_INC = $(prefix)/X11/include +EXTRA_LIB = $(prefix)/X11/lib +EXTRA_PKG_CONFIG_DIRS = $(prefix)/X11/lib + # We define upstream file regex so we can be notifed of new upstream software release UPSTREAM_MASTER_SITES = $(SF_PROJECT_SHOWFILE)=10501 UPSTREAM_USE_SF = 1 @@ -32,9 +51,7 @@ TEST_TARGET = check +STRIP_LIBTOOL = 1 + include gar/category.mk - -post-configure-modulated: - @(echo "~~~ Fixing Libtool ~~~") - @$(FILEDIR)/fixme.sh $(WORKSRC) - $(DONADA) +PATH := /opt/csw/gnu:$(PATH) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From skayser at users.sourceforge.net Sat Jan 9 19:05:43 2010 From: skayser at users.sourceforge.net (skayser at users.sourceforge.net) Date: Sat, 09 Jan 2010 18:05:43 +0000 Subject: [csw-devel] SF.net SVN: gar:[7929] csw/mgar/pkg/dante/trunk Message-ID: Revision: 7929 http://gar.svn.sourceforge.net/gar/?rev=7929&view=rev Author: skayser Date: 2010-01-09 18:05:41 +0000 (Sat, 09 Jan 2010) Log Message: ----------- dante: bump to 1.2.0, some remaining TODOs Modified Paths: -------------- csw/mgar/pkg/dante/trunk/Makefile csw/mgar/pkg/dante/trunk/checksums csw/mgar/pkg/dante/trunk/files/CSWdante.cswdante csw/mgar/pkg/dante/trunk/files/README.CSW csw/mgar/pkg/dante/trunk/files/changelog.CSW Removed Paths: ------------- csw/mgar/pkg/dante/trunk/files/man-conflocations.diff Modified: csw/mgar/pkg/dante/trunk/Makefile =================================================================== --- csw/mgar/pkg/dante/trunk/Makefile 2010-01-09 17:33:54 UTC (rev 7928) +++ csw/mgar/pkg/dante/trunk/Makefile 2010-01-09 18:05:41 UTC (rev 7929) @@ -1,7 +1,12 @@ -# Todo -# * Ponder about the SOCKS_CONF / issetguid() issue +# Known issue: +# - The libsocks build doesn't support $SOCKS_CONF. See README.CSW +# and INSTALL with its description of `--without-glibc-secure'. +# +# Todo: +# - Look into kerberos linking issues +# - Test sockd and its init script GARNAME = dante -GARVERSION = 1.1.19 +GARVERSION = 1.2.0 CATEGORIES = net DESCRIPTION = Dante SOCKS packages @@ -16,76 +21,62 @@ the server administrator. endef -MASTER_SITES = ftp://ftp.inet.no/pub/socks/ -MASTER_SITES += ftp://ftp.inet.no/pub/socks/old/ -DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz SPKG_SOURCEURL = http://www.inet.no/dante/ +MASTER_SITES = ftp://ftp.inet.no/pub/socks/ +MASTER_SITES += ftp://ftp.inet.no/pub/socks/old/ +DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + LICENSE = LICENSE PACKAGES = CSWlibsocks CSWdante SPKG_DESC_CSWlibsocks = Dante SOCKS runtime libraries (and socksify wrapper) SPKG_DESC_CSWdante = Dante SOCKS (v4 and v5) proxy daemon -SPKG_CLASSES_CSWdante = none cswinitsmf -# There is no pkg compiling against dante right now, just drop the .h file -EXTRA_MERGE_EXCLUDE_FILES = $(includedir)/socks.h +# There is no pkg compiling against dante right now, just drop the dev files +EXTRA_MERGE_EXCLUDE_FILES = $(includedir)/.* -PKGFILES_CSWlibsocks = $(PKGFILES_RT) .*socks.* +PKGFILES_CSWlibsocks = $(PKGFILES_RT) .*socks.* PKGFILES_CSWlibsocks += $(docdir)/libsocks/.* -PKGFILES_CSWdante = .*sockd.* /etc/opt/csw/init.d/cswdante -PKGFILES_CSWdante += $(docdir)/dante/.* +PKGFILES_CSWdante = .*sockd.* /etc/opt/csw/init.d/cswdante +PKGFILES_CSWdante += $(docdir)/dante/.* -REQUIRED_PKGS_CSWdante = CSWlibsocks CSWcswclassutils CSWtcpwrap +REQUIRED_PKGS_CSWdante = CSWtcpwrap -# CSWlibsocks not yet installed on the build farm -ENABLE_CHECK = 0 +TEST_SCRIPTS = -# We define upstream file regex so we can be notifed of new upstream software release -UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz +sysconfdir = /etc/opt/csw +localstatedir = /var/opt/csw -# Make the man pages reference our CSW locations instead of /etc/*.conf -PATCHFILES = man-conflocations.diff +# Don't bother about the "not found" modules after the ./configure run, +# they are commercial add-ons (http://www.inet.no/dante/module.html). +# +# Features disabled via --without will be also stated as "not found" +# in the summary messages that ./configure displays at the end -TEST_SCRIPTS = - CONFIGURE_ARGS = $(DIRPATHS) CONFIGURE_ARGS += --with-socks-conf=$(sysconfdir)/socks.conf CONFIGURE_ARGS += --with-sockd-conf=$(sysconfdir)/sockd.conf -CONFIGURE_ARGS += --with-pidfile=/var/opt/csw/dante/sockd.pid +CONFIGURE_ARGS += --with-pidfile=/var/run/cswsockd.pid +CONFIGURE_ARGS += --without-glibc-secure -# Don't bother about the "not found" modules after the ./configure run, -# they are commercial add-ons (http://www.inet.no/dante/module.html). +# Kerberos linking fails .. looks like it is missing -L/opt/csw/lib. +# Needs investigation. +CONFIGURE_ARGS += --without-gssapi -PROTOTYPE_FILTER = awk '\ - $$$$3 ~ /\/init.d\/cswdante$$$$/ { $$$$2 = "cswinitsmf" } \ - { print }' +# UPNP support requires miniupnp from http://miniupnp.free.fr/ +CONFIGURE_ARGS += --without-upnp -include gar/category.mk -# The SOCKS_CONF and issetugid() issue needs some thought. Are there any -# secure alternative to the simple get{ug}id below? Could ask upstream. -# -# Fix missing issetugid on Solaris 8, it is not nice, but the best i can -# come up with for now, ref. -# http://bugs.gentoo.org/attachment.cgi?id=180390 -# issetugid(2) on a Solaris 10 box (WRT to concerns) -# -# If at all this needs to be revamped into a patch for libscompat/issetugid.c -#post-extract-modulated: -# @perl -pi -e '\ -# s/int issetugid __P\(\(void\)\)/#define issetugid() (getuid() != geteuid()) || (getgid() != getegid())/' \ -# $(WORKSRC)/include/common.h -# @$(MAKECOOKIE) +INITSMF = /etc/opt/csw/init\.d/cswdante +include gar/category.mk post-configure-modulated: - # Get rid of -misalign which is meant for /usr/ucb/cc - @perl -pi -e 's|-misalign || if /^CFLAGS =/' $(WORKSRC)/*/Makefile ifneq ($(GARFLAVOR),DBG) - # Get rid of -g. - # configure wants to use -g even if --disable-debugging (default) - @perl -pi -e 's#-(g|xs|xO0) ##g if /^CFLAGS =/' $(WORKSRC)/*/Makefile + # Get rid of debugging flags which ./configure determines per default + perl -pi -e 's#-(g|xs|xO0) ##g if /^CFLAGS =/' $(WORKSRC)/*/Makefile endif @$(MAKECOOKIE) @@ -93,10 +84,10 @@ post-install-libsocks: DOCS = CREDITS NEWS SUPPORT post-install-libsocks: CSWDOCS = README.CSW changelog.CSW post-install-libsocks: - @ginstall -d $(DOCDEST)/examples - @cp $(WORKSRC)/example/socks*.conf $(DOCDEST)/examples - @$(foreach D,$(DOCS), cp $(WORKSRC)/$(D) $(DOCDEST);) - @$(foreach D,$(CSWDOCS), cp $(FILEDIR)/$(D) $(DOCDEST);) + ginstall -d $(DOCDEST)/examples + cp $(WORKSRC)/example/socks*.conf $(DOCDEST)/examples + cp $(addprefix $(WORKSRC)/,$(DOCS)) $(DOCDEST) + cp $(addprefix $(FILEDIR)/,$(CSWDOCS)) $(DOCDEST) @$(MAKECOOKIE) @@ -104,17 +95,27 @@ post-install-dante: DOCS = CREDITS NEWS SUPPORT post-install-dante: CSWDOCS = changelog.CSW post-install-dante: - @ginstall -d $(DESTDIR)/var/opt/csw/dante - @ginstall -d $(DOCDEST)/examples - @cp $(WORKSRC)/example/sockd*.conf $(DOCDEST)/examples - @$(foreach D,$(DOCS), cp $(WORKSRC)/$(D) $(DOCDEST);) - @$(foreach D,$(CSWDOCS), cp $(FILEDIR)/$(D) $(DOCDEST);) + ginstall -d $(DESTDIR)/var/opt/csw/dante + ginstall -d $(DOCDEST)/examples + cp $(WORKSRC)/example/sockd*.conf $(DOCDEST)/examples + cp $(addprefix $(WORKSRC)/,$(DOCS)) $(DOCDEST) + cp $(addprefix $(FILEDIR)/,$(CSWDOCS)) $(DOCDEST) - @ginstall -d $(DESTDIR)/etc/opt/csw/init.d - @ginstall -m 0755 $(FILEDIR)/CSWdante.cswdante \ + ginstall -d $(DESTDIR)/etc/opt/csw/init.d + ginstall -m 0755 $(FILEDIR)/CSWdante.cswdante \ $(DESTDIR)/etc/opt/csw/init.d/cswdante @$(MAKECOOKIE) +# Make the man pages reference our CSW locations instead of /etc/*.conf +fix-manpages: + gsed -i \ + -e 's,/etc/socks.conf,$(sysconfdir)/socks.conf,' \ + -e 's,/etc/sockd.conf,$(sysconfdir)/sockd.conf,' \ + $(DESTDIR)$(mandir)/man1/socksify.1 \ + $(DESTDIR)$(mandir)/man5/socks.conf.5 \ + $(DESTDIR)$(mandir)/man5/sockd.conf.5 \ + $(DESTDIR)$(mandir)/man8/sockd.8 + @$(MAKECOOKIE) -post-install-modulated: post-install-libsocks post-install-dante +post-install-modulated: post-install-libsocks post-install-dante fix-manpages @$(MAKECOOKIE) Modified: csw/mgar/pkg/dante/trunk/checksums =================================================================== --- csw/mgar/pkg/dante/trunk/checksums 2010-01-09 17:33:54 UTC (rev 7928) +++ csw/mgar/pkg/dante/trunk/checksums 2010-01-09 18:05:41 UTC (rev 7929) @@ -1,2 +1,2 @@ -58b56d1e964f3f0186f3eeed3d95d9a4 download/dante-1.1.19.tar.gz -a38ad03fa8cc40b0ee527cb15e41fa9c download/man-conflocations.diff +af00063243cc94e524497342982615cd dante-1.2.0.tar.gz +a38ad03fa8cc40b0ee527cb15e41fa9c man-conflocations.diff Modified: csw/mgar/pkg/dante/trunk/files/CSWdante.cswdante =================================================================== --- csw/mgar/pkg/dante/trunk/files/CSWdante.cswdante 2010-01-09 17:33:54 UTC (rev 7928) +++ csw/mgar/pkg/dante/trunk/files/CSWdante.cswdante 2010-01-09 18:05:41 UTC (rev 7929) @@ -5,12 +5,9 @@ PATH=/usr/bin:/opt/csw/bin:/usr/sbin -PIDFILE=/var/opt/csw/dante/sockd.pid -CONFIG=/opt/csw/etc/sockd.conf -CONFIG_LOCAL=/etc/opt/csw/etc/sockd.conf +PIDFILE=/var/run/cswsockd.pid +CONFIG=/etc/opt/csw/etc/sockd.conf -[ -r $CONFIG_LOCAL ] && CONFIG=$CONFIG_LOCAL - case $1 in 'start') printf "Starting SOCKS proxy: cswdante ... " Modified: csw/mgar/pkg/dante/trunk/files/README.CSW =================================================================== --- csw/mgar/pkg/dante/trunk/files/README.CSW 2010-01-09 17:33:54 UTC (rev 7928) +++ csw/mgar/pkg/dante/trunk/files/README.CSW 2010-01-09 18:05:41 UTC (rev 7929) @@ -1,12 +1,16 @@ -Known client issue: $SOCKS_CONF not used ----------------------------------------- +Known issue: libsocks does not support $SOCKS_CONF +-------------------------------------------------- -The Dante socks client libraries are supposed to evaluate the environment -variable $SOCKS_CONF that can be used to specify an alternative config -location. This is _not working_ with this version. +This build of the libsocks _does not_ support an alternate socks.conf +passed via the environment variable SOCKS_CONF. As a workaround you can +specify a SOCKS server via the environment variables pointed out in +socksify(1). -Dante employs SETUID/SETGID safety checks before evaluating $SOCKS_CONF -and Solaris 8 (our base build platform) does not offer the required system -calls. Dante hence deactivates looking for $SOCK_CONF. + SOCKS_SERVER, SOCKS4_SERVER, SOCKS5_SERVER -This might change in a future version of this package or Dante. +Background information: +libsocks employs a setuid/setgid safety check via issetugid(2) before +opening $SOCKS_CONF. Our base build platform (Solaris 8) does not offer +this system call, thus the libsocks build completely deactivates support +for $SOCK_CONF out of security reasons. This might change if we decide +to provide a Solaris 10 specific package of libsocks. Modified: csw/mgar/pkg/dante/trunk/files/changelog.CSW =================================================================== --- csw/mgar/pkg/dante/trunk/files/changelog.CSW 2010-01-09 17:33:54 UTC (rev 7928) +++ csw/mgar/pkg/dante/trunk/files/changelog.CSW 2010-01-09 18:05:41 UTC (rev 7929) @@ -1,5 +1,5 @@ -dante|libsocks (1.1.19,REV=2009.06.05) +dante (1.2.0,REV=2010.01.09) - * Adopted and updated to 1.1.19. + * Adopted and updated to 1.2.0 - -- Sebastian Kayser Fri, 5 Jun 2009 00:02:09 +0200 + -- Sebastian Kayser Sat, 9 Jan 2010 19:18:23 +0100 Deleted: csw/mgar/pkg/dante/trunk/files/man-conflocations.diff =================================================================== --- csw/mgar/pkg/dante/trunk/files/man-conflocations.diff 2010-01-09 17:33:54 UTC (rev 7928) +++ csw/mgar/pkg/dante/trunk/files/man-conflocations.diff 2010-01-09 18:05:41 UTC (rev 7929) @@ -1,40 +0,0 @@ -diff --speed-large-files --minimal -Nru dante-1.1.19.orig/doc/sockd.8 dante-1.1.19/doc/sockd.8 ---- dante-1.1.19.orig/doc/sockd.8 2005-01-24 11:24:20.000000000 +0100 -+++ dante-1.1.19/doc/sockd.8 2009-06-10 13:28:07.589216602 +0200 -@@ -112,7 +112,8 @@ - be set to a (local) filesystem with low latency. - .SH FILES - .TP --/etc/sockd.conf -+/opt/csw/etc/sockd.conf or /etc/opt/csw/sockd.conf -+.br - .B Dante - server configuration file. - .SH AUTHORS -diff --speed-large-files --minimal -Nru dante-1.1.19.orig/doc/sockd.conf.5 dante-1.1.19/doc/sockd.conf.5 ---- dante-1.1.19.orig/doc/sockd.conf.5 2006-01-20 14:13:55.000000000 +0100 -+++ dante-1.1.19/doc/sockd.conf.5 2009-06-10 13:27:47.748142347 +0200 -@@ -315,8 +315,9 @@ - See the example directory in the distribution. - .SH FILES - .nf --.ta \w 1 --/etc/sockd.conf \fBDante\fP server configuration file. -+/opt/csw/etc/sockd.conf or /etc/opt/csw/sockd.conf -+.br -+ \fBDante\fP server configuration file. - /etc/passwd file used when checking username/passwords. - .fi - .SH AUTHORS -diff --speed-large-files --minimal -Nru dante-1.1.19.orig/doc/socks.conf.5 dante-1.1.19/doc/socks.conf.5 ---- dante-1.1.19.orig/doc/socks.conf.5 2005-12-19 20:13:37.000000000 +0100 -+++ dante-1.1.19/doc/socks.conf.5 2009-06-10 13:23:37.252560424 +0200 -@@ -119,7 +119,7 @@ - authentication. Not recommended as other users on the system - might be able to see your password. - .SH FILES --.I /etc/socks.conf -+.I /opt/csw/etc/socks.conf - .SH AUTHORS - For Inferno Nettverk A/S, Norway: - Michael Shuldman : Design and implementation. This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From skayser at users.sourceforge.net Sat Jan 9 19:13:02 2010 From: skayser at users.sourceforge.net (skayser at users.sourceforge.net) Date: Sat, 09 Jan 2010 18:13:02 +0000 Subject: [csw-devel] SF.net SVN: gar:[7930] csw/mgar/pkg/screen/trunk Message-ID: Revision: 7930 http://gar.svn.sourceforge.net/gar/?rev=7930&view=rev Author: skayser Date: 2010-01-09 18:13:01 +0000 (Sat, 09 Jan 2010) Log Message: ----------- screen: NMU commit, bumped to 4.0.3, switched to GARv2 Modified Paths: -------------- csw/mgar/pkg/screen/trunk/Makefile csw/mgar/pkg/screen/trunk/checksums Removed Paths: ------------- csw/mgar/pkg/screen/trunk/files/CSWscrn.gspec csw/mgar/pkg/screen/trunk/files/CSWscrn.prototype Property Changed: ---------------- csw/mgar/pkg/screen/trunk/ Property changes on: csw/mgar/pkg/screen/trunk ___________________________________________________________________ Modified: svn:externals - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v1 + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 Modified: csw/mgar/pkg/screen/trunk/Makefile =================================================================== --- csw/mgar/pkg/screen/trunk/Makefile 2010-01-09 18:05:41 UTC (rev 7929) +++ csw/mgar/pkg/screen/trunk/Makefile 2010-01-09 18:13:01 UTC (rev 7930) @@ -1,5 +1,9 @@ +# TODO +# - This is a NMU (bumped to 4.0.3, switched to GAR v2) which fails to +# build. Yann needs to incorporate his current build script into this +# recipe once he is working on an updated version/revision. GARNAME = screen -GARVERSION = 4.0.1 +GARVERSION = 4.0.3 CATEGORIES = utils DESCRIPTION = A window manager that multiplexes a physical terminal. @@ -11,21 +15,20 @@ insert/delete line and support for multiple character sets). endef -MASTER_SITES = http://ftp.uni-erlangen.de/pub/utilities/screen/ - -# We define upstream file regex so we can be notifed of new upstream software release +VENDOR_URL = http://www.gnu.org/software/screen/ +MASTER_SITES = http://ftp.gnu.org/gnu/screen/ +DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz -DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz -DISTFILES += $(call admfiles,CSWscrn,prototype) +PACKAGES = CSWscrn +CATALOGNAME = screen -DISTFILES += changelog.CSW - -# this patch increases the maximum number of simultaneously allowed windows per screen session. +# this patch increases the maximum number of simultaneously allowed +# windows per screen session. PATCHFILES = screen-maxwin.patch -# patch used by the previous maintainer Derek Morr, I don't know exactly what it is supposed -# to do or fix but I keep it to no introduce any breakage +# patch used by the previous maintainer Derek Morr, I don't know exactly what +# it is supposed to do or fix but I keep it to no introduce any breakage PATCHFILES += screen-utmp.patch CONFIGURE_ARGS = $(DIRPATHS) @@ -36,3 +39,9 @@ TEST_TARGET = check include gar/category.mk + +post-install-modulated: DOCDEST=$(DESTDIR)$(docdir)/$(GARNAME) +post-install-modulated: + ginstall -d $(DOCDEST) + cp $(FILEDIR)/changelog.CSW $(DOCDEST) + @$(MAKECOOKIE) Modified: csw/mgar/pkg/screen/trunk/checksums =================================================================== --- csw/mgar/pkg/screen/trunk/checksums 2010-01-09 18:05:41 UTC (rev 7929) +++ csw/mgar/pkg/screen/trunk/checksums 2010-01-09 18:13:01 UTC (rev 7930) @@ -1,6 +1,3 @@ -8506fd205028a96c741e4037de6e3c42 download/screen-4.0.3.tar.gz -b983bef55fb5b056b178d7dff166b21f download/CSWscrn.gspec -c83f5d003bcacd6b2670e941664e7201 download/CSWscrn.prototype -a7026461bcda14338f2175ba958195cb download/changelog.CSW -ed83d7a9001fa159a367d699580c1dd2 download/screen-maxwin.patch -3f25f108225cea31321046da5b033f6a download/screen-utmp.patch +8506fd205028a96c741e4037de6e3c42 screen-4.0.3.tar.gz +ed83d7a9001fa159a367d699580c1dd2 screen-maxwin.patch +3f25f108225cea31321046da5b033f6a screen-utmp.patch Deleted: csw/mgar/pkg/screen/trunk/files/CSWscrn.gspec =================================================================== --- csw/mgar/pkg/screen/trunk/files/CSWscrn.gspec 2010-01-09 18:05:41 UTC (rev 7929) +++ csw/mgar/pkg/screen/trunk/files/CSWscrn.gspec 2010-01-09 18:13:01 UTC (rev 7930) @@ -1,4 +0,0 @@ -%var bitname screen -%var pkgname CSWscrn -%include url file://%{PKGLIB}/csw_dyndepend.gspec -%copyright url file://%{WORKSRC}/COPYING Deleted: csw/mgar/pkg/screen/trunk/files/CSWscrn.prototype =================================================================== --- csw/mgar/pkg/screen/trunk/files/CSWscrn.prototype 2010-01-09 18:05:41 UTC (rev 7929) +++ csw/mgar/pkg/screen/trunk/files/CSWscrn.prototype 2010-01-09 18:13:01 UTC (rev 7930) @@ -1,28 +0,0 @@ -s none /opt/csw/bin/screen=screen-4.0.3 -f none /opt/csw/bin/screen-4.0.3 0755 root bin -f none /opt/csw/share/info/screen.info 0644 root bin -f none /opt/csw/share/info/screen.info-1 0644 root bin -f none /opt/csw/share/info/screen.info-2 0644 root bin -f none /opt/csw/share/info/screen.info-3 0644 root bin -f none /opt/csw/share/info/screen.info-4 0644 root bin -f none /opt/csw/share/info/screen.info-5 0644 root bin -f none /opt/csw/share/man/man1/screen.1 0644 root bin -f none /opt/csw/share/screen/utf8encodings/01 0644 root bin -f none /opt/csw/share/screen/utf8encodings/02 0644 root bin -f none /opt/csw/share/screen/utf8encodings/03 0644 root bin -f none /opt/csw/share/screen/utf8encodings/04 0644 root bin -f none /opt/csw/share/screen/utf8encodings/18 0644 root bin -f none /opt/csw/share/screen/utf8encodings/19 0644 root bin -f none /opt/csw/share/screen/utf8encodings/a1 0644 root bin -f none /opt/csw/share/screen/utf8encodings/bf 0644 root bin -f none /opt/csw/share/screen/utf8encodings/c2 0644 root bin -f none /opt/csw/share/screen/utf8encodings/c3 0644 root bin -f none /opt/csw/share/screen/utf8encodings/c4 0644 root bin -f none /opt/csw/share/screen/utf8encodings/c6 0644 root bin -f none /opt/csw/share/screen/utf8encodings/c7 0644 root bin -f none /opt/csw/share/screen/utf8encodings/c8 0644 root bin -f none /opt/csw/share/screen/utf8encodings/cc 0644 root bin -f none /opt/csw/share/screen/utf8encodings/cd 0644 root bin -f none /opt/csw/share/screen/utf8encodings/d6 0644 root bin -d none /opt/csw/share/doc/screen 0755 root bin -f none /opt/csw/share/doc/screen/changelog.CSW=changelog.CSW 0644 root bin This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From chninkel at users.sourceforge.net Sun Jan 10 00:31:05 2010 From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net) Date: Sat, 09 Jan 2010 23:31:05 +0000 Subject: [csw-devel] SF.net SVN: gar:[7931] csw/mgar/pkg/screen/trunk Message-ID: Revision: 7931 http://gar.svn.sourceforge.net/gar/?rev=7931&view=rev Author: chninkel Date: 2010-01-09 23:31:05 +0000 (Sat, 09 Jan 2010) Log Message: ----------- screen: updated Makefile for garv2, added screenrc and changelog.CSW files Modified Paths: -------------- csw/mgar/pkg/screen/trunk/Makefile csw/mgar/pkg/screen/trunk/checksums Added Paths: ----------- csw/mgar/pkg/screen/trunk/files/screenrc Modified: csw/mgar/pkg/screen/trunk/Makefile =================================================================== --- csw/mgar/pkg/screen/trunk/Makefile 2010-01-09 18:13:01 UTC (rev 7930) +++ csw/mgar/pkg/screen/trunk/Makefile 2010-01-09 23:31:05 UTC (rev 7931) @@ -1,7 +1,3 @@ -# TODO -# - This is a NMU (bumped to 4.0.3, switched to GAR v2) which fails to -# build. Yann needs to incorporate his current build script into this -# recipe once he is working on an updated version/revision. GARNAME = screen GARVERSION = 4.0.3 CATEGORIES = utils @@ -20,6 +16,9 @@ DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz +DISTFILES += screenrc +DISTFILES += changelog.CSW + PACKAGES = CSWscrn CATALOGNAME = screen @@ -27,21 +26,21 @@ # windows per screen session. PATCHFILES = screen-maxwin.patch -# patch used by the previous maintainer Derek Morr, I don't know exactly what -# it is supposed to do or fix but I keep it to no introduce any breakage +# screen is not isntalled with setuid bit so we disable utmp update PATCHFILES += screen-utmp.patch CONFIGURE_ARGS = $(DIRPATHS) CONFIGURE_ARGS += --enable-pam CONFIGURE_ARGS += --enable-telnet CONFIGURE_ARGS += --enable-colors256 +CONFIGURE_ARGS += --sysconfdir=/etc/$(prefix)/ TEST_TARGET = check include gar/category.mk -post-install-modulated: DOCDEST=$(DESTDIR)$(docdir)/$(GARNAME) -post-install-modulated: - ginstall -d $(DOCDEST) - cp $(FILEDIR)/changelog.CSW $(DOCDEST) +post-merge: + ginstall -D $(WORKDIR_FIRSTMOD)/screenrc $(PKGROOT)/etc/$(prefix)/screenrc + ginstall -D $(WORKDIR_FIRSTMOD)/changelog.CSW $(PKGROOT)/$(docdir)/$(GARNAME)/changelog.CSW @$(MAKECOOKIE) + Modified: csw/mgar/pkg/screen/trunk/checksums =================================================================== --- csw/mgar/pkg/screen/trunk/checksums 2010-01-09 18:13:01 UTC (rev 7930) +++ csw/mgar/pkg/screen/trunk/checksums 2010-01-09 23:31:05 UTC (rev 7931) @@ -1,3 +1,5 @@ +a7026461bcda14338f2175ba958195cb changelog.CSW 8506fd205028a96c741e4037de6e3c42 screen-4.0.3.tar.gz ed83d7a9001fa159a367d699580c1dd2 screen-maxwin.patch 3f25f108225cea31321046da5b033f6a screen-utmp.patch +f6c675685f3cfa25a43a1827c264b3f0 screenrc Added: csw/mgar/pkg/screen/trunk/files/screenrc =================================================================== --- csw/mgar/pkg/screen/trunk/files/screenrc (rev 0) +++ csw/mgar/pkg/screen/trunk/files/screenrc 2010-01-09 23:31:05 UTC (rev 7931) @@ -0,0 +1,9 @@ +################################################### +# System-wide screenrc file +################################################### + +# Make sure programs used under screen use the +# csw terminfo database, this is necessary +# as solaris native on doesn't know TERM=screen +setenv TERMINFO /opt/csw/share/terminfo + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From chninkel at users.sourceforge.net Sun Jan 10 00:41:50 2010 From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net) Date: Sat, 09 Jan 2010 23:41:50 +0000 Subject: [csw-devel] SF.net SVN: gar:[7932] csw/mgar/pkg/screen/trunk/Makefile Message-ID: Revision: 7932 http://gar.svn.sourceforge.net/gar/?rev=7932&view=rev Author: chninkel Date: 2010-01-09 23:41:50 +0000 (Sat, 09 Jan 2010) Log Message: ----------- screen: fixed screenrc path Modified Paths: -------------- csw/mgar/pkg/screen/trunk/Makefile Modified: csw/mgar/pkg/screen/trunk/Makefile =================================================================== --- csw/mgar/pkg/screen/trunk/Makefile 2010-01-09 23:31:05 UTC (rev 7931) +++ csw/mgar/pkg/screen/trunk/Makefile 2010-01-09 23:41:50 UTC (rev 7932) @@ -33,7 +33,7 @@ CONFIGURE_ARGS += --enable-pam CONFIGURE_ARGS += --enable-telnet CONFIGURE_ARGS += --enable-colors256 -CONFIGURE_ARGS += --sysconfdir=/etc/$(prefix)/ +CONFIGURE_ARGS += --with-sys-screenrc=/etc$(prefix)/screenrc TEST_TARGET = check This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From chninkel at users.sourceforge.net Sun Jan 10 01:31:18 2010 From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net) Date: Sun, 10 Jan 2010 00:31:18 +0000 Subject: [csw-devel] SF.net SVN: gar:[7933] csw/mgar/pkg/screen/trunk Message-ID: Revision: 7933 http://gar.svn.sourceforge.net/gar/?rev=7933&view=rev Author: chninkel Date: 2010-01-10 00:31:17 +0000 (Sun, 10 Jan 2010) Log Message: ----------- screen: now linked with opencsw libncurses Modified Paths: -------------- csw/mgar/pkg/screen/trunk/Makefile csw/mgar/pkg/screen/trunk/checksums Added Paths: ----------- csw/mgar/pkg/screen/trunk/files/enable_ncurses.patch Modified: csw/mgar/pkg/screen/trunk/Makefile =================================================================== --- csw/mgar/pkg/screen/trunk/Makefile 2010-01-09 23:41:50 UTC (rev 7932) +++ csw/mgar/pkg/screen/trunk/Makefile 2010-01-10 00:31:17 UTC (rev 7933) @@ -22,11 +22,17 @@ PACKAGES = CSWscrn CATALOGNAME = screen +REQUIRED_PKGS = CSWncurses + +# we want to use opencsw libncurses and not solaris libcurses +# so we modify configure.in so ncurses is tried before curses +PATCHFILES += enable_ncurses.patch + # this patch increases the maximum number of simultaneously allowed # windows per screen session. -PATCHFILES = screen-maxwin.patch +PATCHFILES += screen-maxwin.patch -# screen is not isntalled with setuid bit so we disable utmp update +# screen is not installed with setuid bit so we disable utmp update PATCHFILES += screen-utmp.patch CONFIGURE_ARGS = $(DIRPATHS) @@ -39,6 +45,10 @@ include gar/category.mk +# we must recreate configure as we modified configure.in +pre-configure-modulated: + cd $(WORKSRC) && $(prefix)/bin/autoconf + post-merge: ginstall -D $(WORKDIR_FIRSTMOD)/screenrc $(PKGROOT)/etc/$(prefix)/screenrc ginstall -D $(WORKDIR_FIRSTMOD)/changelog.CSW $(PKGROOT)/$(docdir)/$(GARNAME)/changelog.CSW Modified: csw/mgar/pkg/screen/trunk/checksums =================================================================== --- csw/mgar/pkg/screen/trunk/checksums 2010-01-09 23:41:50 UTC (rev 7932) +++ csw/mgar/pkg/screen/trunk/checksums 2010-01-10 00:31:17 UTC (rev 7933) @@ -1,4 +1,5 @@ a7026461bcda14338f2175ba958195cb changelog.CSW +bc3ac54668be521328c598408cab2d60 enable_ncurses.patch 8506fd205028a96c741e4037de6e3c42 screen-4.0.3.tar.gz ed83d7a9001fa159a367d699580c1dd2 screen-maxwin.patch 3f25f108225cea31321046da5b033f6a screen-utmp.patch Added: csw/mgar/pkg/screen/trunk/files/enable_ncurses.patch =================================================================== --- csw/mgar/pkg/screen/trunk/files/enable_ncurses.patch (rev 0) +++ csw/mgar/pkg/screen/trunk/files/enable_ncurses.patch 2010-01-10 00:31:17 UTC (rev 7933) @@ -0,0 +1,23 @@ +diff -ur screen-4.0.3.orig/configure.in screen-4.0.3/configure.in +--- screen-4.0.3.orig/configure.in 2003-06-03 13:58:24.000000000 +0200 ++++ screen-4.0.3/configure.in 2010-01-10 01:58:58.248639453 +0100 +@@ -643,6 +643,9 @@ + AC_CHECKING(for tgetent) + AC_TRY_LINK(,tgetent((char *)0, (char *)0);,, + olibs="$LIBS" ++LIBS="-lncurses $olibs" ++AC_CHECKING(libncurses) ++AC_TRY_LINK(,tgetent((char *)0, (char *)0);,, + LIBS="-lcurses $olibs" + AC_CHECKING(libcurses) + AC_TRY_LINK(,[ +@@ -658,9 +661,6 @@ + LIBS="-ltermlib $olibs" + AC_CHECKING(libtermlib) + AC_TRY_LINK(,tgetent((char *)0, (char *)0);,, +-LIBS="-lncurses $olibs" +-AC_CHECKING(libncurses) +-AC_TRY_LINK(,tgetent((char *)0, (char *)0);,, + AC_MSG_ERROR(!!! no tgetent - no screen)))))) + + AC_TRY_RUN([ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From maciej at opencsw.org Sun Jan 10 01:35:15 2010 From: maciej at opencsw.org (Maciej (Matchek) Blizinski) Date: Sun, 10 Jan 2010 00:35:15 +0000 Subject: [csw-devel] SF.net SVN: gar:[7931] csw/mgar/pkg/screen/trunk In-Reply-To: References: Message-ID: On Sat, Jan 9, 2010 at 11:31 PM, wrote: > Added: csw/mgar/pkg/screen/trunk/files/screenrc > =================================================================== > --- csw/mgar/pkg/screen/trunk/files/screenrc ? ? ? ? ? ? ? ? ? ? ? ? ? ?(rev 0) > +++ csw/mgar/pkg/screen/trunk/files/screenrc ? ?2010-01-09 23:31:05 UTC (rev 7931) > @@ -0,0 +1,9 @@ > +################################################### > +# System-wide screenrc file > +################################################### > + > +# Make sure programs used under screen use the > +# csw terminfo database, this is necessary > +# as solaris native on doesn't know TERM=screen > +setenv TERMINFO /opt/csw/share/terminfo > + I'd suggest adding to the dependencies the package which provides /opt/csw/share/terminfo, so that screen can be sure the terminfo files can be accessed. From chninkel at users.sourceforge.net Sun Jan 10 01:59:00 2010 From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net) Date: Sun, 10 Jan 2010 00:59:00 +0000 Subject: [csw-devel] SF.net SVN: gar:[7934] csw/mgar/pkg/screen/trunk Message-ID: Revision: 7934 http://gar.svn.sourceforge.net/gar/?rev=7934&view=rev Author: chninkel Date: 2010-01-10 00:59:00 +0000 (Sun, 10 Jan 2010) Log Message: ----------- screen: fixed cswpreserveconf usage and updated changelog.CSW Modified Paths: -------------- csw/mgar/pkg/screen/trunk/Makefile csw/mgar/pkg/screen/trunk/files/changelog.CSW Modified: csw/mgar/pkg/screen/trunk/Makefile =================================================================== --- csw/mgar/pkg/screen/trunk/Makefile 2010-01-10 00:31:17 UTC (rev 7933) +++ csw/mgar/pkg/screen/trunk/Makefile 2010-01-10 00:59:00 UTC (rev 7934) @@ -24,6 +24,9 @@ REQUIRED_PKGS = CSWncurses +PRESERVECONF = /etc/opt/csw/screenrc +MIGRATE_FILES = screenrc + # we want to use opencsw libncurses and not solaris libcurses # so we modify configure.in so ncurses is tried before curses PATCHFILES += enable_ncurses.patch Modified: csw/mgar/pkg/screen/trunk/files/changelog.CSW =================================================================== --- csw/mgar/pkg/screen/trunk/files/changelog.CSW 2010-01-10 00:31:17 UTC (rev 7933) +++ csw/mgar/pkg/screen/trunk/files/changelog.CSW 2010-01-10 00:59:00 UTC (rev 7934) @@ -1,5 +1,14 @@ +screen (4.0.3,REV=2010.01.10) unstable + + * Now linked with opencsw libncurses. + * Added system-wide screenrc file. + * Moved configuration from /opt/csw/etc to /etc/opt/csw. + * Fixed terminfo problem (Closes: #4133). + + -- Yann Rouillard Sun, 10 Jan 2010 01:53:59 +0100 + screen (4.0.3) unstable - * New upstream version. + * New upstream version. -- Yann Rouillard Wed, 23 Apr 2008 22:25:50 +0200 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From chninkel at users.sourceforge.net Sun Jan 10 01:59:55 2010 From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net) Date: Sun, 10 Jan 2010 00:59:55 +0000 Subject: [csw-devel] SF.net SVN: gar:[7935] csw/mgar/pkg/screen/trunk/checksums Message-ID: Revision: 7935 http://gar.svn.sourceforge.net/gar/?rev=7935&view=rev Author: chninkel Date: 2010-01-10 00:59:55 +0000 (Sun, 10 Jan 2010) Log Message: ----------- screen: updated checksum Modified Paths: -------------- csw/mgar/pkg/screen/trunk/checksums Modified: csw/mgar/pkg/screen/trunk/checksums =================================================================== --- csw/mgar/pkg/screen/trunk/checksums 2010-01-10 00:59:00 UTC (rev 7934) +++ csw/mgar/pkg/screen/trunk/checksums 2010-01-10 00:59:55 UTC (rev 7935) @@ -1,4 +1,4 @@ -a7026461bcda14338f2175ba958195cb changelog.CSW +6c6640f9826245227fca18a26bcf92ad changelog.CSW bc3ac54668be521328c598408cab2d60 enable_ncurses.patch 8506fd205028a96c741e4037de6e3c42 screen-4.0.3.tar.gz ed83d7a9001fa159a367d699580c1dd2 screen-maxwin.patch This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From chninkel at users.sourceforge.net Sun Jan 10 02:11:10 2010 From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net) Date: Sun, 10 Jan 2010 01:11:10 +0000 Subject: [csw-devel] SF.net SVN: gar:[7936] csw/mgar/pkg/screen/trunk/Makefile Message-ID: Revision: 7936 http://gar.svn.sourceforge.net/gar/?rev=7936&view=rev Author: chninkel Date: 2010-01-10 01:11:10 +0000 (Sun, 10 Jan 2010) Log Message: ----------- screen: really fix cswpreserveconf usage Modified Paths: -------------- csw/mgar/pkg/screen/trunk/Makefile Modified: csw/mgar/pkg/screen/trunk/Makefile =================================================================== --- csw/mgar/pkg/screen/trunk/Makefile 2010-01-10 00:59:55 UTC (rev 7935) +++ csw/mgar/pkg/screen/trunk/Makefile 2010-01-10 01:11:10 UTC (rev 7936) @@ -53,7 +53,7 @@ cd $(WORKSRC) && $(prefix)/bin/autoconf post-merge: - ginstall -D $(WORKDIR_FIRSTMOD)/screenrc $(PKGROOT)/etc/$(prefix)/screenrc + ginstall -D $(WORKDIR_FIRSTMOD)/screenrc $(PKGROOT)/etc/$(prefix)/screenrc.CSW ginstall -D $(WORKDIR_FIRSTMOD)/changelog.CSW $(PKGROOT)/$(docdir)/$(GARNAME)/changelog.CSW @$(MAKECOOKIE) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From hson at users.sourceforge.net Sun Jan 10 05:10:36 2010 From: hson at users.sourceforge.net (hson at users.sourceforge.net) Date: Sun, 10 Jan 2010 04:10:36 +0000 Subject: [csw-devel] SF.net SVN: gar:[7937] csw/mgar/pkg Message-ID: Revision: 7937 http://gar.svn.sourceforge.net/gar/?rev=7937&view=rev Author: hson Date: 2010-01-10 04:10:36 +0000 (Sun, 10 Jan 2010) Log Message: ----------- Change from sf.net to sourceforge.net for gar Property Changed: ---------------- csw/mgar/pkg/djvulibre/trunk/ csw/mgar/pkg/evolution/trunk/ csw/mgar/pkg/evolution-ds/trunk/ csw/mgar/pkg/evolution-exchange/trunk/ csw/mgar/pkg/evolution-mapi/trunk/ csw/mgar/pkg/evolution-webcal/trunk/ csw/mgar/pkg/ghostscript/trunk/ csw/mgar/pkg/gnomedesktop/trunk/ csw/mgar/pkg/libfpx/trunk/ csw/mgar/pkg/liblcms/trunk/ csw/mgar/pkg/pxlib/trunk/ csw/mgar/pkg/tiff/trunk/ Property changes on: csw/mgar/pkg/djvulibre/trunk ___________________________________________________________________ Modified: svn:externals - gar https://gar.svn.sf.net/svnroot/gar/csw/mgar/gar/v2 + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 Property changes on: csw/mgar/pkg/evolution/trunk ___________________________________________________________________ Modified: svn:externals - gar https://gar.svn.sf.net/svnroot/gar/csw/mgar/gar/v2 + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 Property changes on: csw/mgar/pkg/evolution-ds/trunk ___________________________________________________________________ Modified: svn:externals - gar https://gar.svn.sf.net/svnroot/gar/csw/mgar/gar/v2 + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 Property changes on: csw/mgar/pkg/evolution-exchange/trunk ___________________________________________________________________ Modified: svn:externals - gar https://gar.svn.sf.net/svnroot/gar/csw/mgar/gar/v2 + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 Property changes on: csw/mgar/pkg/evolution-mapi/trunk ___________________________________________________________________ Modified: svn:externals - gar https://gar.svn.sf.net/svnroot/gar/csw/mgar/gar/v2 + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 Property changes on: csw/mgar/pkg/evolution-webcal/trunk ___________________________________________________________________ Modified: svn:externals - gar https://gar.svn.sf.net/svnroot/gar/csw/mgar/gar/v2 + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 Property changes on: csw/mgar/pkg/ghostscript/trunk ___________________________________________________________________ Modified: svn:externals - gar https://gar.svn.sf.net/svnroot/gar/csw/mgar/gar/v2 + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 Property changes on: csw/mgar/pkg/gnomedesktop/trunk ___________________________________________________________________ Modified: svn:externals - gar https://gar.svn.sf.net/svnroot/gar/csw/mgar/gar/v2 + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 Property changes on: csw/mgar/pkg/libfpx/trunk ___________________________________________________________________ Modified: svn:externals - gar https://gar.svn.sf.net/svnroot/gar/csw/mgar/gar/v2 + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 Property changes on: csw/mgar/pkg/liblcms/trunk ___________________________________________________________________ Modified: svn:externals - gar https://gar.svn.sf.net/svnroot/gar/csw/mgar/gar/v2 + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 Property changes on: csw/mgar/pkg/pxlib/trunk ___________________________________________________________________ Modified: svn:externals - gar https://gar.svn.sf.net/svnroot/gar/csw/mgar/gar/v2 + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 Property changes on: csw/mgar/pkg/tiff/trunk ___________________________________________________________________ Modified: svn:externals - gar https://gar.svn.sf.net/svnroot/gar/csw/mgar/gar/v2 + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From chninkel at users.sourceforge.net Sun Jan 10 13:01:56 2010 From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net) Date: Sun, 10 Jan 2010 12:01:56 +0000 Subject: [csw-devel] SF.net SVN: gar:[7938] csw/mgar/pkg/screen/trunk Message-ID: Revision: 7938 http://gar.svn.sourceforge.net/gar/?rev=7938&view=rev Author: chninkel Date: 2010-01-10 12:01:56 +0000 (Sun, 10 Jan 2010) Log Message: ----------- screen: added screen documentation files Modified Paths: -------------- csw/mgar/pkg/screen/trunk/Makefile csw/mgar/pkg/screen/trunk/checksums csw/mgar/pkg/screen/trunk/files/changelog.CSW Modified: csw/mgar/pkg/screen/trunk/Makefile =================================================================== --- csw/mgar/pkg/screen/trunk/Makefile 2010-01-10 04:10:36 UTC (rev 7937) +++ csw/mgar/pkg/screen/trunk/Makefile 2010-01-10 12:01:56 UTC (rev 7938) @@ -19,6 +19,8 @@ DISTFILES += screenrc DISTFILES += changelog.CSW +DOCFILES = FAQ INSTALL NEWS NEWS.3.5 NEWS.3.6 NEWS.3.7 NEWS.3.9 README TODO ChangeLog + PACKAGES = CSWscrn CATALOGNAME = screen @@ -53,6 +55,9 @@ cd $(WORKSRC) && $(prefix)/bin/autoconf post-merge: + for FILE in $(DOCFILES); do \ + ginstall -D $(WORKSRC_FIRSTMOD)/$$FILE $(PKGROOT)/$(docdir)/$(GARNAME)/$$FILE; \ + done ginstall -D $(WORKDIR_FIRSTMOD)/screenrc $(PKGROOT)/etc/$(prefix)/screenrc.CSW ginstall -D $(WORKDIR_FIRSTMOD)/changelog.CSW $(PKGROOT)/$(docdir)/$(GARNAME)/changelog.CSW @$(MAKECOOKIE) Modified: csw/mgar/pkg/screen/trunk/checksums =================================================================== --- csw/mgar/pkg/screen/trunk/checksums 2010-01-10 04:10:36 UTC (rev 7937) +++ csw/mgar/pkg/screen/trunk/checksums 2010-01-10 12:01:56 UTC (rev 7938) @@ -1,4 +1,4 @@ -6c6640f9826245227fca18a26bcf92ad changelog.CSW +18269762c8dbe1443730d1e23fddfd0c changelog.CSW bc3ac54668be521328c598408cab2d60 enable_ncurses.patch 8506fd205028a96c741e4037de6e3c42 screen-4.0.3.tar.gz ed83d7a9001fa159a367d699580c1dd2 screen-maxwin.patch Modified: csw/mgar/pkg/screen/trunk/files/changelog.CSW =================================================================== --- csw/mgar/pkg/screen/trunk/files/changelog.CSW 2010-01-10 04:10:36 UTC (rev 7937) +++ csw/mgar/pkg/screen/trunk/files/changelog.CSW 2010-01-10 12:01:56 UTC (rev 7938) @@ -4,6 +4,7 @@ * Added system-wide screenrc file. * Moved configuration from /opt/csw/etc to /etc/opt/csw. * Fixed terminfo problem (Closes: #4133). + * Added screen documentation files in the package. -- Yann Rouillard Sun, 10 Jan 2010 01:53:59 +0100 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From skayser at users.sourceforge.net Sun Jan 10 13:59:40 2010 From: skayser at users.sourceforge.net (skayser at users.sourceforge.net) Date: Sun, 10 Jan 2010 12:59:40 +0000 Subject: [csw-devel] SF.net SVN: gar:[7939] csw/mgar/pkg/dante/trunk Message-ID: Revision: 7939 http://gar.svn.sourceforge.net/gar/?rev=7939&view=rev Author: skayser Date: 2010-01-10 12:59:40 +0000 (Sun, 10 Jan 2010) Log Message: ----------- dante: add kerberos, tweaked init script, added sample config Modified Paths: -------------- csw/mgar/pkg/dante/trunk/Makefile Added Paths: ----------- csw/mgar/pkg/dante/trunk/files/cswdante csw/mgar/pkg/dante/trunk/files/sockd.conf.CSW Removed Paths: ------------- csw/mgar/pkg/dante/trunk/files/CSWdante.cswdante Modified: csw/mgar/pkg/dante/trunk/Makefile =================================================================== --- csw/mgar/pkg/dante/trunk/Makefile 2010-01-10 12:01:56 UTC (rev 7938) +++ csw/mgar/pkg/dante/trunk/Makefile 2010-01-10 12:59:40 UTC (rev 7939) @@ -1,10 +1,6 @@ -# Known issue: +# Known limitation: # - The libsocks build doesn't support $SOCKS_CONF. See README.CSW # and INSTALL with its description of `--without-glibc-secure'. -# -# Todo: -# - Look into kerberos linking issues -# - Test sockd and its init script GARNAME = dante GARVERSION = 1.2.0 CATEGORIES = net @@ -21,7 +17,7 @@ the server administrator. endef -SPKG_SOURCEURL = http://www.inet.no/dante/ +VENDOR_URL = http://www.inet.no/dante/ MASTER_SITES = ftp://ftp.inet.no/pub/socks/ MASTER_SITES += ftp://ftp.inet.no/pub/socks/old/ DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz @@ -29,21 +25,23 @@ LICENSE = LICENSE -PACKAGES = CSWlibsocks CSWdante +# See doc/README.usage: dante is stand-alone. libsocks can be used to +# compile or run-time link applications against the SOCKS library +PACKAGES = CSWdante CSWlibsocks -SPKG_DESC_CSWlibsocks = Dante SOCKS runtime libraries (and socksify wrapper) -SPKG_DESC_CSWdante = Dante SOCKS (v4 and v5) proxy daemon +SPKG_DESC_CSWdante = Dante SOCKS (v4 and v5) proxy daemon +SPKG_DESC_CSWlibsocks = Dante SOCKS library (and socksify wrapper) -# There is no pkg compiling against dante right now, just drop the dev files -EXTRA_MERGE_EXCLUDE_FILES = $(includedir)/.* - +PKGFILES_CSWdante = .*sockd.* /etc/opt/csw/init.d/cswdante +PKGFILES_CSWdante += $(docdir)/dante/.* PKGFILES_CSWlibsocks = $(PKGFILES_RT) .*socks.* PKGFILES_CSWlibsocks += $(docdir)/libsocks/.* -PKGFILES_CSWdante = .*sockd.* /etc/opt/csw/init.d/cswdante -PKGFILES_CSWdante += $(docdir)/dante/.* +PKGFILES_CSWlibsocks += $(PKGFILES_DEVEL) -REQUIRED_PKGS_CSWdante = CSWtcpwrap +REQUIRED_PKGS_CSWdante = CSWtcpwrap CSWkrb5lib +REQUIRED_PKGS_CSWlibsocks = CSWkrb5lib +# dante doesn't come with a test suite TEST_SCRIPTS = sysconfdir = /etc/opt/csw @@ -60,11 +58,6 @@ CONFIGURE_ARGS += --with-sockd-conf=$(sysconfdir)/sockd.conf CONFIGURE_ARGS += --with-pidfile=/var/run/cswsockd.pid CONFIGURE_ARGS += --without-glibc-secure - -# Kerberos linking fails .. looks like it is missing -L/opt/csw/lib. -# Needs investigation. -CONFIGURE_ARGS += --without-gssapi - # UPNP support requires miniupnp from http://miniupnp.free.fr/ CONFIGURE_ARGS += --without-upnp @@ -78,6 +71,11 @@ # Get rid of debugging flags which ./configure determines per default perl -pi -e 's#-(g|xs|xO0) ##g if /^CFLAGS =/' $(WORKSRC)/*/Makefile endif + # Kerberos linking fails with the shipped libtool, so make ./configure + # use /opt/csw/bin/libtool (similar to what Debian does). See + # http://article.gmane.org/gmane.os.solaris.opencsw.maintainers/5275 + gsed -ie 's,^LIBTOOL=.*,LIBTOOL=/opt/csw/bin/libtool,' \ + $(WORKSRC)/configure @$(MAKECOOKIE) post-install-libsocks: DOCDEST = $(DESTDIR)$(docdir)/libsocks @@ -102,8 +100,14 @@ cp $(addprefix $(FILEDIR)/,$(CSWDOCS)) $(DOCDEST) ginstall -d $(DESTDIR)/etc/opt/csw/init.d - ginstall -m 0755 $(FILEDIR)/CSWdante.cswdante \ + ginstall -m 0755 $(FILEDIR)/cswdante \ $(DESTDIR)/etc/opt/csw/init.d/cswdante + + ginstall -d $(DESTDIR)/etc/opt/csw + cp $(FILEDIR)/sockd.conf.CSW $(DESTDIR)/etc/opt/csw + + # This is where sockd.log goes, ref. $(FILEDIR)/sockd.conf.CSW + ginstall -d $(DESTDIR)$(localstatedir)/dante @$(MAKECOOKIE) # Make the man pages reference our CSW locations instead of /etc/*.conf Deleted: csw/mgar/pkg/dante/trunk/files/CSWdante.cswdante =================================================================== --- csw/mgar/pkg/dante/trunk/files/CSWdante.cswdante 2010-01-10 12:01:56 UTC (rev 7938) +++ csw/mgar/pkg/dante/trunk/files/CSWdante.cswdante 2010-01-10 12:59:40 UTC (rev 7939) @@ -1,55 +0,0 @@ -#!/sbin/sh -# Simple init script for dante. -# -#AUTOENABLE no - -PATH=/usr/bin:/opt/csw/bin:/usr/sbin - -PIDFILE=/var/run/cswsockd.pid -CONFIG=/etc/opt/csw/etc/sockd.conf - -case $1 in - 'start') - printf "Starting SOCKS proxy: cswdante ... " - if [ ! -f "$CONFIG" ]; then - echo "no configuration, not starting" - exit 96 - fi - /opt/csw/sbin/sockd -D -f $CONFIG; RC=$? - if [ $RC -ne 0 ]; then - echo "failed" - exit $RC - else - echo "ok" - fi - ;; - 'stop') - printf "Stopping SOCKS proxy: cswdante ... " - if [ -f "$PIDFILE" ]; then - /usr/bin/kill `/usr/bin/cat $PIDFILE` - echo "ok" - else - echo " no pid file, not running?" - fi - ;; - 'restart') - $0 stop - $0 start - ;; - 'reload') - # Make the parent process reload the config file, but leave - # child processes untouched. - printf "Reloading SOCKS proxy: cswdante ... " - if [ -f "$PIDFILE" ]; then - /usr/bin/kill -HUP `/usr/bin/cat $PIDFILE` - else - echo " no pid file, not running?" - fi - ;; - *) - echo "Usage: $0 { start | stop | restart | reload }" - exit 1 - ;; -esac - -exit 0 Copied: csw/mgar/pkg/dante/trunk/files/cswdante (from rev 7929, csw/mgar/pkg/dante/trunk/files/CSWdante.cswdante) =================================================================== --- csw/mgar/pkg/dante/trunk/files/cswdante (rev 0) +++ csw/mgar/pkg/dante/trunk/files/cswdante 2010-01-10 12:59:40 UTC (rev 7939) @@ -0,0 +1,64 @@ +#!/sbin/sh +# Simple init script for dante. +# +#AUTOENABLE no + +DAEMON=/opt/csw/sbin/sockd +CONFIG=/etc/opt/csw/sockd.conf +OUTPUT=/var/opt/csw/dante/sockd.log +# PIDFILE is not deleted upon stop by sockd, but simply emptied +PIDFILE=/var/run/cswsockd.pid + +case $1 in + 'start') + printf "Starting SOCKS proxy: cswdante ... " + if [ ! -f "$CONFIG" ]; then + echo "no configuration, not starting" + # exit code 96 translates to SMF_EXIT_ERR_CONFIG on Solaris 10 + exit 96 + fi + $DAEMON -D -f $CONFIG; RC=$? + if [ $RC -ne 0 ]; then + echo "failed (see $OUTPUT)" + exit $RC + else + echo "OK" + fi + ;; + 'stop') + printf "Stopping SOCKS proxy: cswdante ... " + if [ -s "$PIDFILE" ]; then + /usr/bin/kill `/usr/bin/cat $PIDFILE` + echo "OK" + else + echo " no PID found, not running?" + fi + ;; + 'restart') + if $DAEMON -V -f $CONFIG; then + $0 stop + $0 start + else + RC=$? + echo "Not restarting cswdante. Configuration verification failed." + echo "(see $OUTPUT)" + exit $RC + fi + ;; + 'reload') + # Make the parent process reload the config file, but leave + # child processes untouched. + printf "Reloading SOCKS proxy: cswdante ... " + if [ -s "$PIDFILE" ]; then + /usr/bin/kill -HUP `/usr/bin/cat $PIDFILE` + else + echo " no PID found, not running?" + fi + ;; + *) + echo "Usage: $0 { start | stop | restart | reload }" + exit 1 + ;; +esac + +exit 0 Added: csw/mgar/pkg/dante/trunk/files/sockd.conf.CSW =================================================================== --- csw/mgar/pkg/dante/trunk/files/sockd.conf.CSW (rev 0) +++ csw/mgar/pkg/dante/trunk/files/sockd.conf.CSW 2010-01-10 12:59:40 UTC (rev 7939) @@ -0,0 +1,78 @@ +## +## This configuration serves as a very basic example. It makes sockd listen +## on localhost and accepts PAM authenticated connection requestes to any +## target. All requested connections are logged to /var/opt/csw/dante/sockd.log. +## +## Please see sockd.conf(5) and /opt/csw/share/doc/dante/examples for +## guidance on how to configure sockd to your requirements. +## + +## Part #1: general server setttings + +# Write sockd output to a logfile +logoutput: /var/opt/csw/dante/sockd.log + +# sockd listens on localhost and uses interface pcn0:1 for outgoing connections. +# You will very likely need to adjust the external interface name. +internal: localhost port = 1080 +external: pcn0:1 + +# Globally enable authentication modules +method: pam +# PAM service name defaults to "sockd". If no PAM configuration for this service +# name can be found, the PAM libs will default to "other". +#pam.servicename: sockd + +user.privileged: root +user.unprivileged: nobody +user.libwrap: nobody + + +## Part #2: client access rules +## There are two sets of access rules and they work at different levels. Rules +## prefixed with client are checked first and are used to see if the client +## is allowed to connect to the Dante server. + +# Allow connections from localhost to our sockd listening on localhost. +client pass { + from: localhost to: localhost +} + +# To allow LAN connections for an example network of 192.168.0.0 +# you would need to un-comment the following and add another interface +# for sockd to listen to via the "internal" directive at the top. +# client pass { from: 192.168.0.0/24 to: 0.0.0.0/0 } + + +## Part #3: SOCKS request rules +## The other rules, are a level higher and are checked after the client +## connection has been accepted by the client-rules. The socks-rules are +## used to evaluate the socks request that the client sends. +## +## The format and content of the rules is identical, but +## client-rules may contain only a subset of the socks-rules. More +## concrete, they may not contain any keywords related to the socks +## protocol. + +# Block connections to localhost, or they will appear to come from the proxy. +block { + from: 0.0.0.0/0 to: localhost + log: connect +} + +# Block bind to ports lower than 1023 +block { + from: 0.0.0.0/0 to: 0.0.0.0/0 port le 1023 + command: bind + log: connect +} + +# Allow all other SOCKS requestes, but require them to be authenticated. +# Authentication is a SOCKS5 feature only, thus requires SOCKS5 clients. +pass { + from: 0.0.0.0/0 to: 0.0.0.0/0 + log: connect + method: pam +} + +# Fallthrough would be an implicit block This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From skayser at users.sourceforge.net Sun Jan 10 14:21:39 2010 From: skayser at users.sourceforge.net (skayser at users.sourceforge.net) Date: Sun, 10 Jan 2010 13:21:39 +0000 Subject: [csw-devel] SF.net SVN: gar:[7940] csw/mgar/pkg/dante/trunk Message-ID: Revision: 7940 http://gar.svn.sourceforge.net/gar/?rev=7940&view=rev Author: skayser Date: 2010-01-10 13:21:39 +0000 (Sun, 10 Jan 2010) Log Message: ----------- dante: add sample socks.conf, SAMPLECONF for socks.conf & sockd.conf Modified Paths: -------------- csw/mgar/pkg/dante/trunk/Makefile Added Paths: ----------- csw/mgar/pkg/dante/trunk/files/socks.conf.CSW Modified: csw/mgar/pkg/dante/trunk/Makefile =================================================================== --- csw/mgar/pkg/dante/trunk/Makefile 2010-01-10 12:59:40 UTC (rev 7939) +++ csw/mgar/pkg/dante/trunk/Makefile 2010-01-10 13:21:39 UTC (rev 7940) @@ -61,9 +61,10 @@ # UPNP support requires miniupnp from http://miniupnp.free.fr/ CONFIGURE_ARGS += --without-upnp +SAMPLECONF = $(sysconfdir)/socks.conf.CSW +SAMPLECONF += $(sysconfdir)/sockd.conf.CSW +INITSMF = /etc/opt/csw/init\.d/cswdante -INITSMF = /etc/opt/csw/init\.d/cswdante - include gar/category.mk post-configure-modulated: @@ -86,6 +87,9 @@ cp $(WORKSRC)/example/socks*.conf $(DOCDEST)/examples cp $(addprefix $(WORKSRC)/,$(DOCS)) $(DOCDEST) cp $(addprefix $(FILEDIR)/,$(CSWDOCS)) $(DOCDEST) + + ginstall -d $(DESTDIR)$(sysconfdir) + cp $(FILEDIR)/socks.conf.CSW $(DESTDIR)$(sysconfdir) @$(MAKECOOKIE) @@ -103,8 +107,8 @@ ginstall -m 0755 $(FILEDIR)/cswdante \ $(DESTDIR)/etc/opt/csw/init.d/cswdante - ginstall -d $(DESTDIR)/etc/opt/csw - cp $(FILEDIR)/sockd.conf.CSW $(DESTDIR)/etc/opt/csw + ginstall -d $(DESTDIR)$(sysconfdir) + cp $(FILEDIR)/sockd.conf.CSW $(DESTDIR)$(sysconfdir) # This is where sockd.log goes, ref. $(FILEDIR)/sockd.conf.CSW ginstall -d $(DESTDIR)$(localstatedir)/dante Added: csw/mgar/pkg/dante/trunk/files/socks.conf.CSW =================================================================== --- csw/mgar/pkg/dante/trunk/files/socks.conf.CSW (rev 0) +++ csw/mgar/pkg/dante/trunk/files/socks.conf.CSW 2010-01-10 13:21:39 UTC (rev 7940) @@ -0,0 +1,22 @@ +## +## A simple sample socks.conf for users with a local nameserver. +## +## Please see socks.conf(5) and /opt/csw/share/doc/libsocks/examples for +## guidance on how to configure libsocks to your requirements. Please +## also see /opt/csw/share/doc/libsocks/README.CSW as alternate configs +## specified via $SOCKS_CONF are not supported with this build. +## + +# Assuming de0 is on the lan-net, the below will make connections to it +# (and anything else on the lan), be direct, i.e. not go via the proxy. +#route { from: 0.0.0.0/0 to: de0 via: direct } + +# Clients going anywhere else go via the proxyserver listening at +# localhost, port 1080. Uncomment the line(s) corresponding to the +# proxyprotocols your proxyserver supports. +route { + from: 0.0.0.0/0 to: 0.0.0.0/0 via: 127.0.0.1 port = 1080 + proxyprotocol: socks_v5 # server supports socks v5. + proxyprotocol: socks_v4 # server supports socks v4 +# proxyprotocol: http_v1.0 # server supports http v1 +} This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From skayser at users.sourceforge.net Sun Jan 10 14:25:10 2010 From: skayser at users.sourceforge.net (skayser at users.sourceforge.net) Date: Sun, 10 Jan 2010 13:25:10 +0000 Subject: [csw-devel] SF.net SVN: gar:[7941] csw/mgar/pkg/dante/trunk Message-ID: Revision: 7941 http://gar.svn.sourceforge.net/gar/?rev=7941&view=rev Author: skayser Date: 2010-01-10 13:25:10 +0000 (Sun, 10 Jan 2010) Log Message: ----------- dante: updated changelog.CSW, renamed NEWS to changelog Modified Paths: -------------- csw/mgar/pkg/dante/trunk/Makefile csw/mgar/pkg/dante/trunk/files/changelog.CSW Modified: csw/mgar/pkg/dante/trunk/Makefile =================================================================== --- csw/mgar/pkg/dante/trunk/Makefile 2010-01-10 13:21:39 UTC (rev 7940) +++ csw/mgar/pkg/dante/trunk/Makefile 2010-01-10 13:25:10 UTC (rev 7941) @@ -65,6 +65,8 @@ SAMPLECONF += $(sysconfdir)/sockd.conf.CSW INITSMF = /etc/opt/csw/init\.d/cswdante +EXTRA_PAX_ARGS = '-s,NEWS$$,changelog,p' + include gar/category.mk post-configure-modulated: Modified: csw/mgar/pkg/dante/trunk/files/changelog.CSW =================================================================== --- csw/mgar/pkg/dante/trunk/files/changelog.CSW 2010-01-10 13:21:39 UTC (rev 7940) +++ csw/mgar/pkg/dante/trunk/files/changelog.CSW 2010-01-10 13:25:10 UTC (rev 7941) @@ -1,5 +1,5 @@ -dante (1.2.0,REV=2010.01.09) +dante (1.2.0,REV=2010.01.10) * Adopted and updated to 1.2.0 - -- Sebastian Kayser Sat, 9 Jan 2010 19:18:23 +0100 + -- Sebastian Kayser Sun, 10 Jan 2010 14:09:19 +0100 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From skayser at users.sourceforge.net Sun Jan 10 14:30:25 2010 From: skayser at users.sourceforge.net (skayser at users.sourceforge.net) Date: Sun, 10 Jan 2010 13:30:25 +0000 Subject: [csw-devel] SF.net SVN: gar:[7942] csw/mgar/pkg/dante/trunk/Makefile Message-ID: Revision: 7942 http://gar.svn.sourceforge.net/gar/?rev=7942&view=rev Author: skayser Date: 2010-01-10 13:30:25 +0000 (Sun, 10 Jan 2010) Log Message: ----------- dante: fix SAMPLECONF paths Modified Paths: -------------- csw/mgar/pkg/dante/trunk/Makefile Modified: csw/mgar/pkg/dante/trunk/Makefile =================================================================== --- csw/mgar/pkg/dante/trunk/Makefile 2010-01-10 13:25:10 UTC (rev 7941) +++ csw/mgar/pkg/dante/trunk/Makefile 2010-01-10 13:30:25 UTC (rev 7942) @@ -61,8 +61,8 @@ # UPNP support requires miniupnp from http://miniupnp.free.fr/ CONFIGURE_ARGS += --without-upnp -SAMPLECONF = $(sysconfdir)/socks.conf.CSW -SAMPLECONF += $(sysconfdir)/sockd.conf.CSW +SAMPLECONF = $(sysconfdir)/socks.conf +SAMPLECONF += $(sysconfdir)/sockd.conf INITSMF = /etc/opt/csw/init\.d/cswdante EXTRA_PAX_ARGS = '-s,NEWS$$,changelog,p' @@ -91,7 +91,7 @@ cp $(addprefix $(FILEDIR)/,$(CSWDOCS)) $(DOCDEST) ginstall -d $(DESTDIR)$(sysconfdir) - cp $(FILEDIR)/socks.conf.CSW $(DESTDIR)$(sysconfdir) + cp $(FILEDIR)/socks.conf.CSW $(DESTDIR)$(sysconfdir)/socks.conf @$(MAKECOOKIE) @@ -110,7 +110,7 @@ $(DESTDIR)/etc/opt/csw/init.d/cswdante ginstall -d $(DESTDIR)$(sysconfdir) - cp $(FILEDIR)/sockd.conf.CSW $(DESTDIR)$(sysconfdir) + cp $(FILEDIR)/sockd.conf.CSW $(DESTDIR)$(sysconfdir)/sockd.conf # This is where sockd.log goes, ref. $(FILEDIR)/sockd.conf.CSW ginstall -d $(DESTDIR)$(localstatedir)/dante This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From skayser at users.sourceforge.net Sun Jan 10 15:21:59 2010 From: skayser at users.sourceforge.net (skayser at users.sourceforge.net) Date: Sun, 10 Jan 2010 14:21:59 +0000 Subject: [csw-devel] SF.net SVN: gar:[7943] csw/mgar/pkg/dante/trunk Message-ID: Revision: 7943 http://gar.svn.sourceforge.net/gar/?rev=7943&view=rev Author: skayser Date: 2010-01-10 14:21:59 +0000 (Sun, 10 Jan 2010) Log Message: ----------- dante: tweaked sockd.conf, socksify core dumps Modified Paths: -------------- csw/mgar/pkg/dante/trunk/Makefile csw/mgar/pkg/dante/trunk/files/sockd.conf.CSW Modified: csw/mgar/pkg/dante/trunk/Makefile =================================================================== --- csw/mgar/pkg/dante/trunk/Makefile 2010-01-10 13:30:25 UTC (rev 7942) +++ csw/mgar/pkg/dante/trunk/Makefile 2010-01-10 14:21:59 UTC (rev 7943) @@ -1,6 +1,10 @@ # Known limitation: # - The libsocks build doesn't support $SOCKS_CONF. See README.CSW # and INSTALL with its description of `--without-glibc-secure'. +# +# TODO +# - socksify throws a core dump after the request is finished, +# to reproduce: /opt/csw/bin/socksify wget -qO http://google.com GARNAME = dante GARVERSION = 1.2.0 CATEGORIES = net Modified: csw/mgar/pkg/dante/trunk/files/sockd.conf.CSW =================================================================== --- csw/mgar/pkg/dante/trunk/files/sockd.conf.CSW 2010-01-10 13:30:25 UTC (rev 7942) +++ csw/mgar/pkg/dante/trunk/files/sockd.conf.CSW 2010-01-10 14:21:59 UTC (rev 7943) @@ -17,8 +17,8 @@ internal: localhost port = 1080 external: pcn0:1 -# Globally enable authentication modules -method: pam +# Which authentication methods should be advertised in the SOCKS5 negotiation +method: pam none # PAM service name defaults to "sockd". If no PAM configuration for this service # name can be found, the PAM libs will default to "other". #pam.servicename: sockd @@ -57,21 +57,21 @@ # Block connections to localhost, or they will appear to come from the proxy. block { from: 0.0.0.0/0 to: localhost - log: connect + log: connect error } # Block bind to ports lower than 1023 block { from: 0.0.0.0/0 to: 0.0.0.0/0 port le 1023 command: bind - log: connect + log: connect error } # Allow all other SOCKS requestes, but require them to be authenticated. # Authentication is a SOCKS5 feature only, thus requires SOCKS5 clients. pass { from: 0.0.0.0/0 to: 0.0.0.0/0 - log: connect + log: connect error method: pam } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From skayser at users.sourceforge.net Sun Jan 10 16:17:18 2010 From: skayser at users.sourceforge.net (skayser at users.sourceforge.net) Date: Sun, 10 Jan 2010 15:17:18 +0000 Subject: [csw-devel] SF.net SVN: gar:[7944] csw/mgar/pkg/dante/trunk/files/socks.conf.CSW Message-ID: Revision: 7944 http://gar.svn.sourceforge.net/gar/?rev=7944&view=rev Author: skayser Date: 2010-01-10 15:17:18 +0000 (Sun, 10 Jan 2010) Log Message: ----------- dante: add debug directives/instructions to socks.conf Modified Paths: -------------- csw/mgar/pkg/dante/trunk/files/socks.conf.CSW Modified: csw/mgar/pkg/dante/trunk/files/socks.conf.CSW =================================================================== --- csw/mgar/pkg/dante/trunk/files/socks.conf.CSW 2010-01-10 14:21:59 UTC (rev 7943) +++ csw/mgar/pkg/dante/trunk/files/socks.conf.CSW 2010-01-10 15:17:18 UTC (rev 7944) @@ -7,6 +7,10 @@ ## specified via $SOCKS_CONF are not supported with this build. ## +# Uncomment these if you are having troubles with libsocks +#debug: 1 +#logoutput: stderr + # Assuming de0 is on the lan-net, the below will make connections to it # (and anything else on the lan), be direct, i.e. not go via the proxy. #route { from: 0.0.0.0/0 to: de0 via: direct } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From skayser at users.sourceforge.net Sun Jan 10 16:22:49 2010 From: skayser at users.sourceforge.net (skayser at users.sourceforge.net) Date: Sun, 10 Jan 2010 15:22:49 +0000 Subject: [csw-devel] SF.net SVN: gar:[7945] csw/mgar/pkg/dante/trunk/Makefile Message-ID: Revision: 7945 http://gar.svn.sourceforge.net/gar/?rev=7945&view=rev Author: skayser Date: 2010-01-10 15:22:49 +0000 (Sun, 10 Jan 2010) Log Message: ----------- dante: build w/o kerberos to see whether it fixes socksify core dumps Modified Paths: -------------- csw/mgar/pkg/dante/trunk/Makefile Modified: csw/mgar/pkg/dante/trunk/Makefile =================================================================== --- csw/mgar/pkg/dante/trunk/Makefile 2010-01-10 15:17:18 UTC (rev 7944) +++ csw/mgar/pkg/dante/trunk/Makefile 2010-01-10 15:22:49 UTC (rev 7945) @@ -65,6 +65,8 @@ # UPNP support requires miniupnp from http://miniupnp.free.fr/ CONFIGURE_ARGS += --without-upnp +CONFIGURE_ARGS += --without-gssapi + SAMPLECONF = $(sysconfdir)/socks.conf SAMPLECONF += $(sysconfdir)/sockd.conf INITSMF = /etc/opt/csw/init\.d/cswdante @@ -81,8 +83,8 @@ # Kerberos linking fails with the shipped libtool, so make ./configure # use /opt/csw/bin/libtool (similar to what Debian does). See # http://article.gmane.org/gmane.os.solaris.opencsw.maintainers/5275 - gsed -ie 's,^LIBTOOL=.*,LIBTOOL=/opt/csw/bin/libtool,' \ - $(WORKSRC)/configure + #gsed -ie 's,^LIBTOOL=.*,LIBTOOL=/opt/csw/bin/libtool,' \ + # $(WORKSRC)/configure @$(MAKECOOKIE) post-install-libsocks: DOCDEST = $(DESTDIR)$(docdir)/libsocks This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From skayser at users.sourceforge.net Sun Jan 10 17:25:20 2010 From: skayser at users.sourceforge.net (skayser at users.sourceforge.net) Date: Sun, 10 Jan 2010 16:25:20 +0000 Subject: [csw-devel] SF.net SVN: gar:[7946] csw/mgar/pkg/dante/trunk/Makefile Message-ID: Revision: 7946 http://gar.svn.sourceforge.net/gar/?rev=7946&view=rev Author: skayser Date: 2010-01-10 16:25:20 +0000 (Sun, 10 Jan 2010) Log Message: ----------- dante: move LIBTOOL hack to pre-configure, further socksify core dump debugging Modified Paths: -------------- csw/mgar/pkg/dante/trunk/Makefile Modified: csw/mgar/pkg/dante/trunk/Makefile =================================================================== --- csw/mgar/pkg/dante/trunk/Makefile 2010-01-10 15:22:49 UTC (rev 7945) +++ csw/mgar/pkg/dante/trunk/Makefile 2010-01-10 16:25:20 UTC (rev 7946) @@ -1,10 +1,12 @@ # Known limitation: # - The libsocks build doesn't support $SOCKS_CONF. See README.CSW # and INSTALL with its description of `--without-glibc-secure'. -# -# TODO -# - socksify throws a core dump after the request is finished, -# to reproduce: /opt/csw/bin/socksify wget -qO http://google.com +# +# Known issues: +# - When compiled with GSSAPI/kerberos support, socksify core dumps +# at the end of the connection (when all data has been transmitted). +# To reproduce: /opt/csw/bin/socksify wget -qO http://google.com +# GARNAME = dante GARVERSION = 1.2.0 CATEGORIES = net @@ -64,9 +66,9 @@ CONFIGURE_ARGS += --without-glibc-secure # UPNP support requires miniupnp from http://miniupnp.free.fr/ CONFIGURE_ARGS += --without-upnp +# See "Known issues" at the top of this Makefile +#CONFIGURE_ARGS += --without-gssapi -CONFIGURE_ARGS += --without-gssapi - SAMPLECONF = $(sysconfdir)/socks.conf SAMPLECONF += $(sysconfdir)/sockd.conf INITSMF = /etc/opt/csw/init\.d/cswdante @@ -75,16 +77,19 @@ include gar/category.mk +pre-configure-modulated: + # Kerberos linking fails with the shipped libtool, so make ./configure + # use /opt/csw/bin/libtool (similar to what Debian does). See + # http://article.gmane.org/gmane.os.solaris.opencsw.maintainers/5275 + gsed -ie 's,^LIBTOOL=.*,LIBTOOL=/opt/csw/bin/libtool,' \ + $(WORKSRC)/configure + @$(MAKECOOKIE) + post-configure-modulated: ifneq ($(GARFLAVOR),DBG) # Get rid of debugging flags which ./configure determines per default perl -pi -e 's#-(g|xs|xO0) ##g if /^CFLAGS =/' $(WORKSRC)/*/Makefile endif - # Kerberos linking fails with the shipped libtool, so make ./configure - # use /opt/csw/bin/libtool (similar to what Debian does). See - # http://article.gmane.org/gmane.os.solaris.opencsw.maintainers/5275 - #gsed -ie 's,^LIBTOOL=.*,LIBTOOL=/opt/csw/bin/libtool,' \ - # $(WORKSRC)/configure @$(MAKECOOKIE) post-install-libsocks: DOCDEST = $(DESTDIR)$(docdir)/libsocks @@ -98,6 +103,9 @@ ginstall -d $(DESTDIR)$(sysconfdir) cp $(FILEDIR)/socks.conf.CSW $(DESTDIR)$(sysconfdir)/socks.conf + + # /bin/sh doesn't understand "if ! test", reported to dante-bugs at inet.no + gsed -ie 's,/bin/sh,/usr/bin/bash,' $(DESTDIR)$(bindir)/socksify @$(MAKECOOKIE) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From hson at users.sourceforge.net Sun Jan 10 17:50:42 2010 From: hson at users.sourceforge.net (hson at users.sourceforge.net) Date: Sun, 10 Jan 2010 16:50:42 +0000 Subject: [csw-devel] SF.net SVN: gar:[7947] csw/mgar/pkg/djvulibre/trunk/checksums Message-ID: Revision: 7947 http://gar.svn.sourceforge.net/gar/?rev=7947&view=rev Author: hson Date: 2010-01-10 16:50:42 +0000 (Sun, 10 Jan 2010) Log Message: ----------- djvulibre: Add missing file Added Paths: ----------- csw/mgar/pkg/djvulibre/trunk/checksums Added: csw/mgar/pkg/djvulibre/trunk/checksums =================================================================== --- csw/mgar/pkg/djvulibre/trunk/checksums (rev 0) +++ csw/mgar/pkg/djvulibre/trunk/checksums 2010-01-10 16:50:42 UTC (rev 7947) @@ -0,0 +1,2 @@ +23e0083aef7878b2c9527d2e5e7a8fa9 ddjvu.cpp.patch +d1513784ce0e4f37d71595dc34c95ec7 djvulibre-3.5.22.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From hson at users.sourceforge.net Sun Jan 10 17:59:27 2010 From: hson at users.sourceforge.net (hson at users.sourceforge.net) Date: Sun, 10 Jan 2010 16:59:27 +0000 Subject: [csw-devel] SF.net SVN: gar:[7948] csw/mgar/pkg/tiff/trunk/Makefile Message-ID: Revision: 7948 http://gar.svn.sourceforge.net/gar/?rev=7948&view=rev Author: hson Date: 2010-01-10 16:59:27 +0000 (Sun, 10 Jan 2010) Log Message: ----------- tiff: Add configure args to build C++ lib Modified Paths: -------------- csw/mgar/pkg/tiff/trunk/Makefile Modified: csw/mgar/pkg/tiff/trunk/Makefile =================================================================== --- csw/mgar/pkg/tiff/trunk/Makefile 2010-01-10 16:50:42 UTC (rev 7947) +++ csw/mgar/pkg/tiff/trunk/Makefile 2010-01-10 16:59:27 UTC (rev 7948) @@ -43,6 +43,7 @@ CONFIGURE_ARGS = $(DIRPATHS) CONFIGURE_ARGS += --with-docdir=/opt/csw/share/doc/tiff CONFIGURE_ARGS += --disable-static +CONFIGURE_ARGS += --enable-cxx CONFIGURE_ARGS += --with-zlib-include-dir=/opt/csw/include CONFIGURE_ARGS += --with-zlib-lib-dir=/opt/csw/lib CONFIGURE_ARGS += --with-jpeg-include-dir=/opt/csw/include This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From hson at users.sourceforge.net Sun Jan 10 18:01:05 2010 From: hson at users.sourceforge.net (hson at users.sourceforge.net) Date: Sun, 10 Jan 2010 17:01:05 +0000 Subject: [csw-devel] SF.net SVN: gar:[7949] csw/mgar/pkg/wmf/trunk/Makefile Message-ID: Revision: 7949 http://gar.svn.sourceforge.net/gar/?rev=7949&view=rev Author: hson Date: 2010-01-10 17:01:04 +0000 (Sun, 10 Jan 2010) Log Message: ----------- wmf: Add configure args for X11, add prerequisite package Modified Paths: -------------- csw/mgar/pkg/wmf/trunk/Makefile Modified: csw/mgar/pkg/wmf/trunk/Makefile =================================================================== --- csw/mgar/pkg/wmf/trunk/Makefile 2010-01-10 16:59:27 UTC (rev 7948) +++ csw/mgar/pkg/wmf/trunk/Makefile 2010-01-10 17:01:04 UTC (rev 7949) @@ -31,6 +31,8 @@ REQUIRED_PKGS_CSWwmfdevel += CSWwmf REQUIRED_PKGS_CSWwmfdoc += CSWwmf +PREREQUISITE_PKGS += CSWgtk2devel + PKGFILES_CSWwmfdevel = $(PKGFILES_DEVEL) PKGFILES_CSWwmfdoc = $(sharedstatedir)/doc/.* @@ -48,6 +50,8 @@ UFILES_REGEX = (\d+(?:\.\d+)*) CONFIGURE_ARGS = $(DIRPATHS) +CONFIGURE_ARGS += --x-includes=$(prefix)/X11/include +CONFIGURE_ARGS += --x-libraries=$(abspath $(prefix)/X11/lib/$(MM_LIBDIR)) TEST_TARGET = check This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From hson at users.sourceforge.net Sun Jan 10 18:02:37 2010 From: hson at users.sourceforge.net (hson at users.sourceforge.net) Date: Sun, 10 Jan 2010 17:02:37 +0000 Subject: [csw-devel] SF.net SVN: gar:[7950] csw/mgar/pkg/openexr/trunk/Makefile Message-ID: Revision: 7950 http://gar.svn.sourceforge.net/gar/?rev=7950&view=rev Author: hson Date: 2010-01-10 17:02:36 +0000 (Sun, 10 Jan 2010) Log Message: ----------- openexr: Add NO_ISAEXEC since no 64-binaries are built, set TEST_TARGET to NULL until 64-bit libraries are installed Modified Paths: -------------- csw/mgar/pkg/openexr/trunk/Makefile Modified: csw/mgar/pkg/openexr/trunk/Makefile =================================================================== --- csw/mgar/pkg/openexr/trunk/Makefile 2010-01-10 17:01:04 UTC (rev 7949) +++ csw/mgar/pkg/openexr/trunk/Makefile 2010-01-10 17:02:36 UTC (rev 7950) @@ -51,11 +51,12 @@ EXTRA_CXX_FLAGS += $(EXTRA_LD_FLAGS_$(MODULATION)) BUILD64 = 1 +NO_ISAEXEC = 1 # Check fails if library isn't installed /opt/csw/lib and until a 64-bit # lib is installed test has to be disabled -TEST_TARGET = check -#TEST_TARGET = +#TEST_TARGET = check +TEST_TARGET = STRIP_LIBTOOL = 1 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From skayser at users.sourceforge.net Sun Jan 10 18:15:53 2010 From: skayser at users.sourceforge.net (skayser at users.sourceforge.net) Date: Sun, 10 Jan 2010 17:15:53 +0000 Subject: [csw-devel] SF.net SVN: gar:[7951] csw/mgar/pkg/dante/trunk Message-ID: Revision: 7951 http://gar.svn.sourceforge.net/gar/?rev=7951&view=rev Author: skayser Date: 2010-01-10 17:15:52 +0000 (Sun, 10 Jan 2010) Log Message: ----------- dante: documented Kerberos-related core dumps, releasing w/o Kerberos support for now Modified Paths: -------------- csw/mgar/pkg/dante/trunk/Makefile csw/mgar/pkg/dante/trunk/files/README.CSW Modified: csw/mgar/pkg/dante/trunk/Makefile =================================================================== --- csw/mgar/pkg/dante/trunk/Makefile 2010-01-10 17:02:36 UTC (rev 7950) +++ csw/mgar/pkg/dante/trunk/Makefile 2010-01-10 17:15:52 UTC (rev 7951) @@ -3,9 +3,14 @@ # and INSTALL with its description of `--without-glibc-secure'. # # Known issues: -# - When compiled with GSSAPI/kerberos support, socksify core dumps +# - When compiled with GSSAPI/Kerberos support, socksify core dumps # at the end of the connection (when all data has been transmitted). # To reproduce: /opt/csw/bin/socksify wget -qO http://google.com +# Observed on Solaris 10 U7 x86 with CSWkrb5lib 1.4.4,REV=2006.12.27. +# Not investigated in depth. If anyone needs Kerberos support, feel +# free to tackle this. Might be bug in Dante, might have to do with +# the LIBTOOL hack (see pre-configure-modulated) or might also +# originate in our downrev Kerberos libs. # GARNAME = dante GARVERSION = 1.2.0 @@ -67,7 +72,7 @@ # UPNP support requires miniupnp from http://miniupnp.free.fr/ CONFIGURE_ARGS += --without-upnp # See "Known issues" at the top of this Makefile -#CONFIGURE_ARGS += --without-gssapi +CONFIGURE_ARGS += --without-gssapi SAMPLECONF = $(sysconfdir)/socks.conf SAMPLECONF += $(sysconfdir)/sockd.conf @@ -81,8 +86,8 @@ # Kerberos linking fails with the shipped libtool, so make ./configure # use /opt/csw/bin/libtool (similar to what Debian does). See # http://article.gmane.org/gmane.os.solaris.opencsw.maintainers/5275 - gsed -ie 's,^LIBTOOL=.*,LIBTOOL=/opt/csw/bin/libtool,' \ - $(WORKSRC)/configure + #gsed -ie 's,^LIBTOOL=.*,LIBTOOL=/opt/csw/bin/libtool,' \ + # $(WORKSRC)/configure @$(MAKECOOKIE) post-configure-modulated: @@ -111,7 +116,7 @@ post-install-dante: DOCDEST = $(DESTDIR)$(docdir)/dante post-install-dante: DOCS = CREDITS NEWS SUPPORT -post-install-dante: CSWDOCS = changelog.CSW +post-install-dante: CSWDOCS = README.CSW changelog.CSW post-install-dante: ginstall -d $(DESTDIR)/var/opt/csw/dante ginstall -d $(DOCDEST)/examples Modified: csw/mgar/pkg/dante/trunk/files/README.CSW =================================================================== --- csw/mgar/pkg/dante/trunk/files/README.CSW 2010-01-10 17:02:36 UTC (rev 7950) +++ csw/mgar/pkg/dante/trunk/files/README.CSW 2010-01-10 17:15:52 UTC (rev 7951) @@ -1,6 +1,16 @@ -Known issue: libsocks does not support $SOCKS_CONF --------------------------------------------------- +Known limitation: libsocks/sockd without Kerberos support +--------------------------------------------------------- +These builds of libsocks/sockd come without Kerberos support. If you +require Kerberos support and are willing to invest some time, feel +free to ping our maintainers mailing list and we will get you started +with our build system. If you can't help out, but still require +Kerberos support, please file a bug report so that we know about +your requirement. + +Known limitation: libsocks does not support $SOCKS_CONF +------------------------------------------------------- + This build of the libsocks _does not_ support an alternate socks.conf passed via the environment variable SOCKS_CONF. As a workaround you can specify a SOCKS server via the environment variables pointed out in This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From skayser at users.sourceforge.net Sun Jan 10 18:49:47 2010 From: skayser at users.sourceforge.net (skayser at users.sourceforge.net) Date: Sun, 10 Jan 2010 17:49:47 +0000 Subject: [csw-devel] SF.net SVN: gar:[7952] csw/mgar/pkg/dante/trunk/files/changelog.CSW Message-ID: Revision: 7952 http://gar.svn.sourceforge.net/gar/?rev=7952&view=rev Author: skayser Date: 2010-01-10 17:49:46 +0000 (Sun, 10 Jan 2010) Log Message: ----------- dante: mention $(sysconfdir) change in changelog.CSW Modified Paths: -------------- csw/mgar/pkg/dante/trunk/files/changelog.CSW Modified: csw/mgar/pkg/dante/trunk/files/changelog.CSW =================================================================== --- csw/mgar/pkg/dante/trunk/files/changelog.CSW 2010-01-10 17:15:52 UTC (rev 7951) +++ csw/mgar/pkg/dante/trunk/files/changelog.CSW 2010-01-10 17:49:46 UTC (rev 7952) @@ -1,5 +1,6 @@ dante (1.2.0,REV=2010.01.10) * Adopted and updated to 1.2.0 + * sockd/libsocks now look in /etc/opt/csw/ for their configuration files. -- Sebastian Kayser Sun, 10 Jan 2010 14:09:19 +0100 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From hson at users.sourceforge.net Sun Jan 10 19:26:01 2010 From: hson at users.sourceforge.net (hson at users.sourceforge.net) Date: Sun, 10 Jan 2010 18:26:01 +0000 Subject: [csw-devel] SF.net SVN: gar:[7953] csw/mgar/pkg/librsvg/trunk/Makefile Message-ID: Revision: 7953 http://gar.svn.sourceforge.net/gar/?rev=7953&view=rev Author: hson Date: 2010-01-10 18:26:01 +0000 (Sun, 10 Jan 2010) Log Message: ----------- librsvg: Add configure args for X11, build 64-bit Modified Paths: -------------- csw/mgar/pkg/librsvg/trunk/Makefile Modified: csw/mgar/pkg/librsvg/trunk/Makefile =================================================================== --- csw/mgar/pkg/librsvg/trunk/Makefile 2010-01-10 17:49:46 UTC (rev 7952) +++ csw/mgar/pkg/librsvg/trunk/Makefile 2010-01-10 18:26:01 UTC (rev 7953) @@ -45,11 +45,19 @@ LIBS=-lm EXTRA_COMMON_EXPORTS = LIBS + CONFIGURE_ARGS = $(DIRPATHS) CONFIGURE_ARGS += --enable-shared=yes --enable-static=no +CONFIGURE_ARGS += --x-includes=$(prefix)/X11/include +CONFIGURE_ARGS += --x-libraries=$(abspath $(prefix)/X11/lib/$(MM_LIBDIR)) + +EXTRA_INC = $(prefix)/X11/include +EXTRA_LIB = $(prefix)/X11/lib +EXTRA_PKG_CONFIG_DIRS = $(prefix)/X11/lib EXTRA_LD_OPTIONS = -R/opt/csw/X11/lib -EXTRA_PKG_CONFIG_DIRS = $(prefix)/X11/lib +BUILD64 = 1 + STRIP_LIBTOOL=1 TEST_TARGET = check This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From skayser at users.sourceforge.net Sun Jan 10 19:40:46 2010 From: skayser at users.sourceforge.net (skayser at users.sourceforge.net) Date: Sun, 10 Jan 2010 18:40:46 +0000 Subject: [csw-devel] SF.net SVN: gar:[7954] csw/mgar/pkg/dante/trunk/Makefile Message-ID: Revision: 7954 http://gar.svn.sourceforge.net/gar/?rev=7954&view=rev Author: skayser Date: 2010-01-10 18:40:44 +0000 (Sun, 10 Jan 2010) Log Message: ----------- dante: removed dep on krb5lib Modified Paths: -------------- csw/mgar/pkg/dante/trunk/Makefile Modified: csw/mgar/pkg/dante/trunk/Makefile =================================================================== --- csw/mgar/pkg/dante/trunk/Makefile 2010-01-10 18:26:01 UTC (rev 7953) +++ csw/mgar/pkg/dante/trunk/Makefile 2010-01-10 18:40:44 UTC (rev 7954) @@ -49,8 +49,7 @@ PKGFILES_CSWlibsocks += $(docdir)/libsocks/.* PKGFILES_CSWlibsocks += $(PKGFILES_DEVEL) -REQUIRED_PKGS_CSWdante = CSWtcpwrap CSWkrb5lib -REQUIRED_PKGS_CSWlibsocks = CSWkrb5lib +REQUIRED_PKGS_CSWdante = CSWtcpwrap # dante doesn't come with a test suite TEST_SCRIPTS = This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From skayser at users.sourceforge.net Sun Jan 10 20:11:29 2010 From: skayser at users.sourceforge.net (skayser at users.sourceforge.net) Date: Sun, 10 Jan 2010 19:11:29 +0000 Subject: [csw-devel] SF.net SVN: gar:[7955] csw/mgar/pkg/dante/trunk/files/changelog.CSW Message-ID: Revision: 7955 http://gar.svn.sourceforge.net/gar/?rev=7955&view=rev Author: skayser Date: 2010-01-10 19:11:28 +0000 (Sun, 10 Jan 2010) Log Message: ----------- dante: full description of changes in changelog.CSW Modified Paths: -------------- csw/mgar/pkg/dante/trunk/files/changelog.CSW Modified: csw/mgar/pkg/dante/trunk/files/changelog.CSW =================================================================== --- csw/mgar/pkg/dante/trunk/files/changelog.CSW 2010-01-10 18:40:44 UTC (rev 7954) +++ csw/mgar/pkg/dante/trunk/files/changelog.CSW 2010-01-10 19:11:28 UTC (rev 7955) @@ -2,5 +2,9 @@ * Adopted and updated to 1.2.0 * sockd/libsocks now look in /etc/opt/csw/ for their configuration files. + * Enhanced init script to verify configuration syntax on restart. + * Automatic rc.d and SMF setup now done by cswclassutils. + * Config file handling now done via cswclassutils (i.e. config files + will be preserved on update). -- Sebastian Kayser Sun, 10 Jan 2010 14:09:19 +0100 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From skayser at users.sourceforge.net Sun Jan 10 20:17:32 2010 From: skayser at users.sourceforge.net (skayser at users.sourceforge.net) Date: Sun, 10 Jan 2010 19:17:32 +0000 Subject: [csw-devel] SF.net SVN: gar:[7956] csw/mgar/pkg/dante/trunk/files/changelog.CSW Message-ID: Revision: 7956 http://gar.svn.sourceforge.net/gar/?rev=7956&view=rev Author: skayser Date: 2010-01-10 19:17:32 +0000 (Sun, 10 Jan 2010) Log Message: ----------- dante: full description of changes in changelog.CSW Modified Paths: -------------- csw/mgar/pkg/dante/trunk/files/changelog.CSW Modified: csw/mgar/pkg/dante/trunk/files/changelog.CSW =================================================================== --- csw/mgar/pkg/dante/trunk/files/changelog.CSW 2010-01-10 19:11:28 UTC (rev 7955) +++ csw/mgar/pkg/dante/trunk/files/changelog.CSW 2010-01-10 19:17:32 UTC (rev 7956) @@ -2,6 +2,7 @@ * Adopted and updated to 1.2.0 * sockd/libsocks now look in /etc/opt/csw/ for their configuration files. + * Removed dante dependency on libsocks (not required). * Enhanced init script to verify configuration syntax on restart. * Automatic rc.d and SMF setup now done by cswclassutils. * Config file handling now done via cswclassutils (i.e. config files This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From skayser at users.sourceforge.net Sun Jan 10 20:21:12 2010 From: skayser at users.sourceforge.net (skayser at users.sourceforge.net) Date: Sun, 10 Jan 2010 19:21:12 +0000 Subject: [csw-devel] SF.net SVN: gar:[7957] csw/mgar/pkg/dante/trunk/Makefile Message-ID: Revision: 7957 http://gar.svn.sourceforge.net/gar/?rev=7957&view=rev Author: skayser Date: 2010-01-10 19:21:12 +0000 (Sun, 10 Jan 2010) Log Message: ----------- dante: fix gsed invocation Modified Paths: -------------- csw/mgar/pkg/dante/trunk/Makefile Modified: csw/mgar/pkg/dante/trunk/Makefile =================================================================== --- csw/mgar/pkg/dante/trunk/Makefile 2010-01-10 19:17:32 UTC (rev 7956) +++ csw/mgar/pkg/dante/trunk/Makefile 2010-01-10 19:21:12 UTC (rev 7957) @@ -109,7 +109,7 @@ cp $(FILEDIR)/socks.conf.CSW $(DESTDIR)$(sysconfdir)/socks.conf # /bin/sh doesn't understand "if ! test", reported to dante-bugs at inet.no - gsed -ie 's,/bin/sh,/usr/bin/bash,' $(DESTDIR)$(bindir)/socksify + gsed -i -e 's,/bin/sh,/usr/bin/bash,' $(DESTDIR)$(bindir)/socksify @$(MAKECOOKIE) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From hson at users.sourceforge.net Mon Jan 11 00:26:09 2010 From: hson at users.sourceforge.net (hson at users.sourceforge.net) Date: Sun, 10 Jan 2010 23:26:09 +0000 Subject: [csw-devel] SF.net SVN: gar:[7958] csw/mgar/pkg/librsvg/trunk Message-ID: Revision: 7958 http://gar.svn.sourceforge.net/gar/?rev=7958&view=rev Author: hson Date: 2010-01-10 23:26:05 +0000 (Sun, 10 Jan 2010) Log Message: ----------- librsvg: Fix LD_FLAGS for libcairo problem, disable 64-bit until libgsf-1 has 64-bit support Modified Paths: -------------- csw/mgar/pkg/librsvg/trunk/Makefile csw/mgar/pkg/librsvg/trunk/checksums Modified: csw/mgar/pkg/librsvg/trunk/Makefile =================================================================== --- csw/mgar/pkg/librsvg/trunk/Makefile 2010-01-10 19:21:12 UTC (rev 7957) +++ csw/mgar/pkg/librsvg/trunk/Makefile 2010-01-10 23:26:05 UTC (rev 7958) @@ -54,10 +54,15 @@ EXTRA_INC = $(prefix)/X11/include EXTRA_LIB = $(prefix)/X11/lib EXTRA_PKG_CONFIG_DIRS = $(prefix)/X11/lib -EXTRA_LD_OPTIONS = -R/opt/csw/X11/lib -BUILD64 = 1 +# We want to be linked with Xrender from $(prefix)/X11/lib not +# $(prefix)/lib since the latter is linked to /usr/openwin/lib/libX11.so.4 +EXTRA_SOS_LD_FLAGS = -L$(abspath $(prefix)/X11/lib/$(MM_LIBDIR)) +#EXTRA_SOS_LD_OPTIONS = -R$(abspath $(prefix)/X11/lib/$(MM_LIBDIR)) +# Won't work until libgsf-1 is 64bit +#BUILD64 = 1 + STRIP_LIBTOOL=1 TEST_TARGET = check Modified: csw/mgar/pkg/librsvg/trunk/checksums =================================================================== --- csw/mgar/pkg/librsvg/trunk/checksums 2010-01-10 19:21:12 UTC (rev 7957) +++ csw/mgar/pkg/librsvg/trunk/checksums 2010-01-10 23:26:05 UTC (rev 7958) @@ -1,5 +1,5 @@ -5eddcc7be3ee182c94ee21691720c6aa download/doc_makefile.patch -65dbd726a514fe8b797d26254b8efc1e download/librsvg-2.26.0.tar.bz2 -5b0c0387946c3b7ca7feb913de436936 download/pdiff.patch -8a26f6d0d0cf1cfce1a1e0365c6624ce download/perceptualdiff.patch -803a5d10e3e9c9a561b397aade043024 download/test_makefiles.patch +5eddcc7be3ee182c94ee21691720c6aa doc_makefile.patch +65dbd726a514fe8b797d26254b8efc1e librsvg-2.26.0.tar.bz2 +5b0c0387946c3b7ca7feb913de436936 pdiff.patch +8a26f6d0d0cf1cfce1a1e0365c6624ce perceptualdiff.patch +803a5d10e3e9c9a561b397aade043024 test_makefiles.patch This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From hson at users.sourceforge.net Mon Jan 11 00:28:12 2010 From: hson at users.sourceforge.net (hson at users.sourceforge.net) Date: Sun, 10 Jan 2010 23:28:12 +0000 Subject: [csw-devel] SF.net SVN: gar:[7959] csw/mgar/pkg/libgsf/trunk Message-ID: Revision: 7959 http://gar.svn.sourceforge.net/gar/?rev=7959&view=rev Author: hson Date: 2010-01-10 23:28:12 +0000 (Sun, 10 Jan 2010) Log Message: ----------- libgsf: Some minor cleanup Modified Paths: -------------- csw/mgar/pkg/libgsf/trunk/Makefile csw/mgar/pkg/libgsf/trunk/checksums Modified: csw/mgar/pkg/libgsf/trunk/Makefile =================================================================== --- csw/mgar/pkg/libgsf/trunk/Makefile 2010-01-10 23:26:05 UTC (rev 7958) +++ csw/mgar/pkg/libgsf/trunk/Makefile 2010-01-10 23:28:12 UTC (rev 7959) @@ -18,9 +18,10 @@ REQUIRED_PKGS += CSWbonobo2 CSWbzip2 CSWgconf2 CSWggettextrt CSWglib2 REQUIRED_PKGS += CSWgnomevfs2 CSWlibxml2 CSWorbit2 CSWzlib CSWiconv -# We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz +EXTRA_LD_OPTIONS = -L../gsf/.libs -L../../gsf/.libs + CONFIGURE_ARGS = $(DIRPATHS) #CONFIGURE_ARGS = "PATH=$(NPATH)" $(DIRPATHS) #CONFIGURE_ARGS += --enable-gtk-doc=no @@ -28,26 +29,24 @@ TEST_TARGET = check -EXTRA_LD_OPTIONS = -L../gsf/.libs -L../../gsf/.libs +# Missing 64-bit libs: +# libgnomevfs-2.so libgconf-2.so libbonobo-2.so libbonobo-activation.so +#BUILD64 = 1 +STRIP_LIBTOOL = 1 + include gar/category.mk PATH := /opt/csw/gnu:$(PATH) -post-configure-$(MODULATION): - @(echo "~~~ Fixing Libtool ~~~") - @$(FILEDIR)/fixme.sh $(WORKSRC) -# @$(FILEDIR)/fixme2.sh $(WORKSRC) - $(DONADA) - post-install-isa-sparcv8: @cp -p $(FILEDIR)/libgsf-1.so.1.9.1.s $(INSTALLISADIR)$(libdir)/libgsf-1.so.1.9.1 @cp -p $(FILEDIR)/libgsf-gnome-1.so.1.9.1.s $(INSTALLISADIR)$(libdir)/libgsf-gnome-1.so.1.9.1 - @ln -s libgsf-1.so.1.9.1 $(INSTALLISADIR)$(libdir)/libgsf-1.so.1 - @ln -s libgsf-gnome-1.so.1.9.1 $(INSTALLISADIR)$(libdir)/libgsf-gnome-1.so.1 + @( if [ ! -r $(INSTALLISADIR)$(libdir)/libgsf-1.so.1 ] ; then ln -s libgsf-1.so.1.9.1 $(INSTALLISADIR)$(libdir)/libgsf-1.so.1 ; fi ) + @( if [ ! -r $(INSTALLISADIR)$(libdir)/libgsf-gnome-1.so.1 ] ; then ln -s libgsf-gnome-1.so.1.9.1 $(INSTALLISADIR)$(libdir)/libgsf-gnome-1.so.1 ; fi ) post-install-isa-i386: @cp -p $(FILEDIR)/libgsf-1.so.1.9.1.i $(INSTALLISADIR)$(libdir)/libgsf-1.so.1.9.1 @cp -p $(FILEDIR)/libgsf-gnome-1.so.1.9.1.i $(INSTALLISADIR)$(libdir)/libgsf-gnome-1.so.1.9.1 - @ln -s libgsf-1.so.1.9.1 $(INSTALLISADIR)$(libdir)/libgsf-1.so.1 - @ln -s libgsf-gnome-1.so.1.9.1 $(INSTALLISADIR)$(libdir)/libgsf-gnome-1.so.1 + @( if [ ! -r $(INSTALLISADIR)$(libdir)/libgsf-1.so.1 ] ; then ln -s libgsf-1.so.1.9.1 $(INSTALLISADIR)$(libdir)/libgsf-1.so.1 ; fi ) + @( if [ ! -r $(INSTALLISADIR)$(libdir)/libgsf-gnome-1.so.1 ] ; then ln -s libgsf-gnome-1.so.1.9.1 $(INSTALLISADIR)$(libdir)/libgsf-gnome-1.so.1 ; fi ) Modified: csw/mgar/pkg/libgsf/trunk/checksums =================================================================== --- csw/mgar/pkg/libgsf/trunk/checksums 2010-01-10 23:26:05 UTC (rev 7958) +++ csw/mgar/pkg/libgsf/trunk/checksums 2010-01-10 23:28:12 UTC (rev 7959) @@ -1,2 +1 @@ -7d6fa1c26ebb58dcf2128c3b9c7d1a2a download/libgsf-1.14.11.tar.gz -34f5b20f6caf282b2533784fbb1b4395 download/fixme.sh +7d6fa1c26ebb58dcf2128c3b9c7d1a2a libgsf-1.14.11.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From hson at users.sourceforge.net Mon Jan 11 00:36:44 2010 From: hson at users.sourceforge.net (hson at users.sourceforge.net) Date: Sun, 10 Jan 2010 23:36:44 +0000 Subject: [csw-devel] SF.net SVN: gar:[7960] csw/mgar/pkg/tiff/trunk/Makefile Message-ID: Revision: 7960 http://gar.svn.sourceforge.net/gar/?rev=7960&view=rev Author: hson Date: 2010-01-10 23:36:43 +0000 (Sun, 10 Jan 2010) Log Message: ----------- tiff: Change to dynamic path Modified Paths: -------------- csw/mgar/pkg/tiff/trunk/Makefile Modified: csw/mgar/pkg/tiff/trunk/Makefile =================================================================== --- csw/mgar/pkg/tiff/trunk/Makefile 2010-01-10 23:28:12 UTC (rev 7959) +++ csw/mgar/pkg/tiff/trunk/Makefile 2010-01-10 23:36:43 UTC (rev 7960) @@ -41,7 +41,7 @@ EXTRA_PKG_CONFIG_DIRS = $(prefix)/X11/lib CONFIGURE_ARGS = $(DIRPATHS) -CONFIGURE_ARGS += --with-docdir=/opt/csw/share/doc/tiff +CONFIGURE_ARGS += --with-docdir=$(docdir)/tiff CONFIGURE_ARGS += --disable-static CONFIGURE_ARGS += --enable-cxx CONFIGURE_ARGS += --with-zlib-include-dir=/opt/csw/include This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From hson at users.sourceforge.net Mon Jan 11 00:37:31 2010 From: hson at users.sourceforge.net (hson at users.sourceforge.net) Date: Sun, 10 Jan 2010 23:37:31 +0000 Subject: [csw-devel] SF.net SVN: gar:[7961] csw/mgar/pkg/libcairo/trunk/Makefile Message-ID: Revision: 7961 http://gar.svn.sourceforge.net/gar/?rev=7961&view=rev Author: hson Date: 2010-01-10 23:37:31 +0000 (Sun, 10 Jan 2010) Log Message: ----------- libcairo: Add X11/lib first to RUNPATH Modified Paths: -------------- csw/mgar/pkg/libcairo/trunk/Makefile Modified: csw/mgar/pkg/libcairo/trunk/Makefile =================================================================== --- csw/mgar/pkg/libcairo/trunk/Makefile 2010-01-10 23:36:43 UTC (rev 7960) +++ csw/mgar/pkg/libcairo/trunk/Makefile 2010-01-10 23:37:31 UTC (rev 7961) @@ -55,6 +55,7 @@ # We want libcairo to be linked with Xrender from $(prefix)/X11/lib not # $(prefix)/lib since the latter is linked to /usr/openwin/lib/libX11.so.4 EXTRA_SOS_LD_FLAGS = -L$(abspath $(prefix)/X11/lib/$(MM_LIBDIR)) +EXTRA_SOS_LD_OPTIONS = -R$(abspath $(prefix)/X11/lib/$(MM_LIBDIR)) # imagediff in testsuite needs -lsocket EXTRA_LDFLAGS = -lsocket -lnsl This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From hson at users.sourceforge.net Mon Jan 11 00:41:53 2010 From: hson at users.sourceforge.net (hson at users.sourceforge.net) Date: Sun, 10 Jan 2010 23:41:53 +0000 Subject: [csw-devel] SF.net SVN: gar:[7962] csw/mgar/pkg/djvulibre/trunk/Makefile Message-ID: Revision: 7962 http://gar.svn.sourceforge.net/gar/?rev=7962&view=rev Author: hson Date: 2010-01-10 23:41:52 +0000 (Sun, 10 Jan 2010) Log Message: ----------- djvulibre: Use proper configure flags for X11 Modified Paths: -------------- csw/mgar/pkg/djvulibre/trunk/Makefile Modified: csw/mgar/pkg/djvulibre/trunk/Makefile =================================================================== --- csw/mgar/pkg/djvulibre/trunk/Makefile 2010-01-10 23:37:31 UTC (rev 7961) +++ csw/mgar/pkg/djvulibre/trunk/Makefile 2010-01-10 23:41:52 UTC (rev 7962) @@ -44,7 +44,6 @@ EXTRA_COMMON_EXPORTS += PTHREAD_LIBS EXTRA_COMMON_EXPORTS += PTHREAD_CFLAGS - EXTRA_INC = $(prefix)/X11/include EXTRA_LIB = $(prefix)/X11/lib EXTRA_PKG_CONFIG_DIRS = $(prefix)/X11/lib @@ -55,8 +54,8 @@ EXTRA_COMMON_EXPORTS += X_LIBS CONFIGURE_ARGS = $(DIRPATHS) -CONFIGURE_ARGS += --with-extra-includes=$(prefix)/X11/include -CONFIGURE_ARGS += --with-extra-libraries=$(prefix)/X11/lib +CONFIGURE_ARGS += --x-includes=$(prefix)/X11/include +CONFIGURE_ARGS += --x-libraries=$(abspath $(prefix)/X11/lib/$(MM_LIBDIR)) BUILD64 = 1 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Mon Jan 11 01:09:00 2010 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Mon, 11 Jan 2010 00:09:00 +0000 Subject: [csw-devel] SF.net SVN: gar:[7963] csw/mgar/pkg/gitosis/trunk/Makefile Message-ID: Revision: 7963 http://gar.svn.sourceforge.net/gar/?rev=7963&view=rev Author: bdwalton Date: 2010-01-11 00:08:55 +0000 (Mon, 11 Jan 2010) Log Message: ----------- gitosis: correct vendor url in pkginfo file Modified Paths: -------------- csw/mgar/pkg/gitosis/trunk/Makefile Modified: csw/mgar/pkg/gitosis/trunk/Makefile =================================================================== --- csw/mgar/pkg/gitosis/trunk/Makefile 2010-01-10 23:41:52 UTC (rev 7962) +++ csw/mgar/pkg/gitosis/trunk/Makefile 2010-01-11 00:08:55 UTC (rev 7963) @@ -5,6 +5,8 @@ PATCHLEVEL = 73a03 CATEGORIES = python +VENDOR_URL = http://eagain.net/gitweb/?p=gitosis.git + DESCRIPTION = Software for hosting git repositories define BLURB Manage git repositories, provide access to them over SSH, with tight access control and not needing shell accounts. This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Mon Jan 11 04:28:03 2010 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Mon, 11 Jan 2010 03:28:03 +0000 Subject: [csw-devel] SF.net SVN: gar:[7964] csw/mgar/pkg/cswpkgloghooks/trunk/Makefile Message-ID: Revision: 7964 http://gar.svn.sourceforge.net/gar/?rev=7964&view=rev Author: bdwalton Date: 2010-01-11 03:28:02 +0000 (Mon, 11 Jan 2010) Log Message: ----------- cswpkgloghooks: add vendor url for pkginfo Modified Paths: -------------- csw/mgar/pkg/cswpkgloghooks/trunk/Makefile Modified: csw/mgar/pkg/cswpkgloghooks/trunk/Makefile =================================================================== --- csw/mgar/pkg/cswpkgloghooks/trunk/Makefile 2010-01-11 00:08:55 UTC (rev 7963) +++ csw/mgar/pkg/cswpkgloghooks/trunk/Makefile 2010-01-11 03:28:02 UTC (rev 7964) @@ -2,6 +2,8 @@ GARVERSION = 1.0 CATEGORIES = utils +VENDOR_URL = http://opencsw.org + DESCRIPTION = Hook scripts to log package maintenance actions define BLURB This set of hook scripts will log package maintenance actions to syslog. This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Mon Jan 11 04:35:42 2010 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Mon, 11 Jan 2010 03:35:42 +0000 Subject: [csw-devel] SF.net SVN: gar:[7965] csw/mgar/pkg/gardev/trunk/Makefile Message-ID: Revision: 7965 http://gar.svn.sourceforge.net/gar/?rev=7965&view=rev Author: bdwalton Date: 2010-01-11 03:35:42 +0000 (Mon, 11 Jan 2010) Log Message: ----------- gardev: add vendor url for pkginfo Modified Paths: -------------- csw/mgar/pkg/gardev/trunk/Makefile Modified: csw/mgar/pkg/gardev/trunk/Makefile =================================================================== --- csw/mgar/pkg/gardev/trunk/Makefile 2010-01-11 03:28:02 UTC (rev 7964) +++ csw/mgar/pkg/gardev/trunk/Makefile 2010-01-11 03:35:42 UTC (rev 7965) @@ -2,6 +2,8 @@ GARVERSION = 1.0 CATEGORIES = devel +VENDOR_URL = http://opencsw.org + DESCRIPTION = Ease setting up a GAR development environment define BLURB Pull in all packages required to get started developing OpenCSW packages This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Mon Jan 11 04:41:38 2010 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Mon, 11 Jan 2010 03:41:38 +0000 Subject: [csw-devel] SF.net SVN: gar:[7966] csw/mgar/pkg/git-subtree/trunk/Makefile Message-ID: Revision: 7966 http://gar.svn.sourceforge.net/gar/?rev=7966&view=rev Author: bdwalton Date: 2010-01-11 03:41:38 +0000 (Mon, 11 Jan 2010) Log Message: ----------- git-subtree: add vendor url for pkginfo Modified Paths: -------------- csw/mgar/pkg/git-subtree/trunk/Makefile Modified: csw/mgar/pkg/git-subtree/trunk/Makefile =================================================================== --- csw/mgar/pkg/git-subtree/trunk/Makefile 2010-01-11 03:35:42 UTC (rev 7965) +++ csw/mgar/pkg/git-subtree/trunk/Makefile 2010-01-11 03:41:38 UTC (rev 7966) @@ -3,6 +3,8 @@ PATCHLEVEL = d20ac CATEGORIES = devel +VENDOR_URL = http://github.com/apenwarr/git-subtree + DESCRIPTION = Subtree support for git define BLURB An experimental alternative to the git-submodule command. This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Mon Jan 11 15:01:40 2010 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Mon, 11 Jan 2010 14:01:40 +0000 Subject: [csw-devel] SF.net SVN: gar:[7967] csw/mgar/pkg/gnulinks/trunk/Makefile Message-ID: Revision: 7967 http://gar.svn.sourceforge.net/gar/?rev=7967&view=rev Author: bdwalton Date: 2010-01-11 14:01:40 +0000 (Mon, 11 Jan 2010) Log Message: ----------- gnulinks: update vendor url Modified Paths: -------------- csw/mgar/pkg/gnulinks/trunk/Makefile Modified: csw/mgar/pkg/gnulinks/trunk/Makefile =================================================================== --- csw/mgar/pkg/gnulinks/trunk/Makefile 2010-01-11 03:41:38 UTC (rev 7966) +++ csw/mgar/pkg/gnulinks/trunk/Makefile 2010-01-11 14:01:40 UTC (rev 7967) @@ -2,14 +2,14 @@ GARVERSION = 1.2 CATEGORIES = xtra +VENDOR_URL = http://opencsw.org + GLINKPKGS = CSWdiffutils CSWggettext CSWggettextrt CSWbison CSWbinutils GLINKPKGS += CSWggrep CSWgawk CSWgsed CSWggetopt CSWfindutils GLINKPKGS += CSWgmake CSWgpatch CSWgm4 CSWgwhois CSWgtar GLINKPKGS += CSWshutils CSWgfile CSWtextutils PREREQUISITE_PKGS = $(GLINKPKGS) CSWpkgutil -SPKG_SOURCEURL = No Source - DESCRIPTION = Creates native symlinks for GNU tools in /opt/csw/gnu define BLURB Installs links for GNU utilities with a 'g' prefix into This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Mon Jan 11 15:46:59 2010 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Mon, 11 Jan 2010 14:46:59 +0000 Subject: [csw-devel] SF.net SVN: gar:[7968] csw/mgar/pkg/gardev/trunk/Makefile Message-ID: Revision: 7968 http://gar.svn.sourceforge.net/gar/?rev=7968&view=rev Author: bdwalton Date: 2010-01-11 14:46:59 +0000 (Mon, 11 Jan 2010) Log Message: ----------- gardev: add CSWpython, CSWpy-cheetah as deps for checkpkg Modified Paths: -------------- csw/mgar/pkg/gardev/trunk/Makefile Modified: csw/mgar/pkg/gardev/trunk/Makefile =================================================================== --- csw/mgar/pkg/gardev/trunk/Makefile 2010-01-11 14:01:40 UTC (rev 7967) +++ csw/mgar/pkg/gardev/trunk/Makefile 2010-01-11 14:46:59 UTC (rev 7968) @@ -19,7 +19,7 @@ REQUIRED_PKGS_CSWgardevel = CSWgmake CSWgtar CSWggrep CSWdiffutils CSWgfile REQUIRED_PKGS_CSWgardevel += CSWtextutils CSWwget CSWfindutils CSWgsed REQUIRED_PKGS_CSWgardevel += CSWgawk CSWbzip2 CSWlftp CSWgit CSWnetcat -REQUIRED_PKGS_CSWgardevel += CSWsvn +REQUIRED_PKGS_CSWgardevel += CSWsvn CSWpython CSWpy-cheetah MASTER_SITES = This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Mon Jan 11 16:28:58 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Mon, 11 Jan 2010 15:28:58 +0000 Subject: [csw-devel] SF.net SVN: gar:[7969] csw/mgar/pkg Message-ID: Revision: 7969 http://gar.svn.sourceforge.net/gar/?rev=7969&view=rev Author: wahwah Date: 2010-01-11 15:28:58 +0000 (Mon, 11 Jan 2010) Log Message: ----------- moc: Initial commit, doesn't compile Modified Paths: -------------- csw/mgar/pkg/moc/trunk/Makefile csw/mgar/pkg/moc/trunk/checksums Added Paths: ----------- csw/mgar/pkg/moc/ Modified: csw/mgar/pkg/moc/trunk/Makefile =================================================================== --- csw/mgar/pkg/template/trunk/Makefile 2010-01-08 11:02:13 UTC (rev 7915) +++ csw/mgar/pkg/moc/trunk/Makefile 2010-01-11 15:28:58 UTC (rev 7969) @@ -2,184 +2,24 @@ # Distributed under the terms of the GNU General Public License v2 # $Id$ -## This file contains comments to guide you through various GAR settings. -## Please remove unnecessary comments before committing your code to the code -## repository. The comments to remove are marked with double hashes. -## If you want to remove them all in-place, use: -## gsed -i -e '/^##/d' Makefile -## -## For more information about GAR variables, please see: -## https://sourceforge.net/apps/trac/gar/wiki/GAR%20Variable%20Reference -## -GARNAME = mypkg -GARVERSION = 1.0 -## -## The category that your software fits in. This is not a descriptive field, but -## influences the build process. Depending on the CATEGORIES setting, different -## Makefiles are included from gar/categories/ in your trunk directory, which -## adjust the build settings for the respective category. -## -## Possible settings are: -## apps, cpan, devel, gnome, java, kde, lang, lib, meta, net, python, server, -## utils, x11, xfce, xorg, xtra +GARNAME = moc +GARVERSION = 2.4.4 CATEGORIES = lib -## -## A one-line description of the package, which will appear in the pkginfo. -DESCRIPTION = -## -## A longer description of the package. This is only for descriptive purposes -## inside the Makefile and is not used elsewhere. +DESCRIPTION = Music On Console define BLURB - endef -## -## Upstream URL that should show up in the VENDOR field as well as on -## http://opencsw.org/packages/. -SPKG_SOURCEURL = -## -## Whitespace-separated list of URLs to download the source package from. -## There are presets: $(SF_MIRRORS), $(GNU_MIRRORS) and $(GOOGLE_MIRROR). -MASTER_SITES = -## -## SF_PROJ is required if you set $(MASTER_SITES) to $(SF_MIRRORS) and the -## Sourceforge project name differs from $(GARNAME). Specifies the Sourceforge -## project name of the software you wish to download. -## SF_PROJ = -## -## A list of space separated patch filenames from files/ that are to be applied -## to the extracted software before the ./configure stage. Patches need to be -## included in the DISTFILES variable as well. -## PATCHFILES = -## -## Whitespace-separated list of files which comprise this build. mGAR will look -## for the files in the $(FILEDIR) (trunk/files) directory and on the -## $(MASTER_SITES). -DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz -## -## We define upstream file regex so we can be notifed of new upstream software release -UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz -## -## Catalog name is the name to be used with pkg{-get,util} -i . -## It is different from the system package name, which by convention is CSWpkgname. -## CATALOGNAME = -## -## Set to 1 to mark the package as architecture-independent. -## ARCHALL = 0 -## -## A list of files / patterns that should be excluded from the package. Amends -## the default list of excluded filenames $(MERGE_EXCLUDE_DEFAULT), which -## contains things like libtool .la files and files with a leading ~. -## EXTRA_MERGE_EXCLUDE_FILES = -## -## A list of space separated package names that should be marked as -## incompatible with the current package. This will go into the depend file. -## When a user has one of the incompatible packages installed and installs -## your package, he will be prompted that the incompatible package must be -## removed. He will however not be prevented to install your package without -## removing the conflicting package first. -## INCOMPATIBLE_PKGS = -## -## The name of the license file that should be included in your package. Defaults -## to COPYING. See http://sourceforge.net/apps/trac/gar/wiki/CopyRightfor details -## on including and displaying licenses. -## LICENSE = -## -## A list of space separated package names that should be produced from your -## Makefile. This is used when a software has different components that can be -## packaged and used individually (think runtime libraries, client tools, server -## files, development headers). You don't need to set this when you just want to -## produce one package. -## -## When you set this variable to include more than one package, you also need to -## set PKGFILES_CSWpkgname for each package (except for the first one in your -## $(PACKAGES) list) to define which files go into each package. The first -## package from $(PACKAGES) one will hold all files that are not matched by -## PKGFILES_ for other packages. -## PACKAGES = -## -## If specified, GAR feeds the almost-final package prototype file to -## $(PROTOTYPE_FILTER) and reads the final package prototype file from it. -## $(PROTOTYPE_FILTER) is usually a sed/awk/perl one-liner, which was mostly used -## to prepare the prototype file for use with cswclassutils (see -## $(SPKG_CLASSES)). Now that there are convenience variables for cswclassutils, -## you will rarely have to use this. A still valid use case would be to change -## the file permissions of a file to be set-UID. -## See http://wiki.opencsw.org/cswclassutils-package for common usage information -## PROTOTYPE_FILTER = -## -## cswclassutils settings -## -## A list of action classes. Possible values are: -## none cswpreserveconf cswcpsampleconf cswpycompile cswusergroup cswinitsmf -## cswinetd cswetcservices -## The class 'cswinitsmf' must be the last class listed. When you use cswclassutils, -## you need to add CSWcswclassutils to REQUIRED_PKGS. -## SPKG_CLASSES = none -## Simplified settings for classes: -## PRESERVECONF = -## SAMPLECONF = -## INITSMF = -## USERGROUP = -## ETCSERVICES = -## INETDCONF = -## A list of runtime package dependencies in the form of CSWfoo. -## REQUIRED_PKGS = -## -## A list of packages necessary to build this package -## PREREQUISITE_PKGS = $(REQUIRED_PKGS) -## -## When using non-empty $(PACKAGES): -## REQUIRED_PKGS_CSWpkgname = -## SPKG_DESC_CSWpkgname = -## PKGFILES_CSWpkgname = -## CATALOGNAME_CSWpkgname = -## -## A list of space separated directories where objects should be stripped in -## addition to the bin/ and sbin/ directories. -## STRIP_DIRS = -## -## Define a custom target for the configure phase. When you set this, the target -## that will be used instead of configure: target, is named -## configure-$(CONFIGURE_SCRIPTS) and you will need to define it in your Makefile -## after including gar/gar.include.mk. If you want to skip the configure phase -## completely (for example when your software doesn't need to be compiled) assign -## this variable an empty value. The procedure works for configure, build, -## install and test steps. -## CONFIGURE_SCRIPTS = -## BUILD_SCRIPTS = -## INSTALL_SCRIPTS = -## TEST_SCRIPTS = -## -## Compilation settings -## -## The build directory. -## WORKSRC = $(WORKDIR)/$(GARNAME)-$(GARVERSION) -## -## BUILD_ARGS is passed as an argument to gmake during the build phase. Use this -## for example, if you need to override Makefile variables. -## BUILD_ARGS = -## -## Arguments passed to the ./configure script. +SPKG_SOURCEURL = http://moc.daper.net/ +MASTER_SITES = ftp://ftp.daper.net/pub/soft/moc/stable/ +PATCHFILES = remove-export-dynamic.patch +DISTFILES = $(GARNAME)-$(GARVERSION).tar.bz2 +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.bz2 CONFIGURE_ARGS = $(DIRPATHS) -## -## BUILD64 = -## CONFIGURE_ENV = -## EXTRA_CFLAGS = -## EXTRA_LDFLAGS = -## EXTRA_INC = -## EXTRA_LIB = -## GARFLAVOR = -## INSTALL_ARGS = -## OPT_FLAGS_SOS = -xO3 -## OPT_FLAGS_GCC = -O2 -pipe -## -## The compiler to use. Defaults to SOS11, can be also: SOS12, GCC3, GCC4. -## GARCOMPILER = SOS11 -## -# Remove the following rules and uncomment the -# include before building. -all: .DEFAULT -.DEFAULT: - @true +EXTRA_LDFLAGS = -lsocket -#include gar/category.mk +# Doesn't compile yet. +# +# The current problem is that the configure script checks for soundcard.h and +# when it's not there, it concludes that there's no OSS. It might be explained +# by moc never having been built on Solaris yet. + +include gar/category.mk Modified: csw/mgar/pkg/moc/trunk/checksums =================================================================== --- csw/mgar/pkg/template/trunk/checksums 2010-01-08 11:02:13 UTC (rev 7915) +++ csw/mgar/pkg/moc/trunk/checksums 2010-01-11 15:28:58 UTC (rev 7969) @@ -0,0 +1,2 @@ +647c770a5542a4ae5437386807a89796 moc-2.4.4.tar.bz2 +f2500b397dd3e1944447da1f3ece14a0 remove-export-dynamic.patch This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From hson at users.sourceforge.net Mon Jan 11 16:53:57 2010 From: hson at users.sourceforge.net (hson at users.sourceforge.net) Date: Mon, 11 Jan 2010 15:53:57 +0000 Subject: [csw-devel] SF.net SVN: gar:[7970] csw/mgar/pkg/ImageMagick/trunk/Makefile Message-ID: Revision: 7970 http://gar.svn.sourceforge.net/gar/?rev=7970&view=rev Author: hson Date: 2010-01-11 15:53:57 +0000 (Mon, 11 Jan 2010) Log Message: ----------- imagemagick: Fixes for linking X11 libs Modified Paths: -------------- csw/mgar/pkg/ImageMagick/trunk/Makefile Modified: csw/mgar/pkg/ImageMagick/trunk/Makefile =================================================================== --- csw/mgar/pkg/ImageMagick/trunk/Makefile 2010-01-11 15:28:58 UTC (rev 7969) +++ csw/mgar/pkg/ImageMagick/trunk/Makefile 2010-01-11 15:53:57 UTC (rev 7970) @@ -20,23 +20,24 @@ LICENSE = LICENSE -REQUIRED_PKGS += CSWbzip2 CSWdjvulibre CSWfconfig CSWftype2 CSWggettextrt +REQUIRED_PKGS += CSWbzip2 CSWdjvulibrert CSWfconfig CSWftype2 CSWggettextrt REQUIRED_PKGS += CSWglib2 CSWgs CSWgtk2 CSWilmbase CSWjasper CSWjbigkit REQUIRED_PKGS += CSWjpeg CSWlcms CSWlibcairo CSWlibfpx CSWlibrsvg CSWlibxml2 REQUIRED_PKGS += CSWopenexr CSWperl CSWpng CSWsunmath CSWtiff CSWwmf CSWzlib -REQUIRED_PKGS += CSWlibtoolrt CSWlibice CSWlibsm CSWlibxext +REQUIRED_PKGS += CSWlibtoolrt CSWlibice CSWlibsm CSWlibxext CSWgraphviz +REQUIRED_PKGS += CSWlibx11 CSWlibxt # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = ImageMagick-((\d+(?:\.\d+)*)-(\d+)?).tar.bz2 -CPPFLAGS += -I/usr/openwin/include -I/usr/openwin/include/X11 +#CPPFLAGS += -I/usr/openwin/include -I/usr/openwin/include/X11 CONFIGURE_ARGS = $(DIRPATHS) CONFIGURE_ARGS += --with-perl=$(bindir)/perl CONFIGURE_ARGS += --enable-shared --disable-static CONFIGURE_ARGS += --with-dps=yes --with-gslib=yes -CONFIGURE_ARGS += --x-includes=/usr/openwin/include -CONFIGURE_ARGS += --x-libraries=/usr/openwin/lib +CONFIGURE_ARGS += --x-includes=/opt/csw/X11/include +CONFIGURE_ARGS += --x-libraries=/opt/csw/X11/lib CONFIGURE_ARGS += --disable-openmp PATCHFILES += Makefile.patch @@ -44,9 +45,17 @@ #PATCHFILES += djvu.c.diff # Test has to be run *after* install -TEST_SCRIPTS = +#TEST_TARGET = check +TEST_TARGET = +EXTRA_INC = $(prefix)/X11/include +EXTRA_LIB = $(prefix)/X11/lib +EXTRA_PKG_CONFIG_DIRS = $(prefix)/X11/lib EXTRA_LD_OPTIONS = -L./magick/.libs +# We want to be link with Xrender from $(prefix)/X11/lib not $(prefix)/lib +# since the latter is linked to /usr/openwin/lib/libX11.so.4 +EXTRA_SOS_LD_FLAGS = -L$(abspath $(prefix)/X11/lib/$(MM_LIBDIR)) + MERGE_EXCLUDE_LIBTOOL ?= $(libdir)/lib.*\.la EXTRA_MERGE_EXCLUDE_FILES = .*/perllocal.pod This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Mon Jan 11 18:03:34 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Mon, 11 Jan 2010 17:03:34 +0000 Subject: [csw-devel] SF.net SVN: gar:[7971] csw/mgar/pkg/keychain/trunk Message-ID: Revision: 7971 http://gar.svn.sourceforge.net/gar/?rev=7971&view=rev Author: wahwah Date: 2010-01-11 17:03:34 +0000 (Mon, 11 Jan 2010) Log Message: ----------- keychain: patching to use CSWbash Modified Paths: -------------- csw/mgar/pkg/keychain/trunk/Makefile csw/mgar/pkg/keychain/trunk/checksums Added Paths: ----------- csw/mgar/pkg/keychain/trunk/files/bash.patch Modified: csw/mgar/pkg/keychain/trunk/Makefile =================================================================== --- csw/mgar/pkg/keychain/trunk/Makefile 2010-01-11 15:53:57 UTC (rev 7970) +++ csw/mgar/pkg/keychain/trunk/Makefile 2010-01-11 17:03:34 UTC (rev 7971) @@ -20,7 +20,8 @@ MASTER_SITES = http://www.funtoo.org/archive/keychain/ DISTFILES = $(GARNAME)-$(GARVERSION).tar.bz2 -PATCHFILES = gsed.patch +PATCHFILES += bash.patch +PATCHFILES += gsed.patch UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.bz2 @@ -30,7 +31,8 @@ INSTALL_SCRIPTS = keychain TEST_SCRIPTS = -PREREQUISITE_PKGS = CSWperl +REQUIRED_PKGS = CSWbash +PREREQUISITE_PKGS = $(REQUIRED_PKGS) CSWperl include gar/category.mk Modified: csw/mgar/pkg/keychain/trunk/checksums =================================================================== --- csw/mgar/pkg/keychain/trunk/checksums 2010-01-11 15:53:57 UTC (rev 7970) +++ csw/mgar/pkg/keychain/trunk/checksums 2010-01-11 17:03:34 UTC (rev 7971) @@ -1,2 +1,3 @@ +6485201fc090ad73b72971357e018d52 bash.patch ad52a3ab14a63ccff22cac5076286bcb gsed.patch c5eecd36130d9e8617a77f96b746982d keychain-2.7.0.tar.bz2 Added: csw/mgar/pkg/keychain/trunk/files/bash.patch =================================================================== --- csw/mgar/pkg/keychain/trunk/files/bash.patch (rev 0) +++ csw/mgar/pkg/keychain/trunk/files/bash.patch 2010-01-11 17:03:34 UTC (rev 7971) @@ -0,0 +1,11 @@ +Looks like keychain is written in bash, but declares /bin/sh as the shell. +Let's fix it. + +--- keychain-2.7.0/keychain.sh.orig 2010-01-11 18:18:26.606373414 +0100 ++++ keychain-2.7.0/keychain.sh 2010-01-11 18:18:42.710377114 +0100 +@@ -1,4 +1,4 @@ +-#!/bin/sh ++#!/opt/csw/bin/bash + + # Copyright 1999-2005 Gentoo Foundation + # Copyright 2007 Aron Griffis This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Mon Jan 11 22:45:38 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Mon, 11 Jan 2010 21:45:38 +0000 Subject: [csw-devel] SF.net SVN: gar:[7972] csw/mgar/pkg/examples Message-ID: Revision: 7972 http://gar.svn.sourceforge.net/gar/?rev=7972&view=rev Author: wahwah Date: 2010-01-11 21:45:37 +0000 (Mon, 11 Jan 2010) Log Message: ----------- examples/multiple-versions: Initial commit of an example of supporting multiple software versions Modified Paths: -------------- csw/mgar/pkg/examples/multiple-versions/trunk/Makefile csw/mgar/pkg/examples/multiple-versions/trunk/checksums Added Paths: ----------- csw/mgar/pkg/examples/multiple-versions/ csw/mgar/pkg/examples/multiple-versions/trunk/files/hello-0.1.0.tar.gz Modified: csw/mgar/pkg/examples/multiple-versions/trunk/Makefile =================================================================== --- csw/mgar/pkg/template/trunk/Makefile 2010-01-11 17:03:34 UTC (rev 7971) +++ csw/mgar/pkg/examples/multiple-versions/trunk/Makefile 2010-01-11 21:45:37 UTC (rev 7972) @@ -2,184 +2,44 @@ # Distributed under the terms of the GNU General Public License v2 # $Id$ -## This file contains comments to guide you through various GAR settings. -## Please remove unnecessary comments before committing your code to the code -## repository. The comments to remove are marked with double hashes. -## If you want to remove them all in-place, use: -## gsed -i -e '/^##/d' Makefile -## -## For more information about GAR variables, please see: -## https://sourceforge.net/apps/trac/gar/wiki/GAR%20Variable%20Reference -## -GARNAME = mypkg -GARVERSION = 1.0 -## -## The category that your software fits in. This is not a descriptive field, but -## influences the build process. Depending on the CATEGORIES setting, different -## Makefiles are included from gar/categories/ in your trunk directory, which -## adjust the build settings for the respective category. -## -## Possible settings are: -## apps, cpan, devel, gnome, java, kde, lang, lib, meta, net, python, server, -## utils, x11, xfce, xorg, xtra -CATEGORIES = lib -## -## A one-line description of the package, which will appear in the pkginfo. -DESCRIPTION = -## -## A longer description of the package. This is only for descriptive purposes -## inside the Makefile and is not used elsewhere. +GARNAME = multiple-versions +BASE_VERSION = 0.1 +GARVERSION = $(BASE_VERSION).0 +CATEGORIES = apps +DESCRIPTION = Example layout that supports multiple versions of a program. define BLURB - + + This package description is an example of a layout supporting multiple + versions of the packaged software. It's been created for testing purposes. + endef -## -## Upstream URL that should show up in the VENDOR field as well as on -## http://opencsw.org/packages/. SPKG_SOURCEURL = -## -## Whitespace-separated list of URLs to download the source package from. -## There are presets: $(SF_MIRRORS), $(GNU_MIRRORS) and $(GOOGLE_MIRROR). + +version_dependent = /lib/$(GARNAME)/$(BASE_VERSION) +bindir_install = $(prefix)$(version_dependent)/bin +bindir = $(prefix)$(version_dependent)/bin +sbindir_install = $(prefix)$(version_dependent)/sbin +sbindir = $(prefix)$(version_dependent)/sbin +libdir_install = $(prefix)$(version_dependent)/lib +libdir = $(prefix)$(version_dependent)/lib +localstatedir = /var$(prefix)/$(GARNAME)/$(BASE_VERSION) +sysconfdir = /etc$(prefix)/$(GARNAME)/$(BASE_VERSION) +datadir = $(prefix)/share/$(GARNAME)/$(BASE_VERSION) +docdir = $(prefix)/share/doc/$(GARNAME)-$(BASE_VERSION) +includedir = $(prefix)/include/$(GARNAME)/$(BASE_VERSION) +infodir = $(datadir)/info +libexecdir_install = $(prefix)/libexec/$(GARNAME)/$(BASE_VERSION) +lispdir = $(datadir)/emacs/site-lisp +mandir = $(datadir)/man +sharedstatedir = $(prefix)/share/$(GARNAME)/$(BASE_VERSION) +sourcedir = $(prefix)/src/$(GARNAME)/$(BASE_VERSION) + MASTER_SITES = -## -## SF_PROJ is required if you set $(MASTER_SITES) to $(SF_MIRRORS) and the -## Sourceforge project name differs from $(GARNAME). Specifies the Sourceforge -## project name of the software you wish to download. -## SF_PROJ = -## -## A list of space separated patch filenames from files/ that are to be applied -## to the extracted software before the ./configure stage. Patches need to be -## included in the DISTFILES variable as well. -## PATCHFILES = -## -## Whitespace-separated list of files which comprise this build. mGAR will look -## for the files in the $(FILEDIR) (trunk/files) directory and on the -## $(MASTER_SITES). -DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz -## -## We define upstream file regex so we can be notifed of new upstream software release -UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz -## -## Catalog name is the name to be used with pkg{-get,util} -i . -## It is different from the system package name, which by convention is CSWpkgname. -## CATALOGNAME = -## -## Set to 1 to mark the package as architecture-independent. -## ARCHALL = 0 -## -## A list of files / patterns that should be excluded from the package. Amends -## the default list of excluded filenames $(MERGE_EXCLUDE_DEFAULT), which -## contains things like libtool .la files and files with a leading ~. -## EXTRA_MERGE_EXCLUDE_FILES = -## -## A list of space separated package names that should be marked as -## incompatible with the current package. This will go into the depend file. -## When a user has one of the incompatible packages installed and installs -## your package, he will be prompted that the incompatible package must be -## removed. He will however not be prevented to install your package without -## removing the conflicting package first. -## INCOMPATIBLE_PKGS = -## -## The name of the license file that should be included in your package. Defaults -## to COPYING. See http://sourceforge.net/apps/trac/gar/wiki/CopyRightfor details -## on including and displaying licenses. -## LICENSE = -## -## A list of space separated package names that should be produced from your -## Makefile. This is used when a software has different components that can be -## packaged and used individually (think runtime libraries, client tools, server -## files, development headers). You don't need to set this when you just want to -## produce one package. -## -## When you set this variable to include more than one package, you also need to -## set PKGFILES_CSWpkgname for each package (except for the first one in your -## $(PACKAGES) list) to define which files go into each package. The first -## package from $(PACKAGES) one will hold all files that are not matched by -## PKGFILES_ for other packages. -## PACKAGES = -## -## If specified, GAR feeds the almost-final package prototype file to -## $(PROTOTYPE_FILTER) and reads the final package prototype file from it. -## $(PROTOTYPE_FILTER) is usually a sed/awk/perl one-liner, which was mostly used -## to prepare the prototype file for use with cswclassutils (see -## $(SPKG_CLASSES)). Now that there are convenience variables for cswclassutils, -## you will rarely have to use this. A still valid use case would be to change -## the file permissions of a file to be set-UID. -## See http://wiki.opencsw.org/cswclassutils-package for common usage information -## PROTOTYPE_FILTER = -## -## cswclassutils settings -## -## A list of action classes. Possible values are: -## none cswpreserveconf cswcpsampleconf cswpycompile cswusergroup cswinitsmf -## cswinetd cswetcservices -## The class 'cswinitsmf' must be the last class listed. When you use cswclassutils, -## you need to add CSWcswclassutils to REQUIRED_PKGS. -## SPKG_CLASSES = none -## Simplified settings for classes: -## PRESERVECONF = -## SAMPLECONF = -## INITSMF = -## USERGROUP = -## ETCSERVICES = -## INETDCONF = -## A list of runtime package dependencies in the form of CSWfoo. -## REQUIRED_PKGS = -## -## A list of packages necessary to build this package -## PREREQUISITE_PKGS = $(REQUIRED_PKGS) -## -## When using non-empty $(PACKAGES): -## REQUIRED_PKGS_CSWpkgname = -## SPKG_DESC_CSWpkgname = -## PKGFILES_CSWpkgname = -## CATALOGNAME_CSWpkgname = -## -## A list of space separated directories where objects should be stripped in -## addition to the bin/ and sbin/ directories. -## STRIP_DIRS = -## -## Define a custom target for the configure phase. When you set this, the target -## that will be used instead of configure: target, is named -## configure-$(CONFIGURE_SCRIPTS) and you will need to define it in your Makefile -## after including gar/gar.include.mk. If you want to skip the configure phase -## completely (for example when your software doesn't need to be compiled) assign -## this variable an empty value. The procedure works for configure, build, -## install and test steps. -## CONFIGURE_SCRIPTS = -## BUILD_SCRIPTS = -## INSTALL_SCRIPTS = -## TEST_SCRIPTS = -## -## Compilation settings -## -## The build directory. -## WORKSRC = $(WORKDIR)/$(GARNAME)-$(GARVERSION) -## -## BUILD_ARGS is passed as an argument to gmake during the build phase. Use this -## for example, if you need to override Makefile variables. -## BUILD_ARGS = -## -## Arguments passed to the ./configure script. +DISTFILES = hello-$(GARVERSION).tar.gz +CATALOGNAME = multiple_versions +TEST_SCRIPTS = +WORKSRC = $(WORKDIR)/hello-$(GARVERSION) CONFIGURE_ARGS = $(DIRPATHS) -## -## BUILD64 = -## CONFIGURE_ENV = -## EXTRA_CFLAGS = -## EXTRA_LDFLAGS = -## EXTRA_INC = -## EXTRA_LIB = -## GARFLAVOR = -## INSTALL_ARGS = -## OPT_FLAGS_SOS = -xO3 -## OPT_FLAGS_GCC = -O2 -pipe -## -## The compiler to use. Defaults to SOS11, can be also: SOS12, GCC3, GCC4. -## GARCOMPILER = SOS11 -## -# Remove the following rules and uncomment the -# include before building. -all: .DEFAULT -.DEFAULT: - @true +BUILD64 = 1 -#include gar/category.mk +include gar/category.mk Modified: csw/mgar/pkg/examples/multiple-versions/trunk/checksums =================================================================== --- csw/mgar/pkg/template/trunk/checksums 2010-01-11 17:03:34 UTC (rev 7971) +++ csw/mgar/pkg/examples/multiple-versions/trunk/checksums 2010-01-11 21:45:37 UTC (rev 7972) @@ -0,0 +1 @@ +4f3e25ac55024d443aae34c088c3b520 hello-0.1.0.tar.gz Added: csw/mgar/pkg/examples/multiple-versions/trunk/files/hello-0.1.0.tar.gz =================================================================== (Binary files differ) Property changes on: csw/mgar/pkg/examples/multiple-versions/trunk/files/hello-0.1.0.tar.gz ___________________________________________________________________ Added: svn:mime-type + application/octet-stream This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From skayser at users.sourceforge.net Tue Jan 12 00:23:28 2010 From: skayser at users.sourceforge.net (skayser at users.sourceforge.net) Date: Mon, 11 Jan 2010 23:23:28 +0000 Subject: [csw-devel] SF.net SVN: gar:[7973] csw/mgar/pkg/mtr/trunk Message-ID: Revision: 7973 http://gar.svn.sourceforge.net/gar/?rev=7973&view=rev Author: skayser Date: 2010-01-11 23:23:27 +0000 (Mon, 11 Jan 2010) Log Message: ----------- mtr: build a base package w/o X11 (mtr) and one with X11 (mtr_gtk) Modified Paths: -------------- csw/mgar/pkg/mtr/trunk/Makefile csw/mgar/pkg/mtr/trunk/checksums csw/mgar/pkg/mtr/trunk/files/changelog.CSW Added Paths: ----------- csw/mgar/pkg/mtr/trunk/files/0001-Makefile.am-honor-program-prefix-suffix-transform-na.patch csw/mgar/pkg/mtr/trunk/files/0002-configure.in-check-socklen_t-via-sys-socket.h.patch Modified: csw/mgar/pkg/mtr/trunk/Makefile =================================================================== --- csw/mgar/pkg/mtr/trunk/Makefile 2010-01-11 21:45:37 UTC (rev 7972) +++ csw/mgar/pkg/mtr/trunk/Makefile 2010-01-11 23:23:27 UTC (rev 7973) @@ -1,6 +1,6 @@ # TODO # ---- -# * Revisit curses autoconf detection. Maybe have a chat with upstream +# - Revisit curses autoconf detection. Maybe have a chat with upstream # as the README says that there are known, yet unsolved Solaris autoconf # recipe problems # @@ -21,85 +21,98 @@ about each machine. endef -SPKG_SOURCEURL = http://www.bitwizard.nl/mtr/ +VENDOR_URL = http://www.bitwizard.nl/mtr/ MASTER_SITES = ftp://ftp.bitwizard.nl/mtr/ -DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz +DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz -PACKAGES = CSWmtr CSWmtrtiny +# Build the base package without X support and have an additional one that +# supports X. http://article.gmane.org/gmane.os.solaris.opencsw.maintainers/5090 +PACKAGES = CSWmtr CSWmtr-gtk -CATALOGNAME_CSWmtr = mtr -SPKG_DESC_CSWmtr = Combined traceroute and ping utility -REQUIRED_PKGS_CSWmtr = CSWgtk2 CSWlibatk CSWpango CSWlibcairo -REQUIRED_PKGS_CSWmtr += CSWggettextrt CSWglib2 CSWncurses -REQUIRED_PKGS_CSWmtr += CSWfconfig CSWftype2 CSWzlib -INCOMPATIBLE_PKGS_CSWmtr = CSWmtrtiny -EXTRA_PKGFILES_EXCLUDED_CSWmtr = $(sbindir)/mtr-nongui +# Just catch those files belonging to CSWmtr-gtk, all others will go to CSWmtr. +PKGFILES_CSWmtr-gtk = .*/mtr_gtk.* +PKGFILES_CSWmtr-gtk += .*/xmtr.* -CATALOGNAME_CSWmtrtiny = mtr_tiny -SPKG_DESC_CSWmtrtiny = Combined traceroute and ping utility (CLI only version) -REQUIRED_PKGS_CSWmtrtiny = CSWncurses -INCOMPATIBLE_PKGS_CSWmtrtiny = CSWmtr -EXTRA_PKGFILES_EXCLUDED_CSWmtrtiny = $(sbindir)/mtr-gui +CATALOGNAME_CSWmtr = mtr +SPKG_DESC_CSWmtr = Combined traceroute and ping utility (CLI only) +REQUIRED_PKGS_CSWmtr += CSWncurses +CATALOGNAME_CSWmtr-gtk = mtr_gtk +SPKG_DESC_CSWmtr-gtk = Combined traceroute and ping utility (GUI version) +REQUIRED_PKGS_CSWmtr-gtk = CSWgtk2 +REQUIRED_PKGS_CSWmtr-gtk += CSWfconfig +REQUIRED_PKGS_CSWmtr-gtk += CSWftype2 +REQUIRED_PKGS_CSWmtr-gtk += CSWggettextrt +REQUIRED_PKGS_CSWmtr-gtk += CSWglib2 +REQUIRED_PKGS_CSWmtr-gtk += CSWlibatk +REQUIRED_PKGS_CSWmtr-gtk += CSWlibcairo +REQUIRED_PKGS_CSWmtr-gtk += CSWncurses +REQUIRED_PKGS_CSWmtr-gtk += CSWpango + # 1) Check for socklen_t via sys/socket.h (not netinet/in.h) # 2) Don't cast sin_addr to (struct in_addr), cc bails out with invalid cast PATCHFILES = gar-base.diff +PATCHFILES += 0001-Makefile.am-honor-program-prefix-suffix-transform-na.patch +# Could be redone into a proper portable socklen_t check like the one from +# gnulib's socklen.m4 and submitted back upstream. +PATCHFILES += 0002-configure.in-check-socklen_t-via-sys-socket.h.patch TEST_SCRIPTS = - CONFIGURE_ARGS = $(DIRPATHS) -# ------------------ BEWARE: NASTY HACK AHEAD -------------------- -# # We employ modulations to produce two mtr binaries, one with X support -# the other one without (less dependencies). We need to transform the -# name on merge so that the binaries don't clash and fiddle the correct -# binary into the proper path again on package assembly (via prototype). +# the other one without (less dependencies). # EXTRA_MODULATORS = GUI MODULATIONS_GUI = disable enable - - CONFIGURE_ARGS_GUI-disable = --without-gtk -CONFIGURE_ARGS_GUI-enable = --disable-gtktest +CONFIGURE_ARGS_GUI-enable = --disable-gtktest +CONFIGURE_ARGS_GUI-enable += --program-prefix=x CONFIGURE_ARGS += $(CONFIGURE_ARGS_GUI-$(GUI)) -EXTRA_PKG_CONFIG_PATH_GUI-enable = /opt/csw/X11/lib/pkgconfig -EXTRA_PKG_CONFIG_PATH += $(EXTRA_PKG_CONFIG_PATH_GUI-$(GUI)) +ifeq ($(GUI),enable) +EXTRA_PKG_CONFIG_PATH = /opt/csw/X11/lib/pkgconfig +EXTRA_SOS_LD_FLAGS = -L$(abspath $(prefix)/X11/lib/$(MM_LIBDIR)) +endif -# Rename the modulated binaries so that we can distinguish them -# Could also be done via ./configure --program-suffix, but the -# install-exec-hook for mtr doesn't honor the transformed name -# and fails. -EXTRA_PAX_ARGS_isa-default-gui-enable = -s ",^.$(sbindir)/mtr$$,$(sbindir)/mtr-gui,p" -EXTRA_PAX_ARGS_isa-default-gui-disable = -s ",^.$(sbindir)/mtr$$,$(sbindir)/mtr-nongui,p" +# These two should work instead of the four ones below, but they don't. +# license is the only file that ends up in pkgroot/. +#MERGE_SCRIPTS_isa-default-gui-enable = copy-all +#MERGE_SCRIPTS_isa-default-gui-disable = copy-all -# Simply copy all files, EXTRA_PAX_ARGS above takes care not to overwrite the -# mtr binary on merging. -MERGE_SCRIPTS_isa-default-gui-enable = copy-all -MERGE_SCRIPTS_isa-default-gui-disable = copy-all +MERGE_SCRIPTS_isa-i386-gui-enable = copy-all +MERGE_SCRIPTS_isa-sparcv8-gui-enable = copy-all +MERGE_SCRIPTS_isa-i386-gui-disable = copy-all +MERGE_SCRIPTS_isa-sparcv8-gui-disable = copy-all # Make mtr setuid so that it can access raw sockets PROTOTYPE_MODIFIERS = makesuid -PROTOTYPE_FILES_makesuid = $(sbindir)/mtr-.* +PROTOTYPE_FILES_makesuid = $(sbindir)/x?mtr PROTOTYPE_PERMS_makesuid = 4755 -# ------------------ /BEWARE: NASTY HACK AHEAD -------------------- +# ---- end of modulations relevant settings include gar/category.mk +# Need to autoreconf as we patch configure.in and Makefile.am +pre-configure-modulated: + autoreconf -fi $(WORKSRC) + @$(MAKECOOKIE) + # curses detection is somehow broken, ncurses.h is included but no curses # lib is added to LIBS (according to comments in configure.in termcap is only # included to satisfy Solaris curses dependencies) post-configure-modulated: - @perl -pi -e 'if (/^LIBS =/) { s|-ltermcap|-lncurses| }' \ + perl -pi -e 'if (/^LIBS =/) { s|-ltermcap|-lncurses| }' \ $(WORKSRC)/Makefile @$(MAKECOOKIE) -post-install-modulated: - @ginstall -d $(DESTDIR)$(docdir)/$(CATALOGNAME) - @cp $(FILEDIR)/changelog.CSW $(DESTDIR)$(docdir)/$(CATALOGNAME) +post-merge: + ginstall -d $(PKGROOT)$(docdir)/mtr + ginstall -d $(PKGROOT)$(docdir)/mtr_gtk + cp $(FILEDIR)/changelog.CSW $(PKGROOT)$(docdir)/mtr/ + cp $(FILEDIR)/changelog.CSW $(PKGROOT)$(docdir)/mtr_gtk/ @$(MAKECOOKIE) Modified: csw/mgar/pkg/mtr/trunk/checksums =================================================================== --- csw/mgar/pkg/mtr/trunk/checksums 2010-01-11 21:45:37 UTC (rev 7972) +++ csw/mgar/pkg/mtr/trunk/checksums 2010-01-11 23:23:27 UTC (rev 7973) @@ -1,2 +1,4 @@ +46fbebe2240c1beeefd2b8df272c153a 0001-Makefile.am-honor-program-prefix-suffix-transform-na.patch +2574238ad108bd6f1737adf5fc50df5f 0002-configure.in-check-socklen_t-via-sys-socket.h.patch 4a3e6fef662eb4794e61e334f6c33722 gar-base.diff 23baca52d0922c2ecba7eba05317868c mtr-0.75.tar.gz Added: csw/mgar/pkg/mtr/trunk/files/0001-Makefile.am-honor-program-prefix-suffix-transform-na.patch =================================================================== --- csw/mgar/pkg/mtr/trunk/files/0001-Makefile.am-honor-program-prefix-suffix-transform-na.patch (rev 0) +++ csw/mgar/pkg/mtr/trunk/files/0001-Makefile.am-honor-program-prefix-suffix-transform-na.patch 2010-01-11 23:23:27 UTC (rev 7973) @@ -0,0 +1,28 @@ +From e237f1d4993f48be1cbbf283b0965426af195206 Mon Sep 17 00:00:00 2001 +From: Sebastian Kayser +Date: Mon, 11 Jan 2010 22:25:30 +0100 +Subject: [PATCH] Makefile.am: honor --program-{prefix,suffix,transform-name} + +--- + Makefile.am | 4 +++- + 1 files changed, 3 insertions(+), 1 deletions(-) + +diff --git a/Makefile.am b/Makefile.am +index 7ff9ddf..1702674 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -2,8 +2,10 @@ SUBDIRS = img + + sbin_PROGRAMS = mtr + man_MANS = mtr.8 ++actual_mtr = `echo mtr | sed '$(transform)'` ++ + install-exec-hook: +- chmod u+s $(DESTDIR)$(sbindir)/mtr ++ chmod u+s $(DESTDIR)$(sbindir)/$(actual_mtr) + + mtr_SOURCES = mtr.c \ + net.c net.h \ +-- +1.6.5.1 + Added: csw/mgar/pkg/mtr/trunk/files/0002-configure.in-check-socklen_t-via-sys-socket.h.patch =================================================================== --- csw/mgar/pkg/mtr/trunk/files/0002-configure.in-check-socklen_t-via-sys-socket.h.patch (rev 0) +++ csw/mgar/pkg/mtr/trunk/files/0002-configure.in-check-socklen_t-via-sys-socket.h.patch 2010-01-11 23:23:27 UTC (rev 7973) @@ -0,0 +1,25 @@ +From c1321af12b27e917b29a427b58d2539e89cc44b2 Mon Sep 17 00:00:00 2001 +From: Sebastian Kayser +Date: Mon, 11 Jan 2010 21:57:53 +0100 +Subject: [PATCH] configure.in: check socklen_t via sys/socket.h + +--- + configure.in | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/configure.in b/configure.in +index d73e994..1015f7b 100644 +--- a/configure.in ++++ b/configure.in +@@ -96,7 +96,7 @@ AC_CHECK_DECLS(errno, , , [[ + ]] ) + + AC_CHECK_TYPE(socklen_t, AC_DEFINE([HAVE_SOCKLEN_T], [], [Define if your system has socklen_t]) , , [[ +-#include ++#include + ]]) + + AC_CHECK_TYPE(struct in_addr, AC_DEFINE([HAVE_STRUCT_INADDR], [], [Define if you have struct in_addr]), , [[ +-- +1.6.5.1 + Modified: csw/mgar/pkg/mtr/trunk/files/changelog.CSW =================================================================== --- csw/mgar/pkg/mtr/trunk/files/changelog.CSW 2010-01-11 21:45:37 UTC (rev 7972) +++ csw/mgar/pkg/mtr/trunk/files/changelog.CSW 2010-01-11 23:23:27 UTC (rev 7973) @@ -1,5 +1,7 @@ mtr (0.75,REV=2009.06.19) * Adopted and updated to 0.75. (Closes #2557, #3278) + * Split off a separate mtr_gtk package for the GUI version. The mtr package + is now CLI only which equates to less dependencies. -- Sebastian Kayser Fri, 19 Jun 2009 00:26:08 +0200 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From skayser at users.sourceforge.net Tue Jan 12 00:26:21 2010 From: skayser at users.sourceforge.net (skayser at users.sourceforge.net) Date: Mon, 11 Jan 2010 23:26:21 +0000 Subject: [csw-devel] SF.net SVN: gar:[7974] csw/mgar/pkg/mtr/trunk/Makefile Message-ID: Revision: 7974 http://gar.svn.sourceforge.net/gar/?rev=7974&view=rev Author: skayser Date: 2010-01-11 23:26:20 +0000 (Mon, 11 Jan 2010) Log Message: ----------- mtr: rename mtr_gtk to mtr_x11 Modified Paths: -------------- csw/mgar/pkg/mtr/trunk/Makefile Modified: csw/mgar/pkg/mtr/trunk/Makefile =================================================================== --- csw/mgar/pkg/mtr/trunk/Makefile 2010-01-11 23:23:27 UTC (rev 7973) +++ csw/mgar/pkg/mtr/trunk/Makefile 2010-01-11 23:26:20 UTC (rev 7974) @@ -28,27 +28,27 @@ # Build the base package without X support and have an additional one that # supports X. http://article.gmane.org/gmane.os.solaris.opencsw.maintainers/5090 -PACKAGES = CSWmtr CSWmtr-gtk +PACKAGES = CSWmtr CSWmtr-x11 -# Just catch those files belonging to CSWmtr-gtk, all others will go to CSWmtr. -PKGFILES_CSWmtr-gtk = .*/mtr_gtk.* -PKGFILES_CSWmtr-gtk += .*/xmtr.* +# Just catch those files belonging to CSWmtr-x11, all others will go to CSWmtr. +PKGFILES_CSWmtr-x11 = .*/mtr_x11.* +PKGFILES_CSWmtr-x11 += .*/xmtr.* CATALOGNAME_CSWmtr = mtr SPKG_DESC_CSWmtr = Combined traceroute and ping utility (CLI only) REQUIRED_PKGS_CSWmtr += CSWncurses -CATALOGNAME_CSWmtr-gtk = mtr_gtk -SPKG_DESC_CSWmtr-gtk = Combined traceroute and ping utility (GUI version) -REQUIRED_PKGS_CSWmtr-gtk = CSWgtk2 -REQUIRED_PKGS_CSWmtr-gtk += CSWfconfig -REQUIRED_PKGS_CSWmtr-gtk += CSWftype2 -REQUIRED_PKGS_CSWmtr-gtk += CSWggettextrt -REQUIRED_PKGS_CSWmtr-gtk += CSWglib2 -REQUIRED_PKGS_CSWmtr-gtk += CSWlibatk -REQUIRED_PKGS_CSWmtr-gtk += CSWlibcairo -REQUIRED_PKGS_CSWmtr-gtk += CSWncurses -REQUIRED_PKGS_CSWmtr-gtk += CSWpango +CATALOGNAME_CSWmtr-x11 = mtr_x11 +SPKG_DESC_CSWmtr-x11 = Combined traceroute and ping utility (GUI version) +REQUIRED_PKGS_CSWmtr-x11 = CSWgtk2 +REQUIRED_PKGS_CSWmtr-x11 += CSWfconfig +REQUIRED_PKGS_CSWmtr-x11 += CSWftype2 +REQUIRED_PKGS_CSWmtr-x11 += CSWggettextrt +REQUIRED_PKGS_CSWmtr-x11 += CSWglib2 +REQUIRED_PKGS_CSWmtr-x11 += CSWlibatk +REQUIRED_PKGS_CSWmtr-x11 += CSWlibcairo +REQUIRED_PKGS_CSWmtr-x11 += CSWncurses +REQUIRED_PKGS_CSWmtr-x11 += CSWpango # 1) Check for socklen_t via sys/socket.h (not netinet/in.h) # 2) Don't cast sin_addr to (struct in_addr), cc bails out with invalid cast @@ -112,7 +112,7 @@ post-merge: ginstall -d $(PKGROOT)$(docdir)/mtr - ginstall -d $(PKGROOT)$(docdir)/mtr_gtk + ginstall -d $(PKGROOT)$(docdir)/mtr_x11 cp $(FILEDIR)/changelog.CSW $(PKGROOT)$(docdir)/mtr/ - cp $(FILEDIR)/changelog.CSW $(PKGROOT)$(docdir)/mtr_gtk/ + cp $(FILEDIR)/changelog.CSW $(PKGROOT)$(docdir)/mtr_x11/ @$(MAKECOOKIE) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From skayser at users.sourceforge.net Tue Jan 12 00:27:56 2010 From: skayser at users.sourceforge.net (skayser at users.sourceforge.net) Date: Mon, 11 Jan 2010 23:27:56 +0000 Subject: [csw-devel] SF.net SVN: gar:[7975] csw/mgar/pkg/mtr/trunk/files/changelog.CSW Message-ID: Revision: 7975 http://gar.svn.sourceforge.net/gar/?rev=7975&view=rev Author: skayser Date: 2010-01-11 23:27:56 +0000 (Mon, 11 Jan 2010) Log Message: ----------- mtr: updated changelog.CSW Modified Paths: -------------- csw/mgar/pkg/mtr/trunk/files/changelog.CSW Modified: csw/mgar/pkg/mtr/trunk/files/changelog.CSW =================================================================== --- csw/mgar/pkg/mtr/trunk/files/changelog.CSW 2010-01-11 23:26:20 UTC (rev 7974) +++ csw/mgar/pkg/mtr/trunk/files/changelog.CSW 2010-01-11 23:27:56 UTC (rev 7975) @@ -1,7 +1,7 @@ -mtr (0.75,REV=2009.06.19) +mtr (0.75,REV=2010.01.12) * Adopted and updated to 0.75. (Closes #2557, #3278) - * Split off a separate mtr_gtk package for the GUI version. The mtr package + * Split off a separate mtr_x11 package for the GUI version. The mtr package is now CLI only which equates to less dependencies. - -- Sebastian Kayser Fri, 19 Jun 2009 00:26:08 +0200 + -- Sebastian Kayser Tue, 12 Jan 2010 00:14:32 +0100 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From skayser at users.sourceforge.net Tue Jan 12 01:52:05 2010 From: skayser at users.sourceforge.net (skayser at users.sourceforge.net) Date: Tue, 12 Jan 2010 00:52:05 +0000 Subject: [csw-devel] SF.net SVN: gar:[7976] csw/mgar/pkg/httping/trunk Message-ID: Revision: 7976 http://gar.svn.sourceforge.net/gar/?rev=7976&view=rev Author: skayser Date: 2010-01-12 00:52:04 +0000 (Tue, 12 Jan 2010) Log Message: ----------- httping: update to 1.4.1 Modified Paths: -------------- csw/mgar/pkg/httping/trunk/Makefile csw/mgar/pkg/httping/trunk/checksums csw/mgar/pkg/httping/trunk/files/changelog.CSW Added Paths: ----------- csw/mgar/pkg/httping/trunk/files/0001-Makefile-make-options-and-tools-configurable.patch Modified: csw/mgar/pkg/httping/trunk/Makefile =================================================================== --- csw/mgar/pkg/httping/trunk/Makefile 2010-01-11 23:27:56 UTC (rev 7975) +++ csw/mgar/pkg/httping/trunk/Makefile 2010-01-12 00:52:04 UTC (rev 7976) @@ -1,5 +1,8 @@ +# TODO (release-critical prefixed with !, non release-critical with *) +# * Submit 0001-* patch upstream +# * -6 not documented in man page (any others?), feedback to upstream GARNAME = httping -GARVERSION = 1.3.0 +GARVERSION = 1.4.1 CATEGORIES = net DESCRIPTION = Httping is like 'ping' but for http-requests. @@ -11,25 +14,34 @@ endef MASTER_SITES = http://www.vanheusden.com/httping/ -DISTFILES = $(GARNAME)-$(GARVERSION).tgz +DISTFILES = $(GARNAME)-$(GARVERSION).tgz +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tgz REQUIRED_PKGS = CSWosslrt -# We define upstream file regex so we can be notifed of new upstream software release -UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tgz +# Makefile comes pre-set with gcc defaults and hardcoded tools +PATCHFILES = 0001-Makefile-make-options-and-tools-configurable.patch -PATCHFILES = gar-base.diff - CONFIGURE_SCRIPTS = TEST_SCRIPTS = -CONFIGURE_ARGS = $(DIRPATHS) +# Build options (see $(WORKSRC)/Makefile) +EXTRA_LD_FLAGS = -lsocket -lnsl +EXTRA_BUILD_EXPORTS = WFLAGS OFLAGS +WFLAGS = +OFLAGS = +# Install options (see $(WORKSRC)/Makefile) +INSTALL_EXPORTS = PREFIX INSTALL STRIP +PREFIX = $(prefix) +INSTALL = ginstall +STRIP = /usr/ccs/bin/strip + LICENSE = license.txt include gar/category.mk post-install-modulated: - @ginstall -d $(DESTDIR)$(docdir)/$(GARNAME) - @cp $(FILEDIR)/changelog.CSW $(DESTDIR)$(docdir)/$(GARNAME) + ginstall -d $(DESTDIR)$(docdir)/$(GARNAME) + cp $(FILEDIR)/changelog.CSW $(DESTDIR)$(docdir)/$(GARNAME) @$(MAKECOOKIE) Modified: csw/mgar/pkg/httping/trunk/checksums =================================================================== --- csw/mgar/pkg/httping/trunk/checksums 2010-01-11 23:27:56 UTC (rev 7975) +++ csw/mgar/pkg/httping/trunk/checksums 2010-01-12 00:52:04 UTC (rev 7976) @@ -1,2 +1,2 @@ -9f75ad45daa91e67c6677c9959165f89 download/gar-base.diff -41c912a9ecc904e51d7260053fc2195c download/httping-1.3.0.tgz +828d966da2d49e3300a0914e8d6f7b16 0001-Makefile-make-options-and-tools-configurable.patch +bde1ff3c01343d2371d8f34fbf8a1d9a httping-1.4.1.tgz Added: csw/mgar/pkg/httping/trunk/files/0001-Makefile-make-options-and-tools-configurable.patch =================================================================== --- csw/mgar/pkg/httping/trunk/files/0001-Makefile-make-options-and-tools-configurable.patch (rev 0) +++ csw/mgar/pkg/httping/trunk/files/0001-Makefile-make-options-and-tools-configurable.patch 2010-01-12 00:52:04 UTC (rev 7976) @@ -0,0 +1,52 @@ +From f252b0a2a7f87d34dbcdf8bcccde9e6069ac9729 Mon Sep 17 00:00:00 2001 +From: Sebastian Kayser +Date: Tue, 12 Jan 2010 01:10:31 +0100 +Subject: [PATCH] Makefile: make options and tools configurable + +--- + Makefile | 18 +++++++++--------- + 1 files changed, 9 insertions(+), 9 deletions(-) + +diff --git a/Makefile b/Makefile +index 873c57e..0133741 100644 +--- a/Makefile ++++ b/Makefile +@@ -16,26 +16,26 @@ include version + + TARGET=httping + +-WFLAGS=-Wall -W +-OFLAGS=-O2 ++WFLAGS?=-Wall -W ++OFLAGS?=-O2 + CFLAGS+=$(WFLAGS) $(OFLAGS) -DVERSION=\"$(VERSION)\" + + PACKAGE=$(TARGET)-$(VERSION) +-PREFIX=/usr ++PREFIX?=/usr + BINDIR=$(PREFIX)/bin + MANDIR=$(PREFIX)/share/man + DOCDIR=$(PREFIX)/share/doc/$(TARGET) + +-INSTALL=install ++INSTALL?=install + INSTALLDIR=$(INSTALL) -m 0755 -d + INSTALLBIN=$(INSTALL) -m 0755 + INSTALLMAN=$(INSTALL) -m 0644 + INSTALLDOC=$(INSTALL) -m 0644 +-STRIP=/usr/bin/strip +-RMDIR=/bin/rm -rf +-MKDIR=/bin/mkdir +-ARCHIVE=/bin/tar cf - +-COMPRESS=/bin/gzip -9 ++STRIP?=/usr/bin/strip ++RMDIR?=/bin/rm -rf ++MKDIR?=/bin/mkdir ++ARCHIVE?=/bin/tar cf - ++COMPRESS?=/bin/gzip -9 + + OBJS=mem.o http.o io.o str.o error.o utils.o main.o tcp.o res.o + +-- +1.6.5.1 + Modified: csw/mgar/pkg/httping/trunk/files/changelog.CSW =================================================================== --- csw/mgar/pkg/httping/trunk/files/changelog.CSW 2010-01-11 23:27:56 UTC (rev 7975) +++ csw/mgar/pkg/httping/trunk/files/changelog.CSW 2010-01-12 00:52:04 UTC (rev 7976) @@ -1,3 +1,9 @@ +httping (1.4.1,REV=2010.01.12) + + * Updated to 1.4.1 + + -- Sebastian Kayser Tue, 12 Jan 2010 02:08:40 +0100 + httping (1.3.0,REV=2009.05.31) * Adopted and updated to 1.3.0 (Closes: #3458, #2391). This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From skayser at users.sourceforge.net Tue Jan 12 01:52:37 2010 From: skayser at users.sourceforge.net (skayser at users.sourceforge.net) Date: Tue, 12 Jan 2010 00:52:37 +0000 Subject: [csw-devel] SF.net SVN: gar:[7977] csw/mgar/pkg/httping/trunk/files/gar-base.diff Message-ID: Revision: 7977 http://gar.svn.sourceforge.net/gar/?rev=7977&view=rev Author: skayser Date: 2010-01-12 00:52:37 +0000 (Tue, 12 Jan 2010) Log Message: ----------- httping: delete obsolete gar-base.diff Removed Paths: ------------- csw/mgar/pkg/httping/trunk/files/gar-base.diff Deleted: csw/mgar/pkg/httping/trunk/files/gar-base.diff =================================================================== --- csw/mgar/pkg/httping/trunk/files/gar-base.diff 2010-01-12 00:52:04 UTC (rev 7976) +++ csw/mgar/pkg/httping/trunk/files/gar-base.diff 2010-01-12 00:52:37 UTC (rev 7977) @@ -1,33 +0,0 @@ -diff --speed-large-files --minimal -Nru httping-1.3.0.orig/Makefile httping-1.3.0/Makefile ---- httping-1.3.0.orig/Makefile 2009-02-18 16:32:43.000000000 +0100 -+++ httping-1.3.0/Makefile 2009-05-21 12:43:55.083896462 +0200 -@@ -14,22 +14,23 @@ - - include version - --DEBUG=-g # -D_DEBUG --LDFLAGS+=-lssl -lcrypto $(DEBUG) --CFLAGS+=-O2 -Wall -DVERSION=\"$(VERSION)\" $(DEBUG) -+LDFLAGS+=-lssl -lcrypto -lsocket -lnsl -lresolv -+CFLAGS+=-DVERSION=\"$(VERSION)\" - - OBJS=mem.o http.o io.o str.o error.o utils.o main.o tcp.o mssl.o res.o - - all: httping - - httping: $(OBJS) -- $(CC) -Wall -W $(OBJS) $(LDFLAGS) -o httping -+ $(CC) $(CFLAGS) $(OBJS) $(LDFLAGS) -o httping - # - # Oh, blatant plug: http://keetweej.vanheusden.com/wishlist.html - - install: httping -- cp httping $(DESTDIR)/usr/bin -- cp httping.1 $(DESTDIR)/usr/share/man/man1/ -+ ginstall -d $(DESTDIR)$(bindir) -+ ginstall -d $(DESTDIR)$(mandir)/man1 -+ cp httping $(DESTDIR)$(bindir) -+ cp httping.1 $(DESTDIR)$(mandir)/man1 - - clean: - rm -f $(OBJS) core httping This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From janholzh at users.sourceforge.net Tue Jan 12 11:43:11 2010 From: janholzh at users.sourceforge.net (janholzh at users.sourceforge.net) Date: Tue, 12 Jan 2010 10:43:11 +0000 Subject: [csw-devel] SF.net SVN: gar:[7978] csw/mgar/pkg/libsoup2/trunk Message-ID: Revision: 7978 http://gar.svn.sourceforge.net/gar/?rev=7978&view=rev Author: janholzh Date: 2010-01-12 10:43:07 +0000 (Tue, 12 Jan 2010) Log Message: ----------- libsoup2: Initial gar Makefile, some preliminary work Added Paths: ----------- csw/mgar/pkg/libsoup2/trunk/Makefile csw/mgar/pkg/libsoup2/trunk/checksums csw/mgar/pkg/libsoup2/trunk/files/ Property Changed: ---------------- csw/mgar/pkg/libsoup2/trunk/ Property changes on: csw/mgar/pkg/libsoup2/trunk ___________________________________________________________________ Added: svn:externals + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 Added: csw/mgar/pkg/libsoup2/trunk/Makefile =================================================================== --- csw/mgar/pkg/libsoup2/trunk/Makefile (rev 0) +++ csw/mgar/pkg/libsoup2/trunk/Makefile 2010-01-12 10:43:07 UTC (rev 7978) @@ -0,0 +1,27 @@ +GARNAME = libsoup +GARVERSION = 2.26.3 +CATEGORIES = lib + + +DESCRIPTION = HTTP client/server library for GNOME +define BLURB +endef +MASTER_SITES = $(GNOME_MIRROR) +DISTFILES = $(GARNAME)-$(GARVERSION).tar.bz2 + + +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = -(\d+(?:\.\d+)*).tar.bz2 + +PACKAGES = CSWlibsoup2 + + +EXTRA_INC = /opt/csw/X11/include +EXTRA_LIB = /opt/csw/X11/lib +EXTRA_PKG_CONFIG_DIRS = $(prefix)/X11/lib + +CONFIGURE_ARGS = $(DIRPATHS) + +TEST_TARGET = check + +include gar/category.mk Added: csw/mgar/pkg/libsoup2/trunk/checksums =================================================================== --- csw/mgar/pkg/libsoup2/trunk/checksums (rev 0) +++ csw/mgar/pkg/libsoup2/trunk/checksums 2010-01-12 10:43:07 UTC (rev 7978) @@ -0,0 +1 @@ +19f15636380a9a08a0f071cc53069b80 libsoup-2.26.3.tar.bz2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Tue Jan 12 15:24:24 2010 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Tue, 12 Jan 2010 14:24:24 +0000 Subject: [csw-devel] SF.net SVN: gar:[7979] csw/mgar/pkg/tig/trunk/Makefile Message-ID: Revision: 7979 http://gar.svn.sourceforge.net/gar/?rev=7979&view=rev Author: bdwalton Date: 2010-01-12 14:24:19 +0000 (Tue, 12 Jan 2010) Log Message: ----------- tig: add vendor url Modified Paths: -------------- csw/mgar/pkg/tig/trunk/Makefile Modified: csw/mgar/pkg/tig/trunk/Makefile =================================================================== --- csw/mgar/pkg/tig/trunk/Makefile 2010-01-12 10:43:07 UTC (rev 7978) +++ csw/mgar/pkg/tig/trunk/Makefile 2010-01-12 14:24:19 UTC (rev 7979) @@ -3,6 +3,8 @@ CATEGORIES = utils PATCHLEVEL = 1e69632 +VENDOR_URL = http://jonas.nitro.dk/tig/ + DESCRIPTION = A git repository browser define BLURB Tig is a git repository browser that additionally can act as a pager This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From d_pocock at users.sourceforge.net Tue Jan 12 16:53:53 2010 From: d_pocock at users.sourceforge.net (d_pocock at users.sourceforge.net) Date: Tue, 12 Jan 2010 15:53:53 +0000 Subject: [csw-devel] SF.net SVN: gar:[7980] csw/mgar/pkg/ganglia/branches Message-ID: Revision: 7980 http://gar.svn.sourceforge.net/gar/?rev=7980&view=rev Author: d_pocock Date: 2010-01-12 15:53:51 +0000 (Tue, 12 Jan 2010) Log Message: ----------- Start preparing for the 3.1.6 release Modified Paths: -------------- csw/mgar/pkg/ganglia/branches/ganglia-3.1.6-rc/checksums Added Paths: ----------- csw/mgar/pkg/ganglia/branches/ganglia-3.1.6-rc/ csw/mgar/pkg/ganglia/branches/ganglia-3.1.6-rc/Makefile Removed Paths: ------------- csw/mgar/pkg/ganglia/branches/ganglia-3.1.6-rc/Makefile Deleted: csw/mgar/pkg/ganglia/branches/ganglia-3.1.6-rc/Makefile =================================================================== --- csw/mgar/pkg/ganglia/branches/ganglia-3.1.4-rc/Makefile 2009-10-26 14:51:49 UTC (rev 6977) +++ csw/mgar/pkg/ganglia/branches/ganglia-3.1.6-rc/Makefile 2010-01-12 15:53:51 UTC (rev 7980) @@ -1,161 +0,0 @@ -GARNAME = ganglia -GARVERSION = 3.1.4 -CATEGORIES = utils - -# How should we set this? -# There is a release number in configure.in, maybe use that? -# RELVER = - -USER_GMOND = nobody -# nobody shouldn't really be allowed to own any files -# maybe we should add a ganglia user to own the RRD files? -USER_GMETAD = nobody - -DESCRIPTION = A scalable distributed monitoring system -define BLURB - Ganglia is a scalable distributed monitoring system for high-performance computing - systems such as clusters and Grids. It is based on a hierarchical design targeted - at federations of clusters. -endef - -SF_PROJ = ganglia -MASTER_SITES = $(SF_MIRRORS) -DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz -DISTFILES += CSWgangliaweb.postinstall CSWgangliaweb.preremove -DISTFILES += httpd-ganglia.conf.CSW cswgmond cswgmetad - -PACKAGES = CSWgangliart CSWgangliaagent CSWgangliadevel CSWgangliagmetad CSWgangliaweb CSWgangliamodpython - -CATALOGNAME_CSWganglia = ganglia -CATALOGNAME_CSWgangliart = ganglia_rt -CATALOGNAME_CSWgangliaagent = ganglia_agent -CATALOGNAME_CSWgangliamodpython = ganglia_modpython -CATALOGNAME_CSWgangliadevel = ganglia_devel -CATALOGNAME_CSWgangliagmetad = ganglia_gmetad -CATALOGNAME_CSWgangliaweb = ganglia_web - -SPKG_DESC_CSWganglia = Dummy package -SPKG_DESC_CSWgangliart = Ganglia runtime libraries -SPKG_DESC_CSWgangliaagent = Ganglia performance monitoring agent gmond -SPKG_DESC_CSWgangliamodpython = Ganglia agent module for Python metrics -SPKG_DESC_CSWgangliadevel = Ganglia headers for metric module development -SPKG_DESC_CSWgangliagmetad = Ganglia gmetad -SPKG_DESC_CSWgangliaweb = Ganglia web - -PREREQUISITE_PKGS = CSWexpat CSWlibconfuse CSWapache2rt CSWapache2-devel CSWrrd - -REQUIRED_PKGS_CSWgangliart = CSWexpat CSWlibconfuse CSWapache2rt -REQUIRED_PKGS_CSWgangliaagent = CSWexpat CSWlibconfuse CSWapache2rt -REQUIRED_PKGS_CSWgangliaagent += CSWgangliart -REQUIRED_PKGS_CSWgangliamodpython = CSWlibconfuse CSWapache2rt CSWgangliart -REQUIRED_PKGS_CSWgangliamodpython += CSWgangliaagent -REQUIRED_PKGS_CSWgangliadevel = CSWexpat CSWlibconfuse CSWapache2rt -REQUIRED_PKGS_CSWgangliagmetad = CSWexpat CSWlibconfuse CSWapache2rt -REQUIRED_PKGS_CSWgangliagmetad += CSWgangliart CSWgangliaagent CSWrrd -REQUIRED_PKGS_CSWgangliaweb = CSWgangliagmetad -REQUIRED_PKGS_CSWgangliaweb += CSWapache2 CSWphp5 CSWap2modphp5 CSWrrd - -# We define upstream file regex so we can be notifed of new upstream software release -UPSTREAM_MASTER_SITES = $(SF_PROJECT_SHOWFILE)=43021 -UPSTREAM_USE_SF = 1 -UFILES_REGEX = (\d+(?:\.\d+)*) - -# This is attachment #45 from Ganglia bug -# http://bugzilla.ganglia.info/cgi-bin/bugzilla/show_bug.cgi?id=77 -#PATCHFILES = $(GARNAME)-$(GARVERSION)-solaris-cc.patch - -CONFIGURE_ARGS = $(DIRPATHS) - -# Don't build gmetad (not tested yet on Solaris, more deps required to build) -#CONFIGURE_ARGS += --without-gmetad -CONFIGURE_ARGS += --with-gmetad - -# Reduce dependencies, no gettext: -CONFIGURE_ARGS += --disable-nls - -# Use apr from CSWapache2rt -CONFIGURE_ARGS += --with-libapr=/opt/csw/apache2/bin/apr-1-config - -# Include the status module -CONFIGURE_ARGS += --with-status - -# When we enable this, modpython will have to go in a separate package, -# otherwise CSWgangliaagent will have lots of dependencies -# TODO: define a CSWgangliamodpython package -# Depends: some issues exist getting the Python support working on Solaris, -# Ganglia's configure.in needs to be further enhanced for this to work -CONFIGURE_ARGS += --disable-python -#CONFIGURE_ARGS += --with-python=/opt/csw - -# For Ganglia 3.1.2, the test suite doesn't compile cleanly on Solaris, -# so we skip it. This should be re-assessed with each new release -# from upstream. Proposed fixes for the test suite to be submitted -# upstream. -ifeq ($(GARVERSION),3.1.3) -TEST_SCRIPTS = -endif - -INSTALL_SCRIPTS = $(WORKSRC)/Makefile custom - -WWWROOT = /opt/csw/share/www -WWWGANGLIA = $(WWWROOT)/ganglia -sysconfdir = /etc/opt/csw/ganglia -ETCGANGLIA = $(sysconfdir) - -PKGFILES_CSWganglia = -PKGFILES_CSWgangliart = $(libdir)/libganglia.* -PKGFILES_CSWgangliamodpython = .*python.* -PKGFILES_CSWgangliadevel = .*/include/.*.h .*/bin/ganglia-config -PKGFILES_CSWgangliagmetad = .*/gmetad.* /opt/csw/var/ganglia/rrds /etc/opt/csw/init.d/cswgmetad -PKGFILES_CSWgangliaweb = $(WWWGANGLIA)/.* /opt/csw/apache2/etc/extra/.* - -PRESERVECONF = /opt/csw/apache2/etc/extra/httpd-ganglia.conf.CSW - -# For gmond -INITSMF = /etc/opt/csw/init.d/cswgmond -# For gmetad -INITSMF += /etc/opt/csw/init.d/cswgmetad - -PROTOTYPE_FILTER_CSWgangliagmetad = awk '\ -$$$$3 ~ /\/opt\/csw\/var\/ganglia\/rrds/ { $$$$5 = "nobody"; $$$$6 = "nogroup" } \ -{ print }' - - -#ARCHALL_CSWgangliadevel = 1 -#ARCHALL_CSWgangliaweb = 1 - -include gar/category.mk - -install-custom: - @ginstall -D $(DOWNLOADDIR)/cswgmond \ - $(PKGROOT)/etc/opt/csw/init.d/cswgmond - @ginstall -D $(DOWNLOADDIR)/cswgmetad \ - $(PKGROOT)/etc/opt/csw/init.d/cswgmetad - @ginstall -d $(DESTDIR)$(WWWGANGLIA) - @cd $(WORKSRC)/web; \ - cp -R * $(DESTDIR)$(WWWGANGLIA) - @ginstall -D $(FILEDIR)/conf.php \ - $(DESTDIR)$(WWWGANGLIA)/conf.php - @rm -rf $(DESTDIR)$(WWWGANGLIA)/*.in - @ginstall -D $(FILEDIR)/httpd-ganglia.conf.CSW \ - $(DESTDIR)/opt/csw/apache2/etc/extra/httpd-ganglia.conf.CSW - @ginstall -d $(DESTDIR)$(ETCGANGLIA)/conf.d - @$(WORKSRC)/gmond/gmond -t | grep -v "^include" \ - > $(DESTDIR)$(ETCGANGLIA)/gmond.conf - @echo "include ('/etc/opt/csw/ganglia/conf.d/*.conf')" \ - >> $(DESTDIR)$(ETCGANGLIA)/gmond.conf -# @ginstall -D $(FILEDIR)/gmond.conf \ -# $(DESTDIR)$(ETCGANGLIA)/gmond.conf - @ginstall -D $(FILEDIR)/gmetad.conf \ - $(DESTDIR)$(ETCGANGLIA)/gmetad.conf - @cd $(WORKSRC)/gmond/modules/conf.d; \ - cp -R *.conf $(DESTDIR)$(ETCGANGLIA)/conf.d - @rm -rf $(DESTDIR)$(ETCGANGLIA)/conf.d/example.conf \ - $(DESTDIR)$(ETCGANGLIA)/conf.d/multicpu.conf -ifeq ($(GARVERSION),3.1.2) - @rm -rf $(DESTDIR)$(ETCGANGLIA)/conf.d/modgstatus.conf -endif - @ginstall -d $(DESTDIR)/opt/csw/var/ganglia/rrds - - - Copied: csw/mgar/pkg/ganglia/branches/ganglia-3.1.6-rc/Makefile (from rev 6980, csw/mgar/pkg/ganglia/branches/ganglia-3.1.4-rc/Makefile) =================================================================== --- csw/mgar/pkg/ganglia/branches/ganglia-3.1.6-rc/Makefile (rev 0) +++ csw/mgar/pkg/ganglia/branches/ganglia-3.1.6-rc/Makefile 2010-01-12 15:53:51 UTC (rev 7980) @@ -0,0 +1,180 @@ +GARNAME = ganglia +GARVERSION = 3.1.5.2215 +CATEGORIES = utils + +# How should we set this? +# There is a release number in configure.in, maybe use that? +# RELVER = + +USER_GMOND = nobody +# nobody shouldn't really be allowed to own any files +# maybe we should add a ganglia user to own the RRD files? +USER_GMETAD = nobody + +DESCRIPTION = A scalable distributed monitoring system +define BLURB + Ganglia is a scalable distributed monitoring system for high-performance computing + systems such as clusters and Grids. It is based on a hierarchical design targeted + at federations of clusters. +endef + +SF_PROJ = ganglia +MASTER_SITES = $(SF_MIRRORS) +DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz +DISTFILES += CSWgangliaweb.postinstall CSWgangliaweb.preremove +DISTFILES += httpd-ganglia.conf.CSW cswgmond cswgmetad + +PACKAGES = CSWgangliart CSWgangliaagent CSWgangliadevel CSWgangliagmetad CSWgangliaweb CSWgangliamodpython + +CATALOGNAME_CSWganglia = ganglia +CATALOGNAME_CSWgangliart = ganglia_rt +CATALOGNAME_CSWgangliaagent = ganglia_agent +CATALOGNAME_CSWgangliamodpython = ganglia_modpython +CATALOGNAME_CSWgangliadevel = ganglia_devel +CATALOGNAME_CSWgangliagmetad = ganglia_gmetad +CATALOGNAME_CSWgangliaweb = ganglia_web + +SPKG_DESC_CSWganglia = Dummy package +SPKG_DESC_CSWgangliart = Ganglia runtime libraries +SPKG_DESC_CSWgangliaagent = Ganglia performance monitoring agent gmond +SPKG_DESC_CSWgangliamodpython = Ganglia agent module for Python metrics +SPKG_DESC_CSWgangliadevel = Ganglia headers for metric module development +SPKG_DESC_CSWgangliagmetad = Ganglia gmetad +SPKG_DESC_CSWgangliaweb = Ganglia web + +PREREQUISITE_PKGS = CSWexpat CSWlibconfuse CSWapache2rt CSWapache2-devel CSWrrd CSWpcre + +REQUIRED_PKGS_CSWgangliart = CSWexpat CSWlibconfuse CSWapache2rt +REQUIRED_PKGS_CSWgangliaagent = CSWexpat CSWlibconfuse CSWapache2rt +REQUIRED_PKGS_CSWgangliaagent += CSWgangliart CSWpcrert +REQUIRED_PKGS_CSWgangliamodpython = CSWlibconfuse CSWapache2rt CSWgangliart +REQUIRED_PKGS_CSWgangliamodpython += CSWgangliaagent +REQUIRED_PKGS_CSWgangliadevel = CSWexpat CSWlibconfuse CSWapache2rt +REQUIRED_PKGS_CSWgangliagmetad = CSWexpat CSWlibconfuse CSWapache2rt +REQUIRED_PKGS_CSWgangliagmetad += CSWgangliart CSWgangliaagent CSWrrd +REQUIRED_PKGS_CSWgangliaweb = CSWgangliagmetad +REQUIRED_PKGS_CSWgangliaweb += CSWapache2 CSWphp5 CSWap2modphp5 CSWrrd + +# We define upstream file regex so we can be notifed of new upstream software release +UPSTREAM_MASTER_SITES = $(SF_PROJECT_SHOWFILE)=43021 +UPSTREAM_USE_SF = 1 +UFILES_REGEX = (\d+(?:\.\d+)*) + +# This is attachment #45 from Ganglia bug +# http://bugzilla.ganglia.info/cgi-bin/bugzilla/show_bug.cgi?id=77 +#PATCHFILES = $(GARNAME)-$(GARVERSION)-solaris-cc.patch + +# Uncomment this if we want to build both 32 bit and 64 bit binaries +# By default, only 32 bit binaries are built +#BUILD64 = 1 + +CONFIGURE_ARGS = $(DIRPATHS) + +# Don't build gmetad (not tested yet on Solaris, more deps required to build) +#CONFIGURE_ARGS += --without-gmetad +CONFIGURE_ARGS += --with-gmetad + +# Reduce dependencies, no gettext: +CONFIGURE_ARGS += --disable-nls + +# Use apr from CSWapache2rt +CONFIGURE_ARGS += --with-libapr=/opt/csw/apache2/bin/apr-1-config + +# Include the status module +CONFIGURE_ARGS += --with-status + +# When we enable this, modpython will have to go in a separate package, +# otherwise CSWgangliaagent will have lots of dependencies +# TODO: define a CSWgangliamodpython package +# Depends: some issues exist getting the Python support working on Solaris, +# Ganglia's configure.in needs to be further enhanced for this to work +CONFIGURE_ARGS += --disable-python +#CONFIGURE_ARGS += --with-python=/opt/csw + +# For Ganglia 3.1.2, the test suite doesn't compile cleanly on Solaris, +# so we skip it. This should be re-assessed with each new release +# from upstream. Proposed fixes for the test suite to be submitted +# upstream. +ifeq ($(GARVERSION),3.1.3) +TEST_SCRIPTS = +endif +ifeq ($(GARVERSION),3.1.4) +TEST_SCRIPTS = +endif +ifeq ($(GARVERSION),3.1.5.2215) +TEST_SCRIPTS = +endif +ifeq ($(GARVERSION),3.1.6) +TEST_SCRIPTS = +endif + +INSTALL_SCRIPTS = $(WORKSRC)/Makefile custom + +WWWROOT = /opt/csw/share/www +WWWGANGLIA = $(WWWROOT)/ganglia +sysconfdir = /etc/opt/csw/ganglia +ETCGANGLIA = $(sysconfdir) + +PKGFILES_CSWganglia = +PKGFILES_CSWgangliart = $(libdir)/libganglia.* +PKGFILES_CSWgangliamodpython = .*python.* +PKGFILES_CSWgangliadevel = .*/include/.*.h .*/bin/ganglia-config +PKGFILES_CSWgangliagmetad = .*/gmetad.* /opt/csw/var/ganglia/rrds /etc/opt/csw/init.d/cswgmetad +PKGFILES_CSWgangliaweb = $(WWWGANGLIA)/.* /opt/csw/apache2/etc/extra/.* + +PRESERVECONF = /opt/csw/apache2/etc/extra/httpd-ganglia.conf.CSW +PRESERVECONF += /etc/opt/csw/ganglia/gmond.conf.CSW +PRESERVECONF += /etc/opt/csw/ganglia/gmetad.conf.CSW +PRESERVECONF += /etc/opt/csw/ganglia/conf.d/modgstatus.conf.CSW +PRESERVECONF += /etc/opt/csw/ganglia/conf.d/modpython.conf.CSW +PRESERVECONF += $(WWWGANGLIA)/conf.php + +# For gmond +INITSMF = /etc/opt/csw/init.d/cswgmond +# For gmetad +INITSMF += /etc/opt/csw/init.d/cswgmetad + +PROTOTYPE_FILTER_CSWgangliagmetad = awk '\ +$$$$3 ~ /\/opt\/csw\/var\/ganglia\/rrds/ { $$$$5 = "nobody"; $$$$6 = "nogroup" } \ +{ print }' + + +#ARCHALL_CSWgangliadevel = 1 +#ARCHALL_CSWgangliaweb = 1 + +include gar/category.mk + +install-custom: + @ginstall -D $(DOWNLOADDIR)/cswgmond \ + $(PKGROOT)/etc/opt/csw/init.d/cswgmond + @ginstall -D $(DOWNLOADDIR)/cswgmetad \ + $(PKGROOT)/etc/opt/csw/init.d/cswgmetad + @ginstall -d $(DESTDIR)$(WWWGANGLIA) + @cd $(WORKSRC)/web; \ + cp -R * $(DESTDIR)$(WWWGANGLIA) + @ginstall -D $(FILEDIR)/conf.php \ + $(DESTDIR)$(WWWGANGLIA)/conf.php.CSW + @rm -rf $(DESTDIR)$(WWWGANGLIA)/*.in + @ginstall -D $(FILEDIR)/httpd-ganglia.conf.CSW \ + $(DESTDIR)/opt/csw/apache2/etc/extra/httpd-ganglia.conf.CSW + @ginstall -d $(DESTDIR)$(ETCGANGLIA)/conf.d + @$(WORKSRC)/gmond/gmond -t | grep -v "^include" \ + > $(DESTDIR)$(ETCGANGLIA)/gmond.conf.CSW + @echo "include ('/etc/opt/csw/ganglia/conf.d/*.conf')" \ + >> $(DESTDIR)$(ETCGANGLIA)/gmond.conf.CSW +# @ginstall -D $(FILEDIR)/gmond.conf \ +# $(DESTDIR)$(ETCGANGLIA)/gmond.conf + @ginstall -D $(FILEDIR)/gmetad.conf \ + $(DESTDIR)$(ETCGANGLIA)/gmetad.conf.CSW + @cd $(WORKSRC)/gmond/modules/conf.d; \ + for CONF_FILE in *.conf ; \ + do cp -R "$${CONF_FILE}" $(DESTDIR)$(ETCGANGLIA)/conf.d/"$${CONF_FILE}.CSW" ; done + @rm -rf $(DESTDIR)$(ETCGANGLIA)/conf.d/example.conf.CSW \ + $(DESTDIR)$(ETCGANGLIA)/conf.d/multicpu.conf.CSW +ifeq ($(GARVERSION),3.1.2) + @rm -rf $(DESTDIR)$(ETCGANGLIA)/conf.d/modgstatus.conf.CSW +endif + @ginstall -d $(DESTDIR)/opt/csw/var/ganglia/rrds + + + Modified: csw/mgar/pkg/ganglia/branches/ganglia-3.1.6-rc/checksums =================================================================== --- csw/mgar/pkg/ganglia/branches/ganglia-3.1.4-rc/checksums 2009-10-26 14:51:49 UTC (rev 6977) +++ csw/mgar/pkg/ganglia/branches/ganglia-3.1.6-rc/checksums 2010-01-12 15:53:51 UTC (rev 7980) @@ -2,5 +2,5 @@ c4c333a46db391464e372ad8ede4993c download/CSWgangliaweb.preremove 25d302948e25837bf17757d5e23e4955 download/cswgmetad c6bb96c949dbb989d06ebb36b6af885d download/cswgmond -b040c8b8efe3fd3973e4b1e5f687133a download/ganglia-3.1.4.tar.gz +9d6af1b71352c78f04cd2202f06a9db6 download/ganglia-3.1.5.2215.tar.gz 2ff504ecb546aca2cdd6ee09af9a417e download/httpd-ganglia.conf.CSW This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From skayser at users.sourceforge.net Tue Jan 12 19:20:10 2010 From: skayser at users.sourceforge.net (skayser at users.sourceforge.net) Date: Tue, 12 Jan 2010 18:20:10 +0000 Subject: [csw-devel] SF.net SVN: gar:[7981] csw/mgar/pkg/dante/trunk/Makefile Message-ID: Revision: 7981 http://gar.svn.sourceforge.net/gar/?rev=7981&view=rev Author: skayser Date: 2010-01-12 18:20:07 +0000 (Tue, 12 Jan 2010) Log Message: ----------- dante: clarify libsocks description Modified Paths: -------------- csw/mgar/pkg/dante/trunk/Makefile Modified: csw/mgar/pkg/dante/trunk/Makefile =================================================================== --- csw/mgar/pkg/dante/trunk/Makefile 2010-01-12 15:53:51 UTC (rev 7980) +++ csw/mgar/pkg/dante/trunk/Makefile 2010-01-12 18:20:07 UTC (rev 7981) @@ -41,7 +41,7 @@ PACKAGES = CSWdante CSWlibsocks SPKG_DESC_CSWdante = Dante SOCKS (v4 and v5) proxy daemon -SPKG_DESC_CSWlibsocks = Dante SOCKS library (and socksify wrapper) +SPKG_DESC_CSWlibsocks = Dante SOCKS library (and socksify wrapper) to socksify applications PKGFILES_CSWdante = .*sockd.* /etc/opt/csw/init.d/cswdante PKGFILES_CSWdante += $(docdir)/dante/.* @@ -109,6 +109,7 @@ cp $(FILEDIR)/socks.conf.CSW $(DESTDIR)$(sysconfdir)/socks.conf # /bin/sh doesn't understand "if ! test", reported to dante-bugs at inet.no + # Should be fixed in the next release, so upon version bump, verify and drop gsed -i -e 's,/bin/sh,/usr/bin/bash,' $(DESTDIR)$(bindir)/socksify @$(MAKECOOKIE) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From skayser at users.sourceforge.net Tue Jan 12 19:22:46 2010 From: skayser at users.sourceforge.net (skayser at users.sourceforge.net) Date: Tue, 12 Jan 2010 18:22:46 +0000 Subject: [csw-devel] SF.net SVN: gar:[7982] csw/mgar/pkg/dante/trunk/files/changelog.CSW Message-ID: Revision: 7982 http://gar.svn.sourceforge.net/gar/?rev=7982&view=rev Author: skayser Date: 2010-01-12 18:22:46 +0000 (Tue, 12 Jan 2010) Log Message: ----------- dante: clarify libsocks description Modified Paths: -------------- csw/mgar/pkg/dante/trunk/files/changelog.CSW Modified: csw/mgar/pkg/dante/trunk/files/changelog.CSW =================================================================== --- csw/mgar/pkg/dante/trunk/files/changelog.CSW 2010-01-12 18:20:07 UTC (rev 7981) +++ csw/mgar/pkg/dante/trunk/files/changelog.CSW 2010-01-12 18:22:46 UTC (rev 7982) @@ -1,3 +1,9 @@ +dante (1.2.0,REV=2010.01.12) + + * Updated libsocks package description + + -- Sebastian Kayser Tue, 12 Jan 2010 19:21:47 +0100 + dante (1.2.0,REV=2010.01.10) * Adopted and updated to 1.2.0 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From harpchad at users.sourceforge.net Tue Jan 12 21:18:27 2010 From: harpchad at users.sourceforge.net (harpchad at users.sourceforge.net) Date: Tue, 12 Jan 2010 20:18:27 +0000 Subject: [csw-devel] SF.net SVN: gar:[7983] csw/mgar/pkg/pidgin/trunk Message-ID: Revision: 7983 http://gar.svn.sourceforge.net/gar/?rev=7983&view=rev Author: harpchad Date: 2010-01-12 20:18:26 +0000 (Tue, 12 Jan 2010) Log Message: ----------- Bump version to 2.6.5 Modified Paths: -------------- csw/mgar/pkg/pidgin/trunk/Makefile csw/mgar/pkg/pidgin/trunk/checksums Modified: csw/mgar/pkg/pidgin/trunk/Makefile =================================================================== --- csw/mgar/pkg/pidgin/trunk/Makefile 2010-01-12 18:22:46 UTC (rev 7982) +++ csw/mgar/pkg/pidgin/trunk/Makefile 2010-01-12 20:18:26 UTC (rev 7983) @@ -1,7 +1,7 @@ # $Id$ GARNAME = pidgin -GARVERSION = 2.6.4 +GARVERSION = 2.6.5 CATEGORIES = apps DESCRIPTION = Multi-protocol IM client Modified: csw/mgar/pkg/pidgin/trunk/checksums =================================================================== --- csw/mgar/pkg/pidgin/trunk/checksums 2010-01-12 18:22:46 UTC (rev 7982) +++ csw/mgar/pkg/pidgin/trunk/checksums 2010-01-12 20:18:26 UTC (rev 7983) @@ -1 +1 @@ -81acb7d7e4a5d21ba83b5b00cfb60ac5 download/pidgin-2.6.4.tar.gz +93306b1eff371fc28af580a2dc9679e6 download/pidgin-2.6.5.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Wed Jan 13 11:13:50 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Wed, 13 Jan 2010 10:13:50 +0000 Subject: [csw-devel] SF.net SVN: gar:[7984] csw/mgar/gar/v2/bin/checkpkg Message-ID: Revision: 7984 http://gar.svn.sourceforge.net/gar/?rev=7984&view=rev Author: wahwah Date: 2010-01-13 10:13:50 +0000 (Wed, 13 Jan 2010) Log Message: ----------- mGAR v2: checkpkg: added a check for the file name arch matching the actual package arch Modified Paths: -------------- csw/mgar/gar/v2/bin/checkpkg Modified: csw/mgar/gar/v2/bin/checkpkg =================================================================== --- csw/mgar/gar/v2/bin/checkpkg 2010-01-12 20:18:26 UTC (rev 7983) +++ csw/mgar/gar/v2/bin/checkpkg 2010-01-13 10:13:50 UTC (rev 7984) @@ -295,6 +295,17 @@ exit 1 esac +case $f in + *${pkgarch}*) + print "f: $f, pkgarch: $pkgarch" + ;; + *) + print "The file name is '$f'." + print "The pkgarch is '$pkgarch'." + errmsg "ERROR: package file name and pkgarch don't match." + ;; +esac + goodarch=yes case $f in *${LOCAL_ARCH}*) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Wed Jan 13 12:31:57 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Wed, 13 Jan 2010 11:31:57 +0000 Subject: [csw-devel] SF.net SVN: gar:[7985] csw/mgar/pkg Message-ID: Revision: 7985 http://gar.svn.sourceforge.net/gar/?rev=7985&view=rev Author: wahwah Date: 2010-01-13 11:31:57 +0000 (Wed, 13 Jan 2010) Log Message: ----------- hachoir-core: Initial commit Modified Paths: -------------- csw/mgar/pkg/hachoir-core/trunk/Makefile csw/mgar/pkg/hachoir-core/trunk/checksums Added Paths: ----------- csw/mgar/pkg/hachoir-core/ Modified: csw/mgar/pkg/hachoir-core/trunk/Makefile =================================================================== --- csw/mgar/pkg/template/trunk/Makefile 2010-01-13 10:13:50 UTC (rev 7984) +++ csw/mgar/pkg/hachoir-core/trunk/Makefile 2010-01-13 11:31:57 UTC (rev 7985) @@ -2,184 +2,21 @@ # Distributed under the terms of the GNU General Public License v2 # $Id$ -## This file contains comments to guide you through various GAR settings. -## Please remove unnecessary comments before committing your code to the code -## repository. The comments to remove are marked with double hashes. -## If you want to remove them all in-place, use: -## gsed -i -e '/^##/d' Makefile -## -## For more information about GAR variables, please see: -## https://sourceforge.net/apps/trac/gar/wiki/GAR%20Variable%20Reference -## -GARNAME = mypkg -GARVERSION = 1.0 -## -## The category that your software fits in. This is not a descriptive field, but -## influences the build process. Depending on the CATEGORIES setting, different -## Makefiles are included from gar/categories/ in your trunk directory, which -## adjust the build settings for the respective category. -## -## Possible settings are: -## apps, cpan, devel, gnome, java, kde, lang, lib, meta, net, python, server, -## utils, x11, xfce, xorg, xtra -CATEGORIES = lib -## -## A one-line description of the package, which will appear in the pkginfo. -DESCRIPTION = -## -## A longer description of the package. This is only for descriptive purposes -## inside the Makefile and is not used elsewhere. +GARNAME = hachoir-core +GARVERSION = 1.2.1 +CATEGORIES = python +DESCRIPTION = allows to view and edit a binary stream field by field (core) define BLURB - + Hachoir is a Python library that allows to view and edit a binary stream + field by field. In other words, Hachoir allows you to "browse" any binary + stream just like you browse directories and files. A file is split in a tree + of fields, where the smallest field is just one bit. endef -## -## Upstream URL that should show up in the VENDOR field as well as on -## http://opencsw.org/packages/. -SPKG_SOURCEURL = -## -## Whitespace-separated list of URLs to download the source package from. -## There are presets: $(SF_MIRRORS), $(GNU_MIRRORS) and $(GOOGLE_MIRROR). -MASTER_SITES = -## -## SF_PROJ is required if you set $(MASTER_SITES) to $(SF_MIRRORS) and the -## Sourceforge project name differs from $(GARNAME). Specifies the Sourceforge -## project name of the software you wish to download. -## SF_PROJ = -## -## A list of space separated patch filenames from files/ that are to be applied -## to the extracted software before the ./configure stage. Patches need to be -## included in the DISTFILES variable as well. -## PATCHFILES = -## -## Whitespace-separated list of files which comprise this build. mGAR will look -## for the files in the $(FILEDIR) (trunk/files) directory and on the -## $(MASTER_SITES). +SPKG_SOURCEURL = http://bitbucket.org/haypo/hachoir/wiki/Home +MASTER_SITES = http://cheeseshop.python.org/packages/source/h/$(GARNAME)/ DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz -## -## We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz -## -## Catalog name is the name to be used with pkg{-get,util} -i . -## It is different from the system package name, which by convention is CSWpkgname. -## CATALOGNAME = -## -## Set to 1 to mark the package as architecture-independent. -## ARCHALL = 0 -## -## A list of files / patterns that should be excluded from the package. Amends -## the default list of excluded filenames $(MERGE_EXCLUDE_DEFAULT), which -## contains things like libtool .la files and files with a leading ~. -## EXTRA_MERGE_EXCLUDE_FILES = -## -## A list of space separated package names that should be marked as -## incompatible with the current package. This will go into the depend file. -## When a user has one of the incompatible packages installed and installs -## your package, he will be prompted that the incompatible package must be -## removed. He will however not be prevented to install your package without -## removing the conflicting package first. -## INCOMPATIBLE_PKGS = -## -## The name of the license file that should be included in your package. Defaults -## to COPYING. See http://sourceforge.net/apps/trac/gar/wiki/CopyRightfor details -## on including and displaying licenses. -## LICENSE = -## -## A list of space separated package names that should be produced from your -## Makefile. This is used when a software has different components that can be -## packaged and used individually (think runtime libraries, client tools, server -## files, development headers). You don't need to set this when you just want to -## produce one package. -## -## When you set this variable to include more than one package, you also need to -## set PKGFILES_CSWpkgname for each package (except for the first one in your -## $(PACKAGES) list) to define which files go into each package. The first -## package from $(PACKAGES) one will hold all files that are not matched by -## PKGFILES_ for other packages. -## PACKAGES = -## -## If specified, GAR feeds the almost-final package prototype file to -## $(PROTOTYPE_FILTER) and reads the final package prototype file from it. -## $(PROTOTYPE_FILTER) is usually a sed/awk/perl one-liner, which was mostly used -## to prepare the prototype file for use with cswclassutils (see -## $(SPKG_CLASSES)). Now that there are convenience variables for cswclassutils, -## you will rarely have to use this. A still valid use case would be to change -## the file permissions of a file to be set-UID. -## See http://wiki.opencsw.org/cswclassutils-package for common usage information -## PROTOTYPE_FILTER = -## -## cswclassutils settings -## -## A list of action classes. Possible values are: -## none cswpreserveconf cswcpsampleconf cswpycompile cswusergroup cswinitsmf -## cswinetd cswetcservices -## The class 'cswinitsmf' must be the last class listed. When you use cswclassutils, -## you need to add CSWcswclassutils to REQUIRED_PKGS. -## SPKG_CLASSES = none -## Simplified settings for classes: -## PRESERVECONF = -## SAMPLECONF = -## INITSMF = -## USERGROUP = -## ETCSERVICES = -## INETDCONF = -## A list of runtime package dependencies in the form of CSWfoo. -## REQUIRED_PKGS = -## -## A list of packages necessary to build this package -## PREREQUISITE_PKGS = $(REQUIRED_PKGS) -## -## When using non-empty $(PACKAGES): -## REQUIRED_PKGS_CSWpkgname = -## SPKG_DESC_CSWpkgname = -## PKGFILES_CSWpkgname = -## CATALOGNAME_CSWpkgname = -## -## A list of space separated directories where objects should be stripped in -## addition to the bin/ and sbin/ directories. -## STRIP_DIRS = -## -## Define a custom target for the configure phase. When you set this, the target -## that will be used instead of configure: target, is named -## configure-$(CONFIGURE_SCRIPTS) and you will need to define it in your Makefile -## after including gar/gar.include.mk. If you want to skip the configure phase -## completely (for example when your software doesn't need to be compiled) assign -## this variable an empty value. The procedure works for configure, build, -## install and test steps. -## CONFIGURE_SCRIPTS = -## BUILD_SCRIPTS = -## INSTALL_SCRIPTS = -## TEST_SCRIPTS = -## -## Compilation settings -## -## The build directory. -## WORKSRC = $(WORKDIR)/$(GARNAME)-$(GARVERSION) -## -## BUILD_ARGS is passed as an argument to gmake during the build phase. Use this -## for example, if you need to override Makefile variables. -## BUILD_ARGS = -## -## Arguments passed to the ./configure script. -CONFIGURE_ARGS = $(DIRPATHS) -## -## BUILD64 = -## CONFIGURE_ENV = -## EXTRA_CFLAGS = -## EXTRA_LDFLAGS = -## EXTRA_INC = -## EXTRA_LIB = -## GARFLAVOR = -## INSTALL_ARGS = -## OPT_FLAGS_SOS = -xO3 -## OPT_FLAGS_GCC = -O2 -pipe -## -## The compiler to use. Defaults to SOS11, can be also: SOS12, GCC3, GCC4. -## GARCOMPILER = SOS11 -## -# Remove the following rules and uncomment the -# include before building. -all: .DEFAULT -.DEFAULT: - @true - -#include gar/category.mk +CATALOGNAME = hachoir_core +ARCHALL = 1 +TEST_SCRIPTS = +include gar/category.mk Modified: csw/mgar/pkg/hachoir-core/trunk/checksums =================================================================== --- csw/mgar/pkg/template/trunk/checksums 2010-01-13 10:13:50 UTC (rev 7984) +++ csw/mgar/pkg/hachoir-core/trunk/checksums 2010-01-13 11:31:57 UTC (rev 7985) @@ -0,0 +1 @@ +d7227f9d1bcf62f2a5c8f3e6da4f2aee hachoir-core-1.2.1.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Wed Jan 13 15:42:48 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 13 Jan 2010 14:42:48 +0000 Subject: [csw-devel] SF.net SVN: gar:[7986] csw/mgar/pkg/neon/trunk Message-ID: Revision: 7986 http://gar.svn.sourceforge.net/gar/?rev=7986&view=rev Author: dmichelsen Date: 2010-01-13 14:42:48 +0000 (Wed, 13 Jan 2010) Log Message: ----------- libneon: Update to 0.29.3 Modified Paths: -------------- csw/mgar/pkg/neon/trunk/Makefile csw/mgar/pkg/neon/trunk/checksums Modified: csw/mgar/pkg/neon/trunk/Makefile =================================================================== --- csw/mgar/pkg/neon/trunk/Makefile 2010-01-13 11:31:57 UTC (rev 7985) +++ csw/mgar/pkg/neon/trunk/Makefile 2010-01-13 14:42:48 UTC (rev 7986) @@ -1,9 +1,9 @@ GARNAME = neon -GARVERSION = 0.29.2 +GARVERSION = 0.29.3 CATEGORIES = lib EXTRA_MODULATORS = GARVERSION -MODULATIONS_GARVERSION = 0.26.4 0.29.2 +MODULATIONS_GARVERSION = 0.26.4 0.29.3 DESCRIPTION = Neon HTTP and WebDAV client library define BLURB @@ -51,9 +51,9 @@ MERGE_SCRIPTS_isa-default64-garversion-0.26.4 = copy-relocated-only MERGE_DIRS_isa-default64-garversion-0.26.4 = $(libdir) -MERGE_SCRIPTS_isa-default-garversion-0.29.2 = copy-all -MERGE_SCRIPTS_isa-default64-garversion-0.29.2 = copy-relocated-only -MERGE_DIRS_isa-default64-garversion-0.29.2 = $(bindir) $(sbindir) $(libexecdir) $(libdir) +MERGE_SCRIPTS_isa-default-garversion-0.29.3 = copy-all +MERGE_SCRIPTS_isa-default64-garversion-0.29.3 = copy-relocated-only +MERGE_DIRS_isa-default64-garversion-0.29.3 = $(bindir) $(sbindir) $(libexecdir) $(libdir) PKGFILES_CSWneon-devel = $(PKGFILES_DEVEL) PKGFILES_CSWneon-devel += $(docdir)/.* Modified: csw/mgar/pkg/neon/trunk/checksums =================================================================== --- csw/mgar/pkg/neon/trunk/checksums 2010-01-13 11:31:57 UTC (rev 7985) +++ csw/mgar/pkg/neon/trunk/checksums 2010-01-13 14:42:48 UTC (rev 7986) @@ -1,3 +1,3 @@ 4ef5552e8930ef82b1f56c2712f8ed1e COPYING 2d11fff51ffa856fc6b5d4bd801d6cc4 neon-0.26.4.tar.gz -bf475710d1116cece210e8b1ae708d69 neon-0.29.2.tar.gz +ba1015b59c112d44d7797b62fe7bee51 neon-0.29.3.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Wed Jan 13 16:08:11 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 13 Jan 2010 15:08:11 +0000 Subject: [csw-devel] SF.net SVN: gar:[7987] csw/mgar/pkg/mpg123/trunk/Makefile Message-ID: Revision: 7987 http://gar.svn.sourceforge.net/gar/?rev=7987&view=rev Author: dmichelsen Date: 2010-01-13 15:08:11 +0000 (Wed, 13 Jan 2010) Log Message: ----------- mpg123: Include libtool .la-files in plugin dir Modified Paths: -------------- csw/mgar/pkg/mpg123/trunk/Makefile Modified: csw/mgar/pkg/mpg123/trunk/Makefile =================================================================== --- csw/mgar/pkg/mpg123/trunk/Makefile 2010-01-13 14:42:48 UTC (rev 7986) +++ csw/mgar/pkg/mpg123/trunk/Makefile 2010-01-13 15:08:11 UTC (rev 7987) @@ -31,6 +31,11 @@ TEST_TARGET = check +# Looks like we do need libtool files for plugins: +# http://www.opencsw.org/mantis/view.php?id=4145 +# Skip for libmpg123, though. +MERGE_EXCLUDE_LIBTOOL = $(libdir)/[^/]*\.la + MERGE_DIRS_isa-extra = $(libdir) include gar/category.mk This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Wed Jan 13 16:34:55 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 13 Jan 2010 15:34:55 +0000 Subject: [csw-devel] SF.net SVN: gar:[7988] csw/mgar/pkg/cpan/BerkeleyDB/trunk Message-ID: Revision: 7988 http://gar.svn.sourceforge.net/gar/?rev=7988&view=rev Author: dmichelsen Date: 2010-01-13 15:34:55 +0000 (Wed, 13 Jan 2010) Log Message: ----------- cpan/BerkeleyDB: Update to 0.41 and move dependency to CSWbdb47 Modified Paths: -------------- csw/mgar/pkg/cpan/BerkeleyDB/trunk/Makefile csw/mgar/pkg/cpan/BerkeleyDB/trunk/checksums csw/mgar/pkg/cpan/BerkeleyDB/trunk/files/CSWpmberkeleydb.config.in.diff Modified: csw/mgar/pkg/cpan/BerkeleyDB/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/BerkeleyDB/trunk/Makefile 2010-01-13 15:08:11 UTC (rev 7987) +++ csw/mgar/pkg/cpan/BerkeleyDB/trunk/Makefile 2010-01-13 15:34:55 UTC (rev 7988) @@ -1,5 +1,5 @@ GARNAME = BerkeleyDB -GARVERSION = 0.39 +GARVERSION = 0.41 CATEGORIES = cpan AUTHOR = PMQS @@ -11,10 +11,11 @@ PACKAGES = CSWpmberkeleydb CATALOGNAME = pm_berkeleydb -DISTFILES += CSWpmberkeleydb.config.in.diff - PATCHFILES = CSWpmberkeleydb.config.in.diff -REQUIRED_PKGS += CSWbdb +NOISALIST = 1 +EXTRA_LIB = /opt/csw/bdb47/lib +REQUIRED_PKGS = CSWbdb47 + include gar/category.mk Modified: csw/mgar/pkg/cpan/BerkeleyDB/trunk/checksums =================================================================== --- csw/mgar/pkg/cpan/BerkeleyDB/trunk/checksums 2010-01-13 15:08:11 UTC (rev 7987) +++ csw/mgar/pkg/cpan/BerkeleyDB/trunk/checksums 2010-01-13 15:34:55 UTC (rev 7988) @@ -1,2 +1,2 @@ -da4cff937216a147162a6df76cae8096 download/BerkeleyDB-0.39.tar.gz -bd611cd1c09f11bde779fc0b3e5adf97 download/CSWpmberkeleydb.config.in.diff +5941c90783a55ca4280c2963bbe1ac83 BerkeleyDB-0.41.tar.gz +2061f2f285714a1b6a014c5254e69b92 CSWpmberkeleydb.config.in.diff Modified: csw/mgar/pkg/cpan/BerkeleyDB/trunk/files/CSWpmberkeleydb.config.in.diff =================================================================== --- csw/mgar/pkg/cpan/BerkeleyDB/trunk/files/CSWpmberkeleydb.config.in.diff 2010-01-13 15:08:11 UTC (rev 7987) +++ csw/mgar/pkg/cpan/BerkeleyDB/trunk/files/CSWpmberkeleydb.config.in.diff 2010-01-13 15:34:55 UTC (rev 7988) @@ -6,7 +6,7 @@ #INCLUDE = /usr/local/include #INCLUDE = ../.. -INCLUDE = /usr/local/BerkeleyDB/include -+INCLUDE = /opt/csw/include ++INCLUDE = /opt/csw/bdb47/include # 2. Where is libdb? # @@ -15,7 +15,7 @@ #LIB = /usr/local/lib #LIB = ../.. -LIB = /usr/local/BerkeleyDB/lib -+LIB = /opt/csw/lib ++LIB = /opt/csw/bdb47/lib # 3. Is the library called libdb? # This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Wed Jan 13 17:13:54 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 13 Jan 2010 16:13:54 +0000 Subject: [csw-devel] SF.net SVN: gar:[7989] csw/mgar/gar/v2/gar.mk Message-ID: Revision: 7989 http://gar.svn.sourceforge.net/gar/?rev=7989&view=rev Author: dmichelsen Date: 2010-01-13 16:13:54 +0000 (Wed, 13 Jan 2010) Log Message: ----------- mGAR v2: Make sure default merge rules work also when only one ISA is requested Modified Paths: -------------- csw/mgar/gar/v2/gar.mk Modified: csw/mgar/gar/v2/gar.mk =================================================================== --- csw/mgar/gar/v2/gar.mk 2010-01-13 15:34:55 UTC (rev 7988) +++ csw/mgar/gar/v2/gar.mk 2010-01-13 16:13:54 UTC (rev 7989) @@ -594,7 +594,9 @@ endif ifeq ($(NEEDED_ISAS),$(ISA_DEFAULT)) -MERGE_SCRIPTS_isa-$(ISA_DEFAULT) ?= copy-all $(EXTRA_MERGE_SCRIPTS_$(ISA_DEFAULT)) $(EXTRA_MERGE_SCRIPTS) +MERGE_SCRIPTS_isa-default ?= copy-all $(EXTRA_MERGE_SCRIPTS_$(ISA_DEFAULT)) $(EXTRA_MERGE_SCRIPTS) +MERGE_SCRIPTS_isa-$(ISA_DEFAULT) ?= $(MERGE_SCRIPTS_isa-default) +MERGE_SCRIPTS_$(MODULATION) ?= $(MERGE_SCRIPTS_$(MODULATION_ISACOLLAPSED)) else ISAEXEC_DIRS ?= $(if $(NO_ISAEXEC),,$(bindir) $(sbindir) $(libexecdir)) MERGE_DIRS_isa-default ?= $(EXTRA_MERGE_DIRS) $(EXTRA_MERGE_DIRS_isa-$(ISA_DEFAULT)) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Wed Jan 13 17:15:59 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 13 Jan 2010 16:15:59 +0000 Subject: [csw-devel] SF.net SVN: gar:[7990] csw/mgar/pkg/mtr/trunk/Makefile Message-ID: Revision: 7990 http://gar.svn.sourceforge.net/gar/?rev=7990&view=rev Author: dmichelsen Date: 2010-01-13 16:15:59 +0000 (Wed, 13 Jan 2010) Log Message: ----------- mtr: Use collapsed merge rule Modified Paths: -------------- csw/mgar/pkg/mtr/trunk/Makefile Modified: csw/mgar/pkg/mtr/trunk/Makefile =================================================================== --- csw/mgar/pkg/mtr/trunk/Makefile 2010-01-13 16:13:54 UTC (rev 7989) +++ csw/mgar/pkg/mtr/trunk/Makefile 2010-01-13 16:15:59 UTC (rev 7990) @@ -78,16 +78,9 @@ EXTRA_SOS_LD_FLAGS = -L$(abspath $(prefix)/X11/lib/$(MM_LIBDIR)) endif -# These two should work instead of the four ones below, but they don't. -# license is the only file that ends up in pkgroot/. -#MERGE_SCRIPTS_isa-default-gui-enable = copy-all -#MERGE_SCRIPTS_isa-default-gui-disable = copy-all +MERGE_SCRIPTS_isa-default-gui-enable = copy-all +MERGE_SCRIPTS_isa-default-gui-disable = copy-all -MERGE_SCRIPTS_isa-i386-gui-enable = copy-all -MERGE_SCRIPTS_isa-sparcv8-gui-enable = copy-all -MERGE_SCRIPTS_isa-i386-gui-disable = copy-all -MERGE_SCRIPTS_isa-sparcv8-gui-disable = copy-all - # Make mtr setuid so that it can access raw sockets PROTOTYPE_MODIFIERS = makesuid PROTOTYPE_FILES_makesuid = $(sbindir)/x?mtr This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bonivart at users.sourceforge.net Wed Jan 13 19:21:10 2010 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Wed, 13 Jan 2010 18:21:10 +0000 Subject: [csw-devel] SF.net SVN: gar:[7991] csw/mgar/pkg Message-ID: Revision: 7991 http://gar.svn.sourceforge.net/gar/?rev=7991&view=rev Author: bonivart Date: 2010-01-13 18:21:10 +0000 (Wed, 13 Jan 2010) Log Message: ----------- dnstop: initial commit Added Paths: ----------- csw/mgar/pkg/dnstop/ csw/mgar/pkg/dnstop/branches/ csw/mgar/pkg/dnstop/tags/ csw/mgar/pkg/dnstop/trunk/ csw/mgar/pkg/dnstop/trunk/Makefile csw/mgar/pkg/dnstop/trunk/checksums csw/mgar/pkg/dnstop/trunk/files/ csw/mgar/pkg/dnstop/trunk/files/Makefile.p Property changes on: csw/mgar/pkg/dnstop/trunk ___________________________________________________________________ Added: svn:ignore + cookies download work Added: svn:externals + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 Added: csw/mgar/pkg/dnstop/trunk/Makefile =================================================================== --- csw/mgar/pkg/dnstop/trunk/Makefile (rev 0) +++ csw/mgar/pkg/dnstop/trunk/Makefile 2010-01-13 18:21:10 UTC (rev 7991) @@ -0,0 +1,40 @@ +GARNAME = dnstop +GARVERSION = 20090128 +CATEGORIES = net + +DESCRIPTION = Displays various tables of DNS traffic +define BLURB + Displays various tables of DNS traffic +endef + +MASTER_SITES = http://dns.measurement-factory.com/tools/dnstop/src/ +DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz + +LICENSE = LICENSE + +REQUIRED_PKGS = CSWlibpcap + +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + +TEST_SCRIPTS = +INSTALL_SCRIPTS = custom + +CONFIGURE_ARGS = $(DIRPATHS) + +include gar/category.mk + +pre-build-modulated: + @echo " ==> Pre-build $(GARNAME) (custom)" + @( cd $(WORKSRC) ; \ + gpatch < ../../../../$(FILEDIR)/Makefile.p ) + @$(MAKECOOKIE) + +install-custom: + @echo " ==> Installing $(GARNAME) (custom)" + @ginstall -m 755 -d $(DESTDIR)$(bindir) + @ginstall -m 755 $(WORKSRC)/dnstop $(DESTDIR)$(bindir) + @ginstall -m 755 -d $(DESTDIR)$(mandir)/man8 + @ginstall -m 444 $(WORKSRC)/dnstop.8 $(DESTDIR)$(mandir)/man8 + @ginstall -m 755 -d $(DESTDIR)$(docdir)/$(GARNAME) + @ginstall -m 444 $(WORKSRC)/CHANGES $(DESTDIR)$(docdir)/$(GARNAME) + @$(MAKECOOKIE) Added: csw/mgar/pkg/dnstop/trunk/checksums =================================================================== --- csw/mgar/pkg/dnstop/trunk/checksums (rev 0) +++ csw/mgar/pkg/dnstop/trunk/checksums 2010-01-13 18:21:10 UTC (rev 7991) @@ -0,0 +1,2 @@ +c3b095c7ed3f2d43624d3278a697d89d Makefile.p +827a0d2020b157b925411dd30b6feff3 dnstop-20090128.tar.gz Added: csw/mgar/pkg/dnstop/trunk/files/Makefile.p =================================================================== --- csw/mgar/pkg/dnstop/trunk/files/Makefile.p (rev 0) +++ csw/mgar/pkg/dnstop/trunk/files/Makefile.p 2010-01-13 18:21:10 UTC (rev 7991) @@ -0,0 +1,12 @@ +--- Makefile 2010-01-13 17:55:54.574796795 +0100 ++++ Makefile 2010-01-13 18:00:42.582082173 +0100 +@@ -2,7 +2,7 @@ + + CC=/opt/studio/SOS11/SUNWspro/bin/cc +-CFLAGS=-xO3 -xarch=386 +-LIBS=-lresolv -lnsl -lsocket -lcurses ++CFLAGS=-xO3 -xarch=386 -I/opt/csw/include ++LIBS=-lresolv -lnsl -lsocket -lcurses -lpcap + OPTFLAGS= -DUSE_IPV6=1 + + prefix=/opt/csw This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bonivart at users.sourceforge.net Wed Jan 13 19:47:33 2010 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Wed, 13 Jan 2010 18:47:33 +0000 Subject: [csw-devel] SF.net SVN: gar:[7992] csw/mgar/pkg/dnstop/trunk Message-ID: Revision: 7992 http://gar.svn.sourceforge.net/gar/?rev=7992&view=rev Author: bonivart Date: 2010-01-13 18:47:33 +0000 (Wed, 13 Jan 2010) Log Message: ----------- dnstop: fix arch patch issues Modified Paths: -------------- csw/mgar/pkg/dnstop/trunk/Makefile Added Paths: ----------- csw/mgar/pkg/dnstop/trunk/files/Makefile.i386.p csw/mgar/pkg/dnstop/trunk/files/Makefile.sparc.p Removed Paths: ------------- csw/mgar/pkg/dnstop/trunk/files/Makefile.p Modified: csw/mgar/pkg/dnstop/trunk/Makefile =================================================================== --- csw/mgar/pkg/dnstop/trunk/Makefile 2010-01-13 18:21:10 UTC (rev 7991) +++ csw/mgar/pkg/dnstop/trunk/Makefile 2010-01-13 18:47:33 UTC (rev 7992) @@ -23,10 +23,16 @@ include gar/category.mk +ifeq ($(shell uname -p), sparc) + PATCHFILE = Makefile.sparc.p +else + PATCHFILE = Makefile.i386.p +endif + pre-build-modulated: @echo " ==> Pre-build $(GARNAME) (custom)" @( cd $(WORKSRC) ; \ - gpatch < ../../../../$(FILEDIR)/Makefile.p ) + gpatch < ../../../../$(FILEDIR)/$(PATCHFILE) ) @$(MAKECOOKIE) install-custom: Added: csw/mgar/pkg/dnstop/trunk/files/Makefile.i386.p =================================================================== --- csw/mgar/pkg/dnstop/trunk/files/Makefile.i386.p (rev 0) +++ csw/mgar/pkg/dnstop/trunk/files/Makefile.i386.p 2010-01-13 18:47:33 UTC (rev 7992) @@ -0,0 +1,13 @@ +--- Makefile 2010-01-13 17:55:54.574796795 +0100 ++++ Makefile 2010-01-13 18:00:42.582082173 +0100 +@@ -2,8 +2,8 @@ + DATE != date +%Y%m%d + + CC=/opt/studio/SOS11/SUNWspro/bin/cc +-CFLAGS=-xO3 -xarch=386 +-LIBS=-lresolv -lnsl -lsocket -lcurses ++CFLAGS=-xO3 -xarch=386 -I/opt/csw/include ++LIBS=-lresolv -lnsl -lsocket -lcurses -lpcap + OPTFLAGS= -DUSE_IPV6=1 + + prefix=/opt/csw Deleted: csw/mgar/pkg/dnstop/trunk/files/Makefile.p =================================================================== --- csw/mgar/pkg/dnstop/trunk/files/Makefile.p 2010-01-13 18:21:10 UTC (rev 7991) +++ csw/mgar/pkg/dnstop/trunk/files/Makefile.p 2010-01-13 18:47:33 UTC (rev 7992) @@ -1,12 +0,0 @@ ---- Makefile 2010-01-13 17:55:54.574796795 +0100 -+++ Makefile 2010-01-13 18:00:42.582082173 +0100 -@@ -2,7 +2,7 @@ - - CC=/opt/studio/SOS11/SUNWspro/bin/cc --CFLAGS=-xO3 -xarch=386 --LIBS=-lresolv -lnsl -lsocket -lcurses -+CFLAGS=-xO3 -xarch=386 -I/opt/csw/include -+LIBS=-lresolv -lnsl -lsocket -lcurses -lpcap - OPTFLAGS= -DUSE_IPV6=1 - - prefix=/opt/csw Added: csw/mgar/pkg/dnstop/trunk/files/Makefile.sparc.p =================================================================== --- csw/mgar/pkg/dnstop/trunk/files/Makefile.sparc.p (rev 0) +++ csw/mgar/pkg/dnstop/trunk/files/Makefile.sparc.p 2010-01-13 18:47:33 UTC (rev 7992) @@ -0,0 +1,13 @@ +--- Makefile 2010-01-13 19:25:50.435317055 +0100 ++++ Makefile 2010-01-13 19:24:07.075661494 +0100 +@@ -2,9 +2,9 @@ + DATE != date +%Y%m%d + + CC=/opt/studio/SOS11/SUNWspro/bin/cc +-CFLAGS=-xO3 -xarch=v8 +-LIBS=-lresolv -lnsl -lsocket -lcurses ++CFLAGS=-xO3 -xarch=v8 -I/opt/csw/include ++LIBS=-lresolv -lnsl -lsocket -lcurses -lpcap + OPTFLAGS= -DUSE_IPV6=1 + + prefix=/opt/csw This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Wed Jan 13 21:07:02 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Wed, 13 Jan 2010 20:07:02 +0000 Subject: [csw-devel] SF.net SVN: gar:[7993] csw/mgar/pkg Message-ID: Revision: 7993 http://gar.svn.sourceforge.net/gar/?rev=7993&view=rev Author: wahwah Date: 2010-01-13 20:06:59 +0000 (Wed, 13 Jan 2010) Log Message: ----------- hachore-parser: Initial commit Modified Paths: -------------- csw/mgar/pkg/hachoir-parser/trunk/Makefile csw/mgar/pkg/hachoir-parser/trunk/checksums Added Paths: ----------- csw/mgar/pkg/hachoir-parser/ Modified: csw/mgar/pkg/hachoir-parser/trunk/Makefile =================================================================== --- csw/mgar/pkg/hachoir-core/trunk/Makefile 2010-01-13 11:31:57 UTC (rev 7985) +++ csw/mgar/pkg/hachoir-parser/trunk/Makefile 2010-01-13 20:06:59 UTC (rev 7993) @@ -2,7 +2,7 @@ # Distributed under the terms of the GNU General Public License v2 # $Id$ -GARNAME = hachoir-core +GARNAME = hachoir-parser GARVERSION = 1.2.1 CATEGORIES = python DESCRIPTION = allows to view and edit a binary stream field by field (core) @@ -16,7 +16,7 @@ MASTER_SITES = http://cheeseshop.python.org/packages/source/h/$(GARNAME)/ DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz -CATALOGNAME = hachoir_core +CATALOGNAME = hachoir_parser ARCHALL = 1 TEST_SCRIPTS = include gar/category.mk Modified: csw/mgar/pkg/hachoir-parser/trunk/checksums =================================================================== --- csw/mgar/pkg/hachoir-core/trunk/checksums 2010-01-13 11:31:57 UTC (rev 7985) +++ csw/mgar/pkg/hachoir-parser/trunk/checksums 2010-01-13 20:06:59 UTC (rev 7993) @@ -1 +1 @@ -d7227f9d1bcf62f2a5c8f3e6da4f2aee hachoir-core-1.2.1.tar.gz +8308920290165f73955043ea21666264 hachoir-parser-1.2.1.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Wed Jan 13 21:40:56 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Wed, 13 Jan 2010 20:40:56 +0000 Subject: [csw-devel] SF.net SVN: gar:[7994] csw/mgar/pkg/hachoir-parser/trunk/Makefile Message-ID: Revision: 7994 http://gar.svn.sourceforge.net/gar/?rev=7994&view=rev Author: wahwah Date: 2010-01-13 20:40:54 +0000 (Wed, 13 Jan 2010) Log Message: ----------- hachoir-parser: Adding hachoir-core as a dependency Modified Paths: -------------- csw/mgar/pkg/hachoir-parser/trunk/Makefile Modified: csw/mgar/pkg/hachoir-parser/trunk/Makefile =================================================================== --- csw/mgar/pkg/hachoir-parser/trunk/Makefile 2010-01-13 20:06:59 UTC (rev 7993) +++ csw/mgar/pkg/hachoir-parser/trunk/Makefile 2010-01-13 20:40:54 UTC (rev 7994) @@ -18,5 +18,6 @@ UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz CATALOGNAME = hachoir_parser ARCHALL = 1 +REQUIRED_PKGS = CSWhachoir-core TEST_SCRIPTS = include gar/category.mk This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From skayser at users.sourceforge.net Thu Jan 14 01:00:53 2010 From: skayser at users.sourceforge.net (skayser at users.sourceforge.net) Date: Thu, 14 Jan 2010 00:00:53 +0000 Subject: [csw-devel] SF.net SVN: gar:[7995] csw/mgar/pkg/postfix/branches/postfix-2.6 Message-ID: Revision: 7995 http://gar.svn.sourceforge.net/gar/?rev=7995&view=rev Author: skayser Date: 2010-01-14 00:00:53 +0000 (Thu, 14 Jan 2010) Log Message: ----------- postfix: on the way towards a 2.6.x package Modified Paths: -------------- csw/mgar/pkg/postfix/branches/postfix-2.6/Makefile csw/mgar/pkg/postfix/branches/postfix-2.6/files/upgrade Added Paths: ----------- csw/mgar/pkg/postfix/branches/postfix-2.6/files/CSWpostfix.checkinstall csw/mgar/pkg/postfix/branches/postfix-2.6/files/changelog.CSW csw/mgar/pkg/postfix/branches/postfix-2.6/files/cswusergroup Removed Paths: ------------- csw/mgar/pkg/postfix/branches/postfix-2.6/files/CSWpostfix.cswusergroup csw/mgar/pkg/postfix/branches/postfix-2.6/files/CSWpostfix.depends csw/mgar/pkg/postfix/branches/postfix-2.6/files/CSWpostfix.gspec csw/mgar/pkg/postfix/branches/postfix-2.6/files/CSWpostfix.postinstall csw/mgar/pkg/postfix/branches/postfix-2.6/files/CSWpostfix.postremove csw/mgar/pkg/postfix/branches/postfix-2.6/files/cswpostfix.xml csw/mgar/pkg/postfix/branches/postfix-2.6/files/fix_main.cf.sed Modified: csw/mgar/pkg/postfix/branches/postfix-2.6/Makefile =================================================================== --- csw/mgar/pkg/postfix/branches/postfix-2.6/Makefile 2010-01-13 20:40:54 UTC (rev 7994) +++ csw/mgar/pkg/postfix/branches/postfix-2.6/Makefile 2010-01-14 00:00:53 UTC (rev 7995) @@ -1,27 +1,19 @@ -# Status -# - Build with all activated features completes, packaging completes -# - Beware: uses a modified GARv2 for USERGROUP= -# http://lists.opencsw.org/pipermail/maintainers/2009-July/003143.html -# - Fixed bugs: -# #3580 Not sun4m compatible -# $(CFLAGS) are now incorporated into $(CCARGS) -# #3063 /opt/csw/libexec/postfix not stripped, takes ~30MB -# $(STRIP_DIRS) added to build description -# #3017 Please depend against CSWpcrert instead of CSWpcre -# #2843 No cyrus-sasl support -# Added cyrus SASL support, link postfix against the same -# bdb version that CSWsasl uses. -# - Moved queue and data dirs to /var/opt/csw (see DDEFs) as per standard -# - Integrated CSWcswclassutils for user/group creation, configuration -# file handling, and SMF / init script support -# -# TODO -# - Check remaining open bugs -# - Check sed main.cf script functionality -# - Check update script functionality, add handling for spool location change -# - Do we need to take care of file ownerships? -# - Does the currently available package preserve configuration files on +# TODO (release-critical prefixed with !, non release-critical with *) +# ! Obsolete postinstall scripts: +# #3060 http://www.opencsw.org/bugtrack/view.php?id=3060 +# #2964 http://www.opencsw.org/bugtrack/view.php?id=2964 +# #1943 http://www.opencsw.org/bugtrack/view.php?id=1943 +# ! Handle spool location change (bail out and force user interaction?) +# ! Handle system integration (refer to README.CSW or alike), see +# http://article.gmane.org/gmane.os.solaris.opencsw.maintainers/5313 +# ! Does the currently available package preserve configuration files on # removal? +# ! Update to most recent postfix version (2.6.5 as of 13th Jan 2010) +# ! Verify CONFIG_FILES list (can this be generated on the fly?) +# ! Ship simple default configuration +# ! Build, install and test package (works? spool permissions ok?) +# WRT to permissions, run "postfix set-permissions" and compare +# GARNAME = postfix GARVERSION = 2.6.2 CATEGORIES = server @@ -37,34 +29,63 @@ completely different. endef +VENDOR_URL = http://www.postfix.org MASTER_SITES = ftp://ftp.porcupine.org/mirrors/postfix-release/official/ -DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz +DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz -SPKG_SOURCEURL = http://www.postfix.org -# Conflicting files (bin/mailq and bin/sendmail) in sendmail -INCOMPATIBLE_PKGS = CSWsendmail +DISTFILES += CSWpostfix.checkinstall -DISTFILES += CSWpostfix.cswusergroup -DISTFILES += CSWpostfix.postinstall -DISTFILES += CSWpostfix.postremove +# Tag configuration files for handling via cswclassutils +CONFIG_BASE = /etc/opt/csw/postfix/ +CONFIG_FILES = access +CONFIG_FILES += aliases +CONFIG_FILES += canonical +CONFIG_FILES += generic +CONFIG_FILES += header_checks +CONFIG_FILES += main.cf +CONFIG_FILES += master.cf +CONFIG_FILES += relocated +CONFIG_FILES += transport +CONFIG_FILES += virtual +SAMPLECONF = $(addprefix $(CONFIG_BASE), $(CONFIG_FILES)) -# Tag files for cswclassutils -CONFIG_BASE = /etc/opt/csw/postfix/ -CONFIG_FILES = access aliases canonical generic header_checks -CONFIG_FILES += main.cf master.cf relocated transport virtual - -SAMPLECONF = $(addprefix $(CONFIG_BASE), $(CONFIG_FILES)) INITSMF = /etc/opt/csw/init.d/cswpostfix USERGROUP = $(sysconfdir)/pkg/CSWpostfix/cswusergroup +# Make postdrop setgid so that it can deliver to $(DEF_QUEUE_DIR)/maildrop +PROTOTYPE_MODIFIERS = makesgid +PROTOTYPE_FILES_makesgid = $(sbindir)/postdrop +PROTOTYPE_PERMS_makesgid = 2755 + +# Make $(DEF_QUEUE_DIR) subdirs accessible/writable to postfix only +PROTOTYPE_MODIFIERS += spooldir +PROTOTYPE_FILES_spooldir = $(DEF_QUEUE_DIR)/* +PROTOTYPE_USER_spooldir = postfix +PROTOTYPE_PERMS_spooldir = 0700 +PROTOTYPE_CLASS_spooldir = ugfiles + +# Make $(DEF_QUEUE_DIR)/maildrop accessible by postdrop group +PROTOTYPE_MODIFIERS += maildrop +PROTOTYPE_FILES_maildrop = $(DEF_QUEUE_DIR)/maildrop +PROTOTYPE_GROUP_maildrop = postdrop +PROTOTYPE_PERMS_maildrop = 0730 +PROTOTYPE_CLASS_maildrop = ugfiles + +# IMPORTANT! Make $(DEF_QUEUE_DIR)/pid accessible by root only +# http://www.openwall.com/lists/oss-security/2009/09/18/6 +PROTOTYPE_MODIFIERS += pid +PROTOTYPE_FILES_pid = $(DEF_QUEUE_DIR)/pid +PROTOTYPE_USER_pid = root +PROTOTYPE_GROUP_pid = bin +PROTOTYPE_PERMS_pid = 0755 +PROTOTYPE_CLASS_pid = ugfiles + EXTRA_MERGE_EXCLUDE_FILES = /etc/opt/csw/postfix/LICENSE -EXTRA_MERGE_EXCLUDE_FILES += /etc/opt/csw/postfix/TLS_LICENSE EXTRA_MERGE_EXCLUDE_FILES += /etc/opt/csw/postfix/makedefs.out STRIP_DIRS = $(DESTDIR)$(libexecdir)/postfix - CONFIGURE_SCRIPTS = custom TEST_SCRIPTS = INSTALL_SCRIPTS = custom @@ -188,20 +209,9 @@ readme_directory=$(DEF_README_DIR) \ html_directory=$(DEF_HTML_DIR) - # XXX: Needs to be checked/revised for current version - sed -f $(FILEDIR)/fix_main.cf.sed $(DESTDIR)/etc/opt/csw/postfix/main.cf > $(WORKDIR)/main.cf - cp $(WORKDIR)/main.cf $(DESTDIR)/etc/opt/csw/postfix/main.cf - - # Script to handle the sysconfdir location change /opt -> /etc - # XXX: Needs to be checked and amended with /opt -> /var changes - ginstall -D -m 755 $(FILEDIR)/upgrade \ - $(DESTDIR)/opt/csw/share/postfix/upgrade - # Files for cswinitsmf and cswusergroup ginstall -Dm 755 $(FILEDIR)/cswpostfix \ $(DESTDIR)/etc/opt/csw/init.d/cswpostfix - ginstall -D $(FILEDIR)/cswpostfix.xml \ - $(DESTDIR)/var/opt/csw/svc/manifest/network/cswpostfix.xml" - ginstall -D $(FILEDIR)/CSWpostfix.cswusergroup \ + ginstall -D $(FILEDIR)/cswusergroup \ $(DESTDIR)$(sysconfdir)/pkg/CSWpostfix/cswusergroup @$(MAKECOOKIE) Added: csw/mgar/pkg/postfix/branches/postfix-2.6/files/CSWpostfix.checkinstall =================================================================== --- csw/mgar/pkg/postfix/branches/postfix-2.6/files/CSWpostfix.checkinstall (rev 0) +++ csw/mgar/pkg/postfix/branches/postfix-2.6/files/CSWpostfix.checkinstall 2010-01-14 00:00:53 UTC (rev 7995) @@ -0,0 +1,46 @@ +#!/bin/sh +# Copied from the CSWcupsd.preinstall script (obsolete_dir_file_name adjusted) +# https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/pkg/cups/trunk/files/CSWcupsd.preinstall +# +# $Id$ +# + +set -u + +PKG_INSTALL_ROOT="${PKG_INSTALL_ROOT:-}" +readonly PKG_INSTALL_ROOT + +obsolete_directories="/opt/csw/etc/postfix:/etc/opt/csw/postfix" + +obsolete_dir_information=" +This directory is obsolete. Files in this directory are going to be ignored. +Please move your data to the new location. + +Feel free to remove this file afterwards. +" +obsolete_dir_file_name="README.THIS_DIRECTORY_IS_OBSOLETE" + +for dirpair in ${obsolete_directories}; do + obsolete_dir=`echo ${dirpair} | cut -d: -f1` + new_dir=`echo ${dirpair} | cut -d: -f2` + if [ -d "${PKG_INSTALL_ROOT}/${obsolete_dir}" ]; then + echo + echo "*******************************************************************" + echo "* The old configuration directory ${obsolete_dir} still exists. " + echo "* Please move your configuration to ${new_dir}. " + echo "* " + echo "* Installation will continue in 10 seconds. " + echo "* Press CTRL+C if you want to stop now. " + echo "*******************************************************************" + echo + sleep 10 + + # Leaving a note for the sysadmin if the they proceed with the installation. + fn="${PKG_INSTALL_ROOT}/${obsolete_dir}/${obsolete_dir_file_name}" + if touch "${fn}" 2>/dev/null; then + echo "${obsolete_dir_information}" > "${fn}" + fi + fi +done + +exit 0 Deleted: csw/mgar/pkg/postfix/branches/postfix-2.6/files/CSWpostfix.cswusergroup =================================================================== --- csw/mgar/pkg/postfix/branches/postfix-2.6/files/CSWpostfix.cswusergroup 2010-01-13 20:40:54 UTC (rev 7994) +++ csw/mgar/pkg/postfix/branches/postfix-2.6/files/CSWpostfix.cswusergroup 2010-01-14 00:00:53 UTC (rev 7995) @@ -1,2 +0,0 @@ -:postdrop::::: -postfix:postfix:Postfix Daemon:/var/opt/csw/spool/postfix:/usr/bin/pfsh:: Deleted: csw/mgar/pkg/postfix/branches/postfix-2.6/files/CSWpostfix.depends =================================================================== --- csw/mgar/pkg/postfix/branches/postfix-2.6/files/CSWpostfix.depends 2010-01-13 20:40:54 UTC (rev 7994) +++ csw/mgar/pkg/postfix/branches/postfix-2.6/files/CSWpostfix.depends 2010-01-14 00:00:53 UTC (rev 7995) @@ -1,9 +0,0 @@ -CSWbdb3 berkeleydb3 - file based pseudo-database library -CSWcommon common - common files and dirs for CSW packages -CSWlibpq libpq - libraries needed by postgresql server and clients -CSWmysql4rt mysql4rt - run-time libraries for mysql4 -CSWoldaprt openldap_rt - OpenLDAP runtime libraries (oldaprt) -CSWosslrt openssl_rt - Openssl runtime libraries -CSWpcre pcre - Perl-compatible regular expression library -CSWsasl sasl - Simple Authentication and Security Layer -CSWzlib zlib - Zlib Data Compression Library Deleted: csw/mgar/pkg/postfix/branches/postfix-2.6/files/CSWpostfix.gspec =================================================================== --- csw/mgar/pkg/postfix/branches/postfix-2.6/files/CSWpostfix.gspec 2010-01-13 20:40:54 UTC (rev 7994) +++ csw/mgar/pkg/postfix/branches/postfix-2.6/files/CSWpostfix.gspec 2010-01-14 00:00:53 UTC (rev 7995) @@ -1,7 +0,0 @@ -%var bitname postfix -%var pkgname CSWpostfix -%include url file://%{PKGLIB}/csw_dyndepend.gspec -%copyright url file://%{WORKSRC}/LICENSE -%include url file://%{PKGLIB}/csw_class_conf/gspec -%include url file://%{PKGLIB}/csw_usrgrp.gspec -%include url file://%{PKGLIB}/smf_enabled.gspec Deleted: csw/mgar/pkg/postfix/branches/postfix-2.6/files/CSWpostfix.postinstall =================================================================== --- csw/mgar/pkg/postfix/branches/postfix-2.6/files/CSWpostfix.postinstall 2010-01-13 20:40:54 UTC (rev 7994) +++ csw/mgar/pkg/postfix/branches/postfix-2.6/files/CSWpostfix.postinstall 2010-01-14 00:00:53 UTC (rev 7995) @@ -1,48 +0,0 @@ -#!/bin/sh -# -# do we replace /usr/lib/sendmail, /usr/bin/newaliases, and /usr/bin/mailq? -# this depends on whether the .OFF files exist. if the .OFF does NOT exist -# then we replace, but if both exist then it's likely that either CSWsendmail -# CSWexim or CSWpostfix are installed, in which case we don't replace. -# - -if [ "$PKG_ROOT_DIR" = "" ] ; then PKG_ROOT_DIR="/" ; fi - -PF_ACTION=replace - -if [ -f /usr/lib/sendmail ]; then - if [ -f /usr/lib/sendmail.OFF ]; then - printf "It would appear that /usr/lib/sendmail.OFF already exists!\n" - printf "CSWpostfix will NOT configure itself as the default MTA.\n" - PF_ACTION=leave - else - printf "CSWpostfix is renaming /usr/lib/sendmail, /usr/bin/newaliases\n" - printf "and /usr/bin/mailq to *.OFF.\n" - PF_ACTION=replace - fi -else - PF_ACTION=leave -fi - -if [ $PF_ACTION = "replace" ]; then -# printf "Stopping sendmail\n" -# /usr/sbin/chroot $PKG_ROOT_DIR /etc/init.d/sendmail stop - - printf "Turning off /usr/lib/sendmail to enable the Postfix version\n" - /usr/sbin/chroot $PKG_ROOT_DIR /usr/bin/mv /usr/lib/sendmail /usr/lib/sendmail.OFF - - printf "Turning off /usr/bin/newaliases to enable the Postfix version\n" - /usr/sbin/chroot $PKG_ROOT_DIR /usr/bin/mv /usr/bin/newaliases /usr/bin/newaliases.OFF - - printf "Turning off /usr/bin/mailq to enable the Postfix version\n" - /usr/sbin/chroot $PKG_ROOT_DIR /usr/bin/mv /usr/bin/mailq /usr/bin/mailq.OFF - - printf "Linking /usr/lib/sendmail to /opt/csw/sbin/postfix\n" - /usr/sbin/chroot $PKG_ROOT_DIR /usr/bin/ln -s /opt/csw/sbin/sendmail /usr/lib/sendmail - - printf "Linking /usr/bin/newaliases to /opt/csw/bin/newaliases\n" - /usr/sbin/chroot $PKG_ROOT_DIR /usr/bin/ln -s /opt/csw/bin/newaliases /usr/bin/newaliases - - printf "Linking /usr/bin/mailq to /opt/csw/bin/mailq\n" - /usr/sbin/chroot $PKG_ROOT_DIR /usr/bin/ln -s /opt/csw/bin/mailq /usr/bin/mailq -fi Deleted: csw/mgar/pkg/postfix/branches/postfix-2.6/files/CSWpostfix.postremove =================================================================== --- csw/mgar/pkg/postfix/branches/postfix-2.6/files/CSWpostfix.postremove 2010-01-13 20:40:54 UTC (rev 7994) +++ csw/mgar/pkg/postfix/branches/postfix-2.6/files/CSWpostfix.postremove 2010-01-14 00:00:53 UTC (rev 7995) @@ -1,20 +0,0 @@ -#!/bin/sh -# -# but back sendmail, newaliases, and mailq - -if [ "$PKG_ROOT_DIR" = "" ] ; then PKG_ROOT_DIR="/" ; fi - -if [ -f /usr/lib/sendmail.OFF ]; then - printf "Reinstalling original /usr/lib/sendmail\n" - /usr/sbin/chroot $PKG_ROOT_DIR /usr/bin/mv /usr/lib/sendmail.OFF /usr/lib/sendmail -fi - -if [ -f /usr/bin/newaliases.OFF ]; then - printf "Reinstalling original /usr/bin/newaliases\n" - /usr/sbin/chroot $PKG_ROOT_DIR /usr/bin/mv /usr/bin/newaliases.OFF /usr/bin/newaliases -fi - -if [ -f /usr/bin/mailq.OFF ]; then - printf "Reinstalling original /usr/bin/mailq\n" - /usr/sbin/chroot $PKG_ROOT_DIR /usr/bin/mv /usr/bin/mailq.OFF /usr/bin/mailq -fi Added: csw/mgar/pkg/postfix/branches/postfix-2.6/files/changelog.CSW =================================================================== --- csw/mgar/pkg/postfix/branches/postfix-2.6/files/changelog.CSW (rev 0) +++ csw/mgar/pkg/postfix/branches/postfix-2.6/files/changelog.CSW 2010-01-14 00:00:53 UTC (rev 7995) @@ -0,0 +1,11 @@ +postfix (2.6.2,REV=2010.01.13) + + * Updated to 2.6.2. (Closes #3580, #3700, #3970) + * Moved spool directory to /var/opt/csw/spool/postfix. (Closes #3946) + * Added Cyrus SASL support. (Closes #2843) + * Added hash table support via bdb. (Closes #2097) + * Init / SMF handling now done with cswclassutils. (Closes #3946) + * Now depends on pcre_rt instead of pcre. (Closes #3017) + * Binaries in /opt/csw/libexec/postfix are now stripped. (Closes #3063) + + -- Sebastian Kayser Wed, 13 Jan 2010 22:01:36 +0100 Deleted: csw/mgar/pkg/postfix/branches/postfix-2.6/files/cswpostfix.xml =================================================================== --- csw/mgar/pkg/postfix/branches/postfix-2.6/files/cswpostfix.xml 2010-01-13 20:40:54 UTC (rev 7994) +++ csw/mgar/pkg/postfix/branches/postfix-2.6/files/cswpostfix.xml 2010-01-14 00:00:53 UTC (rev 7995) @@ -1,76 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Copied: csw/mgar/pkg/postfix/branches/postfix-2.6/files/cswusergroup (from rev 7993, csw/mgar/pkg/postfix/branches/postfix-2.6/files/CSWpostfix.cswusergroup) =================================================================== --- csw/mgar/pkg/postfix/branches/postfix-2.6/files/cswusergroup (rev 0) +++ csw/mgar/pkg/postfix/branches/postfix-2.6/files/cswusergroup 2010-01-14 00:00:53 UTC (rev 7995) @@ -0,0 +1,2 @@ +:postdrop::::: +postfix:postfix:Postfix daemon user:/var/opt/csw/spool/postfix:/usr/bin/pfsh:: Deleted: csw/mgar/pkg/postfix/branches/postfix-2.6/files/fix_main.cf.sed =================================================================== --- csw/mgar/pkg/postfix/branches/postfix-2.6/files/fix_main.cf.sed 2010-01-13 20:40:54 UTC (rev 7994) +++ csw/mgar/pkg/postfix/branches/postfix-2.6/files/fix_main.cf.sed 2010-01-14 00:00:53 UTC (rev 7995) @@ -1,10 +0,0 @@ -# Remove 'fix' from previous runs to prevent duplicates -/^alias_maps =/d -/^alias_database =/d - -# These will work as long as the template configuration file doesn't change too much -/alias_maps = netinfo:.aliases/ a\ -alias_maps = dbm:/etc/opt/csw/postfix/aliases - -/alias_database = .*hash:.opt.majordomo.aliases$/ a\ -alias_database = dbm:/etc/opt/csw/postfix/aliases Modified: csw/mgar/pkg/postfix/branches/postfix-2.6/files/upgrade =================================================================== --- csw/mgar/pkg/postfix/branches/postfix-2.6/files/upgrade 2010-01-13 20:40:54 UTC (rev 7994) +++ csw/mgar/pkg/postfix/branches/postfix-2.6/files/upgrade 2010-01-14 00:00:53 UTC (rev 7995) @@ -1,21 +1,46 @@ #!/bin/sh +# Copied from the CSWcupsd.preinstall script (obsolete_dir_file_name adjusted) +# https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/pkg/cups/trunk/files/CSWcupsd.preinstall +# +# $Id$ +# -old=/opt/csw/etc/postfix -new=/etc/opt/csw/postfix +set -u -if [ ! -d $old ] -then - echo "No old configuration exist: $old" > /dev/stderr - exit 1 -fi +PKG_INSTALL_ROOT="${PKG_INSTALL_ROOT:-}" +readonly PKG_INSTALL_ROOT -echo "Copying current configuration files from $old to new location $new" - -( cd $old; find . -type f ) | grep -v CSW$ | while read f; do - # Create the parent directory - dir=`dirname $f` - [ ! -d $new/$dir ] && mkdir -p $new/$dir +obsolete_directories="/opt/csw/etc/postfix:/etc/opt/csw/postfix" - # Copy over the new file - cp -p $old/$f $new/$f +obsolete_dir_information=" +This directory is obsolete. Files in this directory are going to be ignored. +Please move your data to the new location. + +Feel free to remove this file afterwards. +" +obsolete_dir_file_name="README.THIS_DIRECTORY_IS_OBSOLETE" + +for dirpair in ${obsolete_directories}; do + obsolete_dir=`echo ${dirpair} | cut -d: -f1` + new_dir=`echo ${dirpair} | cut -d: -f2` + if [ -d "${PKG_INSTALL_ROOT}/${obsolete_dir}" ]; then + echo + echo "*******************************************************************" + echo "* The old configuration directory ${obsolete_dir} still exists. " + echo "* Please move your configuration to ${new_dir}. " + echo "* " + echo "* Installation will continue in 10 seconds. " + echo "* Press CTRL+C if you want to stop now. " + echo "*******************************************************************" + echo + sleep 10 + + # Leaving a note for the sysadmin if the they proceed with the installation. + fn="${PKG_INSTALL_ROOT}/${obsolete_dir}/${obsolete_dir_file_name}" + if touch "${fn}" 2>/dev/null; then + echo "${obsolete_dir_information}" > "${fn}" + fi + fi done + +exit 0 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From skayser at users.sourceforge.net Thu Jan 14 02:30:15 2010 From: skayser at users.sourceforge.net (skayser at users.sourceforge.net) Date: Thu, 14 Jan 2010 01:30:15 +0000 Subject: [csw-devel] SF.net SVN: gar:[7996] csw/mgar/pkg/postfix/branches/postfix-2.6 Message-ID: Revision: 7996 http://gar.svn.sourceforge.net/gar/?rev=7996&view=rev Author: skayser Date: 2010-01-14 01:30:15 +0000 (Thu, 14 Jan 2010) Log Message: ----------- postfix: 2.6 branch, checkinstall bail out on potential mail spool files Modified Paths: -------------- csw/mgar/pkg/postfix/branches/postfix-2.6/Makefile csw/mgar/pkg/postfix/branches/postfix-2.6/checksums csw/mgar/pkg/postfix/branches/postfix-2.6/files/CSWpostfix.checkinstall csw/mgar/pkg/postfix/branches/postfix-2.6/files/changelog.CSW Modified: csw/mgar/pkg/postfix/branches/postfix-2.6/Makefile =================================================================== --- csw/mgar/pkg/postfix/branches/postfix-2.6/Makefile 2010-01-14 00:00:53 UTC (rev 7995) +++ csw/mgar/pkg/postfix/branches/postfix-2.6/Makefile 2010-01-14 01:30:15 UTC (rev 7996) @@ -1,19 +1,17 @@ # TODO (release-critical prefixed with !, non release-critical with *) -# ! Obsolete postinstall scripts: -# #3060 http://www.opencsw.org/bugtrack/view.php?id=3060 -# #2964 http://www.opencsw.org/bugtrack/view.php?id=2964 -# #1943 http://www.opencsw.org/bugtrack/view.php?id=1943 -# ! Handle spool location change (bail out and force user interaction?) # ! Handle system integration (refer to README.CSW or alike), see # http://article.gmane.org/gmane.os.solaris.opencsw.maintainers/5313 -# ! Does the currently available package preserve configuration files on -# removal? # ! Update to most recent postfix version (2.6.5 as of 13th Jan 2010) # ! Verify CONFIG_FILES list (can this be generated on the fly?) # ! Ship simple default configuration -# ! Build, install and test package (works? spool permissions ok?) +# ! Build, install and test package (bails out on existing spool files? +# works? spool permissions ok?) # WRT to permissions, run "postfix set-permissions" and compare # +# NICE TO KNOW +# - 2.4.6,REV=2008.05.28 preserves modified configuration files via +# package-shipped CAS class csw_conf. +# GARNAME = postfix GARVERSION = 2.6.2 CATEGORIES = server Modified: csw/mgar/pkg/postfix/branches/postfix-2.6/checksums =================================================================== --- csw/mgar/pkg/postfix/branches/postfix-2.6/checksums 2010-01-14 00:00:53 UTC (rev 7995) +++ csw/mgar/pkg/postfix/branches/postfix-2.6/checksums 2010-01-14 01:30:15 UTC (rev 7996) @@ -1,4 +1,2 @@ -63ac43075e092255cb266e5270ce5364 download/CSWpostfix.cswusergroup -76e992eb49e5d2d8c51305be8891566f download/CSWpostfix.postinstall -980c70abf5ea711adec41f3dd4e37141 download/CSWpostfix.postremove -1f0edbd521d2b0473626f4d61e8bb4eb download/postfix-2.6.2.tar.gz +64dadd7a3737c6a82211b301e380a31a CSWpostfix.checkinstall +1f0edbd521d2b0473626f4d61e8bb4eb postfix-2.6.2.tar.gz Modified: csw/mgar/pkg/postfix/branches/postfix-2.6/files/CSWpostfix.checkinstall =================================================================== --- csw/mgar/pkg/postfix/branches/postfix-2.6/files/CSWpostfix.checkinstall 2010-01-14 00:00:53 UTC (rev 7995) +++ csw/mgar/pkg/postfix/branches/postfix-2.6/files/CSWpostfix.checkinstall 2010-01-14 01:30:15 UTC (rev 7996) @@ -43,4 +43,29 @@ fi done +# Verify that there are no possibly important files in the old spool location +# (where old <= 2.4.6,REV=2008.05.28). Bail out otherwise and instruct user to +# manually migrate. Skips named pipes as well as all files in pid/. +old_spooldir="/opt/csw/var/spool/postfix/" +new_spooldir="/var/opt/csw/ +old_spoolfiles=`find ${PKG_INSTALL_ROOT}/opt/csw/var/spool/postfix/ \ + -name pid -prune -o ! -type d ! -type p | grep -v '/pid$'` +if [ "${old_spoolfiles}" != "" ]; then + echo + echo "*******************************************************************" + echo "* The old spool directory ${old_spooldir} still contains files. " + echo "* Please migrate these as needed to ${new_spooldir}. " + echo "* " + echo "* Installation will now terminate. Please restart the installation " + echo "* once the files have been migrated or removed. " + echo "*******************************************************************" + echo + echo "*******************************************************************" + echo "* This is the list of affected files: " + echo ${old_spoolfiles} + echo + + exit 1 +fi + exit 0 Modified: csw/mgar/pkg/postfix/branches/postfix-2.6/files/changelog.CSW =================================================================== --- csw/mgar/pkg/postfix/branches/postfix-2.6/files/changelog.CSW 2010-01-14 00:00:53 UTC (rev 7995) +++ csw/mgar/pkg/postfix/branches/postfix-2.6/files/changelog.CSW 2010-01-14 01:30:15 UTC (rev 7996) @@ -1,11 +1,13 @@ postfix (2.6.2,REV=2010.01.13) - * Updated to 2.6.2. (Closes #3580, #3700, #3970) + * Adopted and updated to 2.6.2. (Closes #3580, #3700, #3970) * Moved spool directory to /var/opt/csw/spool/postfix. (Closes #3946) * Added Cyrus SASL support. (Closes #2843) * Added hash table support via bdb. (Closes #2097) * Init / SMF handling now done with cswclassutils. (Closes #3946) * Now depends on pcre_rt instead of pcre. (Closes #3017) * Binaries in /opt/csw/libexec/postfix are now stripped. (Closes #3063) + * Doesn't automatically substitute system sendmail binaries any more. + Please refer to README.CSW instead. (Closes #1943, #2964, #3060) -- Sebastian Kayser Wed, 13 Jan 2010 22:01:36 +0100 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Thu Jan 14 10:22:26 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Thu, 14 Jan 2010 09:22:26 +0000 Subject: [csw-devel] SF.net SVN: gar:[7997] csw/mgar/gar/v2/bin/checkpkg.d/checkpkg-libs.py Message-ID: Revision: 7997 http://gar.svn.sourceforge.net/gar/?rev=7997&view=rev Author: wahwah Date: 2010-01-14 09:22:25 +0000 (Thu, 14 Jan 2010) Log Message: ----------- mGAR v2: a bugfix for checkpkg-libs.py Modified Paths: -------------- csw/mgar/gar/v2/bin/checkpkg.d/checkpkg-libs.py Modified: csw/mgar/gar/v2/bin/checkpkg.d/checkpkg-libs.py =================================================================== --- csw/mgar/gar/v2/bin/checkpkg.d/checkpkg-libs.py 2010-01-14 01:30:15 UTC (rev 7996) +++ csw/mgar/gar/v2/bin/checkpkg.d/checkpkg-libs.py 2010-01-14 09:22:25 UTC (rev 7997) @@ -192,7 +192,7 @@ for soname in orphan_sonames: errors.append(checkpkg.Error("The following soname does't belong to " - "any package: %s" % checker.soname)) + "any package: %s" % soname)) if errors: for error in errors: This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From skayser at users.sourceforge.net Thu Jan 14 10:27:46 2010 From: skayser at users.sourceforge.net (skayser at users.sourceforge.net) Date: Thu, 14 Jan 2010 09:27:46 +0000 Subject: [csw-devel] SF.net SVN: gar:[7998] csw/mgar/pkg/postfix/branches/postfix-2.6 Message-ID: Revision: 7998 http://gar.svn.sourceforge.net/gar/?rev=7998&view=rev Author: skayser Date: 2010-01-14 09:27:45 +0000 (Thu, 14 Jan 2010) Log Message: ----------- postfix: 2.6 branch, tweak CC args and switch to bdb42 Modified Paths: -------------- csw/mgar/pkg/postfix/branches/postfix-2.6/Makefile csw/mgar/pkg/postfix/branches/postfix-2.6/checksums Modified: csw/mgar/pkg/postfix/branches/postfix-2.6/Makefile =================================================================== --- csw/mgar/pkg/postfix/branches/postfix-2.6/Makefile 2010-01-14 09:22:25 UTC (rev 7997) +++ csw/mgar/pkg/postfix/branches/postfix-2.6/Makefile 2010-01-14 09:27:45 UTC (rev 7998) @@ -132,10 +132,10 @@ # Activate support for hash and btree lookup tables # http://www.postfix.org/DB_README.html FEATURES += -DHAS_DB -INCLUDES += -I/opt/csw/bdb4/include -AUXLIBS += -L/opt/csw/bdb4/lib -R/opt/csw/bdb4/lib -ldb-4 -PREREQUISITE_PKGS += CSWbdb4 -REQUIRED_PKGS += CSWbdb4 +INCLUDES += -I/opt/csw/bdb42/include +AUXLIBS += -L/opt/csw/bdb42/lib -R/opt/csw/bdb42/lib -ldb-4.2 +PREREQUISITE_PKGS += CSWbdb42devel +REQUIRED_PKGS += CSWbdb42 # Activate support for SSL/TLS # http://www.postfix.org/TLS_README.html @@ -179,7 +179,7 @@ # Make sure to include $(CFLAGS) so that we get sane defaults via GAR -CCARGS=$(CFLAGS) $(FEATURES) $(DEFAULTS) $(INCLUDES) +CCARGS=$(CPPFLAGS) $(INCLUDES) $(FEATURES) $(DEFAULTS) $(CFLAGS) # We zero makedef's DEBUG and OPT, the relevant flags are set via GAR & CFLAGS configure-custom: Modified: csw/mgar/pkg/postfix/branches/postfix-2.6/checksums =================================================================== --- csw/mgar/pkg/postfix/branches/postfix-2.6/checksums 2010-01-14 09:22:25 UTC (rev 7997) +++ csw/mgar/pkg/postfix/branches/postfix-2.6/checksums 2010-01-14 09:27:45 UTC (rev 7998) @@ -1,2 +1,2 @@ -64dadd7a3737c6a82211b301e380a31a CSWpostfix.checkinstall +a5247da640e70b66144632e724a8d895 CSWpostfix.checkinstall 1f0edbd521d2b0473626f4d61e8bb4eb postfix-2.6.2.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Thu Jan 14 12:01:22 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Thu, 14 Jan 2010 11:01:22 +0000 Subject: [csw-devel] SF.net SVN: gar:[7999] csw/mgar/gar/v2/bin/checkpkg.d Message-ID: Revision: 7999 http://gar.svn.sourceforge.net/gar/?rev=7999&view=rev Author: wahwah Date: 2010-01-14 11:01:22 +0000 (Thu, 14 Jan 2010) Log Message: ----------- mGAR v2: checkpkg-libs.py: Better handling of symlinks, added the bdb4 -> bdb42 symlink, handling double slases and trailing slashes in RPATH Modified Paths: -------------- csw/mgar/gar/v2/bin/checkpkg.d/checkpkg.py csw/mgar/gar/v2/bin/checkpkg.d/checkpkg_test.py Added Paths: ----------- csw/mgar/gar/v2/bin/checkpkg.d/testdata/checkpkg_test_data_CSWpostfix.py Modified: csw/mgar/gar/v2/bin/checkpkg.d/checkpkg.py =================================================================== --- csw/mgar/gar/v2/bin/checkpkg.d/checkpkg.py 2010-01-14 09:27:45 UTC (rev 7998) +++ csw/mgar/gar/v2/bin/checkpkg.d/checkpkg.py 2010-01-14 11:01:22 UTC (rev 7999) @@ -275,7 +275,7 @@ c.execute(sql, [CONFIG_MTIME]) row = c.fetchone() if not row: - # raise ConfigurationError("Could not find the mtime setting") + # raise ConfigurationError("Could not find the mtime setting") self.cache_mtime = 1 else: self.cache_mtime = row[0] @@ -443,16 +443,34 @@ Since we don't know the architecture, we'll adding both amd64 and sparcv9. It should be safe. """ + symlinks = ( + ("/opt/csw/bdb4", ["/opt/csw/bdb42"]), + ("/64", ["/amd64", "/sparcv9"]), + ) symlinked_list = [] for runpath in runpath_list: - if "/64" in runpath: - symlinked_list.append(runpath.replace("/64", "/amd64")) - symlinked_list.append(runpath.replace("/64", "/sparcv9")) - else: - symlinked_list.append(runpath) + for symlink, expansion_list in symlinks: + symlink_re = re.compile(r"%s(/|$)" % symlink) + if re.search(symlink_re, runpath): + for expansion in expansion_list: + symlinked_list.append(runpath.replace(symlink, expansion)) + else: + symlinked_list.append(runpath) return symlinked_list +def SanitizeRunpath(runpath): + ok = False + while True: + if runpath.endswith("/"): + runpath = runpath[:-1] + elif "//" in runpath: + runpath = runpath.replace("//", "/") + else: + break + return runpath + + def GetLinesBySoname(pkgmap, needed_sonames, runpath_by_needed_soname, isalist): """Works out which system pkgmap lines correspond to given sonames.""" lines_by_soname = {} @@ -461,6 +479,7 @@ # runpath and finds the first matching one. runpath_found = False for runpath in runpath_by_needed_soname[soname]: + runpath = SanitizeRunpath(runpath) runpath_list = ExpandRunpath(runpath, isalist) runpath_list = Emulate64BitSymlinks(runpath_list) soname_runpath_data = pkgmap.GetPkgmapLineByBasename(soname) Modified: csw/mgar/gar/v2/bin/checkpkg.d/checkpkg_test.py =================================================================== --- csw/mgar/gar/v2/bin/checkpkg.d/checkpkg_test.py 2010-01-14 09:27:45 UTC (rev 7998) +++ csw/mgar/gar/v2/bin/checkpkg.d/checkpkg_test.py 2010-01-14 11:01:22 UTC (rev 7999) @@ -11,6 +11,7 @@ import testdata.checkpkg_test_data_CSWmysql51devel as d4 import testdata.checkpkg_test_data_CSWlibpq_84 as d5 import testdata.checkpkg_test_data_CSWmysql5client_8x as d6 +import testdata.checkpkg_test_data_CSWpostfix as d7 import testdata.dump_output_1 as dump_1 import testdata.dump_output_2 as dump_2 @@ -179,6 +180,32 @@ self.assertEquals(expected, self.missing_deps) +class DependenciesUnitTest_7(unittest.TestCase): + + def setUp(self): + (self.missing_deps, + self.surplus_deps, + self.orphan_sonames) = checkpkg.AnalyzeDependencies( + d7.DATA_PKGNAME, + d7.DATA_DECLARED_DEPENDENCIES, + d7.DATA_BINARIES_BY_PKGNAME, + d7.DATA_NEEDED_SONAMES_BY_BINARY, + d7.DATA_PKGS_BY_FILENAME, + d7.DATA_FILENAMES_BY_SONAME, + d7.DATA_PKG_BY_ANY_FILENAME, + ) + + def testSurplusDeps(self): + self.assertEquals(set([]), self.surplus_deps) + + def testOrphanSonames(self): + self.assertEquals(set([]), self.orphan_sonames) + + def testMissingDeps(self): + expected = set([u'SUNWcslx']) + self.assertEquals(expected, self.missing_deps) + + class GuessDepsUnitTest(unittest.TestCase): def testGuessDepsByFilename1(self): @@ -277,6 +304,26 @@ result = checkpkg.Emulate64BitSymlinks(runpath_list) self.assertTrue(expected in result, "%s not in %s" % (expected, result)) + def testEmulate64BitSymlinks_3(self): + runpath_list = ["/opt/csw/mysql5/lib/64/mysql/foo"] + expected = "/opt/csw/mysql5/lib/sparcv9/mysql/foo" + result = checkpkg.Emulate64BitSymlinks(runpath_list) + self.assertTrue(expected in result, "%s not in %s" % (expected, result)) + + def testEmulateSymlinks_3(self): + runpath_list = ["/opt/csw/bdb4"] + expected = "/opt/csw/bdb42" + result = checkpkg.Emulate64BitSymlinks(runpath_list) + self.assertTrue(expected in result, "%s not in %s" % (expected, result)) + + def testEmulateSymlinks_4(self): + runpath_list = ["/opt/csw/bdb42"] + expected = "/opt/csw/bdb42" + not_expected = "/opt/csw/bdb422" + result = checkpkg.Emulate64BitSymlinks(runpath_list) + self.assertTrue(expected in result, "%s not in %s" % (expected, result)) + self.assertFalse(not_expected in result, "%s is in %s" % (not_expected, result)) + def testGetLinesBySoname(self): expected = {'foo.so.1': '/opt/csw/lib/isa-value-1/foo.so.1 foo'} pkgmap = self.pkgmap_mocker.CreateMock(checkpkg.SystemPkgmap) @@ -401,7 +448,30 @@ d6.DATA_ISALIST) self.assertEqual(expected, result) + def testGetLinesBySoname_8(self): + expected = {'foo.so.1': '/opt/csw/postgresql/lib/foo.so.1 foo'} + pkgmap = self.pkgmap_mocker.CreateMock(checkpkg.SystemPkgmap) + pkgmap.GetPkgmapLineByBasename("foo") + lines1 = {"/opt/csw/lib/postgresql": "/opt/csw/lib/postgresql/foo.so.1 foo"} + pkgmap.GetPkgmapLineByBasename("foo.so.1").AndReturn(lines1) + pkgmap.GetPkgmapLineByBasename("foo.so.1").AndReturn(lines1) + self.pkgmap_mocker.ReplayAll() + pkgmap.GetPkgmapLineByBasename("foo") + needed_sonames = set(["foo.so.1"]) + runpath_by_needed_soname = {"foo.so.1": ["/opt/csw/postgresql/lib/", "/usr/lib"]} + isalist = ["isa-value-1", "isa-value-2"] + result = checkpkg.GetLinesBySoname(pkgmap, needed_sonames, runpath_by_needed_soname, isalist) + self.pkgmap_mocker.VerifyAll() + self.assertEqual(expected, result) + def testSanitizeRunpath_1(self): + self.assertEqual("/opt/csw/lib", checkpkg.SanitizeRunpath("/opt/csw/lib/")) + + def testSanitizeRunpath_2(self): + self.assertEqual("/opt/csw/lib", checkpkg.SanitizeRunpath("/opt//csw////lib/")) + + + class ParseDumpOutputUnitTest(unittest.TestCase): def test_1(self): Added: csw/mgar/gar/v2/bin/checkpkg.d/testdata/checkpkg_test_data_CSWpostfix.py =================================================================== --- csw/mgar/gar/v2/bin/checkpkg.d/testdata/checkpkg_test_data_CSWpostfix.py (rev 0) +++ csw/mgar/gar/v2/bin/checkpkg.d/testdata/checkpkg_test_data_CSWpostfix.py 2010-01-14 11:01:22 UTC (rev 7999) @@ -0,0 +1,13 @@ +# Testing data for CSWpostfix +# $Id: checkpkg-libs.py 7997 2010-01-14 09:22:25Z wahwah $ +DATA_PKGNAME = 'CSWpostfix' +DATA_DECLARED_DEPENDENCIES = {'CSWcswclassutils': 'CSWcswclassutils cswclassutils - CSW class action utilities ', 'CSWpcrert': 'CSWpcrert pcre_rt - Perl-compatible regular expression runtime libraries ', 'CSWmysql5rt': 'CSWmysql5rt mysql5rt - MySQL 5 runtime files ', 'CSWbdb4': 'CSWbdb4 berkeleydb4 - Stub package as contents moved to CSWbdb42 ', 'CSWlibpq': 'CSWlibpq libpq - libraries needed by postgresql server and clients ', 'CSWsasl': 'CSWsasl sasl - Simple Authentication and Security Layer ', 'CSWcommon': 'CSWcommon common - common files and dirs for CSW packages ', 'CSWoldaprt': 'CSWoldaprt openldap_rt - OpenLDAP runtime libraries (oldaprt) ', 'CSWosslrt': 'CSWosslrt openssl_rt - Openssl runtime libraries '} +DATA_BINARIES_BY_PKGNAME = {'CSWpostfix': ['anvil', 'spawn', 'nqmgr', 'tlsmgr', 'scache', 'discard', 'pickup', 'oqmgr', 'proxymap', 'flush', 'verify', 'pipe', 'master', 'bounce', 'error', 'qmqpd', 'virtual', 'smtpd', 'lmtp', 'trivial-rewrite', 'showq', 'cleanup', 'local', 'postmap', 'postlog', 'postmulti', 'postalias', 'postsuper', 'postconf', 'postlock', 'postcat', 'sendmail', 'postqueue', 'postkick', 'postfix', 'postdrop']} +DATA_NEEDED_SONAMES_BY_BINARY = {'postmulti': {'soname': 'postmulti', 'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/bdb4/lib', '/opt/csw/mysql5/lib/mysql', '/opt/csw/postgresql/lib/', '/usr/lib/$ISALIST', '/usr/lib', '/lib/$ISALIST', '/lib'], 'needed sonames': ['libpcre.so.0', 'libdb-4.2.so', 'libssl.so.0.9.8', 'libcrypto.so.0.9.8', 'libsasl2.so.2', 'libldap-2.3.so.0', 'liblber-2.3.so.0', 'libmysqlclient.so.15', 'libpq.so.5', 'libresolv.so.2', 'libsocket.so.1', 'libnsl.so.1', 'libc.so.1']}, 'spawn': {'soname': 'spawn', 'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/bdb4/lib', '/opt/csw/mysql5/lib/mysql', '/opt/csw/postgresql/lib/', '/usr/lib/$ISALIST', '/usr/lib', '/lib/$ISALIST', '/lib'], 'needed sonames': ['libpcre.so.0', 'libdb-4.2.so', 'libssl.so.0.9.8', 'libcrypto.so.0.9.8', 'libsasl2.so.2', 'libldap-2.3.so.0', 'liblber-2.3.so.0', 'libmysqlclient.so.15', 'libpq.so.5', 'libresolv.so.2', 'libsocket.so.1', 'libnsl.so.1', 'libc.so.1']}, 'pos tkick': {'soname': 'postkick', 'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/bdb4/lib', '/opt/csw/mysql5/lib/mysql', '/opt/csw/postgresql/lib/', '/usr/lib/$ISALIST', '/usr/lib', '/lib/$ISALIST', '/lib'], 'needed sonames': ['libpcre.so.0', 'libdb-4.2.so', 'libssl.so.0.9.8', 'libcrypto.so.0.9.8', 'libsasl2.so.2', 'libldap-2.3.so.0', 'liblber-2.3.so.0', 'libmysqlclient.so.15', 'libpq.so.5', 'libresolv.so.2', 'libsocket.so.1', 'libnsl.so.1', 'libc.so.1']}, 'postlog': {'soname': 'postlog', 'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/bdb4/lib', '/opt/csw/mysql5/lib/mysql', '/opt/csw/postgresql/lib/', '/usr/lib/$ISALIST', '/usr/lib', '/lib/$ISALIST', '/lib'], 'needed sonames': ['libpcre.so.0', 'libdb-4.2.so', 'libssl.so.0.9.8', 'libcrypto.so.0.9.8', 'libsasl2.so.2', 'libldap-2.3.so.0', 'liblber-2.3.so.0', 'libmysqlclient.so.15', 'libpq.so.5', 'libresolv.so.2', 'libsocket.so.1', 'libnsl.so.1', 'libc.so.1']}, 'postconf': {'soname': 'postconf', 'run path': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/bdb4/lib', '/opt/csw/mysql5/lib/mysql', '/opt/csw/postgresql/lib/', '/usr/lib/$ISALIST', '/usr/lib', '/lib/$ISALIST', '/lib'], 'needed sonames': ['libpcre.so.0', 'libdb-4.2.so', 'libssl.so.0.9.8', 'libcrypto.so.0.9.8', 'libsasl2.so.2', 'libldap-2.3.so.0', 'liblber-2.3.so.0', 'libmysqlclient.so.15', 'libpq.so.5', 'libresolv.so.2', 'libsocket.so.1', 'libnsl.so.1', 'libc.so.1']}, 'bounce': {'soname': 'bounce', 'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/bdb4/lib', '/opt/csw/mysql5/lib/mysql', '/opt/csw/postgresql/lib/', '/usr/lib/$ISALIST', '/usr/lib', '/lib/$ISALIST', '/lib'], 'needed sonames': ['libpcre.so.0', 'libdb-4.2.so', 'libssl.so.0.9.8', 'libcrypto.so.0.9.8', 'libsasl2.so.2', 'libldap-2.3.so.0', 'liblber-2.3.so.0', 'libmysqlclient.so.15', 'libpq.so.5', 'libresolv.so.2', 'libsocket.so.1', 'libnsl.so.1', 'libc.so.1']}, 'qmqpd': {'soname': 'qmqpd', 'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/ lib', '/opt/csw/bdb4/lib', '/opt/csw/mysql5/lib/mysql', '/opt/csw/postgresql/lib/', '/usr/lib/$ISALIST', '/usr/lib', '/lib/$ISALIST', '/lib'], 'needed sonames': ['libpcre.so.0', 'libdb-4.2.so', 'libssl.so.0.9.8', 'libcrypto.so.0.9.8', 'libsasl2.so.2', 'libldap-2.3.so.0', 'liblber-2.3.so.0', 'libmysqlclient.so.15', 'libpq.so.5', 'libresolv.so.2', 'libsocket.so.1', 'libnsl.so.1', 'libc.so.1']}, 'nqmgr': {'soname': 'nqmgr', 'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/bdb4/lib', '/opt/csw/mysql5/lib/mysql', '/opt/csw/postgresql/lib/', '/usr/lib/$ISALIST', '/usr/lib', '/lib/$ISALIST', '/lib'], 'needed sonames': ['libpcre.so.0', 'libdb-4.2.so', 'libssl.so.0.9.8', 'libcrypto.so.0.9.8', 'libsasl2.so.2', 'libldap-2.3.so.0', 'liblber-2.3.so.0', 'libmysqlclient.so.15', 'libpq.so.5', 'libresolv.so.2', 'libsocket.so.1', 'libnsl.so.1', 'libc.so.1']}, 'flush': {'soname': 'flush', 'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/bdb4/lib', '/opt/csw/mysql5/l ib/mysql', '/opt/csw/postgresql/lib/', '/usr/lib/$ISALIST', '/usr/lib', '/lib/$ISALIST', '/lib'], 'needed sonames': ['libpcre.so.0', 'libdb-4.2.so', 'libssl.so.0.9.8', 'libcrypto.so.0.9.8', 'libsasl2.so.2', 'libldap-2.3.so.0', 'liblber-2.3.so.0', 'libmysqlclient.so.15', 'libpq.so.5', 'libresolv.so.2', 'libsocket.so.1', 'libnsl.so.1', 'libc.so.1']}, 'proxymap': {'soname': 'proxymap', 'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/bdb4/lib', '/opt/csw/mysql5/lib/mysql', '/opt/csw/postgresql/lib/', '/usr/lib/$ISALIST', '/usr/lib', '/lib/$ISALIST', '/lib'], 'needed sonames': ['libpcre.so.0', 'libdb-4.2.so', 'libssl.so.0.9.8', 'libcrypto.so.0.9.8', 'libsasl2.so.2', 'libldap-2.3.so.0', 'liblber-2.3.so.0', 'libmysqlclient.so.15', 'libpq.so.5', 'libresolv.so.2', 'libsocket.so.1', 'libnsl.so.1', 'libc.so.1']}, 'scache': {'soname': 'scache', 'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/bdb4/lib', '/opt/csw/mysql5/lib/mysql', '/opt/csw/postgresql/lib/' , '/usr/lib/$ISALIST', '/usr/lib', '/lib/$ISALIST', '/lib'], 'needed sonames': ['libpcre.so.0', 'libdb-4.2.so', 'libssl.so.0.9.8', 'libcrypto.so.0.9.8', 'libsasl2.so.2', 'libldap-2.3.so.0', 'liblber-2.3.so.0', 'libmysqlclient.so.15', 'libpq.so.5', 'libresolv.so.2', 'libsocket.so.1', 'libnsl.so.1', 'libc.so.1']}, 'anvil': {'soname': 'anvil', 'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/bdb4/lib', '/opt/csw/mysql5/lib/mysql', '/opt/csw/postgresql/lib/', '/usr/lib/$ISALIST', '/usr/lib', '/lib/$ISALIST', '/lib'], 'needed sonames': ['libpcre.so.0', 'libdb-4.2.so', 'libssl.so.0.9.8', 'libcrypto.so.0.9.8', 'libsasl2.so.2', 'libldap-2.3.so.0', 'liblber-2.3.so.0', 'libmysqlclient.so.15', 'libpq.so.5', 'libresolv.so.2', 'libsocket.so.1', 'libnsl.so.1', 'libc.so.1']}, 'verify': {'soname': 'verify', 'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/bdb4/lib', '/opt/csw/mysql5/lib/mysql', '/opt/csw/postgresql/lib/', '/usr/lib/$ISALIST', '/usr/lib', '/lib/$I SALIST', '/lib'], 'needed sonames': ['libpcre.so.0', 'libdb-4.2.so', 'libssl.so.0.9.8', 'libcrypto.so.0.9.8', 'libsasl2.so.2', 'libldap-2.3.so.0', 'liblber-2.3.so.0', 'libmysqlclient.so.15', 'libpq.so.5', 'libresolv.so.2', 'libsocket.so.1', 'libnsl.so.1', 'libc.so.1']}, 'postalias': {'soname': 'postalias', 'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/bdb4/lib', '/opt/csw/mysql5/lib/mysql', '/opt/csw/postgresql/lib/', '/usr/lib/$ISALIST', '/usr/lib', '/lib/$ISALIST', '/lib'], 'needed sonames': ['libpcre.so.0', 'libdb-4.2.so', 'libssl.so.0.9.8', 'libcrypto.so.0.9.8', 'libsasl2.so.2', 'libldap-2.3.so.0', 'liblber-2.3.so.0', 'libmysqlclient.so.15', 'libpq.so.5', 'libresolv.so.2', 'libsocket.so.1', 'libnsl.so.1', 'libc.so.1']}, 'postcat': {'soname': 'postcat', 'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/bdb4/lib', '/opt/csw/mysql5/lib/mysql', '/opt/csw/postgresql/lib/', '/usr/lib/$ISALIST', '/usr/lib', '/lib/$ISALIST', '/lib'], 'needed sonames ': ['libpcre.so.0', 'libdb-4.2.so', 'libssl.so.0.9.8', 'libcrypto.so.0.9.8', 'libsasl2.so.2', 'libldap-2.3.so.0', 'liblber-2.3.so.0', 'libmysqlclient.so.15', 'libpq.so.5', 'libresolv.so.2', 'libsocket.so.1', 'libnsl.so.1', 'libc.so.1']}, 'virtual': {'soname': 'virtual', 'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/bdb4/lib', '/opt/csw/mysql5/lib/mysql', '/opt/csw/postgresql/lib/', '/usr/lib/$ISALIST', '/usr/lib', '/lib/$ISALIST', '/lib'], 'needed sonames': ['libpcre.so.0', 'libdb-4.2.so', 'libssl.so.0.9.8', 'libcrypto.so.0.9.8', 'libsasl2.so.2', 'libldap-2.3.so.0', 'liblber-2.3.so.0', 'libmysqlclient.so.15', 'libpq.so.5', 'libresolv.so.2', 'libsocket.so.1', 'libnsl.so.1', 'libc.so.1']}, 'pickup': {'soname': 'pickup', 'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/bdb4/lib', '/opt/csw/mysql5/lib/mysql', '/opt/csw/postgresql/lib/', '/usr/lib/$ISALIST', '/usr/lib', '/lib/$ISALIST', '/lib'], 'needed sonames': ['libpcre.so.0', 'libdb-4.2.so', 'li bssl.so.0.9.8', 'libcrypto.so.0.9.8', 'libsasl2.so.2', 'libldap-2.3.so.0', 'liblber-2.3.so.0', 'libmysqlclient.so.15', 'libpq.so.5', 'libresolv.so.2', 'libsocket.so.1', 'libnsl.so.1', 'libc.so.1']}, 'oqmgr': {'soname': 'oqmgr', 'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/bdb4/lib', '/opt/csw/mysql5/lib/mysql', '/opt/csw/postgresql/lib/', '/usr/lib/$ISALIST', '/usr/lib', '/lib/$ISALIST', '/lib'], 'needed sonames': ['libpcre.so.0', 'libdb-4.2.so', 'libssl.so.0.9.8', 'libcrypto.so.0.9.8', 'libsasl2.so.2', 'libldap-2.3.so.0', 'liblber-2.3.so.0', 'libmysqlclient.so.15', 'libpq.so.5', 'libresolv.so.2', 'libsocket.so.1', 'libnsl.so.1', 'libc.so.1']}, 'master': {'soname': 'master', 'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/bdb4/lib', '/opt/csw/mysql5/lib/mysql', '/opt/csw/postgresql/lib/', '/usr/lib/$ISALIST', '/usr/lib', '/lib/$ISALIST', '/lib'], 'needed sonames': ['libpcre.so.0', 'libdb-4.2.so', 'libssl.so.0.9.8', 'libcrypto.so.0.9.8', 'libs asl2.so.2', 'libldap-2.3.so.0', 'liblber-2.3.so.0', 'libmysqlclient.so.15', 'libpq.so.5', 'libresolv.so.2', 'libsocket.so.1', 'libnsl.so.1', 'libc.so.1']}, 'postqueue': {'soname': 'postqueue', 'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/bdb4/lib', '/opt/csw/mysql5/lib/mysql', '/opt/csw/postgresql/lib/', '/usr/lib/$ISALIST', '/usr/lib', '/lib/$ISALIST', '/lib'], 'needed sonames': ['libpcre.so.0', 'libdb-4.2.so', 'libssl.so.0.9.8', 'libcrypto.so.0.9.8', 'libsasl2.so.2', 'libldap-2.3.so.0', 'liblber-2.3.so.0', 'libmysqlclient.so.15', 'libpq.so.5', 'libresolv.so.2', 'libsocket.so.1', 'libnsl.so.1', 'libc.so.1']}, 'postmap': {'soname': 'postmap', 'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/bdb4/lib', '/opt/csw/mysql5/lib/mysql', '/opt/csw/postgresql/lib/', '/usr/lib/$ISALIST', '/usr/lib', '/lib/$ISALIST', '/lib'], 'needed sonames': ['libpcre.so.0', 'libdb-4.2.so', 'libssl.so.0.9.8', 'libcrypto.so.0.9.8', 'libsasl2.so.2', 'libldap-2.3.so.0', ' liblber-2.3.so.0', 'libmysqlclient.so.15', 'libpq.so.5', 'libresolv.so.2', 'libsocket.so.1', 'libnsl.so.1', 'libc.so.1']}, 'local': {'soname': 'local', 'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/bdb4/lib', '/opt/csw/mysql5/lib/mysql', '/opt/csw/postgresql/lib/', '/usr/lib/$ISALIST', '/usr/lib', '/lib/$ISALIST', '/lib'], 'needed sonames': ['libpcre.so.0', 'libdb-4.2.so', 'libssl.so.0.9.8', 'libcrypto.so.0.9.8', 'libsasl2.so.2', 'libldap-2.3.so.0', 'liblber-2.3.so.0', 'libmysqlclient.so.15', 'libpq.so.5', 'libresolv.so.2', 'libsocket.so.1', 'libnsl.so.1', 'libc.so.1']}, 'showq': {'soname': 'showq', 'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/bdb4/lib', '/opt/csw/mysql5/lib/mysql', '/opt/csw/postgresql/lib/', '/usr/lib/$ISALIST', '/usr/lib', '/lib/$ISALIST', '/lib'], 'needed sonames': ['libpcre.so.0', 'libdb-4.2.so', 'libssl.so.0.9.8', 'libcrypto.so.0.9.8', 'libsasl2.so.2', 'libldap-2.3.so.0', 'liblber-2.3.so.0', 'libmysqlclient.so.15', 'l ibpq.so.5', 'libresolv.so.2', 'libsocket.so.1', 'libnsl.so.1', 'libc.so.1']}, 'sendmail': {'soname': 'sendmail', 'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/bdb4/lib', '/opt/csw/mysql5/lib/mysql', '/opt/csw/postgresql/lib/', '/usr/lib/$ISALIST', '/usr/lib', '/lib/$ISALIST', '/lib'], 'needed sonames': ['libpcre.so.0', 'libdb-4.2.so', 'libssl.so.0.9.8', 'libcrypto.so.0.9.8', 'libsasl2.so.2', 'libldap-2.3.so.0', 'liblber-2.3.so.0', 'libmysqlclient.so.15', 'libpq.so.5', 'libresolv.so.2', 'libsocket.so.1', 'libnsl.so.1', 'libc.so.1']}, 'smtpd': {'soname': 'smtpd', 'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/bdb4/lib', '/opt/csw/mysql5/lib/mysql', '/opt/csw/postgresql/lib/', '/usr/lib/$ISALIST', '/usr/lib', '/lib/$ISALIST', '/lib'], 'needed sonames': ['libpcre.so.0', 'libdb-4.2.so', 'libssl.so.0.9.8', 'libcrypto.so.0.9.8', 'libsasl2.so.2', 'libldap-2.3.so.0', 'liblber-2.3.so.0', 'libmysqlclient.so.15', 'libpq.so.5', 'libresolv.so.2', 'libsocke t.so.1', 'libnsl.so.1', 'libc.so.1']}, 'lmtp': {'soname': 'lmtp', 'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/bdb4/lib', '/opt/csw/mysql5/lib/mysql', '/opt/csw/postgresql/lib/', '/usr/lib/$ISALIST', '/usr/lib', '/lib/$ISALIST', '/lib'], 'needed sonames': ['libpcre.so.0', 'libdb-4.2.so', 'libssl.so.0.9.8', 'libcrypto.so.0.9.8', 'libsasl2.so.2', 'libldap-2.3.so.0', 'liblber-2.3.so.0', 'libmysqlclient.so.15', 'libpq.so.5', 'libresolv.so.2', 'libsocket.so.1', 'libnsl.so.1', 'libc.so.1']}, 'postdrop': {'soname': 'postdrop', 'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/bdb4/lib', '/opt/csw/mysql5/lib/mysql', '/opt/csw/postgresql/lib/', '/usr/lib/$ISALIST', '/usr/lib', '/lib/$ISALIST', '/lib'], 'needed sonames': ['libpcre.so.0', 'libdb-4.2.so', 'libssl.so.0.9.8', 'libcrypto.so.0.9.8', 'libsasl2.so.2', 'libldap-2.3.so.0', 'liblber-2.3.so.0', 'libmysqlclient.so.15', 'libpq.so.5', 'libresolv.so.2', 'libsocket.so.1', 'libnsl.so.1', 'libc.so.1']}, 't rivial-rewrite': {'soname': 'trivial-rewrite', 'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/bdb4/lib', '/opt/csw/mysql5/lib/mysql', '/opt/csw/postgresql/lib/', '/usr/lib/$ISALIST', '/usr/lib', '/lib/$ISALIST', '/lib'], 'needed sonames': ['libpcre.so.0', 'libdb-4.2.so', 'libssl.so.0.9.8', 'libcrypto.so.0.9.8', 'libsasl2.so.2', 'libldap-2.3.so.0', 'liblber-2.3.so.0', 'libmysqlclient.so.15', 'libpq.so.5', 'libresolv.so.2', 'libsocket.so.1', 'libnsl.so.1', 'libc.so.1']}, 'postfix': {'soname': 'postfix', 'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/bdb4/lib', '/opt/csw/mysql5/lib/mysql', '/opt/csw/postgresql/lib/', '/usr/lib/$ISALIST', '/usr/lib', '/lib/$ISALIST', '/lib'], 'needed sonames': ['libpcre.so.0', 'libdb-4.2.so', 'libssl.so.0.9.8', 'libcrypto.so.0.9.8', 'libsasl2.so.2', 'libldap-2.3.so.0', 'liblber-2.3.so.0', 'libmysqlclient.so.15', 'libpq.so.5', 'libresolv.so.2', 'libsocket.so.1', 'libnsl.so.1', 'libc.so.1']}, 'postlock': {'soname': 'postlock', 'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/bdb4/lib', '/opt/csw/mysql5/lib/mysql', '/opt/csw/postgresql/lib/', '/usr/lib/$ISALIST', '/usr/lib', '/lib/$ISALIST', '/lib'], 'needed sonames': ['libpcre.so.0', 'libdb-4.2.so', 'libssl.so.0.9.8', 'libcrypto.so.0.9.8', 'libsasl2.so.2', 'libldap-2.3.so.0', 'liblber-2.3.so.0', 'libmysqlclient.so.15', 'libpq.so.5', 'libresolv.so.2', 'libsocket.so.1', 'libnsl.so.1', 'libc.so.1']}, 'pipe': {'soname': 'pipe', 'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/bdb4/lib', '/opt/csw/mysql5/lib/mysql', '/opt/csw/postgresql/lib/', '/usr/lib/$ISALIST', '/usr/lib', '/lib/$ISALIST', '/lib'], 'needed sonames': ['libpcre.so.0', 'libdb-4.2.so', 'libssl.so.0.9.8', 'libcrypto.so.0.9.8', 'libsasl2.so.2', 'libldap-2.3.so.0', 'liblber-2.3.so.0', 'libmysqlclient.so.15', 'libpq.so.5', 'libresolv.so.2', 'libsocket.so.1', 'libnsl.so.1', 'libc.so.1']}, 'tlsmgr': {'soname': 'tlsmgr', 'runpath': ['/opt/csw/lib/$ISALIS T', '/opt/csw/lib', '/opt/csw/bdb4/lib', '/opt/csw/mysql5/lib/mysql', '/opt/csw/postgresql/lib/', '/usr/lib/$ISALIST', '/usr/lib', '/lib/$ISALIST', '/lib'], 'needed sonames': ['libpcre.so.0', 'libdb-4.2.so', 'libssl.so.0.9.8', 'libcrypto.so.0.9.8', 'libsasl2.so.2', 'libldap-2.3.so.0', 'liblber-2.3.so.0', 'libmysqlclient.so.15', 'libpq.so.5', 'libresolv.so.2', 'libsocket.so.1', 'libnsl.so.1', 'libc.so.1']}, 'error': {'soname': 'error', 'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/bdb4/lib', '/opt/csw/mysql5/lib/mysql', '/opt/csw/postgresql/lib/', '/usr/lib/$ISALIST', '/usr/lib', '/lib/$ISALIST', '/lib'], 'needed sonames': ['libpcre.so.0', 'libdb-4.2.so', 'libssl.so.0.9.8', 'libcrypto.so.0.9.8', 'libsasl2.so.2', 'libldap-2.3.so.0', 'liblber-2.3.so.0', 'libmysqlclient.so.15', 'libpq.so.5', 'libresolv.so.2', 'libsocket.so.1', 'libnsl.so.1', 'libc.so.1']}, 'discard': {'soname': 'discard', 'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/bdb4/lib', '/opt/csw/mysql5/lib/mysql', '/opt/csw/postgresql/lib/', '/usr/lib/$ISALIST', '/usr/lib', '/lib/$ISALIST', '/lib'], 'needed sonames': ['libpcre.so.0', 'libdb-4.2.so', 'libssl.so.0.9.8', 'libcrypto.so.0.9.8', 'libsasl2.so.2', 'libldap-2.3.so.0', 'liblber-2.3.so.0', 'libmysqlclient.so.15', 'libpq.so.5', 'libresolv.so.2', 'libsocket.so.1', 'libnsl.so.1', 'libc.so.1']}, 'postsuper': {'soname': 'postsuper', 'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/bdb4/lib', '/opt/csw/mysql5/lib/mysql', '/opt/csw/postgresql/lib/', '/usr/lib/$ISALIST', '/usr/lib', '/lib/$ISALIST', '/lib'], 'needed sonames': ['libpcre.so.0', 'libdb-4.2.so', 'libssl.so.0.9.8', 'libcrypto.so.0.9.8', 'libsasl2.so.2', 'libldap-2.3.so.0', 'liblber-2.3.so.0', 'libmysqlclient.so.15', 'libpq.so.5', 'libresolv.so.2', 'libsocket.so.1', 'libnsl.so.1', 'libc.so.1']}, 'cleanup': {'soname': 'cleanup', 'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/bdb4/lib', '/opt/csw/mysql5/lib/mysql', '/op t/csw/postgresql/lib/', '/usr/lib/$ISALIST', '/usr/lib', '/lib/$ISALIST', '/lib'], 'needed sonames': ['libpcre.so.0', 'libdb-4.2.so', 'libssl.so.0.9.8', 'libcrypto.so.0.9.8', 'libsasl2.so.2', 'libldap-2.3.so.0', 'liblber-2.3.so.0', 'libmysqlclient.so.15', 'libpq.so.5', 'libresolv.so.2', 'libsocket.so.1', 'libnsl.so.1', 'libc.so.1']}} +DATA_PKGS_BY_FILENAME = {'libresolv.so.2': u'SUNWcslx', 'libnsl.so.1': u'SUNWcslx', 'libsasl2.so.2': u'CSWsasl', 'libmysqlclient.so.15': u'CSWmysql5rt', 'libpcre.so.0': u'CSWpcrert', 'libssl.so.0.9.8': u'CSWosslrt', 'libldap-2.3.so.0': u'CSWoldaprt', 'libcrypto.so.0.9.8': u'CSWosslrt', 'libsocket.so.1': u'SUNWcslx', 'liblber-2.3.so.0': u'CSWoldaprt', 'libc.so.1': u'SUNWcslx'} +DATA_FILENAMES_BY_SONAME = {'postmulti': 'postmulti', 'spawn': 'spawn', 'postkick': 'postkick', 'postlog': 'postlog', 'postconf': 'postconf', 'bounce': 'bounce', 'qmqpd': 'qmqpd', 'nqmgr': 'nqmgr', 'flush': 'flush', 'proxymap': 'proxymap', 'scache': 'scache', 'anvil': 'anvil', 'verify': 'verify', 'postalias': 'postalias', 'postcat': 'postcat', 'virtual': 'virtual', 'pickup': 'pickup', 'oqmgr': 'oqmgr', 'master': 'master', 'postqueue': 'postqueue', 'postmap': 'postmap', 'local': 'local', 'showq': 'showq', 'sendmail': 'sendmail', 'smtpd': 'smtpd', 'lmtp': 'lmtp', 'postdrop': 'postdrop', 'trivial-rewrite': 'trivial-rewrite', 'postfix': 'postfix', 'postlock': 'postlock', 'pipe': 'pipe', 'tlsmgr': 'tlsmgr', 'error': 'error', 'discard': 'discard', 'postsuper': 'postsuper', 'cleanup': 'cleanup'} +DATA_PKG_BY_ANY_FILENAME = {'BASIC_CONFIGURATION_README': 'CSWpostfix', 'postlock.1': 'CSWpostfix', 'newaliases.1.html': 'CSWpostfix', 'CDB_README': 'CSWpostfix', 'MULTI_INSTANCE_README': 'CSWpostfix', 'CONTENT_INSPECTION_README.html': 'CSWpostfix', 'trace.8': 'CSWpostfix', 'SASL_README.html': 'CSWpostfix', 'postsuper': 'CSWpostfix', 'showq.8': 'CSWpostfix', 'qmqpd': 'CSWpostfix', 'cidr_table.5.html': 'CSWpostfix', 'virtual': 'CSWpostfix', 'verify.8': 'CSWpostfix', 'ETRN_README.html': 'CSWpostfix', 'pgsql_table.5.html': 'CSWpostfix', 'generic.CSW': 'CSWpostfix', 'FILTER_README.html': 'CSWpostfix', 'cswusergroup': 'CSWpostfix', 'CONNECTION_CACHE_README': 'CSWpostfix', 'STRESS_README.html': 'CSWpostfix', 'pickup.8': 'CSWpostfix', 'postconf.1': 'CSWpostfix', 'OVERVIEW': 'CSWpostfix', 'showq.8.html': 'CSWpostfix', 'XFORWARD_README.html': 'CSWpostfix', 'pickup.8.html': 'CSWpostfix', 'master.5.html': 'CSWpostfix', 'smtpd.8': 'CSWpostfix', 'ADDRESS_VERIFICATION_README': 'CSWpo stfix', 'discard.8': 'CSWpostfix', 'IPV6_README': 'CSWpostfix', 'local': 'CSWpostfix', 'qmgr.8': 'CSWpostfix', 'local.8.html': 'CSWpostfix', 'newaliases.1': 'CSWpostfix', 'PACKAGE_README': 'CSWpostfix', 'header_checks.CSW': 'CSWpostfix', 'PACKAGE_README.html': 'CSWpostfix', 'postmap.1.html': 'CSWpostfix', 'regexp_table.5': 'CSWpostfix', 'VIRTUAL_README.html': 'CSWpostfix', 'virtual.8': 'CSWpostfix', 'postlock.1.html': 'CSWpostfix', 'postfix-wrapper': 'CSWpostfix', 'tlsmgr.8': 'CSWpostfix', 'lmtp': 'CSWpostfix', 'verify': 'CSWpostfix', 'trivial-rewrite': 'CSWpostfix', 'scache': 'CSWpostfix', 'CONNECTION_CACHE_README.html': 'CSWpostfix', 'postlog.1.html': 'CSWpostfix', 'postconf.1.html': 'CSWpostfix', 'postfix-files': 'CSWpostfix', 'VIRTUAL_README': 'CSWpostfix', 'TLS_LEGACY_README.html': 'CSWpostfix', 'LOCAL_RECIPIENT_README': 'CSWpostfix', 'TUNING_README': 'CSWpostfix', 'main.cf': 'CSWpostfix', 'postfix-wrapper.5.html': 'CSWpostfix', 'cidr_table.5': 'CSWpostfix', 'NFS_README ': 'CSWpostfix', 'flush.8': 'CSWpostfix', 'postkick.1.html': 'CSWpostfix', 'postalias': 'CSWpostfix', 'STANDARD_CONFIGURATION_README': 'CSWpostfix', 'postmulti': 'CSWpostfix', 'postqueue.1': 'CSWpostfix', 'MAILDROP_README': 'CSWpostfix', 'postqueue.1.html': 'CSWpostfix', 'postlog': 'CSWpostfix', 'postconf': 'CSWpostfix', 'nisplus_table.5.html': 'CSWpostfix', 'scache.8': 'CSWpostfix', 'aliases.5': 'CSWpostfix', 'bounce.8': 'CSWpostfix', 'ldap_table.5.html': 'CSWpostfix', 'master.5': 'CSWpostfix', 'flush': 'CSWpostfix', 'master.8': 'CSWpostfix', 'postmulti.1.html': 'CSWpostfix', 'STANDARD_CONFIGURATION_README.html': 'CSWpostfix', 'bounce.5': 'CSWpostfix', 'smtp-source.1.html': 'CSWpostfix', 'smtpd': 'CSWpostfix', 'proxymap.8.html': 'CSWpostfix', 'oqmgr.8': 'CSWpostfix', 'postkick.1': 'CSWpostfix', 'BACKSCATTER_README.html': 'CSWpostfix', 'tcp_table.5': 'CSWpostfix', 'pkginfo': 'CSWpostfix', 'postfix.1.html': 'CSWpostfix', 'post-install': 'CSWpostfix', 'access.CSW': 'CSWpostfix ', 'CONTENT_INSPECTION_README': 'CSWpostfix', 'SMTPD_POLICY_README': 'CSWpostfix', 'TLS_README.html': 'CSWpostfix', 'postconf.5': 'CSWpostfix', 'smtpd.8.html': 'CSWpostfix', 'MILTER_README': 'CSWpostfix', 'LINUX_README': 'CSWpostfix', 'SMTPD_PROXY_README.html': 'CSWpostfix', 'showq': 'CSWpostfix', 'tlsmgr': 'CSWpostfix', 'INSTALL.html': 'CSWpostfix', 'access.5.html': 'CSWpostfix', 'relocated.CSW': 'CSWpostfix', 'ULTRIX_README': 'CSWpostfix', 'sendmail': 'CSWpostfix', 'error': 'CSWpostfix', 'ETRN_README': 'CSWpostfix', 'AAAREADME': 'CSWpostfix', 'master.cf.CSW': 'CSWpostfix', 'pgsql_table.5': 'CSWpostfix', 'error.8': 'CSWpostfix', 'depend': 'CSWpostfix', 'LDAP_README': 'CSWpostfix', 'canonical.5': 'CSWpostfix', 'postmulti.1': 'CSWpostfix', 'MYSQL_README.html': 'CSWpostfix', 'qmgr.8.html': 'CSWpostfix', 'smtp.8': 'CSWpostfix', 'pipe.8.html': 'CSWpostfix', 'oqmgr': 'CSWpostfix', 'anvil': 'CSWpostfix', 'main.cf.CSW': 'CSWpostfix', 'postlock': 'CSWpostfix', 'postfix.1': 'CSWpostf ix', 'ADDRESS_CLASS_README': 'CSWpostfix', 'OVERVIEW.html': 'CSWpostfix', 'QSHAPE_README': 'CSWpostfix', 'NFS_README.html': 'CSWpostfix', 'discard': 'CSWpostfix', 'FILTER_README': 'CSWpostfix', 'lmtp.8.html': 'CSWpostfix', 'body_checks.5': 'CSWpostfix', 'generic.5.html': 'CSWpostfix', 'postdrop.1.html': 'CSWpostfix', 'error.8.html': 'CSWpostfix', 'verify.8.html': 'CSWpostfix', 'TLS_LICENSE': 'CSWpostfix', 'discard.8.html': 'CSWpostfix', 'tcp_table.5.html': 'CSWpostfix', 'header_checks.5': 'CSWpostfix', 'PGSQL_README': 'CSWpostfix', 'XFORWARD_README': 'CSWpostfix', 'postmap': 'CSWpostfix', 'proxymap': 'CSWpostfix', 'RESTRICTION_CLASS_README': 'CSWpostfix', 'LDAP_README.html': 'CSWpostfix', 'defer.8.html': 'CSWpostfix', 'flush.8.html': 'CSWpostfix', 'VERP_README': 'CSWpostfix', 'cleanup.8': 'CSWpostfix', 'XCLIENT_README.html': 'CSWpostfix', 'virtual.CSW': 'CSWpostfix', 'qmqpd.8.html': 'CSWpostfix', 'cleanup.8.html': 'CSWpostfix', 'postdrop': 'CSWpostfix', 'qshape.1.html': 'CSW postfix', 'VERP_README.html': 'CSWpostfix', 'SCHEDULER_README.html': 'CSWpostfix', 'trivial-rewrite.8.html': 'CSWpostfix', 'postqueue': 'CSWpostfix', 'master': 'CSWpostfix', 'oqmgr.8.html': 'CSWpostfix', 'trivial-rewrite.8': 'CSWpostfix', 'master.8.html': 'CSWpostfix', 'PGSQL_README.html': 'CSWpostfix', 'STRESS_README': 'CSWpostfix', 'header_checks.5.html': 'CSWpostfix', 'canonical.CSW': 'CSWpostfix', 'relocated.5.html': 'CSWpostfix', 'TLS_README': 'CSWpostfix', 'BACKSCATTER_README': 'CSWpostfix', 'pcre_table.5': 'CSWpostfix', 'postfix-script': 'CSWpostfix', 'qmqp-source.1.html': 'CSWpostfix', 'postcat': 'CSWpostfix', 'transport.5': 'CSWpostfix', 'defer.8': 'CSWpostfix', 'bounce': 'CSWpostfix', 'postsuper.1': 'CSWpostfix', 'LINUX_README.html': 'CSWpostfix', 'index.html': 'CSWpostfix', 'postdrop.1': 'CSWpostfix', 'transport.CSW': 'CSWpostfix', 'ADDRESS_REWRITING_README.html': 'CSWpostfix', 'pipe.8': 'CSWpostfix', 'proxymap.8': 'CSWpostfix', 'DB_README.html': 'CSWpostfix', 'LO CAL_RECIPIENT_README.html': 'CSWpostfix', 'UUCP_README': 'CSWpostfix', 'postcat.1.html': 'CSWpostfix', 'ldap_table.5': 'CSWpostfix', 'pkgmap': 'CSWpostfix', 'postmulti-script': 'CSWpostfix', 'BUILTIN_FILTER_README.html': 'CSWpostfix', 'SMTPD_POLICY_README.html': 'CSWpostfix', 'main.cf.default': 'CSWpostfix', 'postfix-wrapper.5': 'CSWpostfix', 'IPV6_README.html': 'CSWpostfix', 'qmqpd.8': 'CSWpostfix', 'spawn': 'CSWpostfix', 'mailq.1': 'CSWpostfix', 'DB_README': 'CSWpostfix', 'pickup': 'CSWpostfix', 'BASIC_CONFIGURATION_README.html': 'CSWpostfix', 'postsuper.1.html': 'CSWpostfix', 'cswpostfix': 'CSWpostfix', 'postconf.5.html': 'CSWpostfix', 'CDB_README.html': 'CSWpostfix', 'BUILTIN_FILTER_README': 'CSWpostfix', 'SMTPD_ACCESS_README': 'CSWpostfix', 'TLS_LEGACY_README': 'CSWpostfix', 'virtual.8.html': 'CSWpostfix', 'DATABASE_README': 'CSWpostfix', 'lmtp.8': 'CSWpostfix', 'spawn.8.html': 'CSWpostfix', 'access.5': 'CSWpostfix', 'ADDRESS_REWRITING_README': 'CSWpostfix', 'aliases.CS W': 'CSWpostfix', 'SASL_README': 'CSWpostfix', 'pcre_table.5.html': 'CSWpostfix', 'MYSQL_README': 'CSWpostfix', 'ADDRESS_VERIFICATION_README.html': 'CSWpostfix', 'mysql_table.5': 'CSWpostfix', 'DSN_README.html': 'CSWpostfix', 'DATABASE_README.html': 'CSWpostfix', 'postfix-manuals.html': 'CSWpostfix', 'SCHEDULER_README': 'CSWpostfix', 'SMTPD_ACCESS_README.html': 'CSWpostfix', 'postlog.1': 'CSWpostfix', 'nqmgr': 'CSWpostfix', 'nisplus_table.5': 'CSWpostfix', 'local.8': 'CSWpostfix', 'smtp-sink.1.html': 'CSWpostfix', 'ADDRESS_CLASS_README.html': 'CSWpostfix', 'cleanup': 'CSWpostfix', 'QSHAPE_README.html': 'CSWpostfix', 'virtual.5.html': 'CSWpostfix', 'XCLIENT_README': 'CSWpostfix', 'UUCP_README.html': 'CSWpostfix', 'relocated.5': 'CSWpostfix', 'RELEASE_NOTES': 'CSWpostfix', 'canonical.5.html': 'CSWpostfix', 'checkinstall': 'CSWpostfix', 'INSTALL': 'CSWpostfix', 'PCRE_README': 'CSWpostfix', 'postalias.1.html': 'CSWpostfix', 'postcat.1': 'CSWpostfix', 'sendmail.1': 'CSWpostfix', 'bounce.cf.default': 'CSWpostfix', 'postfix-logo.jpg': 'CSWpostfix', 'TUNING_README.html': 'CSWpostfix', 'anvil.8.html': 'CSWpostfix', 'mysql_table.5.html': 'CSWpostfix', 'RESTRICTION_CLASS_README.html': 'CSWpostfix', 'master.cf': 'CSWpostfix', 'postkick': 'CSWpostfix', 'MULTI_INSTANCE_README.html': 'CSWpostfix', 'spawn.8': 'CSWpostfix', 'DEBUG_README': 'CSWpostfix', 'postalias.1': 'CSWpostfix', 'PCRE_README.html': 'CSWpostfix', 'postfix': 'CSWpostfix', 'DEBUG_README.html': 'CSWpostfix', 'MILTER_README.html': 'CSWpostfix', 'MAILDROP_README.html': 'CSWpostfix', 'aliases.5.html': 'CSWpostfix', 'pipe': 'CSWpostfix', 'SMTPD_PROXY_README': 'CSWpostfix', 'regexp_table.5.html': 'CSWpostfix', 'postmap.1': 'CSWpostfix', 'transport.5.html': 'CSWpostfix', 'qmqp-sink.1.html': 'CSWpostfix', 'DSN_README': 'CSWpostfix', 'anvil.8': 'CSWpostfix', 'virtual.5': 'CSWpostfix', 'generic.5': 'CSWpostfix'} +DATA_LINES_BY_SONAME = {'libresolv.so.2': u'/usr/lib/sparcv9/libresolv.so.2 f none 0755 root bin 448048 5947 1234567885 SUNWcslx', 'libnsl.so.1': u'/usr/lib/sparcv9/libnsl.so.1 f none 0755 root bin 1099248 7581 1217954364 SUNWcslx', 'libsasl2.so.2': u'/opt/csw/lib/libsasl2.so.2=libsasl2.so.2.0.22 s none CSWsasl', 'libmysqlclient.so.15': u'/opt/csw/mysql5/lib/mysql/libmysqlclient.so.15=libmysqlclient.so.15.0.0 s none CSWmysql5rt', 'libpcre.so.0': u'/opt/csw/lib/sparcv9/libpcre.so.0=libpcre.so.0.0.1 s none CSWpcrert', 'libssl.so.0.9.8': u'/opt/csw/lib/sparcv9/libssl.so.0.9.8 f none 0755 root bin 427792 46460 1261308405 CSWosslrt', 'libldap-2.3.so.0': u'/opt/csw/lib/sparcv9/libldap-2.3.so.0=libldap-2.3.so.0.2.27 s none CSWoldaprt', 'libcrypto.so.0.9.8': u'/opt/csw/lib/sparcv9/libcrypto.so.0.9.8 f none 0755 root bin 2520480 3820 1261308405 CSWosslrt', 'libsocket.so.1': u'/usr/lib/sparcv9/libsocket.so.1 f none 0755 root bin 96448 3175 1210705279 SUNWcslx', 'libc.so.1': u '/usr/lib/sparcv9/libc.so.1 f none 0755 root bin 1271000 23501 1217954364 SUNWcslx', 'liblber-2.3.so.0': u'/opt/csw/lib/sparcv9/liblber-2.3.so.0=liblber-2.3.so.0.2.27 s none CSWoldaprt'} +DATA_PKGMAP_CACHE = {'libresolv.so.2': {u'/usr/lib/sparcv9': u'/usr/lib/sparcv9/libresolv.so.2 f none 0755 root bin 448048 5947 1234567885 SUNWcslx', u'/usr/lib': u'/usr/lib/libresolv.so.2 f none 0755 root bin 392904 57407 1234567884 SUNWcsl'}, 'libdb-4.2.so': {u'/opt/csw/bdb42/lib': u'/opt/csw/bdb42/lib/libdb-4.2.so f none 0755 root bin 1327544 49309 1254747864 CSWbdb42', u'/opt/csw/bdb42/lib/sparcv9': u'/opt/csw/bdb42/lib/sparcv9/libdb-4.2.so f none 0755 root bin 1450608 31012 1254748763 CSWbdb42'}, 'libsasl2.so.2': {u'/opt/csw/lib': u'/opt/csw/lib/libsasl2.so.2=libsasl2.so.2.0.22 s none CSWsasl'}, 'libmysqlclient.so.15': {u'/opt/csw/mysql5/lib/mysql': u'/opt/csw/mysql5/lib/mysql/libmysqlclient.so.15=libmysqlclient.so.15.0.0 s none CSWmysql5rt', u'/opt/csw/mysql5/lib/sparcv9/mysql': u'/opt/csw/mysql5/lib/sparcv9/mysql/libmysqlclient.so.15=libmysqlclient.so.15.0.0 s none CSWmysql5rt'}, 'libpcre.so.0': {u'/opt/csw/lib': u'/opt/csw/lib/libpcre.so.0=libpcre.so.0.0. 1 s none CSWpcrert', u'/opt/csw/lib/sparcv9': u'/opt/csw/lib/sparcv9/libpcre.so.0=libpcre.so.0.0.1 s none CSWpcrert'}, 'libssl.so.0.9.8': {u'/opt/csw/lib/sparcv8plus+vis': u'/opt/csw/lib/sparcv8plus+vis/libssl.so.0.9.8 f none 0755 root bin 375532 23572 1261306582 CSWosslrt', u'/opt/csw/lib': u'/opt/csw/lib/libssl.so.0.9.8 f none 0555 root bin 372000 63313 1261304839 CSWosslrt', u'/opt/csw/lib/sparcv9': u'/opt/csw/lib/sparcv9/libssl.so.0.9.8 f none 0755 root bin 427792 46460 1261308405 CSWosslrt'}, 'libldap-2.3.so.0': {u'/opt/csw/lib': u'/opt/csw/lib/libldap-2.3.so.0=libldap-2.3.so.0.2.27 s none CSWoldaprt', u'/opt/csw/lib/sparcv9': u'/opt/csw/lib/sparcv9/libldap-2.3.so.0=libldap-2.3.so.0.2.27 s none CSWoldaprt'}, 'libnsl.so.1': {u'/usr/lib/sparcv9': u'/usr/lib/sparcv9/libnsl.so.1 f none 0755 root bin 1099248 7581 1217954364 SUNWcslx', u'/usr/lib': u'/usr/lib/libnsl.so.1 f none 0755 root bin 920500 29766 1217954358 SUNWcsl'}, 'libcrypto.so.0.9.8': {u'/opt/csw/lib/sparcv8plus+ vis': u'/opt/csw/lib/sparcv8plus+vis/libcrypto.so.0.9.8 f none 0755 root bin 2194440 48878 1261306582 CSWosslrt', u'/opt/csw/lib': u'/opt/csw/lib/libcrypto.so.0.9.8 f none 0555 root bin 2166696 48180 1261304839 CSWosslrt', u'/opt/csw/lib/sparcv9': u'/opt/csw/lib/sparcv9/libcrypto.so.0.9.8 f none 0755 root bin 2520480 3820 1261308405 CSWosslrt'}, 'libsocket.so.1': {u'/usr/lib/sparcv9': u'/usr/lib/sparcv9/libsocket.so.1 f none 0755 root bin 96448 3175 1210705279 SUNWcslx', u'/usr/lib': u'/usr/lib/libsocket.so.1 f none 0755 root bin 70860 28509 1210705279 SUNWcsl'}, 'libc.so.1': {u'/usr/lib/libp/sparcv9': u'/usr/lib/libp/sparcv9/libc.so.1 f none 0755 root bin 1395296 13745 1217954372 SUNWdplx', u'/usr/lib/sparcv9': u'/usr/lib/sparcv9/libc.so.1 f none 0755 root bin 1271000 23501 1217954364 SUNWcslx', u'/usr/lib': u'/usr/lib/libc.so.1 f none 0755 root bin 1157948 58901 1217954358 SUNWcsl'}, 'liblber-2.3.so.0': {u'/opt/csw/lib': u'/opt/csw/lib/liblber-2.3.so.0=liblber-2.3.so.0.2.2 7 s none CSWoldaprt', u'/opt/csw/lib/sparcv9': u'/opt/csw/lib/sparcv9/liblber-2.3.so.0=liblber-2.3.so.0.2.27 s none CSWoldaprt'}, 'libpq.so.5': {u'/opt/csw/postgresql/lib': u'/opt/csw/postgresql/lib/libpq.so.5=libpq.so.5.1 s none CSWlibpq', u'/opt/csw/postgresql/lib/sparcv9': u'/opt/csw/postgresql/lib/sparcv9/libpq.so.5=libpq.so.5.1 s none CSWlibpq'}} +DATA_BINARIES_BY_SONAME = {'libresolv.so.2': set(['postmulti', 'spawn', 'postkick', 'postlog', 'postconf', 'bounce', 'qmqpd', 'virtual', 'flush', 'proxymap', 'scache', 'anvil', 'verify', 'postalias', 'postcat', 'nqmgr', 'pickup', 'oqmgr', 'master', 'postqueue', 'postmap', 'local', 'showq', 'sendmail', 'discard', 'lmtp', 'postdrop', 'trivial-rewrite', 'postfix', 'postlock', 'pipe', 'tlsmgr', 'error', 'smtpd', 'postsuper', 'cleanup']), 'libdb-4.2.so': set(['postmulti', 'spawn', 'postkick', 'postlog', 'postconf', 'bounce', 'qmqpd', 'virtual', 'flush', 'proxymap', 'scache', 'anvil', 'verify', 'postalias', 'postcat', 'nqmgr', 'pickup', 'oqmgr', 'master', 'postqueue', 'postmap', 'local', 'showq', 'sendmail', 'discard', 'lmtp', 'postdrop', 'trivial-rewrite', 'postfix', 'postlock', 'pipe', 'tlsmgr', 'error', 'smtpd', 'postsuper', 'cleanup']), 'libsasl2.so.2': set(['postmulti', 'spawn', 'postkick', 'postlog', 'postconf', 'bounce', 'qmqpd', 'virtual', 'flush', 'proxymap', 'scach e', 'anvil', 'verify', 'postalias', 'postcat', 'nqmgr', 'pickup', 'oqmgr', 'master', 'postqueue', 'postmap', 'local', 'showq', 'sendmail', 'discard', 'lmtp', 'postdrop', 'trivial-rewrite', 'postfix', 'postlock', 'pipe', 'tlsmgr', 'error', 'smtpd', 'postsuper', 'cleanup']), 'libmysqlclient.so.15': set(['postmulti', 'spawn', 'postkick', 'postlog', 'postconf', 'bounce', 'qmqpd', 'virtual', 'flush', 'proxymap', 'scache', 'anvil', 'verify', 'postalias', 'postcat', 'nqmgr', 'pickup', 'oqmgr', 'master', 'postqueue', 'postmap', 'local', 'showq', 'sendmail', 'discard', 'lmtp', 'postdrop', 'trivial-rewrite', 'postfix', 'postlock', 'pipe', 'tlsmgr', 'error', 'smtpd', 'postsuper', 'cleanup']), 'libpcre.so.0': set(['postmulti', 'spawn', 'postkick', 'postlog', 'postconf', 'bounce', 'qmqpd', 'virtual', 'flush', 'proxymap', 'scache', 'anvil', 'verify', 'postalias', 'postcat', 'nqmgr', 'pickup', 'oqmgr', 'master', 'postqueue', 'postmap', 'local', 'showq', 'sendmail', 'discard', 'lmtp', 'post drop', 'trivial-rewrite', 'postfix', 'postlock', 'pipe', 'tlsmgr', 'error', 'smtpd', 'postsuper', 'cleanup']), 'libssl.so.0.9.8': set(['postmulti', 'spawn', 'postkick', 'postlog', 'postconf', 'bounce', 'qmqpd', 'virtual', 'flush', 'proxymap', 'scache', 'anvil', 'verify', 'postalias', 'postcat', 'nqmgr', 'pickup', 'oqmgr', 'master', 'postqueue', 'postmap', 'local', 'showq', 'sendmail', 'discard', 'lmtp', 'postdrop', 'trivial-rewrite', 'postfix', 'postlock', 'pipe', 'tlsmgr', 'error', 'smtpd', 'postsuper', 'cleanup']), 'libldap-2.3.so.0': set(['postmulti', 'spawn', 'postkick', 'postlog', 'postconf', 'bounce', 'qmqpd', 'virtual', 'flush', 'proxymap', 'scache', 'anvil', 'verify', 'postalias', 'postcat', 'nqmgr', 'pickup', 'oqmgr', 'master', 'postqueue', 'postmap', 'local', 'showq', 'sendmail', 'discard', 'lmtp', 'postdrop', 'trivial-rewrite', 'postfix', 'postlock', 'pipe', 'tlsmgr', 'error', 'smtpd', 'postsuper', 'cleanup']), 'libnsl.so.1': set(['postmulti', 'spawn', 'postkick', 'postlog', 'postconf', 'bounce', 'qmqpd', 'virtual', 'flush', 'proxymap', 'scache', 'anvil', 'verify', 'postalias', 'postcat', 'nqmgr', 'pickup', 'oqmgr', 'master', 'postqueue', 'postmap', 'local', 'showq', 'sendmail', 'discard', 'lmtp', 'postdrop', 'trivial-rewrite', 'postfix', 'postlock', 'pipe', 'tlsmgr', 'error', 'smtpd', 'postsuper', 'cleanup']), 'libcrypto.so.0.9.8': set(['postmulti', 'spawn', 'postkick', 'postlog', 'postconf', 'bounce', 'qmqpd', 'virtual', 'flush', 'proxymap', 'scache', 'anvil', 'verify', 'postalias', 'postcat', 'nqmgr', 'pickup', 'oqmgr', 'master', 'postqueue', 'postmap', 'local', 'showq', 'sendmail', 'discard', 'lmtp', 'postdrop', 'trivial-rewrite', 'postfix', 'postlock', 'pipe', 'tlsmgr', 'error', 'smtpd', 'postsuper', 'cleanup']), 'libc.so.1': set(['postmulti', 'spawn', 'postkick', 'postlog', 'postconf', 'bounce', 'qmqpd', 'virtual', 'flush', 'proxymap', 'scache', 'anvil', 'verify', 'postalias', 'postcat', 'nqmgr', 'pickup', 'oqmgr', 'master', 'p ostqueue', 'postmap', 'local', 'showq', 'sendmail', 'discard', 'lmtp', 'postdrop', 'trivial-rewrite', 'postfix', 'postlock', 'pipe', 'tlsmgr', 'error', 'smtpd', 'postsuper', 'cleanup']), 'libsocket.so.1': set(['postmulti', 'spawn', 'postkick', 'postlog', 'postconf', 'bounce', 'qmqpd', 'virtual', 'flush', 'proxymap', 'scache', 'anvil', 'verify', 'postalias', 'postcat', 'nqmgr', 'pickup', 'oqmgr', 'master', 'postqueue', 'postmap', 'local', 'showq', 'sendmail', 'discard', 'lmtp', 'postdrop', 'trivial-rewrite', 'postfix', 'postlock', 'pipe', 'tlsmgr', 'error', 'smtpd', 'postsuper', 'cleanup']), 'liblber-2.3.so.0': set(['postmulti', 'spawn', 'postkick', 'postlog', 'postconf', 'bounce', 'qmqpd', 'virtual', 'flush', 'proxymap', 'scache', 'anvil', 'verify', 'postalias', 'postcat', 'nqmgr', 'pickup', 'oqmgr', 'master', 'postqueue', 'postmap', 'local', 'showq', 'sendmail', 'discard', 'lmtp', 'postdrop', 'trivial-rewrite', 'postfix', 'postlock', 'pipe', 'tlsmgr', 'error', 'smtpd', 'pos tsuper', 'cleanup']), 'libpq.so.5': set(['postmulti', 'spawn', 'postkick', 'postlog', 'postconf', 'bounce', 'qmqpd', 'virtual', 'flush', 'proxymap', 'scache', 'anvil', 'verify', 'postalias', 'postcat', 'nqmgr', 'pickup', 'oqmgr', 'master', 'postqueue', 'postmap', 'local', 'showq', 'sendmail', 'discard', 'lmtp', 'postdrop', 'trivial-rewrite', 'postfix', 'postlock', 'pipe', 'tlsmgr', 'error', 'smtpd', 'postsuper', 'cleanup'])} +DATA_ISALIST = ['sparcv9+vis2', 'sparcv9+vis', 'sparcv9', 'sparcv8plus+vis2', 'sparcv8plus+vis', 'sparcv8plus', 'sparcv8', 'sparcv8-fsmuld', 'sparcv7', 'sparc'] This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Thu Jan 14 23:25:38 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 14 Jan 2010 22:25:38 +0000 Subject: [csw-devel] SF.net SVN: gar:[8000] csw/mgar/pkg/libidn/tags/libidn-1.15, REV=2009.06.10/ Message-ID: Revision: 8000 http://gar.svn.sourceforge.net/gar/?rev=8000&view=rev Author: dmichelsen Date: 2010-01-14 22:25:38 +0000 (Thu, 14 Jan 2010) Log Message: ----------- libidn: Tag libidn-1.15,REV=2009.06.10 Added Paths: ----------- csw/mgar/pkg/libidn/tags/libidn-1.15,REV=2009.06.10/ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Thu Jan 14 23:29:34 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 14 Jan 2010 22:29:34 +0000 Subject: [csw-devel] SF.net SVN: gar:[8001] csw/mgar/pkg/libidn/trunk Message-ID: Revision: 8001 http://gar.svn.sourceforge.net/gar/?rev=8001&view=rev Author: dmichelsen Date: 2010-01-14 22:29:34 +0000 (Thu, 14 Jan 2010) Log Message: ----------- libidn: Re-add check Modified Paths: -------------- csw/mgar/pkg/libidn/trunk/Makefile csw/mgar/pkg/libidn/trunk/checksums Modified: csw/mgar/pkg/libidn/trunk/Makefile =================================================================== --- csw/mgar/pkg/libidn/trunk/Makefile 2010-01-14 22:25:38 UTC (rev 8000) +++ csw/mgar/pkg/libidn/trunk/Makefile 2010-01-14 22:29:34 UTC (rev 8001) @@ -1,5 +1,5 @@ GARNAME = libidn -GARVERSION = 1.15 +GARVERSION = 1.16 CATEGORIES = lib DESCRIPTION = GNU IDN Library @@ -25,8 +25,6 @@ CONFIGURE_ARGS = $(DIRPATHS) -# The failing test is due to a bug in libiconv. This is fixed in libiconv 0.13 -#TEST_TARGET = check -TEST_TARGET = +TEST_TARGET = check include gar/category.mk Modified: csw/mgar/pkg/libidn/trunk/checksums =================================================================== --- csw/mgar/pkg/libidn/trunk/checksums 2010-01-14 22:25:38 UTC (rev 8000) +++ csw/mgar/pkg/libidn/trunk/checksums 2010-01-14 22:29:34 UTC (rev 8001) @@ -1 +1 @@ -482a25b7b223e52f967fafd284a1a992 download/libidn-1.15.tar.gz +a6af62602fa71bc1b90ce246dd208bd6 libidn-1.16.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Thu Jan 14 23:36:58 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 14 Jan 2010 22:36:58 +0000 Subject: [csw-devel] SF.net SVN: gar:[8002] csw/mgar/pkg/libidn/trunk/Makefile Message-ID: Revision: 8002 http://gar.svn.sourceforge.net/gar/?rev=8002&view=rev Author: dmichelsen Date: 2010-01-14 22:36:58 +0000 (Thu, 14 Jan 2010) Log Message: ----------- libidn: Do not set LD_OPTIONS or test breaks. This is known behaviour from Simon Joseffsons packages Modified Paths: -------------- csw/mgar/pkg/libidn/trunk/Makefile Modified: csw/mgar/pkg/libidn/trunk/Makefile =================================================================== --- csw/mgar/pkg/libidn/trunk/Makefile 2010-01-14 22:29:34 UTC (rev 8001) +++ csw/mgar/pkg/libidn/trunk/Makefile 2010-01-14 22:36:58 UTC (rev 8002) @@ -18,10 +18,13 @@ UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz +REQUIRED_PKGS = CSWggettextrt CSWiconv + BUILD64 = 1 NO_ISAEXEC = 1 -REQUIRED_PKGS = CSWggettextrt CSWiconv +# We don't need it and if defined the test breaks +LD_OPTIONS = CONFIGURE_ARGS = $(DIRPATHS) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Thu Jan 14 23:55:54 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 14 Jan 2010 22:55:54 +0000 Subject: [csw-devel] SF.net SVN: gar:[8003] csw/mgar/pkg/libidn/trunk/Makefile Message-ID: Revision: 8003 http://gar.svn.sourceforge.net/gar/?rev=8003&view=rev Author: dmichelsen Date: 2010-01-14 22:55:54 +0000 (Thu, 14 Jan 2010) Log Message: ----------- libidn: Move in runtime flags over different variable Modified Paths: -------------- csw/mgar/pkg/libidn/trunk/Makefile Modified: csw/mgar/pkg/libidn/trunk/Makefile =================================================================== --- csw/mgar/pkg/libidn/trunk/Makefile 2010-01-14 22:36:58 UTC (rev 8002) +++ csw/mgar/pkg/libidn/trunk/Makefile 2010-01-14 22:55:54 UTC (rev 8003) @@ -25,6 +25,7 @@ # We don't need it and if defined the test breaks LD_OPTIONS = +EXTRA_LINKER_FLAGS = $(RUNPATH_LINKER_FLAGS) CONFIGURE_ARGS = $(DIRPATHS) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Fri Jan 15 02:09:57 2010 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Fri, 15 Jan 2010 01:09:57 +0000 Subject: [csw-devel] SF.net SVN: gar:[8004] csw/mgar/pkg/coreutils/trunk Message-ID: Revision: 8004 http://gar.svn.sourceforge.net/gar/?rev=8004&view=rev Author: bdwalton Date: 2010-01-15 01:09:57 +0000 (Fri, 15 Jan 2010) Log Message: ----------- coreutils: bump to 8.4 Modified Paths: -------------- csw/mgar/pkg/coreutils/trunk/Makefile csw/mgar/pkg/coreutils/trunk/checksums Modified: csw/mgar/pkg/coreutils/trunk/Makefile =================================================================== --- csw/mgar/pkg/coreutils/trunk/Makefile 2010-01-14 22:55:54 UTC (rev 8003) +++ csw/mgar/pkg/coreutils/trunk/Makefile 2010-01-15 01:09:57 UTC (rev 8004) @@ -1,5 +1,5 @@ GARNAME = coreutils -GARVERSION = 8.3 +GARVERSION = 8.4 CATEGORIES = utils # seq has issues related to the handling of long double's with -O2. Modified: csw/mgar/pkg/coreutils/trunk/checksums =================================================================== --- csw/mgar/pkg/coreutils/trunk/checksums 2010-01-14 22:55:54 UTC (rev 8003) +++ csw/mgar/pkg/coreutils/trunk/checksums 2010-01-15 01:09:57 UTC (rev 8004) @@ -1,2 +1,2 @@ 0fde2b11f34c49995765566acf6cd5b4 0001-Fix-solaris-acl-support-breakage.patch -3961aee7ac96434a1831580e0b7ad227 coreutils-8.3.tar.gz +56f549854d723d9dcebb77919019df55 coreutils-8.4.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From skayser at users.sourceforge.net Fri Jan 15 03:07:20 2010 From: skayser at users.sourceforge.net (skayser at users.sourceforge.net) Date: Fri, 15 Jan 2010 02:07:20 +0000 Subject: [csw-devel] SF.net SVN: gar:[8005] csw/mgar/pkg/httping/trunk Message-ID: Revision: 8005 http://gar.svn.sourceforge.net/gar/?rev=8005&view=rev Author: skayser Date: 2010-01-15 02:07:19 +0000 (Fri, 15 Jan 2010) Log Message: ----------- httping: tweaked Makefile patch, updated changelog.CSW Modified Paths: -------------- csw/mgar/pkg/httping/trunk/Makefile csw/mgar/pkg/httping/trunk/checksums csw/mgar/pkg/httping/trunk/files/0001-Makefile-make-options-and-tools-configurable.patch csw/mgar/pkg/httping/trunk/files/changelog.CSW Modified: csw/mgar/pkg/httping/trunk/Makefile =================================================================== --- csw/mgar/pkg/httping/trunk/Makefile 2010-01-15 01:09:57 UTC (rev 8004) +++ csw/mgar/pkg/httping/trunk/Makefile 2010-01-15 02:07:19 UTC (rev 8005) @@ -1,6 +1,7 @@ -# TODO (release-critical prefixed with !, non release-critical with *) -# * Submit 0001-* patch upstream -# * -6 not documented in man page (any others?), feedback to upstream +# Known issue: +# - Options -C, -6, and -y not documented in man page. Reported upstream, +# feedback pending. +# GARNAME = httping GARVERSION = 1.4.1 CATEGORIES = net @@ -20,6 +21,7 @@ REQUIRED_PKGS = CSWosslrt # Makefile comes pre-set with gcc defaults and hardcoded tools +# Already submitted upstream, feedback pending. PATCHFILES = 0001-Makefile-make-options-and-tools-configurable.patch CONFIGURE_SCRIPTS = Modified: csw/mgar/pkg/httping/trunk/checksums =================================================================== --- csw/mgar/pkg/httping/trunk/checksums 2010-01-15 01:09:57 UTC (rev 8004) +++ csw/mgar/pkg/httping/trunk/checksums 2010-01-15 02:07:19 UTC (rev 8005) @@ -1,2 +1,2 @@ -828d966da2d49e3300a0914e8d6f7b16 0001-Makefile-make-options-and-tools-configurable.patch +5ddf24edea5117b38507259359c27631 0001-Makefile-make-options-and-tools-configurable.patch bde1ff3c01343d2371d8f34fbf8a1d9a httping-1.4.1.tgz Modified: csw/mgar/pkg/httping/trunk/files/0001-Makefile-make-options-and-tools-configurable.patch =================================================================== --- csw/mgar/pkg/httping/trunk/files/0001-Makefile-make-options-and-tools-configurable.patch 2010-01-15 01:09:57 UTC (rev 8004) +++ csw/mgar/pkg/httping/trunk/files/0001-Makefile-make-options-and-tools-configurable.patch 2010-01-15 02:07:19 UTC (rev 8005) @@ -1,14 +1,14 @@ -From f252b0a2a7f87d34dbcdf8bcccde9e6069ac9729 Mon Sep 17 00:00:00 2001 +From 4d95ec1e711a77139cb3f9e53463d2b01aa1fcdb Mon Sep 17 00:00:00 2001 From: Sebastian Kayser -Date: Tue, 12 Jan 2010 01:10:31 +0100 +Date: Fri, 15 Jan 2010 02:39:30 +0100 Subject: [PATCH] Makefile: make options and tools configurable --- - Makefile | 18 +++++++++--------- - 1 files changed, 9 insertions(+), 9 deletions(-) + Makefile | 20 ++++++++++---------- + 1 files changed, 10 insertions(+), 10 deletions(-) diff --git a/Makefile b/Makefile -index 873c57e..0133741 100644 +index c27bf22..0133741 100644 --- a/Makefile +++ b/Makefile @@ -16,26 +16,26 @@ include version @@ -47,6 +47,15 @@ OBJS=mem.o http.o io.o str.o error.o utils.o main.o tcp.o res.o +@@ -62,7 +62,7 @@ endif + all: $(TARGET) + + $(TARGET): $(OBJS) +- $(CC) $(WFLAGS) $(OBJS) $(LDFLAGS) -o $(TARGET) ++ $(CC) $(CFLAGS) $(OBJS) $(LDFLAGS) -o $(TARGET) + # + # Oh, blatant plug: http://keetweej.vanheusden.com/wishlist.html + -- -1.6.5.1 +1.6.6 Modified: csw/mgar/pkg/httping/trunk/files/changelog.CSW =================================================================== --- csw/mgar/pkg/httping/trunk/files/changelog.CSW 2010-01-15 01:09:57 UTC (rev 8004) +++ csw/mgar/pkg/httping/trunk/files/changelog.CSW 2010-01-15 02:07:19 UTC (rev 8005) @@ -1,11 +1,11 @@ -httping (1.4.1,REV=2010.01.12) +httping (1.4.1,REV=2010.01.15) - * Updated to 1.4.1 + * Updated to 1.4.1 (Closes #4157) - -- Sebastian Kayser Tue, 12 Jan 2010 02:08:40 +0100 + -- Sebastian Kayser Fri, 15 Jan 2010 03:01:27 +0100 httping (1.3.0,REV=2009.05.31) - * Adopted and updated to 1.3.0 (Closes: #3458, #2391). + * Adopted and updated to 1.3.0 (Closes: #3458, #2391) -- Sebastian Kayser Sun, 31 May 2009 18:35:11 +0200 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From hson at users.sourceforge.net Fri Jan 15 03:35:56 2010 From: hson at users.sourceforge.net (hson at users.sourceforge.net) Date: Fri, 15 Jan 2010 02:35:56 +0000 Subject: [csw-devel] SF.net SVN: gar:[8006] csw/mgar/pkg/libproxy Message-ID: Revision: 8006 http://gar.svn.sourceforge.net/gar/?rev=8006&view=rev Author: hson Date: 2010-01-15 02:35:56 +0000 (Fri, 15 Jan 2010) Log Message: ----------- libproxy: Fixes for Solaris 8 compatibility Modified Paths: -------------- csw/mgar/pkg/libproxy/trunk/Makefile csw/mgar/pkg/libproxy/trunk/checksums Added Paths: ----------- csw/mgar/pkg/libproxy/Makefile csw/mgar/pkg/libproxy/trunk/files/Solaris8-have-no-stdc99-flag.patch csw/mgar/pkg/libproxy/trunk/files/SunStudio-have-no-stdc99-flag.patch csw/mgar/pkg/libproxy/trunk/files/proxy.c.patch csw/mgar/pkg/libproxy/trunk/files/stdfiles.patch Added: csw/mgar/pkg/libproxy/Makefile =================================================================== --- csw/mgar/pkg/libproxy/Makefile (rev 0) +++ csw/mgar/pkg/libproxy/Makefile 2010-01-15 02:35:56 UTC (rev 8006) @@ -0,0 +1,15 @@ +# vim: ft=make ts=4 sw=4 noet + +default: + @echo "You are in the pkg/ directory." + +%: + $(MAKE) -C trunk $* + +paranoid-%: + $(MAKE) -C trunk $* || exit 2 + +export BUILDLOG ?= $(shell pwd)/buildlog.txt + +report-%: + $(MAKE) -C trunk $* || echo " *** make $* in $$i failed ***" >> $(BUILDLOG) Modified: csw/mgar/pkg/libproxy/trunk/Makefile =================================================================== --- csw/mgar/pkg/libproxy/trunk/Makefile 2010-01-15 02:07:19 UTC (rev 8005) +++ csw/mgar/pkg/libproxy/trunk/Makefile 2010-01-15 02:35:56 UTC (rev 8006) @@ -13,21 +13,65 @@ MASTER_SITES = http://libproxy.googlecode.com/files/ DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz -PATCHFILES = 0001-Use-xc99-for-Sun-Studio-compiler.patch +#PATCHFILES = 0001-Use-xc99-for-Sun-Studio-compiler.patch PATCHFILES += 0002-Dont-preset-CFLAGS.patch +# For Solaris 10 targets +#PATCHFILES_isa-amd64 += SunStudio-have-no-stdc99-flag.patch +#PATCHFILES_isa-sparcv8 += SunStudio-have-no-stdc99-flag.patch +#PATCHFILES_isa-sparcv9 += SunStudio-have-no-stdc99-flag.patch +#PATCHFILES_isa-i386 += SunStudio-have-no-stdc99-flag.patch +#For Solaris 8 targets +PATCHFILES_isa-amd64 += SunStudio-have-no-stdc99-flag.patch +PATCHFILES_isa-sparcv8 += Solaris8-have-no-stdc99-flag.patch +PATCHFILES_isa-sparcv8 += stdfiles.patch +PATCHFILES_isa-sparcv8 += proxy.c.patch +PATCHFILES_isa-sparcv9 += Solaris8-have-no-stdc99-flag.patch +PATCHFILES_isa-sparcv9 += stdfiles.patch +PATCHFILES_isa-sparcv9 += proxy.c.patch +PATCHFILES_isa-i386 += Solaris8-have-no-stdc99-flag.patch +PATCHFILES_isa-i386 += stdfiles.patch +PATCHFILES_isa-i386 += proxy.c.patch -# We define upstream file regex so we can be notifed of new upstream software release +PREREQUISITE_PKGS += CSWlibx11devel CSWlibxmudevel CSWlibdbusdev +#Disable Mozilla plugin until there is a 64-bit version +#PREREQUISITE_PKGS += CSWmozilla CSWseamonkey + +REQUIRED_PKGS += CSWlibice CSWlibsm CSWlibx11 CSWlibxmu CSWlibxt + UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz PACKAGING_PLATFORMS = solaris10-sparc solaris10-i386 EXTRA_LINKER_FLAGS = -lnsl BUILD64 = 1 + +EXTRA_INC = $(prefix)/X11/include +EXTRA_LIB = $(prefix)/X11/lib +EXTRA_PKG_CONFIG_DIRS = $(prefix)/X11/lib +EXTRA_PKG_CONFIG_DIRS += $(prefix)/mozilla/lib +EXTRA_PKG_CONFIG_DIRS += $(prefix)/mozilla/seamonkey/lib + + CONFIGURE_ARGS = $(DIRPATHS) +#Disable Mozilla plugin until there is a 64-bit version +CONFIGURE_ARGS += --without-mozjs +CONFIGURE_ARGS += --with-python +CONFIGURE_ARGS += --disable-silent-rules TEST_TARGET = check include gar/category.mk +#pre-configure-modulated: +# @echo " ==> Regenerating build tools..." +# @(cd $(WORKSRC) ; \ +# aclocal && \ +# autoconf && \ +# libtoolize --automake --force && \ +# aclocal && \ +# automake -a ) +# @$(MAKECOOKIE) + + # There is actually the cpp executable in /usr/lib PATH := $(PATH):/usr/lib Modified: csw/mgar/pkg/libproxy/trunk/checksums =================================================================== --- csw/mgar/pkg/libproxy/trunk/checksums 2010-01-15 02:07:19 UTC (rev 8005) +++ csw/mgar/pkg/libproxy/trunk/checksums 2010-01-15 02:35:56 UTC (rev 8006) @@ -1,3 +1,6 @@ -ce2d836df293fa8183265176459cf87e 0001-Use-xc99-for-Sun-Studio-compiler.patch acd3e61f107ff188722fb1335e0ed37c 0002-Dont-preset-CFLAGS.patch +dd08c0fd4795084e5970d59f8de149dd Solaris8-have-no-stdc99-flag.patch +95c2645311c9e840c0ed81c7a9aefadb SunStudio-have-no-stdc99-flag.patch 6ded75a6c6aef53be657ece207cc26c4 libproxy-0.3.0.tar.gz +647cefd3bb414eb269cb59aace9eb35b proxy.c.patch +7dd25dd1f615fe7a3c2a1d9c9a179e74 stdfiles.patch Added: csw/mgar/pkg/libproxy/trunk/files/Solaris8-have-no-stdc99-flag.patch =================================================================== --- csw/mgar/pkg/libproxy/trunk/files/Solaris8-have-no-stdc99-flag.patch (rev 0) +++ csw/mgar/pkg/libproxy/trunk/files/Solaris8-have-no-stdc99-flag.patch 2010-01-15 02:35:56 UTC (rev 8006) @@ -0,0 +1,134 @@ +diff -Nru libproxy-0.3.0.orig/src/bin/Makefile.am libproxy-0.3.0/src/bin/Makefile.am +--- libproxy-0.3.0.orig/src/bin/Makefile.am 2009-08-14 21:00:32.000000000 +0200 ++++ libproxy-0.3.0/src/bin/Makefile.am 2010-01-07 12:16:16.608932753 +0100 +@@ -2,5 +2,5 @@ + + # Command line interface to libproxy + proxy_SOURCES = proxy.c +-proxy_CPPFLAGS = -I$(top_srcdir)/src/lib -std=c99 ++proxy_CPPFLAGS = -I$(top_srcdir)/src/lib + proxy_LDADD = ../lib/libproxy.la +diff -Nru libproxy-0.3.0.orig/src/lib/Makefile.am libproxy-0.3.0/src/lib/Makefile.am +--- libproxy-0.3.0.orig/src/lib/Makefile.am 2009-08-14 21:00:32.000000000 +0200 ++++ libproxy-0.3.0/src/lib/Makefile.am 2010-01-07 12:17:37.568266736 +0100 +@@ -10,8 +10,8 @@ + strdict.c strdict.h \ + url.c url.h + +-libproxy_la_CFLAGS = -DMODULEDIR=\"@MODULEDIR@@DIR_SEPARATOR@\" -DSYSCONFDIR=\"@SYSCONFDIR@@DIR_SEPARATOR@\" -std=c99 -D_POSIX_C_SOURCE=200112L ++libproxy_la_CFLAGS = -DMODULEDIR=\"@MODULEDIR@@DIR_SEPARATOR@\" -DSYSCONFDIR=\"@SYSCONFDIR@@DIR_SEPARATOR@\" + libproxy_la_LDFLAGS = -lpthread -lm -no-undefined + + include_HEADERS = proxy.h + +diff -Nru libproxy-0.3.0.orig/src/lib/Makefile.in libproxy-0.3.0/src/lib/Makefile.in +--- libproxy-0.3.0.orig/src/lib/Makefile.in 2009-08-14 21:05:15.000000000 +0200 ++++ libproxy-0.3.0/src/lib/Makefile.in 2010-01-07 11:58:19.284179024 +0100 +@@ -277,7 +277,7 @@ + strdict.c strdict.h \ + url.c url.h + +-libproxy_la_CFLAGS = -DMODULEDIR=\"@MODULEDIR@@DIR_SEPARATOR@\" -DSYSCONFDIR=\"@SYSCONFDIR@@DIR_SEPARATOR@\" -std=c99 -D_POSIX_C_SOURCE=200112L ++libproxy_la_CFLAGS = -DMODULEDIR=\"@MODULEDIR@@DIR_SEPARATOR@\" -DSYSCONFDIR=\"@SYSCONFDIR@@DIR_SEPARATOR@\" + libproxy_la_LDFLAGS = -lpthread -lm -no-undefined + include_HEADERS = proxy.h + all: all-am +diff -Nru libproxy-0.3.0.orig/src/modules/Makefile.am libproxy-0.3.0/src/modules/Makefile.am +--- libproxy-0.3.0.orig/src/modules/Makefile.am 2009-08-14 21:06:30.000000000 +0200 ++++ libproxy-0.3.0/src/modules/Makefile.am 2010-01-07 12:18:24.020865842 +0100 +@@ -1,5 +1,5 @@ + moduledir = @MODULEDIR@ +-AM_CFLAGS = -std=c99 ++AM_CFLAGS = + AM_LDFLAGS = -module -avoid-version -no-undefined + + +@@ -50,7 +50,7 @@ + + # GConf/GNOME Config Module + config_gnome_la_SOURCES = config_gnome.c xhasclient.c +-config_gnome_la_CPPFLAGS = -I$(top_srcdir)/src/lib -D_POSIX_C_SOURCE=200112L -DGCONFTOOLBIN='"@GCONFTOOLBIN@"' @GNOME_CFLAGS@ ++config_gnome_la_CPPFLAGS = -I$(top_srcdir)/src/lib -DGCONFTOOLBIN='"@GCONFTOOLBIN@"' @GNOME_CFLAGS@ + config_gnome_la_LIBADD = ../lib/libproxy.la + config_gnome_la_LDFLAGS = $(AM_LDFLAGS) @GNOME_LIBS@ + +@@ -77,12 +77,12 @@ + + # IP Ignore Module + ignore_ip_la_SOURCES = ignore_ip.c +-ignore_ip_la_CPPFLAGS = -I$(top_srcdir)/src/lib -D_POSIX_C_SOURCE=200112L ++ignore_ip_la_CPPFLAGS = -I$(top_srcdir)/src/lib + ignore_ip_la_LIBADD = ../lib/libproxy.la + + # WebKit (JavaScriptCore) based PAC runner + pacrunner_webkit_la_SOURCES = pacrunner_webkit.c +-pacrunner_webkit_la_CPPFLAGS = -I$(top_srcdir)/src/lib @WEBKIT_CFLAGS@ -D_POSIX_C_SOURCE=200112L ++pacrunner_webkit_la_CPPFLAGS = -I$(top_srcdir)/src/lib @WEBKIT_CFLAGS@ + pacrunner_webkit_la_LIBADD = ../lib/libproxy.la + if MINGW32 + pacrunner_webkit_la_LIBADD += ../platform/win32/libwinutils.la +@@ -92,7 +92,7 @@ + + # Mozilla (Spidermonkey) based PAC runner + pacrunner_mozjs_la_SOURCES = pacrunner_mozjs.c +-pacrunner_mozjs_la_CPPFLAGS = -I$(top_srcdir)/src/lib @MOZJS_CFLAGS@ -D_POSIX_C_SOURCE=200112L ++pacrunner_mozjs_la_CPPFLAGS = -I$(top_srcdir)/src/lib @MOZJS_CFLAGS@ + pacrunner_mozjs_la_LIBADD = ../lib/libproxy.la + pacrunner_mozjs_la_LDFLAGS = $(AM_LDFLAGS) @MOZJS_LIBS@ + nodist_pacrunner_mozjs_la_SOURCES = pacutils.h +diff -Nru libproxy-0.3.0.orig/src/modules/Makefile.in libproxy-0.3.0/src/modules/Makefile.in +--- libproxy-0.3.0.orig/src/modules/Makefile.in 2009-08-14 21:07:00.000000000 +0200 ++++ libproxy-0.3.0/src/modules/Makefile.in 2010-01-14 18:03:41.850944638 +0100 +@@ -359,7 +359,7 @@ + xmu_CFLAGS = @xmu_CFLAGS@ + xmu_LIBS = @xmu_LIBS@ + moduledir = @MODULEDIR@ +-AM_CFLAGS = -std=c99 ++AM_CFLAGS = + AM_LDFLAGS = -module -avoid-version -no-undefined + + # Which modules to build +@@ -385,7 +385,7 @@ + + # GConf/GNOME Config Module + config_gnome_la_SOURCES = config_gnome.c xhasclient.c +-config_gnome_la_CPPFLAGS = -I$(top_srcdir)/src/lib -D_POSIX_C_SOURCE=200112L -DGCONFTOOLBIN='"@GCONFTOOLBIN@"' @GNOME_CFLAGS@ ++config_gnome_la_CPPFLAGS = -I$(top_srcdir)/src/lib -DGCONFTOOLBIN='"@GCONFTOOLBIN@"' @GNOME_CFLAGS@ + config_gnome_la_LIBADD = ../lib/libproxy.la + config_gnome_la_LDFLAGS = $(AM_LDFLAGS) @GNOME_LIBS@ + +@@ -412,19 +412,19 @@ + + # IP Ignore Module + ignore_ip_la_SOURCES = ignore_ip.c +-ignore_ip_la_CPPFLAGS = -I$(top_srcdir)/src/lib -D_POSIX_C_SOURCE=200112L ++ignore_ip_la_CPPFLAGS = -I$(top_srcdir)/src/lib + ignore_ip_la_LIBADD = ../lib/libproxy.la + + # WebKit (JavaScriptCore) based PAC runner + pacrunner_webkit_la_SOURCES = pacrunner_webkit.c +-pacrunner_webkit_la_CPPFLAGS = -I$(top_srcdir)/src/lib @WEBKIT_CFLAGS@ -D_POSIX_C_SOURCE=200112L ++pacrunner_webkit_la_CPPFLAGS = -I$(top_srcdir)/src/lib @WEBKIT_CFLAGS@ + pacrunner_webkit_la_LIBADD = ../lib/libproxy.la $(am__append_10) + pacrunner_webkit_la_LDFLAGS = $(AM_LDFLAGS) @WEBKIT_LIBS@ + nodist_pacrunner_webkit_la_SOURCES = pacutils.h + + # Mozilla (Spidermonkey) based PAC runner + pacrunner_mozjs_la_SOURCES = pacrunner_mozjs.c +-pacrunner_mozjs_la_CPPFLAGS = -I$(top_srcdir)/src/lib @MOZJS_CFLAGS@ -D_POSIX_C_SOURCE=200112L ++pacrunner_mozjs_la_CPPFLAGS = -I$(top_srcdir)/src/lib @MOZJS_CFLAGS@ + pacrunner_mozjs_la_LIBADD = ../lib/libproxy.la + pacrunner_mozjs_la_LDFLAGS = $(AM_LDFLAGS) @MOZJS_LIBS@ + nodist_pacrunner_mozjs_la_SOURCES = pacutils.h +diff -Nru libproxy-0.3.0.orig/src/bin/Makefile.in libproxy-0.3.0/src/bin/Makefile.in +--- libproxy-0.3.0.orig/src/bin/Makefile.in 2009-08-14 21:05:15.000000000 +0200 ++++ libproxy-0.3.0/src/bin/Makefile.in 2010-01-14 18:04:24.531275033 +0100 +@@ -239,7 +239,7 @@ + + # Command line interface to libproxy + proxy_SOURCES = proxy.c +-proxy_CPPFLAGS = -I$(top_srcdir)/src/lib -std=c99 ++proxy_CPPFLAGS = -I$(top_srcdir)/src/lib + proxy_LDADD = ../lib/libproxy.la + all: all-am + Added: csw/mgar/pkg/libproxy/trunk/files/SunStudio-have-no-stdc99-flag.patch =================================================================== --- csw/mgar/pkg/libproxy/trunk/files/SunStudio-have-no-stdc99-flag.patch (rev 0) +++ csw/mgar/pkg/libproxy/trunk/files/SunStudio-have-no-stdc99-flag.patch 2010-01-15 02:35:56 UTC (rev 8006) @@ -0,0 +1,69 @@ +diff -Nru libproxy-0.3.0.orig/src/bin/Makefile.am libproxy-0.3.0/src/bin/Makefile.am +--- libproxy-0.3.0.orig/src/bin/Makefile.am 2009-08-14 21:00:32.000000000 +0200 ++++ libproxy-0.3.0/src/bin/Makefile.am 2010-01-07 12:16:16.608932753 +0100 +@@ -2,5 +2,5 @@ + + # Command line interface to libproxy + proxy_SOURCES = proxy.c +-proxy_CPPFLAGS = -I$(top_srcdir)/src/lib -std=c99 ++proxy_CPPFLAGS = -I$(top_srcdir)/src/lib -xc99 + proxy_LDADD = ../lib/libproxy.la +diff -Nru libproxy-0.3.0.orig/src/lib/Makefile.am libproxy-0.3.0/src/lib/Makefile.am +--- libproxy-0.3.0.orig/src/lib/Makefile.am 2009-08-14 21:00:32.000000000 +0200 ++++ libproxy-0.3.0/src/lib/Makefile.am 2010-01-07 12:17:37.568266736 +0100 +@@ -10,8 +10,8 @@ + strdict.c strdict.h \ + url.c url.h + +-libproxy_la_CFLAGS = -DMODULEDIR=\"@MODULEDIR@@DIR_SEPARATOR@\" -DSYSCONFDIR=\"@SYSCONFDIR@@DIR_SEPARATOR@\" -std=c99 -D_POSIX_C_SOURCE=200112L ++libproxy_la_CFLAGS = -DMODULEDIR=\"@MODULEDIR@@DIR_SEPARATOR@\" -DSYSCONFDIR=\"@SYSCONFDIR@@DIR_SEPARATOR@\" -xc99 -D_POSIX_C_SOURCE=200112L + libproxy_la_LDFLAGS = -lpthread -lm -no-undefined + + include_HEADERS = proxy.h + +diff -Nru libproxy-0.3.0.orig/src/lib/Makefile.in libproxy-0.3.0/src/lib/Makefile.in +--- libproxy-0.3.0.orig/src/lib/Makefile.in 2009-08-14 21:05:15.000000000 +0200 ++++ libproxy-0.3.0/src/lib/Makefile.in 2010-01-07 11:58:19.284179024 +0100 +@@ -277,7 +277,7 @@ + strdict.c strdict.h \ + url.c url.h + +-libproxy_la_CFLAGS = -DMODULEDIR=\"@MODULEDIR@@DIR_SEPARATOR@\" -DSYSCONFDIR=\"@SYSCONFDIR@@DIR_SEPARATOR@\" -std=c99 -D_POSIX_C_SOURCE=200112L ++libproxy_la_CFLAGS = -DMODULEDIR=\"@MODULEDIR@@DIR_SEPARATOR@\" -DSYSCONFDIR=\"@SYSCONFDIR@@DIR_SEPARATOR@\" -xc99 -D_POSIX_C_SOURCE=200112L + libproxy_la_LDFLAGS = -lpthread -lm -no-undefined + include_HEADERS = proxy.h + all: all-am +diff -Nru libproxy-0.3.0.orig/src/modules/Makefile.am libproxy-0.3.0/src/modules/Makefile.am +--- libproxy-0.3.0.orig/src/modules/Makefile.am 2009-08-14 21:06:30.000000000 +0200 ++++ libproxy-0.3.0/src/modules/Makefile.am 2010-01-07 12:18:24.020865842 +0100 +@@ -1,5 +1,5 @@ + moduledir = @MODULEDIR@ +-AM_CFLAGS = -std=c99 ++AM_CFLAGS = -xc99 + AM_LDFLAGS = -module -avoid-version -no-undefined + + +diff -Nru libproxy-0.3.0.orig/src/modules/Makefile.in libproxy-0.3.0/src/modules/Makefile.in +--- libproxy-0.3.0.orig/src/modules/Makefile.in 2009-08-14 21:07:00.000000000 +0200 ++++ libproxy-0.3.0/src/modules/Makefile.in 2010-01-14 18:03:41.850944638 +0100 +@@ -359,7 +359,7 @@ + xmu_CFLAGS = @xmu_CFLAGS@ + xmu_LIBS = @xmu_LIBS@ + moduledir = @MODULEDIR@ +-AM_CFLAGS = -std=c99 ++AM_CFLAGS = -xc99 + AM_LDFLAGS = -module -avoid-version -no-undefined + + # Which modules to build +diff -Nru libproxy-0.3.0.orig/src/bin/Makefile.in libproxy-0.3.0/src/bin/Makefile.in +--- libproxy-0.3.0.orig/src/bin/Makefile.in 2009-08-14 21:05:15.000000000 +0200 ++++ libproxy-0.3.0/src/bin/Makefile.in 2010-01-14 18:04:24.531275033 +0100 +@@ -239,7 +239,7 @@ + + # Command line interface to libproxy + proxy_SOURCES = proxy.c +-proxy_CPPFLAGS = -I$(top_srcdir)/src/lib -std=c99 ++proxy_CPPFLAGS = -I$(top_srcdir)/src/lib -xc99 + proxy_LDADD = ../lib/libproxy.la + all: all-am + Added: csw/mgar/pkg/libproxy/trunk/files/proxy.c.patch =================================================================== --- csw/mgar/pkg/libproxy/trunk/files/proxy.c.patch (rev 0) +++ csw/mgar/pkg/libproxy/trunk/files/proxy.c.patch 2010-01-15 02:35:56 UTC (rev 8006) @@ -0,0 +1,40 @@ +diff -Nru libproxy-0.3.0.orig/src/lib/proxy.c libproxy-0.3.0/src/lib/proxy.c +--- libproxy-0.3.0.orig/src/lib/proxy.c 2009-08-14 21:00:32.000000000 +0200 ++++ libproxy-0.3.0/src/lib/proxy.c 2010-01-07 11:57:19.188739832 +0100 +@@ -162,17 +162,37 @@ + if (!px_module_manager_register_type(self->mm, pxWPADModule, _px_wpad_module_cmp, false)) goto error; + + /* If we have a config file, load the config order from it */ ++#if (defined(__SUNPRO_C) && ( defined(__SunOS_5_8) || defined(__SunOS_5_9))) ++ char *envp; ++ envp = px_malloc0(strlen("_PX_CONFIG_ORDER")+3); ++ sprintf(envp,"_PX_CONFIG_ORDER="); ++ putenv(envp); ++#else + setenv("_PX_CONFIG_ORDER", "", 1); ++#endif + pxConfigFile *cf = px_config_file_new(SYSCONFDIR "proxy.conf"); + if (cf) + { + char *tmp = px_config_file_get_value(cf, PX_CONFIG_FILE_DEFAULT_SECTION, "config_order"); + px_config_file_free(cf); ++#if (defined(__SUNPRO_C) && ( defined(__SunOS_5_8) || defined(__SunOS_5_9))) ++ if (tmp) { ++ int retval; ++ envp = px_malloc0(strlen("_PX_CONFIG_ORDER")+strlen(tmp)+2); ++ sprintf(envp,"_PX_CONFIG_ORDER=%s",tmp); ++ retval = putenv(envp); ++ if(retval) { ++ px_free(tmp); ++ goto error; ++ } ++ } ++#else + if (tmp && setenv("_PX_CONFIG_ORDER", tmp, 1)) + { + px_free(tmp); + goto error; + } ++#endif + px_free(tmp); + } Added: csw/mgar/pkg/libproxy/trunk/files/stdfiles.patch =================================================================== --- csw/mgar/pkg/libproxy/trunk/files/stdfiles.patch (rev 0) +++ csw/mgar/pkg/libproxy/trunk/files/stdfiles.patch 2010-01-15 02:35:56 UTC (rev 8006) @@ -0,0 +1,34 @@ +diff -Nru libproxy-0.3.0.orig/src/lib/stdbool.h libproxy-0.3.0/src/lib/stdbool.h +--- libproxy-0.3.0.orig/src/lib/stdbool.h 1970-01-01 01:00:00.000000000 +0100 ++++ libproxy-0.3.0/src/lib/stdbool.h 2010-01-15 00:49:51.930719445 +0100 +@@ -0,0 +1,17 @@ ++#ifndef _STDBOOL_H ++#ifndef _MY_STDBOOL_H ++#define _MY_STDBOOL_H ++ ++#if !defined(__GNUG__) && (defined(__SUNPRO_C) && ( defined(__SunOS_5_8) || defined(__SunOS_5_9))) ++ ++#ifndef bool ++#define bool int ++#define false 0 ++#define true 1 ++#endif /* bool */ ++ ++#endif /* Compiler has bool */ ++ ++ ++#endif /* _MY_BOOL_H_*/ ++#endif /* _STDBOOL_H_*/ +diff -Nru libproxy-0.3.0.orig/src/lib/stdint.h libproxy-0.3.0/src/lib/stdint.h +--- libproxy-0.3.0.orig/src/lib/stdint.h 1970-01-01 01:00:00.000000000 +0100 ++++ libproxy-0.3.0/src/lib/stdint.h 2010-01-15 01:00:57.971084112 +0100 +@@ -0,0 +1,9 @@ ++#ifndef _STDINT_H ++#ifndef _MY_STDINT_H ++#define _MY_STDINT_H ++ ++#if !defined(__GNUG__) && (defined(__SUNPRO_C) && ( defined(__SunOS_5_8) || defined(__SunOS_5_9))) ++#include ++#endif /* Compiler has stdint.h */ ++#endif /* _MY_STDINT_H */ ++#endif /* _STDINT_H */ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Fri Jan 15 03:54:14 2010 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Fri, 15 Jan 2010 02:54:14 +0000 Subject: [csw-devel] SF.net SVN: gar:[8007] csw/mgar/pkg/coreutils/trunk Message-ID: Revision: 8007 http://gar.svn.sourceforge.net/gar/?rev=8007&view=rev Author: bdwalton Date: 2010-01-15 02:54:14 +0000 (Fri, 15 Jan 2010) Log Message: ----------- coreutils: update patch for new version Modified Paths: -------------- csw/mgar/pkg/coreutils/trunk/checksums csw/mgar/pkg/coreutils/trunk/files/0001-Fix-solaris-acl-support-breakage.patch Modified: csw/mgar/pkg/coreutils/trunk/checksums =================================================================== --- csw/mgar/pkg/coreutils/trunk/checksums 2010-01-15 02:35:56 UTC (rev 8006) +++ csw/mgar/pkg/coreutils/trunk/checksums 2010-01-15 02:54:14 UTC (rev 8007) @@ -1,2 +1,2 @@ -0fde2b11f34c49995765566acf6cd5b4 0001-Fix-solaris-acl-support-breakage.patch +2d8837f7ca6d422837bcdb2be4ab28bb 0001-Fix-solaris-acl-support-breakage.patch 56f549854d723d9dcebb77919019df55 coreutils-8.4.tar.gz Modified: csw/mgar/pkg/coreutils/trunk/files/0001-Fix-solaris-acl-support-breakage.patch =================================================================== --- csw/mgar/pkg/coreutils/trunk/files/0001-Fix-solaris-acl-support-breakage.patch 2010-01-15 02:35:56 UTC (rev 8006) +++ csw/mgar/pkg/coreutils/trunk/files/0001-Fix-solaris-acl-support-breakage.patch 2010-01-15 02:54:14 UTC (rev 8007) @@ -1,7 +1,7 @@ -From bd8c66a7789d05bee45a162adf3f6f488fde75bf Mon Sep 17 00:00:00 2001 -From: Ben Walton -Date: Wed, 25 Nov 2009 04:59:51 +0100 -Subject: [PATCH 1/2] Fix solaris acl support breakage +From 8d4aa48bc66f346db116dd2fe4aa524e1362897f Mon Sep 17 00:00:00 2001 +From: Ben Walton +Date: Fri, 15 Jan 2010 03:43:16 +0100 +Subject: [PATCH] Fix solaris acl support breakage Solaris has support for ACL's on NFS, but only in certain combinations of client and server. When ACL operations are attempted in @@ -9,46 +9,46 @@ This patch allows utilities that work with ACL's to handle the difference properly. -Signed-off-by: Ben Walton +Signed-off-by: Ben Walton --- lib/copy-acl.c | 4 ++-- lib/set-mode-acl.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/copy-acl.c b/lib/copy-acl.c -index af85a08..bfacf20 100644 +index 1e82240..6a21aeb 100644 --- a/lib/copy-acl.c +++ b/lib/copy-acl.c @@ -294,7 +294,7 @@ qcopy_acl (const char *src_name, int source_desc, const char *dst_name, if (count < 0) - { -- if (errno == ENOSYS || errno == ENOTSUP) -+ if (errno == ENOSYS || errno == EOPNOTSUPP || errno == ENOTSUP) - { - count = 0; - entries = NULL; + { +- if (errno == ENOSYS || errno == ENOTSUP) ++ if (errno == ENOSYS || errno == EOPNOTSUPP || errno == ENOTSUP) + { + count = 0; + entries = NULL; @@ -358,7 +358,7 @@ qcopy_acl (const char *src_name, int source_desc, const char *dst_name, if (ret < 0 && saved_errno == 0) - { - saved_errno = errno; -- if (errno == ENOSYS && !acl_nontrivial (count, entries)) -+ if ((errno == ENOSYS || errno == EOPNOTSUPP) && !acl_nontrivial (count, entries)) - saved_errno = 0; - } + { + saved_errno = errno; +- if (errno == ENOSYS && !acl_nontrivial (count, entries)) ++ if ((errno == ENOSYS || errno == EOPNOTSUPP) && !acl_nontrivial (count, entries)) + saved_errno = 0; + } else diff --git a/lib/set-mode-acl.c b/lib/set-mode-acl.c -index ddac4df..fdc74f2 100644 +index c5b4726..2cd2c75 100644 --- a/lib/set-mode-acl.c +++ b/lib/set-mode-acl.c @@ -387,7 +387,7 @@ qset_acl (char const *name, int desc, mode_t mode) ret = acl (name, SETACL, sizeof (entries) / sizeof (aclent_t), entries); if (ret < 0) { -- if (errno == ENOSYS) -+ if (errno == ENOSYS || errno == EOPNOTSUPP) - return chmod_or_fchmod (name, desc, mode); - return -1; +- if (errno == ENOSYS) ++ if (errno == ENOSYS || errno == EOPNOTSUPP) + return chmod_or_fchmod (name, desc, mode); + return -1; } -- 1.6.5.1 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Fri Jan 15 04:36:37 2010 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Fri, 15 Jan 2010 03:36:37 +0000 Subject: [csw-devel] SF.net SVN: gar:[8008] csw/mgar/gar/v2/gar.mk Message-ID: Revision: 8008 http://gar.svn.sourceforge.net/gar/?rev=8008&view=rev Author: bdwalton Date: 2010-01-15 03:36:37 +0000 (Fri, 15 Jan 2010) Log Message: ----------- gar: prevent dynamic adm scripts from being garchived. Modified Paths: -------------- csw/mgar/gar/v2/gar.mk Modified: csw/mgar/gar/v2/gar.mk =================================================================== --- csw/mgar/gar/v2/gar.mk 2010-01-15 02:54:14 UTC (rev 8007) +++ csw/mgar/gar/v2/gar.mk 2010-01-15 03:36:37 UTC (rev 8008) @@ -368,7 +368,7 @@ # I am always typing this by mistake makesums: makesum -GARCHIVE_TARGETS = $(addprefix $(GARCHIVEDIR)/,$(ALLFILES)) +GARCHIVE_TARGETS = $(addprefix $(GARCHIVEDIR)/,$(filter-out $(ALLFILES_DYNSCRIPTS), $(ALLFILES))) garchive: checksum $(GARCHIVE_TARGETS) ; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Fri Jan 15 10:04:38 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Fri, 15 Jan 2010 09:04:38 +0000 Subject: [csw-devel] SF.net SVN: gar:[8009] csw/mgar/pkg/cswclassutils/trunk Message-ID: Revision: 8009 http://gar.svn.sourceforge.net/gar/?rev=8009&view=rev Author: wahwah Date: 2010-01-15 09:04:37 +0000 (Fri, 15 Jan 2010) Log Message: ----------- cswclassutils: migrateconf: Print out the warning only when actually migrating files. Modified Paths: -------------- csw/mgar/pkg/cswclassutils/trunk/Makefile csw/mgar/pkg/cswclassutils/trunk/checksums csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.i.cswmigrateconf Modified: csw/mgar/pkg/cswclassutils/trunk/Makefile =================================================================== --- csw/mgar/pkg/cswclassutils/trunk/Makefile 2010-01-15 03:36:37 UTC (rev 8008) +++ csw/mgar/pkg/cswclassutils/trunk/Makefile 2010-01-15 09:04:37 UTC (rev 8009) @@ -1,7 +1,7 @@ # $Id$ GARNAME = cswclassutils -GARVERSION = 1.30 +GARVERSION = 1.31 CATEGORIES = utils DESCRIPTION = CSW class action utilities Modified: csw/mgar/pkg/cswclassutils/trunk/checksums =================================================================== --- csw/mgar/pkg/cswclassutils/trunk/checksums 2010-01-15 03:36:37 UTC (rev 8008) +++ csw/mgar/pkg/cswclassutils/trunk/checksums 2010-01-15 09:04:37 UTC (rev 8009) @@ -4,7 +4,7 @@ 56900bb1fc9f40f7c227877eca32b1f8 CSWcswclassutils.i.cswetcservices 4f2e9de463cb4b17ba6e1b3dfdf18913 CSWcswclassutils.i.cswinetd fa318ca696e80a9a9f2efbf35cb69080 CSWcswclassutils.i.cswinitsmf -42668b41c7c886091a8ca44992b90806 CSWcswclassutils.i.cswmigrateconf +5049a5d77ddcc3359d1c991d387446f1 CSWcswclassutils.i.cswmigrateconf c875d62c8ddaad0de2e18fff7946e1e8 CSWcswclassutils.i.cswpreserveconf 9018419febe06c12e89d66cc76e7261f CSWcswclassutils.i.cswpycompile 1282bef941c49d98a061b3701a1fda7c CSWcswclassutils.i.cswtexinfo Modified: csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.i.cswmigrateconf =================================================================== --- csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.i.cswmigrateconf 2010-01-15 03:36:37 UTC (rev 8008) +++ csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.i.cswmigrateconf 2010-01-15 09:04:37 UTC (rev 8009) @@ -43,6 +43,12 @@ fi give_a_chance_to_stop() { + if [ "${chance_to_stop_given}" -ne 0 ]; then + return + fi + echo "----8<---- migration configuration start ----8<----" + cat "${confdst}" + echo "----8<---- migration configuration end ----8<----" echo echo "*******************************************************************" echo "* Configuration files are going to be migrated from the deprecated " @@ -57,6 +63,7 @@ sleep 1 done echo "0." + chance_to_stop_given=1 } files_are_identical() { @@ -139,15 +146,11 @@ } run_already=0 +chance_to_stop_given=0 while read confsrc confdst ; do # We're not sure if the files to be migrated have already been copied or not. - cp "$confsrc" "$confdst" - - cat "${confdst}" - give_a_chance_to_stop - # Sourcing the file, it should contain the configuration. if [ -r "$confsrc" ]; then debug "Sourcing ${confsrc}" @@ -217,6 +220,7 @@ # moved already. if [ -r "${srcpath}" ] then + give_a_chance_to_stop place_signpost_for "${srcpath}" debug "Moving '${srcpath}' to '${archpath}'" mv "${srcpath}" "${archpath}" This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Fri Jan 15 10:05:09 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Fri, 15 Jan 2010 09:05:09 +0000 Subject: [csw-devel] SF.net SVN: gar:[8010] csw/mgar/pkg/cswclassutils/trunk/checksums Message-ID: Revision: 8010 http://gar.svn.sourceforge.net/gar/?rev=8010&view=rev Author: wahwah Date: 2010-01-15 09:05:08 +0000 (Fri, 15 Jan 2010) Log Message: ----------- cswclassutils: Updating checksums for files with the Id tag Modified Paths: -------------- csw/mgar/pkg/cswclassutils/trunk/checksums Modified: csw/mgar/pkg/cswclassutils/trunk/checksums =================================================================== --- csw/mgar/pkg/cswclassutils/trunk/checksums 2010-01-15 09:04:37 UTC (rev 8009) +++ csw/mgar/pkg/cswclassutils/trunk/checksums 2010-01-15 09:05:08 UTC (rev 8010) @@ -4,7 +4,7 @@ 56900bb1fc9f40f7c227877eca32b1f8 CSWcswclassutils.i.cswetcservices 4f2e9de463cb4b17ba6e1b3dfdf18913 CSWcswclassutils.i.cswinetd fa318ca696e80a9a9f2efbf35cb69080 CSWcswclassutils.i.cswinitsmf -5049a5d77ddcc3359d1c991d387446f1 CSWcswclassutils.i.cswmigrateconf +9b47f2ac9b8ddbdd3aa30ad59a808af6 CSWcswclassutils.i.cswmigrateconf c875d62c8ddaad0de2e18fff7946e1e8 CSWcswclassutils.i.cswpreserveconf 9018419febe06c12e89d66cc76e7261f CSWcswclassutils.i.cswpycompile 1282bef941c49d98a061b3701a1fda7c CSWcswclassutils.i.cswtexinfo This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Fri Jan 15 12:12:33 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Fri, 15 Jan 2010 11:12:33 +0000 Subject: [csw-devel] SF.net SVN: gar:[8011] csw/mgar/pkg Message-ID: Revision: 8011 http://gar.svn.sourceforge.net/gar/?rev=8011&view=rev Author: wahwah Date: 2010-01-15 11:12:31 +0000 (Fri, 15 Jan 2010) Log Message: ----------- hachoir-*: Using the 'py' prefix in package names' Modified Paths: -------------- csw/mgar/pkg/hachoir-core/trunk/Makefile csw/mgar/pkg/hachoir-parser/trunk/Makefile Modified: csw/mgar/pkg/hachoir-core/trunk/Makefile =================================================================== --- csw/mgar/pkg/hachoir-core/trunk/Makefile 2010-01-15 09:05:08 UTC (rev 8010) +++ csw/mgar/pkg/hachoir-core/trunk/Makefile 2010-01-15 11:12:31 UTC (rev 8011) @@ -16,7 +16,8 @@ MASTER_SITES = http://cheeseshop.python.org/packages/source/h/$(GARNAME)/ DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz -CATALOGNAME = hachoir_core +CATALOGNAME = py_hachoir_core +PACKAGES = CSWpy-hachoir-core ARCHALL = 1 TEST_SCRIPTS = include gar/category.mk Modified: csw/mgar/pkg/hachoir-parser/trunk/Makefile =================================================================== --- csw/mgar/pkg/hachoir-parser/trunk/Makefile 2010-01-15 09:05:08 UTC (rev 8010) +++ csw/mgar/pkg/hachoir-parser/trunk/Makefile 2010-01-15 11:12:31 UTC (rev 8011) @@ -16,8 +16,8 @@ MASTER_SITES = http://cheeseshop.python.org/packages/source/h/$(GARNAME)/ DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz -CATALOGNAME = hachoir_parser +CATALOGNAME = py_hachoir_parser ARCHALL = 1 -REQUIRED_PKGS = CSWhachoir-core +REQUIRED_PKGS = CSWpy-hachoir-core TEST_SCRIPTS = include gar/category.mk This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bonivart at users.sourceforge.net Fri Jan 15 14:36:48 2010 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Fri, 15 Jan 2010 13:36:48 +0000 Subject: [csw-devel] SF.net SVN: gar:[8012] csw/mgar/pkg/cpan/DBD-SQLite/trunk Message-ID: Revision: 8012 http://gar.svn.sourceforge.net/gar/?rev=8012&view=rev Author: bonivart Date: 2010-01-15 13:36:48 +0000 (Fri, 15 Jan 2010) Log Message: ----------- dbd-sqlite: update to 1.29 Modified Paths: -------------- csw/mgar/pkg/cpan/DBD-SQLite/trunk/Makefile csw/mgar/pkg/cpan/DBD-SQLite/trunk/checksums Property Changed: ---------------- csw/mgar/pkg/cpan/DBD-SQLite/trunk/ Property changes on: csw/mgar/pkg/cpan/DBD-SQLite/trunk ___________________________________________________________________ Modified: svn:externals - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v1 + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 Modified: csw/mgar/pkg/cpan/DBD-SQLite/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/DBD-SQLite/trunk/Makefile 2010-01-15 11:12:31 UTC (rev 8011) +++ csw/mgar/pkg/cpan/DBD-SQLite/trunk/Makefile 2010-01-15 13:36:48 UTC (rev 8012) @@ -1,17 +1,26 @@ GARNAME = DBD-SQLite -GARVERSION = 1.14 +GARVERSION = 1.29 CATEGORIES = cpan -AUTHOR = MSERGEANT +AUTHOR = ADAMK DESCRIPTION = self contained RDBMS in a DBI driver define BLURB - SQLite is a public domain RDBMS database engine that you can find at - http://www.hwaci.com/sw/sqlite/. + DBD::SQLite is a Perl DBI driver for SQLite, that includes the entire + thing in the distribution. So in order to get a fast transaction capable + RDBMS working for your perl project you simply have to install this + module, and nothing else. endef -DISTFILES += CSWpmdbdsqlite.gspec +PACKAGES = CSWpmdbdsqlite +CATALOGNAME = pm_dbdsqlite +REQUIRED_PKGS = CSWpmdbi -# Use Perl's Config{optimize} instead of -O6 -PATCHFILES = optimize.diff +LICENSE = LICENSE include gar/category.mk + +post-install-modulated: + @echo "Post-Install (custom)" + @ginstall -d -m 755 $(DESTDIR)$(docdir)/pm_dbdsqlite + @ginstall -m 444 $(WORKSRC)/README $(DESTDIR)$(docdir)/pm_dbdsqlite + @$(MAKECOOKIE) Modified: csw/mgar/pkg/cpan/DBD-SQLite/trunk/checksums =================================================================== --- csw/mgar/pkg/cpan/DBD-SQLite/trunk/checksums 2010-01-15 11:12:31 UTC (rev 8011) +++ csw/mgar/pkg/cpan/DBD-SQLite/trunk/checksums 2010-01-15 13:36:48 UTC (rev 8012) @@ -1,3 +1,2 @@ -ea1d42acc6bf060e607c1ba5e3d05754 download/CSWpmdbdsqlite.gspec -d33e584f435d464a55946f58d4d4b9e2 download/DBD-SQLite-1.13.tar.gz +2a47cea6ecff62508775d90151a8030f download/DBD-SQLite-1.29.tar.gz 065e7791e4b06c234d9052ed81de6095 download/optimize.diff This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bonivart at users.sourceforge.net Fri Jan 15 14:46:45 2010 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Fri, 15 Jan 2010 13:46:45 +0000 Subject: [csw-devel] SF.net SVN: gar:[8013] csw/mgar/pkg/cpan/DBD-SQLite/trunk/files Message-ID: Revision: 8013 http://gar.svn.sourceforge.net/gar/?rev=8013&view=rev Author: bonivart Date: 2010-01-15 13:46:45 +0000 (Fri, 15 Jan 2010) Log Message: ----------- dbd-sqlite: remove unused files Removed Paths: ------------- csw/mgar/pkg/cpan/DBD-SQLite/trunk/files/CSWpmdbdsqlite.gspec csw/mgar/pkg/cpan/DBD-SQLite/trunk/files/optimize.diff Deleted: csw/mgar/pkg/cpan/DBD-SQLite/trunk/files/CSWpmdbdsqlite.gspec =================================================================== --- csw/mgar/pkg/cpan/DBD-SQLite/trunk/files/CSWpmdbdsqlite.gspec 2010-01-15 13:36:48 UTC (rev 8012) +++ csw/mgar/pkg/cpan/DBD-SQLite/trunk/files/CSWpmdbdsqlite.gspec 2010-01-15 13:46:45 UTC (rev 8013) @@ -1,8 +0,0 @@ -%var bitname pm_dbdsqlite -%var pkgname CSWpmdbdsqlite -%include url file://%{PKGLIB}/csw_cpan.gspec -%copyright -This module is distributed under the same terms as Perl itself, and -is copyright Matt Sergeant, 2002. - -The underlying SQLite database engine is copyright free. Deleted: csw/mgar/pkg/cpan/DBD-SQLite/trunk/files/optimize.diff =================================================================== --- csw/mgar/pkg/cpan/DBD-SQLite/trunk/files/optimize.diff 2010-01-15 13:36:48 UTC (rev 8012) +++ csw/mgar/pkg/cpan/DBD-SQLite/trunk/files/optimize.diff 2010-01-15 13:46:45 UTC (rev 8013) @@ -1,12 +0,0 @@ -diff --speed-large-files --minimal -Nru DBD-SQLite-1.07.orig/Makefile.PL DBD-SQLite-1.07/Makefile.PL ---- DBD-SQLite-1.07.orig/Makefile.PL 2004-10-12 02:03:50.000000000 -0700 -+++ DBD-SQLite-1.07/Makefile.PL 2005-02-11 11:17:37.100010000 -0800 -@@ -44,7 +44,7 @@ - 'PREREQ_PM' => {DBI => 1.21}, # e.g., Module::Name => 1.1 - 'OBJECT' => '$(O_FILES)', - 'INC' => '-I. -I$(DBI_INSTARCH_DIR)', -- 'OPTIMIZE' => "-O2", -+ 'OPTIMIZE' => "$Config{optimize}" - 'DEFINE' => "-DNDEBUG=1 -DSQLITE_PTR_SZ=$Config{ptrsize}" . - ($Config{d_usleep} ? " -DHAVE_USLEEP=1" : "") . - ($DBI::VERSION > 1.42 ? '' : ' -Dno_last_insert_id'), This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bonivart at users.sourceforge.net Fri Jan 15 15:08:59 2010 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Fri, 15 Jan 2010 14:08:59 +0000 Subject: [csw-devel] SF.net SVN: gar:[8014] csw/mgar/pkg/cpan/DBI/trunk Message-ID: Revision: 8014 http://gar.svn.sourceforge.net/gar/?rev=8014&view=rev Author: bonivart Date: 2010-01-15 14:08:59 +0000 (Fri, 15 Jan 2010) Log Message: ----------- pm_dbi: update to 1.609 Modified Paths: -------------- csw/mgar/pkg/cpan/DBI/trunk/Makefile csw/mgar/pkg/cpan/DBI/trunk/checksums Modified: csw/mgar/pkg/cpan/DBI/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/DBI/trunk/Makefile 2010-01-15 13:46:45 UTC (rev 8013) +++ csw/mgar/pkg/cpan/DBI/trunk/Makefile 2010-01-15 14:08:59 UTC (rev 8014) @@ -1,5 +1,5 @@ GARNAME = DBI -GARVERSION = 1.607 +GARVERSION = 1.609 CATEGORIES = cpan AUTHOR = TIMB @@ -13,12 +13,11 @@ DISTFILES = COPYING -# We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz PACKAGES = CSWpmdbi CATALOGNAME = pm_dbi -REQUIRED_PKGS = CSWpmplrpc +#REQUIRED_PKGS = CSWpmplrpc include gar/category.mk Modified: csw/mgar/pkg/cpan/DBI/trunk/checksums =================================================================== --- csw/mgar/pkg/cpan/DBI/trunk/checksums 2010-01-15 13:46:45 UTC (rev 8013) +++ csw/mgar/pkg/cpan/DBI/trunk/checksums 2010-01-15 14:08:59 UTC (rev 8014) @@ -1,2 +1,2 @@ -e8ddfc437b943ae538b777d472060191 download/COPYING -bd5785b39675213948a61dea1b400012 download/DBI-1.607.tar.gz +e8ddfc437b943ae538b777d472060191 COPYING +e4689870b3f7ce503022a076c53284ed DBI-1.609.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Fri Jan 15 15:52:02 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 15 Jan 2010 14:52:02 +0000 Subject: [csw-devel] SF.net SVN: gar:[8015] csw/mgar/pkg/cpan/Unicode-Map/trunk/Makefile Message-ID: Revision: 8015 http://gar.svn.sourceforge.net/gar/?rev=8015&view=rev Author: dmichelsen Date: 2010-01-15 14:52:01 +0000 (Fri, 15 Jan 2010) Log Message: ----------- cpan/Unicode-Map: Add dependency to CSWpmlibwww Modified Paths: -------------- csw/mgar/pkg/cpan/Unicode-Map/trunk/Makefile Modified: csw/mgar/pkg/cpan/Unicode-Map/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/Unicode-Map/trunk/Makefile 2010-01-15 14:08:59 UTC (rev 8014) +++ csw/mgar/pkg/cpan/Unicode-Map/trunk/Makefile 2010-01-15 14:52:01 UTC (rev 8015) @@ -13,4 +13,8 @@ PACKAGES = CSWpmunicodemap CATALOGNAME = pm_unicodemap +# This is needed for mirrorMappings: +# http://www.opencsw.org/mantis/view.php?id=2710 +REQUIRED_PKGS = CSWpmlibwww + include gar/category.mk This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Fri Jan 15 15:55:02 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 15 Jan 2010 14:55:02 +0000 Subject: [csw-devel] SF.net SVN: gar:[8016] csw/mgar/pkg/cpan/Spiffy/trunk/Makefile Message-ID: Revision: 8016 http://gar.svn.sourceforge.net/gar/?rev=8016&view=rev Author: dmichelsen Date: 2010-01-15 14:54:59 +0000 (Fri, 15 Jan 2010) Log Message: ----------- cpan/Spiffy: Add required package CSWpmyaml Modified Paths: -------------- csw/mgar/pkg/cpan/Spiffy/trunk/Makefile Modified: csw/mgar/pkg/cpan/Spiffy/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/Spiffy/trunk/Makefile 2010-01-15 14:52:01 UTC (rev 8015) +++ csw/mgar/pkg/cpan/Spiffy/trunk/Makefile 2010-01-15 14:54:59 UTC (rev 8016) @@ -15,6 +15,10 @@ PACKAGES = CSWpmspiffy CATALOGNAME = pm_spiffy +# Add required module due to bug report: +# http://www.opencsw.org/mantis/view.php?id=2711 +REQUIRED_PKGS = CSWpmyaml + ARCHALL = 1 include gar/category.mk This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Fri Jan 15 16:06:04 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 15 Jan 2010 15:06:04 +0000 Subject: [csw-devel] SF.net SVN: gar:[8017] csw/mgar/pkg/curl/trunk/Makefile Message-ID: Revision: 8017 http://gar.svn.sourceforge.net/gar/?rev=8017&view=rev Author: dmichelsen Date: 2010-01-15 15:06:04 +0000 (Fri, 15 Jan 2010) Log Message: ----------- curl: Adjust catalog name from curlrt to curl_rt and curldevel to curl_devel Modified Paths: -------------- csw/mgar/pkg/curl/trunk/Makefile Modified: csw/mgar/pkg/curl/trunk/Makefile =================================================================== --- csw/mgar/pkg/curl/trunk/Makefile 2010-01-15 14:54:59 UTC (rev 8016) +++ csw/mgar/pkg/curl/trunk/Makefile 2010-01-15 15:06:04 UTC (rev 8017) @@ -23,8 +23,8 @@ PACKAGES = CSWcurl CSWcurlrt CSWcurldevel CATALOGNAME_CSWcurl = curl -CATALOGNAME_CSWcurlrt = curlrt -CATALOGNAME_CSWcurldevel = curldevel +CATALOGNAME_CSWcurlrt = curl_rt +CATALOGNAME_CSWcurldevel = curl_devel SPKG_DESC_CSWcurl = A command line tool and library for client-side URL transfers SPKG_DESC_CSWcurlrt = Curl Runtime Libraries This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bonivart at users.sourceforge.net Fri Jan 15 16:15:45 2010 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Fri, 15 Jan 2010 15:15:45 +0000 Subject: [csw-devel] SF.net SVN: gar:[8018] csw/mgar/pkg/spamassassin/trunk Message-ID: Revision: 8018 http://gar.svn.sourceforge.net/gar/?rev=8018&view=rev Author: bonivart Date: 2010-01-15 15:15:24 +0000 (Fri, 15 Jan 2010) Log Message: ----------- spamassassin: update to 3.3rc3 Modified Paths: -------------- csw/mgar/pkg/spamassassin/trunk/Makefile csw/mgar/pkg/spamassassin/trunk/checksums Modified: csw/mgar/pkg/spamassassin/trunk/Makefile =================================================================== --- csw/mgar/pkg/spamassassin/trunk/Makefile 2010-01-15 15:06:04 UTC (rev 8017) +++ csw/mgar/pkg/spamassassin/trunk/Makefile 2010-01-15 15:15:24 UTC (rev 8018) @@ -11,18 +11,17 @@ endef #MASTER_SITES = http://apache.jumper.nu/spamassassin/source/ -MASTER_SITES = http://people.apache.org/~wtogami/devel/3.3.0-rc1/ +MASTER_SITES = http://people.apache.org/~wtogami/devel/3.3.0-rc3.unofficial/ #DISTFILES = $(SPKG_NAME)-$(GARVERSION).tar.gz -DISTFILES = $(SPKG_NAME)-$(GARVERSION)-rc1.tar.gz +DISTFILES = $(SPKG_NAME)-$(GARVERSION)-rc3.tar.gz DISTFILES += COPYING -REQUIRED_PKGS = CSWosslrt CSWperl CSWpmarchivetar CSWpmdbi CSWpmdigestsha1 +REQUIRED_PKGS = CSWosslrt CSWperl CSWpmarchivetar CSWpmdbi CSWpmdigestsha REQUIRED_PKGS += CSWpmiosocketinet6 CSWpmiosocketssl CSWpmiozlib REQUIRED_PKGS += CSWpmipcountry CSWpmldap CSWpmlibwww CSWpmmaildkim -REQUIRED_PKGS += CSWpmmailspf CSWpmmailtools CSWpmmimebase64 CSWpmnetdns +REQUIRED_PKGS += CSWpmmailspf CSWpmmailtools CSWpmmimebase64 CSWpmnetaddrip CSWpmnetdns REQUIRED_PKGS += CSWpmuri CSWpmhtmlparser CSWzlib -# We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(SPKG_NAME)-(\d+(?:\.\d+)*).tar.gz SAMPLECONF = /opt/csw/etc/spamassassin/.+\.pre\.CSW Modified: csw/mgar/pkg/spamassassin/trunk/checksums =================================================================== --- csw/mgar/pkg/spamassassin/trunk/checksums 2010-01-15 15:06:04 UTC (rev 8017) +++ csw/mgar/pkg/spamassassin/trunk/checksums 2010-01-15 15:15:24 UTC (rev 8018) @@ -1,2 +1,2 @@ 3b83ef96387f14655fc854ddc3c6bd57 COPYING -e5f1498a02b79ead743504e1f4f0fa89 Mail-SpamAssassin-3.3.0-rc1.tar.gz +98ad221b18c6c881f609d1a35bb800a0 Mail-SpamAssassin-3.3.0-rc3.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Fri Jan 15 16:50:41 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 15 Jan 2010 15:50:41 +0000 Subject: [csw-devel] SF.net SVN: gar:[8019] csw/mgar/pkg Message-ID: Revision: 8019 http://gar.svn.sourceforge.net/gar/?rev=8019&view=rev Author: dmichelsen Date: 2010-01-15 15:50:40 +0000 (Fri, 15 Jan 2010) Log Message: ----------- slang: Initial commit Added Paths: ----------- csw/mgar/pkg/slang/ csw/mgar/pkg/slang/branches/ csw/mgar/pkg/slang/tags/ csw/mgar/pkg/slang/trunk/ csw/mgar/pkg/slang/trunk/Makefile csw/mgar/pkg/slang/trunk/checksums csw/mgar/pkg/slang/trunk/files/ Property changes on: csw/mgar/pkg/slang/trunk ___________________________________________________________________ Added: svn:ignore + cookies download work Added: svn:externals + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 Added: csw/mgar/pkg/slang/trunk/Makefile =================================================================== --- csw/mgar/pkg/slang/trunk/Makefile (rev 0) +++ csw/mgar/pkg/slang/trunk/Makefile 2010-01-15 15:50:40 UTC (rev 8019) @@ -0,0 +1,23 @@ +GARNAME = slang +GARVERSION = 2.2.2 +CATEGORIES = lib + +DESCRIPTION = Library primarily to provide an alternative to libcurses +define BLURB +endef + +MASTER_SITES = ftp://space.mit.edu/pub/davis/slang/v2.2/ +MASTER_SITES += ftp://ftp.fu-berlin.de/pub/unix/misc/slang/v2.2/ +MASTER_SITES += ftp://ftp.ntua.gr/pub/lang/slang/slang/v2.2/ + +DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz + +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + +SPKG_SOURCEURL = http://www.s-lang.org/ + +BUILD64 = 1 +CONFIGURE_ARGS = $(DIRPATHS) + +include gar/category.mk Added: csw/mgar/pkg/slang/trunk/checksums =================================================================== --- csw/mgar/pkg/slang/trunk/checksums (rev 0) +++ csw/mgar/pkg/slang/trunk/checksums 2010-01-15 15:50:40 UTC (rev 8019) @@ -0,0 +1 @@ +e7183d0acab9cc35fae12849f8b848e2 slang-2.2.2.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From hson at users.sourceforge.net Fri Jan 15 17:20:22 2010 From: hson at users.sourceforge.net (hson at users.sourceforge.net) Date: Fri, 15 Jan 2010 16:20:22 +0000 Subject: [csw-devel] SF.net SVN: gar:[8020] csw/mgar/pkg/libproxy/trunk/Makefile Message-ID: Revision: 8020 http://gar.svn.sourceforge.net/gar/?rev=8020&view=rev Author: hson Date: 2010-01-15 16:20:21 +0000 (Fri, 15 Jan 2010) Log Message: ----------- libproxy: Split package Modified Paths: -------------- csw/mgar/pkg/libproxy/trunk/Makefile Modified: csw/mgar/pkg/libproxy/trunk/Makefile =================================================================== --- csw/mgar/pkg/libproxy/trunk/Makefile 2010-01-15 15:50:40 UTC (rev 8019) +++ csw/mgar/pkg/libproxy/trunk/Makefile 2010-01-15 16:20:21 UTC (rev 8020) @@ -32,15 +32,27 @@ PATCHFILES_isa-i386 += stdfiles.patch PATCHFILES_isa-i386 += proxy.c.patch +PACKAGES = CSWlibproxy CSWlibproxydevel CSWpy-libproxy +CATALOGNAME_CSWlibproxy = libproxy +CATALOGNAME_CSWlibproxydevel = libproxy_devel +CATALOGNAME_CSWpy-libproxy = py_libproxy +SPKG_DESC_CSWlibproxy = A library that provides automatic proxy configuration management +SPKG_DESC_CSWlibproxydevel = A library that provides automatic proxy configuration management - development files +SPKG_DESC_CSWpy-libproxy = A library that provides automatic proxy configuration management - Python bindings + +REQUIRED_PKGS_CSWlibproxy += CSWlibice CSWlibsm CSWlibx11 CSWlibxmu CSWlibxt +REQUIRED_PKGS_CSWlibproxydevel += CSWlibproxy +REQUIRED_PKGS_CSWpy-libproxy += CSWpython CSWlibproxy PREREQUISITE_PKGS += CSWlibx11devel CSWlibxmudevel CSWlibdbusdev -#Disable Mozilla plugin until there is a 64-bit version -#PREREQUISITE_PKGS += CSWmozilla CSWseamonkey +#Disable Mozilla/Firefox/Seamonkey plugin until there is a 64-bit version +#PREREQUISITE_PKGS += CSWmozilla CSWseamonkey CSWfirefox -REQUIRED_PKGS += CSWlibice CSWlibsm CSWlibx11 CSWlibxmu CSWlibxt +PKGFILES_CSWlibproxydevel = $(PKGFILES_DEVEL) +PKGFILES_CSWpy-libproxy = $(libdir).*/python/site-packages/.* UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz -PACKAGING_PLATFORMS = solaris10-sparc solaris10-i386 +#PACKAGING_PLATFORMS = solaris10-sparc solaris10-i386 EXTRA_LINKER_FLAGS = -lnsl BUILD64 = 1 @@ -48,12 +60,14 @@ EXTRA_INC = $(prefix)/X11/include EXTRA_LIB = $(prefix)/X11/lib EXTRA_PKG_CONFIG_DIRS = $(prefix)/X11/lib -EXTRA_PKG_CONFIG_DIRS += $(prefix)/mozilla/lib -EXTRA_PKG_CONFIG_DIRS += $(prefix)/mozilla/seamonkey/lib +#Disable Mozilla/Firefox/Seamonkey plugin until there is a 64-bit version +#EXTRA_PKG_CONFIG_DIRS += $(prefix)/mozilla/lib +#EXTRA_PKG_CONFIG_DIRS += $(prefix)/mozilla/firefox/lib +#EXTRA_PKG_CONFIG_DIRS += $(prefix)/mozilla/seamonkey/lib CONFIGURE_ARGS = $(DIRPATHS) -#Disable Mozilla plugin until there is a 64-bit version +#Disable Mozilla/Firefox/Seamonkey plugin until there is a 64-bit version CONFIGURE_ARGS += --without-mozjs CONFIGURE_ARGS += --with-python CONFIGURE_ARGS += --disable-silent-rules This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From hson at users.sourceforge.net Fri Jan 15 17:41:01 2010 From: hson at users.sourceforge.net (hson at users.sourceforge.net) Date: Fri, 15 Jan 2010 16:41:01 +0000 Subject: [csw-devel] SF.net SVN: gar:[8021] csw/mgar/pkg/libproxy/trunk/Makefile Message-ID: Revision: 8021 http://gar.svn.sourceforge.net/gar/?rev=8021&view=rev Author: hson Date: 2010-01-15 16:41:00 +0000 (Fri, 15 Jan 2010) Log Message: ----------- libproxy: Make python package ARCHALL Modified Paths: -------------- csw/mgar/pkg/libproxy/trunk/Makefile Modified: csw/mgar/pkg/libproxy/trunk/Makefile =================================================================== --- csw/mgar/pkg/libproxy/trunk/Makefile 2010-01-15 16:20:21 UTC (rev 8020) +++ csw/mgar/pkg/libproxy/trunk/Makefile 2010-01-15 16:41:00 UTC (rev 8021) @@ -50,6 +50,8 @@ PKGFILES_CSWlibproxydevel = $(PKGFILES_DEVEL) PKGFILES_CSWpy-libproxy = $(libdir).*/python/site-packages/.* +ARCHALL_CSWpy-libproxy = 1 + UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz #PACKAGING_PLATFORMS = solaris10-sparc solaris10-i386 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Fri Jan 15 17:48:14 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 15 Jan 2010 16:48:14 +0000 Subject: [csw-devel] SF.net SVN: gar:[8022] csw/mgar/pkg/pca/trunk Message-ID: Revision: 8022 http://gar.svn.sourceforge.net/gar/?rev=8022&view=rev Author: dmichelsen Date: 2010-01-15 16:48:13 +0000 (Fri, 15 Jan 2010) Log Message: ----------- pca: Add /etc/opt/csw as default location and add sample config file Modified Paths: -------------- csw/mgar/pkg/pca/trunk/Makefile csw/mgar/pkg/pca/trunk/checksums Added Paths: ----------- csw/mgar/pkg/pca/trunk/files/0002-Add-etc-opt-csw-as-config-location.patch Modified: csw/mgar/pkg/pca/trunk/Makefile =================================================================== --- csw/mgar/pkg/pca/trunk/Makefile 2010-01-15 16:41:00 UTC (rev 8021) +++ csw/mgar/pkg/pca/trunk/Makefile 2010-01-15 16:48:13 UTC (rev 8022) @@ -18,7 +18,9 @@ DISTFILES += COPYING DISTFILES += pca.conf -PATCHFILES = 0001-prefer-opencsw-perl.diff +PATCHFILES = 0001-prefer-opencsw-perl.diff +PATCHFILES += 0002-Add-etc-opt-csw-as-config-location.patch + #PATCHDIRLEVEL = 0 # We define upstream file regex so we can be notifed of new upstream software release @@ -34,17 +36,21 @@ SPKG_SOURCEURL = http://www.par.univie.ac.at/solaris/pca/ SPKG_VERSION = $(shell echo $(GARVERSION) | sed -e 's/-/./g') +SAMPLECONF = /etc/opt/csw/pca.conf + ARCHALL = 1 include gar/category.mk post-extract-modulated: - @mv $(WORKSRC)/$(DISTNAME) $(WORKSRC)/pca + mv $(WORKSRC)/$(DISTNAME) $(WORKSRC)/pca @$(MAKECOOKIE) install-custom: - @ginstall -d $(DESTDIR)$(bindir) - @ginstall $(WORKSRC)/pca $(DESTDIR)$(bindir)/pca - @ginstall -d $(DESTDIR)$(mandir)/man8 - @pod2man --section=8 $(WORKSRC)/pca > $(DESTDIR)$(mandir)/man8/pca.8 + ginstall -d $(DESTDIR)$(bindir) + ginstall $(WORKSRC)/pca $(DESTDIR)$(bindir)/pca + ginstall -d $(DESTDIR)/etc/opt/csw + ginstall $(WORKSRC)/pca.conf $(DESTDIR)/etc/opt/csw + ginstall -d $(DESTDIR)$(mandir)/man8 + pod2man --section=8 $(WORKSRC)/pca > $(DESTDIR)$(mandir)/man8/pca.8 @$(MAKECOOKIE) Modified: csw/mgar/pkg/pca/trunk/checksums =================================================================== --- csw/mgar/pkg/pca/trunk/checksums 2010-01-15 16:41:00 UTC (rev 8021) +++ csw/mgar/pkg/pca/trunk/checksums 2010-01-15 16:48:13 UTC (rev 8022) @@ -1,4 +1,5 @@ 4376789925fa9002d0567d739f717748 0001-prefer-opencsw-perl.diff +78c76967d20b4c9c69acacd7417527e1 0002-Add-etc-opt-csw-as-config-location.patch 6f2f2376eba0a788795dd43d68ad32d1 COPYING 7236327edeb969fd2a223cd5b60c0b57 pca-20091216-02 12de68ff8f67b4bb8b095e5646402208 pca.conf Added: csw/mgar/pkg/pca/trunk/files/0002-Add-etc-opt-csw-as-config-location.patch =================================================================== --- csw/mgar/pkg/pca/trunk/files/0002-Add-etc-opt-csw-as-config-location.patch (rev 0) +++ csw/mgar/pkg/pca/trunk/files/0002-Add-etc-opt-csw-as-config-location.patch 2010-01-15 16:48:13 UTC (rev 8022) @@ -0,0 +1,30 @@ +From 00323f9c9023a24b559f59938bc5258caf74501e Mon Sep 17 00:00:00 2001 +From: Dagobert Michelsen +Date: Fri, 15 Jan 2010 17:41:19 +0100 +Subject: [PATCH] Add /etc/opt/csw as config location + +--- + pca | 2 ++ + 1 files changed, 2 insertions(+), 0 deletions(-) + +diff --git a/pca b/pca +index b0206f9..45140f1 100644 +--- a/pca ++++ b/pca +@@ -2394,11 +2394,13 @@ sub parse_args { + if ($o{proxy}) { + push (@conf, dirname($0)."/../etc/pca-proxy.conf"); + push (@conf, "/etc/pca-proxy.conf"); ++ push (@conf, "/etc/opt/csw/pca-proxy.conf"); + push (@conf, "pca-proxy.conf"); + } else { + push (@conf, dirname($0)."/pca.conf"); + push (@conf, dirname($0)."/../etc/pca.conf"); + push (@conf, "/etc/pca.conf"); ++ push (@conf, "/etc/opt/csw/pca.conf"); + $ENV{HOME} && push (@conf, $ENV{HOME}."/.pca"); + push (@conf, "pca.conf"); + } +-- +1.6.6 + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From hson at users.sourceforge.net Fri Jan 15 18:28:24 2010 From: hson at users.sourceforge.net (hson at users.sourceforge.net) Date: Fri, 15 Jan 2010 17:28:24 +0000 Subject: [csw-devel] SF.net SVN: gar:[8023] csw/mgar/pkg/libproxy/tags Message-ID: Revision: 8023 http://gar.svn.sourceforge.net/gar/?rev=8023&view=rev Author: hson Date: 2010-01-15 17:28:21 +0000 (Fri, 15 Jan 2010) Log Message: ----------- libproxy: Package released Added Paths: ----------- csw/mgar/pkg/libproxy/tags/libproxy-0.3.0REV=2010.01.15/ csw/mgar/pkg/libproxy/tags/libproxy-0.3.0REV=2010.01.15/Makefile csw/mgar/pkg/libproxy/tags/libproxy-0.3.0REV=2010.01.15/checksums csw/mgar/pkg/libproxy/tags/libproxy-0.3.0REV=2010.01.15/files/0001-Use-xc99-for-Sun-Studio-compiler.patch csw/mgar/pkg/libproxy/tags/libproxy-0.3.0REV=2010.01.15/files/Solaris8-have-no-stdc99-flag.patch csw/mgar/pkg/libproxy/tags/libproxy-0.3.0REV=2010.01.15/files/SunStudio-have-no-stdc99-flag.patch csw/mgar/pkg/libproxy/tags/libproxy-0.3.0REV=2010.01.15/files/proxy.c.patch csw/mgar/pkg/libproxy/tags/libproxy-0.3.0REV=2010.01.15/files/stdfiles.patch Removed Paths: ------------- csw/mgar/pkg/libproxy/tags/libproxy-0.3.0REV=2010.01.15/Makefile csw/mgar/pkg/libproxy/tags/libproxy-0.3.0REV=2010.01.15/checksums csw/mgar/pkg/libproxy/tags/libproxy-0.3.0REV=2010.01.15/files/0001-Use-xc99-for-Sun-Studio-compiler.patch Deleted: csw/mgar/pkg/libproxy/tags/libproxy-0.3.0REV=2010.01.15/Makefile =================================================================== --- csw/mgar/pkg/libproxy/trunk/Makefile 2010-01-11 15:28:58 UTC (rev 7969) +++ csw/mgar/pkg/libproxy/tags/libproxy-0.3.0REV=2010.01.15/Makefile 2010-01-15 17:28:21 UTC (rev 8023) @@ -1,33 +0,0 @@ -GARNAME = libproxy -GARVERSION = 0.3.0 -CATEGORIES = lib - -DESCRIPTION = A library that provides automatic proxy configuration management -define BLURB - libproxy exists to answer the question: Given a network resource, how do I - reach it? It handles all the details, enabling you to get back to programming. - GNOME? KDE? Command line? WPAD? PAC? Network changed? It doesn't matter! Just - ask libproxy what proxy to use: you get simple code and your users get correct, - consistant behavior and broad infrastructure compatibility. -endef - -MASTER_SITES = http://libproxy.googlecode.com/files/ -DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz -PATCHFILES = 0001-Use-xc99-for-Sun-Studio-compiler.patch -PATCHFILES += 0002-Dont-preset-CFLAGS.patch - -# We define upstream file regex so we can be notifed of new upstream software release -UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz - -PACKAGING_PLATFORMS = solaris10-sparc solaris10-i386 - -EXTRA_LINKER_FLAGS = -lnsl -BUILD64 = 1 -CONFIGURE_ARGS = $(DIRPATHS) - -TEST_TARGET = check - -include gar/category.mk - -# There is actually the cpp executable in /usr/lib -PATH := $(PATH):/usr/lib Copied: csw/mgar/pkg/libproxy/tags/libproxy-0.3.0REV=2010.01.15/Makefile (from rev 8021, csw/mgar/pkg/libproxy/trunk/Makefile) =================================================================== --- csw/mgar/pkg/libproxy/tags/libproxy-0.3.0REV=2010.01.15/Makefile (rev 0) +++ csw/mgar/pkg/libproxy/tags/libproxy-0.3.0REV=2010.01.15/Makefile 2010-01-15 17:28:21 UTC (rev 8023) @@ -0,0 +1,93 @@ +GARNAME = libproxy +GARVERSION = 0.3.0 +CATEGORIES = lib + +DESCRIPTION = A library that provides automatic proxy configuration management +define BLURB + libproxy exists to answer the question: Given a network resource, how do I + reach it? It handles all the details, enabling you to get back to programming. + GNOME? KDE? Command line? WPAD? PAC? Network changed? It doesn't matter! Just + ask libproxy what proxy to use: you get simple code and your users get correct, + consistant behavior and broad infrastructure compatibility. +endef + +MASTER_SITES = http://libproxy.googlecode.com/files/ +DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz +#PATCHFILES = 0001-Use-xc99-for-Sun-Studio-compiler.patch +PATCHFILES += 0002-Dont-preset-CFLAGS.patch +# For Solaris 10 targets +#PATCHFILES_isa-amd64 += SunStudio-have-no-stdc99-flag.patch +#PATCHFILES_isa-sparcv8 += SunStudio-have-no-stdc99-flag.patch +#PATCHFILES_isa-sparcv9 += SunStudio-have-no-stdc99-flag.patch +#PATCHFILES_isa-i386 += SunStudio-have-no-stdc99-flag.patch +#For Solaris 8 targets +PATCHFILES_isa-amd64 += SunStudio-have-no-stdc99-flag.patch +PATCHFILES_isa-sparcv8 += Solaris8-have-no-stdc99-flag.patch +PATCHFILES_isa-sparcv8 += stdfiles.patch +PATCHFILES_isa-sparcv8 += proxy.c.patch +PATCHFILES_isa-sparcv9 += Solaris8-have-no-stdc99-flag.patch +PATCHFILES_isa-sparcv9 += stdfiles.patch +PATCHFILES_isa-sparcv9 += proxy.c.patch +PATCHFILES_isa-i386 += Solaris8-have-no-stdc99-flag.patch +PATCHFILES_isa-i386 += stdfiles.patch +PATCHFILES_isa-i386 += proxy.c.patch + +PACKAGES = CSWlibproxy CSWlibproxydevel CSWpy-libproxy +CATALOGNAME_CSWlibproxy = libproxy +CATALOGNAME_CSWlibproxydevel = libproxy_devel +CATALOGNAME_CSWpy-libproxy = py_libproxy +SPKG_DESC_CSWlibproxy = A library that provides automatic proxy configuration management +SPKG_DESC_CSWlibproxydevel = A library that provides automatic proxy configuration management - development files +SPKG_DESC_CSWpy-libproxy = A library that provides automatic proxy configuration management - Python bindings + +REQUIRED_PKGS_CSWlibproxy += CSWlibice CSWlibsm CSWlibx11 CSWlibxmu CSWlibxt +REQUIRED_PKGS_CSWlibproxydevel += CSWlibproxy +REQUIRED_PKGS_CSWpy-libproxy += CSWpython CSWlibproxy +PREREQUISITE_PKGS += CSWlibx11devel CSWlibxmudevel CSWlibdbusdev +#Disable Mozilla/Firefox/Seamonkey plugin until there is a 64-bit version +#PREREQUISITE_PKGS += CSWmozilla CSWseamonkey CSWfirefox + +PKGFILES_CSWlibproxydevel = $(PKGFILES_DEVEL) +PKGFILES_CSWpy-libproxy = $(libdir).*/python/site-packages/.* + +ARCHALL_CSWpy-libproxy = 1 + +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + +#PACKAGING_PLATFORMS = solaris10-sparc solaris10-i386 + +EXTRA_LINKER_FLAGS = -lnsl +BUILD64 = 1 + +EXTRA_INC = $(prefix)/X11/include +EXTRA_LIB = $(prefix)/X11/lib +EXTRA_PKG_CONFIG_DIRS = $(prefix)/X11/lib +#Disable Mozilla/Firefox/Seamonkey plugin until there is a 64-bit version +#EXTRA_PKG_CONFIG_DIRS += $(prefix)/mozilla/lib +#EXTRA_PKG_CONFIG_DIRS += $(prefix)/mozilla/firefox/lib +#EXTRA_PKG_CONFIG_DIRS += $(prefix)/mozilla/seamonkey/lib + + +CONFIGURE_ARGS = $(DIRPATHS) +#Disable Mozilla/Firefox/Seamonkey plugin until there is a 64-bit version +CONFIGURE_ARGS += --without-mozjs +CONFIGURE_ARGS += --with-python +CONFIGURE_ARGS += --disable-silent-rules + +TEST_TARGET = check + +include gar/category.mk + +#pre-configure-modulated: +# @echo " ==> Regenerating build tools..." +# @(cd $(WORKSRC) ; \ +# aclocal && \ +# autoconf && \ +# libtoolize --automake --force && \ +# aclocal && \ +# automake -a ) +# @$(MAKECOOKIE) + + +# There is actually the cpp executable in /usr/lib +PATH := $(PATH):/usr/lib Deleted: csw/mgar/pkg/libproxy/tags/libproxy-0.3.0REV=2010.01.15/checksums =================================================================== --- csw/mgar/pkg/libproxy/trunk/checksums 2010-01-11 15:28:58 UTC (rev 7969) +++ csw/mgar/pkg/libproxy/tags/libproxy-0.3.0REV=2010.01.15/checksums 2010-01-15 17:28:21 UTC (rev 8023) @@ -1,3 +0,0 @@ -ce2d836df293fa8183265176459cf87e 0001-Use-xc99-for-Sun-Studio-compiler.patch -acd3e61f107ff188722fb1335e0ed37c 0002-Dont-preset-CFLAGS.patch -6ded75a6c6aef53be657ece207cc26c4 libproxy-0.3.0.tar.gz Copied: csw/mgar/pkg/libproxy/tags/libproxy-0.3.0REV=2010.01.15/checksums (from rev 8006, csw/mgar/pkg/libproxy/trunk/checksums) =================================================================== --- csw/mgar/pkg/libproxy/tags/libproxy-0.3.0REV=2010.01.15/checksums (rev 0) +++ csw/mgar/pkg/libproxy/tags/libproxy-0.3.0REV=2010.01.15/checksums 2010-01-15 17:28:21 UTC (rev 8023) @@ -0,0 +1,6 @@ +acd3e61f107ff188722fb1335e0ed37c 0002-Dont-preset-CFLAGS.patch +dd08c0fd4795084e5970d59f8de149dd Solaris8-have-no-stdc99-flag.patch +95c2645311c9e840c0ed81c7a9aefadb SunStudio-have-no-stdc99-flag.patch +6ded75a6c6aef53be657ece207cc26c4 libproxy-0.3.0.tar.gz +647cefd3bb414eb269cb59aace9eb35b proxy.c.patch +7dd25dd1f615fe7a3c2a1d9c9a179e74 stdfiles.patch Deleted: csw/mgar/pkg/libproxy/tags/libproxy-0.3.0REV=2010.01.15/files/0001-Use-xc99-for-Sun-Studio-compiler.patch =================================================================== --- csw/mgar/pkg/libproxy/trunk/files/0001-Use-xc99-for-Sun-Studio-compiler.patch 2010-01-11 15:28:58 UTC (rev 7969) +++ csw/mgar/pkg/libproxy/tags/libproxy-0.3.0REV=2010.01.15/files/0001-Use-xc99-for-Sun-Studio-compiler.patch 2010-01-15 17:28:21 UTC (rev 8023) @@ -1,56 +0,0 @@ -From 3ea26b980c8929de2f92a33de49a09dc12f63a68 Mon Sep 17 00:00:00 2001 -From: Dagobert Michelsen -Date: Tue, 5 Jan 2010 15:29:01 +0100 -Subject: [PATCH] Use xc99 for Sun Studio compiler - ---- - src/bin/Makefile.am | 2 +- - src/bin/Makefile.in | 2 +- - src/lib/Makefile.am | 2 +- - src/lib/Makefile.in | 2 +- - src/modules/Makefile.am | 2 +- - src/modules/Makefile.in | 2 +- - 6 files changed, 6 insertions(+), 6 deletions(-) - -diff --git a/src/bin/Makefile.in b/src/bin/Makefile.in -index 625fbb3..ed8cd56 100644 ---- a/src/bin/Makefile.in -+++ b/src/bin/Makefile.in -@@ -239,7 +239,7 @@ xmu_LIBS = @xmu_LIBS@ - - # Command line interface to libproxy - proxy_SOURCES = proxy.c --proxy_CPPFLAGS = -I$(top_srcdir)/src/lib -std=c99 -+proxy_CPPFLAGS = -I$(top_srcdir)/src/lib -xc99 - proxy_LDADD = ../lib/libproxy.la - all: all-am - -diff --git a/src/lib/Makefile.in b/src/lib/Makefile.in -index 77bb2da..73e087c 100644 ---- a/src/lib/Makefile.in -+++ b/src/lib/Makefile.in -@@ -277,7 +277,7 @@ libproxy_la_SOURCES = \ - strdict.c strdict.h \ - url.c url.h - --libproxy_la_CFLAGS = -DMODULEDIR=\"@MODULEDIR@@DIR_SEPARATOR@\" -DSYSCONFDIR=\"@SYSCONFDIR@@DIR_SEPARATOR@\" -std=c99 -D_POSIX_C_SOURCE=200112L -+libproxy_la_CFLAGS = -DMODULEDIR=\"@MODULEDIR@@DIR_SEPARATOR@\" -DSYSCONFDIR=\"@SYSCONFDIR@@DIR_SEPARATOR@\" -xc99 -D_POSIX_C_SOURCE=200112L - libproxy_la_LDFLAGS = -lpthread -lm -no-undefined - include_HEADERS = proxy.h - all: all-am -diff --git a/src/modules/Makefile.in b/src/modules/Makefile.in -index 6965056..45c9c57 100644 ---- a/src/modules/Makefile.in -+++ b/src/modules/Makefile.in -@@ -359,7 +359,7 @@ x11_LIBS = @x11_LIBS@ - xmu_CFLAGS = @xmu_CFLAGS@ - xmu_LIBS = @xmu_LIBS@ - moduledir = @MODULEDIR@ --AM_CFLAGS = -std=c99 -+AM_CFLAGS = -xc99 - AM_LDFLAGS = -module -avoid-version -no-undefined - - # Which modules to build --- -1.6.6 - Copied: csw/mgar/pkg/libproxy/tags/libproxy-0.3.0REV=2010.01.15/files/0001-Use-xc99-for-Sun-Studio-compiler.patch (from rev 8005, csw/mgar/pkg/libproxy/trunk/files/0001-Use-xc99-for-Sun-Studio-compiler.patch) =================================================================== --- csw/mgar/pkg/libproxy/tags/libproxy-0.3.0REV=2010.01.15/files/0001-Use-xc99-for-Sun-Studio-compiler.patch (rev 0) +++ csw/mgar/pkg/libproxy/tags/libproxy-0.3.0REV=2010.01.15/files/0001-Use-xc99-for-Sun-Studio-compiler.patch 2010-01-15 17:28:21 UTC (rev 8023) @@ -0,0 +1,56 @@ +From 3ea26b980c8929de2f92a33de49a09dc12f63a68 Mon Sep 17 00:00:00 2001 +From: Dagobert Michelsen +Date: Tue, 5 Jan 2010 15:29:01 +0100 +Subject: [PATCH] Use xc99 for Sun Studio compiler + +--- + src/bin/Makefile.am | 2 +- + src/bin/Makefile.in | 2 +- + src/lib/Makefile.am | 2 +- + src/lib/Makefile.in | 2 +- + src/modules/Makefile.am | 2 +- + src/modules/Makefile.in | 2 +- + 6 files changed, 6 insertions(+), 6 deletions(-) + +diff --git a/src/bin/Makefile.in b/src/bin/Makefile.in +index 625fbb3..ed8cd56 100644 +--- a/src/bin/Makefile.in ++++ b/src/bin/Makefile.in +@@ -239,7 +239,7 @@ xmu_LIBS = @xmu_LIBS@ + + # Command line interface to libproxy + proxy_SOURCES = proxy.c +-proxy_CPPFLAGS = -I$(top_srcdir)/src/lib -std=c99 ++proxy_CPPFLAGS = -I$(top_srcdir)/src/lib -xc99 + proxy_LDADD = ../lib/libproxy.la + all: all-am + +diff --git a/src/lib/Makefile.in b/src/lib/Makefile.in +index 77bb2da..73e087c 100644 +--- a/src/lib/Makefile.in ++++ b/src/lib/Makefile.in +@@ -277,7 +277,7 @@ libproxy_la_SOURCES = \ + strdict.c strdict.h \ + url.c url.h + +-libproxy_la_CFLAGS = -DMODULEDIR=\"@MODULEDIR@@DIR_SEPARATOR@\" -DSYSCONFDIR=\"@SYSCONFDIR@@DIR_SEPARATOR@\" -std=c99 -D_POSIX_C_SOURCE=200112L ++libproxy_la_CFLAGS = -DMODULEDIR=\"@MODULEDIR@@DIR_SEPARATOR@\" -DSYSCONFDIR=\"@SYSCONFDIR@@DIR_SEPARATOR@\" -xc99 -D_POSIX_C_SOURCE=200112L + libproxy_la_LDFLAGS = -lpthread -lm -no-undefined + include_HEADERS = proxy.h + all: all-am +diff --git a/src/modules/Makefile.in b/src/modules/Makefile.in +index 6965056..45c9c57 100644 +--- a/src/modules/Makefile.in ++++ b/src/modules/Makefile.in +@@ -359,7 +359,7 @@ x11_LIBS = @x11_LIBS@ + xmu_CFLAGS = @xmu_CFLAGS@ + xmu_LIBS = @xmu_LIBS@ + moduledir = @MODULEDIR@ +-AM_CFLAGS = -std=c99 ++AM_CFLAGS = -xc99 + AM_LDFLAGS = -module -avoid-version -no-undefined + + # Which modules to build +-- +1.6.6 + Copied: csw/mgar/pkg/libproxy/tags/libproxy-0.3.0REV=2010.01.15/files/Solaris8-have-no-stdc99-flag.patch (from rev 8006, csw/mgar/pkg/libproxy/trunk/files/Solaris8-have-no-stdc99-flag.patch) =================================================================== --- csw/mgar/pkg/libproxy/tags/libproxy-0.3.0REV=2010.01.15/files/Solaris8-have-no-stdc99-flag.patch (rev 0) +++ csw/mgar/pkg/libproxy/tags/libproxy-0.3.0REV=2010.01.15/files/Solaris8-have-no-stdc99-flag.patch 2010-01-15 17:28:21 UTC (rev 8023) @@ -0,0 +1,134 @@ +diff -Nru libproxy-0.3.0.orig/src/bin/Makefile.am libproxy-0.3.0/src/bin/Makefile.am +--- libproxy-0.3.0.orig/src/bin/Makefile.am 2009-08-14 21:00:32.000000000 +0200 ++++ libproxy-0.3.0/src/bin/Makefile.am 2010-01-07 12:16:16.608932753 +0100 +@@ -2,5 +2,5 @@ + + # Command line interface to libproxy + proxy_SOURCES = proxy.c +-proxy_CPPFLAGS = -I$(top_srcdir)/src/lib -std=c99 ++proxy_CPPFLAGS = -I$(top_srcdir)/src/lib + proxy_LDADD = ../lib/libproxy.la +diff -Nru libproxy-0.3.0.orig/src/lib/Makefile.am libproxy-0.3.0/src/lib/Makefile.am +--- libproxy-0.3.0.orig/src/lib/Makefile.am 2009-08-14 21:00:32.000000000 +0200 ++++ libproxy-0.3.0/src/lib/Makefile.am 2010-01-07 12:17:37.568266736 +0100 +@@ -10,8 +10,8 @@ + strdict.c strdict.h \ + url.c url.h + +-libproxy_la_CFLAGS = -DMODULEDIR=\"@MODULEDIR@@DIR_SEPARATOR@\" -DSYSCONFDIR=\"@SYSCONFDIR@@DIR_SEPARATOR@\" -std=c99 -D_POSIX_C_SOURCE=200112L ++libproxy_la_CFLAGS = -DMODULEDIR=\"@MODULEDIR@@DIR_SEPARATOR@\" -DSYSCONFDIR=\"@SYSCONFDIR@@DIR_SEPARATOR@\" + libproxy_la_LDFLAGS = -lpthread -lm -no-undefined + + include_HEADERS = proxy.h + +diff -Nru libproxy-0.3.0.orig/src/lib/Makefile.in libproxy-0.3.0/src/lib/Makefile.in +--- libproxy-0.3.0.orig/src/lib/Makefile.in 2009-08-14 21:05:15.000000000 +0200 ++++ libproxy-0.3.0/src/lib/Makefile.in 2010-01-07 11:58:19.284179024 +0100 +@@ -277,7 +277,7 @@ + strdict.c strdict.h \ + url.c url.h + +-libproxy_la_CFLAGS = -DMODULEDIR=\"@MODULEDIR@@DIR_SEPARATOR@\" -DSYSCONFDIR=\"@SYSCONFDIR@@DIR_SEPARATOR@\" -std=c99 -D_POSIX_C_SOURCE=200112L ++libproxy_la_CFLAGS = -DMODULEDIR=\"@MODULEDIR@@DIR_SEPARATOR@\" -DSYSCONFDIR=\"@SYSCONFDIR@@DIR_SEPARATOR@\" + libproxy_la_LDFLAGS = -lpthread -lm -no-undefined + include_HEADERS = proxy.h + all: all-am +diff -Nru libproxy-0.3.0.orig/src/modules/Makefile.am libproxy-0.3.0/src/modules/Makefile.am +--- libproxy-0.3.0.orig/src/modules/Makefile.am 2009-08-14 21:06:30.000000000 +0200 ++++ libproxy-0.3.0/src/modules/Makefile.am 2010-01-07 12:18:24.020865842 +0100 +@@ -1,5 +1,5 @@ + moduledir = @MODULEDIR@ +-AM_CFLAGS = -std=c99 ++AM_CFLAGS = + AM_LDFLAGS = -module -avoid-version -no-undefined + + +@@ -50,7 +50,7 @@ + + # GConf/GNOME Config Module + config_gnome_la_SOURCES = config_gnome.c xhasclient.c +-config_gnome_la_CPPFLAGS = -I$(top_srcdir)/src/lib -D_POSIX_C_SOURCE=200112L -DGCONFTOOLBIN='"@GCONFTOOLBIN@"' @GNOME_CFLAGS@ ++config_gnome_la_CPPFLAGS = -I$(top_srcdir)/src/lib -DGCONFTOOLBIN='"@GCONFTOOLBIN@"' @GNOME_CFLAGS@ + config_gnome_la_LIBADD = ../lib/libproxy.la + config_gnome_la_LDFLAGS = $(AM_LDFLAGS) @GNOME_LIBS@ + +@@ -77,12 +77,12 @@ + + # IP Ignore Module + ignore_ip_la_SOURCES = ignore_ip.c +-ignore_ip_la_CPPFLAGS = -I$(top_srcdir)/src/lib -D_POSIX_C_SOURCE=200112L ++ignore_ip_la_CPPFLAGS = -I$(top_srcdir)/src/lib + ignore_ip_la_LIBADD = ../lib/libproxy.la + + # WebKit (JavaScriptCore) based PAC runner + pacrunner_webkit_la_SOURCES = pacrunner_webkit.c +-pacrunner_webkit_la_CPPFLAGS = -I$(top_srcdir)/src/lib @WEBKIT_CFLAGS@ -D_POSIX_C_SOURCE=200112L ++pacrunner_webkit_la_CPPFLAGS = -I$(top_srcdir)/src/lib @WEBKIT_CFLAGS@ + pacrunner_webkit_la_LIBADD = ../lib/libproxy.la + if MINGW32 + pacrunner_webkit_la_LIBADD += ../platform/win32/libwinutils.la +@@ -92,7 +92,7 @@ + + # Mozilla (Spidermonkey) based PAC runner + pacrunner_mozjs_la_SOURCES = pacrunner_mozjs.c +-pacrunner_mozjs_la_CPPFLAGS = -I$(top_srcdir)/src/lib @MOZJS_CFLAGS@ -D_POSIX_C_SOURCE=200112L ++pacrunner_mozjs_la_CPPFLAGS = -I$(top_srcdir)/src/lib @MOZJS_CFLAGS@ + pacrunner_mozjs_la_LIBADD = ../lib/libproxy.la + pacrunner_mozjs_la_LDFLAGS = $(AM_LDFLAGS) @MOZJS_LIBS@ + nodist_pacrunner_mozjs_la_SOURCES = pacutils.h +diff -Nru libproxy-0.3.0.orig/src/modules/Makefile.in libproxy-0.3.0/src/modules/Makefile.in +--- libproxy-0.3.0.orig/src/modules/Makefile.in 2009-08-14 21:07:00.000000000 +0200 ++++ libproxy-0.3.0/src/modules/Makefile.in 2010-01-14 18:03:41.850944638 +0100 +@@ -359,7 +359,7 @@ + xmu_CFLAGS = @xmu_CFLAGS@ + xmu_LIBS = @xmu_LIBS@ + moduledir = @MODULEDIR@ +-AM_CFLAGS = -std=c99 ++AM_CFLAGS = + AM_LDFLAGS = -module -avoid-version -no-undefined + + # Which modules to build +@@ -385,7 +385,7 @@ + + # GConf/GNOME Config Module + config_gnome_la_SOURCES = config_gnome.c xhasclient.c +-config_gnome_la_CPPFLAGS = -I$(top_srcdir)/src/lib -D_POSIX_C_SOURCE=200112L -DGCONFTOOLBIN='"@GCONFTOOLBIN@"' @GNOME_CFLAGS@ ++config_gnome_la_CPPFLAGS = -I$(top_srcdir)/src/lib -DGCONFTOOLBIN='"@GCONFTOOLBIN@"' @GNOME_CFLAGS@ + config_gnome_la_LIBADD = ../lib/libproxy.la + config_gnome_la_LDFLAGS = $(AM_LDFLAGS) @GNOME_LIBS@ + +@@ -412,19 +412,19 @@ + + # IP Ignore Module + ignore_ip_la_SOURCES = ignore_ip.c +-ignore_ip_la_CPPFLAGS = -I$(top_srcdir)/src/lib -D_POSIX_C_SOURCE=200112L ++ignore_ip_la_CPPFLAGS = -I$(top_srcdir)/src/lib + ignore_ip_la_LIBADD = ../lib/libproxy.la + + # WebKit (JavaScriptCore) based PAC runner + pacrunner_webkit_la_SOURCES = pacrunner_webkit.c +-pacrunner_webkit_la_CPPFLAGS = -I$(top_srcdir)/src/lib @WEBKIT_CFLAGS@ -D_POSIX_C_SOURCE=200112L ++pacrunner_webkit_la_CPPFLAGS = -I$(top_srcdir)/src/lib @WEBKIT_CFLAGS@ + pacrunner_webkit_la_LIBADD = ../lib/libproxy.la $(am__append_10) + pacrunner_webkit_la_LDFLAGS = $(AM_LDFLAGS) @WEBKIT_LIBS@ + nodist_pacrunner_webkit_la_SOURCES = pacutils.h + + # Mozilla (Spidermonkey) based PAC runner + pacrunner_mozjs_la_SOURCES = pacrunner_mozjs.c +-pacrunner_mozjs_la_CPPFLAGS = -I$(top_srcdir)/src/lib @MOZJS_CFLAGS@ -D_POSIX_C_SOURCE=200112L ++pacrunner_mozjs_la_CPPFLAGS = -I$(top_srcdir)/src/lib @MOZJS_CFLAGS@ + pacrunner_mozjs_la_LIBADD = ../lib/libproxy.la + pacrunner_mozjs_la_LDFLAGS = $(AM_LDFLAGS) @MOZJS_LIBS@ + nodist_pacrunner_mozjs_la_SOURCES = pacutils.h +diff -Nru libproxy-0.3.0.orig/src/bin/Makefile.in libproxy-0.3.0/src/bin/Makefile.in +--- libproxy-0.3.0.orig/src/bin/Makefile.in 2009-08-14 21:05:15.000000000 +0200 ++++ libproxy-0.3.0/src/bin/Makefile.in 2010-01-14 18:04:24.531275033 +0100 +@@ -239,7 +239,7 @@ + + # Command line interface to libproxy + proxy_SOURCES = proxy.c +-proxy_CPPFLAGS = -I$(top_srcdir)/src/lib -std=c99 ++proxy_CPPFLAGS = -I$(top_srcdir)/src/lib + proxy_LDADD = ../lib/libproxy.la + all: all-am + Copied: csw/mgar/pkg/libproxy/tags/libproxy-0.3.0REV=2010.01.15/files/SunStudio-have-no-stdc99-flag.patch (from rev 8006, csw/mgar/pkg/libproxy/trunk/files/SunStudio-have-no-stdc99-flag.patch) =================================================================== --- csw/mgar/pkg/libproxy/tags/libproxy-0.3.0REV=2010.01.15/files/SunStudio-have-no-stdc99-flag.patch (rev 0) +++ csw/mgar/pkg/libproxy/tags/libproxy-0.3.0REV=2010.01.15/files/SunStudio-have-no-stdc99-flag.patch 2010-01-15 17:28:21 UTC (rev 8023) @@ -0,0 +1,69 @@ +diff -Nru libproxy-0.3.0.orig/src/bin/Makefile.am libproxy-0.3.0/src/bin/Makefile.am +--- libproxy-0.3.0.orig/src/bin/Makefile.am 2009-08-14 21:00:32.000000000 +0200 ++++ libproxy-0.3.0/src/bin/Makefile.am 2010-01-07 12:16:16.608932753 +0100 +@@ -2,5 +2,5 @@ + + # Command line interface to libproxy + proxy_SOURCES = proxy.c +-proxy_CPPFLAGS = -I$(top_srcdir)/src/lib -std=c99 ++proxy_CPPFLAGS = -I$(top_srcdir)/src/lib -xc99 + proxy_LDADD = ../lib/libproxy.la +diff -Nru libproxy-0.3.0.orig/src/lib/Makefile.am libproxy-0.3.0/src/lib/Makefile.am +--- libproxy-0.3.0.orig/src/lib/Makefile.am 2009-08-14 21:00:32.000000000 +0200 ++++ libproxy-0.3.0/src/lib/Makefile.am 2010-01-07 12:17:37.568266736 +0100 +@@ -10,8 +10,8 @@ + strdict.c strdict.h \ + url.c url.h + +-libproxy_la_CFLAGS = -DMODULEDIR=\"@MODULEDIR@@DIR_SEPARATOR@\" -DSYSCONFDIR=\"@SYSCONFDIR@@DIR_SEPARATOR@\" -std=c99 -D_POSIX_C_SOURCE=200112L ++libproxy_la_CFLAGS = -DMODULEDIR=\"@MODULEDIR@@DIR_SEPARATOR@\" -DSYSCONFDIR=\"@SYSCONFDIR@@DIR_SEPARATOR@\" -xc99 -D_POSIX_C_SOURCE=200112L + libproxy_la_LDFLAGS = -lpthread -lm -no-undefined + + include_HEADERS = proxy.h + +diff -Nru libproxy-0.3.0.orig/src/lib/Makefile.in libproxy-0.3.0/src/lib/Makefile.in +--- libproxy-0.3.0.orig/src/lib/Makefile.in 2009-08-14 21:05:15.000000000 +0200 ++++ libproxy-0.3.0/src/lib/Makefile.in 2010-01-07 11:58:19.284179024 +0100 +@@ -277,7 +277,7 @@ + strdict.c strdict.h \ + url.c url.h + +-libproxy_la_CFLAGS = -DMODULEDIR=\"@MODULEDIR@@DIR_SEPARATOR@\" -DSYSCONFDIR=\"@SYSCONFDIR@@DIR_SEPARATOR@\" -std=c99 -D_POSIX_C_SOURCE=200112L ++libproxy_la_CFLAGS = -DMODULEDIR=\"@MODULEDIR@@DIR_SEPARATOR@\" -DSYSCONFDIR=\"@SYSCONFDIR@@DIR_SEPARATOR@\" -xc99 -D_POSIX_C_SOURCE=200112L + libproxy_la_LDFLAGS = -lpthread -lm -no-undefined + include_HEADERS = proxy.h + all: all-am +diff -Nru libproxy-0.3.0.orig/src/modules/Makefile.am libproxy-0.3.0/src/modules/Makefile.am +--- libproxy-0.3.0.orig/src/modules/Makefile.am 2009-08-14 21:06:30.000000000 +0200 ++++ libproxy-0.3.0/src/modules/Makefile.am 2010-01-07 12:18:24.020865842 +0100 +@@ -1,5 +1,5 @@ + moduledir = @MODULEDIR@ +-AM_CFLAGS = -std=c99 ++AM_CFLAGS = -xc99 + AM_LDFLAGS = -module -avoid-version -no-undefined + + +diff -Nru libproxy-0.3.0.orig/src/modules/Makefile.in libproxy-0.3.0/src/modules/Makefile.in +--- libproxy-0.3.0.orig/src/modules/Makefile.in 2009-08-14 21:07:00.000000000 +0200 ++++ libproxy-0.3.0/src/modules/Makefile.in 2010-01-14 18:03:41.850944638 +0100 +@@ -359,7 +359,7 @@ + xmu_CFLAGS = @xmu_CFLAGS@ + xmu_LIBS = @xmu_LIBS@ + moduledir = @MODULEDIR@ +-AM_CFLAGS = -std=c99 ++AM_CFLAGS = -xc99 + AM_LDFLAGS = -module -avoid-version -no-undefined + + # Which modules to build +diff -Nru libproxy-0.3.0.orig/src/bin/Makefile.in libproxy-0.3.0/src/bin/Makefile.in +--- libproxy-0.3.0.orig/src/bin/Makefile.in 2009-08-14 21:05:15.000000000 +0200 ++++ libproxy-0.3.0/src/bin/Makefile.in 2010-01-14 18:04:24.531275033 +0100 +@@ -239,7 +239,7 @@ + + # Command line interface to libproxy + proxy_SOURCES = proxy.c +-proxy_CPPFLAGS = -I$(top_srcdir)/src/lib -std=c99 ++proxy_CPPFLAGS = -I$(top_srcdir)/src/lib -xc99 + proxy_LDADD = ../lib/libproxy.la + all: all-am + Copied: csw/mgar/pkg/libproxy/tags/libproxy-0.3.0REV=2010.01.15/files/proxy.c.patch (from rev 8006, csw/mgar/pkg/libproxy/trunk/files/proxy.c.patch) =================================================================== --- csw/mgar/pkg/libproxy/tags/libproxy-0.3.0REV=2010.01.15/files/proxy.c.patch (rev 0) +++ csw/mgar/pkg/libproxy/tags/libproxy-0.3.0REV=2010.01.15/files/proxy.c.patch 2010-01-15 17:28:21 UTC (rev 8023) @@ -0,0 +1,40 @@ +diff -Nru libproxy-0.3.0.orig/src/lib/proxy.c libproxy-0.3.0/src/lib/proxy.c +--- libproxy-0.3.0.orig/src/lib/proxy.c 2009-08-14 21:00:32.000000000 +0200 ++++ libproxy-0.3.0/src/lib/proxy.c 2010-01-07 11:57:19.188739832 +0100 +@@ -162,17 +162,37 @@ + if (!px_module_manager_register_type(self->mm, pxWPADModule, _px_wpad_module_cmp, false)) goto error; + + /* If we have a config file, load the config order from it */ ++#if (defined(__SUNPRO_C) && ( defined(__SunOS_5_8) || defined(__SunOS_5_9))) ++ char *envp; ++ envp = px_malloc0(strlen("_PX_CONFIG_ORDER")+3); ++ sprintf(envp,"_PX_CONFIG_ORDER="); ++ putenv(envp); ++#else + setenv("_PX_CONFIG_ORDER", "", 1); ++#endif + pxConfigFile *cf = px_config_file_new(SYSCONFDIR "proxy.conf"); + if (cf) + { + char *tmp = px_config_file_get_value(cf, PX_CONFIG_FILE_DEFAULT_SECTION, "config_order"); + px_config_file_free(cf); ++#if (defined(__SUNPRO_C) && ( defined(__SunOS_5_8) || defined(__SunOS_5_9))) ++ if (tmp) { ++ int retval; ++ envp = px_malloc0(strlen("_PX_CONFIG_ORDER")+strlen(tmp)+2); ++ sprintf(envp,"_PX_CONFIG_ORDER=%s",tmp); ++ retval = putenv(envp); ++ if(retval) { ++ px_free(tmp); ++ goto error; ++ } ++ } ++#else + if (tmp && setenv("_PX_CONFIG_ORDER", tmp, 1)) + { + px_free(tmp); + goto error; + } ++#endif + px_free(tmp); + } Copied: csw/mgar/pkg/libproxy/tags/libproxy-0.3.0REV=2010.01.15/files/stdfiles.patch (from rev 8006, csw/mgar/pkg/libproxy/trunk/files/stdfiles.patch) =================================================================== --- csw/mgar/pkg/libproxy/tags/libproxy-0.3.0REV=2010.01.15/files/stdfiles.patch (rev 0) +++ csw/mgar/pkg/libproxy/tags/libproxy-0.3.0REV=2010.01.15/files/stdfiles.patch 2010-01-15 17:28:21 UTC (rev 8023) @@ -0,0 +1,34 @@ +diff -Nru libproxy-0.3.0.orig/src/lib/stdbool.h libproxy-0.3.0/src/lib/stdbool.h +--- libproxy-0.3.0.orig/src/lib/stdbool.h 1970-01-01 01:00:00.000000000 +0100 ++++ libproxy-0.3.0/src/lib/stdbool.h 2010-01-15 00:49:51.930719445 +0100 +@@ -0,0 +1,17 @@ ++#ifndef _STDBOOL_H ++#ifndef _MY_STDBOOL_H ++#define _MY_STDBOOL_H ++ ++#if !defined(__GNUG__) && (defined(__SUNPRO_C) && ( defined(__SunOS_5_8) || defined(__SunOS_5_9))) ++ ++#ifndef bool ++#define bool int ++#define false 0 ++#define true 1 ++#endif /* bool */ ++ ++#endif /* Compiler has bool */ ++ ++ ++#endif /* _MY_BOOL_H_*/ ++#endif /* _STDBOOL_H_*/ +diff -Nru libproxy-0.3.0.orig/src/lib/stdint.h libproxy-0.3.0/src/lib/stdint.h +--- libproxy-0.3.0.orig/src/lib/stdint.h 1970-01-01 01:00:00.000000000 +0100 ++++ libproxy-0.3.0/src/lib/stdint.h 2010-01-15 01:00:57.971084112 +0100 +@@ -0,0 +1,9 @@ ++#ifndef _STDINT_H ++#ifndef _MY_STDINT_H ++#define _MY_STDINT_H ++ ++#if !defined(__GNUG__) && (defined(__SUNPRO_C) && ( defined(__SunOS_5_8) || defined(__SunOS_5_9))) ++#include ++#endif /* Compiler has stdint.h */ ++#endif /* _MY_STDINT_H */ ++#endif /* _STDINT_H */ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Fri Jan 15 23:20:49 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 15 Jan 2010 22:20:49 +0000 Subject: [csw-devel] SF.net SVN: gar:[8024] csw/mgar/pkg Message-ID: Revision: 8024 http://gar.svn.sourceforge.net/gar/?rev=8024&view=rev Author: dmichelsen Date: 2010-01-15 22:20:48 +0000 (Fri, 15 Jan 2010) Log Message: ----------- mtx: Initial commit Added Paths: ----------- csw/mgar/pkg/mtx/ csw/mgar/pkg/mtx/branches/ csw/mgar/pkg/mtx/tags/ csw/mgar/pkg/mtx/trunk/ csw/mgar/pkg/mtx/trunk/Makefile csw/mgar/pkg/mtx/trunk/checksums csw/mgar/pkg/mtx/trunk/files/ Property changes on: csw/mgar/pkg/mtx/trunk ___________________________________________________________________ Added: svn:ignore + cookies download work Added: svn:externals + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 Added: csw/mgar/pkg/mtx/trunk/Makefile =================================================================== --- csw/mgar/pkg/mtx/trunk/Makefile (rev 0) +++ csw/mgar/pkg/mtx/trunk/Makefile 2010-01-15 22:20:48 UTC (rev 8024) @@ -0,0 +1,19 @@ +GARNAME = mtx +GARVERSION = 1.3.12 +CATEGORIES = utils + +DESCRIPTION = Control tape autoloaders +define BLURB +endef + +MASTER_SITES = $(SF_MIRRORS) +DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz + +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + +SPKG_SOURCEURL = http://mtx.opensource-sw.net/ + +CONFIGURE_ARGS = $(DIRPATHS) + +include gar/category.mk Added: csw/mgar/pkg/mtx/trunk/checksums =================================================================== --- csw/mgar/pkg/mtx/trunk/checksums (rev 0) +++ csw/mgar/pkg/mtx/trunk/checksums 2010-01-15 22:20:48 UTC (rev 8024) @@ -0,0 +1 @@ +ce8f0e44671fb0c7d9ec30bb0bfa8b5c mtx-1.3.12.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Fri Jan 15 23:34:04 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 15 Jan 2010 22:34:04 +0000 Subject: [csw-devel] SF.net SVN: gar:[8025] csw/mgar/pkg/mtx/trunk/Makefile Message-ID: Revision: 8025 http://gar.svn.sourceforge.net/gar/?rev=8025&view=rev Author: dmichelsen Date: 2010-01-15 22:34:04 +0000 (Fri, 15 Jan 2010) Log Message: ----------- mtx: Fix installation Modified Paths: -------------- csw/mgar/pkg/mtx/trunk/Makefile Modified: csw/mgar/pkg/mtx/trunk/Makefile =================================================================== --- csw/mgar/pkg/mtx/trunk/Makefile 2010-01-15 22:20:48 UTC (rev 8024) +++ csw/mgar/pkg/mtx/trunk/Makefile 2010-01-15 22:34:04 UTC (rev 8025) @@ -4,11 +4,24 @@ DESCRIPTION = Control tape autoloaders define BLURB + mtx is a set of low level driver programs to control features of SCSI backup + related devices such as autoloaders, tape changers, media jukeboxes, and tape drives. + It can also report much data, including serial numbers, maximum block sizes, and + TapeAlert messages that most modern tape drives implement (to tell you the exact + reason why a backup or restore failed), as well as do raw SCSI READ and WRITE commands + to tape drives (not important on Linux, but important on Solaris due to the fact that + the Solaris tape driver supports none of the additional features of tape drives invented + after 1988). mtx is designed to be a low level driver in a larger scripted backup solution, + such as Bacula or Amanda. mtx is not supposed to itself be a high level interface to the + SCSI devices that it controls. endef MASTER_SITES = $(SF_MIRRORS) DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz +# TODO: +# - Add stuff from contrib + # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz @@ -16,4 +29,8 @@ CONFIGURE_ARGS = $(DIRPATHS) +TEST_TARGET = + +INSTALL_OVERRIDE_DIRS = sbindir mandir + include gar/category.mk This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Fri Jan 15 23:41:19 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 15 Jan 2010 22:41:19 +0000 Subject: [csw-devel] SF.net SVN: gar:[8026] csw/mgar/pkg/mtx/trunk/Makefile Message-ID: Revision: 8026 http://gar.svn.sourceforge.net/gar/?rev=8026&view=rev Author: dmichelsen Date: 2010-01-15 22:41:19 +0000 (Fri, 15 Jan 2010) Log Message: ----------- mtx: Add contrib Solaris config script Modified Paths: -------------- csw/mgar/pkg/mtx/trunk/Makefile Modified: csw/mgar/pkg/mtx/trunk/Makefile =================================================================== --- csw/mgar/pkg/mtx/trunk/Makefile 2010-01-15 22:34:04 UTC (rev 8025) +++ csw/mgar/pkg/mtx/trunk/Makefile 2010-01-15 22:41:19 UTC (rev 8026) @@ -34,3 +34,7 @@ INSTALL_OVERRIDE_DIRS = sbindir mandir include gar/category.mk + +post-install-modulated: + ginstall $(WORKSRC)/contrib/config_sgen_solaris.sh $(DESTDIR)$(sbindir) + @$(MAKECOOKIE) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Fri Jan 15 23:54:05 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 15 Jan 2010 22:54:05 +0000 Subject: [csw-devel] SF.net SVN: gar:[8027] csw/mgar/pkg/mutt/trunk Message-ID: Revision: 8027 http://gar.svn.sourceforge.net/gar/?rev=8027&view=rev Author: dmichelsen Date: 2010-01-15 22:54:04 +0000 (Fri, 15 Jan 2010) Log Message: ----------- mutt: Update to 1.5.20, modulate over slang-support. Merge and split into curses/slang pkg still missing Modified Paths: -------------- csw/mgar/pkg/mutt/trunk/Makefile csw/mgar/pkg/mutt/trunk/checksums Modified: csw/mgar/pkg/mutt/trunk/Makefile =================================================================== --- csw/mgar/pkg/mutt/trunk/Makefile 2010-01-15 22:41:19 UTC (rev 8026) +++ csw/mgar/pkg/mutt/trunk/Makefile 2010-01-15 22:54:04 UTC (rev 8027) @@ -1,8 +1,11 @@ GARNAME = mutt -GARVERSION = 1.5.19 +GARVERSION = 1.5.20 CATEGORIES = apps -DESCRIPTION = A text-based mail client for Unix operating systems. +EXTRA_MODULATORS = SLANG +MODULATIONS_SLANG = no yes + +DESCRIPTION = A text-based mail client for Unix operating systems define BLURB endef @@ -12,9 +15,24 @@ # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz -REQUIRED_PKGS_CSWmutt = CSWggettextrt CSWiconv CSWlibidn CSWncurses +REQUIRED_PKGS = CSWggettextrt CSWiconv CSWlibidn CSWncurses +# Raise optimizer level unless this bug has been fixed: +# http://dev.mutt.org/trac/ticket/3347 +OPT_FLAGS_SOS = -xO4 + +sysconfdir = /etc/opt/csw + CONFIGURE_ARGS = $(DIRPATHS) +CONFIGURE_ARGS_SLANG-no = +CONFIGURE_ARGS_SLANG-yes = --with-slang=$(prefix) +CONFIGURE_ARGS += $(CONFIGURE_ARGS_SLANG-$(SLANG)) + TEST_SCRIPTS = +PRESERVECONF = $(sysconfdir)/mime.types +PRESERVECONF += $(sysconfdir)/Muttrc + +MIGRATE_FILES = mime.types Muttrc + include gar/category.mk Modified: csw/mgar/pkg/mutt/trunk/checksums =================================================================== --- csw/mgar/pkg/mutt/trunk/checksums 2010-01-15 22:41:19 UTC (rev 8026) +++ csw/mgar/pkg/mutt/trunk/checksums 2010-01-15 22:54:04 UTC (rev 8027) @@ -1 +1 @@ -73b3747bc7f7c805921e8d24ebac693f download/mutt-1.5.19.tar.gz +027cdd9959203de0c3c64149a7ee351c mutt-1.5.20.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Fri Jan 15 23:54:38 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 15 Jan 2010 22:54:38 +0000 Subject: [csw-devel] SF.net SVN: gar:[8028] csw/mgar/pkg/slang/trunk Message-ID: Revision: 8028 http://gar.svn.sourceforge.net/gar/?rev=8028&view=rev Author: dmichelsen Date: 2010-01-15 22:54:38 +0000 (Fri, 15 Jan 2010) Log Message: ----------- slang: Add version modulation for legacy 1.4.9 Modified Paths: -------------- csw/mgar/pkg/slang/trunk/Makefile csw/mgar/pkg/slang/trunk/checksums Modified: csw/mgar/pkg/slang/trunk/Makefile =================================================================== --- csw/mgar/pkg/slang/trunk/Makefile 2010-01-15 22:54:04 UTC (rev 8027) +++ csw/mgar/pkg/slang/trunk/Makefile 2010-01-15 22:54:38 UTC (rev 8028) @@ -2,22 +2,48 @@ GARVERSION = 2.2.2 CATEGORIES = lib +EXTRA_MODULATORS = GARVERSION +MODULATIONS_GARVERSION = 1.4.9 2.2.2 + DESCRIPTION = Library primarily to provide an alternative to libcurses define BLURB endef -MASTER_SITES = ftp://space.mit.edu/pub/davis/slang/v2.2/ -MASTER_SITES += ftp://ftp.fu-berlin.de/pub/unix/misc/slang/v2.2/ -MASTER_SITES += ftp://ftp.ntua.gr/pub/lang/slang/slang/v2.2/ +MASTER_SITES = $(foreach V,$(MODULATIONS_GARVERSION),ftp://space.mit.edu/pub/davis/slang/v$(shell echo $V | perl -ne 'print /(\d+\.\d+)/')/) +SOURCEFILES = $(foreach VERSION,$(MODULATIONS_GARVERSION), $(GARNAME)-$(VERSION).tar.gz) +DISTFILES = $(SOURCEFILES) +NOEXTRACT = $(filter-out $(GARNAME)-$(GARVERSION).tar.gz,$(SOURCEFILES)) -DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz - # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz +REQUIRED_PKGS = CSWiconv CSWpcrert CSWpng CSWzlib + SPKG_SOURCEURL = http://www.s-lang.org/ +# Setting -L$(libdir) before the newly built lib confuses function +# definitions if the installed lib is older than the newly built one. +LINKER_FLAGS = + BUILD64 = 1 CONFIGURE_ARGS = $(DIRPATHS) +TEST_TARGET_GARVERSION-1.4.9 = +TEST_TARGET_GARVERSION-2.2.2 = check +TEST_TARGET = $(TEST_TARGET_GARVERSION-$(GARVERSION)) + +INSTALL_ARGS_GARVERSION-1.4.9 = install-elf install-links +INSTALL_ARGS = $(INSTALL_ARGS_GARVERSION-$(GARVERSION)) + +MERGE_SCRIPTS_isa-default-garversion-1.4.9 = copy-only +MERGE_DIRS_isa-default-garversion-1.4.9 = $(libdir) +MERGE_SCRIPTS_isa-default64-garversion-1.4.9 = copy-relocated-only +MERGE_DIRS_isa-default64-garversion-1.4.9 = $(libdir) + +MERGE_SCRIPTS_isa-default-garversion-2.2.2 = copy-all +MERGE_SCRIPTS_isa-default64-garversion-2.2.2 = copy-relocated-only +MERGE_DIRS_isa-default64-garversion-2.2.2 = $(bindir) $(sbindir) $(libexecdir) $(libdir) + + include gar/category.mk + Modified: csw/mgar/pkg/slang/trunk/checksums =================================================================== --- csw/mgar/pkg/slang/trunk/checksums 2010-01-15 22:54:04 UTC (rev 8027) +++ csw/mgar/pkg/slang/trunk/checksums 2010-01-15 22:54:38 UTC (rev 8028) @@ -1 +1,2 @@ +c73aa62b2d1b215ca55a7337daa3f543 slang-1.4.9.tar.gz e7183d0acab9cc35fae12849f8b848e2 slang-2.2.2.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Sat Jan 16 09:14:46 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sat, 16 Jan 2010 08:14:46 +0000 Subject: [csw-devel] SF.net SVN: gar:[8029] csw/mgar/pkg Message-ID: Revision: 8029 http://gar.svn.sourceforge.net/gar/?rev=8029&view=rev Author: wahwah Date: 2010-01-16 08:14:46 +0000 (Sat, 16 Jan 2010) Log Message: ----------- iotop: Initial commit (DTrace? What DTrace?) Modified Paths: -------------- csw/mgar/pkg/iotop/trunk/Makefile csw/mgar/pkg/iotop/trunk/checksums Added Paths: ----------- csw/mgar/pkg/iotop/ Modified: csw/mgar/pkg/iotop/trunk/Makefile =================================================================== --- csw/mgar/pkg/template/trunk/Makefile 2010-01-15 22:54:38 UTC (rev 8028) +++ csw/mgar/pkg/iotop/trunk/Makefile 2010-01-16 08:14:46 UTC (rev 8029) @@ -11,8 +11,8 @@ ## For more information about GAR variables, please see: ## https://sourceforge.net/apps/trac/gar/wiki/GAR%20Variable%20Reference ## -GARNAME = mypkg -GARVERSION = 1.0 +GARNAME = iotop +GARVERSION = 0.4 ## ## The category that your software fits in. This is not a descriptive field, but ## influences the build process. Depending on the CATEGORIES setting, different @@ -22,10 +22,10 @@ ## Possible settings are: ## apps, cpan, devel, gnome, java, kde, lang, lib, meta, net, python, server, ## utils, x11, xfce, xorg, xtra -CATEGORIES = lib +CATEGORIES = python ## ## A one-line description of the package, which will appear in the pkginfo. -DESCRIPTION = +DESCRIPTION = shows of behalf of which process is the I/O going on ## ## A longer description of the package. This is only for descriptive purposes ## inside the Makefile and is not used elsewhere. @@ -39,7 +39,7 @@ ## ## Whitespace-separated list of URLs to download the source package from. ## There are presets: $(SF_MIRRORS), $(GNU_MIRRORS) and $(GOOGLE_MIRROR). -MASTER_SITES = +MASTER_SITES = http://guichaz.free.fr/iotop/files/ ## ## SF_PROJ is required if you set $(MASTER_SITES) to $(SF_MIRRORS) and the ## Sourceforge project name differs from $(GARNAME). Specifies the Sourceforge @@ -54,10 +54,10 @@ ## Whitespace-separated list of files which comprise this build. mGAR will look ## for the files in the $(FILEDIR) (trunk/files) directory and on the ## $(MASTER_SITES). -DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz +DISTFILES = $(GARNAME)-$(GARVERSION).tar.bz2 ## ## We define upstream file regex so we can be notifed of new upstream software release -UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.bz2 ## ## Catalog name is the name to be used with pkg{-get,util} -i . ## It is different from the system package name, which by convention is CSWpkgname. @@ -148,7 +148,7 @@ ## CONFIGURE_SCRIPTS = ## BUILD_SCRIPTS = ## INSTALL_SCRIPTS = -## TEST_SCRIPTS = +TEST_SCRIPTS = ## ## Compilation settings ## @@ -160,7 +160,7 @@ ## BUILD_ARGS = ## ## Arguments passed to the ./configure script. -CONFIGURE_ARGS = $(DIRPATHS) +## CONFIGURE_ARGS = $(DIRPATHS) ## ## BUILD64 = ## CONFIGURE_ENV = @@ -176,10 +176,4 @@ ## The compiler to use. Defaults to SOS11, can be also: SOS12, GCC3, GCC4. ## GARCOMPILER = SOS11 ## -# Remove the following rules and uncomment the -# include before building. -all: .DEFAULT -.DEFAULT: - @true - -#include gar/category.mk +include gar/category.mk Modified: csw/mgar/pkg/iotop/trunk/checksums =================================================================== --- csw/mgar/pkg/template/trunk/checksums 2010-01-15 22:54:38 UTC (rev 8028) +++ csw/mgar/pkg/iotop/trunk/checksums 2010-01-16 08:14:46 UTC (rev 8029) @@ -0,0 +1 @@ +3607f8b77ed6686efd9a4a7e6c135ceb iotop-0.4.tar.bz2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Sat Jan 16 09:18:47 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sat, 16 Jan 2010 08:18:47 +0000 Subject: [csw-devel] SF.net SVN: gar:[8030] csw/mgar/pkg/iotop/trunk/Makefile Message-ID: Revision: 8030 http://gar.svn.sourceforge.net/gar/?rev=8030&view=rev Author: wahwah Date: 2010-01-16 08:18:47 +0000 (Sat, 16 Jan 2010) Log Message: ----------- iotop: ARCHALL = 1, removed boilerplate docs Modified Paths: -------------- csw/mgar/pkg/iotop/trunk/Makefile Modified: csw/mgar/pkg/iotop/trunk/Makefile =================================================================== --- csw/mgar/pkg/iotop/trunk/Makefile 2010-01-16 08:14:46 UTC (rev 8029) +++ csw/mgar/pkg/iotop/trunk/Makefile 2010-01-16 08:18:47 UTC (rev 8030) @@ -2,178 +2,16 @@ # Distributed under the terms of the GNU General Public License v2 # $Id$ -## This file contains comments to guide you through various GAR settings. -## Please remove unnecessary comments before committing your code to the code -## repository. The comments to remove are marked with double hashes. -## If you want to remove them all in-place, use: -## gsed -i -e '/^##/d' Makefile -## -## For more information about GAR variables, please see: -## https://sourceforge.net/apps/trac/gar/wiki/GAR%20Variable%20Reference -## GARNAME = iotop GARVERSION = 0.4 -## -## The category that your software fits in. This is not a descriptive field, but -## influences the build process. Depending on the CATEGORIES setting, different -## Makefiles are included from gar/categories/ in your trunk directory, which -## adjust the build settings for the respective category. -## -## Possible settings are: -## apps, cpan, devel, gnome, java, kde, lang, lib, meta, net, python, server, -## utils, x11, xfce, xorg, xtra CATEGORIES = python -## -## A one-line description of the package, which will appear in the pkginfo. DESCRIPTION = shows of behalf of which process is the I/O going on -## -## A longer description of the package. This is only for descriptive purposes -## inside the Makefile and is not used elsewhere. define BLURB - endef -## -## Upstream URL that should show up in the VENDOR field as well as on -## http://opencsw.org/packages/. -SPKG_SOURCEURL = -## -## Whitespace-separated list of URLs to download the source package from. -## There are presets: $(SF_MIRRORS), $(GNU_MIRRORS) and $(GOOGLE_MIRROR). +SPKG_SOURCEURL = http://guichaz.free.fr/iotop/ MASTER_SITES = http://guichaz.free.fr/iotop/files/ -## -## SF_PROJ is required if you set $(MASTER_SITES) to $(SF_MIRRORS) and the -## Sourceforge project name differs from $(GARNAME). Specifies the Sourceforge -## project name of the software you wish to download. -## SF_PROJ = -## -## A list of space separated patch filenames from files/ that are to be applied -## to the extracted software before the ./configure stage. Patches need to be -## included in the DISTFILES variable as well. -## PATCHFILES = -## -## Whitespace-separated list of files which comprise this build. mGAR will look -## for the files in the $(FILEDIR) (trunk/files) directory and on the -## $(MASTER_SITES). DISTFILES = $(GARNAME)-$(GARVERSION).tar.bz2 -## -## We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.bz2 -## -## Catalog name is the name to be used with pkg{-get,util} -i . -## It is different from the system package name, which by convention is CSWpkgname. -## CATALOGNAME = -## -## Set to 1 to mark the package as architecture-independent. -## ARCHALL = 0 -## -## A list of files / patterns that should be excluded from the package. Amends -## the default list of excluded filenames $(MERGE_EXCLUDE_DEFAULT), which -## contains things like libtool .la files and files with a leading ~. -## EXTRA_MERGE_EXCLUDE_FILES = -## -## A list of space separated package names that should be marked as -## incompatible with the current package. This will go into the depend file. -## When a user has one of the incompatible packages installed and installs -## your package, he will be prompted that the incompatible package must be -## removed. He will however not be prevented to install your package without -## removing the conflicting package first. -## INCOMPATIBLE_PKGS = -## -## The name of the license file that should be included in your package. Defaults -## to COPYING. See http://sourceforge.net/apps/trac/gar/wiki/CopyRightfor details -## on including and displaying licenses. -## LICENSE = -## -## A list of space separated package names that should be produced from your -## Makefile. This is used when a software has different components that can be -## packaged and used individually (think runtime libraries, client tools, server -## files, development headers). You don't need to set this when you just want to -## produce one package. -## -## When you set this variable to include more than one package, you also need to -## set PKGFILES_CSWpkgname for each package (except for the first one in your -## $(PACKAGES) list) to define which files go into each package. The first -## package from $(PACKAGES) one will hold all files that are not matched by -## PKGFILES_ for other packages. -## PACKAGES = -## -## If specified, GAR feeds the almost-final package prototype file to -## $(PROTOTYPE_FILTER) and reads the final package prototype file from it. -## $(PROTOTYPE_FILTER) is usually a sed/awk/perl one-liner, which was mostly used -## to prepare the prototype file for use with cswclassutils (see -## $(SPKG_CLASSES)). Now that there are convenience variables for cswclassutils, -## you will rarely have to use this. A still valid use case would be to change -## the file permissions of a file to be set-UID. -## See http://wiki.opencsw.org/cswclassutils-package for common usage information -## PROTOTYPE_FILTER = -## -## cswclassutils settings -## -## A list of action classes. Possible values are: -## none cswpreserveconf cswcpsampleconf cswpycompile cswusergroup cswinitsmf -## cswinetd cswetcservices -## The class 'cswinitsmf' must be the last class listed. When you use cswclassutils, -## you need to add CSWcswclassutils to REQUIRED_PKGS. -## SPKG_CLASSES = none -## Simplified settings for classes: -## PRESERVECONF = -## SAMPLECONF = -## INITSMF = -## USERGROUP = -## ETCSERVICES = -## INETDCONF = -## A list of runtime package dependencies in the form of CSWfoo. -## REQUIRED_PKGS = -## -## A list of packages necessary to build this package -## PREREQUISITE_PKGS = $(REQUIRED_PKGS) -## -## When using non-empty $(PACKAGES): -## REQUIRED_PKGS_CSWpkgname = -## SPKG_DESC_CSWpkgname = -## PKGFILES_CSWpkgname = -## CATALOGNAME_CSWpkgname = -## -## A list of space separated directories where objects should be stripped in -## addition to the bin/ and sbin/ directories. -## STRIP_DIRS = -## -## Define a custom target for the configure phase. When you set this, the target -## that will be used instead of configure: target, is named -## configure-$(CONFIGURE_SCRIPTS) and you will need to define it in your Makefile -## after including gar/gar.include.mk. If you want to skip the configure phase -## completely (for example when your software doesn't need to be compiled) assign -## this variable an empty value. The procedure works for configure, build, -## install and test steps. -## CONFIGURE_SCRIPTS = -## BUILD_SCRIPTS = -## INSTALL_SCRIPTS = TEST_SCRIPTS = -## -## Compilation settings -## -## The build directory. -## WORKSRC = $(WORKDIR)/$(GARNAME)-$(GARVERSION) -## -## BUILD_ARGS is passed as an argument to gmake during the build phase. Use this -## for example, if you need to override Makefile variables. -## BUILD_ARGS = -## -## Arguments passed to the ./configure script. -## CONFIGURE_ARGS = $(DIRPATHS) -## -## BUILD64 = -## CONFIGURE_ENV = -## EXTRA_CFLAGS = -## EXTRA_LDFLAGS = -## EXTRA_INC = -## EXTRA_LIB = -## GARFLAVOR = -## INSTALL_ARGS = -## OPT_FLAGS_SOS = -xO3 -## OPT_FLAGS_GCC = -O2 -pipe -## -## The compiler to use. Defaults to SOS11, can be also: SOS12, GCC3, GCC4. -## GARCOMPILER = SOS11 -## +ARCHALL = 1 include gar/category.mk This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Sat Jan 16 16:22:11 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Sat, 16 Jan 2010 15:22:11 +0000 Subject: [csw-devel] SF.net SVN: gar:[8031] csw/mgar/pkg/slang/trunk/Makefile Message-ID: Revision: 8031 http://gar.svn.sourceforge.net/gar/?rev=8031&view=rev Author: dmichelsen Date: 2010-01-16 15:22:11 +0000 (Sat, 16 Jan 2010) Log Message: ----------- slang: Skip 64 bit executable and move config to /etc/opt/csw Modified Paths: -------------- csw/mgar/pkg/slang/trunk/Makefile Modified: csw/mgar/pkg/slang/trunk/Makefile =================================================================== --- csw/mgar/pkg/slang/trunk/Makefile 2010-01-16 08:18:47 UTC (rev 8030) +++ csw/mgar/pkg/slang/trunk/Makefile 2010-01-16 15:22:11 UTC (rev 8031) @@ -25,6 +25,8 @@ # definitions if the installed lib is older than the newly built one. LINKER_FLAGS = +sysconfdir = /etc/opt/csw + BUILD64 = 1 CONFIGURE_ARGS = $(DIRPATHS) @@ -42,8 +44,7 @@ MERGE_SCRIPTS_isa-default-garversion-2.2.2 = copy-all MERGE_SCRIPTS_isa-default64-garversion-2.2.2 = copy-relocated-only -MERGE_DIRS_isa-default64-garversion-2.2.2 = $(bindir) $(sbindir) $(libexecdir) $(libdir) +MERGE_DIRS_isa-default64-garversion-2.2.2 = $(libdir) - include gar/category.mk This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Sat Jan 16 16:23:32 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Sat, 16 Jan 2010 15:23:32 +0000 Subject: [csw-devel] SF.net SVN: gar:[8032] csw/mgar/pkg/slang/trunk/Makefile Message-ID: Revision: 8032 http://gar.svn.sourceforge.net/gar/?rev=8032&view=rev Author: dmichelsen Date: 2010-01-16 15:23:32 +0000 (Sat, 16 Jan 2010) Log Message: ----------- slang: Do not isaexec Modified Paths: -------------- csw/mgar/pkg/slang/trunk/Makefile Modified: csw/mgar/pkg/slang/trunk/Makefile =================================================================== --- csw/mgar/pkg/slang/trunk/Makefile 2010-01-16 15:22:11 UTC (rev 8031) +++ csw/mgar/pkg/slang/trunk/Makefile 2010-01-16 15:23:32 UTC (rev 8032) @@ -27,6 +27,7 @@ sysconfdir = /etc/opt/csw +NO_ISAEXEC = 1 BUILD64 = 1 CONFIGURE_ARGS = $(DIRPATHS) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Sat Jan 16 20:32:02 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Sat, 16 Jan 2010 19:32:02 +0000 Subject: [csw-devel] SF.net SVN: gar:[8033] csw/mgar/pkg/mutt/trunk/Makefile Message-ID: Revision: 8033 http://gar.svn.sourceforge.net/gar/?rev=8033&view=rev Author: dmichelsen Date: 2010-01-16 19:32:02 +0000 (Sat, 16 Jan 2010) Log Message: ----------- mutt: Add custom merge rules and split into different packages Modified Paths: -------------- csw/mgar/pkg/mutt/trunk/Makefile Modified: csw/mgar/pkg/mutt/trunk/Makefile =================================================================== --- csw/mgar/pkg/mutt/trunk/Makefile 2010-01-16 15:23:32 UTC (rev 8032) +++ csw/mgar/pkg/mutt/trunk/Makefile 2010-01-16 19:32:02 UTC (rev 8033) @@ -15,8 +15,22 @@ # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz -REQUIRED_PKGS = CSWggettextrt CSWiconv CSWlibidn CSWncurses +LICENSE = COPYRIGHT +PACKAGES = CSWmutt-base CSWmutt-ncurses CSWmutt-slang + +REQUIRED_PKGS_CSWmutt-base = CSWggettextrt CSWiconv CSWlibidn +REQUIRED_PKGS_CSWmutt-ncurses = CSWmutt-base CSWncurses CSWggettextrt CSWiconv CSWlibidn +REQUIRED_PKGS_CSWmutt-slang = CSWmutt-base CSWslang CSWggettextrt CSWiconv CSWlibidn + +CATALOGNAME_CSWmutt-base = mutt_base +CATALOGNAME_CSWmutt-ncurses = mutt_ncurses +CATALOGNAME_CSWmutt-slang = mutt_slang + +SPKG_DESC_CSWmutt-base = $(DESCRIPTION) +SPKG_DESC_CSWmutt-ncurses = Mutt mail client with ncurses interface +SPKG_DESC_CSWmutt-slang = Mutt mail client with slang interface + # Raise optimizer level unless this bug has been fixed: # http://dev.mutt.org/trac/ticket/3347 OPT_FLAGS_SOS = -xO4 @@ -33,6 +47,19 @@ PRESERVECONF = $(sysconfdir)/mime.types PRESERVECONF += $(sysconfdir)/Muttrc -MIGRATE_FILES = mime.types Muttrc +EXTRA_MERGE_EXCLUDE_FILES = .*\.dist +MIGRATE_FILES_CSWmutt-base = mime.types Muttrc + +MERGE_SCRIPTS_isa-default-slang-no = copy-all +MERGE_SCRIPTS_isa-default-slang-yes = copy-mutt-only + +PKGFILES_CSWmutt-ncurses = $(bindir)/mutt +PKGFILES_CSWmutt-slang = $(bindir)/mutt-slang + include gar/category.mk + +merge-copy-mutt-only: $(PKGROOT) + ginstall -d $(PKGROOT)$(bindir) + ginstall $(INSTALLISADIR)$(bindir)/mutt $(PKGROOT)$(bindir)/mutt-slang + @$(MAKECOOKIE) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From skayser at users.sourceforge.net Sat Jan 16 22:29:59 2010 From: skayser at users.sourceforge.net (skayser at users.sourceforge.net) Date: Sat, 16 Jan 2010 21:29:59 +0000 Subject: [csw-devel] SF.net SVN: gar:[8034] csw/mgar/pkg/subversion/trunk/Makefile Message-ID: Revision: 8034 http://gar.svn.sourceforge.net/gar/?rev=8034&view=rev Author: skayser Date: 2010-01-16 21:29:58 +0000 (Sat, 16 Jan 2010) Log Message: ----------- subversion: restrict cswpycompile usage to $(libdir)/python, fixes #4156 Modified Paths: -------------- csw/mgar/pkg/subversion/trunk/Makefile Modified: csw/mgar/pkg/subversion/trunk/Makefile =================================================================== --- csw/mgar/pkg/subversion/trunk/Makefile 2010-01-16 19:32:02 UTC (rev 8033) +++ csw/mgar/pkg/subversion/trunk/Makefile 2010-01-16 21:29:58 UTC (rev 8034) @@ -95,8 +95,9 @@ export LDFLAGS EXTRA_MERGE_EXCLUDE_FILES = .*\.pyo .*\.pyc -PROTOTYPE_FILTER = awk '$$$$3 ~/.*\.py$$$$/ { $$$$2 = "cswpycompile" } { print }' -SPKG_CLASSES_CSWpythonsvn = none cswpycompile +PROTOTYPE_MODIFIERS += cswpycompile +PROTOTYPE_FILES_cswpycompile = $(libdir)/python/.*\.py +PROTOTYPE_CLASS_cswpycompile = cswpycompile CONFIGURE_ARGS = $(DIRPATHS) --libdir=$(SVNLIB) --libexecdir=$(SVNLIB) CONFIGURE_ARGS += --disable-mod-activation This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From trygvis at users.sourceforge.net Sat Jan 16 23:08:21 2010 From: trygvis at users.sourceforge.net (trygvis at users.sourceforge.net) Date: Sat, 16 Jan 2010 22:08:21 +0000 Subject: [csw-devel] SF.net SVN: gar:[8035] csw/mgar/pkg/pcb/trunk Message-ID: Revision: 8035 http://gar.svn.sourceforge.net/gar/?rev=8035&view=rev Author: trygvis Date: 2010-01-16 22:08:21 +0000 (Sat, 16 Jan 2010) Log Message: ----------- o Adding a couple of patches to prevent a coredump. Modified Paths: -------------- csw/mgar/pkg/pcb/trunk/Makefile csw/mgar/pkg/pcb/trunk/checksums Added Paths: ----------- csw/mgar/pkg/pcb/trunk/files/0001-Fix-off-by-one-error-in-the-GTK-HID-s-netlist-window.patch csw/mgar/pkg/pcb/trunk/files/0001-Regenerate-rats-r-tree-when-re-allocating-a-bigger-r.patch Modified: csw/mgar/pkg/pcb/trunk/Makefile =================================================================== --- csw/mgar/pkg/pcb/trunk/Makefile 2010-01-16 21:29:58 UTC (rev 8034) +++ csw/mgar/pkg/pcb/trunk/Makefile 2010-01-16 22:08:21 UTC (rev 8035) @@ -55,8 +55,11 @@ # uncomment the next line. Otherwise it is set by default to the value of MASTER_SITES # UPSTREAM_MASTER_SITES = -# Patch submitted to upstream, pending new release -#PATCHFILES = iptc-dataset.patch +# See [1] and [2]. [1] seems to fix the problem, but [2] is included too. - trygvis +# [1]: http://www.mail-archive.com/geda-user at moria.seul.org/msg14911.html +# [2]: http://www.mail-archive.com/geda-user at moria.seul.org/msg14914.html +PATCHFILES = 0001-Fix-off-by-one-error-in-the-GTK-HID-s-netlist-window.patch +PATCHFILES += 0001-Regenerate-rats-r-tree-when-re-allocating-a-bigger-r.patch EXTRA_PKG_CONFIG_DIRS = $(prefix)/X11/lib CONFIGURE_ARGS = $(DIRPATHS) Modified: csw/mgar/pkg/pcb/trunk/checksums =================================================================== --- csw/mgar/pkg/pcb/trunk/checksums 2010-01-16 21:29:58 UTC (rev 8034) +++ csw/mgar/pkg/pcb/trunk/checksums 2010-01-16 22:08:21 UTC (rev 8035) @@ -1 +1,3 @@ -e192ee993b04749f82dd3e8b529d40c0 download/pcb-20081128.tar.gz +509826c8a9184b46055258861228b555 0001-Fix-off-by-one-error-in-the-GTK-HID-s-netlist-window.patch +00fd904d4439493a998100f40891fffd 0001-Regenerate-rats-r-tree-when-re-allocating-a-bigger-r.patch +e192ee993b04749f82dd3e8b529d40c0 pcb-20081128.tar.gz Added: csw/mgar/pkg/pcb/trunk/files/0001-Fix-off-by-one-error-in-the-GTK-HID-s-netlist-window.patch =================================================================== --- csw/mgar/pkg/pcb/trunk/files/0001-Fix-off-by-one-error-in-the-GTK-HID-s-netlist-window.patch (rev 0) +++ csw/mgar/pkg/pcb/trunk/files/0001-Fix-off-by-one-error-in-the-GTK-HID-s-netlist-window.patch 2010-01-16 22:08:21 UTC (rev 8035) @@ -0,0 +1,28 @@ +From d053b4e41da10fd033429cb4b88c6e3b52769eb7 Mon Sep 17 00:00:00 2001 +From: Peter Clifton +Date: Wed, 24 Dec 2008 03:07:02 +0000 +Subject: [PATCH] Fix off-by one error in the GTK HID's netlist window model generation + +Broken when I added support for a hierarchical view of nets. The bug +caused invalid memory to be read, possibly leading to a crash, as the +last (and missing) element from g_new0 was supposed to be a terminator. +--- + src/hid/gtk/gui-netlist-window.c | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/src/hid/gtk/gui-netlist-window.c b/src/hid/gtk/gui-netlist-window.c +index 8dc2299..848fb7e 100644 +--- a/src/hid/gtk/gui-netlist-window.c ++++ b/src/hid/gtk/gui-netlist-window.c +@@ -385,7 +385,7 @@ net_model_create (void) + parent_iter = new_iter; + parent_ptr = &parent_iter; + +- join_array = g_new0 (char *, try_depth + 1); ++ join_array = g_new0 (char *, try_depth + 2); + memcpy (join_array, path_segments, sizeof (char *) * (try_depth + 1)); + + hash_string = g_strjoinv (NET_HIERARCHY_SEPARATOR, join_array); +-- +1.5.6.5 + Added: csw/mgar/pkg/pcb/trunk/files/0001-Regenerate-rats-r-tree-when-re-allocating-a-bigger-r.patch =================================================================== --- csw/mgar/pkg/pcb/trunk/files/0001-Regenerate-rats-r-tree-when-re-allocating-a-bigger-r.patch (rev 0) +++ csw/mgar/pkg/pcb/trunk/files/0001-Regenerate-rats-r-tree-when-re-allocating-a-bigger-r.patch 2010-01-16 22:08:21 UTC (rev 8035) @@ -0,0 +1,37 @@ +From 40347a55413e152c7b5fc2bac074c75c7687b766 Mon Sep 17 00:00:00 2001 +From: Peter Clifton +Date: Wed, 24 Dec 2008 13:14:27 +0000 +Subject: [PATCH] Regenerate rats r-tree when re-allocating a bigger rats array. + +Shuould fix crashes observed on a board with a large number of rats. +--- + src/mymem.c | 9 +++++++++ + 1 files changed, 9 insertions(+), 0 deletions(-) + +diff --git a/src/mymem.c b/src/mymem.c +index 57eca2d..36b13d5 100644 +--- a/src/mymem.c ++++ b/src/mymem.c +@@ -305,10 +305,19 @@ GetRatMemory (DataTypePtr Data) + if (Data->RatN >= Data->RatMax) + { + Data->RatMax += STEP_RAT; ++ /* all of the pointers move, so rebuild the whole tree */ ++ if (Data->rat_tree) ++ r_destroy_tree (&Data->rat_tree); + rat = MyRealloc (rat, Data->RatMax * sizeof (RatType), + "GetRatMemory()"); + Data->Rat = rat; + memset (rat + Data->RatN, 0, STEP_RAT * sizeof (RatType)); ++ Data->rat_tree = r_create_tree (NULL, 0, 0); ++ RAT_LOOP (Data); ++ { ++ r_insert_entry (Data->rat_tree, (BoxTypePtr) line, 0); ++ } ++ END_LOOP; + } + return (rat + Data->RatN++); + } +-- +1.5.6.5 + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From trygvis at users.sourceforge.net Sat Jan 16 23:15:24 2010 From: trygvis at users.sourceforge.net (trygvis at users.sourceforge.net) Date: Sat, 16 Jan 2010 22:15:24 +0000 Subject: [csw-devel] SF.net SVN: gar:[8036] csw/mgar/pkg/pcb/trunk/Makefile Message-ID: Revision: 8036 http://gar.svn.sourceforge.net/gar/?rev=8036&view=rev Author: trygvis Date: 2010-01-16 22:15:24 +0000 (Sat, 16 Jan 2010) Log Message: ----------- o Removing extra directory. Modified Paths: -------------- csw/mgar/pkg/pcb/trunk/Makefile Modified: csw/mgar/pkg/pcb/trunk/Makefile =================================================================== --- csw/mgar/pkg/pcb/trunk/Makefile 2010-01-16 22:08:21 UTC (rev 8035) +++ csw/mgar/pkg/pcb/trunk/Makefile 2010-01-16 22:15:24 UTC (rev 8036) @@ -77,3 +77,6 @@ do \ mv "$$f" `echo $$f | tr " " _`; \ done + +post-install-modulated: + @rmdir $(DESTDIR)/opt/csw/share/pcb-20081128 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From skayser at users.sourceforge.net Sun Jan 17 02:59:18 2010 From: skayser at users.sourceforge.net (skayser at users.sourceforge.net) Date: Sun, 17 Jan 2010 01:59:18 +0000 Subject: [csw-devel] SF.net SVN: gar:[8037] csw/mgar/pkg/subversion/trunk Message-ID: Revision: 8037 http://gar.svn.sourceforge.net/gar/?rev=8037&view=rev Author: skayser Date: 2010-01-17 01:59:18 +0000 (Sun, 17 Jan 2010) Log Message: ----------- subversion: tidied up and commented Makefile, removed obsolete deps, also fixes #4096 Modified Paths: -------------- csw/mgar/pkg/subversion/trunk/Makefile Added Paths: ----------- csw/mgar/pkg/subversion/trunk/files/changelog.CSW Modified: csw/mgar/pkg/subversion/trunk/Makefile =================================================================== --- csw/mgar/pkg/subversion/trunk/Makefile 2010-01-16 22:15:24 UTC (rev 8036) +++ csw/mgar/pkg/subversion/trunk/Makefile 2010-01-17 01:59:18 UTC (rev 8037) @@ -1,6 +1,14 @@ +# TODO (release-critical prefixed with !, non release-critical with *) +# +# * How about shipping a changelog.CSW (example in files/)? +# * The language binding packages all have a whole stack of dependencies +# (mostly the same libs that the main svn package has). Are those really +# required? The shared objects generated by SWIG have them in their NEEDED +# list, but they also link against the main libsvn_client-1.so which in +# turn pulls in the rest. Can this be tweaked? +# GARNAME = subversion -DISTVERSION = 1.6.6 -GARVERSION = $(subst -,,$(DISTVERSION)) +GARVERSION = 1.6.6 CATEGORIES = utils DESCRIPTION = Version control rethought @@ -9,66 +17,94 @@ that is a compelling replacement for CVS in the open source community. endef -# Vendor site -SPKG_SOURCEURL = http://subversion.tigris.org/ - -# Release site +VENDOR_URL = http://subversion.tigris.org/ MASTER_SITES = http://subversion.tigris.org/downloads/ - -DISTFILES = $(GARNAME)-$(DISTVERSION).tar.bz2 - -# We define upstream file regex so we can be notifed of -# new upstream software release +DISTFILES = $(GARNAME)-$(GARVERSION).tar.bz2 UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.bz2 -EXTRA_LIB = $(SVNLIB) $(prefix)/apache2/lib -EXTRA_INC = $(prefix)/apache2/include - -WORKSRC = $(WORKDIR)/$(GARNAME)-$(DISTVERSION) - PACKAGES = CSWsvn CSWsvn-devel CSWap2svn CSWpmsvn PACKAGES += CSWpythonsvn CSWrbsvn CSWjavasvn -ARCHALL_CSWsvn-devel = 1 SPKG_DESC_CSWsvn = Version control rethought CATALOGNAME_CSWsvn = subversion -REQUIRED_PKGS_CSWsvn = CSWapache2rt CSWbdb47 CSWexpat CSWggettextrt -REQUIRED_PKGS_CSWsvn += CSWiconv CSWkrb5lib CSWlibnet CSWneon CSWoldaprt -REQUIRED_PKGS_CSWsvn += CSWosslrt CSWsasl CSWzlib CSWsqlite3rt +REQUIRED_PKGS_CSWsvn = CSWapache2rt +REQUIRED_PKGS_CSWsvn += CSWbdb47 +REQUIRED_PKGS_CSWsvn += CSWexpat +REQUIRED_PKGS_CSWsvn += CSWggettextrt +REQUIRED_PKGS_CSWsvn += CSWiconv +REQUIRED_PKGS_CSWsvn += CSWneon +REQUIRED_PKGS_CSWsvn += CSWoldaprt +REQUIRED_PKGS_CSWsvn += CSWsasl +REQUIRED_PKGS_CSWsvn += CSWsqlite3rt +REQUIRED_PKGS_CSWsvn += CSWzlib +# There are additional requirements for $(docdir)/subversion/tools/ which +# also contains the stack of hook-scripts. Should we add those? +#REQUIRED_PKGS_CSWsvn += CSWperl +#REQUIRED_PKGS_CSWsvn += CSWpython +#REQUIRED_PKGS_CSWsvn += CSWruby + SPKG_DESC_CSWsvn-devel = Subversion Development Support CATALOGNAME_CSWsvn-devel = subversion_devel REQUIRED_PKGS_CSWsvn-devel = CSWsvn +ARCHALL_CSWsvn-devel = 1 +PKGFILES_CSWsvn-devel = $(PKGFILES_DEVEL) + SPKG_DESC_CSWap2svn = Subversion Modules for Apache 2.2 CATALOGNAME_CSWap2svn = ap2_subversion -REQUIRED_PKGS_CSWap2svn = CSWsvn CSWggettextrt CSWiconv +REQUIRED_PKGS_CSWap2svn = CSWsvn +REQUIRED_PKGS_CSWap2svn += CSWggettextrt +REQUIRED_PKGS_CSWap2svn += CSWiconv +PKGFILES_CSWap2svn = $(prefix)/apache2.* + SPKG_DESC_CSWjavasvn = Subversion Java Language Binding CATALOGNAME_CSWjavasvn = javasvn -REQUIRED_PKGS_CSWjavasvn = CSWsvn CSWapache2rt CSWneon CSWoldaprt -REQUIRED_PKGS_CSWjavasvn += CSWbdb47 CSWexpat CSWggettextrt CSWiconv +REQUIRED_PKGS_CSWjavasvn = CSWsvn +REQUIRED_PKGS_CSWjavasvn += CSWapache2rt +REQUIRED_PKGS_CSWjavasvn += CSWexpat +REQUIRED_PKGS_CSWjavasvn += CSWggettextrt +REQUIRED_PKGS_CSWjavasvn += CSWiconv +REQUIRED_PKGS_CSWjavasvn += CSWneon +REQUIRED_PKGS_CSWjavasvn += CSWoldaprt +PKGFILES_CSWjavasvn = $(SVNLIB)/.*java.* + SPKG_DESC_CSWpmsvn = Subversion Perl Language Binding CATALOGNAME_CSWpmsvn = pm_subversion -REQUIRED_PKGS_CSWpmsvn = CSWsvn CSWperl CSWapache2rt CSWbdb47 CSWexpat -REQUIRED_PKGS_CSWpmsvn += CSWggettextrt CSWiconv CSWoldaprt -SPKG_DESC_CSWpythonsvn = Subversion Python Language Binding -CATALOGNAME_CSWpythonsvn = pythonsvn -REQUIRED_PKGS_CSWpythonsvn = CSWsvn CSWpython CSWapache2rt CSWbdb47 CSWexpat -REQUIRED_PKGS_CSWpythonsvn += CSWggettextrt CSWiconv CSWoldaprt +REQUIRED_PKGS_CSWpmsvn = CSWsvn +REQUIRED_PKGS_CSWpmsvn += CSWperl +REQUIRED_PKGS_CSWpmsvn += CSWapache2rt +REQUIRED_PKGS_CSWpmsvn += CSWexpat +REQUIRED_PKGS_CSWpmsvn += CSWggettextrt +REQUIRED_PKGS_CSWpmsvn += CSWiconv +REQUIRED_PKGS_CSWpmsvn += CSWoldaprt +PKGFILES_CSWpmsvn = $(libdir)/perl.* +PKGFILES_CSWpmsvn += $(SVNLIB)/.*perl.* +PKGFILES_CSWpmsvn += $(mandir)/.*swig_perl.* + SPKG_DESC_CSWrbsvn = Subversion Ruby Language Binding CATALOGNAME_CSWrbsvn = rbsvn -REQUIRED_PKGS_CSWrbsvn = CSWsvn CSWruby CSWiconv CSWoldaprt -REQUIRED_PKGS_CSWrbsvn += CSWapache2rt CSWbdb47 CSWexpat CSWggettextrt +REQUIRED_PKGS_CSWrbsvn = CSWsvn +REQUIRED_PKGS_CSWrbsvn += CSWruby +REQUIRED_PKGS_CSWrbsvn += CSWapache2rt +REQUIRED_PKGS_CSWrbsvn += CSWexpat +REQUIRED_PKGS_CSWrbsvn += CSWggettextrt +REQUIRED_PKGS_CSWrbsvn += CSWiconv +REQUIRED_PKGS_CSWrbsvn += CSWoldaprt +PKGFILES_CSWrbsvn = $(libdir)/ruby.* +PKGFILES_CSWrbsvn += $(SVNLIB)/.*swig_ruby.* -PKGFILES_CSWsvn-devel = $(PKGFILES_DEVEL) -PKGFILES_CSWap2svn = $(prefix)/apache2.* -PKGFILES_CSWjavasvn = $(SVNLIB)/.*java.* -PKGFILES_CSWpmsvn = $(libdir)/perl.* -PKGFILES_CSWpmsvn += $(SVNLIB)/.*perl.* -PKGFILES_CSWpmsvn += $(mandir)/.*swig_perl.* -PKGFILES_CSWpythonsvn = $(libdir)/python.* -PKGFILES_CSWpythonsvn += $(SVNLIB)/.*swig_py.* -PKGFILES_CSWrbsvn = $(libdir)/ruby.* -PKGFILES_CSWrbsvn += $(SVNLIB)/.*swig_ruby.* +SPKG_DESC_CSWpythonsvn = Subversion Python Language Binding +CATALOGNAME_CSWpythonsvn = pythonsvn +REQUIRED_PKGS_CSWpythonsvn = CSWsvn +REQUIRED_PKGS_CSWpythonsvn += CSWpython +REQUIRED_PKGS_CSWpythonsvn += CSWapache2rt +REQUIRED_PKGS_CSWpythonsvn += CSWexpat +REQUIRED_PKGS_CSWpythonsvn += CSWggettextrt +REQUIRED_PKGS_CSWpythonsvn += CSWiconv +REQUIRED_PKGS_CSWpythonsvn += CSWoldaprt +PKGFILES_CSWpythonsvn = $(libdir)/python.* +PKGFILES_CSWpythonsvn += $(SVNLIB)/.*swig_py.* + DISTFILES += CSWsvn.checkinstall DISTFILES += CSWap2svn.postinstall CSWap2svn.preremove DISTFILES += httpd-svn.conf.CSW svn_access.conf.CSW @@ -80,10 +116,9 @@ PATCHFILES += subversion161.diff PATCHFILES += 0001-make-subversion-sysconfigdir-as-it-should-be-for-csw.patch -DEPENDS = server/apache2 -DEPENDS = lib/neon +EXTRA_LIB = $(SVNLIB) $(prefix)/apache2/lib +EXTRA_INC = $(prefix)/apache2/include -NODIRPATHS = --libdir --libexecdir JDK = /usr/jdk1.5.0_15 EXTRA_INC += $(JDK)/include SVNLIB = $(prefix)/lib/svn @@ -94,11 +129,18 @@ LDFLAGS += -R/opt/csw/bdb47/lib -L/opt/csw/bdb47/lib export LDFLAGS -EXTRA_MERGE_EXCLUDE_FILES = .*\.pyo .*\.pyc +EXTRA_MERGE_EXCLUDE_FILES += .*\.pyo .*\.pyc PROTOTYPE_MODIFIERS += cswpycompile PROTOTYPE_FILES_cswpycompile = $(libdir)/python/.*\.py PROTOTYPE_CLASS_cswpycompile = cswpycompile +# All of the perl modules go to $(libdir)/perl/site_perl. We are not interested +# in the version specific perl directory which only contains a perllocal.pod. +# Can this be re-done as a version agnostic regex? Couldn't get this to work :/ +# EXTRA_MERGE_EXCLUDE_FILES += $(libdir)/perl/(?!site_perl\/) +EXTRA_MERGE_EXCLUDE_FILES += $(libdir)/perl/5.8.8.* + +NODIRPATHS = --libdir --libexecdir CONFIGURE_ARGS = $(DIRPATHS) --libdir=$(SVNLIB) --libexecdir=$(SVNLIB) CONFIGURE_ARGS += --disable-mod-activation CONFIGURE_ARGS += --disable-static @@ -113,53 +155,55 @@ CONFIGURE_ARGS += --with-zlib=$(prefix) CONFIGURE_ARGS += --with-serf=$(prefix) -TEST_TARGET = check # Tests take *forever* -TEST_SCRIPTS = skip +#TEST_TARGET = check +TEST_TARGET = -test-skip: - @$(MAKECOOKIE) - include gar/category.mk BINDING_LANGS = java perl python ruby -BINDING_TARGETS = $(foreach LANG,$(BINDING_LANGS),svn-$(LANG)) +BINDING_TARGETS = $(addprefix svn-,$(BINDING_LANGS)) -PI_DEPENDS = install-extras -PI_DEPENDS += fix-ra_dav +PI_DEPENDS += copy-apache-templates +PI_DEPENDS += create-ra_dav-symlinks +PI_DEPENDS += install-extras PI_DEPENDS += $(BINDING_TARGETS) -PI_DEPENDS += copy-templates -PI_DEPENDS += fix-install post-install-modulated: $(PI_DEPENDS) $(MAKECOOKIE) +# The whole subversion build is done with Sun's cc. Ruby language bindings +# need to be built with gcc. Hack (!) together Makefile.gcc/libtool.gcc which +# are then used in the "svn-ruby" target. +# See http://lists.opencsw.org/pipermail/maintainers/2009-May/002325.html post-configure-modulated: @echo "~~~ Fixing Libtool ~~~" - @$(DOWNLOADDIR)/fixme.sh $(WORKSRC) - @echo "~~~ Creating GCC Makefile and libtool for javahl and ruby ~~~" - @gcp $(WORKSRC)/Makefile $(WORKSRC)/Makefile.gcc - @gcp $(WORKSRC)/libtool $(WORKSRC)/libtool.gcc - @perl -i -pe 's/-mt\|*//' $(WORKSRC)/*.gcc - @perl -i -pe 's|-xO3|-pipe -O2|' $(WORKSRC)/*.gcc - @perl -i -pe 's|/opt/studio/SOS11/SUNWspro/bin/cc|/opt/csw/gcc4/bin/gcc|' \ - $(WORKSRC)/*.gcc - @perl -i -pe 's|/opt/studio/SOS11/SUNWspro/bin/CC|/opt/csw/gcc4/bin/g++|' \ - $(WORKSRC)/*.gcc - @perl -i -pe 's|libtool|libtool.gcc|' $(WORKSRC)/Makefile.gcc - @perl -i -pe 's|KPIC|fPIC|' $(WORKSRC)/libtool.gcc - @perl -i -pe 's|postdeps=.*|postdeps=""|' $(WORKSRC)/libtool.gcc - @( if [ "`uname -p`" = "sparc" ]; then \ - perl -i -pe 's|-xarch=v8|-mcpu=v8|' $(WORKSRC)/*.gcc; \ + $(DOWNLOADDIR)/fixme.sh $(WORKSRC) + @echo "~~~ Creating GCC Makefile and libtool for ruby ~~~" + + gcp $(WORKSRC)/Makefile $(WORKSRC)/Makefile.gcc + gcp $(WORKSRC)/libtool $(WORKSRC)/libtool.gcc + + @# -mt\|* effectively strips any occasion of -mt or -mt| out of + @# libtool.gcc, but what for? -mt is recognized by both Sun's cc + @# and gcc and is responsible for adding multi-threading support. + gsed -i \ + -e 's,-mt|*,,' \ + -e 's,-xO3,-pipe -O2,' \ + -e 's,KPIC,fPIC,' \ + -e 's,/opt/studio/SOS11/SUNWspro/bin/cc,/opt/csw/gcc4/bin/gcc,' \ + -e 's,/opt/studio/SOS11/SUNWspro/bin/CC,/opt/csw/gcc4/bin/g++,' \ + $(WORKSRC)/*.gcc + gsed -i -e 's,libtool,libtool.gcc,' $(WORKSRC)/Makefile.gcc + gsed -i -e 's,postdeps=.*,postdeps="",' $(WORKSRC)/libtool.gcc + ( if [ "$(GARCH)" = "sparc" ]; then \ + perl -i -pe 's,-xarch=v8,-mcpu=v8,' $(WORKSRC)/*.gcc; \ else \ - perl -i -pe 's|-xarch=386|-march=i386|' $(WORKSRC)/*.gcc; \ + perl -i -pe 's,-xarch=386,-march=i386,' $(WORKSRC)/*.gcc; \ fi ) - $(MAKECOOKIE) + @$(MAKECOOKIE) -fix-install: - @(grm -fr $(DESTDIR)$(prefix)/lib/perl/5.8.8) - -copy-templates: +copy-apache-templates: ginstall -d $(DESTDIR)$(prefix)/apache2/etc/extra ginstall -m 0644 \ $(WORKDIR)/httpd-svn.conf.CSW \ @@ -167,53 +211,53 @@ ginstall -m 0644 \ $(WORKDIR)/svn_access.conf.CSW \ $(DESTDIR)$(prefix)/apache2/etc - $(MAKECOOKIE) + @$(MAKECOOKIE) -fix-ra_dav: - @# libsvn_ra_dav-1* has been renamed to libsvn_ra_neon-1* - @# in the new versions of subversion, - @# we need to link for backward compatability - @(gln -s libsvn_ra_neon-1.so.0.0.0 $(DESTDIR)$(SVNLIB)/libsvn_ra_dav-1.so.0) - @(gln -s libsvn_ra_neon-1.so.0.0.0 $(DESTDIR)$(SVNLIB)/libsvn_ra_dav-1.so) +# libsvn_ra_dav-1* has been renamed to libsvn_ra_neon-1* in the new versions +# of subversion (starting with?), we need to link for backward compatability +create-ra_dav-symlinks: + ( cd $(DESTDIR)$(SVNLIB); \ + ln -s libsvn_ra_neon-1.so.0.0.0 libsvn_ra_dav-1.so.0; \ + ln -s libsvn_ra_neon-1.so.0.0.0 libsvn_ra_dav-1.so; ) @$(MAKECOOKIE) install-extras: - @(ginstall -d $(DESTDIR)$(docdir)/subversion/tools) - @(ginstall -d $(DESTDIR)$(docdir)/subversion/contrib) - @(gcp -R $(WORKSRC)/tools/* $(DESTDIR)$(docdir)/subversion/tools/) - @(gcp -R $(WORKSRC)/contrib/* $(DESTDIR)$(docdir)/subversion/contrib/) - @$(BUILD_ENV) $(INSTALL_ENV) gmake -C $(WORKSRC) install-tools - @$(BUILD_ENV) $(INSTALL_ENV) gmake -C $(WORKSRC) install-contrib + ginstall -d $(DESTDIR)$(docdir)/subversion/tools + ginstall -d $(DESTDIR)$(docdir)/subversion/contrib + gcp -R $(WORKSRC)/tools/* $(DESTDIR)$(docdir)/subversion/tools/ + gcp -R $(WORKSRC)/contrib/* $(DESTDIR)$(docdir)/subversion/contrib/ + $(BUILD_ENV) $(INSTALL_ENV) gmake -C $(WORKSRC) install-tools + $(BUILD_ENV) $(INSTALL_ENV) gmake -C $(WORKSRC) install-contrib @$(MAKECOOKIE) svn-python: @echo " ==> Building Python bindings" - @touch \ + touch \ $(WORKSRC)/subversion/bindings/swig/python/*.c \ $(WORKSRC)/subversion/bindings/swig/python/*.py - @$(BUILD_ENV) gmake -C $(WORKSRC) swig-py - @$(INSTALL_ENV) gmake -C $(WORKSRC) install-swig-py - $(MAKECOOKIE) + $(BUILD_ENV) gmake -C $(WORKSRC) swig-py + $(INSTALL_ENV) gmake -C $(WORKSRC) install-swig-py + @$(MAKECOOKIE) svn-perl: @echo " ==> Building Perl bindings" - @touch \ + touch \ $(WORKSRC)/subversion/bindings/swig/perl/native/*.c \ $(WORKSRC)/subversion/bindings/swig/perl/native/*.pm - @$(BUILD_ENV) gmake -C $(WORKSRC) swig-pl - @$(INSTALL_ENV) gmake DESTDIR=$(DESTDIR) -C $(WORKSRC) install-swig-pl - $(MAKECOOKIE) + $(BUILD_ENV) gmake -C $(WORKSRC) swig-pl + $(INSTALL_ENV) gmake DESTDIR=$(DESTDIR) -C $(WORKSRC) install-swig-pl + @$(MAKECOOKIE) svn-ruby: @echo " ==> Building Ruby bindings" - @touch $(WORKSRC)/subversion/bindings/swig/ruby/*.c + touch $(WORKSRC)/subversion/bindings/swig/ruby/*.c $(BUILD_ENV) gmake -f Makefile.gcc -C $(WORKSRC) swig-rb - @$(INSTALL_ENV) gmake -f Makefile.gcc -C $(WORKSRC) install-swig-rb - $(MAKECOOKIE) + $(INSTALL_ENV) gmake -f Makefile.gcc -C $(WORKSRC) install-swig-rb + @$(MAKECOOKIE) svn-java: @echo " ==> Building Java bindings" - @touch $(WORKSRC)/subversion/bindings/javahl/native/*.c + touch $(WORKSRC)/subversion/bindings/javahl/native/*.c $(BUILD_ENV) gmake -C $(WORKSRC) javahl; $(INSTALL_ENV) gmake -C $(WORKSRC) install-javahl; - $(MAKECOOKIE) + @$(MAKECOOKIE) Added: csw/mgar/pkg/subversion/trunk/files/changelog.CSW =================================================================== --- csw/mgar/pkg/subversion/trunk/files/changelog.CSW (rev 0) +++ csw/mgar/pkg/subversion/trunk/files/changelog.CSW 2010-01-17 01:59:18 UTC (rev 8037) @@ -0,0 +1,9 @@ +subversion (1.6.6,REV=2010.01.17) + + * Restricted cswpycompile usage to python modules. (Closes #4156) + * Corrected libsvn_ra_dav-1.so.0 symlinks. (Closes #4096) + * Dropped openssl_rt dependency (neon with SSL support is built separately). + * Dropped kerberos dependency (neon comes with Kerberos support). + * Dropped libnet dependency (not required). + + -- Sebastian Kayser Sun, 17 Jan 2010 02:39:59 +0100 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From trygvis at users.sourceforge.net Sun Jan 17 11:40:28 2010 From: trygvis at users.sourceforge.net (trygvis at users.sourceforge.net) Date: Sun, 17 Jan 2010 10:40:28 +0000 Subject: [csw-devel] SF.net SVN: gar:[8038] csw/mgar/pkg/pcb/trunk/Makefile Message-ID: Revision: 8038 http://gar.svn.sourceforge.net/gar/?rev=8038&view=rev Author: trygvis Date: 2010-01-17 10:40:28 +0000 (Sun, 17 Jan 2010) Log Message: ----------- wip Modified Paths: -------------- csw/mgar/pkg/pcb/trunk/Makefile Modified: csw/mgar/pkg/pcb/trunk/Makefile =================================================================== --- csw/mgar/pkg/pcb/trunk/Makefile 2010-01-17 01:59:18 UTC (rev 8037) +++ csw/mgar/pkg/pcb/trunk/Makefile 2010-01-17 10:40:28 UTC (rev 8038) @@ -70,13 +70,16 @@ include gar/category.mk -post-extract-modulated: - @echo " ==> Renaming files (' ' => '_')" - @find $(WORKSRC)/lib/pcblib-newlib -name \*\ \* | \ - while read f; \ - do \ - mv "$$f" `echo $$f | tr " " _`; \ - done +post-install-modulated: + @echo " ==> Packaging up lib/" + @echo " DESTDIR=" $(DESTDIR) + false + mkdir -p $(DESTDIR)/var/opt/csw/pcb/ + gtar cf - -C $(DESTDIR)/lib . | gzip -c - > $(DESTDIR)/var/opt/csw/pcb/lib.tar.gz + rm -rf $(DESTDIR)/opt/csw/share/pcb/lib + false + @$(MAKECOOKIE) post-install-modulated: @rmdir $(DESTDIR)/opt/csw/share/pcb-20081128 + @$(MAKECOOKIE) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From skayser at users.sourceforge.net Sun Jan 17 11:48:50 2010 From: skayser at users.sourceforge.net (skayser at users.sourceforge.net) Date: Sun, 17 Jan 2010 10:48:50 +0000 Subject: [csw-devel] SF.net SVN: gar:[8039] csw/mgar/gar/v2/gar.pkg.mk Message-ID: Revision: 8039 http://gar.svn.sourceforge.net/gar/?rev=8039&view=rev Author: skayser Date: 2010-01-17 10:48:50 +0000 (Sun, 17 Jan 2010) Log Message: ----------- gar/v2: added some bits of information on pathfilter Modified Paths: -------------- csw/mgar/gar/v2/gar.pkg.mk Modified: csw/mgar/gar/v2/gar.pkg.mk =================================================================== --- csw/mgar/gar/v2/gar.pkg.mk 2010-01-17 10:40:28 UTC (rev 8038) +++ csw/mgar/gar/v2/gar.pkg.mk 2010-01-17 10:48:50 UTC (rev 8039) @@ -366,7 +366,8 @@ $(PROTOTYPE): $(WORKDIR) merge $(_DBG)cswproto -c $(GARDIR)/etc/commondirs-$(GARCH) -r $(PKGROOT) $(PKGROOT)=/ >$@ -# The pathfilter rules are as follows: +# pathfilter lives in bin/pathfilter and takes care of including/excluding paths from +# a prototype (see "perldoc bin/pathfilter"). We employ it here to: # - include license for current package # - exclude licenses for all other packages # - if other includes are given, only include these files This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From hson at users.sourceforge.net Sun Jan 17 13:00:34 2010 From: hson at users.sourceforge.net (hson at users.sourceforge.net) Date: Sun, 17 Jan 2010 12:00:34 +0000 Subject: [csw-devel] SF.net SVN: gar:[8040] csw/mgar/pkg/djvulibre/trunk/Makefile Message-ID: Revision: 8040 http://gar.svn.sourceforge.net/gar/?rev=8040&view=rev Author: hson Date: 2010-01-17 12:00:34 +0000 (Sun, 17 Jan 2010) Log Message: ----------- djvulibre: Dependency update Modified Paths: -------------- csw/mgar/pkg/djvulibre/trunk/Makefile Modified: csw/mgar/pkg/djvulibre/trunk/Makefile =================================================================== --- csw/mgar/pkg/djvulibre/trunk/Makefile 2010-01-17 10:48:50 UTC (rev 8039) +++ csw/mgar/pkg/djvulibre/trunk/Makefile 2010-01-17 12:00:34 UTC (rev 8040) @@ -21,7 +21,7 @@ REQUIRED_PKGS_CSWdjvulibre += CSWdjvulibrert CSWjpeg CSWtiff CSWzlib REQUIRED_PKGS_CSWdjvulibrert += CSWjpeg -REQUIRED_PKGS_CSWdjvulibredevel += CSWdjvulibre +REQUIRED_PKGS_CSWdjvulibredevel += CSWdjvulibrert PKGFILES_CSWdjvulibrert = $(PKGFILES_RT) PKGFILES_CSWdjvulibredevel = $(PKGFILES_DEVEL) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Sun Jan 17 14:31:38 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sun, 17 Jan 2010 13:31:38 +0000 Subject: [csw-devel] SF.net SVN: gar:[8041] csw/mgar/gar/v2/bin Message-ID: Revision: 8041 http://gar.svn.sourceforge.net/gar/?rev=8041&view=rev Author: wahwah Date: 2010-01-17 13:31:38 +0000 (Sun, 17 Jan 2010) Log Message: ----------- mGAR v2: checkpkg - displaying the information about building the cache Modified Paths: -------------- csw/mgar/gar/v2/bin/checkpkg Added Paths: ----------- csw/mgar/gar/v2/bin/checkpkg.d/update_contents_cache.py Modified: csw/mgar/gar/v2/bin/checkpkg =================================================================== --- csw/mgar/gar/v2/bin/checkpkg 2010-01-17 12:00:34 UTC (rev 8040) +++ csw/mgar/gar/v2/bin/checkpkg 2010-01-17 13:31:38 UTC (rev 8041) @@ -552,15 +552,17 @@ # All packages have been extracted. -# Now running all the plugin checks - set_variables_for_individual_package_check "$f" -echo "Running the experimental plugin infrastructure." +echo "Running modular tests" test_suite_ok=1 checkpkg_scriptname=`basename $0` checkpkg_basedir=${0%/${checkpkg_scriptname}} plugindir=${checkpkg_basedir}/checkpkg.d + +# /var/sadm/install/contents cache update +${plugindir}/update_contents_cache.py + if [[ "${DEBUG}" != "" ]]; then extra_options="--debug" fi @@ -603,7 +605,7 @@ echo if [[ ${test_suite_ok} -ne 1 ]]; then - errmsg "One or more tests have failed." + errmsg "One or more modular tests have failed." else print "All tests were successful." fi Added: csw/mgar/gar/v2/bin/checkpkg.d/update_contents_cache.py =================================================================== --- csw/mgar/gar/v2/bin/checkpkg.d/update_contents_cache.py (rev 0) +++ csw/mgar/gar/v2/bin/checkpkg.d/update_contents_cache.py 2010-01-17 13:31:38 UTC (rev 8041) @@ -0,0 +1,10 @@ +#!/opt/csw/bin/python2.6 + +import checkpkg + +def main(): + test_pkgmap = checkpkg.SystemPkgmap() + + +if __name__ == '__main__': + main() Property changes on: csw/mgar/gar/v2/bin/checkpkg.d/update_contents_cache.py ___________________________________________________________________ Added: svn:executable + * This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From trygvis at users.sourceforge.net Sun Jan 17 15:25:35 2010 From: trygvis at users.sourceforge.net (trygvis at users.sourceforge.net) Date: Sun, 17 Jan 2010 14:25:35 +0000 Subject: [csw-devel] SF.net SVN: gar:[8042] csw/mgar/pkg/pcb/trunk Message-ID: Revision: 8042 http://gar.svn.sourceforge.net/gar/?rev=8042&view=rev Author: trygvis Date: 2010-01-17 14:25:35 +0000 (Sun, 17 Jan 2010) Log Message: ----------- pcb: Adding pre and post scripts to properly handle the footprint library. Modified Paths: -------------- csw/mgar/pkg/pcb/trunk/Makefile csw/mgar/pkg/pcb/trunk/checksums Added Paths: ----------- csw/mgar/pkg/pcb/trunk/files/CSWpcb.postinstall csw/mgar/pkg/pcb/trunk/files/CSWpcb.preremove Modified: csw/mgar/pkg/pcb/trunk/Makefile =================================================================== --- csw/mgar/pkg/pcb/trunk/Makefile 2010-01-17 13:31:38 UTC (rev 8041) +++ csw/mgar/pkg/pcb/trunk/Makefile 2010-01-17 14:25:35 UTC (rev 8042) @@ -15,6 +15,8 @@ SF_PROJ = $(GARNAME) MASTER_SITES = $(SF_MIRRORS) DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz +DISTFILES += CSW$(GARNAME).postinstall +DISTFILES += CSW$(GARNAME).preremove SPKG_SOURCEURL = http://pcb.gpleda.org @@ -70,16 +72,15 @@ include gar/category.mk +PACKAGED_DIRECTORIES = newlib pcblib pcblib-newlib + post-install-modulated: @echo " ==> Packaging up lib/" @echo " DESTDIR=" $(DESTDIR) - false - mkdir -p $(DESTDIR)/var/opt/csw/pcb/ - gtar cf - -C $(DESTDIR)/lib . | gzip -c - > $(DESTDIR)/var/opt/csw/pcb/lib.tar.gz - rm -rf $(DESTDIR)/opt/csw/share/pcb/lib - false - @$(MAKECOOKIE) - -post-install-modulated: + @echo " PKGROOT=" $(PKGROOT) + gtar zcf $(DESTDIR)/opt/csw/share/pcb/lib.tar.gz \ + -C $(DESTDIR)/opt/csw/share/pcb \ + $(PACKAGED_DIRECTORIES) + (cd $(DESTDIR)/opt/csw/share/pcb; rm -rf $(PACKAGED_DIRECTORIES)) @rmdir $(DESTDIR)/opt/csw/share/pcb-20081128 @$(MAKECOOKIE) Modified: csw/mgar/pkg/pcb/trunk/checksums =================================================================== --- csw/mgar/pkg/pcb/trunk/checksums 2010-01-17 13:31:38 UTC (rev 8041) +++ csw/mgar/pkg/pcb/trunk/checksums 2010-01-17 14:25:35 UTC (rev 8042) @@ -1,3 +1,5 @@ 509826c8a9184b46055258861228b555 0001-Fix-off-by-one-error-in-the-GTK-HID-s-netlist-window.patch 00fd904d4439493a998100f40891fffd 0001-Regenerate-rats-r-tree-when-re-allocating-a-bigger-r.patch +19b4f08dc4fedfaf1388727463a4d344 CSWpcb.postinstall +e4bcdb905fc698d3fdbf7449b495c774 CSWpcb.preremove e192ee993b04749f82dd3e8b529d40c0 pcb-20081128.tar.gz Added: csw/mgar/pkg/pcb/trunk/files/CSWpcb.postinstall =================================================================== --- csw/mgar/pkg/pcb/trunk/files/CSWpcb.postinstall (rev 0) +++ csw/mgar/pkg/pcb/trunk/files/CSWpcb.postinstall 2010-01-17 14:25:35 UTC (rev 8042) @@ -0,0 +1,14 @@ +#!/bin/sh + +set -e + +PATH=/sbin:/usr/sbin:/opt/csw/sbin:/bin:/usr/bin:/opt/csw/bin + +if [ "$PKG_INSTALL_ROOT" = "" ] +then + PKG_INSTALL_ROOT="/" +fi + +echo "Installing footprint library..." +cd $PKG_INSTALL_ROOT/opt/csw/share/pcb +gzcat $PKG_INSTALL_ROOT/opt/csw/share/pcb/lib.tar.gz | tar xf - Added: csw/mgar/pkg/pcb/trunk/files/CSWpcb.preremove =================================================================== --- csw/mgar/pkg/pcb/trunk/files/CSWpcb.preremove (rev 0) +++ csw/mgar/pkg/pcb/trunk/files/CSWpcb.preremove 2010-01-17 14:25:35 UTC (rev 8042) @@ -0,0 +1,23 @@ +#!/bin/sh +set -e + +PATH=/sbin:/usr/sbin:/opt/csw/sbin:/bin:/usr/bin:/opt/csw/bin + +if [ "$PKG_INSTALL_ROOT" = "" ] +then + PKG_INSTALL_ROOT="/" +fi + +echo "Removing footprint library..." + +cd $PKG_INSTALL_ROOT/opt/csw/share/pcb +gzcat $PKG_INSTALL_ROOT/opt/csw/share/pcb/lib.tar.gz | tar tf - | grep -v /$ | while read f +do + rm "$PKG_INSTALL_ROOT/opt/csw/share/pcb/$f" +done + +# Remove all directories in the tar file +gzcat $PKG_INSTALL_ROOT/opt/csw/share/pcb/lib.tar.gz | tar tf - | grep /$ | sort -r | while read d +do + rmdir "$d" +done This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From trygvis at users.sourceforge.net Sun Jan 17 15:32:10 2010 From: trygvis at users.sourceforge.net (trygvis at users.sourceforge.net) Date: Sun, 17 Jan 2010 14:32:10 +0000 Subject: [csw-devel] SF.net SVN: gar:[8043] csw/mgar/pkg/pcb/trunk/checksums Message-ID: Revision: 8043 http://gar.svn.sourceforge.net/gar/?rev=8043&view=rev Author: trygvis Date: 2010-01-17 14:32:10 +0000 (Sun, 17 Jan 2010) Log Message: ----------- pcb: checksum.. Modified Paths: -------------- csw/mgar/pkg/pcb/trunk/checksums Modified: csw/mgar/pkg/pcb/trunk/checksums =================================================================== --- csw/mgar/pkg/pcb/trunk/checksums 2010-01-17 14:25:35 UTC (rev 8042) +++ csw/mgar/pkg/pcb/trunk/checksums 2010-01-17 14:32:10 UTC (rev 8043) @@ -1,5 +1,5 @@ 509826c8a9184b46055258861228b555 0001-Fix-off-by-one-error-in-the-GTK-HID-s-netlist-window.patch 00fd904d4439493a998100f40891fffd 0001-Regenerate-rats-r-tree-when-re-allocating-a-bigger-r.patch -19b4f08dc4fedfaf1388727463a4d344 CSWpcb.postinstall -e4bcdb905fc698d3fdbf7449b495c774 CSWpcb.preremove +c2a305c3c331a3653beb075d5a9aa814 CSWpcb.postinstall +4c73a3c19563d53790dfed011d8fd287 CSWpcb.preremove e192ee993b04749f82dd3e8b529d40c0 pcb-20081128.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Sun Jan 17 17:39:58 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Sun, 17 Jan 2010 16:39:58 +0000 Subject: [csw-devel] SF.net SVN: gar:[8044] csw/mgar/pkg/mutt/trunk/Makefile Message-ID: Revision: 8044 http://gar.svn.sourceforge.net/gar/?rev=8044&view=rev Author: dmichelsen Date: 2010-01-17 16:39:57 +0000 (Sun, 17 Jan 2010) Log Message: ----------- mutt: Add more options to configure Modified Paths: -------------- csw/mgar/pkg/mutt/trunk/Makefile Modified: csw/mgar/pkg/mutt/trunk/Makefile =================================================================== --- csw/mgar/pkg/mutt/trunk/Makefile 2010-01-17 14:32:10 UTC (rev 8043) +++ csw/mgar/pkg/mutt/trunk/Makefile 2010-01-17 16:39:57 UTC (rev 8044) @@ -20,8 +20,8 @@ PACKAGES = CSWmutt-base CSWmutt-ncurses CSWmutt-slang REQUIRED_PKGS_CSWmutt-base = CSWggettextrt CSWiconv CSWlibidn -REQUIRED_PKGS_CSWmutt-ncurses = CSWmutt-base CSWncurses CSWggettextrt CSWiconv CSWlibidn -REQUIRED_PKGS_CSWmutt-slang = CSWmutt-base CSWslang CSWggettextrt CSWiconv CSWlibidn +REQUIRED_PKGS_CSWmutt-ncurses = CSWmutt-base CSWncurses CSWggettextrt CSWiconv CSWlibidn CSWgdbm CSWsasl +REQUIRED_PKGS_CSWmutt-slang = CSWmutt-base CSWslang CSWggettextrt CSWiconv CSWlibidn CSWgdbm CSWsasl CATALOGNAME_CSWmutt-base = mutt_base CATALOGNAME_CSWmutt-ncurses = mutt_ncurses @@ -38,6 +38,13 @@ sysconfdir = /etc/opt/csw CONFIGURE_ARGS = $(DIRPATHS) + +# Add requested header fields requested in this bug: +# http://www.opencsw.org/mantis/view.php?id=3726 +CONFIGURE_ARGS += --with-sasl --enable-hcache +# This required POP and/or IMAP +CONFIGURE_ARGS += --enable-pop --enable-imap + CONFIGURE_ARGS_SLANG-no = CONFIGURE_ARGS_SLANG-yes = --with-slang=$(prefix) CONFIGURE_ARGS += $(CONFIGURE_ARGS_SLANG-$(SLANG)) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From idogan23 at users.sourceforge.net Sun Jan 17 17:49:06 2010 From: idogan23 at users.sourceforge.net (idogan23 at users.sourceforge.net) Date: Sun, 17 Jan 2010 16:49:06 +0000 Subject: [csw-devel] SF.net SVN: gar:[8045] csw/mgar/pkg/amavisd-new/trunk Message-ID: Revision: 8045 http://gar.svn.sourceforge.net/gar/?rev=8045&view=rev Author: idogan23 Date: 2010-01-17 16:49:06 +0000 (Sun, 17 Jan 2010) Log Message: ----------- amavisd-new: fixed postinstall script bug 4138, fixed dependancy bug 4137 Modified Paths: -------------- csw/mgar/pkg/amavisd-new/trunk/Makefile csw/mgar/pkg/amavisd-new/trunk/checksums csw/mgar/pkg/amavisd-new/trunk/files/CSWamavisdnew.postinstall Added Paths: ----------- csw/mgar/pkg/amavisd-new/trunk/files/CSWamavisdnew.cswusergroup Removed Paths: ------------- csw/mgar/pkg/amavisd-new/trunk/files/CSWamavisdnew.prototype Modified: csw/mgar/pkg/amavisd-new/trunk/Makefile =================================================================== --- csw/mgar/pkg/amavisd-new/trunk/Makefile 2010-01-17 16:39:57 UTC (rev 8044) +++ csw/mgar/pkg/amavisd-new/trunk/Makefile 2010-01-17 16:49:06 UTC (rev 8045) @@ -13,15 +13,14 @@ MASTER_SITES = http://www.ijs.si/software/amavisd/#download DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz +DISTFILES += CSWamavisdnew.cswusergroup DISTFILES += CSWamavisdnew.postinstall DISTFILES += CSWamavisdnew.preinstall -DISTFILES += CSWamavisdnew.prototype -#DISTFILES += $(call admfiles,CSWamavisdnew, postinstall preinstall prototype) - # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz +REQUIRED_PKGS += CSWbdb47 REQUIRED_PKGS += CSWperl REQUIRED_PKGS += CSWcswclassutils REQUIRED_PKGS += CSWpmiostringy @@ -46,20 +45,27 @@ PATCHFILES += p0f-analyzer.pl.diff SPKG_CLASSES = none cswinitsmf +PROTOTYPE_FILTER = awk ' \ + $$$$3 ~ /\/init.d\/cswamavisdnew$$$$/ { $$$$2 = "cswinitsmf" } \ + $$$$3 ~ /\/csw\/amavisd-new.conf$$$$/ { $$$$2 = "cswcpsampleconf" } \ + { print }' CONFIGURE_SCRIPTS = BUILD_SCRIPTS = TEST_SCRIPTS = INSTALL_SCRIPTS = custom -AMAVISBIN=amavisd-agent amavisd-nanny amavisd-release p0f-analyzer.pl +PCONFDIR = $(DESTDIR)/etc/opt/csw +PVARDIR = $(DESTDIR)/var/opt/csw/$(GARNAME) + +AMAVISBIN = amavisd-agent amavisd-nanny amavisd-release p0f-analyzer.pl AMAVISBIN += amavisd-nanny AMAVISBIN += amavisd-release AMAVISBIN += p0f-analyzer.pl -AMAVISSBIN=amavisd-new +AMAVISSBIN = amavisd-new -AMAVISDOC=LDAP.schema +AMAVISDOC = LDAP.schema AMAVISDOC += README_FILES AMAVISDOC += RELEASE_NOTES AMAVISDOC += AAAREADME.first @@ -81,6 +87,7 @@ cp -r $(AMAVISDOC) $(DESTDIR)$(prefix)/share/doc/amavisd-new ginstall -d $(DESTDIR)/etc/opt/csw/init.d ginstall -m 755 files/cswamavisdnew $(DESTDIR)/etc/opt/csw/init.d/cswamavisdnew + ginstall -m 644 files/CSWamavisdnew.cswusergroup $(DESTDIR)/etc/opt/csw/pkg/CSWamavisdnew/cswusergroup $(MAKECOOKIE) include gar/category.mk Modified: csw/mgar/pkg/amavisd-new/trunk/checksums =================================================================== --- csw/mgar/pkg/amavisd-new/trunk/checksums 2010-01-17 16:39:57 UTC (rev 8044) +++ csw/mgar/pkg/amavisd-new/trunk/checksums 2010-01-17 16:49:06 UTC (rev 8045) @@ -1,10 +1,10 @@ -2df80947353821e6e94fcad09a1bb3da download/CSWamavisdnew.postinstall -171767585ab6662c0cbedae26e9baa2c download/CSWamavisdnew.preinstall -631e33b02eb813b9f3f13db03b5c12eb download/CSWamavisdnew.prototype -b9cafe6715bc2703ac9411f24f248cd3 download/amavisd-agent.diff -3e81998c8b933129870e3cab68d40261 download/amavisd-nanny.diff -02b0bd38b40258841c60479603dc6842 download/amavisd-new-2.6.3.tar.gz -f218d10e5280940268a3ffaa125a00ae download/amavisd-release.diff -9c3d4118cf3837e559a6026d6b89b377 download/amavisd.conf.diff -071af9fb79ee5e9d045905043fea2b96 download/amavisd.diff -befafc9594d5e1c1c8710b7d4d129d0b download/p0f-analyzer.pl.diff +b1af7a961c5f3111efeb72d83b21a0fd CSWamavisdnew.cswusergroup +b12bd6b3223756e47e95347fc177bd7b CSWamavisdnew.postinstall +171767585ab6662c0cbedae26e9baa2c CSWamavisdnew.preinstall +b9cafe6715bc2703ac9411f24f248cd3 amavisd-agent.diff +3e81998c8b933129870e3cab68d40261 amavisd-nanny.diff +02b0bd38b40258841c60479603dc6842 amavisd-new-2.6.3.tar.gz +f218d10e5280940268a3ffaa125a00ae amavisd-release.diff +9c3d4118cf3837e559a6026d6b89b377 amavisd.conf.diff +071af9fb79ee5e9d045905043fea2b96 amavisd.diff +befafc9594d5e1c1c8710b7d4d129d0b p0f-analyzer.pl.diff Added: csw/mgar/pkg/amavisd-new/trunk/files/CSWamavisdnew.cswusergroup =================================================================== --- csw/mgar/pkg/amavisd-new/trunk/files/CSWamavisdnew.cswusergroup (rev 0) +++ csw/mgar/pkg/amavisd-new/trunk/files/CSWamavisdnew.cswusergroup 2010-01-17 16:49:06 UTC (rev 8045) @@ -0,0 +1 @@ +amavisn:amavisn:amavisd-new pseudo user:/:/bin/false:: Modified: csw/mgar/pkg/amavisd-new/trunk/files/CSWamavisdnew.postinstall =================================================================== --- csw/mgar/pkg/amavisd-new/trunk/files/CSWamavisdnew.postinstall 2010-01-17 16:39:57 UTC (rev 8044) +++ csw/mgar/pkg/amavisd-new/trunk/files/CSWamavisdnew.postinstall 2010-01-17 16:49:06 UTC (rev 8045) @@ -17,25 +17,25 @@ echo "Running db_verify (before upgrade) on $DB_HOME" >>$installlog for each_db in `ls *.db` do - ${BASEDIR}/opt/csw/bin/db_verify -h $DB_HOME -o $each_db >>$installlog 2>&1 + ${BASEDIR}/opt/csw/bdb47/bin/db_verify -h $DB_HOME -o $each_db >>$installlog 2>&1 done # Update the database environment to the new value echo "Running db_recover on $DB_HOME" >>$installlog - ${BASEDIR}/opt/csw/bin/db_recover -h $DB_HOME >>$installlog 2>&1 + ${BASEDIR}/opt/csw/bdb47/bin/db_recover -h $DB_HOME >>$installlog 2>&1 # Upgrade each file. This does nothing if no upgrade is needed. echo "Running db_upgrade on $DB_HOME" >>$installlog for each_db in `ls *.db` do - ${BASEDIR}/opt/csw/bin/db_upgrade -h $DB_HOME $each_db >>$installlog 2>&1 + ${BASEDIR}/opt/csw/bdb47/bin/db_upgrade -h $DB_HOME $each_db >>$installlog 2>&1 done # Verify each file echo "Running db_verify (after upgrade) on $DB_HOME" >>$installlog for each_db in `ls *.db` do - ${BASEDIR}/opt/csw/bin/db_verify -h $DB_HOME -o $each_db >>$installlog 2>&1 + ${BASEDIR}/opt/csw/bdb47/bin/db_verify -h $DB_HOME -o $each_db >>$installlog 2>&1 done fi Deleted: csw/mgar/pkg/amavisd-new/trunk/files/CSWamavisdnew.prototype =================================================================== --- csw/mgar/pkg/amavisd-new/trunk/files/CSWamavisdnew.prototype 2010-01-17 16:39:57 UTC (rev 8044) +++ csw/mgar/pkg/amavisd-new/trunk/files/CSWamavisdnew.prototype 2010-01-17 16:49:06 UTC (rev 8045) @@ -1,74 +0,0 @@ -d none /opt/csw/bin 0755 root bin -f none /opt/csw/bin/amavisd-agent 0755 root bin -f none /opt/csw/bin/amavisd-nanny 0755 root bin -f none /opt/csw/bin/amavisd-release 0755 root bin -f none /opt/csw/bin/p0f-analyzer.pl 0755 root bin -d none /opt/csw/etc 0755 root bin -f none /opt/csw/etc/amavisd-new.conf.CSW 0644 root bin -d none /opt/csw/sbin 0755 root bin -f none /opt/csw/sbin/amavisd-new 0755 root bin -d none /opt/csw/share/doc/amavisd-new 0755 root bin -f none /opt/csw/share/doc/amavisd-new/AAAREADME.first 0644 root bin -f none /opt/csw/share/doc/amavisd-new/LDAP.schema 0644 root bin -f none /opt/csw/share/doc/amavisd-new/README_FILES/README.banned 0644 root bin -f none /opt/csw/share/doc/amavisd-new/README_FILES/README.chroot 0644 root bin -f none /opt/csw/share/doc/amavisd-new/README_FILES/README.contributed 0644 root bin -f none /opt/csw/share/doc/amavisd-new/README_FILES/README.courier 0644 root bin -f none /opt/csw/share/doc/amavisd-new/README_FILES/README.courier-old 0644 root bin -f none /opt/csw/share/doc/amavisd-new/README_FILES/README.customize 0644 root bin -f none /opt/csw/share/doc/amavisd-new/README_FILES/README.exim_v3 0644 root bin -f none /opt/csw/share/doc/amavisd-new/README_FILES/README.exim_v3_app 0644 root bin -f none /opt/csw/share/doc/amavisd-new/README_FILES/README.exim_v4 0644 root bin -f none /opt/csw/share/doc/amavisd-new/README_FILES/README.exim_v4_app 0644 root bin -f none /opt/csw/share/doc/amavisd-new/README_FILES/README.exim_v4_app2 0644 root bin -f none /opt/csw/share/doc/amavisd-new/README_FILES/README.ldap 0644 root bin -f none /opt/csw/share/doc/amavisd-new/README_FILES/README.lookups 0644 root bin -f none /opt/csw/share/doc/amavisd-new/README_FILES/README.milter 0644 root bin -f none /opt/csw/share/doc/amavisd-new/README_FILES/README.old.scanners 0644 root bin -f none /opt/csw/share/doc/amavisd-new/README_FILES/README.performance 0644 root bin -f none /opt/csw/share/doc/amavisd-new/README_FILES/README.policy-on-notifications 0644 root bin -f none /opt/csw/share/doc/amavisd-new/README_FILES/README.postfix 0644 root bin -f none /opt/csw/share/doc/amavisd-new/README_FILES/README.postfix.html 0644 root bin -f none /opt/csw/share/doc/amavisd-new/README_FILES/README.protocol 0644 root bin -f none /opt/csw/share/doc/amavisd-new/README_FILES/README.sendmail 0644 root bin -f none /opt/csw/share/doc/amavisd-new/README_FILES/README.sendmail-dual 0644 root bin -f none /opt/csw/share/doc/amavisd-new/README_FILES/README.sendmail-dual.old 0644 root bin -f none /opt/csw/share/doc/amavisd-new/README_FILES/README.sql 0644 root bin -f none /opt/csw/share/doc/amavisd-new/README_FILES/README.sql-mysql 0644 root bin -f none /opt/csw/share/doc/amavisd-new/README_FILES/README.sql-pg 0644 root bin -f none /opt/csw/share/doc/amavisd-new/README_FILES/TODO-SNMP-AGENT 0644 root bin -f none /opt/csw/share/doc/amavisd-new/README_FILES/amavisd-new-docs.html 0644 root bin -f none /opt/csw/share/doc/amavisd-new/README_FILES/images/blank.png 0644 root bin -f none /opt/csw/share/doc/amavisd-new/README_FILES/images/callouts/1.png 0644 root bin -f none /opt/csw/share/doc/amavisd-new/README_FILES/images/callouts/10.png 0644 root bin -f none /opt/csw/share/doc/amavisd-new/README_FILES/images/callouts/11.png 0644 root bin -f none /opt/csw/share/doc/amavisd-new/README_FILES/images/callouts/12.png 0644 root bin -f none /opt/csw/share/doc/amavisd-new/README_FILES/images/callouts/13.png 0644 root bin -f none /opt/csw/share/doc/amavisd-new/README_FILES/images/callouts/14.png 0644 root bin -f none /opt/csw/share/doc/amavisd-new/README_FILES/images/callouts/15.png 0644 root bin -f none /opt/csw/share/doc/amavisd-new/README_FILES/images/callouts/2.png 0644 root bin -f none /opt/csw/share/doc/amavisd-new/README_FILES/images/callouts/3.png 0644 root bin -f none /opt/csw/share/doc/amavisd-new/README_FILES/images/callouts/4.png 0644 root bin -f none /opt/csw/share/doc/amavisd-new/README_FILES/images/callouts/5.png 0644 root bin -f none /opt/csw/share/doc/amavisd-new/README_FILES/images/callouts/6.png 0644 root bin -f none /opt/csw/share/doc/amavisd-new/README_FILES/images/callouts/7.png 0644 root bin -f none /opt/csw/share/doc/amavisd-new/README_FILES/images/callouts/8.png 0644 root bin -f none /opt/csw/share/doc/amavisd-new/README_FILES/images/callouts/9.png 0644 root bin -f none /opt/csw/share/doc/amavisd-new/README_FILES/images/caution.png 0644 root bin -f none /opt/csw/share/doc/amavisd-new/README_FILES/images/draft.png 0644 root bin -f none /opt/csw/share/doc/amavisd-new/README_FILES/images/home.png 0644 root bin -f none /opt/csw/share/doc/amavisd-new/README_FILES/images/important.png 0644 root bin -f none /opt/csw/share/doc/amavisd-new/README_FILES/images/next.png 0644 root bin -f none /opt/csw/share/doc/amavisd-new/README_FILES/images/note.png 0644 root bin -f none /opt/csw/share/doc/amavisd-new/README_FILES/images/prev.png 0644 root bin -f none /opt/csw/share/doc/amavisd-new/README_FILES/images/tip.png 0644 root bin -f none /opt/csw/share/doc/amavisd-new/README_FILES/images/toc-blank.png 0644 root bin -f none /opt/csw/share/doc/amavisd-new/README_FILES/images/toc-minus.png 0644 root bin -f none /opt/csw/share/doc/amavisd-new/README_FILES/images/toc-plus.png 0644 root bin -f none /opt/csw/share/doc/amavisd-new/README_FILES/images/up.png 0644 root bin -f none /opt/csw/share/doc/amavisd-new/README_FILES/images/warning.png 0644 root bin -f none /opt/csw/share/doc/amavisd-new/README_FILES/screen.css 0644 root bin -f none /opt/csw/share/doc/amavisd-new/RELEASE_NOTES 0644 root bin -f none /opt/csw/share/doc/amavisd-new/amavisd.conf-default 0644 root bin -f none /opt/csw/share/doc/amavisd-new/amavisd.conf-sample 0644 root bin -f cswinitsmf /etc/opt/csw/init.d/cswamavisdnew 0755 root bin This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From trygvis at users.sourceforge.net Sun Jan 17 18:32:30 2010 From: trygvis at users.sourceforge.net (trygvis at users.sourceforge.net) Date: Sun, 17 Jan 2010 17:32:30 +0000 Subject: [csw-devel] SF.net SVN: gar:[8046] csw/mgar/pkg/gtkwave/trunk/Makefile Message-ID: Revision: 8046 http://gar.svn.sourceforge.net/gar/?rev=8046&view=rev Author: trygvis Date: 2010-01-17 17:32:30 +0000 (Sun, 17 Jan 2010) Log Message: ----------- gtkwave: Getting at least ./configure to pass on solaris8. Modified Paths: -------------- csw/mgar/pkg/gtkwave/trunk/Makefile Modified: csw/mgar/pkg/gtkwave/trunk/Makefile =================================================================== --- csw/mgar/pkg/gtkwave/trunk/Makefile 2010-01-17 16:49:06 UTC (rev 8045) +++ csw/mgar/pkg/gtkwave/trunk/Makefile 2010-01-17 17:32:30 UTC (rev 8046) @@ -22,9 +22,12 @@ GARCOMPILER = GNU -CONFIGURE_ARGS = $(DIRPATHS) LDFLAGS=-lintl +CONFIGURE_ARGS = $(DIRPATHS) +CONFIGURE_ARGS += LDFLAGS=-lintl -pre-build-modulated: +CONFIGURE_ENV = PKG_CONFIG_PATH=/opt/csw/X11/lib/pkgconfig + +post-extract-modulated: find $(WORKSRC) -type f | xargs -I _ /opt/csw/bin/dos2unix _ _ @$(MAKECOOKIE) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From trygvis at users.sourceforge.net Sun Jan 17 20:19:06 2010 From: trygvis at users.sourceforge.net (trygvis at users.sourceforge.net) Date: Sun, 17 Jan 2010 19:19:06 +0000 Subject: [csw-devel] SF.net SVN: gar:[8047] csw/mgar/pkg/gtkwave/trunk Message-ID: Revision: 8047 http://gar.svn.sourceforge.net/gar/?rev=8047&view=rev Author: trygvis Date: 2010-01-17 19:19:06 +0000 (Sun, 17 Jan 2010) Log Message: ----------- gtkwave: Getting to work on build8s. Modified Paths: -------------- csw/mgar/pkg/gtkwave/trunk/Makefile csw/mgar/pkg/gtkwave/trunk/checksums Added Paths: ----------- csw/mgar/pkg/gtkwave/trunk/files/removing-stdint.h-include.patch Modified: csw/mgar/pkg/gtkwave/trunk/Makefile =================================================================== --- csw/mgar/pkg/gtkwave/trunk/Makefile 2010-01-17 17:32:30 UTC (rev 8046) +++ csw/mgar/pkg/gtkwave/trunk/Makefile 2010-01-17 19:19:06 UTC (rev 8047) @@ -11,26 +11,40 @@ MASTER_SITES = $(SF_MIRRORS) DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz -# We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz -# If the url used to check for software update is different of MASTER_SITES, then -# uncomment the next line. Otherwise it is set by default to the value of MASTER_SITES -# UPSTREAM_MASTER_SITES = - PREREQUISITE_BASE_PKGS = CSWtofrodos GARCOMPILER = GNU +REQUIRED_PKGS = CSWfconfig +REQUIRED_PKGS += CSWftype2 +REQUIRED_PKGS += CSWggettextrt +REQUIRED_PKGS += CSWglib2 +REQUIRED_PKGS += CSWgtk2 +REQUIRED_PKGS += CSWlibatk +REQUIRED_PKGS += CSWlibcairo +REQUIRED_PKGS += CSWpango +REQUIRED_PKGS += CSWtcl +REQUIRED_PKGS += CSWzlib + +PATCHFILES = removing-stdint.h-include.patch + CONFIGURE_ARGS = $(DIRPATHS) -CONFIGURE_ARGS += LDFLAGS=-lintl +CONFIGURE_ARGS += LDFLAGS="-lintl /usr/openwin/lib/libXext.so" CONFIGURE_ENV = PKG_CONFIG_PATH=/opt/csw/X11/lib/pkgconfig post-extract-modulated: + @echo WORKSRC=$(WORKSRC) + @echo post-extract-modulated find $(WORKSRC) -type f | xargs -I _ /opt/csw/bin/dos2unix _ _ @$(MAKECOOKIE) +#post-extract: +# @echo WORKSRC=$(WORKSRC) +# @echo post-extract + TEST_SCRIPTS = include gar/category.mk Modified: csw/mgar/pkg/gtkwave/trunk/checksums =================================================================== --- csw/mgar/pkg/gtkwave/trunk/checksums 2010-01-17 17:32:30 UTC (rev 8046) +++ csw/mgar/pkg/gtkwave/trunk/checksums 2010-01-17 19:19:06 UTC (rev 8047) @@ -1 +1,2 @@ dcc427903a8f5e958c099f108958dce8 gtkwave-3.2.3.tar.gz +d61b452193329d7d7311c7f806d89c87 removing-stdint.h-include.patch Added: csw/mgar/pkg/gtkwave/trunk/files/removing-stdint.h-include.patch =================================================================== --- csw/mgar/pkg/gtkwave/trunk/files/removing-stdint.h-include.patch (rev 0) +++ csw/mgar/pkg/gtkwave/trunk/files/removing-stdint.h-include.patch 2010-01-17 19:19:06 UTC (rev 8047) @@ -0,0 +1,10 @@ +--- gtkwave-3.2.3-orig/src/debug.h 2010-01-17 19:44:25.000307971 +0100 ++++ gtkwave-3.2.3/src/debug.h 2010-01-17 19:46:01.519814776 +0100 +@@ -17,7 +17,6 @@ + + #ifndef _MSC_VER + #ifndef __MINGW32__ +-#include + #else + #include + #endif This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From trygvis at users.sourceforge.net Sun Jan 17 20:22:37 2010 From: trygvis at users.sourceforge.net (trygvis at users.sourceforge.net) Date: Sun, 17 Jan 2010 19:22:37 +0000 Subject: [csw-devel] SF.net SVN: gar:[8048] csw/mgar/pkg/gtkwave/trunk/checksums Message-ID: Revision: 8048 http://gar.svn.sourceforge.net/gar/?rev=8048&view=rev Author: trygvis Date: 2010-01-17 19:22:37 +0000 (Sun, 17 Jan 2010) Log Message: ----------- gtkwave: checksum... Modified Paths: -------------- csw/mgar/pkg/gtkwave/trunk/checksums Modified: csw/mgar/pkg/gtkwave/trunk/checksums =================================================================== --- csw/mgar/pkg/gtkwave/trunk/checksums 2010-01-17 19:19:06 UTC (rev 8047) +++ csw/mgar/pkg/gtkwave/trunk/checksums 2010-01-17 19:22:37 UTC (rev 8048) @@ -1,2 +1,2 @@ dcc427903a8f5e958c099f108958dce8 gtkwave-3.2.3.tar.gz -d61b452193329d7d7311c7f806d89c87 removing-stdint.h-include.patch +572e089ffbf926c940bb0fad3d1aac8a removing-stdint.h-include.patch This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Sun Jan 17 20:50:22 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Sun, 17 Jan 2010 19:50:22 +0000 Subject: [csw-devel] SF.net SVN: gar:[8049] csw/mgar/pkg Message-ID: Revision: 8049 http://gar.svn.sourceforge.net/gar/?rev=8049&view=rev Author: dmichelsen Date: 2010-01-17 19:50:12 +0000 (Sun, 17 Jan 2010) Log Message: ----------- file: Initial commit Added Paths: ----------- csw/mgar/pkg/file/ csw/mgar/pkg/file/branches/ csw/mgar/pkg/file/tags/ csw/mgar/pkg/file/trunk/ csw/mgar/pkg/file/trunk/Makefile csw/mgar/pkg/file/trunk/checksums csw/mgar/pkg/file/trunk/files/ Property changes on: csw/mgar/pkg/file/trunk ___________________________________________________________________ Added: svn:ignore + cookies download work Added: svn:externals + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 Added: csw/mgar/pkg/file/trunk/Makefile =================================================================== --- csw/mgar/pkg/file/trunk/Makefile (rev 0) +++ csw/mgar/pkg/file/trunk/Makefile 2010-01-17 19:50:12 UTC (rev 8049) @@ -0,0 +1,29 @@ +GARNAME = file +GARVERSION = 5.03 +CATEGORIES = utils + +DESCRIPTION = A file type guesser +define BLURB + The file command is "a file type guesser", that is, a command-line tool that + tells you in words what kind of data a file contains. Unlike most GUI systems, + command-line UNIX systems - with this program leading the charge - don't rely + on filename extentions to tell you the type of a file, but look at the file's + actual contents. This is, of course, more reliable, but requires a bit of I/O. +endef + +MASTER_SITES = ftp://ftp.astron.com/pub/file/ +DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz + +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + +SPKG_SOURCEURL = http://www.darwinsys.com/file/ + +CONFIGURE_ARGS = $(DIRPATHS) + +# These flags are not understood by Sun Studio +CONFIGURE_ARGS += --disable-warnings + +TEST_TARGET = check + +include gar/category.mk Added: csw/mgar/pkg/file/trunk/checksums =================================================================== --- csw/mgar/pkg/file/trunk/checksums (rev 0) +++ csw/mgar/pkg/file/trunk/checksums 2010-01-17 19:50:12 UTC (rev 8049) @@ -0,0 +1 @@ +d05f08a53e5c2f51f8ee6a4758c0cc53 file-5.03.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Sun Jan 17 21:11:55 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sun, 17 Jan 2010 20:11:55 +0000 Subject: [csw-devel] SF.net SVN: gar:[8050] csw/mgar/gar/v2/bin/checkpkg.d/checkpkg_test.py Message-ID: Revision: 8050 http://gar.svn.sourceforge.net/gar/?rev=8050&view=rev Author: wahwah Date: 2010-01-17 20:11:53 +0000 (Sun, 17 Jan 2010) Log Message: ----------- mGAR v2: checkpkg, fix for one unit test, two more to go Modified Paths: -------------- csw/mgar/gar/v2/bin/checkpkg.d/checkpkg_test.py Modified: csw/mgar/gar/v2/bin/checkpkg.d/checkpkg_test.py =================================================================== --- csw/mgar/gar/v2/bin/checkpkg.d/checkpkg_test.py 2010-01-17 19:50:12 UTC (rev 8049) +++ csw/mgar/gar/v2/bin/checkpkg.d/checkpkg_test.py 2010-01-17 20:11:53 UTC (rev 8050) @@ -450,13 +450,10 @@ def testGetLinesBySoname_8(self): expected = {'foo.so.1': '/opt/csw/postgresql/lib/foo.so.1 foo'} + lines1 = {"/opt/csw/postgresql/lib": "/opt/csw/postgresql/lib/foo.so.1 foo"} pkgmap = self.pkgmap_mocker.CreateMock(checkpkg.SystemPkgmap) - pkgmap.GetPkgmapLineByBasename("foo") - lines1 = {"/opt/csw/lib/postgresql": "/opt/csw/lib/postgresql/foo.so.1 foo"} pkgmap.GetPkgmapLineByBasename("foo.so.1").AndReturn(lines1) - pkgmap.GetPkgmapLineByBasename("foo.so.1").AndReturn(lines1) self.pkgmap_mocker.ReplayAll() - pkgmap.GetPkgmapLineByBasename("foo") needed_sonames = set(["foo.so.1"]) runpath_by_needed_soname = {"foo.so.1": ["/opt/csw/postgresql/lib/", "/usr/lib"]} isalist = ["isa-value-1", "isa-value-2"] This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Sun Jan 17 21:22:11 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Sun, 17 Jan 2010 20:22:11 +0000 Subject: [csw-devel] SF.net SVN: gar:[8051] csw/mgar/pkg/file/trunk/Makefile Message-ID: Revision: 8051 http://gar.svn.sourceforge.net/gar/?rev=8051&view=rev Author: dmichelsen Date: 2010-01-17 20:22:01 +0000 (Sun, 17 Jan 2010) Log Message: ----------- file: Minor fixes Modified Paths: -------------- csw/mgar/pkg/file/trunk/Makefile Modified: csw/mgar/pkg/file/trunk/Makefile =================================================================== --- csw/mgar/pkg/file/trunk/Makefile 2010-01-17 20:11:53 UTC (rev 8050) +++ csw/mgar/pkg/file/trunk/Makefile 2010-01-17 20:22:01 UTC (rev 8051) @@ -19,6 +19,8 @@ SPKG_SOURCEURL = http://www.darwinsys.com/file/ +REQUIRED_PKGS = CSWzlib + CONFIGURE_ARGS = $(DIRPATHS) # These flags are not understood by Sun Studio @@ -26,4 +28,9 @@ TEST_TARGET = check +# The "file" util is used during stripbin. As the newly build binary +# requires libmagic which is not installed yet we must not use the +# newly built "file". +IGNORE_DESTDIR = 1 + include gar/category.mk This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Sun Jan 17 22:19:32 2010 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Sun, 17 Jan 2010 21:19:32 +0000 Subject: [csw-devel] SF.net SVN: gar:[8052] csw/mgar/pkg/logwatch/trunk Message-ID: Revision: 8052 http://gar.svn.sourceforge.net/gar/?rev=8052&view=rev Author: bdwalton Date: 2010-01-17 21:19:32 +0000 (Sun, 17 Jan 2010) Log Message: ----------- logwatch: add patch to correct paths in manpage Modified Paths: -------------- csw/mgar/pkg/logwatch/trunk/Makefile csw/mgar/pkg/logwatch/trunk/checksums Added Paths: ----------- csw/mgar/pkg/logwatch/trunk/files/fix-manpage-paths.patch Modified: csw/mgar/pkg/logwatch/trunk/Makefile =================================================================== --- csw/mgar/pkg/logwatch/trunk/Makefile 2010-01-17 20:22:01 UTC (rev 8051) +++ csw/mgar/pkg/logwatch/trunk/Makefile 2010-01-17 21:19:32 UTC (rev 8052) @@ -14,6 +14,7 @@ MASTER_SITES = ftp://ftp.kaybee.org/pub/linux/ DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz +PATCHFILES = fix-manpage-paths.patch # We define upstream file regex so we can be notifed of new upstream # software release Modified: csw/mgar/pkg/logwatch/trunk/checksums =================================================================== --- csw/mgar/pkg/logwatch/trunk/checksums 2010-01-17 20:22:01 UTC (rev 8051) +++ csw/mgar/pkg/logwatch/trunk/checksums 2010-01-17 21:19:32 UTC (rev 8052) @@ -1 +1,2 @@ +b3ce78d9ef4de268826de3d03d2d5e81 fix-manpage-paths.patch 937d982006b2a76a83edfcfd2e5a9d7d logwatch-7.3.6.tar.gz Added: csw/mgar/pkg/logwatch/trunk/files/fix-manpage-paths.patch =================================================================== --- csw/mgar/pkg/logwatch/trunk/files/fix-manpage-paths.patch (rev 0) +++ csw/mgar/pkg/logwatch/trunk/files/fix-manpage-paths.patch 2010-01-17 21:19:32 UTC (rev 8052) @@ -0,0 +1,27 @@ +diff -u -r logwatch-7.3.6.orig/logwatch.8 logwatch-7.3.6/logwatch.8 +--- logwatch-7.3.6.orig/logwatch.8 2010-01-17 22:15:53.115085073 +0100 ++++ logwatch-7.3.6/logwatch.8 2010-01-17 22:17:10.483671625 +0100 +@@ -105,12 +105,12 @@ + .IP "\fB--help\fR" + same as --usage. + .SH FILES +-.IP /usr/share/logwatch/ ++.IP /opt/csw/share/logwatch/ + .RS + This directory contains all the perl executables and + configuration files shipped with the logwatch distribution. + .RE +-.IP /etc/logwatch ++.IP /etc/opt/csw/logwatch + .RS + This directory contains local configuration files that override + the default configuration. See \fBMORE INFORMATION\fR below for more +@@ -127,7 +127,7 @@ + This will print out login information for the previous day... + .RE + .SH MORE INFORMATION +-The directory /usr/share/doc/logwatch-* contains several files with additional ++The directory /opt/csw//share/doc/logwatch contains several files with additional + documentation: + .RE + .I HOWTO-Customize-LogWatch This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Sun Jan 17 22:21:48 2010 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Sun, 17 Jan 2010 21:21:48 +0000 Subject: [csw-devel] SF.net SVN: gar:[8053] csw/mgar/pkg/logwatch/trunk/Makefile Message-ID: Revision: 8053 http://gar.svn.sourceforge.net/gar/?rev=8053&view=rev Author: bdwalton Date: 2010-01-17 21:21:48 +0000 (Sun, 17 Jan 2010) Log Message: ----------- logwatch: correct path of classutils crontab file Modified Paths: -------------- csw/mgar/pkg/logwatch/trunk/Makefile Modified: csw/mgar/pkg/logwatch/trunk/Makefile =================================================================== --- csw/mgar/pkg/logwatch/trunk/Makefile 2010-01-17 21:19:32 UTC (rev 8052) +++ csw/mgar/pkg/logwatch/trunk/Makefile 2010-01-17 21:21:48 UTC (rev 8053) @@ -34,7 +34,7 @@ include gar/category.mk sysconfdir = /etc/opt/csw -CRONDIR = $(sysconfdir)/CSW$(GARNAME)/crontabs +CRONDIR = $(sysconfdir)/pkg/CSW$(GARNAME)/crontabs CRONTABS = $(CRONDIR)/root INSTALL = /opt/csw/bin/ginstall This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From trygvis at users.sourceforge.net Sun Jan 17 22:24:00 2010 From: trygvis at users.sourceforge.net (trygvis at users.sourceforge.net) Date: Sun, 17 Jan 2010 21:24:00 +0000 Subject: [csw-devel] SF.net SVN: gar:[8054] csw/mgar/pkg/freehdl/trunk Message-ID: Revision: 8054 http://gar.svn.sourceforge.net/gar/?rev=8054&view=rev Author: trygvis Date: 2010-01-17 21:24:00 +0000 (Sun, 17 Jan 2010) Log Message: ----------- freehdl: wip. Modified Paths: -------------- csw/mgar/pkg/freehdl/trunk/Makefile csw/mgar/pkg/freehdl/trunk/checksums csw/mgar/pkg/freehdl/trunk/files/0001-Use-OpenCSW-pkg-config.patch Added Paths: ----------- csw/mgar/pkg/freehdl/trunk/files/fix_seg_fault_2-1.patch Modified: csw/mgar/pkg/freehdl/trunk/Makefile =================================================================== --- csw/mgar/pkg/freehdl/trunk/Makefile 2010-01-17 21:21:48 UTC (rev 8053) +++ csw/mgar/pkg/freehdl/trunk/Makefile 2010-01-17 21:24:00 UTC (rev 8054) @@ -1,3 +1,6 @@ +# +# TODO: Consider adding this patch: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=549484 + GARNAME = freehdl GARVERSION = 0.0.7 CATEGORIES = devel @@ -2,3 +5,3 @@ -DESCRIPTION = A project to develop a free, open source, GPL'ed VHDL simulator for Linux! +DESCRIPTION = A free, open source, GPL'ed VHDL simulator define BLURB @@ -16,6 +19,7 @@ DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz PATCHFILES = 0000-Mirring-strings.h-include.patch PATCHFILES += 0001-Use-OpenCSW-pkg-config.patch +PATCHFILES += fix_seg_fault_2-1.patch # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz @@ -26,11 +30,17 @@ GARCOMPILER = GNU -CONFIGURE_ARGS = $(DIRPATHS) +#GARFLAVOR = DBG +CONFIGURE_ARGS = $(DIRPATHS) +CONFIGURE_ARGS += $(CONFIGURE_ARGS_$(GARFLAVOR)) +CONFIGURE_ARGS_DBG = --enable-trace --enable-warnings TEST_SCRIPTS = -REQUIRED_PKGS = CSWgcc4corert CSWgcc4g++ CSWgcc4g++rt CSWpkgconfig +REQUIRED_PKGS = CSWlibtool CSWgcc4corert CSWgcc4g++ CSWgcc4g++rt CSWpkgconfig #CSWgcc3core CSWgcc3corert CSWgcc3g++ CSWgcc3g++rt include gar/category.mk + +# We want the .la files, freehdl is based around those +MERGE_EXCLUDE_LIBTOOL = Modified: csw/mgar/pkg/freehdl/trunk/checksums =================================================================== --- csw/mgar/pkg/freehdl/trunk/checksums 2010-01-17 21:21:48 UTC (rev 8053) +++ csw/mgar/pkg/freehdl/trunk/checksums 2010-01-17 21:24:00 UTC (rev 8054) @@ -1,3 +1,4 @@ 75dd38573b84d23a93a10c028051305d 0000-Mirring-strings.h-include.patch -2950515cac5a87c43c97b264195ff5f7 0001-Use-OpenCSW-pkg-config.patch +6a6e16025feda49ecfc4b5b22e0ad70d 0001-Use-OpenCSW-pkg-config.patch +4193d606cf4445811e78a79865d9485e fix_seg_fault_2-1.patch 6d702aa188fb2c62f8cfca5a2f66d956 freehdl-0.0.7.tar.gz Modified: csw/mgar/pkg/freehdl/trunk/files/0001-Use-OpenCSW-pkg-config.patch =================================================================== --- csw/mgar/pkg/freehdl/trunk/files/0001-Use-OpenCSW-pkg-config.patch 2010-01-17 21:21:48 UTC (rev 8053) +++ csw/mgar/pkg/freehdl/trunk/files/0001-Use-OpenCSW-pkg-config.patch 2010-01-17 21:24:00 UTC (rev 8054) @@ -19,7 +19,7 @@ +version=`/opt/csw/bin/pkg-config --modversion freehdl` +cxxflags=`/opt/csw/bin/pkg-config --variable cxxflags freehdl` +cxx=`/opt/csw/bin/pkg-config --variable cxx freehdl` -+linker=`/opt/csw/bin/pkg-config --variable libtool freehdl` ++linker=/opt/csw/bin/libtool case "$option" in Added: csw/mgar/pkg/freehdl/trunk/files/fix_seg_fault_2-1.patch =================================================================== --- csw/mgar/pkg/freehdl/trunk/files/fix_seg_fault_2-1.patch (rev 0) +++ csw/mgar/pkg/freehdl/trunk/files/fix_seg_fault_2-1.patch 2010-01-17 21:24:00 UTC (rev 8054) @@ -0,0 +1,39 @@ +diff -rupN freehdl-0.0.6.old/v2cc/v2cc-decl.cc freehdl-0.0.6/v2cc/v2cc-decl.cc +--- freehdl-0.0.6.old/v2cc/v2cc-decl.cc 2007-10-23 22:14:26.000000000 +0200 ++++ freehdl-0.0.6/v2cc/v2cc-decl.cc 2009-10-04 12:41:50.000000000 +0200 +@@ -865,7 +865,8 @@ m_emit_hdr (pIIR_ArchitectureDeclaration + emit_decls (extended_declarations(a), str, rstack, 2); // emit signal decls + str += "};\n"; + +- emit_hdr(a->architecture_statement_part, str, rstack, 2); // emit process hdrs ++ if (a->architecture_statement_part != NULL) ++ emit_hdr(a->architecture_statement_part, str, rstack, 2); // emit process hdrs + } + + void // ConcStat headers +diff -rupN freehdl-0.0.6.old/v2cc/v2cc-explore.cc freehdl-0.0.6/v2cc/v2cc-explore.cc +--- freehdl-0.0.6.old/v2cc/v2cc-explore.cc 2008-02-15 19:12:30.000000000 +0100 ++++ freehdl-0.0.6/v2cc/v2cc-explore.cc 2009-10-04 12:28:28.000000000 +0200 +@@ -1108,7 +1108,8 @@ m_explore_and_check (pIIR_ArchitectureDe + } + + // Explore concurrent statements of entity +- error_count += explore_and_check(a->architecture_statement_part, rstack, collect_access_info); ++ if(a->architecture_statement_part != NULL) ++ error_count += explore_and_check(a->architecture_statement_part, rstack, collect_access_info); + + // Collect all external declarations into + merge (external_decls_list, a->external_decls, rstack); +diff -rupN freehdl-0.0.6.old/v2cc/v2cc-impl.cc freehdl-0.0.6/v2cc/v2cc-impl.cc +--- freehdl-0.0.6.old/v2cc/v2cc-impl.cc 2007-10-23 22:23:22.000000000 +0200 ++++ freehdl-0.0.6/v2cc/v2cc-impl.cc 2009-10-04 12:39:48.000000000 +0200 +@@ -1134,7 +1134,8 @@ emit_handle (pIIR_ArchitectureDeclaratio + void + m_emit_impl (pIIR_ArchitectureDeclaration a, string &str, RegionStack &rstack, int l) + { +- emit_impl (a->architecture_statement_part, str, rstack, 2); // process impls ++ if (a->architecture_statement_part != NULL) ++ emit_impl (a->architecture_statement_part, str, rstack, 2); // process impls + emit_handle (a, str, rstack); // handle for sim + emit_constructor(a, str, rstack); // arch constructor + } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Sun Jan 17 22:35:59 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Sun, 17 Jan 2010 21:35:59 +0000 Subject: [csw-devel] SF.net SVN: gar:[8055] csw/mgar/gar/v2/gar.lib.mk Message-ID: Revision: 8055 http://gar.svn.sourceforge.net/gar/?rev=8055&view=rev Author: dmichelsen Date: 2010-01-17 21:35:59 +0000 (Sun, 17 Jan 2010) Log Message: ----------- mGAR v2: Introduce variable overriding for Make destinations similar to install Modified Paths: -------------- csw/mgar/gar/v2/gar.lib.mk Modified: csw/mgar/gar/v2/gar.lib.mk =================================================================== --- csw/mgar/gar/v2/gar.lib.mk 2010-01-17 21:24:00 UTC (rev 8054) +++ csw/mgar/gar/v2/gar.lib.mk 2010-01-17 21:35:59 UTC (rev 8055) @@ -509,17 +509,17 @@ # build from a standard gnu-style makefile's default rule. build-%/Makefile: @echo " ==> Running make in $*" - @$(BUILD_ENV) $(MAKE) $(PARALLELMFLAGS) $(foreach TTT,$(BUILD_OVERRIDE_DIRS),$(TTT)="$($(TTT))") -C $* $(BUILD_ARGS) + @$(BUILD_ENV) $(MAKE) $(PARALLELMFLAGS) $(foreach TTT,$(BUILD_OVERRIDE_VARS),$(TTT)="$(BUILD_OVERRIDE_VAR_$(TTT))") $(foreach TTT,$(BUILD_OVERRIDE_DIRS),$(TTT)="$($(TTT))") -C $* $(BUILD_ARGS) @$(MAKECOOKIE) build-%/makefile: @echo " ==> Running make in $*" - @$(BUILD_ENV) $(MAKE) $(PARALLELMFLAGS) $(foreach TTT,$(BUILD_OVERRIDE_DIRS),$(TTT)="$($(TTT))") -C $* $(BUILD_ARGS) + @$(BUILD_ENV) $(MAKE) $(PARALLELMFLAGS) $(foreach TTT,$(BUILD_OVERRIDE_VARS),$(TTT)="$(BUILD_OVERRIDE_VAR_$(TTT))") $(foreach TTT,$(BUILD_OVERRIDE_DIRS),$(TTT)="$($(TTT))") -C $* $(BUILD_ARGS) @$(MAKECOOKIE) build-%/GNUmakefile: @echo " ==> Running make in $*" - @$(BUILD_ENV) $(MAKE) $(PARALLELMFLAGS) $(foreach TTT,$(BUILD_OVERRIDE_DIRS),$(TTT)="$($(TTT))") -C $* $(BUILD_ARGS) + @$(BUILD_ENV) $(MAKE) $(PARALLELMFLAGS) $(foreach TTT,$(BUILD_OVERRIDE_VARS),$(TTT)="$(BUILD_OVERRIDE_VAR_$(TTT))") $(foreach TTT,$(BUILD_OVERRIDE_DIRS),$(TTT)="$($(TTT))") -C $* $(BUILD_ARGS) @$(MAKECOOKIE) build-%/Jamfile: @@ -564,17 +564,17 @@ # Run tests on pre-built sources test-%/Makefile: @echo " ==> Running make $(TEST_TARGET) in $*" - @$(TEST_ENV) $(MAKE) $(foreach TTT,$(TEST_OVERRIDE_DIRS),$(TTT)="$($(TTT))") -C $* $(TEST_ARGS) $(TEST_TARGET) + @$(TEST_ENV) $(MAKE) $(foreach TTT,$(foreach TTT,$(TEST_OVERRIDE_VARS),$(TTT)="$(TEST_OVERRIDE_VAR_$(TTT))") $(TEST_OVERRIDE_DIRS),$(TTT)="$($(TTT))") -C $* $(TEST_ARGS) $(TEST_TARGET) @$(MAKECOOKIE) test-%/makefile: @echo " ==> Running make $(TEST_TARGET) in $*" - @$(TEST_ENV) $(MAKE) $(foreach TTT,$(TEST_OVERRIDE_DIRS),$(TTT)="$($(TTT))") -C $* $(TEST_ARGS) $(TEST_TARGET) + @$(TEST_ENV) $(MAKE) $(foreach TTT,$(foreach TTT,$(TEST_OVERRIDE_VARS),$(TTT)="$(TEST_OVERRIDE_VAR_$(TTT))") $(TEST_OVERRIDE_DIRS),$(TTT)="$($(TTT))") -C $* $(TEST_ARGS) $(TEST_TARGET) @$(MAKECOOKIE) test-%/GNUmakefile: @echo " ==> Running make $(TEST_TARGET) in $*" - @$(TEST_ENV) $(MAKE) $(foreach TTT,$(TEST_OVERRIDE_DIRS),$(TTT)="$($(TTT))") -C $* $(TEST_ARGS) $(TEST_TARGET) + @$(TEST_ENV) $(MAKE) $(foreach TTT,$(TEST_OVERRIDE_VARS),$(TTT)="$(TEST_OVERRIDE_VAR_$(TTT))") $(foreach TTT,$(TEST_OVERRIDE_DIRS),$(TTT)="$($(TTT))") -C $* $(TEST_ARGS) $(TEST_TARGET) @$(MAKECOOKIE) # Ruby makefiles This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Sun Jan 17 23:00:16 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Sun, 17 Jan 2010 22:00:16 +0000 Subject: [csw-devel] SF.net SVN: gar:[8057] csw/mgar/pkg Message-ID: Revision: 8057 http://gar.svn.sourceforge.net/gar/?rev=8057&view=rev Author: dmichelsen Date: 2010-01-17 22:00:16 +0000 (Sun, 17 Jan 2010) Log Message: ----------- oniguruma: Initial commit Added Paths: ----------- csw/mgar/pkg/oniguruma/ csw/mgar/pkg/oniguruma/branches/ csw/mgar/pkg/oniguruma/tags/ csw/mgar/pkg/oniguruma/trunk/ csw/mgar/pkg/oniguruma/trunk/Makefile csw/mgar/pkg/oniguruma/trunk/checksums csw/mgar/pkg/oniguruma/trunk/files/ Property changes on: csw/mgar/pkg/oniguruma/trunk ___________________________________________________________________ Added: svn:ignore + cookies download work Added: svn:externals + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 Added: csw/mgar/pkg/oniguruma/trunk/Makefile =================================================================== --- csw/mgar/pkg/oniguruma/trunk/Makefile (rev 0) +++ csw/mgar/pkg/oniguruma/trunk/Makefile 2010-01-17 22:00:16 UTC (rev 8057) @@ -0,0 +1,25 @@ +GARNAME = oniguruma +GARVERSION = 5.9.2 +CATEGORIES = lib + +DESCRIPTION = A regular expression library +define BLURB + Oniguruma is a regular expressions library. + The characteristics of this library is that different character encoding + for every regular expression object can be specified. + (supported APIs: GNU regex, POSIX and Oniguruma native) +endef + +MASTER_SITES = http://www.geocities.jp/kosako3/oniguruma/archive/ +DISTNAME = onig-$(GARVERSION) +DISTFILES = $(DISTNAME).tar.gz + +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + +BUILD64 = 1 +CONFIGURE_ARGS = $(DIRPATHS) + +TEST_TARGET = check + +include gar/category.mk Added: csw/mgar/pkg/oniguruma/trunk/checksums =================================================================== --- csw/mgar/pkg/oniguruma/trunk/checksums (rev 0) +++ csw/mgar/pkg/oniguruma/trunk/checksums 2010-01-17 22:00:16 UTC (rev 8057) @@ -0,0 +1 @@ +0f4ad1b100a5f9a91623e04111707b84 onig-5.9.2.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Sun Jan 17 22:50:51 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Sun, 17 Jan 2010 21:50:51 +0000 Subject: [csw-devel] SF.net SVN: gar:[8056] csw/mgar/pkg/slang/trunk/Makefile Message-ID: Revision: 8056 http://gar.svn.sourceforge.net/gar/?rev=8056&view=rev Author: dmichelsen Date: 2010-01-17 21:50:50 +0000 (Sun, 17 Jan 2010) Log Message: ----------- slang: Do not build legacy 1.4.9 in 64 bit and make sure CFLAGS are passed correctly Modified Paths: -------------- csw/mgar/pkg/slang/trunk/Makefile Modified: csw/mgar/pkg/slang/trunk/Makefile =================================================================== --- csw/mgar/pkg/slang/trunk/Makefile 2010-01-17 21:35:59 UTC (rev 8055) +++ csw/mgar/pkg/slang/trunk/Makefile 2010-01-17 21:50:50 UTC (rev 8056) @@ -5,6 +5,10 @@ EXTRA_MODULATORS = GARVERSION MODULATIONS_GARVERSION = 1.4.9 2.2.2 +# The old package didn't contain 64 bit, so don't bother building it for compat +SKIP_MODULATIONS = isa-sparcv9-garversion-1.4.9 +SKIP_MODULATIONS += isa-amd64-garversion-1.4.9 + DESCRIPTION = Library primarily to provide an alternative to libcurses define BLURB endef @@ -38,6 +42,13 @@ INSTALL_ARGS_GARVERSION-1.4.9 = install-elf install-links INSTALL_ARGS = $(INSTALL_ARGS_GARVERSION-$(GARVERSION)) +BUILD_ARGS_GARVERSION-1.4.9 = elf +BUILD_ARGS = $(BUILD_ARGS_GARVERSION-$(GARVERSION)) + +BUILD_OVERRIDE_VARS_GARVERSION-1.4.9 = ELF_CFLAGS +BUILD_OVERRIDE_VARS = $(BUILD_OVERRIDE_VARS_GARVERSION-$(GARVERSION)) +BUILD_OVERRIDE_VAR_ELF_CFLAGS = -K pic $(CFLAGS) + MERGE_SCRIPTS_isa-default-garversion-1.4.9 = copy-only MERGE_DIRS_isa-default-garversion-1.4.9 = $(libdir) MERGE_SCRIPTS_isa-default64-garversion-1.4.9 = copy-relocated-only This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Sun Jan 17 23:11:27 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Sun, 17 Jan 2010 22:11:27 +0000 Subject: [csw-devel] SF.net SVN: gar:[8058] csw/mgar/pkg/oniguruma/trunk/Makefile Message-ID: Revision: 8058 http://gar.svn.sourceforge.net/gar/?rev=8058&view=rev Author: dmichelsen Date: 2010-01-17 22:11:26 +0000 (Sun, 17 Jan 2010) Log Message: ----------- oniguruma: Add SOURCEURL Modified Paths: -------------- csw/mgar/pkg/oniguruma/trunk/Makefile Modified: csw/mgar/pkg/oniguruma/trunk/Makefile =================================================================== --- csw/mgar/pkg/oniguruma/trunk/Makefile 2010-01-17 22:00:16 UTC (rev 8057) +++ csw/mgar/pkg/oniguruma/trunk/Makefile 2010-01-17 22:11:26 UTC (rev 8058) @@ -17,6 +17,8 @@ # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz +SPKG_SOURCEURL = http://www.geocities.jp/kosako3/oniguruma/ + BUILD64 = 1 CONFIGURE_ARGS = $(DIRPATHS) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From skayser at users.sourceforge.net Sun Jan 17 23:42:37 2010 From: skayser at users.sourceforge.net (skayser at users.sourceforge.net) Date: Sun, 17 Jan 2010 22:42:37 +0000 Subject: [csw-devel] SF.net SVN: gar:[8059] csw/mgar/pkg/subversion/trunk Message-ID: Revision: 8059 http://gar.svn.sourceforge.net/gar/?rev=8059&view=rev Author: skayser Date: 2010-01-17 22:42:37 +0000 (Sun, 17 Jan 2010) Log Message: ----------- subversion: dropped explicit LDFLAGS in favor of EXTRA_LIB and EXTRA_LINKER_FLAGS, added $ISALIST, updated changelog.CSW Modified Paths: -------------- csw/mgar/pkg/subversion/trunk/Makefile csw/mgar/pkg/subversion/trunk/files/changelog.CSW Modified: csw/mgar/pkg/subversion/trunk/Makefile =================================================================== --- csw/mgar/pkg/subversion/trunk/Makefile 2010-01-17 22:11:26 UTC (rev 8058) +++ csw/mgar/pkg/subversion/trunk/Makefile 2010-01-17 22:42:37 UTC (rev 8059) @@ -7,6 +7,13 @@ # list, but they also link against the main libsvn_client-1.so which in # turn pulls in the rest. Can this be tweaked? # +# Known build issues/facts: +# +# * Build takes about 50 mins on build8x/build8s +# * checkpkg suggests CSWbdb over CSWbdb47, because it picks up the +# libdb-4.7.so symlink in $(libdir) which belongs to the stub CSWbdb. As +# the lib itself belongs to CSWbdb47, the CSWbdb47 dep is completely fine. +# GARNAME = subversion GARVERSION = 1.6.6 CATEGORIES = utils @@ -116,19 +123,22 @@ PATCHFILES += subversion161.diff PATCHFILES += 0001-make-subversion-sysconfigdir-as-it-should-be-for-csw.patch -EXTRA_LIB = $(SVNLIB) $(prefix)/apache2/lib -EXTRA_INC = $(prefix)/apache2/include +SVNLIB = $(prefix)/lib/svn +JDK = /usr/jdk1.5.0_15 -JDK = /usr/jdk1.5.0_15 -EXTRA_INC += $(JDK)/include -SVNLIB = $(prefix)/lib/svn +EXTRA_INC = $(JDK)/include +EXTRA_INC += $(prefix)/apache2/include -NOISALIST = 1 -LDFLAGS = -R/opt/csw/lib -L/opt/csw/lib -R/opt/csw/apache2/lib -LDFLAGS += -L/opt/csw/apache2/lib -L$(SVNLIB) -lintl -liconv -LDFLAGS += -R/opt/csw/bdb47/lib -L/opt/csw/bdb47/lib -export LDFLAGS +EXTRA_LIB = /opt/csw/bdb47/lib +EXTRA_LIB += /opt/csw/apache2/lib +EXTRA_LIB += $(SVNLIB) +EXTRA_LINKER_FLAGS = -lintl -liconv +# Only add $ISALIST to dirs which ship optimized versions (done by explicitly +# excluding those lib dirs which are known not to ship optimized versions). +RUNPATH_ISALIST = $(libdir) +RUNPATH_ISALIST += $(filter-out /opt/csw/apache2/lib $(SVNLIB),$(EXTRA_LIB)) + EXTRA_MERGE_EXCLUDE_FILES += .*\.pyo .*\.pyc PROTOTYPE_MODIFIERS += cswpycompile PROTOTYPE_FILES_cswpycompile = $(libdir)/python/.*\.py Modified: csw/mgar/pkg/subversion/trunk/files/changelog.CSW =================================================================== --- csw/mgar/pkg/subversion/trunk/files/changelog.CSW 2010-01-17 22:11:26 UTC (rev 8058) +++ csw/mgar/pkg/subversion/trunk/files/changelog.CSW 2010-01-17 22:42:37 UTC (rev 8059) @@ -5,5 +5,6 @@ * Dropped openssl_rt dependency (neon with SSL support is built separately). * Dropped kerberos dependency (neon comes with Kerberos support). * Dropped libnet dependency (not required). + * Re-ordered RUNPATH and introduced $ISALIB for /opt/csw/lib/, /opt/csw/bdb47. -- Sebastian Kayser Sun, 17 Jan 2010 02:39:59 +0100 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Mon Jan 18 00:12:00 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sun, 17 Jan 2010 23:12:00 +0000 Subject: [csw-devel] SF.net SVN: gar:[8060] csw/mgar/gar/v2/bin/checkpkg.d/checkpkg.py Message-ID: Revision: 8060 http://gar.svn.sourceforge.net/gar/?rev=8060&view=rev Author: wahwah Date: 2010-01-17 23:12:00 +0000 (Sun, 17 Jan 2010) Log Message: ----------- mGAR v2: checkpkg, recognizing .pm files as Perl Modified Paths: -------------- csw/mgar/gar/v2/bin/checkpkg.d/checkpkg.py Modified: csw/mgar/gar/v2/bin/checkpkg.d/checkpkg.py =================================================================== --- csw/mgar/gar/v2/bin/checkpkg.d/checkpkg.py 2010-01-17 22:42:37 UTC (rev 8059) +++ csw/mgar/gar/v2/bin/checkpkg.d/checkpkg.py 2010-01-17 23:12:00 UTC (rev 8060) @@ -28,6 +28,12 @@ # This shared library is present on Solaris 10 on amd64, but it's missing on # Solaris 8 on i386. It's okay if it's missing. ALLOWED_ORPHAN_SONAMES = set([u"libm.so.2"]) +DEPENDENCY_FILENAME_REGEXES = ( + (r".*\.pl", u"CSWperl"), + (r".*\.pm", u"CSWperl"), + (r".*\.py", u"CSWpython"), + (r".*\.rb", u"CSWruby"), +) REPORT_TMPL = u"""$pkgname: #if $missing_deps @@ -337,12 +343,7 @@ def GuessDepsByFilename(pkgname, pkg_by_any_filename): """Guesses dependencies based on filename regexes.""" guessed_deps = set() - patterns = ( - (r".*\.py", u"CSWpython"), - (r".*\.pl", u"CSWperl"), - (r".*\.rb", u"CSWruby"), - ) - for pattern, dep_pkgname in patterns: + for pattern, dep_pkgname in DEPENDENCY_FILENAME_REGEXES: # If any file name matches, add the dep, go to the next pattern/pkg # combination. pattern_re = re.compile("^%s$" % pattern) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Mon Jan 18 08:49:09 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Mon, 18 Jan 2010 07:49:09 +0000 Subject: [csw-devel] SF.net SVN: gar:[8061] csw/mgar/pkg/subversion Message-ID: Revision: 8061 http://gar.svn.sourceforge.net/gar/?rev=8061&view=rev Author: dmichelsen Date: 2010-01-18 07:49:09 +0000 (Mon, 18 Jan 2010) Log Message: ----------- subversion: Move legacy build to tags/ Added Paths: ----------- csw/mgar/pkg/subversion/tags/legacy/ Removed Paths: ------------- csw/mgar/pkg/subversion/trunk/legacy/ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Mon Jan 18 08:50:23 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Mon, 18 Jan 2010 07:50:23 +0000 Subject: [csw-devel] SF.net SVN: gar:[8062] csw/mgar/pkg/bashdb/trunk Message-ID: Revision: 8062 http://gar.svn.sourceforge.net/gar/?rev=8062&view=rev Author: dmichelsen Date: 2010-01-18 07:50:23 +0000 (Mon, 18 Jan 2010) Log Message: ----------- bashdb: Commit patched form upstream Modified Paths: -------------- csw/mgar/pkg/bashdb/trunk/Makefile csw/mgar/pkg/bashdb/trunk/checksums Added Paths: ----------- csw/mgar/pkg/bashdb/trunk/files/0001-sf-Piwik-analytics.patch csw/mgar/pkg/bashdb/trunk/files/0002-Tolerance-for-Solaris-and-older-sed-sh-and-whatnot.patch csw/mgar/pkg/bashdb/trunk/files/0003-Tolerance-for-Solaris-and-older-sed-sh-and-whatnot.patch csw/mgar/pkg/bashdb/trunk/files/0004-Looks-like-sig-line-fixes-back-ported-to-bash-4.0.-N.patch csw/mgar/pkg/bashdb/trunk/files/0005-Administrivia.patch csw/mgar/pkg/bashdb/trunk/files/0006-sig-SunOS.right-is-same-as-sig-41.right.patch Modified: csw/mgar/pkg/bashdb/trunk/Makefile =================================================================== --- csw/mgar/pkg/bashdb/trunk/Makefile 2010-01-18 07:49:09 UTC (rev 8061) +++ csw/mgar/pkg/bashdb/trunk/Makefile 2010-01-18 07:50:23 UTC (rev 8062) @@ -1,5 +1,5 @@ GARNAME = bashdb -GARVERSION = 0_gitcurrent +GARVERSION = 4.0-0.4 # PATCHLEVEL = 75eadce CATEGORIES = utils @@ -9,14 +9,22 @@ endef # MASTER_SITES = http://cloud.github.com/downloads/rocky/bashdb/ -GIT_REPOS = git://bashdb.git.sourceforge.net/gitroot/bashdb/bashdb -GIT_USE_PROXY = 1 +# GIT_REPOS = git://bashdb.git.sourceforge.net/gitroot/bashdb/bashdb/ +# GIT_USE_PROXY = 1 # GIT_TREEISH_zshdb.git = $(PATCHLEVEL) -# DISTFILES = $(DISTNAME).tar.gz +MASTER_SITES = $(SF_MIRRORS) +DISTFILES = $(DISTNAME).tar.bz2 +# PATCHFILES = $(notdir $(wildcard $(FILEDIR)/*.patch)) +# PATCHFILES = 0001-sf-Piwik-analytics.patch +PATCHFILES += 0002-Tolerance-for-Solaris-and-older-sed-sh-and-whatnot.patch +PATCHFILES += 0003-Tolerance-for-Solaris-and-older-sed-sh-and-whatnot.patch +PATCHFILES += 0004-Looks-like-sig-line-fixes-back-ported-to-bash-4.0.-N.patch +# PATCHFILES += 0005-Administrivia.patch +PATCHFILES += 0006-sig-SunOS.right-is-same-as-sig-41.right.patch # We define upstream file regex so we can be notifed of new upstream software release -UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.bz2 REQUIRED_PKGS = CSWbash @@ -28,6 +36,6 @@ include gar/category.mk -post-extract-isa-sparcv8: - cd $(WORKSRC) && ./autogen.sh --with-bash=/opt/csw/bin/bash - @$(MAKECOOKIE) +#post-extract-isa-sparcv8: +# cd $(WORKSRC) && ./autogen.sh --with-bash=/opt/csw/bin/bash +# @$(MAKECOOKIE) Modified: csw/mgar/pkg/bashdb/trunk/checksums =================================================================== --- csw/mgar/pkg/bashdb/trunk/checksums 2010-01-18 07:49:09 UTC (rev 8061) +++ csw/mgar/pkg/bashdb/trunk/checksums 2010-01-18 07:50:23 UTC (rev 8062) @@ -1 +1,6 @@ -faab06bdb35626033fd795d9c1ccfd41 zshdb-0.04.tar.gz +ff1262d4ab1f61ac1223cb21c7887b88 0002-Tolerance-for-Solaris-and-older-sed-sh-and-whatnot.patch +028815125c41c1b37a77c38c3ca684f3 0003-Tolerance-for-Solaris-and-older-sed-sh-and-whatnot.patch +4b47af8460ffdfec3101aac858296373 0004-Looks-like-sig-line-fixes-back-ported-to-bash-4.0.-N.patch +79335104890385a5b0d8f0f47a7261b3 0005-Administrivia.patch +4d2b0f7d3999219d4aa29968d08e3eef 0006-sig-SunOS.right-is-same-as-sig-41.right.patch +eb411b64d27ccbd0093789e9e945a589 bashdb-4.0-0.4.tar.bz2 Added: csw/mgar/pkg/bashdb/trunk/files/0001-sf-Piwik-analytics.patch =================================================================== --- csw/mgar/pkg/bashdb/trunk/files/0001-sf-Piwik-analytics.patch (rev 0) +++ csw/mgar/pkg/bashdb/trunk/files/0001-sf-Piwik-analytics.patch 2010-01-18 07:50:23 UTC (rev 8062) @@ -0,0 +1,86 @@ +From 5079f62fe84e27158aca58e6850cadd4b1b859ca Mon Sep 17 00:00:00 2001 +From: rocky +Date: Tue, 27 Oct 2009 04:29:43 +0000 +Subject: [PATCH 1/6] sf Piwik analytics. + +--- + ChangeLog | 4 ++++ + htdocs/index.html | 39 +++++++++++++++++++++++++-------------- + 2 files changed, 29 insertions(+), 14 deletions(-) + +diff --git a/ChangeLog b/ChangeLog +index fa08646..85754af 100644 +--- a/ChangeLog ++++ b/ChangeLog +@@ -1,5 +1,9 @@ + 2009-10-27 rocky + ++ * ChangeLog, NEWS: See previous ++ ++2009-10-27 rocky ++ + * ChangeLog, NEWS: One more change noted + + 2009-10-27 rocky +diff --git a/htdocs/index.html b/htdocs/index.html +index da63b85..dd30324 100644 +--- a/htdocs/index.html ++++ b/htdocs/index.html +@@ -129,6 +129,18 @@ tt + + ++ ++ ++ ++ +
+

BASH Debugger

+ +@@ -196,22 +208,21 @@ repository + +

+ +-

$Id: index.html,v 1.2 2009/03/02 02:52:28 rockyb Exp $

+-

+- ++

++ + Valid HTML 4.01 Transitional +- ++ src="http://www.w3.org/Icons/valid-html401-blue" ++ alt="Valid HTML 4.01 Transitional" height="31" width="88"> ++ + Valid CSS! +- +- +- SourceForge Logo +- +-

++ src="http://jigsaw.w3.org/css-validator/images/vcss-blue" ++ alt="Valid CSS!"> ++ ++ ++ SourceForge Logo ++ ++

+
+ + +-- +1.6.2.1 + Added: csw/mgar/pkg/bashdb/trunk/files/0002-Tolerance-for-Solaris-and-older-sed-sh-and-whatnot.patch =================================================================== --- csw/mgar/pkg/bashdb/trunk/files/0002-Tolerance-for-Solaris-and-older-sed-sh-and-whatnot.patch (rev 0) +++ csw/mgar/pkg/bashdb/trunk/files/0002-Tolerance-for-Solaris-and-older-sed-sh-and-whatnot.patch 2010-01-18 07:50:23 UTC (rev 8062) @@ -0,0 +1,350 @@ +From 146bf13599cb835e8efdb8a4402286ac46ffe8c7 Mon Sep 17 00:00:00 2001 +From: rocky +Date: Sun, 20 Dec 2009 18:25:07 +0100 +Subject: [PATCH 2/6] Tolerance for Solaris and older sed, sh and whatnot + +--- + configure.ac | 4 ++ + test/data/sig-SunOS.right | 63 +++++++++++++++++++++++++++++++++++ + test/integration/check-common.sh.in | 2 +- + test/integration/settrace.tests | 4 +- + test/integration/test-interrupt | 7 +++- + test/integration/test-misc | 6 ++-- + test/integration/test-misc.in | 35 +++++++++++++++++++ + test/integration/test-multi | 2 +- + test/integration/test-parm | 2 +- + test/integration/test-setshow | 6 ++-- + test/integration/test-setshow.in | 26 ++++++++++++++ + test/integration/test-settrace | 2 +- + test/integration/test-sig | 2 + + test/integration/test-subshell | 2 +- + test/integration/test-tbreak | 2 +- + test/integration/test-trace | 2 +- + 16 files changed, 151 insertions(+), 16 deletions(-) + create mode 100644 test/data/sig-SunOS.right + create mode 100755 test/integration/test-misc.in + create mode 100755 test/integration/test-setshow.in + +diff --git a/configure.ac b/configure.ac +index 15ddaf5..fa151e7 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -242,6 +242,10 @@ AC_CONFIG_FILES([test/unit/test-save-restore.sh], + AC_CONFIG_FILES([test/unit/test-set0.sh], [chmod +x test/unit/test-set0.sh]) + AC_CONFIG_FILES([test/unit/test-sort.sh], + [chmod +x test/unit/test-sort.sh]) ++AC_CONFIG_FILES([test/integration/test-misc], ++ [chmod +x test/integration/test-misc]) ++AC_CONFIG_FILES([test/integration/test-setshow], ++ [chmod +x test/integration/test-setshow]) + + AC_CONFIG_FILES([ \ + bashdb-main.inc \ +diff --git a/test/data/sig-SunOS.right b/test/data/sig-SunOS.right +new file mode 100644 +index 0000000..4656d84 +--- /dev/null ++++ b/test/data/sig-SunOS.right +@@ -0,0 +1,63 @@ ++(sig.sh:7): ++7: if [[ "$1"x != x ]] ; then +++# Test that debugged program's signals are saved and restored across +++# debug calls. +++### Testing that we have our signal set up... +++info signals ++Signal Stop Print Stack Value ++EXIT stop noprint nostack trap -- '_Dbg_exit_handler "$BASH_COMMAND"' EXIT ++EXIT stop noprint nostack trap -- '_Dbg_exit_handler "$BASH_COMMAND"' EXIT ++SIGINT stop print showstack trap -- '_Dbg_sig_handler 2 "$BASH_COMMAND" "$@"' SIGINT ++SIGQUIT stop print showstack trap -- '_Dbg_sig_handler 3 "$BASH_COMMAND" "$@"' SIGQUIT ++SIGILL stop print showstack trap -- '_Dbg_sig_handler 4 "$BASH_COMMAND" "$@"' SIGILL ++SIGTRAP stop print showstack trap -- '_Dbg_sig_handler 5 "$BASH_COMMAND" "$@"' SIGTRAP ++SIGTERM stop print showstack trap -- '_Dbg_sig_handler 15 "$BASH_COMMAND" "$@"' SIGTERM +++### Testing handle command... +++handle TERM nostack +++handle foo ++Bad signal name: foo +++handle 1000 ++Bad signal number: 1000 +++handle TERM bogus ++Need to give a command: stop, nostop, stack, nostack, print, noprint +++eval kill -TERM $$ ++Program received signal SIGTERM (15)... +++### Should not have printed a stack trace above... +++handle TERM noprint +++handle TERM stack +++handle INT nostop +++eval kill -TERM $$ +++info signals ++Signal Stop Print Stack Value ++EXIT stop noprint nostack trap -- '_Dbg_exit_handler "$BASH_COMMAND"' EXIT ++EXIT stop noprint nostack trap -- '_Dbg_exit_handler "$BASH_COMMAND"' EXIT ++SIGINT nostop print showstack trap -- '_Dbg_sig_handler 2 "$BASH_COMMAND" "$@"' SIGINT ++SIGQUIT stop print showstack trap -- '_Dbg_sig_handler 3 "$BASH_COMMAND" "$@"' SIGQUIT ++SIGILL stop print showstack trap -- '_Dbg_sig_handler 4 "$BASH_COMMAND" "$@"' SIGILL ++SIGTRAP stop print showstack trap -- '_Dbg_sig_handler 5 "$BASH_COMMAND" "$@"' SIGTRAP ++SIGTERM stop noprint showstack trap -- '_Dbg_sig_handler 15 "$BASH_COMMAND" "$@"' SIGTERM +++continue ++Program received signal SIGTERM (15)... ++->0 in file `eval.sh' at line 1 ++##1 _Dbg_do_eval("kill", "-TERM", "$$") called from file `processor.sh' at line 402 ++##2 _Dbg_onecmd("eval", "kill -TERM $$") called from file `processor.sh' at line 167 ++##3 _Dbg_process_commands() called from file `hook.sh' at line 188 ++##4 _Dbg_debug_trap_handler("0", "[[ "$1"x != x ]]") called from file `sig.sh' at line 7 ++##5 source("sig.sh") called from file `bashdb' at line 157 ++##6 main() called from file `bashdb' at line 0 +++### Should have printed a stack trace above... +++continue +++where 1 ++->0 in file `sig.sh' at line 1 +++continue ++Program received signal SIGINT (2)... ++->0 in file `sig.sh' at line 1 ++##1 source("sig.sh") called from file `bashdb' at line 157 ++##2 main() called from file `bashdb' at line 0 ++Program received signal SIGINT (2)... ++->0 in file `sig.sh' at line 1 ++##1 source("sig.sh") called from file `bashdb' at line 157 ++##2 main() called from file `bashdb' at line 0 ++Debugged program terminated normally. Use q to quit or R to restart. +++kill ++sig.tests: line 12: 28364 Killed $SH ${top_builddir}/bashdb -B -q -L $top_builddir -x $cmdfile $debugged_script +diff --git a/test/integration/check-common.sh.in b/test/integration/check-common.sh.in +index c5d8053..c5c1532 100644 +--- a/test/integration/check-common.sh.in ++++ b/test/integration/check-common.sh.in +@@ -3,7 +3,7 @@ + + srcdir=@srcdir@ + builddir=@builddir@ +-[ -z "$SH" ] && SH=@SH_PROG@ ++[ -z "$SH" ] && export SH=@SH_PROG@ + + export top_builddir=@abs_top_builddir@ + export top_srcdir=@abs_top_srcdir@ +diff --git a/test/integration/settrace.tests b/test/integration/settrace.tests +index 2f741cc..8c25943 100755 +--- a/test/integration/settrace.tests ++++ b/test/integration/settrace.tests +@@ -1,10 +1,10 @@ +-#!/bin/sh ++#!/usr/bin/env bash + # -*- shell-script -*- + #$Id: settrace.tests,v 1.1 2008/08/22 19:25:06 rockyb Exp $ + + [ -z "$srcdir" ] && export srcdir=$PWD + [ -z "$builddir" ] && export builddir=$PWD +-[ -z "$top_builddir" ] && export top_builddir=$builddir/.. ++[ -z "$top_builddir" ] && export top_builddir=$builddir/../.. + + cmdfile=${top_builddir}/test/data/settrace.cmd + debugged_script="$top_builddir/test/example/settrace.sh" +diff --git a/test/integration/test-interrupt b/test/integration/test-interrupt +index 9977a68..2a6f63d 100755 +--- a/test/integration/test-interrupt ++++ b/test/integration/test-interrupt +@@ -5,7 +5,12 @@ + + . ${builddir}/check-common.sh + +-[[ $host_os == cygwin ]] || [[ $host_os = darwin* ]] && exit 77 ++case $host_os in ++ cygwin | darwin* | solaris* ) ++ exit ;; ++ * ) ++ break ;; ++esac + + TEST_NAME=interrupt + TEST_FILE="$builddir/${TEST_NAME}.check" +diff --git a/test/integration/test-misc b/test/integration/test-misc +index 818f56d..80f387a 100755 +--- a/test/integration/test-misc ++++ b/test/integration/test-misc +@@ -1,4 +1,4 @@ +-#!/usr/bin/env bash ++#!/opt/csw/bin/bash + # -*- shell-script -*- + #$Id: test-misc,v 1.3 2008/08/23 17:09:36 rockyb Exp $ + +@@ -16,8 +16,8 @@ debugged_script="$top_builddir/test/example/dbg-test2.sh" + + # Different OS's handle ARGV differently, and "info args" may come out + # differently depending on that. +-cat ${TEST_FILE} | sed -e "s:1 = .*/dbg-test2.sh:1 = ./example/dbg-test2.sh:" \ +-| sed -e 's:record the command history is .*:record the command history is: ' \ ++cat ${TEST_FILE} | /opt/csw/bin/gsed -e "s:1 = .*/dbg-test2.sh:1 = ./example/dbg-test2.sh:" \ ++| /opt/csw/bin/gsed -e 's:record the command history is .*:record the command history is: ' \ + > ${TEST_FILTERED_FILE} + + if (( BASH_VERSINFO[0] > 4 || \ +diff --git a/test/integration/test-misc.in b/test/integration/test-misc.in +new file mode 100755 +index 0000000..84ad349 +--- /dev/null ++++ b/test/integration/test-misc.in +@@ -0,0 +1,35 @@ ++#!@SH_PROG@ ++# -*- shell-script -*- ++#$Id: test-misc,v 1.3 2008/08/23 17:09:36 rockyb Exp $ ++ ++[ -z "$srcdir" ] && export srcdir=$PWD ++[ -z "$builddir" ] && export builddir=$PWD ++[ -z "$top_builddir" ] && export top_builddir=$builddir/../.. ++ ++TEST_NAME='misc' ++ ++. ${top_builddir}/test/integration/check-common.sh ++ ++debugged_script="$top_builddir/test/example/dbg-test2.sh" ++ ++(cd $srcdir && run_debugger $debugged_script 2>&1 >$TEST_FILE ${TEST_FILTERED_FILE} ++ ++if (( BASH_VERSINFO[0] > 4 || \ ++ (BASH_VERSINFO[0] == 4 && BASH_VERSINFO[1] >= 1) )) ; then ++ RIGHT_FILE="${top_srcdir}/test/data/${TEST_NAME}-output-41.right" ++fi ++ ++check_output $TEST_FILTERED_FILE $RIGHT_FILE ++rc=$? ++ ++((0 != rc)) && exit $rc ++rm -f $TEST_FILE ++ ++# Return code tells testing mechanism whether passed or not. ++exit 0 +diff --git a/test/integration/test-multi b/test/integration/test-multi +index c9469e7..6443b66 100755 +--- a/test/integration/test-multi ++++ b/test/integration/test-multi +@@ -1,4 +1,4 @@ +-#!/bin/sh ++#!/usr/bin/env bash + # -*- shell-script -*- + #$Id: test-multi,v 1.2 2008/08/23 16:56:21 rockyb Exp $ + +diff --git a/test/integration/test-parm b/test/integration/test-parm +index c330c64..15d988e 100755 +--- a/test/integration/test-parm ++++ b/test/integration/test-parm +@@ -1,4 +1,4 @@ +-#!/bin/sh ++#!/usr/bin/env bash + # -*- shell-script -*- + #$Id: test-parm,v 1.2 2008/08/23 16:56:21 rockyb Exp $ + +diff --git a/test/integration/test-setshow b/test/integration/test-setshow +index 612a03b..deeb3ba 100755 +--- a/test/integration/test-setshow ++++ b/test/integration/test-setshow +@@ -1,4 +1,4 @@ +-#!/bin/bash -f ++#!/opt/csw/bin/bash -f + # -*- shell-script -*- + #$Id: test-setshow,v 1.3 2008/08/23 17:09:36 rockyb Exp $ + +@@ -12,8 +12,8 @@ TEST_NAME='setshow' + + (cd $srcdir && $SH ${srcdir}/${TEST_NAME}.tests > $TEST_FILE 2>&1 < /dev/null) + +-cat ${TEST_FILE} | sed -e "s:-L .* -x .*/data/setshow\.cmd .*/example/dbg-test2.sh:-L .. -x data/setshow.cmd example/dbg-test2.sh:" \ +-| sed -e 's:record the command history is .*:record the command history is: ' \ ++cat ${TEST_FILE} | /opt/csw/bin/gsed -e "s:-L .* -x .*/data/setshow\.cmd .*/example/dbg-test2.sh:-L .. -x data/setshow.cmd example/dbg-test2.sh:" \ ++| /opt/csw/bin/gsed -e 's:record the command history is .*:record the command history is: ' \ + > ${TEST_FILTERED_FILE} + + check_output $TEST_FILTERED_FILE $RIGHT_FILE +diff --git a/test/integration/test-setshow.in b/test/integration/test-setshow.in +new file mode 100755 +index 0000000..8be8546 +--- /dev/null ++++ b/test/integration/test-setshow.in +@@ -0,0 +1,26 @@ ++#!@SH_PROG@ -f ++# -*- shell-script -*- ++#$Id: test-setshow,v 1.3 2008/08/23 17:09:36 rockyb Exp $ ++ ++[ -z "$srcdir" ] && export srcdir=$PWD ++[ -z "$builddir" ] && export builddir=$PWD ++[ -z "$top_builddir" ] && export top_builddir=$builddir/../.. ++ ++TEST_NAME='setshow' ++ ++. ${top_builddir}/test/integration/check-common.sh ++ ++(cd $srcdir && $SH ${srcdir}/${TEST_NAME}.tests > $TEST_FILE 2>&1 < /dev/null) ++ ++cat ${TEST_FILE} | @SED@ -e "s:-L .* -x .*/data/setshow\.cmd .*/example/dbg-test2.sh:-L .. -x data/setshow.cmd example/dbg-test2.sh:" \ ++| @SED@ -e 's:record the command history is .*:record the command history is: ' \ ++> ${TEST_FILTERED_FILE} ++ ++check_output $TEST_FILTERED_FILE $RIGHT_FILE ++rc=$? ++ ++((0 != rc)) && exit $rc ++rm -f $TEST_FILE ++ ++# Return code tells testing mechanism whether passed or not. ++exit 0 +diff --git a/test/integration/test-settrace b/test/integration/test-settrace +index a176850..f6b66f7 100755 +--- a/test/integration/test-settrace ++++ b/test/integration/test-settrace +@@ -1,4 +1,4 @@ +-#!/bin/sh ++#!/usr/bin/env bash + # -*- shell-script -*- + #$Id: test-settrace,v 1.2 2008/08/23 16:56:21 rockyb Exp $ + +diff --git a/test/integration/test-sig b/test/integration/test-sig +index f968e03..98b2359 100755 +--- a/test/integration/test-sig ++++ b/test/integration/test-sig +@@ -15,6 +15,8 @@ if (( BASH_VERSINFO[0] > 4 || \ + RIGHT_FILE="${top_srcdir}/test/data/${TEST_NAME}-41.right" + elif [[ $(uname -s) == 'Darwin' ]] ; then + RIGHT_FILE="${top_srcdir}/test/data/${TEST_NAME}-Darwin.right" ++elif [[ $(uname -s) == 'SunOS' ]] ; then ++ RIGHT_FILE="${top_srcdir}/test/data/${TEST_NAME}-SunOS.right" + fi + FILTERED_TEST_FILE="/tmp/${TEST_NAME}-filtered.check" + FILTERED_RIGHT_FILE="/tmp/${TEST_NAME}-filtered.right" +diff --git a/test/integration/test-subshell b/test/integration/test-subshell +index 7144b20..7c92aa8 100755 +--- a/test/integration/test-subshell ++++ b/test/integration/test-subshell +@@ -1,4 +1,4 @@ +-#!/bin/sh ++#!/usr/bin/env bash + # -*- shell-script -*- + #$Id: test-subshell,v 1.3 2008/08/29 02:55:44 rockyb Exp $ + +diff --git a/test/integration/test-tbreak b/test/integration/test-tbreak +index f078829..7891c83 100755 +--- a/test/integration/test-tbreak ++++ b/test/integration/test-tbreak +@@ -1,4 +1,4 @@ +-#!/bin/sh ++#!/usr/bin/env bash + # -*- shell-script -*- + #$Id: test-tbreak,v 1.2 2008/08/23 16:56:21 rockyb Exp $ + +diff --git a/test/integration/test-trace b/test/integration/test-trace +index 409f597..85c8340 100755 +--- a/test/integration/test-trace ++++ b/test/integration/test-trace +@@ -1,4 +1,4 @@ +-#!/bin/sh ++#!/usr/bin/env bash + # -*- shell-script -*- + #$Id: test-trace,v 1.2 2008/08/23 16:56:21 rockyb Exp $ + +-- +1.6.2.1 + Added: csw/mgar/pkg/bashdb/trunk/files/0003-Tolerance-for-Solaris-and-older-sed-sh-and-whatnot.patch =================================================================== --- csw/mgar/pkg/bashdb/trunk/files/0003-Tolerance-for-Solaris-and-older-sed-sh-and-whatnot.patch (rev 0) +++ csw/mgar/pkg/bashdb/trunk/files/0003-Tolerance-for-Solaris-and-older-sed-sh-and-whatnot.patch 2010-01-18 07:50:23 UTC (rev 8062) @@ -0,0 +1,38 @@ +From 92da4be05ec48c9c07b19527fa26cad088e6ec3c Mon Sep 17 00:00:00 2001 +From: rocky +Date: Sun, 20 Dec 2009 18:27:17 +0100 +Subject: [PATCH 3/6] Tolerance for Solaris and older sed, sh and whatnot - forgot to add new files to distro + +--- + test/data/Makefile.am | 1 + + test/integration/Makefile.am | 2 ++ + 2 files changed, 3 insertions(+), 0 deletions(-) + +diff --git a/test/data/Makefile.am b/test/data/Makefile.am +index f44b617..071aaf1 100644 +--- a/test/data/Makefile.am ++++ b/test/data/Makefile.am +@@ -69,6 +69,7 @@ check_DATA = \ + sig.right \ + sig-41.right \ + sig-Darwin.right \ ++ sig-SunOS.right \ + skip.cmd \ + skip.right \ + sopts.right \ +diff --git a/test/integration/Makefile.am b/test/integration/Makefile.am +index f64ab30..0708330 100644 +--- a/test/integration/Makefile.am ++++ b/test/integration/Makefile.am +@@ -16,6 +16,8 @@ check_DATA = \ + subshell2.tests \ + subshell3.tests \ + subshell4.tests \ ++ test-misc.in \ ++ test-setshow.in \ + trace.tests \ + trace2.tests + +-- +1.6.2.1 + Added: csw/mgar/pkg/bashdb/trunk/files/0004-Looks-like-sig-line-fixes-back-ported-to-bash-4.0.-N.patch =================================================================== --- csw/mgar/pkg/bashdb/trunk/files/0004-Looks-like-sig-line-fixes-back-ported-to-bash-4.0.-N.patch (rev 0) +++ csw/mgar/pkg/bashdb/trunk/files/0004-Looks-like-sig-line-fixes-back-ported-to-bash-4.0.-N.patch 2010-01-18 07:50:23 UTC (rev 8062) @@ -0,0 +1,177 @@ +From d2c95b0e62f91e3d47e8fd7e1300a00d332bd9a2 Mon Sep 17 00:00:00 2001 +From: rocky +Date: Sun, 20 Dec 2009 12:53:32 -0500 +Subject: [PATCH 4/6] Looks like sig line fixes back ported to bash 4.0. No need for a SunOS-specific file. + +test-misc and test-setshow are derived from .in files. +--- + test/data/sig-SunOS.right | 63 ----------------------------------------- + test/integration/test-misc | 35 ---------------------- + test/integration/test-setshow | 26 ----------------- + test/integration/test-sig | 4 +-- + 4 files changed, 1 insertions(+), 127 deletions(-) + delete mode 100644 test/data/sig-SunOS.right + delete mode 100755 test/integration/test-misc + delete mode 100755 test/integration/test-setshow + +diff --git a/test/data/sig-SunOS.right b/test/data/sig-SunOS.right +deleted file mode 100644 +index 4656d84..0000000 +--- a/test/data/sig-SunOS.right ++++ /dev/null +@@ -1,63 +0,0 @@ +-(sig.sh:7): +-7: if [[ "$1"x != x ]] ; then +-+# Test that debugged program's signals are saved and restored across +-+# debug calls. +-+### Testing that we have our signal set up... +-+info signals +-Signal Stop Print Stack Value +-EXIT stop noprint nostack trap -- '_Dbg_exit_handler "$BASH_COMMAND"' EXIT +-EXIT stop noprint nostack trap -- '_Dbg_exit_handler "$BASH_COMMAND"' EXIT +-SIGINT stop print showstack trap -- '_Dbg_sig_handler 2 "$BASH_COMMAND" "$@"' SIGINT +-SIGQUIT stop print showstack trap -- '_Dbg_sig_handler 3 "$BASH_COMMAND" "$@"' SIGQUIT +-SIGILL stop print showstack trap -- '_Dbg_sig_handler 4 "$BASH_COMMAND" "$@"' SIGILL +-SIGTRAP stop print showstack trap -- '_Dbg_sig_handler 5 "$BASH_COMMAND" "$@"' SIGTRAP +-SIGTERM stop print showstack trap -- '_Dbg_sig_handler 15 "$BASH_COMMAND" "$@"' SIGTERM +-+### Testing handle command... +-+handle TERM nostack +-+handle foo +-Bad signal name: foo +-+handle 1000 +-Bad signal number: 1000 +-+handle TERM bogus +-Need to give a command: stop, nostop, stack, nostack, print, noprint +-+eval kill -TERM $$ +-Program received signal SIGTERM (15)... +-+### Should not have printed a stack trace above... +-+handle TERM noprint +-+handle TERM stack +-+handle INT nostop +-+eval kill -TERM $$ +-+info signals +-Signal Stop Print Stack Value +-EXIT stop noprint nostack trap -- '_Dbg_exit_handler "$BASH_COMMAND"' EXIT +-EXIT stop noprint nostack trap -- '_Dbg_exit_handler "$BASH_COMMAND"' EXIT +-SIGINT nostop print showstack trap -- '_Dbg_sig_handler 2 "$BASH_COMMAND" "$@"' SIGINT +-SIGQUIT stop print showstack trap -- '_Dbg_sig_handler 3 "$BASH_COMMAND" "$@"' SIGQUIT +-SIGILL stop print showstack trap -- '_Dbg_sig_handler 4 "$BASH_COMMAND" "$@"' SIGILL +-SIGTRAP stop print showstack trap -- '_Dbg_sig_handler 5 "$BASH_COMMAND" "$@"' SIGTRAP +-SIGTERM stop noprint showstack trap -- '_Dbg_sig_handler 15 "$BASH_COMMAND" "$@"' SIGTERM +-+continue +-Program received signal SIGTERM (15)... +-->0 in file `eval.sh' at line 1 +-##1 _Dbg_do_eval("kill", "-TERM", "$$") called from file `processor.sh' at line 402 +-##2 _Dbg_onecmd("eval", "kill -TERM $$") called from file `processor.sh' at line 167 +-##3 _Dbg_process_commands() called from file `hook.sh' at line 188 +-##4 _Dbg_debug_trap_handler("0", "[[ "$1"x != x ]]") called from file `sig.sh' at line 7 +-##5 source("sig.sh") called from file `bashdb' at line 157 +-##6 main() called from file `bashdb' at line 0 +-+### Should have printed a stack trace above... +-+continue +-+where 1 +-->0 in file `sig.sh' at line 1 +-+continue +-Program received signal SIGINT (2)... +-->0 in file `sig.sh' at line 1 +-##1 source("sig.sh") called from file `bashdb' at line 157 +-##2 main() called from file `bashdb' at line 0 +-Program received signal SIGINT (2)... +-->0 in file `sig.sh' at line 1 +-##1 source("sig.sh") called from file `bashdb' at line 157 +-##2 main() called from file `bashdb' at line 0 +-Debugged program terminated normally. Use q to quit or R to restart. +-+kill +-sig.tests: line 12: 28364 Killed $SH ${top_builddir}/bashdb -B -q -L $top_builddir -x $cmdfile $debugged_script +diff --git a/test/integration/test-misc b/test/integration/test-misc +deleted file mode 100755 +index 80f387a..0000000 +--- a/test/integration/test-misc ++++ /dev/null +@@ -1,35 +0,0 @@ +-#!/opt/csw/bin/bash +-# -*- shell-script -*- +-#$Id: test-misc,v 1.3 2008/08/23 17:09:36 rockyb Exp $ +- +-[ -z "$srcdir" ] && export srcdir=$PWD +-[ -z "$builddir" ] && export builddir=$PWD +-[ -z "$top_builddir" ] && export top_builddir=$builddir/../.. +- +-TEST_NAME='misc' +- +-. ${top_builddir}/test/integration/check-common.sh +- +-debugged_script="$top_builddir/test/example/dbg-test2.sh" +- +-(cd $srcdir && run_debugger $debugged_script 2>&1 >$TEST_FILE ${TEST_FILTERED_FILE} +- +-if (( BASH_VERSINFO[0] > 4 || \ +- (BASH_VERSINFO[0] == 4 && BASH_VERSINFO[1] >= 1) )) ; then +- RIGHT_FILE="${top_srcdir}/test/data/${TEST_NAME}-output-41.right" +-fi +- +-check_output $TEST_FILTERED_FILE $RIGHT_FILE +-rc=$? +- +-((0 != rc)) && exit $rc +-rm -f $TEST_FILE +- +-# Return code tells testing mechanism whether passed or not. +-exit 0 +diff --git a/test/integration/test-setshow b/test/integration/test-setshow +deleted file mode 100755 +index deeb3ba..0000000 +--- a/test/integration/test-setshow ++++ /dev/null +@@ -1,26 +0,0 @@ +-#!/opt/csw/bin/bash -f +-# -*- shell-script -*- +-#$Id: test-setshow,v 1.3 2008/08/23 17:09:36 rockyb Exp $ +- +-[ -z "$srcdir" ] && export srcdir=$PWD +-[ -z "$builddir" ] && export builddir=$PWD +-[ -z "$top_builddir" ] && export top_builddir=$builddir/../.. +- +-TEST_NAME='setshow' +- +-. ${top_builddir}/test/integration/check-common.sh +- +-(cd $srcdir && $SH ${srcdir}/${TEST_NAME}.tests > $TEST_FILE 2>&1 < /dev/null) +- +-cat ${TEST_FILE} | /opt/csw/bin/gsed -e "s:-L .* -x .*/data/setshow\.cmd .*/example/dbg-test2.sh:-L .. -x data/setshow.cmd example/dbg-test2.sh:" \ +-| /opt/csw/bin/gsed -e 's:record the command history is .*:record the command history is: ' \ +-> ${TEST_FILTERED_FILE} +- +-check_output $TEST_FILTERED_FILE $RIGHT_FILE +-rc=$? +- +-((0 != rc)) && exit $rc +-rm -f $TEST_FILE +- +-# Return code tells testing mechanism whether passed or not. +-exit 0 +diff --git a/test/integration/test-sig b/test/integration/test-sig +index 98b2359..1a69609 100755 +--- a/test/integration/test-sig ++++ b/test/integration/test-sig +@@ -11,10 +11,8 @@ TEST_NAME='sig' + . ${top_builddir}/test/integration/check-common.sh + + if (( BASH_VERSINFO[0] > 4 || \ +- (BASH_VERSINFO[0] == 4 && BASH_VERSINFO[1] >= 1) )) ; then ++ (BASH_VERSINFO[0] == 4 && BASH_VERSINFO[1] >= 0) )) ; then + RIGHT_FILE="${top_srcdir}/test/data/${TEST_NAME}-41.right" +-elif [[ $(uname -s) == 'Darwin' ]] ; then +- RIGHT_FILE="${top_srcdir}/test/data/${TEST_NAME}-Darwin.right" + elif [[ $(uname -s) == 'SunOS' ]] ; then + RIGHT_FILE="${top_srcdir}/test/data/${TEST_NAME}-SunOS.right" + fi +-- +1.6.2.1 + Added: csw/mgar/pkg/bashdb/trunk/files/0005-Administrivia.patch =================================================================== --- csw/mgar/pkg/bashdb/trunk/files/0005-Administrivia.patch (rev 0) +++ csw/mgar/pkg/bashdb/trunk/files/0005-Administrivia.patch 2010-01-18 07:50:23 UTC (rev 8062) @@ -0,0 +1,48 @@ +From af51c5aba3ecd33b36423ddfc524f621e29a3a87 Mon Sep 17 00:00:00 2001 +From: rocky +Date: Sun, 20 Dec 2009 12:57:11 -0500 +Subject: [PATCH 5/6] Administrivia + +--- + .gitignore | 4 +++- + test/integration/.gitignore | 6 ++++-- + 2 files changed, 7 insertions(+), 3 deletions(-) + +diff --git a/.gitignore b/.gitignore +index a91f589..8b0b39f 100644 +--- a/.gitignore ++++ b/.gitignore +@@ -1,8 +1,11 @@ ++/*~ + /Makefile + /Makefile.in + /aclocal.m4 + /autom4te.cache + /bashdb ++/bashdb-4.*tar.gz ++/bashdb-4.*tar.bz2 + /bashdb-main.inc + /bashdb-trace + /compile +@@ -20,4 +23,3 @@ + /libtool + /missing + /stamp-h1 +-/*~ +diff --git a/test/integration/.gitignore b/test/integration/.gitignore +index ff80915..45f7bb3 100644 +--- a/test/integration/.gitignore ++++ b/test/integration/.gitignore +@@ -1,5 +1,7 @@ ++/*.check ++/*~ + /Makefile + /Makefile.in + /check-common.sh +-/*.check +-/*~ ++/test-misc ++/test-setshow +-- +1.6.2.1 + Added: csw/mgar/pkg/bashdb/trunk/files/0006-sig-SunOS.right-is-same-as-sig-41.right.patch =================================================================== --- csw/mgar/pkg/bashdb/trunk/files/0006-sig-SunOS.right-is-same-as-sig-41.right.patch (rev 0) +++ csw/mgar/pkg/bashdb/trunk/files/0006-sig-SunOS.right-is-same-as-sig-41.right.patch 2010-01-18 07:50:23 UTC (rev 8062) @@ -0,0 +1,24 @@ +From fe4012d2196d8b0ab2ef531e62616e13e479d1f2 Mon Sep 17 00:00:00 2001 +From: rocky +Date: Thu, 24 Dec 2009 22:54:12 -0500 +Subject: [PATCH 6/6] sig-SunOS.right is same as sig-41.right. + +--- + test/data/Makefile.am | 1 - + 1 files changed, 0 insertions(+), 1 deletions(-) + +diff --git a/test/data/Makefile.am b/test/data/Makefile.am +index 071aaf1..f44b617 100644 +--- a/test/data/Makefile.am ++++ b/test/data/Makefile.am +@@ -69,7 +69,6 @@ check_DATA = \ + sig.right \ + sig-41.right \ + sig-Darwin.right \ +- sig-SunOS.right \ + skip.cmd \ + skip.right \ + sopts.right \ +-- +1.6.2.1 + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Mon Jan 18 08:51:13 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Mon, 18 Jan 2010 07:51:13 +0000 Subject: [csw-devel] SF.net SVN: gar:[8063] csw/mgar/pkg/libbonobo2 Message-ID: Revision: 8063 http://gar.svn.sourceforge.net/gar/?rev=8063&view=rev Author: dmichelsen Date: 2010-01-18 07:51:12 +0000 (Mon, 18 Jan 2010) Log Message: ----------- libbonobo2: Initial commit Added Paths: ----------- csw/mgar/pkg/libbonobo2/branches/ csw/mgar/pkg/libbonobo2/tags/ csw/mgar/pkg/libbonobo2/tags/legacy/ csw/mgar/pkg/libbonobo2/trunk/Makefile csw/mgar/pkg/libbonobo2/trunk/checksums csw/mgar/pkg/libbonobo2/trunk/files/ Property Changed: ---------------- csw/mgar/pkg/libbonobo2/trunk/ Property changes on: csw/mgar/pkg/libbonobo2/trunk ___________________________________________________________________ Added: svn:ignore + cookies download work Added: svn:externals + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 Added: csw/mgar/pkg/libbonobo2/trunk/Makefile =================================================================== --- csw/mgar/pkg/libbonobo2/trunk/Makefile (rev 0) +++ csw/mgar/pkg/libbonobo2/trunk/Makefile 2010-01-18 07:51:12 UTC (rev 8063) @@ -0,0 +1,22 @@ +GARNAME = libbonobo +GARVERSION = 2.24.2 +CATEGORIES = gnome + +DESCRIPTION = GNOME component and compound document system +define BLURB +endef + +MASTER_SITES = $(GNOME_MIRROR) +DISTFILES = $(GARNAME)-$(GARVERSION).tar.bz2 + +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + +BUILD64 = 1 +CONFIGURE_ARGS = $(DIRPATHS) + +TEST_TARGET = check + +include gar/category.mk + +PATH := /opt/csw/gnu:$(PATH) Added: csw/mgar/pkg/libbonobo2/trunk/checksums =================================================================== --- csw/mgar/pkg/libbonobo2/trunk/checksums (rev 0) +++ csw/mgar/pkg/libbonobo2/trunk/checksums 2010-01-18 07:51:12 UTC (rev 8063) @@ -0,0 +1 @@ +5c7c5ea9c2f78a3c1e9ff2f1e27ad751 libbonobo-2.24.2.tar.bz2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Mon Jan 18 08:52:12 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Mon, 18 Jan 2010 07:52:12 +0000 Subject: [csw-devel] SF.net SVN: gar:[8064] csw/mgar/pkg Message-ID: Revision: 8064 http://gar.svn.sourceforge.net/gar/?rev=8064&view=rev Author: dmichelsen Date: 2010-01-18 07:52:12 +0000 (Mon, 18 Jan 2010) Log Message: ----------- libmkv: Initial commit, doesn't compile yet Added Paths: ----------- csw/mgar/pkg/libmkv/ csw/mgar/pkg/libmkv/branches/ csw/mgar/pkg/libmkv/tags/ csw/mgar/pkg/libmkv/trunk/ csw/mgar/pkg/libmkv/trunk/Makefile csw/mgar/pkg/libmkv/trunk/checksums csw/mgar/pkg/libmkv/trunk/files/ Property changes on: csw/mgar/pkg/libmkv/trunk ___________________________________________________________________ Added: svn:ignore + cookies download work Added: svn:externals + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 Added: csw/mgar/pkg/libmkv/trunk/Makefile =================================================================== --- csw/mgar/pkg/libmkv/trunk/Makefile (rev 0) +++ csw/mgar/pkg/libmkv/trunk/Makefile 2010-01-18 07:52:12 UTC (rev 8064) @@ -0,0 +1,22 @@ +GARNAME = libmkv +GARVERSION = 1.0 +CATEGORIES = category + +DESCRIPTION = Brief description +define BLURB + Long description +endef + +MASTER_SITES = +DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz + +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + +# If the url used to check for software update is different of MASTER_SITES, then +# uncomment the next line. Otherwise it is set by default to the value of MASTER_SITES +# UPSTREAM_MASTER_SITES = + +CONFIGURE_ARGS = $(DIRPATHS) + +include gar/category.mk This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From hson at users.sourceforge.net Mon Jan 18 09:59:03 2010 From: hson at users.sourceforge.net (hson at users.sourceforge.net) Date: Mon, 18 Jan 2010 08:59:03 +0000 Subject: [csw-devel] SF.net SVN: gar:[8065] csw/mgar/pkg/libproxy/trunk/Makefile Message-ID: Revision: 8065 http://gar.svn.sourceforge.net/gar/?rev=8065&view=rev Author: hson Date: 2010-01-18 08:59:03 +0000 (Mon, 18 Jan 2010) Log Message: ----------- libproxy: Make libproxy build and package on both Solaris8 and Solaris10 with same Makefile Modified Paths: -------------- csw/mgar/pkg/libproxy/trunk/Makefile Modified: csw/mgar/pkg/libproxy/trunk/Makefile =================================================================== --- csw/mgar/pkg/libproxy/trunk/Makefile 2010-01-18 07:52:12 UTC (rev 8064) +++ csw/mgar/pkg/libproxy/trunk/Makefile 2010-01-18 08:59:03 UTC (rev 8065) @@ -13,25 +13,32 @@ MASTER_SITES = http://libproxy.googlecode.com/files/ DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz +DISTFILES += SunStudio-have-no-stdc99-flag.patch +DISTFILES += Solaris8-have-no-stdc99-flag.patch +DISTFILES += stdfiles.patch +DISTFILES += proxy.c.patch +DISTFILES += 0002-Dont-preset-CFLAGS.patch + +PACKAGING_PLATFORMS = solaris8-sparc solaris8-i386 +PACKAGING_PLATFORMS += solaris10-sparc solaris10-i386 + #PATCHFILES = 0001-Use-xc99-for-Sun-Studio-compiler.patch -PATCHFILES += 0002-Dont-preset-CFLAGS.patch # For Solaris 10 targets -#PATCHFILES_isa-amd64 += SunStudio-have-no-stdc99-flag.patch -#PATCHFILES_isa-sparcv8 += SunStudio-have-no-stdc99-flag.patch -#PATCHFILES_isa-sparcv9 += SunStudio-have-no-stdc99-flag.patch -#PATCHFILES_isa-i386 += SunStudio-have-no-stdc99-flag.patch +PATCHFILES_solaris10-sparc += SunStudio-have-no-stdc99-flag.patch +PATCHFILES_solaris10-i386 += SunStudio-have-no-stdc99-flag.patch #For Solaris 8 targets -PATCHFILES_isa-amd64 += SunStudio-have-no-stdc99-flag.patch -PATCHFILES_isa-sparcv8 += Solaris8-have-no-stdc99-flag.patch -PATCHFILES_isa-sparcv8 += stdfiles.patch -PATCHFILES_isa-sparcv8 += proxy.c.patch -PATCHFILES_isa-sparcv9 += Solaris8-have-no-stdc99-flag.patch -PATCHFILES_isa-sparcv9 += stdfiles.patch -PATCHFILES_isa-sparcv9 += proxy.c.patch -PATCHFILES_isa-i386 += Solaris8-have-no-stdc99-flag.patch -PATCHFILES_isa-i386 += stdfiles.patch -PATCHFILES_isa-i386 += proxy.c.patch +PATCHFILES_solaris8-sparc += Solaris8-have-no-stdc99-flag.patch +PATCHFILES_solaris8-sparc += stdfiles.patch +PATCHFILES_solaris8-sparc += proxy.c.patch +PATCHFILES_solaris8-i386_isa-amd64 += SunStudio-have-no-stdc99-flag.patch +PATCHFILES_solaris8-i386_isa-i386 += Solaris8-have-no-stdc99-flag.patch +PATCHFILES_solaris8-i386_isa-i386 += stdfiles.patch +PATCHFILES_solaris8-i386_isa-i386 += proxy.c.patch +PATCHFILES += $(PATCHFILES_$(PLATFORM)) +PATCHFILES += $(PATCHFILES_$(PLATFORM)_$(MODULATION)) +PATCHFILES += 0002-Dont-preset-CFLAGS.patch + PACKAGES = CSWlibproxy CSWlibproxydevel CSWpy-libproxy CATALOGNAME_CSWlibproxy = libproxy CATALOGNAME_CSWlibproxydevel = libproxy_devel This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Mon Jan 18 10:08:07 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Mon, 18 Jan 2010 09:08:07 +0000 Subject: [csw-devel] SF.net SVN: gar:[8066] csw/mgar/pkg/libtasn1/trunk Message-ID: Revision: 8066 http://gar.svn.sourceforge.net/gar/?rev=8066&view=rev Author: dmichelsen Date: 2010-01-18 09:08:07 +0000 (Mon, 18 Jan 2010) Log Message: ----------- libtasn1: Update to 2.4 Modified Paths: -------------- csw/mgar/pkg/libtasn1/trunk/Makefile csw/mgar/pkg/libtasn1/trunk/checksums Modified: csw/mgar/pkg/libtasn1/trunk/Makefile =================================================================== --- csw/mgar/pkg/libtasn1/trunk/Makefile 2010-01-18 08:59:03 UTC (rev 8065) +++ csw/mgar/pkg/libtasn1/trunk/Makefile 2010-01-18 09:08:07 UTC (rev 8066) @@ -1,9 +1,12 @@ GARNAME = libtasn1 -GARVERSION = 2.3 +GARVERSION = 2.4 CATEGORIES = lib DESCRIPTION = GNU ASN1 library define BLURB + Libtasn1 is the ASN.1 library used by GnuTLS, GNU Shishi and some other packages. + It was written by Fabio Fiorina, and has been shipped as part of GnuTLS for some + time but is now a proper GNU package. endef MASTER_SITES = $(GNU_MIRROR) Modified: csw/mgar/pkg/libtasn1/trunk/checksums =================================================================== --- csw/mgar/pkg/libtasn1/trunk/checksums 2010-01-18 08:59:03 UTC (rev 8065) +++ csw/mgar/pkg/libtasn1/trunk/checksums 2010-01-18 09:08:07 UTC (rev 8066) @@ -1 +1 @@ -4f0918cf8fe8b2b4ba189938772d1dd2 libtasn1-2.3.tar.gz +bdfd59d6eb7924350e91367eb8adaa3c libtasn1-2.4.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bonivart at users.sourceforge.net Mon Jan 18 10:11:24 2010 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Mon, 18 Jan 2010 09:11:24 +0000 Subject: [csw-devel] SF.net SVN: gar:[8067] csw/mgar/pkg/memconf/trunk Message-ID: Revision: 8067 http://gar.svn.sourceforge.net/gar/?rev=8067&view=rev Author: bonivart Date: 2010-01-18 09:11:24 +0000 (Mon, 18 Jan 2010) Log Message: ----------- memconf: update to 2.13 Modified Paths: -------------- csw/mgar/pkg/memconf/trunk/Makefile csw/mgar/pkg/memconf/trunk/checksums Modified: csw/mgar/pkg/memconf/trunk/Makefile =================================================================== --- csw/mgar/pkg/memconf/trunk/Makefile 2010-01-18 09:08:07 UTC (rev 8066) +++ csw/mgar/pkg/memconf/trunk/Makefile 2010-01-18 09:11:24 UTC (rev 8067) @@ -1,5 +1,5 @@ GARNAME = memconf -GARVERSION = 2.12 +GARVERSION = 2.13 CATEGORIES = utils DESCRIPTION = perl script that displays memory modules installed Modified: csw/mgar/pkg/memconf/trunk/checksums =================================================================== --- csw/mgar/pkg/memconf/trunk/checksums 2010-01-18 09:08:07 UTC (rev 8066) +++ csw/mgar/pkg/memconf/trunk/checksums 2010-01-18 09:11:24 UTC (rev 8067) @@ -1,3 +1,3 @@ 818efbe29da417ad462e3f6345690c3d COPYING -25f0fc4fcd06e749dedc2e0fa7e0287b memconf.gz -a99158c0948d76ecb9012494697c840b memconf.man +ff3f49496c54bba509801800e3e154b9 memconf.gz +d850cd562037cd972be81a86efb8566b memconf.man This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From hson at users.sourceforge.net Mon Jan 18 10:34:38 2010 From: hson at users.sourceforge.net (hson at users.sourceforge.net) Date: Mon, 18 Jan 2010 09:34:38 +0000 Subject: [csw-devel] SF.net SVN: gar:[8068] csw/mgar/pkg/libproxy/tags Message-ID: Revision: 8068 http://gar.svn.sourceforge.net/gar/?rev=8068&view=rev Author: hson Date: 2010-01-18 09:34:38 +0000 (Mon, 18 Jan 2010) Log Message: ----------- libproxy: Tag release version Added Paths: ----------- csw/mgar/pkg/libproxy/tags/libproxy-0.3.0REV=2010.01.18/ csw/mgar/pkg/libproxy/tags/libproxy-0.3.0REV=2010.01.18/Makefile csw/mgar/pkg/libproxy/tags/libproxy-0.3.0REV=2010.01.18/checksums csw/mgar/pkg/libproxy/tags/libproxy-0.3.0REV=2010.01.18/files/0001-Use-xc99-for-Sun-Studio-compiler.patch csw/mgar/pkg/libproxy/tags/libproxy-0.3.0REV=2010.01.18/files/Solaris8-have-no-stdc99-flag.patch csw/mgar/pkg/libproxy/tags/libproxy-0.3.0REV=2010.01.18/files/SunStudio-have-no-stdc99-flag.patch csw/mgar/pkg/libproxy/tags/libproxy-0.3.0REV=2010.01.18/files/proxy.c.patch csw/mgar/pkg/libproxy/tags/libproxy-0.3.0REV=2010.01.18/files/stdfiles.patch Removed Paths: ------------- csw/mgar/pkg/libproxy/tags/libproxy-0.3.0REV=2010.01.15/ csw/mgar/pkg/libproxy/tags/libproxy-0.3.0REV=2010.01.18/Makefile csw/mgar/pkg/libproxy/tags/libproxy-0.3.0REV=2010.01.18/checksums csw/mgar/pkg/libproxy/tags/libproxy-0.3.0REV=2010.01.18/files/0001-Use-xc99-for-Sun-Studio-compiler.patch Deleted: csw/mgar/pkg/libproxy/tags/libproxy-0.3.0REV=2010.01.18/Makefile =================================================================== --- csw/mgar/pkg/libproxy/trunk/Makefile 2010-01-11 15:28:58 UTC (rev 7969) +++ csw/mgar/pkg/libproxy/tags/libproxy-0.3.0REV=2010.01.18/Makefile 2010-01-18 09:34:38 UTC (rev 8068) @@ -1,33 +0,0 @@ -GARNAME = libproxy -GARVERSION = 0.3.0 -CATEGORIES = lib - -DESCRIPTION = A library that provides automatic proxy configuration management -define BLURB - libproxy exists to answer the question: Given a network resource, how do I - reach it? It handles all the details, enabling you to get back to programming. - GNOME? KDE? Command line? WPAD? PAC? Network changed? It doesn't matter! Just - ask libproxy what proxy to use: you get simple code and your users get correct, - consistant behavior and broad infrastructure compatibility. -endef - -MASTER_SITES = http://libproxy.googlecode.com/files/ -DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz -PATCHFILES = 0001-Use-xc99-for-Sun-Studio-compiler.patch -PATCHFILES += 0002-Dont-preset-CFLAGS.patch - -# We define upstream file regex so we can be notifed of new upstream software release -UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz - -PACKAGING_PLATFORMS = solaris10-sparc solaris10-i386 - -EXTRA_LINKER_FLAGS = -lnsl -BUILD64 = 1 -CONFIGURE_ARGS = $(DIRPATHS) - -TEST_TARGET = check - -include gar/category.mk - -# There is actually the cpp executable in /usr/lib -PATH := $(PATH):/usr/lib Copied: csw/mgar/pkg/libproxy/tags/libproxy-0.3.0REV=2010.01.18/Makefile (from rev 8065, csw/mgar/pkg/libproxy/trunk/Makefile) =================================================================== --- csw/mgar/pkg/libproxy/tags/libproxy-0.3.0REV=2010.01.18/Makefile (rev 0) +++ csw/mgar/pkg/libproxy/tags/libproxy-0.3.0REV=2010.01.18/Makefile 2010-01-18 09:34:38 UTC (rev 8068) @@ -0,0 +1,100 @@ +GARNAME = libproxy +GARVERSION = 0.3.0 +CATEGORIES = lib + +DESCRIPTION = A library that provides automatic proxy configuration management +define BLURB + libproxy exists to answer the question: Given a network resource, how do I + reach it? It handles all the details, enabling you to get back to programming. + GNOME? KDE? Command line? WPAD? PAC? Network changed? It doesn't matter! Just + ask libproxy what proxy to use: you get simple code and your users get correct, + consistant behavior and broad infrastructure compatibility. +endef + +MASTER_SITES = http://libproxy.googlecode.com/files/ +DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz +DISTFILES += SunStudio-have-no-stdc99-flag.patch +DISTFILES += Solaris8-have-no-stdc99-flag.patch +DISTFILES += stdfiles.patch +DISTFILES += proxy.c.patch +DISTFILES += 0002-Dont-preset-CFLAGS.patch + +PACKAGING_PLATFORMS = solaris8-sparc solaris8-i386 +PACKAGING_PLATFORMS += solaris10-sparc solaris10-i386 + +#PATCHFILES = 0001-Use-xc99-for-Sun-Studio-compiler.patch +# For Solaris 10 targets +PATCHFILES_solaris10-sparc += SunStudio-have-no-stdc99-flag.patch +PATCHFILES_solaris10-i386 += SunStudio-have-no-stdc99-flag.patch +#For Solaris 8 targets +PATCHFILES_solaris8-sparc += Solaris8-have-no-stdc99-flag.patch +PATCHFILES_solaris8-sparc += stdfiles.patch +PATCHFILES_solaris8-sparc += proxy.c.patch +PATCHFILES_solaris8-i386_isa-amd64 += SunStudio-have-no-stdc99-flag.patch +PATCHFILES_solaris8-i386_isa-i386 += Solaris8-have-no-stdc99-flag.patch +PATCHFILES_solaris8-i386_isa-i386 += stdfiles.patch +PATCHFILES_solaris8-i386_isa-i386 += proxy.c.patch +PATCHFILES += $(PATCHFILES_$(PLATFORM)) +PATCHFILES += $(PATCHFILES_$(PLATFORM)_$(MODULATION)) +PATCHFILES += 0002-Dont-preset-CFLAGS.patch + + +PACKAGES = CSWlibproxy CSWlibproxydevel CSWpy-libproxy +CATALOGNAME_CSWlibproxy = libproxy +CATALOGNAME_CSWlibproxydevel = libproxy_devel +CATALOGNAME_CSWpy-libproxy = py_libproxy +SPKG_DESC_CSWlibproxy = A library that provides automatic proxy configuration management +SPKG_DESC_CSWlibproxydevel = A library that provides automatic proxy configuration management - development files +SPKG_DESC_CSWpy-libproxy = A library that provides automatic proxy configuration management - Python bindings + +REQUIRED_PKGS_CSWlibproxy += CSWlibice CSWlibsm CSWlibx11 CSWlibxmu CSWlibxt +REQUIRED_PKGS_CSWlibproxydevel += CSWlibproxy +REQUIRED_PKGS_CSWpy-libproxy += CSWpython CSWlibproxy +PREREQUISITE_PKGS += CSWlibx11devel CSWlibxmudevel CSWlibdbusdev +#Disable Mozilla/Firefox/Seamonkey plugin until there is a 64-bit version +#PREREQUISITE_PKGS += CSWmozilla CSWseamonkey CSWfirefox + +PKGFILES_CSWlibproxydevel = $(PKGFILES_DEVEL) +PKGFILES_CSWpy-libproxy = $(libdir).*/python/site-packages/.* + +ARCHALL_CSWpy-libproxy = 1 + +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + +#PACKAGING_PLATFORMS = solaris10-sparc solaris10-i386 + +EXTRA_LINKER_FLAGS = -lnsl +BUILD64 = 1 + +EXTRA_INC = $(prefix)/X11/include +EXTRA_LIB = $(prefix)/X11/lib +EXTRA_PKG_CONFIG_DIRS = $(prefix)/X11/lib +#Disable Mozilla/Firefox/Seamonkey plugin until there is a 64-bit version +#EXTRA_PKG_CONFIG_DIRS += $(prefix)/mozilla/lib +#EXTRA_PKG_CONFIG_DIRS += $(prefix)/mozilla/firefox/lib +#EXTRA_PKG_CONFIG_DIRS += $(prefix)/mozilla/seamonkey/lib + + +CONFIGURE_ARGS = $(DIRPATHS) +#Disable Mozilla/Firefox/Seamonkey plugin until there is a 64-bit version +CONFIGURE_ARGS += --without-mozjs +CONFIGURE_ARGS += --with-python +CONFIGURE_ARGS += --disable-silent-rules + +TEST_TARGET = check + +include gar/category.mk + +#pre-configure-modulated: +# @echo " ==> Regenerating build tools..." +# @(cd $(WORKSRC) ; \ +# aclocal && \ +# autoconf && \ +# libtoolize --automake --force && \ +# aclocal && \ +# automake -a ) +# @$(MAKECOOKIE) + + +# There is actually the cpp executable in /usr/lib +PATH := $(PATH):/usr/lib Deleted: csw/mgar/pkg/libproxy/tags/libproxy-0.3.0REV=2010.01.18/checksums =================================================================== --- csw/mgar/pkg/libproxy/trunk/checksums 2010-01-11 15:28:58 UTC (rev 7969) +++ csw/mgar/pkg/libproxy/tags/libproxy-0.3.0REV=2010.01.18/checksums 2010-01-18 09:34:38 UTC (rev 8068) @@ -1,3 +0,0 @@ -ce2d836df293fa8183265176459cf87e 0001-Use-xc99-for-Sun-Studio-compiler.patch -acd3e61f107ff188722fb1335e0ed37c 0002-Dont-preset-CFLAGS.patch -6ded75a6c6aef53be657ece207cc26c4 libproxy-0.3.0.tar.gz Copied: csw/mgar/pkg/libproxy/tags/libproxy-0.3.0REV=2010.01.18/checksums (from rev 8006, csw/mgar/pkg/libproxy/trunk/checksums) =================================================================== --- csw/mgar/pkg/libproxy/tags/libproxy-0.3.0REV=2010.01.18/checksums (rev 0) +++ csw/mgar/pkg/libproxy/tags/libproxy-0.3.0REV=2010.01.18/checksums 2010-01-18 09:34:38 UTC (rev 8068) @@ -0,0 +1,6 @@ +acd3e61f107ff188722fb1335e0ed37c 0002-Dont-preset-CFLAGS.patch +dd08c0fd4795084e5970d59f8de149dd Solaris8-have-no-stdc99-flag.patch +95c2645311c9e840c0ed81c7a9aefadb SunStudio-have-no-stdc99-flag.patch +6ded75a6c6aef53be657ece207cc26c4 libproxy-0.3.0.tar.gz +647cefd3bb414eb269cb59aace9eb35b proxy.c.patch +7dd25dd1f615fe7a3c2a1d9c9a179e74 stdfiles.patch Deleted: csw/mgar/pkg/libproxy/tags/libproxy-0.3.0REV=2010.01.18/files/0001-Use-xc99-for-Sun-Studio-compiler.patch =================================================================== --- csw/mgar/pkg/libproxy/trunk/files/0001-Use-xc99-for-Sun-Studio-compiler.patch 2010-01-11 15:28:58 UTC (rev 7969) +++ csw/mgar/pkg/libproxy/tags/libproxy-0.3.0REV=2010.01.18/files/0001-Use-xc99-for-Sun-Studio-compiler.patch 2010-01-18 09:34:38 UTC (rev 8068) @@ -1,56 +0,0 @@ -From 3ea26b980c8929de2f92a33de49a09dc12f63a68 Mon Sep 17 00:00:00 2001 -From: Dagobert Michelsen -Date: Tue, 5 Jan 2010 15:29:01 +0100 -Subject: [PATCH] Use xc99 for Sun Studio compiler - ---- - src/bin/Makefile.am | 2 +- - src/bin/Makefile.in | 2 +- - src/lib/Makefile.am | 2 +- - src/lib/Makefile.in | 2 +- - src/modules/Makefile.am | 2 +- - src/modules/Makefile.in | 2 +- - 6 files changed, 6 insertions(+), 6 deletions(-) - -diff --git a/src/bin/Makefile.in b/src/bin/Makefile.in -index 625fbb3..ed8cd56 100644 ---- a/src/bin/Makefile.in -+++ b/src/bin/Makefile.in -@@ -239,7 +239,7 @@ xmu_LIBS = @xmu_LIBS@ - - # Command line interface to libproxy - proxy_SOURCES = proxy.c --proxy_CPPFLAGS = -I$(top_srcdir)/src/lib -std=c99 -+proxy_CPPFLAGS = -I$(top_srcdir)/src/lib -xc99 - proxy_LDADD = ../lib/libproxy.la - all: all-am - -diff --git a/src/lib/Makefile.in b/src/lib/Makefile.in -index 77bb2da..73e087c 100644 ---- a/src/lib/Makefile.in -+++ b/src/lib/Makefile.in -@@ -277,7 +277,7 @@ libproxy_la_SOURCES = \ - strdict.c strdict.h \ - url.c url.h - --libproxy_la_CFLAGS = -DMODULEDIR=\"@MODULEDIR@@DIR_SEPARATOR@\" -DSYSCONFDIR=\"@SYSCONFDIR@@DIR_SEPARATOR@\" -std=c99 -D_POSIX_C_SOURCE=200112L -+libproxy_la_CFLAGS = -DMODULEDIR=\"@MODULEDIR@@DIR_SEPARATOR@\" -DSYSCONFDIR=\"@SYSCONFDIR@@DIR_SEPARATOR@\" -xc99 -D_POSIX_C_SOURCE=200112L - libproxy_la_LDFLAGS = -lpthread -lm -no-undefined - include_HEADERS = proxy.h - all: all-am -diff --git a/src/modules/Makefile.in b/src/modules/Makefile.in -index 6965056..45c9c57 100644 ---- a/src/modules/Makefile.in -+++ b/src/modules/Makefile.in -@@ -359,7 +359,7 @@ x11_LIBS = @x11_LIBS@ - xmu_CFLAGS = @xmu_CFLAGS@ - xmu_LIBS = @xmu_LIBS@ - moduledir = @MODULEDIR@ --AM_CFLAGS = -std=c99 -+AM_CFLAGS = -xc99 - AM_LDFLAGS = -module -avoid-version -no-undefined - - # Which modules to build --- -1.6.6 - Copied: csw/mgar/pkg/libproxy/tags/libproxy-0.3.0REV=2010.01.18/files/0001-Use-xc99-for-Sun-Studio-compiler.patch (from rev 8005, csw/mgar/pkg/libproxy/trunk/files/0001-Use-xc99-for-Sun-Studio-compiler.patch) =================================================================== --- csw/mgar/pkg/libproxy/tags/libproxy-0.3.0REV=2010.01.18/files/0001-Use-xc99-for-Sun-Studio-compiler.patch (rev 0) +++ csw/mgar/pkg/libproxy/tags/libproxy-0.3.0REV=2010.01.18/files/0001-Use-xc99-for-Sun-Studio-compiler.patch 2010-01-18 09:34:38 UTC (rev 8068) @@ -0,0 +1,56 @@ +From 3ea26b980c8929de2f92a33de49a09dc12f63a68 Mon Sep 17 00:00:00 2001 +From: Dagobert Michelsen +Date: Tue, 5 Jan 2010 15:29:01 +0100 +Subject: [PATCH] Use xc99 for Sun Studio compiler + +--- + src/bin/Makefile.am | 2 +- + src/bin/Makefile.in | 2 +- + src/lib/Makefile.am | 2 +- + src/lib/Makefile.in | 2 +- + src/modules/Makefile.am | 2 +- + src/modules/Makefile.in | 2 +- + 6 files changed, 6 insertions(+), 6 deletions(-) + +diff --git a/src/bin/Makefile.in b/src/bin/Makefile.in +index 625fbb3..ed8cd56 100644 +--- a/src/bin/Makefile.in ++++ b/src/bin/Makefile.in +@@ -239,7 +239,7 @@ xmu_LIBS = @xmu_LIBS@ + + # Command line interface to libproxy + proxy_SOURCES = proxy.c +-proxy_CPPFLAGS = -I$(top_srcdir)/src/lib -std=c99 ++proxy_CPPFLAGS = -I$(top_srcdir)/src/lib -xc99 + proxy_LDADD = ../lib/libproxy.la + all: all-am + +diff --git a/src/lib/Makefile.in b/src/lib/Makefile.in +index 77bb2da..73e087c 100644 +--- a/src/lib/Makefile.in ++++ b/src/lib/Makefile.in +@@ -277,7 +277,7 @@ libproxy_la_SOURCES = \ + strdict.c strdict.h \ + url.c url.h + +-libproxy_la_CFLAGS = -DMODULEDIR=\"@MODULEDIR@@DIR_SEPARATOR@\" -DSYSCONFDIR=\"@SYSCONFDIR@@DIR_SEPARATOR@\" -std=c99 -D_POSIX_C_SOURCE=200112L ++libproxy_la_CFLAGS = -DMODULEDIR=\"@MODULEDIR@@DIR_SEPARATOR@\" -DSYSCONFDIR=\"@SYSCONFDIR@@DIR_SEPARATOR@\" -xc99 -D_POSIX_C_SOURCE=200112L + libproxy_la_LDFLAGS = -lpthread -lm -no-undefined + include_HEADERS = proxy.h + all: all-am +diff --git a/src/modules/Makefile.in b/src/modules/Makefile.in +index 6965056..45c9c57 100644 +--- a/src/modules/Makefile.in ++++ b/src/modules/Makefile.in +@@ -359,7 +359,7 @@ x11_LIBS = @x11_LIBS@ + xmu_CFLAGS = @xmu_CFLAGS@ + xmu_LIBS = @xmu_LIBS@ + moduledir = @MODULEDIR@ +-AM_CFLAGS = -std=c99 ++AM_CFLAGS = -xc99 + AM_LDFLAGS = -module -avoid-version -no-undefined + + # Which modules to build +-- +1.6.6 + Copied: csw/mgar/pkg/libproxy/tags/libproxy-0.3.0REV=2010.01.18/files/Solaris8-have-no-stdc99-flag.patch (from rev 8006, csw/mgar/pkg/libproxy/trunk/files/Solaris8-have-no-stdc99-flag.patch) =================================================================== --- csw/mgar/pkg/libproxy/tags/libproxy-0.3.0REV=2010.01.18/files/Solaris8-have-no-stdc99-flag.patch (rev 0) +++ csw/mgar/pkg/libproxy/tags/libproxy-0.3.0REV=2010.01.18/files/Solaris8-have-no-stdc99-flag.patch 2010-01-18 09:34:38 UTC (rev 8068) @@ -0,0 +1,134 @@ +diff -Nru libproxy-0.3.0.orig/src/bin/Makefile.am libproxy-0.3.0/src/bin/Makefile.am +--- libproxy-0.3.0.orig/src/bin/Makefile.am 2009-08-14 21:00:32.000000000 +0200 ++++ libproxy-0.3.0/src/bin/Makefile.am 2010-01-07 12:16:16.608932753 +0100 +@@ -2,5 +2,5 @@ + + # Command line interface to libproxy + proxy_SOURCES = proxy.c +-proxy_CPPFLAGS = -I$(top_srcdir)/src/lib -std=c99 ++proxy_CPPFLAGS = -I$(top_srcdir)/src/lib + proxy_LDADD = ../lib/libproxy.la +diff -Nru libproxy-0.3.0.orig/src/lib/Makefile.am libproxy-0.3.0/src/lib/Makefile.am +--- libproxy-0.3.0.orig/src/lib/Makefile.am 2009-08-14 21:00:32.000000000 +0200 ++++ libproxy-0.3.0/src/lib/Makefile.am 2010-01-07 12:17:37.568266736 +0100 +@@ -10,8 +10,8 @@ + strdict.c strdict.h \ + url.c url.h + +-libproxy_la_CFLAGS = -DMODULEDIR=\"@MODULEDIR@@DIR_SEPARATOR@\" -DSYSCONFDIR=\"@SYSCONFDIR@@DIR_SEPARATOR@\" -std=c99 -D_POSIX_C_SOURCE=200112L ++libproxy_la_CFLAGS = -DMODULEDIR=\"@MODULEDIR@@DIR_SEPARATOR@\" -DSYSCONFDIR=\"@SYSCONFDIR@@DIR_SEPARATOR@\" + libproxy_la_LDFLAGS = -lpthread -lm -no-undefined + + include_HEADERS = proxy.h + +diff -Nru libproxy-0.3.0.orig/src/lib/Makefile.in libproxy-0.3.0/src/lib/Makefile.in +--- libproxy-0.3.0.orig/src/lib/Makefile.in 2009-08-14 21:05:15.000000000 +0200 ++++ libproxy-0.3.0/src/lib/Makefile.in 2010-01-07 11:58:19.284179024 +0100 +@@ -277,7 +277,7 @@ + strdict.c strdict.h \ + url.c url.h + +-libproxy_la_CFLAGS = -DMODULEDIR=\"@MODULEDIR@@DIR_SEPARATOR@\" -DSYSCONFDIR=\"@SYSCONFDIR@@DIR_SEPARATOR@\" -std=c99 -D_POSIX_C_SOURCE=200112L ++libproxy_la_CFLAGS = -DMODULEDIR=\"@MODULEDIR@@DIR_SEPARATOR@\" -DSYSCONFDIR=\"@SYSCONFDIR@@DIR_SEPARATOR@\" + libproxy_la_LDFLAGS = -lpthread -lm -no-undefined + include_HEADERS = proxy.h + all: all-am +diff -Nru libproxy-0.3.0.orig/src/modules/Makefile.am libproxy-0.3.0/src/modules/Makefile.am +--- libproxy-0.3.0.orig/src/modules/Makefile.am 2009-08-14 21:06:30.000000000 +0200 ++++ libproxy-0.3.0/src/modules/Makefile.am 2010-01-07 12:18:24.020865842 +0100 +@@ -1,5 +1,5 @@ + moduledir = @MODULEDIR@ +-AM_CFLAGS = -std=c99 ++AM_CFLAGS = + AM_LDFLAGS = -module -avoid-version -no-undefined + + +@@ -50,7 +50,7 @@ + + # GConf/GNOME Config Module + config_gnome_la_SOURCES = config_gnome.c xhasclient.c +-config_gnome_la_CPPFLAGS = -I$(top_srcdir)/src/lib -D_POSIX_C_SOURCE=200112L -DGCONFTOOLBIN='"@GCONFTOOLBIN@"' @GNOME_CFLAGS@ ++config_gnome_la_CPPFLAGS = -I$(top_srcdir)/src/lib -DGCONFTOOLBIN='"@GCONFTOOLBIN@"' @GNOME_CFLAGS@ + config_gnome_la_LIBADD = ../lib/libproxy.la + config_gnome_la_LDFLAGS = $(AM_LDFLAGS) @GNOME_LIBS@ + +@@ -77,12 +77,12 @@ + + # IP Ignore Module + ignore_ip_la_SOURCES = ignore_ip.c +-ignore_ip_la_CPPFLAGS = -I$(top_srcdir)/src/lib -D_POSIX_C_SOURCE=200112L ++ignore_ip_la_CPPFLAGS = -I$(top_srcdir)/src/lib + ignore_ip_la_LIBADD = ../lib/libproxy.la + + # WebKit (JavaScriptCore) based PAC runner + pacrunner_webkit_la_SOURCES = pacrunner_webkit.c +-pacrunner_webkit_la_CPPFLAGS = -I$(top_srcdir)/src/lib @WEBKIT_CFLAGS@ -D_POSIX_C_SOURCE=200112L ++pacrunner_webkit_la_CPPFLAGS = -I$(top_srcdir)/src/lib @WEBKIT_CFLAGS@ + pacrunner_webkit_la_LIBADD = ../lib/libproxy.la + if MINGW32 + pacrunner_webkit_la_LIBADD += ../platform/win32/libwinutils.la +@@ -92,7 +92,7 @@ + + # Mozilla (Spidermonkey) based PAC runner + pacrunner_mozjs_la_SOURCES = pacrunner_mozjs.c +-pacrunner_mozjs_la_CPPFLAGS = -I$(top_srcdir)/src/lib @MOZJS_CFLAGS@ -D_POSIX_C_SOURCE=200112L ++pacrunner_mozjs_la_CPPFLAGS = -I$(top_srcdir)/src/lib @MOZJS_CFLAGS@ + pacrunner_mozjs_la_LIBADD = ../lib/libproxy.la + pacrunner_mozjs_la_LDFLAGS = $(AM_LDFLAGS) @MOZJS_LIBS@ + nodist_pacrunner_mozjs_la_SOURCES = pacutils.h +diff -Nru libproxy-0.3.0.orig/src/modules/Makefile.in libproxy-0.3.0/src/modules/Makefile.in +--- libproxy-0.3.0.orig/src/modules/Makefile.in 2009-08-14 21:07:00.000000000 +0200 ++++ libproxy-0.3.0/src/modules/Makefile.in 2010-01-14 18:03:41.850944638 +0100 +@@ -359,7 +359,7 @@ + xmu_CFLAGS = @xmu_CFLAGS@ + xmu_LIBS = @xmu_LIBS@ + moduledir = @MODULEDIR@ +-AM_CFLAGS = -std=c99 ++AM_CFLAGS = + AM_LDFLAGS = -module -avoid-version -no-undefined + + # Which modules to build +@@ -385,7 +385,7 @@ + + # GConf/GNOME Config Module + config_gnome_la_SOURCES = config_gnome.c xhasclient.c +-config_gnome_la_CPPFLAGS = -I$(top_srcdir)/src/lib -D_POSIX_C_SOURCE=200112L -DGCONFTOOLBIN='"@GCONFTOOLBIN@"' @GNOME_CFLAGS@ ++config_gnome_la_CPPFLAGS = -I$(top_srcdir)/src/lib -DGCONFTOOLBIN='"@GCONFTOOLBIN@"' @GNOME_CFLAGS@ + config_gnome_la_LIBADD = ../lib/libproxy.la + config_gnome_la_LDFLAGS = $(AM_LDFLAGS) @GNOME_LIBS@ + +@@ -412,19 +412,19 @@ + + # IP Ignore Module + ignore_ip_la_SOURCES = ignore_ip.c +-ignore_ip_la_CPPFLAGS = -I$(top_srcdir)/src/lib -D_POSIX_C_SOURCE=200112L ++ignore_ip_la_CPPFLAGS = -I$(top_srcdir)/src/lib + ignore_ip_la_LIBADD = ../lib/libproxy.la + + # WebKit (JavaScriptCore) based PAC runner + pacrunner_webkit_la_SOURCES = pacrunner_webkit.c +-pacrunner_webkit_la_CPPFLAGS = -I$(top_srcdir)/src/lib @WEBKIT_CFLAGS@ -D_POSIX_C_SOURCE=200112L ++pacrunner_webkit_la_CPPFLAGS = -I$(top_srcdir)/src/lib @WEBKIT_CFLAGS@ + pacrunner_webkit_la_LIBADD = ../lib/libproxy.la $(am__append_10) + pacrunner_webkit_la_LDFLAGS = $(AM_LDFLAGS) @WEBKIT_LIBS@ + nodist_pacrunner_webkit_la_SOURCES = pacutils.h + + # Mozilla (Spidermonkey) based PAC runner + pacrunner_mozjs_la_SOURCES = pacrunner_mozjs.c +-pacrunner_mozjs_la_CPPFLAGS = -I$(top_srcdir)/src/lib @MOZJS_CFLAGS@ -D_POSIX_C_SOURCE=200112L ++pacrunner_mozjs_la_CPPFLAGS = -I$(top_srcdir)/src/lib @MOZJS_CFLAGS@ + pacrunner_mozjs_la_LIBADD = ../lib/libproxy.la + pacrunner_mozjs_la_LDFLAGS = $(AM_LDFLAGS) @MOZJS_LIBS@ + nodist_pacrunner_mozjs_la_SOURCES = pacutils.h +diff -Nru libproxy-0.3.0.orig/src/bin/Makefile.in libproxy-0.3.0/src/bin/Makefile.in +--- libproxy-0.3.0.orig/src/bin/Makefile.in 2009-08-14 21:05:15.000000000 +0200 ++++ libproxy-0.3.0/src/bin/Makefile.in 2010-01-14 18:04:24.531275033 +0100 +@@ -239,7 +239,7 @@ + + # Command line interface to libproxy + proxy_SOURCES = proxy.c +-proxy_CPPFLAGS = -I$(top_srcdir)/src/lib -std=c99 ++proxy_CPPFLAGS = -I$(top_srcdir)/src/lib + proxy_LDADD = ../lib/libproxy.la + all: all-am + Copied: csw/mgar/pkg/libproxy/tags/libproxy-0.3.0REV=2010.01.18/files/SunStudio-have-no-stdc99-flag.patch (from rev 8006, csw/mgar/pkg/libproxy/trunk/files/SunStudio-have-no-stdc99-flag.patch) =================================================================== --- csw/mgar/pkg/libproxy/tags/libproxy-0.3.0REV=2010.01.18/files/SunStudio-have-no-stdc99-flag.patch (rev 0) +++ csw/mgar/pkg/libproxy/tags/libproxy-0.3.0REV=2010.01.18/files/SunStudio-have-no-stdc99-flag.patch 2010-01-18 09:34:38 UTC (rev 8068) @@ -0,0 +1,69 @@ +diff -Nru libproxy-0.3.0.orig/src/bin/Makefile.am libproxy-0.3.0/src/bin/Makefile.am +--- libproxy-0.3.0.orig/src/bin/Makefile.am 2009-08-14 21:00:32.000000000 +0200 ++++ libproxy-0.3.0/src/bin/Makefile.am 2010-01-07 12:16:16.608932753 +0100 +@@ -2,5 +2,5 @@ + + # Command line interface to libproxy + proxy_SOURCES = proxy.c +-proxy_CPPFLAGS = -I$(top_srcdir)/src/lib -std=c99 ++proxy_CPPFLAGS = -I$(top_srcdir)/src/lib -xc99 + proxy_LDADD = ../lib/libproxy.la +diff -Nru libproxy-0.3.0.orig/src/lib/Makefile.am libproxy-0.3.0/src/lib/Makefile.am +--- libproxy-0.3.0.orig/src/lib/Makefile.am 2009-08-14 21:00:32.000000000 +0200 ++++ libproxy-0.3.0/src/lib/Makefile.am 2010-01-07 12:17:37.568266736 +0100 +@@ -10,8 +10,8 @@ + strdict.c strdict.h \ + url.c url.h + +-libproxy_la_CFLAGS = -DMODULEDIR=\"@MODULEDIR@@DIR_SEPARATOR@\" -DSYSCONFDIR=\"@SYSCONFDIR@@DIR_SEPARATOR@\" -std=c99 -D_POSIX_C_SOURCE=200112L ++libproxy_la_CFLAGS = -DMODULEDIR=\"@MODULEDIR@@DIR_SEPARATOR@\" -DSYSCONFDIR=\"@SYSCONFDIR@@DIR_SEPARATOR@\" -xc99 -D_POSIX_C_SOURCE=200112L + libproxy_la_LDFLAGS = -lpthread -lm -no-undefined + + include_HEADERS = proxy.h + +diff -Nru libproxy-0.3.0.orig/src/lib/Makefile.in libproxy-0.3.0/src/lib/Makefile.in +--- libproxy-0.3.0.orig/src/lib/Makefile.in 2009-08-14 21:05:15.000000000 +0200 ++++ libproxy-0.3.0/src/lib/Makefile.in 2010-01-07 11:58:19.284179024 +0100 +@@ -277,7 +277,7 @@ + strdict.c strdict.h \ + url.c url.h + +-libproxy_la_CFLAGS = -DMODULEDIR=\"@MODULEDIR@@DIR_SEPARATOR@\" -DSYSCONFDIR=\"@SYSCONFDIR@@DIR_SEPARATOR@\" -std=c99 -D_POSIX_C_SOURCE=200112L ++libproxy_la_CFLAGS = -DMODULEDIR=\"@MODULEDIR@@DIR_SEPARATOR@\" -DSYSCONFDIR=\"@SYSCONFDIR@@DIR_SEPARATOR@\" -xc99 -D_POSIX_C_SOURCE=200112L + libproxy_la_LDFLAGS = -lpthread -lm -no-undefined + include_HEADERS = proxy.h + all: all-am +diff -Nru libproxy-0.3.0.orig/src/modules/Makefile.am libproxy-0.3.0/src/modules/Makefile.am +--- libproxy-0.3.0.orig/src/modules/Makefile.am 2009-08-14 21:06:30.000000000 +0200 ++++ libproxy-0.3.0/src/modules/Makefile.am 2010-01-07 12:18:24.020865842 +0100 +@@ -1,5 +1,5 @@ + moduledir = @MODULEDIR@ +-AM_CFLAGS = -std=c99 ++AM_CFLAGS = -xc99 + AM_LDFLAGS = -module -avoid-version -no-undefined + + +diff -Nru libproxy-0.3.0.orig/src/modules/Makefile.in libproxy-0.3.0/src/modules/Makefile.in +--- libproxy-0.3.0.orig/src/modules/Makefile.in 2009-08-14 21:07:00.000000000 +0200 ++++ libproxy-0.3.0/src/modules/Makefile.in 2010-01-14 18:03:41.850944638 +0100 +@@ -359,7 +359,7 @@ + xmu_CFLAGS = @xmu_CFLAGS@ + xmu_LIBS = @xmu_LIBS@ + moduledir = @MODULEDIR@ +-AM_CFLAGS = -std=c99 ++AM_CFLAGS = -xc99 + AM_LDFLAGS = -module -avoid-version -no-undefined + + # Which modules to build +diff -Nru libproxy-0.3.0.orig/src/bin/Makefile.in libproxy-0.3.0/src/bin/Makefile.in +--- libproxy-0.3.0.orig/src/bin/Makefile.in 2009-08-14 21:05:15.000000000 +0200 ++++ libproxy-0.3.0/src/bin/Makefile.in 2010-01-14 18:04:24.531275033 +0100 +@@ -239,7 +239,7 @@ + + # Command line interface to libproxy + proxy_SOURCES = proxy.c +-proxy_CPPFLAGS = -I$(top_srcdir)/src/lib -std=c99 ++proxy_CPPFLAGS = -I$(top_srcdir)/src/lib -xc99 + proxy_LDADD = ../lib/libproxy.la + all: all-am + Copied: csw/mgar/pkg/libproxy/tags/libproxy-0.3.0REV=2010.01.18/files/proxy.c.patch (from rev 8006, csw/mgar/pkg/libproxy/trunk/files/proxy.c.patch) =================================================================== --- csw/mgar/pkg/libproxy/tags/libproxy-0.3.0REV=2010.01.18/files/proxy.c.patch (rev 0) +++ csw/mgar/pkg/libproxy/tags/libproxy-0.3.0REV=2010.01.18/files/proxy.c.patch 2010-01-18 09:34:38 UTC (rev 8068) @@ -0,0 +1,40 @@ +diff -Nru libproxy-0.3.0.orig/src/lib/proxy.c libproxy-0.3.0/src/lib/proxy.c +--- libproxy-0.3.0.orig/src/lib/proxy.c 2009-08-14 21:00:32.000000000 +0200 ++++ libproxy-0.3.0/src/lib/proxy.c 2010-01-07 11:57:19.188739832 +0100 +@@ -162,17 +162,37 @@ + if (!px_module_manager_register_type(self->mm, pxWPADModule, _px_wpad_module_cmp, false)) goto error; + + /* If we have a config file, load the config order from it */ ++#if (defined(__SUNPRO_C) && ( defined(__SunOS_5_8) || defined(__SunOS_5_9))) ++ char *envp; ++ envp = px_malloc0(strlen("_PX_CONFIG_ORDER")+3); ++ sprintf(envp,"_PX_CONFIG_ORDER="); ++ putenv(envp); ++#else + setenv("_PX_CONFIG_ORDER", "", 1); ++#endif + pxConfigFile *cf = px_config_file_new(SYSCONFDIR "proxy.conf"); + if (cf) + { + char *tmp = px_config_file_get_value(cf, PX_CONFIG_FILE_DEFAULT_SECTION, "config_order"); + px_config_file_free(cf); ++#if (defined(__SUNPRO_C) && ( defined(__SunOS_5_8) || defined(__SunOS_5_9))) ++ if (tmp) { ++ int retval; ++ envp = px_malloc0(strlen("_PX_CONFIG_ORDER")+strlen(tmp)+2); ++ sprintf(envp,"_PX_CONFIG_ORDER=%s",tmp); ++ retval = putenv(envp); ++ if(retval) { ++ px_free(tmp); ++ goto error; ++ } ++ } ++#else + if (tmp && setenv("_PX_CONFIG_ORDER", tmp, 1)) + { + px_free(tmp); + goto error; + } ++#endif + px_free(tmp); + } Copied: csw/mgar/pkg/libproxy/tags/libproxy-0.3.0REV=2010.01.18/files/stdfiles.patch (from rev 8006, csw/mgar/pkg/libproxy/trunk/files/stdfiles.patch) =================================================================== --- csw/mgar/pkg/libproxy/tags/libproxy-0.3.0REV=2010.01.18/files/stdfiles.patch (rev 0) +++ csw/mgar/pkg/libproxy/tags/libproxy-0.3.0REV=2010.01.18/files/stdfiles.patch 2010-01-18 09:34:38 UTC (rev 8068) @@ -0,0 +1,34 @@ +diff -Nru libproxy-0.3.0.orig/src/lib/stdbool.h libproxy-0.3.0/src/lib/stdbool.h +--- libproxy-0.3.0.orig/src/lib/stdbool.h 1970-01-01 01:00:00.000000000 +0100 ++++ libproxy-0.3.0/src/lib/stdbool.h 2010-01-15 00:49:51.930719445 +0100 +@@ -0,0 +1,17 @@ ++#ifndef _STDBOOL_H ++#ifndef _MY_STDBOOL_H ++#define _MY_STDBOOL_H ++ ++#if !defined(__GNUG__) && (defined(__SUNPRO_C) && ( defined(__SunOS_5_8) || defined(__SunOS_5_9))) ++ ++#ifndef bool ++#define bool int ++#define false 0 ++#define true 1 ++#endif /* bool */ ++ ++#endif /* Compiler has bool */ ++ ++ ++#endif /* _MY_BOOL_H_*/ ++#endif /* _STDBOOL_H_*/ +diff -Nru libproxy-0.3.0.orig/src/lib/stdint.h libproxy-0.3.0/src/lib/stdint.h +--- libproxy-0.3.0.orig/src/lib/stdint.h 1970-01-01 01:00:00.000000000 +0100 ++++ libproxy-0.3.0/src/lib/stdint.h 2010-01-15 01:00:57.971084112 +0100 +@@ -0,0 +1,9 @@ ++#ifndef _STDINT_H ++#ifndef _MY_STDINT_H ++#define _MY_STDINT_H ++ ++#if !defined(__GNUG__) && (defined(__SUNPRO_C) && ( defined(__SunOS_5_8) || defined(__SunOS_5_9))) ++#include ++#endif /* Compiler has stdint.h */ ++#endif /* _MY_STDINT_H */ ++#endif /* _STDINT_H */ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Mon Jan 18 11:36:17 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Mon, 18 Jan 2010 10:36:17 +0000 Subject: [csw-devel] SF.net SVN: gar:[8069] csw/mgar/pkg Message-ID: Revision: 8069 http://gar.svn.sourceforge.net/gar/?rev=8069&view=rev Author: dmichelsen Date: 2010-01-18 10:36:17 +0000 (Mon, 18 Jan 2010) Log Message: ----------- libgnugetopt: Initial commit Added Paths: ----------- csw/mgar/pkg/libgnugetopt/ csw/mgar/pkg/libgnugetopt/branches/ csw/mgar/pkg/libgnugetopt/tags/ csw/mgar/pkg/libgnugetopt/trunk/ csw/mgar/pkg/libgnugetopt/trunk/Makefile csw/mgar/pkg/libgnugetopt/trunk/checksums csw/mgar/pkg/libgnugetopt/trunk/files/ Property changes on: csw/mgar/pkg/libgnugetopt/trunk ___________________________________________________________________ Added: svn:ignore + cookies download work Added: svn:externals + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 Added: csw/mgar/pkg/libgnugetopt/trunk/Makefile =================================================================== --- csw/mgar/pkg/libgnugetopt/trunk/Makefile (rev 0) +++ csw/mgar/pkg/libgnugetopt/trunk/Makefile 2010-01-18 10:36:17 UTC (rev 8069) @@ -0,0 +1,20 @@ +GARNAME = libgnugetopt +GARVERSION = 1.3 +CATEGORIES = lib + +DESCRIPTION = Library containing getopt_long +define BLURB +endef + +MASTER_SITES = http://distfiles.macports.org/libgnugetopt/ +DISTFILES = $(GARNAME)-$(GARVERSION).tar.bz2 + +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.bz2 + +BUILD64 = 1 +CONFIGURE_ARGS = $(DIRPATHS) + +TEST_TARGET = check + +include gar/category.mk Added: csw/mgar/pkg/libgnugetopt/trunk/checksums =================================================================== --- csw/mgar/pkg/libgnugetopt/trunk/checksums (rev 0) +++ csw/mgar/pkg/libgnugetopt/trunk/checksums 2010-01-18 10:36:17 UTC (rev 8069) @@ -0,0 +1 @@ +0aaa5f3b90a6f7c44aeec26cd61dca92 libgnugetopt-1.3.tar.bz2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Mon Jan 18 11:54:06 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Mon, 18 Jan 2010 10:54:06 +0000 Subject: [csw-devel] SF.net SVN: gar:[8070] csw/mgar/gar/v2/gar.conf.mk Message-ID: Revision: 8070 http://gar.svn.sourceforge.net/gar/?rev=8070&view=rev Author: dmichelsen Date: 2010-01-18 10:54:06 +0000 (Mon, 18 Jan 2010) Log Message: ----------- mGAR v2: Add Berlios support Modified Paths: -------------- csw/mgar/gar/v2/gar.conf.mk Modified: csw/mgar/gar/v2/gar.conf.mk =================================================================== --- csw/mgar/gar/v2/gar.conf.mk 2010-01-18 10:36:17 UTC (rev 8069) +++ csw/mgar/gar/v2/gar.conf.mk 2010-01-18 10:54:06 UTC (rev 8070) @@ -561,6 +561,10 @@ GOOGLE_PROJECT ?= $(GARNAME) GOOGLE_MIRROR ?= http://$(GOOGLE_PROJECT).googlecode.com/files/ +# Berlios +BERLIOS_PROJECT ?= $(GARNAME) +BERLIOS_MIRROR ?= http://download.berlios.de/$(BERLIOS_PROJECT)/ http://download2.berlios.de/$(BERLIOS_PROJECT)/ + # GNU GNU_SITE = http://mirrors.kernel.org GNU_GNUROOT = $(GNU_SITE)/gnu This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Mon Jan 18 13:30:10 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Mon, 18 Jan 2010 12:30:10 +0000 Subject: [csw-devel] SF.net SVN: gar:[8071] csw/mgar/pkg Message-ID: Revision: 8071 http://gar.svn.sourceforge.net/gar/?rev=8071&view=rev Author: dmichelsen Date: 2010-01-18 12:30:10 +0000 (Mon, 18 Jan 2010) Log Message: ----------- lensfun: Initial commit, doesn't compile yet Added Paths: ----------- csw/mgar/pkg/lensfun/ csw/mgar/pkg/lensfun/branches/ csw/mgar/pkg/lensfun/tags/ csw/mgar/pkg/lensfun/trunk/ csw/mgar/pkg/lensfun/trunk/Makefile csw/mgar/pkg/lensfun/trunk/checksums csw/mgar/pkg/lensfun/trunk/files/ Property changes on: csw/mgar/pkg/lensfun/trunk ___________________________________________________________________ Added: svn:ignore + cookies download work Added: svn:externals + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 Added: csw/mgar/pkg/lensfun/trunk/Makefile =================================================================== --- csw/mgar/pkg/lensfun/trunk/Makefile (rev 0) +++ csw/mgar/pkg/lensfun/trunk/Makefile 2010-01-18 12:30:10 UTC (rev 8071) @@ -0,0 +1,61 @@ +GARNAME = lensfun +GARVERSION = 0.2.4 +CATEGORIES = lib + +DESCRIPTION = Library to correct images based on intimate knowledge of lens characteristics +define BLURB + The project provides a database of photographic lenses and a library that allows + advanced access to the database including functions to correct images based on + intimate knowledge of lens characteristics and calibration data. +endef + +MASTER_SITES = $(BERLIOS_MIRROR) +DISTFILES = $(GARNAME)-$(GARVERSION).tar.bz2 + +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.bz2 + +REQUIRED_PKGS = CSWzlib CSWpng +PREREQUISITE_PKGS = $(REQUIRED_PKGS) CSWpython CSWdoxygen + +PACKAGES = CSWliblensfun +CATALOGNAME = liblensfun + +SPKG_SOURCEURL = http://developer.berlios.de/projects/lensfun/ + +LD=$(CC) +EXTRA_COMMON_EXPORTS = LD + +BUILD64 = 1 +# This is not autoconf, but some hand-hacked Python thingie. +CONFIGURE_ARGS = --prefix=$(prefix) +CONFIGURE_ARGS += --bindir=$(bindir) +CONFIGURE_ARGS += --sysconfdir=$(sysconfdir) +CONFIGURE_ARGS += --datadir=$(datadir) +CONFIGURE_ARGS += --libdir=$(libdir) +CONFIGURE_ARGS += --includedir=$(includedir) +CONFIGURE_ARGS += --libexecdir=$(libexecdir) +CONFIGURE_ARGS += --docdir=$(docdir) +CONFIGURE_ARGS += --verbose +CONFIGURE_ARGS += --mode=release +# CONFIGURE_ARGS += --compiler=$(CC) +# [ "CC", None, "Override the C compiler name/path" ], +# [ "CXX", None, "Override the C++ compiler name/path" ], +# [ "LD", None, "Override the linker name/path" ] +CONFIGURE_ARGS += --cflags="$(CFLAGS)" +CONFIGURE_ARGS += --cxxflags="$(CXXFLAGS)" +CONFIGURE_ARGS += --ldflags="$(LDFLAGS)" +CONFIGURE_ARGS += --target=posix +CONFIGURE_ARGS += --staticlibs=NO +# --libs=LIBS Additional libraries to link with + +BUILD_ARG = all + +include gar/category.mk + +# Make sure we have GNU make with name "make" before /usr/ccs/bin/make +PATH := /opt/csw/gnu:$(PATH) + +post-extract-modulated: + perl -pi -e "s,#!/usr/bin/python,#!/opt/csw/bin/python," $(WORKSRC)/configure + @$(MAKECOOKIE) Added: csw/mgar/pkg/lensfun/trunk/checksums =================================================================== --- csw/mgar/pkg/lensfun/trunk/checksums (rev 0) +++ csw/mgar/pkg/lensfun/trunk/checksums 2010-01-18 12:30:10 UTC (rev 8071) @@ -0,0 +1 @@ +ce5c25fc708d1c629d485fbf959dc1cc lensfun-0.2.4.tar.bz2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Mon Jan 18 13:39:53 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Mon, 18 Jan 2010 12:39:53 +0000 Subject: [csw-devel] SF.net SVN: gar:[8072] csw/mgar/pkg/sasl/branches/sasl-2.1.23-mGARv2 Message-ID: Revision: 8072 http://gar.svn.sourceforge.net/gar/?rev=8072&view=rev Author: dmichelsen Date: 2010-01-18 12:39:52 +0000 (Mon, 18 Jan 2010) Log Message: ----------- sasl branch 2.1.23: Move to mGAR v2 Modified Paths: -------------- csw/mgar/pkg/sasl/branches/sasl-2.1.23-mGARv2/Makefile csw/mgar/pkg/sasl/branches/sasl-2.1.23-mGARv2/checksums csw/mgar/pkg/sasl/branches/sasl-2.1.23-mGARv2/files/cswsaslauthd.init Removed Paths: ------------- csw/mgar/pkg/sasl/branches/sasl-2.1.23-mGARv2/files/CSWsasl.depend csw/mgar/pkg/sasl/branches/sasl-2.1.23-mGARv2/files/CSWsasl.gspec csw/mgar/pkg/sasl/branches/sasl-2.1.23-mGARv2/files/CSWsasl.postinstall csw/mgar/pkg/sasl/branches/sasl-2.1.23-mGARv2/files/CSWsasl.preinstall csw/mgar/pkg/sasl/branches/sasl-2.1.23-mGARv2/files/CSWsaslauthd.depend csw/mgar/pkg/sasl/branches/sasl-2.1.23-mGARv2/files/CSWsaslauthd.gspec csw/mgar/pkg/sasl/branches/sasl-2.1.23-mGARv2/files/CSWsaslgssapi.depend csw/mgar/pkg/sasl/branches/sasl-2.1.23-mGARv2/files/CSWsaslgssapi.gspec csw/mgar/pkg/sasl/branches/sasl-2.1.23-mGARv2/files/CSWsaslgssapi.prototype csw/mgar/pkg/sasl/branches/sasl-2.1.23-mGARv2/files/CSWsaslsql.depend csw/mgar/pkg/sasl/branches/sasl-2.1.23-mGARv2/files/CSWsaslsql.gspec csw/mgar/pkg/sasl/branches/sasl-2.1.23-mGARv2/files/CSWsaslsql.prototype csw/mgar/pkg/sasl/branches/sasl-2.1.23-mGARv2/files/cswusergroup Modified: csw/mgar/pkg/sasl/branches/sasl-2.1.23-mGARv2/Makefile =================================================================== --- csw/mgar/pkg/sasl/branches/sasl-2.1.23-mGARv2/Makefile 2010-01-18 12:30:10 UTC (rev 8071) +++ csw/mgar/pkg/sasl/branches/sasl-2.1.23-mGARv2/Makefile 2010-01-18 12:39:52 UTC (rev 8072) @@ -11,40 +11,25 @@ layer is inserted between the protocol and the connection. endef -# Source location MASTER_SITES = ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/ - -# Visitor information -SPKG_SOURCEURL = http://asg.web.cmu.edu/sasl/ - WORKSRC = $(WORKDIR)/cyrus-$(GARNAME)-$(GARVERSION) DISTFILES = cyrus-$(GARNAME)-$(GARVERSION).tar.gz - -# SASL libraries and utilities -DISTFILES += CSWsasl.preinstall CSWsasl.postinstall -# SASL authentication server -#DISTFILES += $(call admfiles,CSWsaslauthd,$(ADMADDON)) -# SASL sql plugin -#DISTFILES += $(call admfiles,CSWsaslsql,$(ADMSTANDARD)) -# SASL gssapi plugin -#DISTFILES += $(call admfiles,CSWsaslgssapi,$(ADMSTANDARD)) - -DISTFILES += cswusergroup - -# Init files for SASLAUTHD DISTFILES += cswsaslauthd.init saslauthd.init.CSW +DISTFILES += README.sasl README.saslauthd PATCHFILES = saslauthd-doc.diff saslauthd-groff.diff ltmain.diff PACKAGES = CSWsasl CSWsaslauthd CSWsaslgssapi CSWsaslsql +SPKG_SOURCEURL = http://asg.web.cmu.edu/sasl/ + CATALOGNAME_CSWsasl = sasl CATALOGNAME_CSWsaslauthd = saslauthd CATALOGNAME_CSWsaslgssapi = sasl_gssapi CATALOGNAME_CSWsaslsql = sasl_sql -REQUIRED_PKGS_CSWsasl = CSWosslrt CSWbdb4 +REQUIRED_PKGS_CSWsasl = CSWosslrt CSWbdb47 REQUIRED_PKGS_CSWsaslauthd = CSWosslrt CSWoldaprt CSWkrb5lib REQUIRED_PKGS_CSWsaslgssapi = CSWsasl CSWkrb5lib REQUIRED_PKGS_CSWsaslsql = CSWsasl CSWlibpq CSWmysql4rt CSWsqlite @@ -57,11 +42,12 @@ # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = cyrus-$(GARNAME)-(\d+(?:\.\d+)*).tar.gz -BUILD64 = 1 +# It is a long way to 64 bits... +# BUILD64 = 1 # Do not use LD_OPTIONS as it breaks tests by using the installed libraries # before the newly built ones. -EXTRA_LDFLAGS = $(RUNPATH_LINKER_FLAGS) +EXTRA_LINKER_FLAGS = $(RUNPATH_LINKER_FLAGS) LD_OPTIONS = BUILD_ENV = _REENTRANT=1 @@ -70,20 +56,24 @@ EXTRA_LIBS += /opt/csw/mysql4/lib EXTRA_LIBS += /opt/csw/postgresql/lib +sysconfdir = /etc/opt/csw +localstatedir = /var/opt/csw + # SASL configuration CONFIGURE_ARGS = $(DIRPATHS) +CONFIGURE_ARGS += --enable-shared CONFIGURE_ARGS += --disable-static CONFIGURE_ARGS += --enable-sql CONFIGURE_ARGS += --with-bdb-libdir=/opt/csw/bdb47/lib CONFIGURE_ARGS += --with-bdb-incdir=/opt/csw/bdb47/include/ -CONFIGURE_ARGS += --with-saslauthd=/var/opt/csw/saslauthd +CONFIGURE_ARGS += --with-saslauthd=$(localstatedir)/saslauthd CONFIGURE_ARGS += --with-ipctype=unix -CONFIGURE_ARGS += --with-ldap=/opt/csw -CONFIGURE_ARGS += --with-mysql=/opt/csw/mysql4/ -CONFIGURE_ARGS += --with-pgsql=/opt/csw/postgresql -CONFIGURE_ARGS += --with-openssl=/opt/csw -CONFIGURE_ARGS += --with-dbpath=/opt/csw/etc/sasldb2 -CONFIGURE_ARGS += --with-plugindir=/opt/csw/lib/sasl2 +CONFIGURE_ARGS += --with-ldap=$(prefix) +CONFIGURE_ARGS += --with-mysql=$(prefix)/mysql4/ +CONFIGURE_ARGS += --with-pgsql=$(prefix)/postgresql +CONFIGURE_ARGS += --with-openssl=$(prefix) +CONFIGURE_ARGS += --with-dbpath=$(sysconfdir)/sasldb2 +CONFIGURE_ARGS += --with-plugindir=$(libdir)/sasl2 CONFIGURE_ARGS += --enable-login SED=/usr/bin/sed @@ -94,9 +84,29 @@ #INSTALL_OVERRIDE_DIRS = prefix exec_prefix bindir libdir includedir mandir +PKGFILES_CSWsaslauthd = /etc/opt/csw/init.d/cswsaslauthd.init +PKGFILES_CSWsaslauthd += $(bindir)/testsaslauthd +PKGFILES_CSWsaslauthd += $(sbindir)/saslauthd +PKGFILES_CSWsaslauthd += $(mandir)/.*/saslauthd\.8 +PKGFILES_CSWsaslauthd += $(docdir)/saslauthd/LDAP_SASLAUTHD +PKGFILES_CSWsaslauthd += $(docdir)/saslauthd/README.saslauthd +PKGFILES_CSWsaslauthd += /var/opt/csw/saslauthd +PKGFILES_CSWsaslgssapi = $(libdir)/sasl2/libgssapiv2\..* +PKGFILES_CSWsaslsql = $(libdir)/sasl2/libsql\..* + +MIGRATECONF = saslauthd.conf sasldb2 +PRESERVECONF = saslauthd.conf + +INITSMF = /etc/opt/csw/init.d/cswsaslauthd.init + +CSWsasl_usergroup = :sasl:::::: + include gar/category.mk post-install-modulated: testsaslauthd install-testsaslauthd install-doc + ginstall -d $(DESTDIR)/etc/opt/csw/init.d/ + ginstall $(WORKDIR)/cswsaslauthd.init $(DESTDIR)/etc/opt/csw/init.d + @$(MAKECOOKIE) DOC_FILES = rfc1321.txt \ rfc1939.txt \ @@ -142,23 +152,21 @@ TODO \ ONEWS -INSTDIR = $(DESTDIR)/opt/csw - - testsaslauthd: cd $(WORKSRC)/saslauthd && make testsaslauthd install-testsaslauthd: - -mkdir -p $(INSTDIR)/bin - cp $(WORKSRC)/saslauthd/testsaslauthd $(INSTDIR)/bin + mkdir -p $(DESTDIR)$(bindir) + cp $(WORKSRC)/saslauthd/testsaslauthd $(DESTDIR)$(bindir) + mkdir -p $(DESTDIR)/var/opt/csw/saslauthd install-doc: - -mkdir -p $(INSTDIR)/share/doc/sasl + mkdir -p $(DESTDIR)$(docdir)/sasl + cp $(WORKDIR)/README.sasl $(DESTDIR)$(docdir)/sasl/README.CSW list='$(DOC_FILES)'; for file in $$list; do \ - cp $(WORKSRC)/doc/$$file $(INSTDIR)/share/doc/sasl; \ + cp $(WORKSRC)/doc/$$file $(DESTDIR)$(docdir)/sasl; \ done - cp files/README.sasl $(INSTDIR)/share/doc/sasl/README.CSW - -mkdir -p $(INSTDIR)/share/doc/saslauthd - cp $(WORKSRC)/saslauthd/LDAP_SASLAUTHD $(INSTDIR)/share/doc/saslauthd - cp files/README.saslauthd $(INSTDIR)/share/doc/saslauthd/README.CSW + mkdir -p $(DESTDIR)$(docdir)/saslauthd + cp $(WORKSRC)/saslauthd/LDAP_SASLAUTHD $(DESTDIR)$(docdir)/saslauthd + cp $(WORKDIR)/README.saslauthd $(DESTDIR)$(docdir)/saslauthd/README.CSW Modified: csw/mgar/pkg/sasl/branches/sasl-2.1.23-mGARv2/checksums =================================================================== --- csw/mgar/pkg/sasl/branches/sasl-2.1.23-mGARv2/checksums 2010-01-18 12:30:10 UTC (rev 8071) +++ csw/mgar/pkg/sasl/branches/sasl-2.1.23-mGARv2/checksums 2010-01-18 12:39:52 UTC (rev 8072) @@ -1,6 +1,6 @@ -614bb55932ed32486c1fd57a0059059a CSWsasl.postinstall -2762eafea57ec2e5e28e5a5a95937fa7 CSWsasl.preinstall -b2491dcfbb2be4a4a09f3003cffb1bc7 cswsaslauthd.init +0ae8b5fe39e9b2ce940284fb85de9303 README.sasl +95b3cae3de944bf6602ad83cb04f3f32 README.saslauthd +62cc0bee2337e4937fcfa847f7bdf26a cswsaslauthd.init 2eb0e48106f0e9cd8001e654f267ecbc cyrus-sasl-2.1.23.tar.gz 48af784184961368ce250c7b33d207b8 ltmain.diff 40b526754554c46d5b134f5ca21fe371 saslauthd-doc.diff Deleted: csw/mgar/pkg/sasl/branches/sasl-2.1.23-mGARv2/files/CSWsasl.depend =================================================================== --- csw/mgar/pkg/sasl/branches/sasl-2.1.23-mGARv2/files/CSWsasl.depend 2010-01-18 12:30:10 UTC (rev 8071) +++ csw/mgar/pkg/sasl/branches/sasl-2.1.23-mGARv2/files/CSWsasl.depend 2010-01-18 12:39:52 UTC (rev 8072) @@ -1,5 +0,0 @@ -P SUNWcsr - Core Solaris, (Root) -P SUNWcsl - Core Solaris, (Shared Libs) -P SUNWlibms - Sun WorkShop Bundled shared libm -P CSWossl - OpenSSL Secure Sockets Layer lib and utilities -P CSWbdb4 - berkeleydb4, embedded database libraries and utilities Deleted: csw/mgar/pkg/sasl/branches/sasl-2.1.23-mGARv2/files/CSWsasl.gspec =================================================================== --- csw/mgar/pkg/sasl/branches/sasl-2.1.23-mGARv2/files/CSWsasl.gspec 2010-01-18 12:30:10 UTC (rev 8071) +++ csw/mgar/pkg/sasl/branches/sasl-2.1.23-mGARv2/files/CSWsasl.gspec 2010-01-18 12:39:52 UTC (rev 8072) @@ -1,5 +0,0 @@ -%var bitname sasl -%var pkgname CSWsasl -%copyright url file://%{WORKSRC}/COPYING -%depend url file://%{GARDIR}/lib/sasl/files/CSWsasl.depend -%include url file://%{GARDIR}/pkglib/csw_standard.gspec Deleted: csw/mgar/pkg/sasl/branches/sasl-2.1.23-mGARv2/files/CSWsasl.postinstall =================================================================== --- csw/mgar/pkg/sasl/branches/sasl-2.1.23-mGARv2/files/CSWsasl.postinstall 2010-01-18 12:30:10 UTC (rev 8071) +++ csw/mgar/pkg/sasl/branches/sasl-2.1.23-mGARv2/files/CSWsasl.postinstall 2010-01-18 12:39:52 UTC (rev 8072) @@ -1,6 +0,0 @@ -# Display message -echo '***' -echo '*** See README.CSW in /opt/csw/share/doc/sasl **' -echo '***' - -exit 0 Deleted: csw/mgar/pkg/sasl/branches/sasl-2.1.23-mGARv2/files/CSWsasl.preinstall =================================================================== --- csw/mgar/pkg/sasl/branches/sasl-2.1.23-mGARv2/files/CSWsasl.preinstall 2010-01-18 12:30:10 UTC (rev 8071) +++ csw/mgar/pkg/sasl/branches/sasl-2.1.23-mGARv2/files/CSWsasl.preinstall 2010-01-18 12:39:52 UTC (rev 8072) @@ -1,24 +0,0 @@ -#!/bin/sh - -if [ "$PKG_INSTALL_ROOT" = "" ] ; then PKG_INSTALL_ROOT=/ ; fi - -# Next, verify that group sasl exists. -# First check target machines group file, THEN check -# NIS/NIS+/whatever - -${BASEDIR}/usr/bin/grep '^sasl:' ${BASEDIR}/etc/group >/dev/null -if [ $? -ne 0 ] ; then - ${BASEDIR}/usr/bin/getent group sasl >/dev/null - if [ $? -ne 0 ] ; then - ADDGROUP=1 - fi -fi - -if [ "$ADDGROUP" = 1 ] ; then - chroot $PKG_INSTALL_ROOT /usr/sbin/groupadd sasl - echo "sasl group added" -else - echo "sasl group detected" -fi - -exit 0 Deleted: csw/mgar/pkg/sasl/branches/sasl-2.1.23-mGARv2/files/CSWsaslauthd.depend =================================================================== --- csw/mgar/pkg/sasl/branches/sasl-2.1.23-mGARv2/files/CSWsaslauthd.depend 2010-01-18 12:30:10 UTC (rev 8071) +++ csw/mgar/pkg/sasl/branches/sasl-2.1.23-mGARv2/files/CSWsaslauthd.depend 2010-01-18 12:39:52 UTC (rev 8072) @@ -1,5 +0,0 @@ -P SUNWcsl - Core Solaris, (Shared Libs) -P SUNWgss - GSSAPI V2 -P CSWossl - OpenSSL Secure Sockets Layer lib and utilities -P CSWoldaprt - openldap, ldap clients,libraries and server -P CSWkrb5lib - A Kerberos 5 implementation: libraries Deleted: csw/mgar/pkg/sasl/branches/sasl-2.1.23-mGARv2/files/CSWsaslauthd.gspec =================================================================== --- csw/mgar/pkg/sasl/branches/sasl-2.1.23-mGARv2/files/CSWsaslauthd.gspec 2010-01-18 12:30:10 UTC (rev 8071) +++ csw/mgar/pkg/sasl/branches/sasl-2.1.23-mGARv2/files/CSWsaslauthd.gspec 2010-01-18 12:39:52 UTC (rev 8072) @@ -1,5 +0,0 @@ -%var bitname saslauthd -%var pkgname CSWsaslauthd -%copyright url file://%{WORKSRC}/COPYING -%depend url file://%{GARDIR}/lib/sasl/files/CSWsaslauthd.depend -%include url file://%{GARDIR}/pkglib/csw_standard.gspec Deleted: csw/mgar/pkg/sasl/branches/sasl-2.1.23-mGARv2/files/CSWsaslgssapi.depend =================================================================== --- csw/mgar/pkg/sasl/branches/sasl-2.1.23-mGARv2/files/CSWsaslgssapi.depend 2010-01-18 12:30:10 UTC (rev 8071) +++ csw/mgar/pkg/sasl/branches/sasl-2.1.23-mGARv2/files/CSWsaslgssapi.depend 2010-01-18 12:39:52 UTC (rev 8072) @@ -1,5 +0,0 @@ -P SUNWcsr - Core Solaris, (Root) -P SUNWcsl - Core Solaris, (Shared Libs) -P SUNWlibms - Sun WorkShop Bundled shared libm -P CSWsasl - sasl, Simple Authentication and Security Layer -P CSWkrb5lib - MIT Kerberos 5 core libraries Deleted: csw/mgar/pkg/sasl/branches/sasl-2.1.23-mGARv2/files/CSWsaslgssapi.gspec =================================================================== --- csw/mgar/pkg/sasl/branches/sasl-2.1.23-mGARv2/files/CSWsaslgssapi.gspec 2010-01-18 12:30:10 UTC (rev 8071) +++ csw/mgar/pkg/sasl/branches/sasl-2.1.23-mGARv2/files/CSWsaslgssapi.gspec 2010-01-18 12:39:52 UTC (rev 8072) @@ -1,5 +0,0 @@ -%var bitname sasl_gssapi -%var pkgname CSWsaslgssapi -%copyright url file://%{WORKSRC}/COPYING -%depend url file://%{GARDIR}/lib/sasl/files/CSWsaslgssapi.depend -%include url file://%{GARDIR}/pkglib/csw_standard.gspec Deleted: csw/mgar/pkg/sasl/branches/sasl-2.1.23-mGARv2/files/CSWsaslgssapi.prototype =================================================================== --- csw/mgar/pkg/sasl/branches/sasl-2.1.23-mGARv2/files/CSWsaslgssapi.prototype 2010-01-18 12:30:10 UTC (rev 8071) +++ csw/mgar/pkg/sasl/branches/sasl-2.1.23-mGARv2/files/CSWsaslgssapi.prototype 2010-01-18 12:39:52 UTC (rev 8072) @@ -1,7 +0,0 @@ -i copyright=CSWsaslgssapi.copyright -i depend=CSWsaslgssapi.depend -i pkginfo=CSWsaslgssapi.pkginfo -f none /opt/csw/lib/sasl2/libgssapiv2.la 0755 root bin -f none /opt/csw/lib/sasl2/libgssapiv2.so.2.0.22 0755 root bin -s none /opt/csw/lib/sasl2/libgssapiv2.so.2=libgssapiv2.so.2.0.22 root bin -s none /opt/csw/lib/sasl2/libgssapiv2.so=libgssapiv2.so.2.0.22 root bin Deleted: csw/mgar/pkg/sasl/branches/sasl-2.1.23-mGARv2/files/CSWsaslsql.depend =================================================================== --- csw/mgar/pkg/sasl/branches/sasl-2.1.23-mGARv2/files/CSWsaslsql.depend 2010-01-18 12:30:10 UTC (rev 8071) +++ csw/mgar/pkg/sasl/branches/sasl-2.1.23-mGARv2/files/CSWsaslsql.depend 2010-01-18 12:39:52 UTC (rev 8072) @@ -1,7 +0,0 @@ -P SUNWcsr - Core Solaris, (Root) -P SUNWcsl - Core Solaris, (Shared Libs) -P SUNWlibms - Sun WorkShop Bundled shared libm -P CSWsasl - sasl, Simple Authentication and Security Layer -P CSWlibpq - libraries needed by postgresql server and clients -P CSWmysql4rt - run-time lib for mysql4 -P CSWsqlite - An embeddable SQL engine in a C library Deleted: csw/mgar/pkg/sasl/branches/sasl-2.1.23-mGARv2/files/CSWsaslsql.gspec =================================================================== --- csw/mgar/pkg/sasl/branches/sasl-2.1.23-mGARv2/files/CSWsaslsql.gspec 2010-01-18 12:30:10 UTC (rev 8071) +++ csw/mgar/pkg/sasl/branches/sasl-2.1.23-mGARv2/files/CSWsaslsql.gspec 2010-01-18 12:39:52 UTC (rev 8072) @@ -1,5 +0,0 @@ -%var bitname sasl_sql -%var pkgname CSWsaslsql -%copyright url file://%{WORKSRC}/COPYING -%depend url file://%{GARDIR}/lib/sasl/files/CSWsaslsql.depend -%include url file://%{GARDIR}/pkglib/csw_standard.gspec Deleted: csw/mgar/pkg/sasl/branches/sasl-2.1.23-mGARv2/files/CSWsaslsql.prototype =================================================================== --- csw/mgar/pkg/sasl/branches/sasl-2.1.23-mGARv2/files/CSWsaslsql.prototype 2010-01-18 12:30:10 UTC (rev 8071) +++ csw/mgar/pkg/sasl/branches/sasl-2.1.23-mGARv2/files/CSWsaslsql.prototype 2010-01-18 12:39:52 UTC (rev 8072) @@ -1,7 +0,0 @@ -i copyright=CSWsaslsql.copyright -i depend=CSWsaslsql.depend -i pkginfo=CSWsaslsql.pkginfo -f none /opt/csw/lib/sasl2/libsql.la 0755 root bin -f none /opt/csw/lib/sasl2/libsql.so.2.0.22 0755 root bin -s none /opt/csw/lib/sasl2/libsql.so.2=libsql.so.2.0.22 root bin -s none /opt/csw/lib/sasl2/libsql.so=libsql.so.2.0.22 root bin Modified: csw/mgar/pkg/sasl/branches/sasl-2.1.23-mGARv2/files/cswsaslauthd.init =================================================================== --- csw/mgar/pkg/sasl/branches/sasl-2.1.23-mGARv2/files/cswsaslauthd.init 2010-01-18 12:30:10 UTC (rev 8071) +++ csw/mgar/pkg/sasl/branches/sasl-2.1.23-mGARv2/files/cswsaslauthd.init 2010-01-18 12:39:52 UTC (rev 8072) @@ -1,6 +1,18 @@ #!/bin/sh # Startup script for saslauthd +# s none /etc/rc2.d/S85cswsaslauthd=../init.d/cswsaslauthd +# s none /etc/rc0.d/K15cswsaslauthd=../init.d/cswsaslauthd +# s none /etc/rc1.d/K15cswsaslauthd=../init.d/cswsaslauthd +# s none /etc/rc2.d/K15cswsaslauthd=../init.d/cswsaslauthd +# s none /etc/rcS.d/K15cswsaslauthd=../init.d/cswsaslauthd + +# Magic setting for CSWcswclassutils +#RC_KNUM 15 +#RC_SNUM 85 +#RC_KLEV 0,1,2,S +#RC_SLEV 2 + INIT_FILE=/etc/opt/csw/saslauthd.init if [ -f "${INIT_FILE}" ]; then INIT_FILE=/opt/csw/etc/saslauthd.init Deleted: csw/mgar/pkg/sasl/branches/sasl-2.1.23-mGARv2/files/cswusergroup =================================================================== --- csw/mgar/pkg/sasl/branches/sasl-2.1.23-mGARv2/files/cswusergroup 2010-01-18 12:30:10 UTC (rev 8071) +++ csw/mgar/pkg/sasl/branches/sasl-2.1.23-mGARv2/files/cswusergroup 2010-01-18 12:39:52 UTC (rev 8072) @@ -1 +0,0 @@ -:sasl:::::: This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bonivart at users.sourceforge.net Mon Jan 18 13:49:26 2010 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Mon, 18 Jan 2010 12:49:26 +0000 Subject: [csw-devel] SF.net SVN: gar:[8073] csw/mgar/pkg Message-ID: Revision: 8073 http://gar.svn.sourceforge.net/gar/?rev=8073&view=rev Author: bonivart Date: 2010-01-18 12:49:26 +0000 (Mon, 18 Jan 2010) Log Message: ----------- Digest-SHA: update to 5.48 Added Paths: ----------- csw/mgar/pkg/Digest-SHA/ csw/mgar/pkg/Digest-SHA/branches/ csw/mgar/pkg/Digest-SHA/tags/ csw/mgar/pkg/Digest-SHA/trunk/ csw/mgar/pkg/Digest-SHA/trunk/Makefile csw/mgar/pkg/Digest-SHA/trunk/checksums csw/mgar/pkg/Digest-SHA/trunk/files/ csw/mgar/pkg/Digest-SHA/trunk/files/COPYING Property changes on: csw/mgar/pkg/Digest-SHA/trunk ___________________________________________________________________ Added: svn:ignore + cookies download work Added: svn:externals + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 Added: csw/mgar/pkg/Digest-SHA/trunk/Makefile =================================================================== --- csw/mgar/pkg/Digest-SHA/trunk/Makefile (rev 0) +++ csw/mgar/pkg/Digest-SHA/trunk/Makefile 2010-01-18 12:49:26 UTC (rev 8073) @@ -0,0 +1,16 @@ +GARNAME = Digest-SHA +GARVERSION = 5.48 +CATEGORIES = cpan +AUTHOR = MSHELOR + +DESCRIPTION = Perl extension for SHA-1/224/256/384/512 +define BLURB + Perl extension for SHA-1/224/256/384/512 +endef + +DISTFILES = COPYING + +PACKAGES = CSWpmdigestsha +CATALOGNAME = pm_digestsha + +include gar/category.mk Added: csw/mgar/pkg/Digest-SHA/trunk/checksums =================================================================== --- csw/mgar/pkg/Digest-SHA/trunk/checksums (rev 0) +++ csw/mgar/pkg/Digest-SHA/trunk/checksums 2010-01-18 12:49:26 UTC (rev 8073) @@ -0,0 +1,2 @@ +46e51a66dc97c970b6330ce8108aca04 COPYING +a7ec2c09a58a68dbf419aa191567d75e Digest-SHA-5.48.tar.gz Added: csw/mgar/pkg/Digest-SHA/trunk/files/COPYING =================================================================== --- csw/mgar/pkg/Digest-SHA/trunk/files/COPYING (rev 0) +++ csw/mgar/pkg/Digest-SHA/trunk/files/COPYING 2010-01-18 12:49:26 UTC (rev 8073) @@ -0,0 +1,10 @@ +COPYRIGHT AND LICENSE + +Copyright (C) 2003-2010 Mark Shelor + +This library is free software; you can redistribute it and/or modify +it under the same terms as Perl itself. + +Please refer to the Perl Artistic License for details: + +http://search.cpan.org/perldoc?perlartistic This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Mon Jan 18 14:16:04 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Mon, 18 Jan 2010 13:16:04 +0000 Subject: [csw-devel] SF.net SVN: gar:[8074] csw/mgar/pkg/sasl/branches/sasl-2.1.23-mGARv2/ Makefile Message-ID: Revision: 8074 http://gar.svn.sourceforge.net/gar/?rev=8074&view=rev Author: dmichelsen Date: 2010-01-18 13:16:04 +0000 (Mon, 18 Jan 2010) Log Message: ----------- sasl: Move to MySQL5 Modified Paths: -------------- csw/mgar/pkg/sasl/branches/sasl-2.1.23-mGARv2/Makefile Modified: csw/mgar/pkg/sasl/branches/sasl-2.1.23-mGARv2/Makefile =================================================================== --- csw/mgar/pkg/sasl/branches/sasl-2.1.23-mGARv2/Makefile 2010-01-18 12:49:26 UTC (rev 8073) +++ csw/mgar/pkg/sasl/branches/sasl-2.1.23-mGARv2/Makefile 2010-01-18 13:16:04 UTC (rev 8074) @@ -32,7 +32,7 @@ REQUIRED_PKGS_CSWsasl = CSWosslrt CSWbdb47 REQUIRED_PKGS_CSWsaslauthd = CSWosslrt CSWoldaprt CSWkrb5lib REQUIRED_PKGS_CSWsaslgssapi = CSWsasl CSWkrb5lib -REQUIRED_PKGS_CSWsaslsql = CSWsasl CSWlibpq CSWmysql4rt CSWsqlite +REQUIRED_PKGS_CSWsaslsql = CSWsasl CSWlibpq CSWmysql5rt CSWsqlite SPKG_DESC_CSWsasl = Cyrus Simple Authentication and Security Layer SPKG_DESC_CSWsaslauthd = Cyrus Simple Authentication and Security Layer Authentication Daemon @@ -53,9 +53,11 @@ BUILD_ENV = _REENTRANT=1 EXTRA_LIBS += /opt/csw/bdb47/lib -EXTRA_LIBS += /opt/csw/mysql4/lib +EXTRA_LIBS += /opt/csw/mysql5/lib EXTRA_LIBS += /opt/csw/postgresql/lib +EXTRA_INC = /opt/csw/mysql5/include + sysconfdir = /etc/opt/csw localstatedir = /var/opt/csw @@ -69,7 +71,7 @@ CONFIGURE_ARGS += --with-saslauthd=$(localstatedir)/saslauthd CONFIGURE_ARGS += --with-ipctype=unix CONFIGURE_ARGS += --with-ldap=$(prefix) -CONFIGURE_ARGS += --with-mysql=$(prefix)/mysql4/ +CONFIGURE_ARGS += --with-mysql=$(prefix)/mysql5/ CONFIGURE_ARGS += --with-pgsql=$(prefix)/postgresql CONFIGURE_ARGS += --with-openssl=$(prefix) CONFIGURE_ARGS += --with-dbpath=$(sysconfdir)/sasldb2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Mon Jan 18 14:25:58 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Mon, 18 Jan 2010 13:25:58 +0000 Subject: [csw-devel] SF.net SVN: gar:[8075] csw/mgar/gar/v2/bin/checkpkg Message-ID: Revision: 8075 http://gar.svn.sourceforge.net/gar/?rev=8075&view=rev Author: wahwah Date: 2010-01-18 13:25:58 +0000 (Mon, 18 Jan 2010) Log Message: ----------- mGAR v2: checkpkg, a fix for the new 'file' which prints out two colons instead of one. Modified Paths: -------------- csw/mgar/gar/v2/bin/checkpkg Modified: csw/mgar/gar/v2/bin/checkpkg =================================================================== --- csw/mgar/gar/v2/bin/checkpkg 2010-01-18 13:16:04 UTC (rev 8074) +++ csw/mgar/gar/v2/bin/checkpkg 2010-01-18 13:25:58 UTC (rev 8075) @@ -90,7 +90,9 @@ set_variables_for_individual_package_check() { f=$1 - file $f |sed 's/^.*://' |grep gzip >/dev/null + file $f \ + | sed 's/^[^:]*://' \ + | grep gzip >/dev/null if [ $? -eq 0 ] ; then TMPARCHIVE=$CHECKPKG_TMPDIR/`basename $f` if [[ -f $TMPARCHIVE ]] ; then This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bonivart at users.sourceforge.net Mon Jan 18 14:32:08 2010 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Mon, 18 Jan 2010 13:32:08 +0000 Subject: [csw-devel] SF.net SVN: gar:[8076] csw/mgar/pkg Message-ID: Revision: 8076 http://gar.svn.sourceforge.net/gar/?rev=8076&view=rev Author: bonivart Date: 2010-01-18 13:32:08 +0000 (Mon, 18 Jan 2010) Log Message: ----------- NetAddr-IP: update to 4.027 Added Paths: ----------- csw/mgar/pkg/NetAddr-IP/ csw/mgar/pkg/NetAddr-IP/branches/ csw/mgar/pkg/NetAddr-IP/tags/ csw/mgar/pkg/NetAddr-IP/trunk/ csw/mgar/pkg/NetAddr-IP/trunk/Makefile csw/mgar/pkg/NetAddr-IP/trunk/checksums csw/mgar/pkg/NetAddr-IP/trunk/files/ csw/mgar/pkg/NetAddr-IP/trunk/files/COPYING Property changes on: csw/mgar/pkg/NetAddr-IP/trunk ___________________________________________________________________ Added: svn:ignore + cookies download work Added: svn:externals + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 Added: csw/mgar/pkg/NetAddr-IP/trunk/Makefile =================================================================== --- csw/mgar/pkg/NetAddr-IP/trunk/Makefile (rev 0) +++ csw/mgar/pkg/NetAddr-IP/trunk/Makefile 2010-01-18 13:32:08 UTC (rev 8076) @@ -0,0 +1,16 @@ +GARNAME = NetAddr-IP +GARVERSION = 4.027 +CATEGORIES = cpan +AUTHOR = MIKER + +DESCRIPTION = Manages IPv4 and IPv6 addresses and subnets +define BLURB + Manages IPv4 and IPv6 addresses and subnets +endef + +DISTFILES = COPYING + +PACKAGES = CSWpmnetaddrip +CATALOGNAME = pm_netaddrip + +include gar/category.mk Added: csw/mgar/pkg/NetAddr-IP/trunk/checksums =================================================================== --- csw/mgar/pkg/NetAddr-IP/trunk/checksums (rev 0) +++ csw/mgar/pkg/NetAddr-IP/trunk/checksums 2010-01-18 13:32:08 UTC (rev 8076) @@ -0,0 +1,2 @@ +12b4da4f58fd06d52dcba60b39927d8d COPYING +c4a21a76e5b1b9f4c8e9810b78559d7b NetAddr-IP-4.027.tar.gz Added: csw/mgar/pkg/NetAddr-IP/trunk/files/COPYING =================================================================== --- csw/mgar/pkg/NetAddr-IP/trunk/files/COPYING (rev 0) +++ csw/mgar/pkg/NetAddr-IP/trunk/files/COPYING 2010-01-18 13:32:08 UTC (rev 8076) @@ -0,0 +1,9 @@ +LICENSE AND WARRANTY + +This software is (c) Luis E. Munoz and Michael A. Robinton. It can be +used under the terms of the perl artistic license provided that proper +credit for the work of the authors is preserved in the form of this +copyright notice and license for this module. + +No warranty of any kind is expressed or implied. This code might make +your computer go up in a puff of black smoke. This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Mon Jan 18 14:34:30 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Mon, 18 Jan 2010 13:34:30 +0000 Subject: [csw-devel] SF.net SVN: gar:[8077] csw/mgar/pkg/cpan/Mail-SPF/trunk/Makefile Message-ID: Revision: 8077 http://gar.svn.sourceforge.net/gar/?rev=8077&view=rev Author: dmichelsen Date: 2010-01-18 13:34:30 +0000 (Mon, 18 Jan 2010) Log Message: ----------- cpan/Mail-SPF: Fix build method and bugs #4139, #4140 Modified Paths: -------------- csw/mgar/pkg/cpan/Mail-SPF/trunk/Makefile Modified: csw/mgar/pkg/cpan/Mail-SPF/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/Mail-SPF/trunk/Makefile 2010-01-18 13:32:08 UTC (rev 8076) +++ csw/mgar/pkg/cpan/Mail-SPF/trunk/Makefile 2010-01-18 13:34:30 UTC (rev 8077) @@ -13,9 +13,20 @@ PACKAGES = CSWpmmailspf CATALOGNAME = pm_mailspf +# Required packages due to bug reports +# http://www.opencsw.org/mantis/view.php?id=4139 +# http://www.opencsw.org/mantis/view.php?id=4140 +REQUIRED_PKGS = CSWpmversion CSWpmnetaddrip + ARCHALL = 1 +CONFIGURE_SCRIPTS = $(WORKSRC)/Build.PL +BUILD_SCRIPTS = $(WORKSRC)/Build +TEST_SCRIPTS = $(WORKSRC)/Build +EXTRA_PERLBUILD_INSTALL_ARGS = --install_path sbin=$(sbindir) +INSTALL_SCRIPTS = $(WORKSRC)/Build + EXTRA_PAX_ARGS = '-s,spfquery,spfquery-cpan,p' -EXTRA_PAX_ARGS += '-s,/usr/sbin/spfd,$(sbindir)/spfd-cpan,p' +EXTRA_PAX_ARGS += '-s,spfd,spfd-cpan,p' include gar/category.mk This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Mon Jan 18 15:11:53 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Mon, 18 Jan 2010 14:11:53 +0000 Subject: [csw-devel] SF.net SVN: gar:[8078] csw/mgar/pkg Message-ID: Revision: 8078 http://gar.svn.sourceforge.net/gar/?rev=8078&view=rev Author: dmichelsen Date: 2010-01-18 14:11:50 +0000 (Mon, 18 Jan 2010) Log Message: ----------- exiv2: Initial commit Added Paths: ----------- csw/mgar/pkg/exiv2/ csw/mgar/pkg/exiv2/branches/ csw/mgar/pkg/exiv2/tags/ csw/mgar/pkg/exiv2/trunk/ csw/mgar/pkg/exiv2/trunk/Makefile csw/mgar/pkg/exiv2/trunk/checksums csw/mgar/pkg/exiv2/trunk/files/ Property changes on: csw/mgar/pkg/exiv2/trunk ___________________________________________________________________ Added: svn:ignore + cookies download work Added: svn:externals + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 Added: csw/mgar/pkg/exiv2/trunk/Makefile =================================================================== --- csw/mgar/pkg/exiv2/trunk/Makefile (rev 0) +++ csw/mgar/pkg/exiv2/trunk/Makefile 2010-01-18 14:11:50 UTC (rev 8078) @@ -0,0 +1,25 @@ +GARNAME = exiv2 +GARVERSION = 0.19 +CATEGORIES = lib + +DESCRIPTION = Image metadata library and tools +define BLURB + Exiv2 is a C++ library and a command line utility to manage image metadata. + It provides fast and easy read and write access to the Exif, IPTC and XMP metadata + of images in various formats. Exiv2 is available as free software and with a + commercial license, and is used in many projects. +endef + +MASTER_SITES = http://www.exiv2.org/ +DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz + +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + +BUILD64 = 1 +CONFIGURE_ARGS = $(DIRPATHS) + +# Sun Studio doesn't unerstand g++ features +CONFIGURE_ARGS += --disable-visibility + +include gar/category.mk Added: csw/mgar/pkg/exiv2/trunk/checksums =================================================================== --- csw/mgar/pkg/exiv2/trunk/checksums (rev 0) +++ csw/mgar/pkg/exiv2/trunk/checksums 2010-01-18 14:11:50 UTC (rev 8078) @@ -0,0 +1 @@ +f52fb75a2cb7512f1484deab76473e13 exiv2-0.19.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Mon Jan 18 16:39:38 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Mon, 18 Jan 2010 15:39:38 +0000 Subject: [csw-devel] SF.net SVN: gar:[8079] csw/mgar/pkg/exiv2/trunk Message-ID: Revision: 8079 http://gar.svn.sourceforge.net/gar/?rev=8079&view=rev Author: dmichelsen Date: 2010-01-18 15:39:38 +0000 (Mon, 18 Jan 2010) Log Message: ----------- exiv2: Add patch Modified Paths: -------------- csw/mgar/pkg/exiv2/trunk/Makefile csw/mgar/pkg/exiv2/trunk/checksums Added Paths: ----------- csw/mgar/pkg/exiv2/trunk/files/0001-Remove-unknown-flag-to-Sun-Studio.patch Modified: csw/mgar/pkg/exiv2/trunk/Makefile =================================================================== --- csw/mgar/pkg/exiv2/trunk/Makefile 2010-01-18 14:11:50 UTC (rev 8078) +++ csw/mgar/pkg/exiv2/trunk/Makefile 2010-01-18 15:39:38 UTC (rev 8079) @@ -12,6 +12,7 @@ MASTER_SITES = http://www.exiv2.org/ DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz +PATCHFILES = 0001-Remove-unknown-flag-to-Sun-Studio.patch # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz Modified: csw/mgar/pkg/exiv2/trunk/checksums =================================================================== --- csw/mgar/pkg/exiv2/trunk/checksums 2010-01-18 14:11:50 UTC (rev 8078) +++ csw/mgar/pkg/exiv2/trunk/checksums 2010-01-18 15:39:38 UTC (rev 8079) @@ -1 +1,2 @@ +ac2024c172a70a811b9972cd8b46f3f3 0001-Remove-unknown-flag-to-Sun-Studio.patch f52fb75a2cb7512f1484deab76473e13 exiv2-0.19.tar.gz Added: csw/mgar/pkg/exiv2/trunk/files/0001-Remove-unknown-flag-to-Sun-Studio.patch =================================================================== --- csw/mgar/pkg/exiv2/trunk/files/0001-Remove-unknown-flag-to-Sun-Studio.patch (rev 0) +++ csw/mgar/pkg/exiv2/trunk/files/0001-Remove-unknown-flag-to-Sun-Studio.patch 2010-01-18 15:39:38 UTC (rev 8079) @@ -0,0 +1,25 @@ +From 34049ff8c3eeaa116ccf07e4ee37ffaa7511860b Mon Sep 17 00:00:00 2001 +From: Dagobert Michelsen +Date: Mon, 18 Jan 2010 16:37:20 +0100 +Subject: [PATCH] Remove unknown flag to Sun Studio + +--- + xmpsdk/src/Makefile | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/xmpsdk/src/Makefile b/xmpsdk/src/Makefile +index 02b06f4..3b27979 100644 +--- a/xmpsdk/src/Makefile ++++ b/xmpsdk/src/Makefile +@@ -86,7 +86,7 @@ SHELL = /bin/sh + .PRECIOUS: %.cpp + + # For a debug build, replace -DNDEBUG=1 with -DDEBUG=1 -D_DEBUG=1 +-CPPFLAGS += -I../include -funsigned-char -DNDEBUG=1 $(EXPAT_CPPFLAGS) ++CPPFLAGS += -I../include -DNDEBUG=1 $(EXPAT_CPPFLAGS) + ifdef HAVE_STDINT + CPPFLAGS += -DEXV_HAVE_STDINT_H=1 + endif +-- +1.6.6 + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From skayser at users.sourceforge.net Mon Jan 18 23:48:29 2010 From: skayser at users.sourceforge.net (skayser at users.sourceforge.net) Date: Mon, 18 Jan 2010 22:48:29 +0000 Subject: [csw-devel] SF.net SVN: gar:[8080] csw/mgar/pkg/subversion/trunk/Makefile Message-ID: Revision: 8080 http://gar.svn.sourceforge.net/gar/?rev=8080&view=rev Author: skayser Date: 2010-01-18 22:48:28 +0000 (Mon, 18 Jan 2010) Log Message: ----------- subversion: documented test details and build times Modified Paths: -------------- csw/mgar/pkg/subversion/trunk/Makefile Modified: csw/mgar/pkg/subversion/trunk/Makefile =================================================================== --- csw/mgar/pkg/subversion/trunk/Makefile 2010-01-18 15:39:38 UTC (rev 8079) +++ csw/mgar/pkg/subversion/trunk/Makefile 2010-01-18 22:48:28 UTC (rev 8080) @@ -6,10 +6,11 @@ # required? The shared objects generated by SWIG have them in their NEEDED # list, but they also link against the main libsvn_client-1.so which in # turn pulls in the rest. Can this be tweaked? +# +# Known build facts/issues: # -# Known build issues/facts: -# -# * Build takes about 50 mins on build8x/build8s +# * Build takes about 50 mins on build8x, 25 mins on build8s. This is only +# the build, the tests take about 5 times as much (see TEST_TARGET). # * checkpkg suggests CSWbdb over CSWbdb47, because it picks up the # libdb-4.7.so symlink in $(libdir) which belongs to the stub CSWbdb. As # the lib itself belongs to CSWbdb47, the CSWbdb47 dep is completely fine. @@ -165,9 +166,18 @@ CONFIGURE_ARGS += --with-zlib=$(prefix) CONFIGURE_ARGS += --with-serf=$(prefix) -# Tests take *forever* -#TEST_TARGET = check -TEST_TARGET = +# Once you have verified that a new upstream release passes the tests, you can use +# "SKIPTEST=1 gmake " to skip the tests for simple repackaging tasks. +# +# Tests that fail with XFAIL (eXpected FAILs) are not actual FAILs, see +# http://svn.collab.net/repos/svn/trunk/subversion/tests/README +# +# Tests take about 4hrs on build8x, 2hrs+ on build8s +# merge_tests.py sub-suite takes most of the time. For a list of its tests see +# $(WORKSRC)/subversion/tests/cmdline/merge_tests.py --list +# and for progress information you could compare this with +# tail -f $(WORKSRC)/tests.log | grep merge_tests.py +TEST_TARGET = check include gar/category.mk This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From skayser at users.sourceforge.net Tue Jan 19 01:34:50 2010 From: skayser at users.sourceforge.net (skayser at users.sourceforge.net) Date: Tue, 19 Jan 2010 00:34:50 +0000 Subject: [csw-devel] SF.net SVN: gar:[8081] csw/mgar/pkg/mutt/trunk/Makefile Message-ID: Revision: 8081 http://gar.svn.sourceforge.net/gar/?rev=8081&view=rev Author: skayser Date: 2010-01-19 00:34:44 +0000 (Tue, 19 Jan 2010) Log Message: ----------- mutt: further fixes WRT to #3726, added --with-ssl --enable-smtp --enable-gpgme Modified Paths: -------------- csw/mgar/pkg/mutt/trunk/Makefile Modified: csw/mgar/pkg/mutt/trunk/Makefile =================================================================== --- csw/mgar/pkg/mutt/trunk/Makefile 2010-01-18 22:48:28 UTC (rev 8080) +++ csw/mgar/pkg/mutt/trunk/Makefile 2010-01-19 00:34:44 UTC (rev 8081) @@ -7,12 +7,16 @@ DESCRIPTION = A text-based mail client for Unix operating systems define BLURB + Mutt is a small but very powerful text-based MIME mail client. Mutt is + highly configurable, and is well suited to the mail power user with + advanced features like key bindings, keyboard macros, mail threading, + regular expression searches and a powerful pattern matching language for + selecting groups of messages. endef +VENDOR_URL = http://www.mutt.org MASTER_SITES = $(SF_MIRRORS) -DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz - -# We define upstream file regex so we can be notifed of new upstream software release +DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz LICENSE = COPYRIGHT @@ -37,13 +41,16 @@ sysconfdir = /etc/opt/csw -CONFIGURE_ARGS = $(DIRPATHS) - -# Add requested header fields requested in this bug: +CONFIGURE_ARGS = $(DIRPATHS) +CONFIGURE_ARGS += --enable-pop +CONFIGURE_ARGS += --enable-imap +CONFIGURE_ARGS += --enable-smtp +CONFIGURE_ARGS += --enable-gpgme +# Add IMAP header caching and SASL as requested per: # http://www.opencsw.org/mantis/view.php?id=3726 -CONFIGURE_ARGS += --with-sasl --enable-hcache -# This required POP and/or IMAP -CONFIGURE_ARGS += --enable-pop --enable-imap +CONFIGURE_ARGS += --enable-hcache +CONFIGURE_ARGS += --with-sasl +CONFIGURE_ARGS += --with-ssl CONFIGURE_ARGS_SLANG-no = CONFIGURE_ARGS_SLANG-yes = --with-slang=$(prefix) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From skayser at users.sourceforge.net Tue Jan 19 02:30:47 2010 From: skayser at users.sourceforge.net (skayser at users.sourceforge.net) Date: Tue, 19 Jan 2010 01:30:47 +0000 Subject: [csw-devel] SF.net SVN: gar:[8082] csw/mgar/pkg/mutt/trunk/Makefile Message-ID: Revision: 8082 http://gar.svn.sourceforge.net/gar/?rev=8082&view=rev Author: skayser Date: 2010-01-19 01:30:47 +0000 (Tue, 19 Jan 2010) Log Message: ----------- mutt: added required dependencies on gpgme, osslrt, zlib Modified Paths: -------------- csw/mgar/pkg/mutt/trunk/Makefile Modified: csw/mgar/pkg/mutt/trunk/Makefile =================================================================== --- csw/mgar/pkg/mutt/trunk/Makefile 2010-01-19 00:34:44 UTC (rev 8081) +++ csw/mgar/pkg/mutt/trunk/Makefile 2010-01-19 01:30:47 UTC (rev 8082) @@ -23,9 +23,18 @@ PACKAGES = CSWmutt-base CSWmutt-ncurses CSWmutt-slang -REQUIRED_PKGS_CSWmutt-base = CSWggettextrt CSWiconv CSWlibidn -REQUIRED_PKGS_CSWmutt-ncurses = CSWmutt-base CSWncurses CSWggettextrt CSWiconv CSWlibidn CSWgdbm CSWsasl -REQUIRED_PKGS_CSWmutt-slang = CSWmutt-base CSWslang CSWggettextrt CSWiconv CSWlibidn CSWgdbm CSWsasl +REQUIRED_PKGS_core = CSWgdbm +REQUIRED_PKGS_core += CSWggettextrt +REQUIRED_PKGS_core += CSWgpgerr +REQUIRED_PKGS_core += CSWgpgme +REQUIRED_PKGS_core += CSWiconv +REQUIRED_PKGS_core += CSWlibidn +REQUIRED_PKGS_core += CSWosslrt +REQUIRED_PKGS_core += CSWsasl +REQUIRED_PKGS_core += CSWzlib +REQUIRED_PKGS_CSWmutt-ncurses = $(REQUIRED_PKGS_core) CSWmutt-base CSWncurses +REQUIRED_PKGS_CSWmutt-slang = $(REQUIRED_PKGS_core) CSWmutt-base CSWslang +REQUIRED_PKGS_CSWmutt-base = CSWggettextrt CSWiconv CSWlibidn CATALOGNAME_CSWmutt-base = mutt_base CATALOGNAME_CSWmutt-ncurses = mutt_ncurses This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Tue Jan 19 08:30:26 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 19 Jan 2010 07:30:26 +0000 Subject: [csw-devel] SF.net SVN: gar:[8083] csw/mgar/pkg/slang/trunk/Makefile Message-ID: Revision: 8083 http://gar.svn.sourceforge.net/gar/?rev=8083&view=rev Author: dmichelsen Date: 2010-01-19 07:30:26 +0000 (Tue, 19 Jan 2010) Log Message: ----------- slang: Add support for oniguruma Modified Paths: -------------- csw/mgar/pkg/slang/trunk/Makefile Modified: csw/mgar/pkg/slang/trunk/Makefile =================================================================== --- csw/mgar/pkg/slang/trunk/Makefile 2010-01-19 01:30:47 UTC (rev 8082) +++ csw/mgar/pkg/slang/trunk/Makefile 2010-01-19 07:30:26 UTC (rev 8083) @@ -21,7 +21,7 @@ # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz -REQUIRED_PKGS = CSWiconv CSWpcrert CSWpng CSWzlib +REQUIRED_PKGS = CSWiconv CSWpcrert CSWpng CSWzlib CSWoniguruma SPKG_SOURCEURL = http://www.s-lang.org/ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Tue Jan 19 09:15:38 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 19 Jan 2010 08:15:38 +0000 Subject: [csw-devel] SF.net SVN: gar:[8084] csw/mgar/pkg/neon/trunk/Makefile Message-ID: Revision: 8084 http://gar.svn.sourceforge.net/gar/?rev=8084&view=rev Author: dmichelsen Date: 2010-01-19 08:15:37 +0000 (Tue, 19 Jan 2010) Log Message: ----------- neon: Add dependency to libproxy Modified Paths: -------------- csw/mgar/pkg/neon/trunk/Makefile Modified: csw/mgar/pkg/neon/trunk/Makefile =================================================================== --- csw/mgar/pkg/neon/trunk/Makefile 2010-01-19 07:30:26 UTC (rev 8083) +++ csw/mgar/pkg/neon/trunk/Makefile 2010-01-19 08:15:37 UTC (rev 8084) @@ -25,9 +25,11 @@ CATALOGNAME_CSWneon = neon CATALOGNAME_CSWneon-devel = neon_devel -REQUIRED_PKGS_CSWneon = CSWexpat CSWkrb5lib CSWosslrt CSWzlib CSWggettextrt CSWpakchois +REQUIRED_PKGS_CSWneon = CSWexpat CSWkrb5lib CSWosslrt CSWzlib CSWggettextrt CSWpakchois CSWlibproxy REQUIRED_PKGS_CSWneon-devel = CSWneon +PREREQUISITE_PKGS = $(REQUIRED_PKGS_CSWneon) + SPKG_DESC_CSWneon = Neon HTTP and WebDAV client library SPKG_DESC_CSWneon-devel = Neon HTTP and WebDAV development support This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From janholzh at users.sourceforge.net Tue Jan 19 09:44:53 2010 From: janholzh at users.sourceforge.net (janholzh at users.sourceforge.net) Date: Tue, 19 Jan 2010 08:44:53 +0000 Subject: [csw-devel] SF.net SVN: gar:[8085] csw/mgar/pkg/transmission/trunk/Makefile Message-ID: Revision: 8085 http://gar.svn.sourceforge.net/gar/?rev=8085&view=rev Author: janholzh Date: 2010-01-19 08:44:52 +0000 (Tue, 19 Jan 2010) Log Message: ----------- transmission: removed one EXTRA_FLAG Modified Paths: -------------- csw/mgar/pkg/transmission/trunk/Makefile Modified: csw/mgar/pkg/transmission/trunk/Makefile =================================================================== --- csw/mgar/pkg/transmission/trunk/Makefile 2010-01-19 08:15:37 UTC (rev 8084) +++ csw/mgar/pkg/transmission/trunk/Makefile 2010-01-19 08:44:52 UTC (rev 8085) @@ -55,7 +55,7 @@ CATALOGNAME_CSWtransmissiongtk2 = transmission_gtk2 -EXTRA_CFLAGS = -DNO_SYS_QUEUE_H -lresolv -mt +EXTRA_CFLAGS = -DNO_SYS_QUEUE_H -lresolv EXTRA_INC = /opt/csw/X11/include EXTRA_LIB = /opt/csw/X11/lib This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bonivart at users.sourceforge.net Tue Jan 19 10:53:45 2010 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Tue, 19 Jan 2010 09:53:45 +0000 Subject: [csw-devel] SF.net SVN: gar:[8086] csw/mgar/pkg/dhcp/trunk Message-ID: Revision: 8086 http://gar.svn.sourceforge.net/gar/?rev=8086&view=rev Author: bonivart Date: 2010-01-19 09:53:44 +0000 (Tue, 19 Jan 2010) Log Message: ----------- dhcp: update to 4.1.1 final Modified Paths: -------------- csw/mgar/pkg/dhcp/trunk/Makefile csw/mgar/pkg/dhcp/trunk/checksums Modified: csw/mgar/pkg/dhcp/trunk/Makefile =================================================================== --- csw/mgar/pkg/dhcp/trunk/Makefile 2010-01-19 08:44:52 UTC (rev 8085) +++ csw/mgar/pkg/dhcp/trunk/Makefile 2010-01-19 09:53:44 UTC (rev 8086) @@ -1,5 +1,5 @@ GARNAME = dhcp -GARVERSION = 4.1.1rc1 +GARVERSION = 4.1.1 CATEGORIES = net DESCRIPTION = ISC DHCP reference implementation @@ -24,7 +24,6 @@ CATALOGNAME_CSWdhcpdevel = dhcp_devel ARCHALL_CSWdhcpdevel = 1 -# We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = ($(GARNAME)-\d+(?:\.\d+)*).tar.gz GARCOMPILER = GNU Modified: csw/mgar/pkg/dhcp/trunk/checksums =================================================================== --- csw/mgar/pkg/dhcp/trunk/checksums 2010-01-19 08:44:52 UTC (rev 8085) +++ csw/mgar/pkg/dhcp/trunk/checksums 2010-01-19 09:53:44 UTC (rev 8086) @@ -1 +1 @@ -f2b4dfe70640d33b29da6b75eb5c82a0 dhcp-4.1.1rc1.tar.gz +38a74c89d8913b9b5f33737047623c18 dhcp-4.1.1.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From janholzh at users.sourceforge.net Tue Jan 19 11:22:43 2010 From: janholzh at users.sourceforge.net (janholzh at users.sourceforge.net) Date: Tue, 19 Jan 2010 10:22:43 +0000 Subject: [csw-devel] SF.net SVN: gar:[8087] csw/mgar/pkg/libsoup2/trunk/Makefile Message-ID: Revision: 8087 http://gar.svn.sourceforge.net/gar/?rev=8087&view=rev Author: janholzh Date: 2010-01-19 10:22:43 +0000 (Tue, 19 Jan 2010) Log Message: ----------- libsoup2: Update Makefile Modified Paths: -------------- csw/mgar/pkg/libsoup2/trunk/Makefile Modified: csw/mgar/pkg/libsoup2/trunk/Makefile =================================================================== --- csw/mgar/pkg/libsoup2/trunk/Makefile 2010-01-19 09:53:44 UTC (rev 8086) +++ csw/mgar/pkg/libsoup2/trunk/Makefile 2010-01-19 10:22:43 UTC (rev 8087) @@ -20,7 +20,7 @@ EXTRA_LIB = /opt/csw/X11/lib EXTRA_PKG_CONFIG_DIRS = $(prefix)/X11/lib -CONFIGURE_ARGS = $(DIRPATHS) +CONFIGURE_ARGS = $(DIRPATHS) --disable-static --with-apache-httpd=/opt/csw/apache2/sbin/httpd --with-apache-module-dir=/opt/csw/apache2/libexec/ TEST_TARGET = check This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From skayser at users.sourceforge.net Tue Jan 19 12:09:21 2010 From: skayser at users.sourceforge.net (skayser at users.sourceforge.net) Date: Tue, 19 Jan 2010 11:09:21 +0000 Subject: [csw-devel] SF.net SVN: gar:[8088] csw/mgar/pkg/subversion/trunk Message-ID: Revision: 8088 http://gar.svn.sourceforge.net/gar/?rev=8088&view=rev Author: skayser Date: 2010-01-19 11:09:21 +0000 (Tue, 19 Jan 2010) Log Message: ----------- subversion: added changelog.CSW Modified Paths: -------------- csw/mgar/pkg/subversion/trunk/Makefile csw/mgar/pkg/subversion/trunk/files/changelog.CSW Modified: csw/mgar/pkg/subversion/trunk/Makefile =================================================================== --- csw/mgar/pkg/subversion/trunk/Makefile 2010-01-19 10:22:43 UTC (rev 8087) +++ csw/mgar/pkg/subversion/trunk/Makefile 2010-01-19 11:09:21 UTC (rev 8088) @@ -281,3 +281,9 @@ $(BUILD_ENV) gmake -C $(WORKSRC) javahl; $(INSTALL_ENV) gmake -C $(WORKSRC) install-javahl; @$(MAKECOOKIE) + +post-merge: $(foreach P,$(_PKG_SPECS),install-changelog-$P) + +install-changelog-%: + ginstall -D $(FILEDIR)/changelog.CSW \ + $(PKGROOT)$(docdir)/$(call catalogname,$*)/changelog.CSW Modified: csw/mgar/pkg/subversion/trunk/files/changelog.CSW =================================================================== --- csw/mgar/pkg/subversion/trunk/files/changelog.CSW 2010-01-19 10:22:43 UTC (rev 8087) +++ csw/mgar/pkg/subversion/trunk/files/changelog.CSW 2010-01-19 11:09:21 UTC (rev 8088) @@ -1,10 +1,11 @@ -subversion (1.6.6,REV=2010.01.17) +subversion (1.6.6,REV=2010.01.19) + * Non-maintainer submission. * Restricted cswpycompile usage to python modules. (Closes #4156) * Corrected libsvn_ra_dav-1.so.0 symlinks. (Closes #4096) * Dropped openssl_rt dependency (neon with SSL support is built separately). * Dropped kerberos dependency (neon comes with Kerberos support). * Dropped libnet dependency (not required). - * Re-ordered RUNPATH and introduced $ISALIB for /opt/csw/lib/, /opt/csw/bdb47. + * Reordered RUNPATH and introduced $ISALIB for /opt/csw/lib/, /opt/csw/bdb47. - -- Sebastian Kayser Sun, 17 Jan 2010 02:39:59 +0100 + -- Sebastian Kayser Tue, 19 Jan 2010 12:06:51 +0100 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Tue Jan 19 13:40:48 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Tue, 19 Jan 2010 12:40:48 +0000 Subject: [csw-devel] SF.net SVN: gar:[8089] csw/mgar/pkg/puppet/branches/puppet-0.24.x/files/ cswpuppetd Message-ID: Revision: 8089 http://gar.svn.sourceforge.net/gar/?rev=8089&view=rev Author: wahwah Date: 2010-01-19 12:40:47 +0000 (Tue, 19 Jan 2010) Log Message: ----------- puppet-0.24.x: A fix for the startup script. The binary is in bindir, not sbindir. Modified Paths: -------------- csw/mgar/pkg/puppet/branches/puppet-0.24.x/files/cswpuppetd Modified: csw/mgar/pkg/puppet/branches/puppet-0.24.x/files/cswpuppetd =================================================================== --- csw/mgar/pkg/puppet/branches/puppet-0.24.x/files/cswpuppetd 2010-01-19 11:09:21 UTC (rev 8088) +++ csw/mgar/pkg/puppet/branches/puppet-0.24.x/files/cswpuppetd 2010-01-19 12:40:47 UTC (rev 8089) @@ -17,16 +17,17 @@ . /lib/svc/share/smf_include.sh prefix="/opt/csw" -exec_prefix="/opt/csw" -sysconfdir="/etc/csw/opt" -sbindir="/opt/csw/sbin" -localstatedir="/var/opt/csw" +exec_prefix="${prefix}" +sysconfdir="/etc${prefix}" +bindir="${prefix}/bin" +sbindir="${prefix}/sbin" +localstatedir="/var${prefix}" start_puppetd() { cd / # Start daemons. - ${sbindir}/puppetd + ${bindir}/puppetd } reload_puppetd() { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Tue Jan 19 13:41:34 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Tue, 19 Jan 2010 12:41:34 +0000 Subject: [csw-devel] SF.net SVN: gar:[8090] csw/mgar/pkg/puppet/branches/puppet-0.24.x/checksums Message-ID: Revision: 8090 http://gar.svn.sourceforge.net/gar/?rev=8090&view=rev Author: wahwah Date: 2010-01-19 12:41:33 +0000 (Tue, 19 Jan 2010) Log Message: ----------- puppet-0.24.x: checksums update Modified Paths: -------------- csw/mgar/pkg/puppet/branches/puppet-0.24.x/checksums Modified: csw/mgar/pkg/puppet/branches/puppet-0.24.x/checksums =================================================================== --- csw/mgar/pkg/puppet/branches/puppet-0.24.x/checksums 2010-01-19 12:40:47 UTC (rev 8089) +++ csw/mgar/pkg/puppet/branches/puppet-0.24.x/checksums 2010-01-19 12:41:33 UTC (rev 8090) @@ -1,6 +1,6 @@ abaa404420106f9f28e9e1218b4e365b 0001-pkgutil-support.patch 9c27c0cdca051eae986b56b91ef889ca 0002-Using-the-single-option-of-pkgutil.patch -f4a95dece2231805abf4754d72471de4 cswpuppetd +ee39853fe02ec20eae7847bcb2822ed4 cswpuppetd aba2c79e589b9bd1c881a22aa663a213 cswpuppetmasterd 3ab0d4f9801075bc78b68b766b496fc7 cswusergroup 288d46dee00acad64d0f3ecc6d8ba6fa puppet-0.24.8.tgz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From janholzh at users.sourceforge.net Tue Jan 19 13:57:23 2010 From: janholzh at users.sourceforge.net (janholzh at users.sourceforge.net) Date: Tue, 19 Jan 2010 12:57:23 +0000 Subject: [csw-devel] SF.net SVN: gar:[8091] csw/mgar/pkg/libsoup2/trunk Message-ID: Revision: 8091 http://gar.svn.sourceforge.net/gar/?rev=8091&view=rev Author: janholzh Date: 2010-01-19 12:57:23 +0000 (Tue, 19 Jan 2010) Log Message: ----------- libsoup2: finish Makefile Modified Paths: -------------- csw/mgar/pkg/libsoup2/trunk/Makefile Property Changed: ---------------- csw/mgar/pkg/libsoup2/trunk/ Property changes on: csw/mgar/pkg/libsoup2/trunk ___________________________________________________________________ Added: svn:ignore + work Modified: csw/mgar/pkg/libsoup2/trunk/Makefile =================================================================== --- csw/mgar/pkg/libsoup2/trunk/Makefile 2010-01-19 12:41:33 UTC (rev 8090) +++ csw/mgar/pkg/libsoup2/trunk/Makefile 2010-01-19 12:57:23 UTC (rev 8091) @@ -14,14 +14,55 @@ UFILES_REGEX = -(\d+(?:\.\d+)*).tar.bz2 PACKAGES = CSWlibsoup2 +PACKAGES += CSWlibsoup2dev +PACKAGES += CSWlibsoup2gnome +PACKAGES += CSWlibsoup2gnomedev +SPKG_DESC_CSWlibsoup2 = HTTP client/server library for GNOME +SPKG_DESC_CSWlibsoup2dev = HTTP client/server library for GNOME, dev files +SPKG_DESC_CSWlibsoup2gnome = HTTP client/server library for GNOME, gnome part +SPKG_DESC_CSWlibsoup2gnomedev = HTTP client/server library for GNOME, gnome dev part +REQUIRED_PKGS_CSWlibsoup2gnome = CSWgconf2 +REQUIRED_PKGS_CSWlibsoup2gnome += CSWgcrypt +REQUIRED_PKGS_CSWlibsoup2gnome += CSWggettextrt +REQUIRED_PKGS_CSWlibsoup2gnome += CSWglib2 +REQUIRED_PKGS_CSWlibsoup2gnome += CSWgnutls +REQUIRED_PKGS_CSWlibsoup2gnome += CSWgpgerr +REQUIRED_PKGS_CSWlibsoup2gnome += CSWlibproxy +REQUIRED_PKGS_CSWlibsoup2gnome += CSWlibxml2 +REQUIRED_PKGS_CSWlibsoup2gnome += CSWsqlite3rt +REQUIRED_PKGS_CSWlibsoup2gnome += CSWlibsoup2 + +REQUIRED_PKGS_CSWlibsoup2dev = CSWlibsoup2 +REQUIRED_PKGS_CSWlibsoup2gnomedev = CSWlibsoup2gnome + +REQUIRED_PKGS_CSWlibsoup2 = CSWgcrypt +REQUIRED_PKGS_CSWlibsoup2 += CSWggettextrt +REQUIRED_PKGS_CSWlibsoup2 += CSWglib2 +REQUIRED_PKGS_CSWlibsoup2 += CSWgnutls +REQUIRED_PKGS_CSWlibsoup2 += CSWgpgerr +#REQUIRED_PKGS_CSWlibsoup2 += CSWlibproxy +REQUIRED_PKGS_CSWlibsoup2 += CSWlibxml2 + +REQUIRED_PKGS_CSWlibsoup2dev = CSWlibsoup2 + +PKGFILES_CSWlibsoup2 = /opt/csw/lib/libsoup-2.4.so.1.2.0 +PKGFILES_CSWlibsoup2dev = /opt/csw/lib/pkgconfig/libsoup-2.4.pc +PKGFILES_CSWlibsoup2dev += /opt/csw/include/libsoup-2.4/.* +PKGFILES_CSWlibsoup2gnomedev = /opt/csw/lib/pkgconfig/libsoup-gnome-2.4.pc +PKGFILES_CSWlibsoup2gnomedev += /opt/csw/include/libsoup-gnome-2.4/.* + + + EXTRA_INC = /opt/csw/X11/include EXTRA_LIB = /opt/csw/X11/lib EXTRA_PKG_CONFIG_DIRS = $(prefix)/X11/lib +STRIP_LIBTOOL = 1 CONFIGURE_ARGS = $(DIRPATHS) --disable-static --with-apache-httpd=/opt/csw/apache2/sbin/httpd --with-apache-module-dir=/opt/csw/apache2/libexec/ -TEST_TARGET = check +#TEST_TARGET = check +TEST_TARGET = include gar/category.mk This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From roger.hakansson at gmail.com Tue Jan 19 14:53:42 2010 From: roger.hakansson at gmail.com (=?ISO-8859-1?Q?Roger_H=E5kansson?=) Date: Tue, 19 Jan 2010 14:53:42 +0100 Subject: [csw-devel] SF.net SVN: gar:[8091] csw/mgar/pkg/libsoup2/trunk In-Reply-To: References: Message-ID: <4B55B966.6060505@gmail.com> janholzh at users.sourceforge.net wrote: > Revision: 8091 > http://gar.svn.sourceforge.net/gar/?rev=8091&view=rev > Author: janholzh > Date: 2010-01-19 12:57:23 +0000 (Tue, 19 Jan 2010) > > Log Message: > ----------- > libsoup2: finish Makefile > Noticed that you committed some stuff for libsoup2, I've been working on releasing a updated version, but I've not committed my stuff yet. However I was going to update libsoup to current and scrap libsoup2 as a separate package since there is only a few packages needing libsoup2. So keeping them as separate packages is in my world not necessary. Also, is there really a need to split the gnome-stuff in a separate package? Even the base stuff are dependent on some GNOME-libs so you won't gain that much. Btw, you don't seem to have a opencsw mail address? -------------- next part -------------- A non-text attachment was scrubbed... Name: smime.p7s Type: application/x-pkcs7-signature Size: 3344 bytes Desc: S/MIME Cryptographic Signature URL: From dmichelsen at users.sourceforge.net Tue Jan 19 15:04:09 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 19 Jan 2010 14:04:09 +0000 Subject: [csw-devel] SF.net SVN: gar:[8092] csw/mgar/pkg Message-ID: Revision: 8092 http://gar.svn.sourceforge.net/gar/?rev=8092&view=rev Author: dmichelsen Date: 2010-01-19 14:04:08 +0000 (Tue, 19 Jan 2010) Log Message: ----------- unrtf: Initial commit, pathes still not right Added Paths: ----------- csw/mgar/pkg/unrtf/ csw/mgar/pkg/unrtf/branches/ csw/mgar/pkg/unrtf/tags/ csw/mgar/pkg/unrtf/trunk/ csw/mgar/pkg/unrtf/trunk/Makefile csw/mgar/pkg/unrtf/trunk/checksums csw/mgar/pkg/unrtf/trunk/files/ Property changes on: csw/mgar/pkg/unrtf/trunk ___________________________________________________________________ Added: svn:ignore + cookies download work Added: svn:externals + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 Added: csw/mgar/pkg/unrtf/trunk/Makefile =================================================================== --- csw/mgar/pkg/unrtf/trunk/Makefile (rev 0) +++ csw/mgar/pkg/unrtf/trunk/Makefile 2010-01-19 14:04:08 UTC (rev 8092) @@ -0,0 +1,23 @@ +GARNAME = unrtf +GARVERSION = 0.21.1 +CATEGORIES = utils + +DESCRIPTION = A tool which converts documents from Rich Text Format +define BLURB +endef + +MASTER_SITES = $(GNU_MIRROR) +DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz + +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + +REQUIRED_PKGS = CSWiconv + +EXTRA_LINKER_FLAGS = -liconv + +CONFIGURE_ARGS = $(DIRPATHS) + +TEST_TARGET = check + +include gar/category.mk Added: csw/mgar/pkg/unrtf/trunk/checksums =================================================================== --- csw/mgar/pkg/unrtf/trunk/checksums (rev 0) +++ csw/mgar/pkg/unrtf/trunk/checksums 2010-01-19 14:04:08 UTC (rev 8092) @@ -0,0 +1 @@ +ce069646837d0a2c15b439a5529afde8 unrtf-0.21.1.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From janholzh at users.sourceforge.net Tue Jan 19 15:55:52 2010 From: janholzh at users.sourceforge.net (janholzh at users.sourceforge.net) Date: Tue, 19 Jan 2010 14:55:52 +0000 Subject: [csw-devel] SF.net SVN: gar:[8093] csw/mgar/pkg/libsoup2/trunk/Makefile Message-ID: Revision: 8093 http://gar.svn.sourceforge.net/gar/?rev=8093&view=rev Author: janholzh Date: 2010-01-19 14:55:52 +0000 (Tue, 19 Jan 2010) Log Message: ----------- libsoup2: merged gnome and non-gnome part Modified Paths: -------------- csw/mgar/pkg/libsoup2/trunk/Makefile Modified: csw/mgar/pkg/libsoup2/trunk/Makefile =================================================================== --- csw/mgar/pkg/libsoup2/trunk/Makefile 2010-01-19 14:04:08 UTC (rev 8092) +++ csw/mgar/pkg/libsoup2/trunk/Makefile 2010-01-19 14:55:52 UTC (rev 8093) @@ -15,44 +15,24 @@ PACKAGES = CSWlibsoup2 PACKAGES += CSWlibsoup2dev -PACKAGES += CSWlibsoup2gnome -PACKAGES += CSWlibsoup2gnomedev SPKG_DESC_CSWlibsoup2 = HTTP client/server library for GNOME SPKG_DESC_CSWlibsoup2dev = HTTP client/server library for GNOME, dev files -SPKG_DESC_CSWlibsoup2gnome = HTTP client/server library for GNOME, gnome part -SPKG_DESC_CSWlibsoup2gnomedev = HTTP client/server library for GNOME, gnome dev part -REQUIRED_PKGS_CSWlibsoup2gnome = CSWgconf2 -REQUIRED_PKGS_CSWlibsoup2gnome += CSWgcrypt -REQUIRED_PKGS_CSWlibsoup2gnome += CSWggettextrt -REQUIRED_PKGS_CSWlibsoup2gnome += CSWglib2 -REQUIRED_PKGS_CSWlibsoup2gnome += CSWgnutls -REQUIRED_PKGS_CSWlibsoup2gnome += CSWgpgerr -REQUIRED_PKGS_CSWlibsoup2gnome += CSWlibproxy -REQUIRED_PKGS_CSWlibsoup2gnome += CSWlibxml2 -REQUIRED_PKGS_CSWlibsoup2gnome += CSWsqlite3rt - -REQUIRED_PKGS_CSWlibsoup2gnome += CSWlibsoup2 - -REQUIRED_PKGS_CSWlibsoup2dev = CSWlibsoup2 -REQUIRED_PKGS_CSWlibsoup2gnomedev = CSWlibsoup2gnome - -REQUIRED_PKGS_CSWlibsoup2 = CSWgcrypt +REQUIRED_PKGS_CSWlibsoup2 = CSWgconf2 +REQUIRED_PKGS_CSWlibsoup2 += CSWgcrypt REQUIRED_PKGS_CSWlibsoup2 += CSWggettextrt REQUIRED_PKGS_CSWlibsoup2 += CSWglib2 REQUIRED_PKGS_CSWlibsoup2 += CSWgnutls REQUIRED_PKGS_CSWlibsoup2 += CSWgpgerr -#REQUIRED_PKGS_CSWlibsoup2 += CSWlibproxy +REQUIRED_PKGS_CSWlibsoup2 += CSWlibproxy REQUIRED_PKGS_CSWlibsoup2 += CSWlibxml2 +REQUIRED_PKGS_CSWlibsoup2 += CSWsqlite3rt -REQUIRED_PKGS_CSWlibsoup2dev = CSWlibsoup2 +REQUIRED_PKGS_CSWlibsoup2dev += CSWlibsoup2 -PKGFILES_CSWlibsoup2 = /opt/csw/lib/libsoup-2.4.so.1.2.0 -PKGFILES_CSWlibsoup2dev = /opt/csw/lib/pkgconfig/libsoup-2.4.pc -PKGFILES_CSWlibsoup2dev += /opt/csw/include/libsoup-2.4/.* -PKGFILES_CSWlibsoup2gnomedev = /opt/csw/lib/pkgconfig/libsoup-gnome-2.4.pc -PKGFILES_CSWlibsoup2gnomedev += /opt/csw/include/libsoup-gnome-2.4/.* +PKGFILES_CSWlibsoup2dev = /opt/csw/lib/pkgconfig/.* +PKGFILES_CSWlibsoup2dev += /opt/csw/include/.* EXTRA_INC = /opt/csw/X11/include @@ -60,9 +40,9 @@ EXTRA_PKG_CONFIG_DIRS = $(prefix)/X11/lib STRIP_LIBTOOL = 1 -CONFIGURE_ARGS = $(DIRPATHS) --disable-static --with-apache-httpd=/opt/csw/apache2/sbin/httpd --with-apache-module-dir=/opt/csw/apache2/libexec/ +CONFIGURE_ARGS = $(DIRPATHS) --disable-static -#TEST_TARGET = check -TEST_TARGET = +# Test disabled because of missing Apache stuff +TEST_TARGET = include gar/category.mk This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Tue Jan 19 16:59:44 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Tue, 19 Jan 2010 15:59:44 +0000 Subject: [csw-devel] SF.net SVN: gar:[8094] csw/mgar/pkg/sudo/trunk/Makefile Message-ID: Revision: 8094 http://gar.svn.sourceforge.net/gar/?rev=8094&view=rev Author: wahwah Date: 2010-01-19 15:59:44 +0000 (Tue, 19 Jan 2010) Log Message: ----------- sudo: Setting the --with-logpath option and making sure it's installed Modified Paths: -------------- csw/mgar/pkg/sudo/trunk/Makefile Modified: csw/mgar/pkg/sudo/trunk/Makefile =================================================================== --- csw/mgar/pkg/sudo/trunk/Makefile 2010-01-19 14:55:52 UTC (rev 8093) +++ csw/mgar/pkg/sudo/trunk/Makefile 2010-01-19 15:59:44 UTC (rev 8094) @@ -36,13 +36,15 @@ DISTFILES += CSWsudo-common.postinstall +LOGPATH = /var/opt/csw/log/sudo + CONFIGURE_ARGS = $(DIRPATHS) CONFIGURE_ARGS += --with-pam CONFIGURE_ARGS += --with-logging=both CONFIGURE_ARGS += --with-ignore-dot CONFIGURE_ARGS += --with-env-editor CONFIGURE_ARGS += --disable-path-info -CONFIGURE_ARGS += --with-logpath=/var/opt/csw/sudo/logs/sudolog +CONFIGURE_ARGS += --with-logpath=$(LOGPATH)/sudolog ifneq ($(shell uname -r),5.8) CONFIGURE_ARGS += --with-project endif @@ -57,6 +59,10 @@ PKGFILES_CSWsudo = $(bindir)/sudo.minimal PKGFILES_CSWsudo += $(bindir)/sudo +PROTOTYPE_MODIFIERS = sudo +PROTOTYPE_FILES_sudo = $(bindir)/sudo.minimal +PROTOTYPE_PERMS_sudo = 4755 + include gar/category.mk post-install-modulated: @@ -65,6 +71,7 @@ @( cd $(DESTDIR)$(bindir) ; grm -f sudoedit ) @( cd $(DESTDIR)$(bindir) ; gcp sudo.minimal sudoedit ) @( cd $(DESTDIR)$(sysconfdir) ; gmv sudoers sudoers.CSW ) + install -m 755 -d $(DESTDIR)$(LOGPATH)/logs @$(MAKECOOKIE) post-merge-modulated: This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Wed Jan 20 15:24:48 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 20 Jan 2010 14:24:48 +0000 Subject: [csw-devel] SF.net SVN: gar:[8095] csw/mgar/pkg/pcre/tags/pcre-8.00, REV=2009.11.17/ Message-ID: Revision: 8095 http://gar.svn.sourceforge.net/gar/?rev=8095&view=rev Author: dmichelsen Date: 2010-01-20 14:24:48 +0000 (Wed, 20 Jan 2010) Log Message: ----------- pcre: Tag 8.00,REV=2009.11.17 Added Paths: ----------- csw/mgar/pkg/pcre/tags/pcre-8.00,REV=2009.11.17/ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Wed Jan 20 16:09:18 2010 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Wed, 20 Jan 2010 15:09:18 +0000 Subject: [csw-devel] SF.net SVN: gar:[8096] csw/mgar/pkg/x11/lib/libpthread-stubs/trunk Message-ID: Revision: 8096 http://gar.svn.sourceforge.net/gar/?rev=8096&view=rev Author: wbonnet Date: 2010-01-20 15:09:09 +0000 (Wed, 20 Jan 2010) Log Message: ----------- Upgrade to version 0.3 Modified Paths: -------------- csw/mgar/pkg/x11/lib/libpthread-stubs/trunk/Makefile csw/mgar/pkg/x11/lib/libpthread-stubs/trunk/checksums Modified: csw/mgar/pkg/x11/lib/libpthread-stubs/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/lib/libpthread-stubs/trunk/Makefile 2010-01-20 14:24:48 UTC (rev 8095) +++ csw/mgar/pkg/x11/lib/libpthread-stubs/trunk/Makefile 2010-01-20 15:09:09 UTC (rev 8096) @@ -1,5 +1,5 @@ GARNAME = libpthread-stubs -GARVERSION = 0.1 +GARVERSION = 0.3 CATEGORIES = x11 DESCRIPTION = pthread stubs not provided by native libc Modified: csw/mgar/pkg/x11/lib/libpthread-stubs/trunk/checksums =================================================================== --- csw/mgar/pkg/x11/lib/libpthread-stubs/trunk/checksums 2010-01-20 14:24:48 UTC (rev 8095) +++ csw/mgar/pkg/x11/lib/libpthread-stubs/trunk/checksums 2010-01-20 15:09:09 UTC (rev 8096) @@ -1 +1 @@ -5e3e75160ab6a8c212d0ecd82aa04651 download/libpthread-stubs-0.1.tar.gz +a09d928c4af54fe5436002345ef71138 libpthread-stubs-0.3.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Wed Jan 20 16:14:09 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 20 Jan 2010 15:14:09 +0000 Subject: [csw-devel] SF.net SVN: gar:[8097] csw/mgar/pkg/pcre/trunk Message-ID: Revision: 8097 http://gar.svn.sourceforge.net/gar/?rev=8097&view=rev Author: dmichelsen Date: 2010-01-20 15:14:09 +0000 (Wed, 20 Jan 2010) Log Message: ----------- pcre: Update to 8.01 Modified Paths: -------------- csw/mgar/pkg/pcre/trunk/Makefile csw/mgar/pkg/pcre/trunk/checksums Added Paths: ----------- csw/mgar/pkg/pcre/trunk/files/0001-Add-missing-inttypes.h.patch Modified: csw/mgar/pkg/pcre/trunk/Makefile =================================================================== --- csw/mgar/pkg/pcre/trunk/Makefile 2010-01-20 15:09:09 UTC (rev 8096) +++ csw/mgar/pkg/pcre/trunk/Makefile 2010-01-20 15:14:09 UTC (rev 8097) @@ -1,5 +1,5 @@ GARNAME = pcre -GARVERSION = 8.00 +GARVERSION = 8.01 CATEGORIES = lib DESCRIPTION = Perl-compatible regular expression tools @@ -12,12 +12,13 @@ MASTER_SITES = ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/ DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz +PATCHFILES = 0001-Add-missing-inttypes.h.patch SPKG_SOURCEURL = http://www.pcre.org PREREQUISITE_PKGS = CSWgnulinks -REQUIRED_PKGS_CSWpcrert = CSWzlib CSWbzip2 CSWreadline CSWncurses -REQUIRED_PKGS_CSWpcre = CSWpcrert $(REQUIRED_PKGS_CSWpcrert) +REQUIRED_PKGS_CSWpcrert = CSWncurses +REQUIRED_PKGS_CSWpcre = CSWpcrert CSWzlib CSWbzip2 CSWreadline $(REQUIRED_PKGS_CSWpcrert) PACKAGES = CSWpcre CSWpcrert CATALOGNAME_CSWpcrert = pcre_rt Modified: csw/mgar/pkg/pcre/trunk/checksums =================================================================== --- csw/mgar/pkg/pcre/trunk/checksums 2010-01-20 15:09:09 UTC (rev 8096) +++ csw/mgar/pkg/pcre/trunk/checksums 2010-01-20 15:14:09 UTC (rev 8097) @@ -1 +1,2 @@ -c95500eeda12c8c7edc6b0926d60952c pcre-8.00.tar.gz +dc6be5e75d8322e6337161990b8ae424 0001-Add-missing-inttypes.h.patch +def40e944d2c429cbf563357e61c1ad2 pcre-8.01.tar.gz Added: csw/mgar/pkg/pcre/trunk/files/0001-Add-missing-inttypes.h.patch =================================================================== --- csw/mgar/pkg/pcre/trunk/files/0001-Add-missing-inttypes.h.patch (rev 0) +++ csw/mgar/pkg/pcre/trunk/files/0001-Add-missing-inttypes.h.patch 2010-01-20 15:14:09 UTC (rev 8097) @@ -0,0 +1,21 @@ +From 8d080cb9ee95738c6b446f1a1fcb8cddbbae7559 Mon Sep 17 00:00:00 2001 +From: Dagobert Michelsen +Date: Wed, 20 Jan 2010 15:55:55 +0100 +Subject: [PATCH] Add missing inttypes.h + +--- + pcre_compile.c | 1 + + 1 files changed, 1 insertions(+), 0 deletions(-) + +diff --git a/pcre_compile.c b/pcre_compile.c +index beae0e4..8a54b54 100644 +--- a/pcre_compile.c ++++ b/pcre_compile.c +@@ -1,3 +1,4 @@ ++#include + /************************************************* + * Perl-Compatible Regular Expressions * + *************************************************/ +-- +1.6.6 + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Wed Jan 20 16:27:28 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 20 Jan 2010 15:27:28 +0000 Subject: [csw-devel] SF.net SVN: gar:[8098] csw/mgar/pkg Message-ID: Revision: 8098 http://gar.svn.sourceforge.net/gar/?rev=8098&view=rev Author: dmichelsen Date: 2010-01-20 15:27:26 +0000 (Wed, 20 Jan 2010) Log Message: ----------- xerces-c: Initial commit Added Paths: ----------- csw/mgar/pkg/xerces-c/ csw/mgar/pkg/xerces-c/branches/ csw/mgar/pkg/xerces-c/tags/ csw/mgar/pkg/xerces-c/trunk/ csw/mgar/pkg/xerces-c/trunk/Makefile csw/mgar/pkg/xerces-c/trunk/checksums csw/mgar/pkg/xerces-c/trunk/files/ Property changes on: csw/mgar/pkg/xerces-c/trunk ___________________________________________________________________ Added: svn:ignore + cookies download work Added: svn:externals + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 Added: csw/mgar/pkg/xerces-c/trunk/Makefile =================================================================== --- csw/mgar/pkg/xerces-c/trunk/Makefile (rev 0) +++ csw/mgar/pkg/xerces-c/trunk/Makefile 2010-01-20 15:27:26 UTC (rev 8098) @@ -0,0 +1,29 @@ +GARNAME = xerces-c +GARVERSION = 3.0.1 +CATEGORIES = lib + +DESCRIPTION = Xerces XML parser for C++ +define BLURB + Xerces-C++ is a validating XML parser written in a portable subset + of C++. Xerces-C++ makes it easy to give your application the ability + to read and write XML data. A shared library is provided for parsing, + generating, manipulating, and validating XML documents using the DOM, + SAX, and SAX2 APIs. For an introduction to programming with Xerces-C++ + refer to the Programming Guide. +endef + +MASTER_SITES = http://apache.abdaal.com/xerces/c/3/sources/ +DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz + +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + +PACKAGES = CSWxerces-c +CATALOGNAME = xerces_c + +SPKG_SOURCEURL = http://xerces.apache.org/xerces-c/ + +BUILD64 = 1 +CONFIGURE_ARGS = $(DIRPATHS) + +include gar/category.mk Added: csw/mgar/pkg/xerces-c/trunk/checksums =================================================================== --- csw/mgar/pkg/xerces-c/trunk/checksums (rev 0) +++ csw/mgar/pkg/xerces-c/trunk/checksums 2010-01-20 15:27:26 UTC (rev 8098) @@ -0,0 +1 @@ +293c03f59bf8e956020d73f5b122094c xerces-c-3.0.1.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From skayser at users.sourceforge.net Thu Jan 21 02:01:21 2010 From: skayser at users.sourceforge.net (skayser at users.sourceforge.net) Date: Thu, 21 Jan 2010 01:01:21 +0000 Subject: [csw-devel] SF.net SVN: gar:[8099] csw/mgar/pkg Message-ID: Revision: 8099 http://gar.svn.sourceforge.net/gar/?rev=8099&view=rev Author: skayser Date: 2010-01-21 01:01:21 +0000 (Thu, 21 Jan 2010) Log Message: ----------- libvanessa-logger: initial commit Added Paths: ----------- csw/mgar/pkg/libvanessa-logger/ csw/mgar/pkg/libvanessa-logger/branches/ csw/mgar/pkg/libvanessa-logger/tags/ csw/mgar/pkg/libvanessa-logger/trunk/ csw/mgar/pkg/libvanessa-logger/trunk/Makefile csw/mgar/pkg/libvanessa-logger/trunk/checksums csw/mgar/pkg/libvanessa-logger/trunk/files/ csw/mgar/pkg/libvanessa-logger/trunk/files/changelog.CSW Property changes on: csw/mgar/pkg/libvanessa-logger/trunk ___________________________________________________________________ Added: svn:ignore + cookies download work Added: svn:externals + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 Added: csw/mgar/pkg/libvanessa-logger/trunk/Makefile =================================================================== --- csw/mgar/pkg/libvanessa-logger/trunk/Makefile (rev 0) +++ csw/mgar/pkg/libvanessa-logger/trunk/Makefile 2010-01-21 01:01:21 UTC (rev 8099) @@ -0,0 +1,33 @@ +GARNAME = libvanessa-logger +GARVERSION = 0.0.8 +CATEGORIES = lib + +DESCRIPTION = Generic logging library +define BLURB + Provides a generic logging layer that may be used to log to one or more + of syslog, an open file handle or a file name. Though due to to + limitations in the implementation of syslog opening multiple syslog + loggers doesn't makes sense. Includes the ability to limit which + messages will be logged based on priorities. +endef + +VENDOR_URL = http://www.vergenet.net/linux/vanessa/ +MASTER_SITES = $(VENDOR_URL)/download/vanessa_logger/$(GARVERSION)/ +DISTFILES = vanessa_logger-$(GARVERSION).tar.gz +DISTNAME = vanessa_logger-$(GARVERSION) +UFILES_REGEX = (\d+(?:\.\d+)*) +UPSTREAM_MASTER_SITES = $(VENDOR_URL)/download/vanessa_logger/ + +CONFIGURE_ARGS = $(DIRPATHS) + +TEST_TARGET = + +include gar/category.mk + + +post-merge: $(foreach P,$(_PKG_SPECS),install-changelog-$P) + +install-changelog-%: + ginstall -D $(FILEDIR)/changelog.CSW \ + $(PKGROOT)$(docdir)/$(call catalogname,$*)/changelog.CSW + @$(MAKECOOKIE) Added: csw/mgar/pkg/libvanessa-logger/trunk/checksums =================================================================== --- csw/mgar/pkg/libvanessa-logger/trunk/checksums (rev 0) +++ csw/mgar/pkg/libvanessa-logger/trunk/checksums 2010-01-21 01:01:21 UTC (rev 8099) @@ -0,0 +1 @@ +12c17d44bd27141c175d69c7b5d0f4dc vanessa_logger-0.0.8.tar.gz Added: csw/mgar/pkg/libvanessa-logger/trunk/files/changelog.CSW =================================================================== --- csw/mgar/pkg/libvanessa-logger/trunk/files/changelog.CSW (rev 0) +++ csw/mgar/pkg/libvanessa-logger/trunk/files/changelog.CSW 2010-01-21 01:01:21 UTC (rev 8099) @@ -0,0 +1,5 @@ +libvanessa-logger (0.0.8,REV=2010.01.21) + + * Initial release. + + -- Sebastian Kayser Thu, 21 Jan 2010 01:59:21 +0100 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From skayser at users.sourceforge.net Thu Jan 21 02:09:14 2010 From: skayser at users.sourceforge.net (skayser at users.sourceforge.net) Date: Thu, 21 Jan 2010 01:09:14 +0000 Subject: [csw-devel] SF.net SVN: gar:[8100] csw/mgar/pkg Message-ID: Revision: 8100 http://gar.svn.sourceforge.net/gar/?rev=8100&view=rev Author: skayser Date: 2010-01-21 01:09:14 +0000 (Thu, 21 Jan 2010) Log Message: ----------- libvanessa-socket: initial commit Added Paths: ----------- csw/mgar/pkg/libvanessa-socket/ csw/mgar/pkg/libvanessa-socket/branches/ csw/mgar/pkg/libvanessa-socket/tags/ csw/mgar/pkg/libvanessa-socket/trunk/ csw/mgar/pkg/libvanessa-socket/trunk/Makefile csw/mgar/pkg/libvanessa-socket/trunk/checksums csw/mgar/pkg/libvanessa-socket/trunk/files/ csw/mgar/pkg/libvanessa-socket/trunk/files/changelog.CSW Property changes on: csw/mgar/pkg/libvanessa-socket/trunk ___________________________________________________________________ Added: svn:ignore + cookies download work Added: svn:externals + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 Added: csw/mgar/pkg/libvanessa-socket/trunk/Makefile =================================================================== --- csw/mgar/pkg/libvanessa-socket/trunk/Makefile (rev 0) +++ csw/mgar/pkg/libvanessa-socket/trunk/Makefile 2010-01-21 01:09:14 UTC (rev 8100) @@ -0,0 +1,32 @@ +GARNAME = libvanessa-socket +GARVERSION = 0.0.9 +CATEGORIES = lib + +DESCRIPTION = Library to simplify common socket operations. +define BLURB + Simplifies TCP/IP socket operations. It includes code to open a socket + to a server as a client, to listen on socket for clients as a server and + to pipe information between sockets. +endef + +VENDOR_URL = http://www.vergenet.net/linux/vanessa/ +MASTER_SITES = $(VENDOR_URL)/download/vanessa_socket/$(GARVERSION)/ +DISTFILES = vanessa_socket-$(GARVERSION).tar.gz +DISTNAME = vanessa_socket-$(GARVERSION) +UFILES_REGEX = (\d+(?:\.\d+)*) +UPSTREAM_MASTER_SITES = $(VENDOR_URL)/download/vanessa_socket/ + +PACKAGES = CSWlibvanessa-socket +CATALOGNAME = libvanessa_socket +REQUIRED_PKGS = CSWlibvanessa-logger + +CONFIGURE_ARGS = $(DIRPATHS) + +include gar/category.mk + +post-merge: $(foreach P,$(_PKG_SPECS),install-changelog-$P) + +install-changelog-%: + ginstall -D $(FILEDIR)/changelog.CSW \ + $(PKGROOT)$(docdir)/$(call catalogname,$*)/changelog.CSW + @$(MAKECOOKIE) Added: csw/mgar/pkg/libvanessa-socket/trunk/checksums =================================================================== --- csw/mgar/pkg/libvanessa-socket/trunk/checksums (rev 0) +++ csw/mgar/pkg/libvanessa-socket/trunk/checksums 2010-01-21 01:09:14 UTC (rev 8100) @@ -0,0 +1 @@ +b63fb0f22938ceec7eec3c77cfcae69b vanessa_socket-0.0.9.tar.gz Added: csw/mgar/pkg/libvanessa-socket/trunk/files/changelog.CSW =================================================================== --- csw/mgar/pkg/libvanessa-socket/trunk/files/changelog.CSW (rev 0) +++ csw/mgar/pkg/libvanessa-socket/trunk/files/changelog.CSW 2010-01-21 01:09:14 UTC (rev 8100) @@ -0,0 +1,5 @@ +libvanessa-socket (0.0.9,REV=2010.01.21) + + * Initial release. + + -- Sebastian Kayser Thu, 21 Jan 2010 02:08:20 +0100 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From skayser at users.sourceforge.net Thu Jan 21 02:10:23 2010 From: skayser at users.sourceforge.net (skayser at users.sourceforge.net) Date: Thu, 21 Jan 2010 01:10:23 +0000 Subject: [csw-devel] SF.net SVN: gar:[8101] csw/mgar/pkg/libvanessa-logger/trunk/Makefile Message-ID: Revision: 8101 http://gar.svn.sourceforge.net/gar/?rev=8101&view=rev Author: skayser Date: 2010-01-21 01:10:23 +0000 (Thu, 21 Jan 2010) Log Message: ----------- libvanessa-logger: adjust PACKAGES/CATALOGNAME Modified Paths: -------------- csw/mgar/pkg/libvanessa-logger/trunk/Makefile Modified: csw/mgar/pkg/libvanessa-logger/trunk/Makefile =================================================================== --- csw/mgar/pkg/libvanessa-logger/trunk/Makefile 2010-01-21 01:09:14 UTC (rev 8100) +++ csw/mgar/pkg/libvanessa-logger/trunk/Makefile 2010-01-21 01:10:23 UTC (rev 8101) @@ -18,6 +18,9 @@ UFILES_REGEX = (\d+(?:\.\d+)*) UPSTREAM_MASTER_SITES = $(VENDOR_URL)/download/vanessa_logger/ +PACKAGES = CSWlibvanessa-logger +CATALOGNAME = libvanessa_logger + CONFIGURE_ARGS = $(DIRPATHS) TEST_TARGET = This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Thu Jan 21 09:26:14 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Thu, 21 Jan 2010 08:26:14 +0000 Subject: [csw-devel] SF.net SVN: gar:[8102] csw/mgar/gar/v2/bin/checkpkg.d/testdata/ checkpkg_test_data_CSWpostfix.py Message-ID: Revision: 8102 http://gar.svn.sourceforge.net/gar/?rev=8102&view=rev Author: wahwah Date: 2010-01-21 08:26:14 +0000 (Thu, 21 Jan 2010) Log Message: ----------- mGAR v2: checkpkg, updating the dest data for postfix (d7) Modified Paths: -------------- csw/mgar/gar/v2/bin/checkpkg.d/testdata/checkpkg_test_data_CSWpostfix.py Modified: csw/mgar/gar/v2/bin/checkpkg.d/testdata/checkpkg_test_data_CSWpostfix.py =================================================================== --- csw/mgar/gar/v2/bin/checkpkg.d/testdata/checkpkg_test_data_CSWpostfix.py 2010-01-21 01:10:23 UTC (rev 8101) +++ csw/mgar/gar/v2/bin/checkpkg.d/testdata/checkpkg_test_data_CSWpostfix.py 2010-01-21 08:26:14 UTC (rev 8102) @@ -1,13 +1,13 @@ # Testing data for CSWpostfix # $Id: checkpkg-libs.py 7997 2010-01-14 09:22:25Z wahwah $ DATA_PKGNAME = 'CSWpostfix' -DATA_DECLARED_DEPENDENCIES = {'CSWcswclassutils': 'CSWcswclassutils cswclassutils - CSW class action utilities ', 'CSWpcrert': 'CSWpcrert pcre_rt - Perl-compatible regular expression runtime libraries ', 'CSWmysql5rt': 'CSWmysql5rt mysql5rt - MySQL 5 runtime files ', 'CSWbdb4': 'CSWbdb4 berkeleydb4 - Stub package as contents moved to CSWbdb42 ', 'CSWlibpq': 'CSWlibpq libpq - libraries needed by postgresql server and clients ', 'CSWsasl': 'CSWsasl sasl - Simple Authentication and Security Layer ', 'CSWcommon': 'CSWcommon common - common files and dirs for CSW packages ', 'CSWoldaprt': 'CSWoldaprt openldap_rt - OpenLDAP runtime libraries (oldaprt) ', 'CSWosslrt': 'CSWosslrt openssl_rt - Openssl runtime libraries '} -DATA_BINARIES_BY_PKGNAME = {'CSWpostfix': ['anvil', 'spawn', 'nqmgr', 'tlsmgr', 'scache', 'discard', 'pickup', 'oqmgr', 'proxymap', 'flush', 'verify', 'pipe', 'master', 'bounce', 'error', 'qmqpd', 'virtual', 'smtpd', 'lmtp', 'trivial-rewrite', 'showq', 'cleanup', 'local', 'postmap', 'postlog', 'postmulti', 'postalias', 'postsuper', 'postconf', 'postlock', 'postcat', 'sendmail', 'postqueue', 'postkick', 'postfix', 'postdrop']} -DATA_NEEDED_SONAMES_BY_BINARY = {'postmulti': {'soname': 'postmulti', 'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/bdb4/lib', '/opt/csw/mysql5/lib/mysql', '/opt/csw/postgresql/lib/', '/usr/lib/$ISALIST', '/usr/lib', '/lib/$ISALIST', '/lib'], 'needed sonames': ['libpcre.so.0', 'libdb-4.2.so', 'libssl.so.0.9.8', 'libcrypto.so.0.9.8', 'libsasl2.so.2', 'libldap-2.3.so.0', 'liblber-2.3.so.0', 'libmysqlclient.so.15', 'libpq.so.5', 'libresolv.so.2', 'libsocket.so.1', 'libnsl.so.1', 'libc.so.1']}, 'spawn': {'soname': 'spawn', 'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/bdb4/lib', '/opt/csw/mysql5/lib/mysql', '/opt/csw/postgresql/lib/', '/usr/lib/$ISALIST', '/usr/lib', '/lib/$ISALIST', '/lib'], 'needed sonames': ['libpcre.so.0', 'libdb-4.2.so', 'libssl.so.0.9.8', 'libcrypto.so.0.9.8', 'libsasl2.so.2', 'libldap-2.3.so.0', 'liblber-2.3.so.0', 'libmysqlclient.so.15', 'libpq.so.5', 'libresolv.so.2', 'libsocket.so.1', 'libnsl.so.1', 'libc.so.1']}, 'pos tkick': {'soname': 'postkick', 'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/bdb4/lib', '/opt/csw/mysql5/lib/mysql', '/opt/csw/postgresql/lib/', '/usr/lib/$ISALIST', '/usr/lib', '/lib/$ISALIST', '/lib'], 'needed sonames': ['libpcre.so.0', 'libdb-4.2.so', 'libssl.so.0.9.8', 'libcrypto.so.0.9.8', 'libsasl2.so.2', 'libldap-2.3.so.0', 'liblber-2.3.so.0', 'libmysqlclient.so.15', 'libpq.so.5', 'libresolv.so.2', 'libsocket.so.1', 'libnsl.so.1', 'libc.so.1']}, 'postlog': {'soname': 'postlog', 'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/bdb4/lib', '/opt/csw/mysql5/lib/mysql', '/opt/csw/postgresql/lib/', '/usr/lib/$ISALIST', '/usr/lib', '/lib/$ISALIST', '/lib'], 'needed sonames': ['libpcre.so.0', 'libdb-4.2.so', 'libssl.so.0.9.8', 'libcrypto.so.0.9.8', 'libsasl2.so.2', 'libldap-2.3.so.0', 'liblber-2.3.so.0', 'libmysqlclient.so.15', 'libpq.so.5', 'libresolv.so.2', 'libsocket.so.1', 'libnsl.so.1', 'libc.so.1']}, 'postconf': {'soname': 'postconf', 'run path': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/bdb4/lib', '/opt/csw/mysql5/lib/mysql', '/opt/csw/postgresql/lib/', '/usr/lib/$ISALIST', '/usr/lib', '/lib/$ISALIST', '/lib'], 'needed sonames': ['libpcre.so.0', 'libdb-4.2.so', 'libssl.so.0.9.8', 'libcrypto.so.0.9.8', 'libsasl2.so.2', 'libldap-2.3.so.0', 'liblber-2.3.so.0', 'libmysqlclient.so.15', 'libpq.so.5', 'libresolv.so.2', 'libsocket.so.1', 'libnsl.so.1', 'libc.so.1']}, 'bounce': {'soname': 'bounce', 'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/bdb4/lib', '/opt/csw/mysql5/lib/mysql', '/opt/csw/postgresql/lib/', '/usr/lib/$ISALIST', '/usr/lib', '/lib/$ISALIST', '/lib'], 'needed sonames': ['libpcre.so.0', 'libdb-4.2.so', 'libssl.so.0.9.8', 'libcrypto.so.0.9.8', 'libsasl2.so.2', 'libldap-2.3.so.0', 'liblber-2.3.so.0', 'libmysqlclient.so.15', 'libpq.so.5', 'libresolv.so.2', 'libsocket.so.1', 'libnsl.so.1', 'libc.so.1']}, 'qmqpd': {'soname': 'qmqpd', 'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/ lib', '/opt/csw/bdb4/lib', '/opt/csw/mysql5/lib/mysql', '/opt/csw/postgresql/lib/', '/usr/lib/$ISALIST', '/usr/lib', '/lib/$ISALIST', '/lib'], 'needed sonames': ['libpcre.so.0', 'libdb-4.2.so', 'libssl.so.0.9.8', 'libcrypto.so.0.9.8', 'libsasl2.so.2', 'libldap-2.3.so.0', 'liblber-2.3.so.0', 'libmysqlclient.so.15', 'libpq.so.5', 'libresolv.so.2', 'libsocket.so.1', 'libnsl.so.1', 'libc.so.1']}, 'nqmgr': {'soname': 'nqmgr', 'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/bdb4/lib', '/opt/csw/mysql5/lib/mysql', '/opt/csw/postgresql/lib/', '/usr/lib/$ISALIST', '/usr/lib', '/lib/$ISALIST', '/lib'], 'needed sonames': ['libpcre.so.0', 'libdb-4.2.so', 'libssl.so.0.9.8', 'libcrypto.so.0.9.8', 'libsasl2.so.2', 'libldap-2.3.so.0', 'liblber-2.3.so.0', 'libmysqlclient.so.15', 'libpq.so.5', 'libresolv.so.2', 'libsocket.so.1', 'libnsl.so.1', 'libc.so.1']}, 'flush': {'soname': 'flush', 'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/bdb4/lib', '/opt/csw/mysql5/l ib/mysql', '/opt/csw/postgresql/lib/', '/usr/lib/$ISALIST', '/usr/lib', '/lib/$ISALIST', '/lib'], 'needed sonames': ['libpcre.so.0', 'libdb-4.2.so', 'libssl.so.0.9.8', 'libcrypto.so.0.9.8', 'libsasl2.so.2', 'libldap-2.3.so.0', 'liblber-2.3.so.0', 'libmysqlclient.so.15', 'libpq.so.5', 'libresolv.so.2', 'libsocket.so.1', 'libnsl.so.1', 'libc.so.1']}, 'proxymap': {'soname': 'proxymap', 'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/bdb4/lib', '/opt/csw/mysql5/lib/mysql', '/opt/csw/postgresql/lib/', '/usr/lib/$ISALIST', '/usr/lib', '/lib/$ISALIST', '/lib'], 'needed sonames': ['libpcre.so.0', 'libdb-4.2.so', 'libssl.so.0.9.8', 'libcrypto.so.0.9.8', 'libsasl2.so.2', 'libldap-2.3.so.0', 'liblber-2.3.so.0', 'libmysqlclient.so.15', 'libpq.so.5', 'libresolv.so.2', 'libsocket.so.1', 'libnsl.so.1', 'libc.so.1']}, 'scache': {'soname': 'scache', 'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/bdb4/lib', '/opt/csw/mysql5/lib/mysql', '/opt/csw/postgresql/lib/' , '/usr/lib/$ISALIST', '/usr/lib', '/lib/$ISALIST', '/lib'], 'needed sonames': ['libpcre.so.0', 'libdb-4.2.so', 'libssl.so.0.9.8', 'libcrypto.so.0.9.8', 'libsasl2.so.2', 'libldap-2.3.so.0', 'liblber-2.3.so.0', 'libmysqlclient.so.15', 'libpq.so.5', 'libresolv.so.2', 'libsocket.so.1', 'libnsl.so.1', 'libc.so.1']}, 'anvil': {'soname': 'anvil', 'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/bdb4/lib', '/opt/csw/mysql5/lib/mysql', '/opt/csw/postgresql/lib/', '/usr/lib/$ISALIST', '/usr/lib', '/lib/$ISALIST', '/lib'], 'needed sonames': ['libpcre.so.0', 'libdb-4.2.so', 'libssl.so.0.9.8', 'libcrypto.so.0.9.8', 'libsasl2.so.2', 'libldap-2.3.so.0', 'liblber-2.3.so.0', 'libmysqlclient.so.15', 'libpq.so.5', 'libresolv.so.2', 'libsocket.so.1', 'libnsl.so.1', 'libc.so.1']}, 'verify': {'soname': 'verify', 'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/bdb4/lib', '/opt/csw/mysql5/lib/mysql', '/opt/csw/postgresql/lib/', '/usr/lib/$ISALIST', '/usr/lib', '/lib/$I SALIST', '/lib'], 'needed sonames': ['libpcre.so.0', 'libdb-4.2.so', 'libssl.so.0.9.8', 'libcrypto.so.0.9.8', 'libsasl2.so.2', 'libldap-2.3.so.0', 'liblber-2.3.so.0', 'libmysqlclient.so.15', 'libpq.so.5', 'libresolv.so.2', 'libsocket.so.1', 'libnsl.so.1', 'libc.so.1']}, 'postalias': {'soname': 'postalias', 'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/bdb4/lib', '/opt/csw/mysql5/lib/mysql', '/opt/csw/postgresql/lib/', '/usr/lib/$ISALIST', '/usr/lib', '/lib/$ISALIST', '/lib'], 'needed sonames': ['libpcre.so.0', 'libdb-4.2.so', 'libssl.so.0.9.8', 'libcrypto.so.0.9.8', 'libsasl2.so.2', 'libldap-2.3.so.0', 'liblber-2.3.so.0', 'libmysqlclient.so.15', 'libpq.so.5', 'libresolv.so.2', 'libsocket.so.1', 'libnsl.so.1', 'libc.so.1']}, 'postcat': {'soname': 'postcat', 'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/bdb4/lib', '/opt/csw/mysql5/lib/mysql', '/opt/csw/postgresql/lib/', '/usr/lib/$ISALIST', '/usr/lib', '/lib/$ISALIST', '/lib'], 'needed sonames ': ['libpcre.so.0', 'libdb-4.2.so', 'libssl.so.0.9.8', 'libcrypto.so.0.9.8', 'libsasl2.so.2', 'libldap-2.3.so.0', 'liblber-2.3.so.0', 'libmysqlclient.so.15', 'libpq.so.5', 'libresolv.so.2', 'libsocket.so.1', 'libnsl.so.1', 'libc.so.1']}, 'virtual': {'soname': 'virtual', 'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/bdb4/lib', '/opt/csw/mysql5/lib/mysql', '/opt/csw/postgresql/lib/', '/usr/lib/$ISALIST', '/usr/lib', '/lib/$ISALIST', '/lib'], 'needed sonames': ['libpcre.so.0', 'libdb-4.2.so', 'libssl.so.0.9.8', 'libcrypto.so.0.9.8', 'libsasl2.so.2', 'libldap-2.3.so.0', 'liblber-2.3.so.0', 'libmysqlclient.so.15', 'libpq.so.5', 'libresolv.so.2', 'libsocket.so.1', 'libnsl.so.1', 'libc.so.1']}, 'pickup': {'soname': 'pickup', 'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/bdb4/lib', '/opt/csw/mysql5/lib/mysql', '/opt/csw/postgresql/lib/', '/usr/lib/$ISALIST', '/usr/lib', '/lib/$ISALIST', '/lib'], 'needed sonames': ['libpcre.so.0', 'libdb-4.2.so', 'li bssl.so.0.9.8', 'libcrypto.so.0.9.8', 'libsasl2.so.2', 'libldap-2.3.so.0', 'liblber-2.3.so.0', 'libmysqlclient.so.15', 'libpq.so.5', 'libresolv.so.2', 'libsocket.so.1', 'libnsl.so.1', 'libc.so.1']}, 'oqmgr': {'soname': 'oqmgr', 'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/bdb4/lib', '/opt/csw/mysql5/lib/mysql', '/opt/csw/postgresql/lib/', '/usr/lib/$ISALIST', '/usr/lib', '/lib/$ISALIST', '/lib'], 'needed sonames': ['libpcre.so.0', 'libdb-4.2.so', 'libssl.so.0.9.8', 'libcrypto.so.0.9.8', 'libsasl2.so.2', 'libldap-2.3.so.0', 'liblber-2.3.so.0', 'libmysqlclient.so.15', 'libpq.so.5', 'libresolv.so.2', 'libsocket.so.1', 'libnsl.so.1', 'libc.so.1']}, 'master': {'soname': 'master', 'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/bdb4/lib', '/opt/csw/mysql5/lib/mysql', '/opt/csw/postgresql/lib/', '/usr/lib/$ISALIST', '/usr/lib', '/lib/$ISALIST', '/lib'], 'needed sonames': ['libpcre.so.0', 'libdb-4.2.so', 'libssl.so.0.9.8', 'libcrypto.so.0.9.8', 'libs asl2.so.2', 'libldap-2.3.so.0', 'liblber-2.3.so.0', 'libmysqlclient.so.15', 'libpq.so.5', 'libresolv.so.2', 'libsocket.so.1', 'libnsl.so.1', 'libc.so.1']}, 'postqueue': {'soname': 'postqueue', 'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/bdb4/lib', '/opt/csw/mysql5/lib/mysql', '/opt/csw/postgresql/lib/', '/usr/lib/$ISALIST', '/usr/lib', '/lib/$ISALIST', '/lib'], 'needed sonames': ['libpcre.so.0', 'libdb-4.2.so', 'libssl.so.0.9.8', 'libcrypto.so.0.9.8', 'libsasl2.so.2', 'libldap-2.3.so.0', 'liblber-2.3.so.0', 'libmysqlclient.so.15', 'libpq.so.5', 'libresolv.so.2', 'libsocket.so.1', 'libnsl.so.1', 'libc.so.1']}, 'postmap': {'soname': 'postmap', 'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/bdb4/lib', '/opt/csw/mysql5/lib/mysql', '/opt/csw/postgresql/lib/', '/usr/lib/$ISALIST', '/usr/lib', '/lib/$ISALIST', '/lib'], 'needed sonames': ['libpcre.so.0', 'libdb-4.2.so', 'libssl.so.0.9.8', 'libcrypto.so.0.9.8', 'libsasl2.so.2', 'libldap-2.3.so.0', ' liblber-2.3.so.0', 'libmysqlclient.so.15', 'libpq.so.5', 'libresolv.so.2', 'libsocket.so.1', 'libnsl.so.1', 'libc.so.1']}, 'local': {'soname': 'local', 'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/bdb4/lib', '/opt/csw/mysql5/lib/mysql', '/opt/csw/postgresql/lib/', '/usr/lib/$ISALIST', '/usr/lib', '/lib/$ISALIST', '/lib'], 'needed sonames': ['libpcre.so.0', 'libdb-4.2.so', 'libssl.so.0.9.8', 'libcrypto.so.0.9.8', 'libsasl2.so.2', 'libldap-2.3.so.0', 'liblber-2.3.so.0', 'libmysqlclient.so.15', 'libpq.so.5', 'libresolv.so.2', 'libsocket.so.1', 'libnsl.so.1', 'libc.so.1']}, 'showq': {'soname': 'showq', 'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/bdb4/lib', '/opt/csw/mysql5/lib/mysql', '/opt/csw/postgresql/lib/', '/usr/lib/$ISALIST', '/usr/lib', '/lib/$ISALIST', '/lib'], 'needed sonames': ['libpcre.so.0', 'libdb-4.2.so', 'libssl.so.0.9.8', 'libcrypto.so.0.9.8', 'libsasl2.so.2', 'libldap-2.3.so.0', 'liblber-2.3.so.0', 'libmysqlclient.so.15', 'l ibpq.so.5', 'libresolv.so.2', 'libsocket.so.1', 'libnsl.so.1', 'libc.so.1']}, 'sendmail': {'soname': 'sendmail', 'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/bdb4/lib', '/opt/csw/mysql5/lib/mysql', '/opt/csw/postgresql/lib/', '/usr/lib/$ISALIST', '/usr/lib', '/lib/$ISALIST', '/lib'], 'needed sonames': ['libpcre.so.0', 'libdb-4.2.so', 'libssl.so.0.9.8', 'libcrypto.so.0.9.8', 'libsasl2.so.2', 'libldap-2.3.so.0', 'liblber-2.3.so.0', 'libmysqlclient.so.15', 'libpq.so.5', 'libresolv.so.2', 'libsocket.so.1', 'libnsl.so.1', 'libc.so.1']}, 'smtpd': {'soname': 'smtpd', 'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/bdb4/lib', '/opt/csw/mysql5/lib/mysql', '/opt/csw/postgresql/lib/', '/usr/lib/$ISALIST', '/usr/lib', '/lib/$ISALIST', '/lib'], 'needed sonames': ['libpcre.so.0', 'libdb-4.2.so', 'libssl.so.0.9.8', 'libcrypto.so.0.9.8', 'libsasl2.so.2', 'libldap-2.3.so.0', 'liblber-2.3.so.0', 'libmysqlclient.so.15', 'libpq.so.5', 'libresolv.so.2', 'libsocke t.so.1', 'libnsl.so.1', 'libc.so.1']}, 'lmtp': {'soname': 'lmtp', 'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/bdb4/lib', '/opt/csw/mysql5/lib/mysql', '/opt/csw/postgresql/lib/', '/usr/lib/$ISALIST', '/usr/lib', '/lib/$ISALIST', '/lib'], 'needed sonames': ['libpcre.so.0', 'libdb-4.2.so', 'libssl.so.0.9.8', 'libcrypto.so.0.9.8', 'libsasl2.so.2', 'libldap-2.3.so.0', 'liblber-2.3.so.0', 'libmysqlclient.so.15', 'libpq.so.5', 'libresolv.so.2', 'libsocket.so.1', 'libnsl.so.1', 'libc.so.1']}, 'postdrop': {'soname': 'postdrop', 'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/bdb4/lib', '/opt/csw/mysql5/lib/mysql', '/opt/csw/postgresql/lib/', '/usr/lib/$ISALIST', '/usr/lib', '/lib/$ISALIST', '/lib'], 'needed sonames': ['libpcre.so.0', 'libdb-4.2.so', 'libssl.so.0.9.8', 'libcrypto.so.0.9.8', 'libsasl2.so.2', 'libldap-2.3.so.0', 'liblber-2.3.so.0', 'libmysqlclient.so.15', 'libpq.so.5', 'libresolv.so.2', 'libsocket.so.1', 'libnsl.so.1', 'libc.so.1']}, 't rivial-rewrite': {'soname': 'trivial-rewrite', 'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/bdb4/lib', '/opt/csw/mysql5/lib/mysql', '/opt/csw/postgresql/lib/', '/usr/lib/$ISALIST', '/usr/lib', '/lib/$ISALIST', '/lib'], 'needed sonames': ['libpcre.so.0', 'libdb-4.2.so', 'libssl.so.0.9.8', 'libcrypto.so.0.9.8', 'libsasl2.so.2', 'libldap-2.3.so.0', 'liblber-2.3.so.0', 'libmysqlclient.so.15', 'libpq.so.5', 'libresolv.so.2', 'libsocket.so.1', 'libnsl.so.1', 'libc.so.1']}, 'postfix': {'soname': 'postfix', 'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/bdb4/lib', '/opt/csw/mysql5/lib/mysql', '/opt/csw/postgresql/lib/', '/usr/lib/$ISALIST', '/usr/lib', '/lib/$ISALIST', '/lib'], 'needed sonames': ['libpcre.so.0', 'libdb-4.2.so', 'libssl.so.0.9.8', 'libcrypto.so.0.9.8', 'libsasl2.so.2', 'libldap-2.3.so.0', 'liblber-2.3.so.0', 'libmysqlclient.so.15', 'libpq.so.5', 'libresolv.so.2', 'libsocket.so.1', 'libnsl.so.1', 'libc.so.1']}, 'postlock': {'soname': 'postlock', 'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/bdb4/lib', '/opt/csw/mysql5/lib/mysql', '/opt/csw/postgresql/lib/', '/usr/lib/$ISALIST', '/usr/lib', '/lib/$ISALIST', '/lib'], 'needed sonames': ['libpcre.so.0', 'libdb-4.2.so', 'libssl.so.0.9.8', 'libcrypto.so.0.9.8', 'libsasl2.so.2', 'libldap-2.3.so.0', 'liblber-2.3.so.0', 'libmysqlclient.so.15', 'libpq.so.5', 'libresolv.so.2', 'libsocket.so.1', 'libnsl.so.1', 'libc.so.1']}, 'pipe': {'soname': 'pipe', 'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/bdb4/lib', '/opt/csw/mysql5/lib/mysql', '/opt/csw/postgresql/lib/', '/usr/lib/$ISALIST', '/usr/lib', '/lib/$ISALIST', '/lib'], 'needed sonames': ['libpcre.so.0', 'libdb-4.2.so', 'libssl.so.0.9.8', 'libcrypto.so.0.9.8', 'libsasl2.so.2', 'libldap-2.3.so.0', 'liblber-2.3.so.0', 'libmysqlclient.so.15', 'libpq.so.5', 'libresolv.so.2', 'libsocket.so.1', 'libnsl.so.1', 'libc.so.1']}, 'tlsmgr': {'soname': 'tlsmgr', 'runpath': ['/opt/csw/lib/$ISALIS T', '/opt/csw/lib', '/opt/csw/bdb4/lib', '/opt/csw/mysql5/lib/mysql', '/opt/csw/postgresql/lib/', '/usr/lib/$ISALIST', '/usr/lib', '/lib/$ISALIST', '/lib'], 'needed sonames': ['libpcre.so.0', 'libdb-4.2.so', 'libssl.so.0.9.8', 'libcrypto.so.0.9.8', 'libsasl2.so.2', 'libldap-2.3.so.0', 'liblber-2.3.so.0', 'libmysqlclient.so.15', 'libpq.so.5', 'libresolv.so.2', 'libsocket.so.1', 'libnsl.so.1', 'libc.so.1']}, 'error': {'soname': 'error', 'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/bdb4/lib', '/opt/csw/mysql5/lib/mysql', '/opt/csw/postgresql/lib/', '/usr/lib/$ISALIST', '/usr/lib', '/lib/$ISALIST', '/lib'], 'needed sonames': ['libpcre.so.0', 'libdb-4.2.so', 'libssl.so.0.9.8', 'libcrypto.so.0.9.8', 'libsasl2.so.2', 'libldap-2.3.so.0', 'liblber-2.3.so.0', 'libmysqlclient.so.15', 'libpq.so.5', 'libresolv.so.2', 'libsocket.so.1', 'libnsl.so.1', 'libc.so.1']}, 'discard': {'soname': 'discard', 'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/bdb4/lib', '/opt/csw/mysql5/lib/mysql', '/opt/csw/postgresql/lib/', '/usr/lib/$ISALIST', '/usr/lib', '/lib/$ISALIST', '/lib'], 'needed sonames': ['libpcre.so.0', 'libdb-4.2.so', 'libssl.so.0.9.8', 'libcrypto.so.0.9.8', 'libsasl2.so.2', 'libldap-2.3.so.0', 'liblber-2.3.so.0', 'libmysqlclient.so.15', 'libpq.so.5', 'libresolv.so.2', 'libsocket.so.1', 'libnsl.so.1', 'libc.so.1']}, 'postsuper': {'soname': 'postsuper', 'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/bdb4/lib', '/opt/csw/mysql5/lib/mysql', '/opt/csw/postgresql/lib/', '/usr/lib/$ISALIST', '/usr/lib', '/lib/$ISALIST', '/lib'], 'needed sonames': ['libpcre.so.0', 'libdb-4.2.so', 'libssl.so.0.9.8', 'libcrypto.so.0.9.8', 'libsasl2.so.2', 'libldap-2.3.so.0', 'liblber-2.3.so.0', 'libmysqlclient.so.15', 'libpq.so.5', 'libresolv.so.2', 'libsocket.so.1', 'libnsl.so.1', 'libc.so.1']}, 'cleanup': {'soname': 'cleanup', 'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/bdb4/lib', '/opt/csw/mysql5/lib/mysql', '/op t/csw/postgresql/lib/', '/usr/lib/$ISALIST', '/usr/lib', '/lib/$ISALIST', '/lib'], 'needed sonames': ['libpcre.so.0', 'libdb-4.2.so', 'libssl.so.0.9.8', 'libcrypto.so.0.9.8', 'libsasl2.so.2', 'libldap-2.3.so.0', 'liblber-2.3.so.0', 'libmysqlclient.so.15', 'libpq.so.5', 'libresolv.so.2', 'libsocket.so.1', 'libnsl.so.1', 'libc.so.1']}} -DATA_PKGS_BY_FILENAME = {'libresolv.so.2': u'SUNWcslx', 'libnsl.so.1': u'SUNWcslx', 'libsasl2.so.2': u'CSWsasl', 'libmysqlclient.so.15': u'CSWmysql5rt', 'libpcre.so.0': u'CSWpcrert', 'libssl.so.0.9.8': u'CSWosslrt', 'libldap-2.3.so.0': u'CSWoldaprt', 'libcrypto.so.0.9.8': u'CSWosslrt', 'libsocket.so.1': u'SUNWcslx', 'liblber-2.3.so.0': u'CSWoldaprt', 'libc.so.1': u'SUNWcslx'} -DATA_FILENAMES_BY_SONAME = {'postmulti': 'postmulti', 'spawn': 'spawn', 'postkick': 'postkick', 'postlog': 'postlog', 'postconf': 'postconf', 'bounce': 'bounce', 'qmqpd': 'qmqpd', 'nqmgr': 'nqmgr', 'flush': 'flush', 'proxymap': 'proxymap', 'scache': 'scache', 'anvil': 'anvil', 'verify': 'verify', 'postalias': 'postalias', 'postcat': 'postcat', 'virtual': 'virtual', 'pickup': 'pickup', 'oqmgr': 'oqmgr', 'master': 'master', 'postqueue': 'postqueue', 'postmap': 'postmap', 'local': 'local', 'showq': 'showq', 'sendmail': 'sendmail', 'smtpd': 'smtpd', 'lmtp': 'lmtp', 'postdrop': 'postdrop', 'trivial-rewrite': 'trivial-rewrite', 'postfix': 'postfix', 'postlock': 'postlock', 'pipe': 'pipe', 'tlsmgr': 'tlsmgr', 'error': 'error', 'discard': 'discard', 'postsuper': 'postsuper', 'cleanup': 'cleanup'} -DATA_PKG_BY_ANY_FILENAME = {'BASIC_CONFIGURATION_README': 'CSWpostfix', 'postlock.1': 'CSWpostfix', 'newaliases.1.html': 'CSWpostfix', 'CDB_README': 'CSWpostfix', 'MULTI_INSTANCE_README': 'CSWpostfix', 'CONTENT_INSPECTION_README.html': 'CSWpostfix', 'trace.8': 'CSWpostfix', 'SASL_README.html': 'CSWpostfix', 'postsuper': 'CSWpostfix', 'showq.8': 'CSWpostfix', 'qmqpd': 'CSWpostfix', 'cidr_table.5.html': 'CSWpostfix', 'virtual': 'CSWpostfix', 'verify.8': 'CSWpostfix', 'ETRN_README.html': 'CSWpostfix', 'pgsql_table.5.html': 'CSWpostfix', 'generic.CSW': 'CSWpostfix', 'FILTER_README.html': 'CSWpostfix', 'cswusergroup': 'CSWpostfix', 'CONNECTION_CACHE_README': 'CSWpostfix', 'STRESS_README.html': 'CSWpostfix', 'pickup.8': 'CSWpostfix', 'postconf.1': 'CSWpostfix', 'OVERVIEW': 'CSWpostfix', 'showq.8.html': 'CSWpostfix', 'XFORWARD_README.html': 'CSWpostfix', 'pickup.8.html': 'CSWpostfix', 'master.5.html': 'CSWpostfix', 'smtpd.8': 'CSWpostfix', 'ADDRESS_VERIFICATION_README': 'CSWpo stfix', 'discard.8': 'CSWpostfix', 'IPV6_README': 'CSWpostfix', 'local': 'CSWpostfix', 'qmgr.8': 'CSWpostfix', 'local.8.html': 'CSWpostfix', 'newaliases.1': 'CSWpostfix', 'PACKAGE_README': 'CSWpostfix', 'header_checks.CSW': 'CSWpostfix', 'PACKAGE_README.html': 'CSWpostfix', 'postmap.1.html': 'CSWpostfix', 'regexp_table.5': 'CSWpostfix', 'VIRTUAL_README.html': 'CSWpostfix', 'virtual.8': 'CSWpostfix', 'postlock.1.html': 'CSWpostfix', 'postfix-wrapper': 'CSWpostfix', 'tlsmgr.8': 'CSWpostfix', 'lmtp': 'CSWpostfix', 'verify': 'CSWpostfix', 'trivial-rewrite': 'CSWpostfix', 'scache': 'CSWpostfix', 'CONNECTION_CACHE_README.html': 'CSWpostfix', 'postlog.1.html': 'CSWpostfix', 'postconf.1.html': 'CSWpostfix', 'postfix-files': 'CSWpostfix', 'VIRTUAL_README': 'CSWpostfix', 'TLS_LEGACY_README.html': 'CSWpostfix', 'LOCAL_RECIPIENT_README': 'CSWpostfix', 'TUNING_README': 'CSWpostfix', 'main.cf': 'CSWpostfix', 'postfix-wrapper.5.html': 'CSWpostfix', 'cidr_table.5': 'CSWpostfix', 'NFS_README ': 'CSWpostfix', 'flush.8': 'CSWpostfix', 'postkick.1.html': 'CSWpostfix', 'postalias': 'CSWpostfix', 'STANDARD_CONFIGURATION_README': 'CSWpostfix', 'postmulti': 'CSWpostfix', 'postqueue.1': 'CSWpostfix', 'MAILDROP_README': 'CSWpostfix', 'postqueue.1.html': 'CSWpostfix', 'postlog': 'CSWpostfix', 'postconf': 'CSWpostfix', 'nisplus_table.5.html': 'CSWpostfix', 'scache.8': 'CSWpostfix', 'aliases.5': 'CSWpostfix', 'bounce.8': 'CSWpostfix', 'ldap_table.5.html': 'CSWpostfix', 'master.5': 'CSWpostfix', 'flush': 'CSWpostfix', 'master.8': 'CSWpostfix', 'postmulti.1.html': 'CSWpostfix', 'STANDARD_CONFIGURATION_README.html': 'CSWpostfix', 'bounce.5': 'CSWpostfix', 'smtp-source.1.html': 'CSWpostfix', 'smtpd': 'CSWpostfix', 'proxymap.8.html': 'CSWpostfix', 'oqmgr.8': 'CSWpostfix', 'postkick.1': 'CSWpostfix', 'BACKSCATTER_README.html': 'CSWpostfix', 'tcp_table.5': 'CSWpostfix', 'pkginfo': 'CSWpostfix', 'postfix.1.html': 'CSWpostfix', 'post-install': 'CSWpostfix', 'access.CSW': 'CSWpostfix ', 'CONTENT_INSPECTION_README': 'CSWpostfix', 'SMTPD_POLICY_README': 'CSWpostfix', 'TLS_README.html': 'CSWpostfix', 'postconf.5': 'CSWpostfix', 'smtpd.8.html': 'CSWpostfix', 'MILTER_README': 'CSWpostfix', 'LINUX_README': 'CSWpostfix', 'SMTPD_PROXY_README.html': 'CSWpostfix', 'showq': 'CSWpostfix', 'tlsmgr': 'CSWpostfix', 'INSTALL.html': 'CSWpostfix', 'access.5.html': 'CSWpostfix', 'relocated.CSW': 'CSWpostfix', 'ULTRIX_README': 'CSWpostfix', 'sendmail': 'CSWpostfix', 'error': 'CSWpostfix', 'ETRN_README': 'CSWpostfix', 'AAAREADME': 'CSWpostfix', 'master.cf.CSW': 'CSWpostfix', 'pgsql_table.5': 'CSWpostfix', 'error.8': 'CSWpostfix', 'depend': 'CSWpostfix', 'LDAP_README': 'CSWpostfix', 'canonical.5': 'CSWpostfix', 'postmulti.1': 'CSWpostfix', 'MYSQL_README.html': 'CSWpostfix', 'qmgr.8.html': 'CSWpostfix', 'smtp.8': 'CSWpostfix', 'pipe.8.html': 'CSWpostfix', 'oqmgr': 'CSWpostfix', 'anvil': 'CSWpostfix', 'main.cf.CSW': 'CSWpostfix', 'postlock': 'CSWpostfix', 'postfix.1': 'CSWpostf ix', 'ADDRESS_CLASS_README': 'CSWpostfix', 'OVERVIEW.html': 'CSWpostfix', 'QSHAPE_README': 'CSWpostfix', 'NFS_README.html': 'CSWpostfix', 'discard': 'CSWpostfix', 'FILTER_README': 'CSWpostfix', 'lmtp.8.html': 'CSWpostfix', 'body_checks.5': 'CSWpostfix', 'generic.5.html': 'CSWpostfix', 'postdrop.1.html': 'CSWpostfix', 'error.8.html': 'CSWpostfix', 'verify.8.html': 'CSWpostfix', 'TLS_LICENSE': 'CSWpostfix', 'discard.8.html': 'CSWpostfix', 'tcp_table.5.html': 'CSWpostfix', 'header_checks.5': 'CSWpostfix', 'PGSQL_README': 'CSWpostfix', 'XFORWARD_README': 'CSWpostfix', 'postmap': 'CSWpostfix', 'proxymap': 'CSWpostfix', 'RESTRICTION_CLASS_README': 'CSWpostfix', 'LDAP_README.html': 'CSWpostfix', 'defer.8.html': 'CSWpostfix', 'flush.8.html': 'CSWpostfix', 'VERP_README': 'CSWpostfix', 'cleanup.8': 'CSWpostfix', 'XCLIENT_README.html': 'CSWpostfix', 'virtual.CSW': 'CSWpostfix', 'qmqpd.8.html': 'CSWpostfix', 'cleanup.8.html': 'CSWpostfix', 'postdrop': 'CSWpostfix', 'qshape.1.html': 'CSW postfix', 'VERP_README.html': 'CSWpostfix', 'SCHEDULER_README.html': 'CSWpostfix', 'trivial-rewrite.8.html': 'CSWpostfix', 'postqueue': 'CSWpostfix', 'master': 'CSWpostfix', 'oqmgr.8.html': 'CSWpostfix', 'trivial-rewrite.8': 'CSWpostfix', 'master.8.html': 'CSWpostfix', 'PGSQL_README.html': 'CSWpostfix', 'STRESS_README': 'CSWpostfix', 'header_checks.5.html': 'CSWpostfix', 'canonical.CSW': 'CSWpostfix', 'relocated.5.html': 'CSWpostfix', 'TLS_README': 'CSWpostfix', 'BACKSCATTER_README': 'CSWpostfix', 'pcre_table.5': 'CSWpostfix', 'postfix-script': 'CSWpostfix', 'qmqp-source.1.html': 'CSWpostfix', 'postcat': 'CSWpostfix', 'transport.5': 'CSWpostfix', 'defer.8': 'CSWpostfix', 'bounce': 'CSWpostfix', 'postsuper.1': 'CSWpostfix', 'LINUX_README.html': 'CSWpostfix', 'index.html': 'CSWpostfix', 'postdrop.1': 'CSWpostfix', 'transport.CSW': 'CSWpostfix', 'ADDRESS_REWRITING_README.html': 'CSWpostfix', 'pipe.8': 'CSWpostfix', 'proxymap.8': 'CSWpostfix', 'DB_README.html': 'CSWpostfix', 'LO CAL_RECIPIENT_README.html': 'CSWpostfix', 'UUCP_README': 'CSWpostfix', 'postcat.1.html': 'CSWpostfix', 'ldap_table.5': 'CSWpostfix', 'pkgmap': 'CSWpostfix', 'postmulti-script': 'CSWpostfix', 'BUILTIN_FILTER_README.html': 'CSWpostfix', 'SMTPD_POLICY_README.html': 'CSWpostfix', 'main.cf.default': 'CSWpostfix', 'postfix-wrapper.5': 'CSWpostfix', 'IPV6_README.html': 'CSWpostfix', 'qmqpd.8': 'CSWpostfix', 'spawn': 'CSWpostfix', 'mailq.1': 'CSWpostfix', 'DB_README': 'CSWpostfix', 'pickup': 'CSWpostfix', 'BASIC_CONFIGURATION_README.html': 'CSWpostfix', 'postsuper.1.html': 'CSWpostfix', 'cswpostfix': 'CSWpostfix', 'postconf.5.html': 'CSWpostfix', 'CDB_README.html': 'CSWpostfix', 'BUILTIN_FILTER_README': 'CSWpostfix', 'SMTPD_ACCESS_README': 'CSWpostfix', 'TLS_LEGACY_README': 'CSWpostfix', 'virtual.8.html': 'CSWpostfix', 'DATABASE_README': 'CSWpostfix', 'lmtp.8': 'CSWpostfix', 'spawn.8.html': 'CSWpostfix', 'access.5': 'CSWpostfix', 'ADDRESS_REWRITING_README': 'CSWpostfix', 'aliases.CS W': 'CSWpostfix', 'SASL_README': 'CSWpostfix', 'pcre_table.5.html': 'CSWpostfix', 'MYSQL_README': 'CSWpostfix', 'ADDRESS_VERIFICATION_README.html': 'CSWpostfix', 'mysql_table.5': 'CSWpostfix', 'DSN_README.html': 'CSWpostfix', 'DATABASE_README.html': 'CSWpostfix', 'postfix-manuals.html': 'CSWpostfix', 'SCHEDULER_README': 'CSWpostfix', 'SMTPD_ACCESS_README.html': 'CSWpostfix', 'postlog.1': 'CSWpostfix', 'nqmgr': 'CSWpostfix', 'nisplus_table.5': 'CSWpostfix', 'local.8': 'CSWpostfix', 'smtp-sink.1.html': 'CSWpostfix', 'ADDRESS_CLASS_README.html': 'CSWpostfix', 'cleanup': 'CSWpostfix', 'QSHAPE_README.html': 'CSWpostfix', 'virtual.5.html': 'CSWpostfix', 'XCLIENT_README': 'CSWpostfix', 'UUCP_README.html': 'CSWpostfix', 'relocated.5': 'CSWpostfix', 'RELEASE_NOTES': 'CSWpostfix', 'canonical.5.html': 'CSWpostfix', 'checkinstall': 'CSWpostfix', 'INSTALL': 'CSWpostfix', 'PCRE_README': 'CSWpostfix', 'postalias.1.html': 'CSWpostfix', 'postcat.1': 'CSWpostfix', 'sendmail.1': 'CSWpostfix', 'bounce.cf.default': 'CSWpostfix', 'postfix-logo.jpg': 'CSWpostfix', 'TUNING_README.html': 'CSWpostfix', 'anvil.8.html': 'CSWpostfix', 'mysql_table.5.html': 'CSWpostfix', 'RESTRICTION_CLASS_README.html': 'CSWpostfix', 'master.cf': 'CSWpostfix', 'postkick': 'CSWpostfix', 'MULTI_INSTANCE_README.html': 'CSWpostfix', 'spawn.8': 'CSWpostfix', 'DEBUG_README': 'CSWpostfix', 'postalias.1': 'CSWpostfix', 'PCRE_README.html': 'CSWpostfix', 'postfix': 'CSWpostfix', 'DEBUG_README.html': 'CSWpostfix', 'MILTER_README.html': 'CSWpostfix', 'MAILDROP_README.html': 'CSWpostfix', 'aliases.5.html': 'CSWpostfix', 'pipe': 'CSWpostfix', 'SMTPD_PROXY_README': 'CSWpostfix', 'regexp_table.5.html': 'CSWpostfix', 'postmap.1': 'CSWpostfix', 'transport.5.html': 'CSWpostfix', 'qmqp-sink.1.html': 'CSWpostfix', 'DSN_README': 'CSWpostfix', 'anvil.8': 'CSWpostfix', 'virtual.5': 'CSWpostfix', 'generic.5': 'CSWpostfix'} -DATA_LINES_BY_SONAME = {'libresolv.so.2': u'/usr/lib/sparcv9/libresolv.so.2 f none 0755 root bin 448048 5947 1234567885 SUNWcslx', 'libnsl.so.1': u'/usr/lib/sparcv9/libnsl.so.1 f none 0755 root bin 1099248 7581 1217954364 SUNWcslx', 'libsasl2.so.2': u'/opt/csw/lib/libsasl2.so.2=libsasl2.so.2.0.22 s none CSWsasl', 'libmysqlclient.so.15': u'/opt/csw/mysql5/lib/mysql/libmysqlclient.so.15=libmysqlclient.so.15.0.0 s none CSWmysql5rt', 'libpcre.so.0': u'/opt/csw/lib/sparcv9/libpcre.so.0=libpcre.so.0.0.1 s none CSWpcrert', 'libssl.so.0.9.8': u'/opt/csw/lib/sparcv9/libssl.so.0.9.8 f none 0755 root bin 427792 46460 1261308405 CSWosslrt', 'libldap-2.3.so.0': u'/opt/csw/lib/sparcv9/libldap-2.3.so.0=libldap-2.3.so.0.2.27 s none CSWoldaprt', 'libcrypto.so.0.9.8': u'/opt/csw/lib/sparcv9/libcrypto.so.0.9.8 f none 0755 root bin 2520480 3820 1261308405 CSWosslrt', 'libsocket.so.1': u'/usr/lib/sparcv9/libsocket.so.1 f none 0755 root bin 96448 3175 1210705279 SUNWcslx', 'libc.so.1': u '/usr/lib/sparcv9/libc.so.1 f none 0755 root bin 1271000 23501 1217954364 SUNWcslx', 'liblber-2.3.so.0': u'/opt/csw/lib/sparcv9/liblber-2.3.so.0=liblber-2.3.so.0.2.27 s none CSWoldaprt'} +DATA_DECLARED_DEPENDENCIES = {'CSWbdb42': 'CSWbdb42 berkeleydb42 - BerkeleyDB 4.2 embedded database libraries and utilities ', 'CSWcswclassutils': 'CSWcswclassutils cswclassutils - CSW class action utilities ', 'CSWpcrert': 'CSWpcrert pcre_rt - Perl-compatible regular expression runtime libraries ', 'CSWmysql5rt': 'CSWmysql5rt mysql5rt - MySQL 5.0 runtime files ', 'CSWlibpq': 'CSWlibpq libpq - libraries needed by postgresql server and clients ', 'CSWsasl': 'CSWsasl sasl - Simple Authentication and Security Layer ', 'CSWcommon': 'CSWcommon common - common files and dirs for CSW packages ', 'CSWoldaprt': 'CSWoldaprt openldap_rt - OpenLDAP runtime libraries (oldaprt) ', 'CSWosslrt': 'CSWosslrt openssl_rt - Openssl runtime libraries '} +DATA_BINARIES_BY_PKGNAME = {'CSWpostfix': ['postmap', 'postqueue', 'postlog', 'postdrop', 'sendmail', 'postkick', 'postalias', 'postmulti', 'postcat', 'postlock', 'postconf', 'postsuper', 'postfix', 'discard', 'showq', 'smtpd', 'trivial-rewrite', 'proxymap', 'local', 'bounce', 'flush', 'qmqpd', 'error', 'verify', 'master', 'pipe', 'virtual', 'tlsmgr', 'scache', 'cleanup', 'pickup', 'oqmgr', 'anvil', 'lmtp', 'nqmgr', 'spawn']} +DATA_NEEDED_SONAMES_BY_BINARY = {'spawn': {'soname': 'spawn', 'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/bdb42/lib', '/opt/csw/mysql5/lib/mysql', '/opt/csw/postgresql/lib/', '/usr/lib/$ISALIST', '/usr/lib', '/lib/$ISALIST', '/lib'], 'needed sonames': ['libpcre.so.0', 'libdb-4.2.so', 'libssl.so.0.9.8', 'libcrypto.so.0.9.8', 'libsasl2.so.2', 'libldap-2.3.so.0', 'liblber-2.3.so.0', 'libmysqlclient.so.15', 'libpq.so.5', 'libresolv.so.2', 'libsocket.so.1', 'libnsl.so.1', 'libc.so.1']}, 'postmulti': {'soname': 'postmulti', 'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/bdb42/lib', '/opt/csw/mysql5/lib/mysql', '/opt/csw/postgresql/lib/', '/usr/lib/$ISALIST', '/usr/lib', '/lib/$ISALIST', '/lib'], 'needed sonames': ['libpcre.so.0', 'libdb-4.2.so', 'libssl.so.0.9.8', 'libcrypto.so.0.9.8', 'libsasl2.so.2', 'libldap-2.3.so.0', 'liblber-2.3.so.0', 'libmysqlclient.so.15', 'libpq.so.5', 'libresolv.so.2', 'libsocket.so.1', 'libnsl.so.1', 'libc.so.1']}, 'p ostkick': {'soname': 'postkick', 'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/bdb42/lib', '/opt/csw/mysql5/lib/mysql', '/opt/csw/postgresql/lib/', '/usr/lib/$ISALIST', '/usr/lib', '/lib/$ISALIST', '/lib'], 'needed sonames': ['libpcre.so.0', 'libdb-4.2.so', 'libssl.so.0.9.8', 'libcrypto.so.0.9.8', 'libsasl2.so.2', 'libldap-2.3.so.0', 'liblber-2.3.so.0', 'libmysqlclient.so.15', 'libpq.so.5', 'libresolv.so.2', 'libsocket.so.1', 'libnsl.so.1', 'libc.so.1']}, 'postlog': {'soname': 'postlog', 'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/bdb42/lib', '/opt/csw/mysql5/lib/mysql', '/opt/csw/postgresql/lib/', '/usr/lib/$ISALIST', '/usr/lib', '/lib/$ISALIST', '/lib'], 'needed sonames': ['libpcre.so.0', 'libdb-4.2.so', 'libssl.so.0.9.8', 'libcrypto.so.0.9.8', 'libsasl2.so.2', 'libldap-2.3.so.0', 'liblber-2.3.so.0', 'libmysqlclient.so.15', 'libpq.so.5', 'libresolv.so.2', 'libsocket.so.1', 'libnsl.so.1', 'libc.so.1']}, 'postconf': {'soname': 'postconf', 'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/bdb42/lib', '/opt/csw/mysql5/lib/mysql', '/opt/csw/postgresql/lib/', '/usr/lib/$ISALIST', '/usr/lib', '/lib/$ISALIST', '/lib'], 'needed sonames': ['libpcre.so.0', 'libdb-4.2.so', 'libssl.so.0.9.8', 'libcrypto.so.0.9.8', 'libsasl2.so.2', 'libldap-2.3.so.0', 'liblber-2.3.so.0', 'libmysqlclient.so.15', 'libpq.so.5', 'libresolv.so.2', 'libsocket.so.1', 'libnsl.so.1', 'libc.so.1']}, 'bounce': {'soname': 'bounce', 'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/bdb42/lib', '/opt/csw/mysql5/lib/mysql', '/opt/csw/postgresql/lib/', '/usr/lib/$ISALIST', '/usr/lib', '/lib/$ISALIST', '/lib'], 'needed sonames': ['libpcre.so.0', 'libdb-4.2.so', 'libssl.so.0.9.8', 'libcrypto.so.0.9.8', 'libsasl2.so.2', 'libldap-2.3.so.0', 'liblber-2.3.so.0', 'libmysqlclient.so.15', 'libpq.so.5', 'libresolv.so.2', 'libsocket.so.1', 'libnsl.so.1', 'libc.so.1']}, 'qmqpd': {'soname': 'qmqpd', 'runpath': ['/opt/csw/lib/$ISALIST', '/op t/csw/lib', '/opt/csw/bdb42/lib', '/opt/csw/mysql5/lib/mysql', '/opt/csw/postgresql/lib/', '/usr/lib/$ISALIST', '/usr/lib', '/lib/$ISALIST', '/lib'], 'needed sonames': ['libpcre.so.0', 'libdb-4.2.so', 'libssl.so.0.9.8', 'libcrypto.so.0.9.8', 'libsasl2.so.2', 'libldap-2.3.so.0', 'liblber-2.3.so.0', 'libmysqlclient.so.15', 'libpq.so.5', 'libresolv.so.2', 'libsocket.so.1', 'libnsl.so.1', 'libc.so.1']}, 'nqmgr': {'soname': 'nqmgr', 'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/bdb42/lib', '/opt/csw/mysql5/lib/mysql', '/opt/csw/postgresql/lib/', '/usr/lib/$ISALIST', '/usr/lib', '/lib/$ISALIST', '/lib'], 'needed sonames': ['libpcre.so.0', 'libdb-4.2.so', 'libssl.so.0.9.8', 'libcrypto.so.0.9.8', 'libsasl2.so.2', 'libldap-2.3.so.0', 'liblber-2.3.so.0', 'libmysqlclient.so.15', 'libpq.so.5', 'libresolv.so.2', 'libsocket.so.1', 'libnsl.so.1', 'libc.so.1']}, 'flush': {'soname': 'flush', 'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/bdb42/lib', '/opt/csw /mysql5/lib/mysql', '/opt/csw/postgresql/lib/', '/usr/lib/$ISALIST', '/usr/lib', '/lib/$ISALIST', '/lib'], 'needed sonames': ['libpcre.so.0', 'libdb-4.2.so', 'libssl.so.0.9.8', 'libcrypto.so.0.9.8', 'libsasl2.so.2', 'libldap-2.3.so.0', 'liblber-2.3.so.0', 'libmysqlclient.so.15', 'libpq.so.5', 'libresolv.so.2', 'libsocket.so.1', 'libnsl.so.1', 'libc.so.1']}, 'proxymap': {'soname': 'proxymap', 'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/bdb42/lib', '/opt/csw/mysql5/lib/mysql', '/opt/csw/postgresql/lib/', '/usr/lib/$ISALIST', '/usr/lib', '/lib/$ISALIST', '/lib'], 'needed sonames': ['libpcre.so.0', 'libdb-4.2.so', 'libssl.so.0.9.8', 'libcrypto.so.0.9.8', 'libsasl2.so.2', 'libldap-2.3.so.0', 'liblber-2.3.so.0', 'libmysqlclient.so.15', 'libpq.so.5', 'libresolv.so.2', 'libsocket.so.1', 'libnsl.so.1', 'libc.so.1']}, 'scache': {'soname': 'scache', 'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/bdb42/lib', '/opt/csw/mysql5/lib/mysql', '/opt/csw/postg resql/lib/', '/usr/lib/$ISALIST', '/usr/lib', '/lib/$ISALIST', '/lib'], 'needed sonames': ['libpcre.so.0', 'libdb-4.2.so', 'libssl.so.0.9.8', 'libcrypto.so.0.9.8', 'libsasl2.so.2', 'libldap-2.3.so.0', 'liblber-2.3.so.0', 'libmysqlclient.so.15', 'libpq.so.5', 'libresolv.so.2', 'libsocket.so.1', 'libnsl.so.1', 'libc.so.1']}, 'anvil': {'soname': 'anvil', 'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/bdb42/lib', '/opt/csw/mysql5/lib/mysql', '/opt/csw/postgresql/lib/', '/usr/lib/$ISALIST', '/usr/lib', '/lib/$ISALIST', '/lib'], 'needed sonames': ['libpcre.so.0', 'libdb-4.2.so', 'libssl.so.0.9.8', 'libcrypto.so.0.9.8', 'libsasl2.so.2', 'libldap-2.3.so.0', 'liblber-2.3.so.0', 'libmysqlclient.so.15', 'libpq.so.5', 'libresolv.so.2', 'libsocket.so.1', 'libnsl.so.1', 'libc.so.1']}, 'verify': {'soname': 'verify', 'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/bdb42/lib', '/opt/csw/mysql5/lib/mysql', '/opt/csw/postgresql/lib/', '/usr/lib/$ISALIST', '/usr/l ib', '/lib/$ISALIST', '/lib'], 'needed sonames': ['libpcre.so.0', 'libdb-4.2.so', 'libssl.so.0.9.8', 'libcrypto.so.0.9.8', 'libsasl2.so.2', 'libldap-2.3.so.0', 'liblber-2.3.so.0', 'libmysqlclient.so.15', 'libpq.so.5', 'libresolv.so.2', 'libsocket.so.1', 'libnsl.so.1', 'libc.so.1']}, 'postalias': {'soname': 'postalias', 'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/bdb42/lib', '/opt/csw/mysql5/lib/mysql', '/opt/csw/postgresql/lib/', '/usr/lib/$ISALIST', '/usr/lib', '/lib/$ISALIST', '/lib'], 'needed sonames': ['libpcre.so.0', 'libdb-4.2.so', 'libssl.so.0.9.8', 'libcrypto.so.0.9.8', 'libsasl2.so.2', 'libldap-2.3.so.0', 'liblber-2.3.so.0', 'libmysqlclient.so.15', 'libpq.so.5', 'libresolv.so.2', 'libsocket.so.1', 'libnsl.so.1', 'libc.so.1']}, 'postcat': {'soname': 'postcat', 'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/bdb42/lib', '/opt/csw/mysql5/lib/mysql', '/opt/csw/postgresql/lib/', '/usr/lib/$ISALIST', '/usr/lib', '/lib/$ISALIST', '/lib'], 'needed sonames': ['libpcre.so.0', 'libdb-4.2.so', 'libssl.so.0.9.8', 'libcrypto.so.0.9.8', 'libsasl2.so.2', 'libldap-2.3.so.0', 'liblber-2.3.so.0', 'libmysqlclient.so.15', 'libpq.so.5', 'libresolv.so.2', 'libsocket.so.1', 'libnsl.so.1', 'libc.so.1']}, 'virtual': {'soname': 'virtual', 'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/bdb42/lib', '/opt/csw/mysql5/lib/mysql', '/opt/csw/postgresql/lib/', '/usr/lib/$ISALIST', '/usr/lib', '/lib/$ISALIST', '/lib'], 'needed sonames': ['libpcre.so.0', 'libdb-4.2.so', 'libssl.so.0.9.8', 'libcrypto.so.0.9.8', 'libsasl2.so.2', 'libldap-2.3.so.0', 'liblber-2.3.so.0', 'libmysqlclient.so.15', 'libpq.so.5', 'libresolv.so.2', 'libsocket.so.1', 'libnsl.so.1', 'libc.so.1']}, 'pickup': {'soname': 'pickup', 'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/bdb42/lib', '/opt/csw/mysql5/lib/mysql', '/opt/csw/postgresql/lib/', '/usr/lib/$ISALIST', '/usr/lib', '/lib/$ISALIST', '/lib'], 'needed sonames': ['libpcre.so.0', 'l ibdb-4.2.so', 'libssl.so.0.9.8', 'libcrypto.so.0.9.8', 'libsasl2.so.2', 'libldap-2.3.so.0', 'liblber-2.3.so.0', 'libmysqlclient.so.15', 'libpq.so.5', 'libresolv.so.2', 'libsocket.so.1', 'libnsl.so.1', 'libc.so.1']}, 'oqmgr': {'soname': 'oqmgr', 'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/bdb42/lib', '/opt/csw/mysql5/lib/mysql', '/opt/csw/postgresql/lib/', '/usr/lib/$ISALIST', '/usr/lib', '/lib/$ISALIST', '/lib'], 'needed sonames': ['libpcre.so.0', 'libdb-4.2.so', 'libssl.so.0.9.8', 'libcrypto.so.0.9.8', 'libsasl2.so.2', 'libldap-2.3.so.0', 'liblber-2.3.so.0', 'libmysqlclient.so.15', 'libpq.so.5', 'libresolv.so.2', 'libsocket.so.1', 'libnsl.so.1', 'libc.so.1']}, 'master': {'soname': 'master', 'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/bdb42/lib', '/opt/csw/mysql5/lib/mysql', '/opt/csw/postgresql/lib/', '/usr/lib/$ISALIST', '/usr/lib', '/lib/$ISALIST', '/lib'], 'needed sonames': ['libpcre.so.0', 'libdb-4.2.so', 'libssl.so.0.9.8', 'libcryp to.so.0.9.8', 'libsasl2.so.2', 'libldap-2.3.so.0', 'liblber-2.3.so.0', 'libmysqlclient.so.15', 'libpq.so.5', 'libresolv.so.2', 'libsocket.so.1', 'libnsl.so.1', 'libc.so.1']}, 'postqueue': {'soname': 'postqueue', 'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/bdb42/lib', '/opt/csw/mysql5/lib/mysql', '/opt/csw/postgresql/lib/', '/usr/lib/$ISALIST', '/usr/lib', '/lib/$ISALIST', '/lib'], 'needed sonames': ['libpcre.so.0', 'libdb-4.2.so', 'libssl.so.0.9.8', 'libcrypto.so.0.9.8', 'libsasl2.so.2', 'libldap-2.3.so.0', 'liblber-2.3.so.0', 'libmysqlclient.so.15', 'libpq.so.5', 'libresolv.so.2', 'libsocket.so.1', 'libnsl.so.1', 'libc.so.1']}, 'trivial-rewrite': {'soname': 'trivial-rewrite', 'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/bdb42/lib', '/opt/csw/mysql5/lib/mysql', '/opt/csw/postgresql/lib/', '/usr/lib/$ISALIST', '/usr/lib', '/lib/$ISALIST', '/lib'], 'needed sonames': ['libpcre.so.0', 'libdb-4.2.so', 'libssl.so.0.9.8', 'libcrypto.so.0.9.8', ' libsasl2.so.2', 'libldap-2.3.so.0', 'liblber-2.3.so.0', 'libmysqlclient.so.15', 'libpq.so.5', 'libresolv.so.2', 'libsocket.so.1', 'libnsl.so.1', 'libc.so.1']}, 'local': {'soname': 'local', 'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/bdb42/lib', '/opt/csw/mysql5/lib/mysql', '/opt/csw/postgresql/lib/', '/usr/lib/$ISALIST', '/usr/lib', '/lib/$ISALIST', '/lib'], 'needed sonames': ['libpcre.so.0', 'libdb-4.2.so', 'libssl.so.0.9.8', 'libcrypto.so.0.9.8', 'libsasl2.so.2', 'libldap-2.3.so.0', 'liblber-2.3.so.0', 'libmysqlclient.so.15', 'libpq.so.5', 'libresolv.so.2', 'libsocket.so.1', 'libnsl.so.1', 'libc.so.1']}, 'showq': {'soname': 'showq', 'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/bdb42/lib', '/opt/csw/mysql5/lib/mysql', '/opt/csw/postgresql/lib/', '/usr/lib/$ISALIST', '/usr/lib', '/lib/$ISALIST', '/lib'], 'needed sonames': ['libpcre.so.0', 'libdb-4.2.so', 'libssl.so.0.9.8', 'libcrypto.so.0.9.8', 'libsasl2.so.2', 'libldap-2.3.so.0', 'liblbe r-2.3.so.0', 'libmysqlclient.so.15', 'libpq.so.5', 'libresolv.so.2', 'libsocket.so.1', 'libnsl.so.1', 'libc.so.1']}, 'sendmail': {'soname': 'sendmail', 'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/bdb42/lib', '/opt/csw/mysql5/lib/mysql', '/opt/csw/postgresql/lib/', '/usr/lib/$ISALIST', '/usr/lib', '/lib/$ISALIST', '/lib'], 'needed sonames': ['libpcre.so.0', 'libdb-4.2.so', 'libssl.so.0.9.8', 'libcrypto.so.0.9.8', 'libsasl2.so.2', 'libldap-2.3.so.0', 'liblber-2.3.so.0', 'libmysqlclient.so.15', 'libpq.so.5', 'libresolv.so.2', 'libsocket.so.1', 'libnsl.so.1', 'libc.so.1']}, 'discard': {'soname': 'discard', 'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/bdb42/lib', '/opt/csw/mysql5/lib/mysql', '/opt/csw/postgresql/lib/', '/usr/lib/$ISALIST', '/usr/lib', '/lib/$ISALIST', '/lib'], 'needed sonames': ['libpcre.so.0', 'libdb-4.2.so', 'libssl.so.0.9.8', 'libcrypto.so.0.9.8', 'libsasl2.so.2', 'libldap-2.3.so.0', 'liblber-2.3.so.0', 'libmysqlclient.so.1 5', 'libpq.so.5', 'libresolv.so.2', 'libsocket.so.1', 'libnsl.so.1', 'libc.so.1']}, 'lmtp': {'soname': 'lmtp', 'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/bdb42/lib', '/opt/csw/mysql5/lib/mysql', '/opt/csw/postgresql/lib/', '/usr/lib/$ISALIST', '/usr/lib', '/lib/$ISALIST', '/lib'], 'needed sonames': ['libpcre.so.0', 'libdb-4.2.so', 'libssl.so.0.9.8', 'libcrypto.so.0.9.8', 'libsasl2.so.2', 'libldap-2.3.so.0', 'liblber-2.3.so.0', 'libmysqlclient.so.15', 'libpq.so.5', 'libresolv.so.2', 'libsocket.so.1', 'libnsl.so.1', 'libc.so.1']}, 'postdrop': {'soname': 'postdrop', 'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/bdb42/lib', '/opt/csw/mysql5/lib/mysql', '/opt/csw/postgresql/lib/', '/usr/lib/$ISALIST', '/usr/lib', '/lib/$ISALIST', '/lib'], 'needed sonames': ['libpcre.so.0', 'libdb-4.2.so', 'libssl.so.0.9.8', 'libcrypto.so.0.9.8', 'libsasl2.so.2', 'libldap-2.3.so.0', 'liblber-2.3.so.0', 'libmysqlclient.so.15', 'libpq.so.5', 'libresolv.so.2', 'li bsocket.so.1', 'libnsl.so.1', 'libc.so.1']}, 'postmap': {'soname': 'postmap', 'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/bdb42/lib', '/opt/csw/mysql5/lib/mysql', '/opt/csw/postgresql/lib/', '/usr/lib/$ISALIST', '/usr/lib', '/lib/$ISALIST', '/lib'], 'needed sonames': ['libpcre.so.0', 'libdb-4.2.so', 'libssl.so.0.9.8', 'libcrypto.so.0.9.8', 'libsasl2.so.2', 'libldap-2.3.so.0', 'liblber-2.3.so.0', 'libmysqlclient.so.15', 'libpq.so.5', 'libresolv.so.2', 'libsocket.so.1', 'libnsl.so.1', 'libc.so.1']}, 'postfix': {'soname': 'postfix', 'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/bdb42/lib', '/opt/csw/mysql5/lib/mysql', '/opt/csw/postgresql/lib/', '/usr/lib/$ISALIST', '/usr/lib', '/lib/$ISALIST', '/lib'], 'needed sonames': ['libpcre.so.0', 'libdb-4.2.so', 'libssl.so.0.9.8', 'libcrypto.so.0.9.8', 'libsasl2.so.2', 'libldap-2.3.so.0', 'liblber-2.3.so.0', 'libmysqlclient.so.15', 'libpq.so.5', 'libresolv.so.2', 'libsocket.so.1', 'libnsl.so.1', 'libc .so.1']}, 'postlock': {'soname': 'postlock', 'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/bdb42/lib', '/opt/csw/mysql5/lib/mysql', '/opt/csw/postgresql/lib/', '/usr/lib/$ISALIST', '/usr/lib', '/lib/$ISALIST', '/lib'], 'needed sonames': ['libpcre.so.0', 'libdb-4.2.so', 'libssl.so.0.9.8', 'libcrypto.so.0.9.8', 'libsasl2.so.2', 'libldap-2.3.so.0', 'liblber-2.3.so.0', 'libmysqlclient.so.15', 'libpq.so.5', 'libresolv.so.2', 'libsocket.so.1', 'libnsl.so.1', 'libc.so.1']}, 'pipe': {'soname': 'pipe', 'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/bdb42/lib', '/opt/csw/mysql5/lib/mysql', '/opt/csw/postgresql/lib/', '/usr/lib/$ISALIST', '/usr/lib', '/lib/$ISALIST', '/lib'], 'needed sonames': ['libpcre.so.0', 'libdb-4.2.so', 'libssl.so.0.9.8', 'libcrypto.so.0.9.8', 'libsasl2.so.2', 'libldap-2.3.so.0', 'liblber-2.3.so.0', 'libmysqlclient.so.15', 'libpq.so.5', 'libresolv.so.2', 'libsocket.so.1', 'libnsl.so.1', 'libc.so.1']}, 'tlsmgr': {'soname': 'tlsmgr' , 'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/bdb42/lib', '/opt/csw/mysql5/lib/mysql', '/opt/csw/postgresql/lib/', '/usr/lib/$ISALIST', '/usr/lib', '/lib/$ISALIST', '/lib'], 'needed sonames': ['libpcre.so.0', 'libdb-4.2.so', 'libssl.so.0.9.8', 'libcrypto.so.0.9.8', 'libsasl2.so.2', 'libldap-2.3.so.0', 'liblber-2.3.so.0', 'libmysqlclient.so.15', 'libpq.so.5', 'libresolv.so.2', 'libsocket.so.1', 'libnsl.so.1', 'libc.so.1']}, 'error': {'soname': 'error', 'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/bdb42/lib', '/opt/csw/mysql5/lib/mysql', '/opt/csw/postgresql/lib/', '/usr/lib/$ISALIST', '/usr/lib', '/lib/$ISALIST', '/lib'], 'needed sonames': ['libpcre.so.0', 'libdb-4.2.so', 'libssl.so.0.9.8', 'libcrypto.so.0.9.8', 'libsasl2.so.2', 'libldap-2.3.so.0', 'liblber-2.3.so.0', 'libmysqlclient.so.15', 'libpq.so.5', 'libresolv.so.2', 'libsocket.so.1', 'libnsl.so.1', 'libc.so.1']}, 'smtpd': {'soname': 'smtpd', 'runpath': ['/opt/csw/lib/$ISALIST', '/op t/csw/lib', '/opt/csw/bdb42/lib', '/opt/csw/mysql5/lib/mysql', '/opt/csw/postgresql/lib/', '/usr/lib/$ISALIST', '/usr/lib', '/lib/$ISALIST', '/lib'], 'needed sonames': ['libpcre.so.0', 'libdb-4.2.so', 'libssl.so.0.9.8', 'libcrypto.so.0.9.8', 'libsasl2.so.2', 'libldap-2.3.so.0', 'liblber-2.3.so.0', 'libmysqlclient.so.15', 'libpq.so.5', 'libresolv.so.2', 'libsocket.so.1', 'libnsl.so.1', 'libc.so.1']}, 'postsuper': {'soname': 'postsuper', 'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/bdb42/lib', '/opt/csw/mysql5/lib/mysql', '/opt/csw/postgresql/lib/', '/usr/lib/$ISALIST', '/usr/lib', '/lib/$ISALIST', '/lib'], 'needed sonames': ['libpcre.so.0', 'libdb-4.2.so', 'libssl.so.0.9.8', 'libcrypto.so.0.9.8', 'libsasl2.so.2', 'libldap-2.3.so.0', 'liblber-2.3.so.0', 'libmysqlclient.so.15', 'libpq.so.5', 'libresolv.so.2', 'libsocket.so.1', 'libnsl.so.1', 'libc.so.1']}, 'cleanup': {'soname': 'cleanup', 'runpath': ['/opt/csw/lib/$ISALIST', '/opt/csw/lib', '/opt/csw/bdb42/lib ', '/opt/csw/mysql5/lib/mysql', '/opt/csw/postgresql/lib/', '/usr/lib/$ISALIST', '/usr/lib', '/lib/$ISALIST', '/lib'], 'needed sonames': ['libpcre.so.0', 'libdb-4.2.so', 'libssl.so.0.9.8', 'libcrypto.so.0.9.8', 'libsasl2.so.2', 'libldap-2.3.so.0', 'liblber-2.3.so.0', 'libmysqlclient.so.15', 'libpq.so.5', 'libresolv.so.2', 'libsocket.so.1', 'libnsl.so.1', 'libc.so.1']}} +DATA_PKGS_BY_FILENAME = {'libresolv.so.2': u'SUNWcslx', 'libdb-4.2.so': u'CSWbdb42', 'libsasl2.so.2': u'CSWsasl', 'libmysqlclient.so.15': u'CSWmysql5rt', 'libpcre.so.0': u'CSWpcrert', 'libssl.so.0.9.8': u'CSWosslrt', 'libldap-2.3.so.0': u'CSWoldaprt', 'libnsl.so.1': u'SUNWcslx', 'libcrypto.so.0.9.8': u'CSWosslrt', 'libpq.so.5': u'CSWlibpq', 'libsocket.so.1': u'SUNWcslx', 'liblber-2.3.so.0': u'CSWoldaprt', 'libc.so.1': u'SUNWcslx'} +DATA_FILENAMES_BY_SONAME = {'spawn': 'spawn', 'postmulti': 'postmulti', 'postkick': 'postkick', 'postlog': 'postlog', 'postconf': 'postconf', 'bounce': 'bounce', 'qmqpd': 'qmqpd', 'nqmgr': 'nqmgr', 'flush': 'flush', 'proxymap': 'proxymap', 'scache': 'scache', 'anvil': 'anvil', 'verify': 'verify', 'postalias': 'postalias', 'postcat': 'postcat', 'virtual': 'virtual', 'pickup': 'pickup', 'oqmgr': 'oqmgr', 'master': 'master', 'postqueue': 'postqueue', 'trivial-rewrite': 'trivial-rewrite', 'local': 'local', 'showq': 'showq', 'sendmail': 'sendmail', 'discard': 'discard', 'lmtp': 'lmtp', 'postdrop': 'postdrop', 'postmap': 'postmap', 'postfix': 'postfix', 'postlock': 'postlock', 'pipe': 'pipe', 'tlsmgr': 'tlsmgr', 'error': 'error', 'smtpd': 'smtpd', 'postsuper': 'postsuper', 'cleanup': 'cleanup'} +DATA_PKG_BY_ANY_FILENAME = {'BASIC_CONFIGURATION_README': 'CSWpostfix', 'SMTPD_ACCESS_README.html': 'CSWpostfix', 'CDB_README': 'CSWpostfix', 'cswusergroup': 'CSWpostfix', 'CONTENT_INSPECTION_README.html': 'CSWpostfix', 'post-install': 'CSWpostfix', 'trace.8': 'CSWpostfix', 'PACKAGE_README': 'CSWpostfix', 'postcat': 'CSWpostfix', 'qmqpd': 'CSWpostfix', 'cidr_table.5.html': 'CSWpostfix', 'virtual': 'CSWpostfix', 'verify.8': 'CSWpostfix', 'ETRN_README.html': 'CSWpostfix', 'pgsql_table.5.html': 'CSWpostfix', 'oqmgr.8': 'CSWpostfix', 'FILTER_README.html': 'CSWpostfix', 'MULTI_INSTANCE_README': 'CSWpostfix', 'CONNECTION_CACHE_README': 'CSWpostfix', 'STRESS_README.html': 'CSWpostfix', 'pickup.8': 'CSWpostfix', 'SMTPD_POLICY_README': 'CSWpostfix', 'showq.8.html': 'CSWpostfix', 'TLS_README.html': 'CSWpostfix', 'pickup.8.html': 'CSWpostfix', 'master.5.html': 'CSWpostfix', 'smtpd.8': 'CSWpostfix', 'ADDRESS_VERIFICATION_README': 'CSWpostfix', 'anvil': 'CSWpostfix', 'IPV6_README': 'CSWpostfix', 'local': 'CSWpostfix', 'qmgr.8': 'CSWpostfix', 'local.8.html': 'CSWpostfix', 'newaliases.1': 'CSWpostfix', 'virtual.5': 'CSWpostfix', 'bounce': 'CSWpostfix', 'header_checks.CSW': 'CSWpostfix', 'OVERVIEW': 'CSWpostfix', 'postmap.1.html': 'CSWpostfix', 'postconf.1.html': 'CSWpostfix', 'main.cf.default': 'CSWpostfix', 'virtual.8': 'CSWpostfix', 'postlock.1.html': 'CSWpostfix', 'tlsmgr.8': 'CSWpostfix', 'lmtp': 'CSWpostfix', 'spawn.8.html': 'CSWpostfix', 'trivial-rewrite': 'CSWpostfix', 'scache': 'CSWpostfix', 'CONNECTION_CACHE_README.html': 'CSWpostfix', 'postlog.1.html': 'CSWpostfix', 'anvil.8': 'CSWpostfix', 'postfix-files': 'CSWpostfix', 'RELEASE_NOTES': 'CSWpostfix', 'ADDRESS_REWRITING_README.html': 'CSWpostfix', 'LOCAL_RECIPIENT_README': 'CSWpostfix', 'TUNING_README': 'CSWpostfix', 'ADDRESS_CLASS_README': 'CSWpostfix', 'showq': 'CSWpostfix', 'postfix-wrapper.5.html': 'CSWpostfix', 'STANDARD_CONFIGURATION_README.html': 'CSWpostfix', 'cidr_table.5': 'CSWpostfix ', 'canonical.5.html': 'CSWpostfix', 'flush.8': 'CSWpostfix', 'XFORWARD_README': 'CSWpostfix', 'postmulti': 'CSWpostfix', 'postqueue.1': 'CSWpostfix', 'MAILDROP_README': 'CSWpostfix', 'postqueue.1.html': 'CSWpostfix', 'postlog': 'CSWpostfix', 'postconf': 'CSWpostfix', 'nisplus_table.5.html': 'CSWpostfix', 'aliases.5': 'CSWpostfix', 'bounce.8': 'CSWpostfix', 'ldap_table.5.html': 'CSWpostfix', 'master.5': 'CSWpostfix', 'flush': 'CSWpostfix', 'master.8': 'CSWpostfix', 'FILTER_README': 'CSWpostfix', 'main.cf': 'CSWpostfix', 'STANDARD_CONFIGURATION_README': 'CSWpostfix', 'bounce.5': 'CSWpostfix', 'smtp-source.1.html': 'CSWpostfix', 'proxymap.8.html': 'CSWpostfix', 'generic.CSW': 'CSWpostfix', 'postkick.1': 'CSWpostfix', 'BACKSCATTER_README.html': 'CSWpostfix', 'tcp_table.5': 'CSWpostfix', 'pkginfo': 'CSWpostfix', 'postfix.1.html': 'CSWpostfix', 'oqmgr.8.html': 'CSWpostfix', 'DSN_README': 'CSWpostfix', 'access.CSW': 'CSWpostfix', 'CONTENT_INSPECTION_README': 'CSWpostfix', 'postcon f.1': 'CSWpostfix', 'postlog.1': 'CSWpostfix', 'postconf.5': 'CSWpostfix', 'smtpd.8.html': 'CSWpostfix', 'MILTER_README': 'CSWpostfix', 'postmap': 'CSWpostfix', 'SMTPD_PROXY_README.html': 'CSWpostfix', 'MAILDROP_README.html': 'CSWpostfix', 'virtual.5.html': 'CSWpostfix', 'tlsmgr': 'CSWpostfix', 'INSTALL.html': 'CSWpostfix', 'access.5.html': 'CSWpostfix', 'relocated.CSW': 'CSWpostfix', 'ULTRIX_README': 'CSWpostfix', 'sendmail': 'CSWpostfix', 'error': 'CSWpostfix', 'ETRN_README': 'CSWpostfix', 'postkick.1.html': 'CSWpostfix', 'AAAREADME': 'CSWpostfix', 'master.cf.CSW': 'CSWpostfix', 'pgsql_table.5': 'CSWpostfix', 'error.8': 'CSWpostfix', 'depend': 'CSWpostfix', 'LDAP_README': 'CSWpostfix', 'postsuper': 'CSWpostfix', 'VERP_README': 'CSWpostfix', 'DEBUG_README.html': 'CSWpostfix', 'MYSQL_README.html': 'CSWpostfix', 'qmgr.8.html': 'CSWpostfix', 'pipe.8.html': 'CSWpostfix', 'oqmgr': 'CSWpostfix', 'main.cf.CSW': 'CSWpostfix', 'smtpd': 'CSWpostfix', 'qmqp-source.1.html': 'CSWpostfix ', 'postlock': 'CSWpostfix', 'sendmail.1': 'CSWpostfix', 'OVERVIEW.html': 'CSWpostfix', 'QSHAPE_README': 'CSWpostfix', 'NFS_README.html': 'CSWpostfix', 'virtual.CSW': 'CSWpostfix', 'discard': 'CSWpostfix', 'proxymap.8': 'CSWpostfix', 'lmtp.8.html': 'CSWpostfix', 'qmqpd.8.html': 'CSWpostfix', 'generic.5.html': 'CSWpostfix', 'postdrop.1.html': 'CSWpostfix', 'error.8.html': 'CSWpostfix', 'verify.8.html': 'CSWpostfix', 'postkick': 'CSWpostfix', 'mailq.1.html': 'CSWpostfix', 'discard.8.html': 'CSWpostfix', 'XFORWARD_README.html': 'CSWpostfix', 'tcp_table.5.html': 'CSWpostfix', 'header_checks.5': 'CSWpostfix', 'PGSQL_README': 'CSWpostfix', 'VERP_README.html': 'CSWpostfix', 'proxymap': 'CSWpostfix', 'RESTRICTION_CLASS_README': 'CSWpostfix', 'LDAP_README.html': 'CSWpostfix', 'LINUX_README': 'CSWpostfix', 'SASL_README.html': 'CSWpostfix', 'flush.8.html': 'CSWpostfix', 'postmulti.1': 'CSWpostfix', 'cleanup.8': 'CSWpostfix', 'XCLIENT_README.html': 'CSWpostfix', 'bounce.cf.default': 'CS Wpostfix', 'body_checks.5': 'CSWpostfix', 'cleanup.8.html': 'CSWpostfix', 'qshape.1.html': 'CSWpostfix', 'spawn': 'CSWpostfix', 'postmulti.1.html': 'CSWpostfix', 'SCHEDULER_README.html': 'CSWpostfix', 'trivial-rewrite.8.html': 'CSWpostfix', 'postqueue': 'CSWpostfix', 'master': 'CSWpostfix', 'aliases.CSW': 'CSWpostfix', 'ADDRESS_REWRITING_README': 'CSWpostfix', 'trivial-rewrite.8': 'CSWpostfix', 'master.8.html': 'CSWpostfix', 'BUILTIN_FILTER_README': 'CSWpostfix', 'TLS_LEGACY_README.html': 'CSWpostfix', 'STRESS_README': 'CSWpostfix', 'TUNING_README.html': 'CSWpostfix', 'header_checks.5.html': 'CSWpostfix', 'smtp-sink.1.html': 'CSWpostfix', 'relocated.5.html': 'CSWpostfix', 'TLS_README': 'CSWpostfix', 'BACKSCATTER_README': 'CSWpostfix', 'pcre_table.5': 'CSWpostfix', 'postfix-script': 'CSWpostfix', 'generic.5': 'CSWpostfix', 'defer.8': 'CSWpostfix', 'trace.8.html': 'CSWpostfix', 'postsuper.1': 'CSWpostfix', 'LINUX_README.html': 'CSWpostfix', 'index.html': 'CSWpostfix', 'postdro p.1': 'CSWpostfix', 'transport.CSW': 'CSWpostfix', 'PACKAGE_README.html': 'CSWpostfix', 'TLS_LEGACY_README': 'CSWpostfix', 'pipe.8': 'CSWpostfix', 'DB_README.html': 'CSWpostfix', 'LOCAL_RECIPIENT_README.html': 'CSWpostfix', 'UUCP_README': 'CSWpostfix', 'postcat.1.html': 'CSWpostfix', 'ldap_table.5': 'CSWpostfix', 'pkgmap': 'CSWpostfix', 'postmulti-script': 'CSWpostfix', 'BUILTIN_FILTER_README.html': 'CSWpostfix', 'SMTPD_POLICY_README.html': 'CSWpostfix', 'canonical.5': 'CSWpostfix', 'postfix-wrapper.5': 'CSWpostfix', 'IPV6_README.html': 'CSWpostfix', 'qmqpd.8': 'CSWpostfix', 'postfix-wrapper': 'CSWpostfix', 'mailq.1': 'CSWpostfix', 'PCRE_README.html': 'CSWpostfix', 'DB_README': 'CSWpostfix', 'TLS_LICENSE': 'CSWpostfix', 'pickup': 'CSWpostfix', 'BASIC_CONFIGURATION_README.html': 'CSWpostfix', 'postsuper.1.html': 'CSWpostfix', 'cswpostfix': 'CSWpostfix', 'postconf.5.html': 'CSWpostfix', 'CDB_README.html': 'CSWpostfix', 'PGSQL_README.html': 'CSWpostfix', 'postfix.1': 'CSWpostfi x', 'virtual.8.html': 'CSWpostfix', 'DATABASE_README': 'CSWpostfix', 'lmtp.8': 'CSWpostfix', 'INSTALL': 'CSWpostfix', 'access.5': 'CSWpostfix', 'smtp.8': 'CSWpostfix', 'SASL_README': 'CSWpostfix', 'pcre_table.5.html': 'CSWpostfix', 'relocated.5': 'CSWpostfix', 'ADDRESS_VERIFICATION_README.html': 'CSWpostfix', 'mysql_table.5': 'CSWpostfix', 'DSN_README.html': 'CSWpostfix', 'DATABASE_README.html': 'CSWpostfix', 'postfix-manuals.html': 'CSWpostfix', 'nqmgr': 'CSWpostfix', 'SCHEDULER_README': 'CSWpostfix', 'postalias': 'CSWpostfix', 'showq.8': 'CSWpostfix', 'verify': 'CSWpostfix', 'nisplus_table.5': 'CSWpostfix', 'local.8': 'CSWpostfix', 'canonical.CSW': 'CSWpostfix', 'ADDRESS_CLASS_README.html': 'CSWpostfix', 'cleanup': 'CSWpostfix', 'QSHAPE_README.html': 'CSWpostfix', 'regexp_table.5': 'CSWpostfix', 'XCLIENT_README': 'CSWpostfix', 'UUCP_README.html': 'CSWpostfix', 'MYSQL_README': 'CSWpostfix', 'VIRTUAL_README': 'CSWpostfix', 'NFS_README': 'CSWpostfix', 'checkinstall': 'CSWpost fix', 'PCRE_README': 'CSWpostfix', 'postalias.1.html': 'CSWpostfix', 'postcat.1': 'CSWpostfix', 'discard.8': 'CSWpostfix', 'postfix-logo.jpg': 'CSWpostfix', 'aliases.5.html': 'CSWpostfix', 'anvil.8.html': 'CSWpostfix', 'mysql_table.5.html': 'CSWpostfix', 'RESTRICTION_CLASS_README.html': 'CSWpostfix', 'master.cf': 'CSWpostfix', 'MULTI_INSTANCE_README.html': 'CSWpostfix', 'spawn.8': 'CSWpostfix', 'postdrop': 'CSWpostfix', 'postalias.1': 'CSWpostfix', 'scache.8': 'CSWpostfix', 'postfix': 'CSWpostfix', 'postlock.1': 'CSWpostfix', 'MILTER_README.html': 'CSWpostfix', 'VIRTUAL_README.html': 'CSWpostfix', 'SMTPD_ACCESS_README': 'CSWpostfix', 'pipe': 'CSWpostfix', 'SMTPD_PROXY_README': 'CSWpostfix', 'regexp_table.5.html': 'CSWpostfix', 'postmap.1': 'CSWpostfix', 'transport.5.html': 'CSWpostfix', 'qmqp-sink.1.html': 'CSWpostfix', 'DEBUG_README': 'CSWpostfix', 'transport.5': 'CSWpostfix'} +DATA_LINES_BY_SONAME = {'libresolv.so.2': u'/usr/lib/sparcv9/libresolv.so.2 f none 0755 root bin 448048 5947 1234567885 SUNWcslx', 'libdb-4.2.so': u'/opt/csw/bdb42/lib/libdb-4.2.so f none 0755 root bin 1327544 49309 1254747864 CSWbdb42', 'libsasl2.so.2': u'/opt/csw/lib/libsasl2.so.2=libsasl2.so.2.0.22 s none CSWsasl', 'libmysqlclient.so.15': u'/opt/csw/mysql5/lib/mysql/libmysqlclient.so.15=libmysqlclient.so.15.0.0 s none CSWmysql5rt', 'libpcre.so.0': u'/opt/csw/lib/sparcv9/libpcre.so.0=libpcre.so.0.0.1 s none CSWpcrert', 'libssl.so.0.9.8': u'/opt/csw/lib/sparcv9/libssl.so.0.9.8 f none 0755 root bin 427792 46460 1261308405 CSWosslrt', 'libldap-2.3.so.0': u'/opt/csw/lib/sparcv9/libldap-2.3.so.0=libldap-2.3.so.0.2.27 s none CSWoldaprt', 'libnsl.so.1': u'/usr/lib/sparcv9/libnsl.so.1 f none 0755 root bin 1099248 7581 1217954364 SUNWcslx', 'libcrypto.so.0.9.8': u'/opt/csw/lib/sparcv9/libcrypto.so.0.9.8 f none 0755 root bin 2520480 3820 1261308405 CSWosslrt', 'libsocket.so .1': u'/usr/lib/sparcv9/libsocket.so.1 f none 0755 root bin 96448 3175 1210705279 SUNWcslx', 'libc.so.1': u'/usr/lib/sparcv9/libc.so.1 f none 0755 root bin 1271000 23501 1217954364 SUNWcslx', 'liblber-2.3.so.0': u'/opt/csw/lib/sparcv9/liblber-2.3.so.0=liblber-2.3.so.0.2.27 s none CSWoldaprt', 'libpq.so.5': u'/opt/csw/postgresql/lib/libpq.so.5=libpq.so.5.1 s none CSWlibpq'} DATA_PKGMAP_CACHE = {'libresolv.so.2': {u'/usr/lib/sparcv9': u'/usr/lib/sparcv9/libresolv.so.2 f none 0755 root bin 448048 5947 1234567885 SUNWcslx', u'/usr/lib': u'/usr/lib/libresolv.so.2 f none 0755 root bin 392904 57407 1234567884 SUNWcsl'}, 'libdb-4.2.so': {u'/opt/csw/bdb42/lib': u'/opt/csw/bdb42/lib/libdb-4.2.so f none 0755 root bin 1327544 49309 1254747864 CSWbdb42', u'/opt/csw/bdb42/lib/sparcv9': u'/opt/csw/bdb42/lib/sparcv9/libdb-4.2.so f none 0755 root bin 1450608 31012 1254748763 CSWbdb42'}, 'libsasl2.so.2': {u'/opt/csw/lib': u'/opt/csw/lib/libsasl2.so.2=libsasl2.so.2.0.22 s none CSWsasl'}, 'libmysqlclient.so.15': {u'/opt/csw/mysql5/lib/mysql': u'/opt/csw/mysql5/lib/mysql/libmysqlclient.so.15=libmysqlclient.so.15.0.0 s none CSWmysql5rt', u'/opt/csw/mysql5/lib/sparcv9/mysql': u'/opt/csw/mysql5/lib/sparcv9/mysql/libmysqlclient.so.15=libmysqlclient.so.15.0.0 s none CSWmysql5rt'}, 'libpcre.so.0': {u'/opt/csw/lib': u'/opt/csw/lib/libpcre.so.0=libpcre.so.0.0. 1 s none CSWpcrert', u'/opt/csw/lib/sparcv9': u'/opt/csw/lib/sparcv9/libpcre.so.0=libpcre.so.0.0.1 s none CSWpcrert'}, 'libssl.so.0.9.8': {u'/opt/csw/lib/sparcv8plus+vis': u'/opt/csw/lib/sparcv8plus+vis/libssl.so.0.9.8 f none 0755 root bin 375532 23572 1261306582 CSWosslrt', u'/opt/csw/lib': u'/opt/csw/lib/libssl.so.0.9.8 f none 0555 root bin 372000 63313 1261304839 CSWosslrt', u'/opt/csw/lib/sparcv9': u'/opt/csw/lib/sparcv9/libssl.so.0.9.8 f none 0755 root bin 427792 46460 1261308405 CSWosslrt'}, 'libldap-2.3.so.0': {u'/opt/csw/lib': u'/opt/csw/lib/libldap-2.3.so.0=libldap-2.3.so.0.2.27 s none CSWoldaprt', u'/opt/csw/lib/sparcv9': u'/opt/csw/lib/sparcv9/libldap-2.3.so.0=libldap-2.3.so.0.2.27 s none CSWoldaprt'}, 'libnsl.so.1': {u'/usr/lib/sparcv9': u'/usr/lib/sparcv9/libnsl.so.1 f none 0755 root bin 1099248 7581 1217954364 SUNWcslx', u'/usr/lib': u'/usr/lib/libnsl.so.1 f none 0755 root bin 920500 29766 1217954358 SUNWcsl'}, 'libcrypto.so.0.9.8': {u'/opt/csw/lib/sparcv8plus+ vis': u'/opt/csw/lib/sparcv8plus+vis/libcrypto.so.0.9.8 f none 0755 root bin 2194440 48878 1261306582 CSWosslrt', u'/opt/csw/lib': u'/opt/csw/lib/libcrypto.so.0.9.8 f none 0555 root bin 2166696 48180 1261304839 CSWosslrt', u'/opt/csw/lib/sparcv9': u'/opt/csw/lib/sparcv9/libcrypto.so.0.9.8 f none 0755 root bin 2520480 3820 1261308405 CSWosslrt'}, 'libsocket.so.1': {u'/usr/lib/sparcv9': u'/usr/lib/sparcv9/libsocket.so.1 f none 0755 root bin 96448 3175 1210705279 SUNWcslx', u'/usr/lib': u'/usr/lib/libsocket.so.1 f none 0755 root bin 70860 28509 1210705279 SUNWcsl'}, 'libc.so.1': {u'/usr/lib/libp/sparcv9': u'/usr/lib/libp/sparcv9/libc.so.1 f none 0755 root bin 1395296 13745 1217954372 SUNWdplx', u'/usr/lib/sparcv9': u'/usr/lib/sparcv9/libc.so.1 f none 0755 root bin 1271000 23501 1217954364 SUNWcslx', u'/usr/lib': u'/usr/lib/libc.so.1 f none 0755 root bin 1157948 58901 1217954358 SUNWcsl'}, 'liblber-2.3.so.0': {u'/opt/csw/lib': u'/opt/csw/lib/liblber-2.3.so.0=liblber-2.3.so.0.2.2 7 s none CSWoldaprt', u'/opt/csw/lib/sparcv9': u'/opt/csw/lib/sparcv9/liblber-2.3.so.0=liblber-2.3.so.0.2.27 s none CSWoldaprt'}, 'libpq.so.5': {u'/opt/csw/postgresql/lib': u'/opt/csw/postgresql/lib/libpq.so.5=libpq.so.5.1 s none CSWlibpq', u'/opt/csw/postgresql/lib/sparcv9': u'/opt/csw/postgresql/lib/sparcv9/libpq.so.5=libpq.so.5.1 s none CSWlibpq'}} -DATA_BINARIES_BY_SONAME = {'libresolv.so.2': set(['postmulti', 'spawn', 'postkick', 'postlog', 'postconf', 'bounce', 'qmqpd', 'virtual', 'flush', 'proxymap', 'scache', 'anvil', 'verify', 'postalias', 'postcat', 'nqmgr', 'pickup', 'oqmgr', 'master', 'postqueue', 'postmap', 'local', 'showq', 'sendmail', 'discard', 'lmtp', 'postdrop', 'trivial-rewrite', 'postfix', 'postlock', 'pipe', 'tlsmgr', 'error', 'smtpd', 'postsuper', 'cleanup']), 'libdb-4.2.so': set(['postmulti', 'spawn', 'postkick', 'postlog', 'postconf', 'bounce', 'qmqpd', 'virtual', 'flush', 'proxymap', 'scache', 'anvil', 'verify', 'postalias', 'postcat', 'nqmgr', 'pickup', 'oqmgr', 'master', 'postqueue', 'postmap', 'local', 'showq', 'sendmail', 'discard', 'lmtp', 'postdrop', 'trivial-rewrite', 'postfix', 'postlock', 'pipe', 'tlsmgr', 'error', 'smtpd', 'postsuper', 'cleanup']), 'libsasl2.so.2': set(['postmulti', 'spawn', 'postkick', 'postlog', 'postconf', 'bounce', 'qmqpd', 'virtual', 'flush', 'proxymap', 'scach e', 'anvil', 'verify', 'postalias', 'postcat', 'nqmgr', 'pickup', 'oqmgr', 'master', 'postqueue', 'postmap', 'local', 'showq', 'sendmail', 'discard', 'lmtp', 'postdrop', 'trivial-rewrite', 'postfix', 'postlock', 'pipe', 'tlsmgr', 'error', 'smtpd', 'postsuper', 'cleanup']), 'libmysqlclient.so.15': set(['postmulti', 'spawn', 'postkick', 'postlog', 'postconf', 'bounce', 'qmqpd', 'virtual', 'flush', 'proxymap', 'scache', 'anvil', 'verify', 'postalias', 'postcat', 'nqmgr', 'pickup', 'oqmgr', 'master', 'postqueue', 'postmap', 'local', 'showq', 'sendmail', 'discard', 'lmtp', 'postdrop', 'trivial-rewrite', 'postfix', 'postlock', 'pipe', 'tlsmgr', 'error', 'smtpd', 'postsuper', 'cleanup']), 'libpcre.so.0': set(['postmulti', 'spawn', 'postkick', 'postlog', 'postconf', 'bounce', 'qmqpd', 'virtual', 'flush', 'proxymap', 'scache', 'anvil', 'verify', 'postalias', 'postcat', 'nqmgr', 'pickup', 'oqmgr', 'master', 'postqueue', 'postmap', 'local', 'showq', 'sendmail', 'discard', 'lmtp', 'post drop', 'trivial-rewrite', 'postfix', 'postlock', 'pipe', 'tlsmgr', 'error', 'smtpd', 'postsuper', 'cleanup']), 'libssl.so.0.9.8': set(['postmulti', 'spawn', 'postkick', 'postlog', 'postconf', 'bounce', 'qmqpd', 'virtual', 'flush', 'proxymap', 'scache', 'anvil', 'verify', 'postalias', 'postcat', 'nqmgr', 'pickup', 'oqmgr', 'master', 'postqueue', 'postmap', 'local', 'showq', 'sendmail', 'discard', 'lmtp', 'postdrop', 'trivial-rewrite', 'postfix', 'postlock', 'pipe', 'tlsmgr', 'error', 'smtpd', 'postsuper', 'cleanup']), 'libldap-2.3.so.0': set(['postmulti', 'spawn', 'postkick', 'postlog', 'postconf', 'bounce', 'qmqpd', 'virtual', 'flush', 'proxymap', 'scache', 'anvil', 'verify', 'postalias', 'postcat', 'nqmgr', 'pickup', 'oqmgr', 'master', 'postqueue', 'postmap', 'local', 'showq', 'sendmail', 'discard', 'lmtp', 'postdrop', 'trivial-rewrite', 'postfix', 'postlock', 'pipe', 'tlsmgr', 'error', 'smtpd', 'postsuper', 'cleanup']), 'libnsl.so.1': set(['postmulti', 'spawn', 'postkick', 'postlog', 'postconf', 'bounce', 'qmqpd', 'virtual', 'flush', 'proxymap', 'scache', 'anvil', 'verify', 'postalias', 'postcat', 'nqmgr', 'pickup', 'oqmgr', 'master', 'postqueue', 'postmap', 'local', 'showq', 'sendmail', 'discard', 'lmtp', 'postdrop', 'trivial-rewrite', 'postfix', 'postlock', 'pipe', 'tlsmgr', 'error', 'smtpd', 'postsuper', 'cleanup']), 'libcrypto.so.0.9.8': set(['postmulti', 'spawn', 'postkick', 'postlog', 'postconf', 'bounce', 'qmqpd', 'virtual', 'flush', 'proxymap', 'scache', 'anvil', 'verify', 'postalias', 'postcat', 'nqmgr', 'pickup', 'oqmgr', 'master', 'postqueue', 'postmap', 'local', 'showq', 'sendmail', 'discard', 'lmtp', 'postdrop', 'trivial-rewrite', 'postfix', 'postlock', 'pipe', 'tlsmgr', 'error', 'smtpd', 'postsuper', 'cleanup']), 'libc.so.1': set(['postmulti', 'spawn', 'postkick', 'postlog', 'postconf', 'bounce', 'qmqpd', 'virtual', 'flush', 'proxymap', 'scache', 'anvil', 'verify', 'postalias', 'postcat', 'nqmgr', 'pickup', 'oqmgr', 'master', 'p ostqueue', 'postmap', 'local', 'showq', 'sendmail', 'discard', 'lmtp', 'postdrop', 'trivial-rewrite', 'postfix', 'postlock', 'pipe', 'tlsmgr', 'error', 'smtpd', 'postsuper', 'cleanup']), 'libsocket.so.1': set(['postmulti', 'spawn', 'postkick', 'postlog', 'postconf', 'bounce', 'qmqpd', 'virtual', 'flush', 'proxymap', 'scache', 'anvil', 'verify', 'postalias', 'postcat', 'nqmgr', 'pickup', 'oqmgr', 'master', 'postqueue', 'postmap', 'local', 'showq', 'sendmail', 'discard', 'lmtp', 'postdrop', 'trivial-rewrite', 'postfix', 'postlock', 'pipe', 'tlsmgr', 'error', 'smtpd', 'postsuper', 'cleanup']), 'liblber-2.3.so.0': set(['postmulti', 'spawn', 'postkick', 'postlog', 'postconf', 'bounce', 'qmqpd', 'virtual', 'flush', 'proxymap', 'scache', 'anvil', 'verify', 'postalias', 'postcat', 'nqmgr', 'pickup', 'oqmgr', 'master', 'postqueue', 'postmap', 'local', 'showq', 'sendmail', 'discard', 'lmtp', 'postdrop', 'trivial-rewrite', 'postfix', 'postlock', 'pipe', 'tlsmgr', 'error', 'smtpd', 'pos tsuper', 'cleanup']), 'libpq.so.5': set(['postmulti', 'spawn', 'postkick', 'postlog', 'postconf', 'bounce', 'qmqpd', 'virtual', 'flush', 'proxymap', 'scache', 'anvil', 'verify', 'postalias', 'postcat', 'nqmgr', 'pickup', 'oqmgr', 'master', 'postqueue', 'postmap', 'local', 'showq', 'sendmail', 'discard', 'lmtp', 'postdrop', 'trivial-rewrite', 'postfix', 'postlock', 'pipe', 'tlsmgr', 'error', 'smtpd', 'postsuper', 'cleanup'])} +DATA_BINARIES_BY_SONAME = {'libresolv.so.2': set(['spawn', 'postmulti', 'postkick', 'postlog', 'postconf', 'bounce', 'qmqpd', 'virtual', 'flush', 'proxymap', 'scache', 'anvil', 'verify', 'postalias', 'postcat', 'nqmgr', 'pickup', 'oqmgr', 'master', 'postqueue', 'trivial-rewrite', 'local', 'showq', 'sendmail', 'smtpd', 'lmtp', 'postdrop', 'postmap', 'postfix', 'postlock', 'pipe', 'tlsmgr', 'error', 'discard', 'postsuper', 'cleanup']), 'libdb-4.2.so': set(['spawn', 'postmulti', 'postkick', 'postlog', 'postconf', 'bounce', 'qmqpd', 'virtual', 'flush', 'proxymap', 'scache', 'anvil', 'verify', 'postalias', 'postcat', 'nqmgr', 'pickup', 'oqmgr', 'master', 'postqueue', 'trivial-rewrite', 'local', 'showq', 'sendmail', 'smtpd', 'lmtp', 'postdrop', 'postmap', 'postfix', 'postlock', 'pipe', 'tlsmgr', 'error', 'discard', 'postsuper', 'cleanup']), 'libsasl2.so.2': set(['spawn', 'postmulti', 'postkick', 'postlog', 'postconf', 'bounce', 'qmqpd', 'virtual', 'flush', 'proxymap', 'scach e', 'anvil', 'verify', 'postalias', 'postcat', 'nqmgr', 'pickup', 'oqmgr', 'master', 'postqueue', 'trivial-rewrite', 'local', 'showq', 'sendmail', 'smtpd', 'lmtp', 'postdrop', 'postmap', 'postfix', 'postlock', 'pipe', 'tlsmgr', 'error', 'discard', 'postsuper', 'cleanup']), 'libmysqlclient.so.15': set(['spawn', 'postmulti', 'postkick', 'postlog', 'postconf', 'bounce', 'qmqpd', 'virtual', 'flush', 'proxymap', 'scache', 'anvil', 'verify', 'postalias', 'postcat', 'nqmgr', 'pickup', 'oqmgr', 'master', 'postqueue', 'trivial-rewrite', 'local', 'showq', 'sendmail', 'smtpd', 'lmtp', 'postdrop', 'postmap', 'postfix', 'postlock', 'pipe', 'tlsmgr', 'error', 'discard', 'postsuper', 'cleanup']), 'libpcre.so.0': set(['spawn', 'postmulti', 'postkick', 'postlog', 'postconf', 'bounce', 'qmqpd', 'virtual', 'flush', 'proxymap', 'scache', 'anvil', 'verify', 'postalias', 'postcat', 'nqmgr', 'pickup', 'oqmgr', 'master', 'postqueue', 'trivial-rewrite', 'local', 'showq', 'sendmail', 'smtpd', 'lmtp', 'postdrop', 'postmap', 'postfix', 'postlock', 'pipe', 'tlsmgr', 'error', 'discard', 'postsuper', 'cleanup']), 'libssl.so.0.9.8': set(['spawn', 'postmulti', 'postkick', 'postlog', 'postconf', 'bounce', 'qmqpd', 'virtual', 'flush', 'proxymap', 'scache', 'anvil', 'verify', 'postalias', 'postcat', 'nqmgr', 'pickup', 'oqmgr', 'master', 'postqueue', 'trivial-rewrite', 'local', 'showq', 'sendmail', 'smtpd', 'lmtp', 'postdrop', 'postmap', 'postfix', 'postlock', 'pipe', 'tlsmgr', 'error', 'discard', 'postsuper', 'cleanup']), 'libldap-2.3.so.0': set(['spawn', 'postmulti', 'postkick', 'postlog', 'postconf', 'bounce', 'qmqpd', 'virtual', 'flush', 'proxymap', 'scache', 'anvil', 'verify', 'postalias', 'postcat', 'nqmgr', 'pickup', 'oqmgr', 'master', 'postqueue', 'trivial-rewrite', 'local', 'showq', 'sendmail', 'smtpd', 'lmtp', 'postdrop', 'postmap', 'postfix', 'postlock', 'pipe', 'tlsmgr', 'error', 'discard', 'postsuper', 'cleanup']), 'libnsl.so.1': set(['spawn', 'postmulti', 'postkick', 'postlog', 'postconf', 'bounce', 'qmqpd', 'virtual', 'flush', 'proxymap', 'scache', 'anvil', 'verify', 'postalias', 'postcat', 'nqmgr', 'pickup', 'oqmgr', 'master', 'postqueue', 'trivial-rewrite', 'local', 'showq', 'sendmail', 'smtpd', 'lmtp', 'postdrop', 'postmap', 'postfix', 'postlock', 'pipe', 'tlsmgr', 'error', 'discard', 'postsuper', 'cleanup']), 'libcrypto.so.0.9.8': set(['spawn', 'postmulti', 'postkick', 'postlog', 'postconf', 'bounce', 'qmqpd', 'virtual', 'flush', 'proxymap', 'scache', 'anvil', 'verify', 'postalias', 'postcat', 'nqmgr', 'pickup', 'oqmgr', 'master', 'postqueue', 'trivial-rewrite', 'local', 'showq', 'sendmail', 'smtpd', 'lmtp', 'postdrop', 'postmap', 'postfix', 'postlock', 'pipe', 'tlsmgr', 'error', 'discard', 'postsuper', 'cleanup']), 'libc.so.1': set(['spawn', 'postmulti', 'postkick', 'postlog', 'postconf', 'bounce', 'qmqpd', 'virtual', 'flush', 'proxymap', 'scache', 'anvil', 'verify', 'postalias', 'postcat', 'nqmgr', 'pickup', 'oqmgr', 'master', 'p ostqueue', 'trivial-rewrite', 'local', 'showq', 'sendmail', 'smtpd', 'lmtp', 'postdrop', 'postmap', 'postfix', 'postlock', 'pipe', 'tlsmgr', 'error', 'discard', 'postsuper', 'cleanup']), 'libsocket.so.1': set(['spawn', 'postmulti', 'postkick', 'postlog', 'postconf', 'bounce', 'qmqpd', 'virtual', 'flush', 'proxymap', 'scache', 'anvil', 'verify', 'postalias', 'postcat', 'nqmgr', 'pickup', 'oqmgr', 'master', 'postqueue', 'trivial-rewrite', 'local', 'showq', 'sendmail', 'smtpd', 'lmtp', 'postdrop', 'postmap', 'postfix', 'postlock', 'pipe', 'tlsmgr', 'error', 'discard', 'postsuper', 'cleanup']), 'liblber-2.3.so.0': set(['spawn', 'postmulti', 'postkick', 'postlog', 'postconf', 'bounce', 'qmqpd', 'virtual', 'flush', 'proxymap', 'scache', 'anvil', 'verify', 'postalias', 'postcat', 'nqmgr', 'pickup', 'oqmgr', 'master', 'postqueue', 'trivial-rewrite', 'local', 'showq', 'sendmail', 'smtpd', 'lmtp', 'postdrop', 'postmap', 'postfix', 'postlock', 'pipe', 'tlsmgr', 'error', 'discard', 'pos tsuper', 'cleanup']), 'libpq.so.5': set(['spawn', 'postmulti', 'postkick', 'postlog', 'postconf', 'bounce', 'qmqpd', 'virtual', 'flush', 'proxymap', 'scache', 'anvil', 'verify', 'postalias', 'postcat', 'nqmgr', 'pickup', 'oqmgr', 'master', 'postqueue', 'trivial-rewrite', 'local', 'showq', 'sendmail', 'smtpd', 'lmtp', 'postdrop', 'postmap', 'postfix', 'postlock', 'pipe', 'tlsmgr', 'error', 'discard', 'postsuper', 'cleanup'])} DATA_ISALIST = ['sparcv9+vis2', 'sparcv9+vis', 'sparcv9', 'sparcv8plus+vis2', 'sparcv8plus+vis', 'sparcv8plus', 'sparcv8', 'sparcv8-fsmuld', 'sparcv7', 'sparc'] This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From janholzh at users.sourceforge.net Thu Jan 21 10:53:55 2010 From: janholzh at users.sourceforge.net (janholzh at users.sourceforge.net) Date: Thu, 21 Jan 2010 09:53:55 +0000 Subject: [csw-devel] SF.net SVN: gar:[8103] csw/mgar/pkg/transmission/trunk Message-ID: Revision: 8103 http://gar.svn.sourceforge.net/gar/?rev=8103&view=rev Author: janholzh Date: 2010-01-21 09:53:55 +0000 (Thu, 21 Jan 2010) Log Message: ----------- transmission: Update to 1.80 Modified Paths: -------------- csw/mgar/pkg/transmission/trunk/Makefile csw/mgar/pkg/transmission/trunk/checksums Modified: csw/mgar/pkg/transmission/trunk/Makefile =================================================================== --- csw/mgar/pkg/transmission/trunk/Makefile 2010-01-21 08:26:14 UTC (rev 8102) +++ csw/mgar/pkg/transmission/trunk/Makefile 2010-01-21 09:53:55 UTC (rev 8103) @@ -1,5 +1,5 @@ GARNAME = transmission -GARVERSION = 1.76 +GARVERSION = 1.80 CATEGORIES = net DESCRIPTION = Fast, easy, and free multi-platform BitTorrent client @@ -34,6 +34,7 @@ REQUIRED_PKGS_CSWtransmissiongtk2 += CSWpango REQUIRED_PKGS_CSWtransmissiongtk2 += CSWzlib REQUIRED_PKGS_CSWtransmissiongtk2 += CSWdbus +REQUIRED_PKGS_CSWtransmissiongtk2 += CSWgconf2 REQUIRED_PKGS_CSWtransmission = CSWcurlrt REQUIRED_PKGS_CSWtransmission += CSWlibevent @@ -61,7 +62,8 @@ EXTRA_LIB = /opt/csw/X11/lib EXTRA_PKG_CONFIG_DIRS = $(prefix)/X11/lib -CONFIGURE_ARGS = $(DIRPATHS) --enable-gtk +CONFIGURE_ARGS = $(DIRPATHS) --enable-gtk +STRIP_LIBTOOL = 1 TEST_TARGET = check Modified: csw/mgar/pkg/transmission/trunk/checksums =================================================================== --- csw/mgar/pkg/transmission/trunk/checksums 2010-01-21 08:26:14 UTC (rev 8102) +++ csw/mgar/pkg/transmission/trunk/checksums 2010-01-21 09:53:55 UTC (rev 8103) @@ -1,3 +1,3 @@ cbdb5cfaf24b68727042c3828b252534 icons-makefile.patch 7124b4836210a10fe649bba75c706cc9 linker-include.patch -ac44511ba4c203998be3079626126ede transmission-1.76.tar.bz2 +19a7d7dd60527199d05cf5e2e775929e transmission-1.80.tar.bz2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Thu Jan 21 12:13:13 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Thu, 21 Jan 2010 11:13:13 +0000 Subject: [csw-devel] SF.net SVN: gar:[8104] csw/mgar/gar/v2/bin Message-ID: Revision: 8104 http://gar.svn.sourceforge.net/gar/?rev=8104&view=rev Author: wahwah Date: 2010-01-21 11:13:10 +0000 (Thu, 21 Jan 2010) Log Message: ----------- mGAR v2: checkpkg, emulating the effect of the /opt/csw/lib/i386 -> . symlink during package installation; printing out a message about checking the package cache. Modified Paths: -------------- csw/mgar/gar/v2/bin/checkpkg csw/mgar/gar/v2/bin/checkpkg.d/checkpkg.py csw/mgar/gar/v2/bin/checkpkg.d/checkpkg_test.py csw/mgar/gar/v2/bin/checkpkg.d/update_contents_cache.py Property Changed: ---------------- csw/mgar/gar/v2/bin/checkpkg.d/update_contents_cache.py Modified: csw/mgar/gar/v2/bin/checkpkg =================================================================== --- csw/mgar/gar/v2/bin/checkpkg 2010-01-21 09:53:55 UTC (rev 8103) +++ csw/mgar/gar/v2/bin/checkpkg 2010-01-21 11:13:10 UTC (rev 8104) @@ -556,7 +556,6 @@ set_variables_for_individual_package_check "$f" -echo "Running modular tests" test_suite_ok=1 checkpkg_scriptname=`basename $0` checkpkg_basedir=${0%/${checkpkg_scriptname}} @@ -571,6 +570,7 @@ debugmsg "plugindir: '$plugindir'" log_files="" if [[ -d "$plugindir" ]]; then + echo "Running modular tests" # echo plugin dir exists for plugin in "${plugindir}"/checkpkg-*; do if [[ -x "${plugin}" ]]; then Modified: csw/mgar/gar/v2/bin/checkpkg.d/checkpkg.py =================================================================== --- csw/mgar/gar/v2/bin/checkpkg.d/checkpkg.py 2010-01-21 09:53:55 UTC (rev 8103) +++ csw/mgar/gar/v2/bin/checkpkg.d/checkpkg.py 2010-01-21 11:13:10 UTC (rev 8104) @@ -24,6 +24,11 @@ DO_NOT_REPORT_SURPLUS = set([u"CSWcommon", u"CSWcswclassutils", u"CSWisaexec"]) DO_NOT_REPORT_MISSING = set([u"SUNWlibC", u"SUNWcsl", u"SUNWlibms", u"*SUNWcslr", u"*SUNWlibC", u"*SUNWlibms"]) +SYSTEM_SYMLINKS = ( + ("/opt/csw/bdb4", ["/opt/csw/bdb42"]), + ("/64", ["/amd64", "/sparcv9"]), + ("/opt/csw/lib/i386", ["/opt/csw/lib"]), +) # This shared library is present on Solaris 10 on amd64, but it's missing on # Solaris 8 on i386. It's okay if it's missing. @@ -182,6 +187,7 @@ logging.debug("Connecting to the %s database.", self.db_path) self.conn = sqlite3.connect(self.db_path) if not self.IsDatabaseUpToDate(): + logging.warning("Rebuilding the package cache, can take a few minutes.") self.PurgeDatabase() self.PopulateDatabase() else: @@ -210,6 +216,10 @@ """) self.PopulateDatabase() + def SymlinkDuringInstallation(self, p): + """Emulates the effect of some symlinks present during installations.""" + p = p.replace("/opt/csw/lib/i386", "/opt/csw/lib") + def PopulateDatabase(self): """Imports data into the database. @@ -296,10 +306,11 @@ def IsDatabaseUpToDate(self): f_mtime = self.GetFileMtime() d_mtime = self.GetDatabaseMtime() - logging.debug("f_mtime", f_mtime, "d_time", d_mtime) + logging.debug("f_mtime %s, d_time: %s", f_mtime, d_mtime) return self.GetFileMtime() <= self.GetDatabaseMtime() def PurgeDatabase(self): + logging.info("Purging the cache database") c = self.conn.cursor() sql = "DELETE FROM config;" c.execute(sql) @@ -438,25 +449,27 @@ expanded_list = [runpath] return expanded_list +def ExpandSymlink(symlink, target, input_path): + symlink_re = re.compile(r"%s(/|$)" % symlink) + if re.search(symlink_re, input_path): + result = input_path.replace(symlink, target) + else: + result = input_path + return result + def Emulate64BitSymlinks(runpath_list): """Need to emulate the 64 -> amd64, 64 -> sparcv9 symlink Since we don't know the architecture, we'll adding both amd64 and sparcv9. It should be safe. """ - symlinks = ( - ("/opt/csw/bdb4", ["/opt/csw/bdb42"]), - ("/64", ["/amd64", "/sparcv9"]), - ) symlinked_list = [] for runpath in runpath_list: - for symlink, expansion_list in symlinks: - symlink_re = re.compile(r"%s(/|$)" % symlink) - if re.search(symlink_re, runpath): - for expansion in expansion_list: - symlinked_list.append(runpath.replace(symlink, expansion)) - else: - symlinked_list.append(runpath) + for symlink, expansion_list in SYSTEM_SYMLINKS: + for target in expansion_list: + expanded = ExpandSymlink(symlink, target, runpath) + if expanded not in symlinked_list: + symlinked_list.append(expanded) return symlinked_list @@ -484,6 +497,17 @@ runpath_list = ExpandRunpath(runpath, isalist) runpath_list = Emulate64BitSymlinks(runpath_list) soname_runpath_data = pkgmap.GetPkgmapLineByBasename(soname) + # Emulating the install time symlinks, for instance, if the prototype contains + # /opt/csw/lib/i386/foo.so.0 and /opt/csw/lib/i386 is a symlink to ".", + # the shared library ends up in /opt/csw/lib/foo.so.0 and should be findable even when + # RPATH does not contain $ISALIST. + new_soname_runpath_data = {} + for p in soname_runpath_data: + expanded_p_list = Emulate64BitSymlinks([p]) + for expanded_p in expanded_p_list: + new_soname_runpath_data[expanded_p] = soname_runpath_data[p] + soname_runpath_data = new_soname_runpath_data + logging.debug("%s: will be looking for %s in %s" % (soname, runpath_list, soname_runpath_data.keys())) for runpath_expanded in runpath_list: Modified: csw/mgar/gar/v2/bin/checkpkg.d/checkpkg_test.py =================================================================== --- csw/mgar/gar/v2/bin/checkpkg.d/checkpkg_test.py 2010-01-21 09:53:55 UTC (rev 8103) +++ csw/mgar/gar/v2/bin/checkpkg.d/checkpkg_test.py 2010-01-21 11:13:10 UTC (rev 8104) @@ -310,6 +310,13 @@ result = checkpkg.Emulate64BitSymlinks(runpath_list) self.assertTrue(expected in result, "%s not in %s" % (expected, result)) + def testEmulate64BitSymlinks_4(self): + """No repeated paths because of symlink expansion""" + runpath_list = ["/opt/csw/lib"] + expected = "/opt/csw/lib" + result = checkpkg.Emulate64BitSymlinks(runpath_list) + self.assertEquals(1, len(result), "len(%s) != %s" % (result, 1)) + def testEmulateSymlinks_3(self): runpath_list = ["/opt/csw/bdb4"] expected = "/opt/csw/bdb42" @@ -324,6 +331,22 @@ self.assertTrue(expected in result, "%s not in %s" % (expected, result)) self.assertFalse(not_expected in result, "%s is in %s" % (not_expected, result)) + def testEmulateSymlinks_5(self): + """Install time symlink expansion.""" + runpath_list = ["/opt/csw/lib/i386"] + expected = "/opt/csw/lib" + result = checkpkg.Emulate64BitSymlinks(runpath_list) + self.assertTrue(expected in result, "%s not in %s" % (expected, result)) + + def testEmulateSymlinks_6(self): + """ExpandSymlink for /opt/csw/lib/i386.""" + runpath_list = ["/opt/csw/lib/i386"] + expected = "/opt/csw/lib" + not_expected = "/opt/csw/lib/i386" + result = checkpkg.ExpandSymlink("/opt/csw/lib/i386", "/opt/csw/lib", "/opt/csw/lib/i386") + self.assertTrue(expected in result, "%s not in %s" % (expected, result)) + self.assertFalse(not_expected in result, "%s is in %s" % (not_expected, result)) + def testGetLinesBySoname(self): expected = {'foo.so.1': '/opt/csw/lib/isa-value-1/foo.so.1 foo'} pkgmap = self.pkgmap_mocker.CreateMock(checkpkg.SystemPkgmap) @@ -441,11 +464,14 @@ binaries_by_soname, runpath_by_needed_soname) = checkpkg.BuildIndexesBySoname( d6.DATA_NEEDED_SONAMES_BY_BINARY) + # The original data did not have amd64 in the isalist. + isalist = ['amd64', 'pentium_pro+mmx', 'pentium_pro', 'pentium+mmx', + 'pentium', 'i486', 'i386', 'i86'] result = checkpkg.GetLinesBySoname( pkgmap_stub, set([soname]), runpath_by_needed_soname, - d6.DATA_ISALIST) + isalist) self.assertEqual(expected, result) def testGetLinesBySoname_8(self): @@ -461,6 +487,24 @@ self.pkgmap_mocker.VerifyAll() self.assertEqual(expected, result) + def testGetLinesBySoname_9(self): + """Emulation of binaries installed into /opt/csw/lib/i386. + + The problem is that /opt/csw/lib/i386 is a symlink and the binaries + end up in /opt/csw/lib instead. + """ + expected = {'foo.so.0': '/opt/csw/lib/i386/foo.so.0 foo'} + lines1 = {"/opt/csw/lib/i386": "/opt/csw/lib/i386/foo.so.0 foo"} + pkgmap = self.pkgmap_mocker.CreateMock(checkpkg.SystemPkgmap) + pkgmap.GetPkgmapLineByBasename("foo.so.0").AndReturn(lines1) + self.pkgmap_mocker.ReplayAll() + needed_sonames = set(["foo.so.0"]) + runpath_by_needed_soname = {"foo.so.0": ["/opt/csw/lib", "/usr/lib"]} + isalist = ["isa-value-1", "isa-value-2"] + result = checkpkg.GetLinesBySoname(pkgmap, needed_sonames, runpath_by_needed_soname, isalist) + self.pkgmap_mocker.VerifyAll() + self.assertEqual(expected, result) + def testSanitizeRunpath_1(self): self.assertEqual("/opt/csw/lib", checkpkg.SanitizeRunpath("/opt/csw/lib/")) Modified: csw/mgar/gar/v2/bin/checkpkg.d/update_contents_cache.py =================================================================== --- csw/mgar/gar/v2/bin/checkpkg.d/update_contents_cache.py 2010-01-21 09:53:55 UTC (rev 8103) +++ csw/mgar/gar/v2/bin/checkpkg.d/update_contents_cache.py 2010-01-21 11:13:10 UTC (rev 8104) @@ -1,8 +1,17 @@ #!/opt/csw/bin/python2.6 +# +# $Id$ +# +# This file only creates an instance of SystemPkgmap in order to update the +# package cache (if necessary), and display the information about the update. import checkpkg +import logging + def main(): + print "Checking if the package cache is up to date." + logging.basicConfig(level=logging.INFO) test_pkgmap = checkpkg.SystemPkgmap() Property changes on: csw/mgar/gar/v2/bin/checkpkg.d/update_contents_cache.py ___________________________________________________________________ Added: svn:keywords + Id This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From a_o_m at users.sourceforge.net Thu Jan 21 12:18:23 2010 From: a_o_m at users.sourceforge.net (a_o_m at users.sourceforge.net) Date: Thu, 21 Jan 2010 11:18:23 +0000 Subject: [csw-devel] SF.net SVN: gar:[8105] csw/mgar/pkg/fontconfig/trunk Message-ID: Revision: 8105 http://gar.svn.sourceforge.net/gar/?rev=8105&view=rev Author: a_o_m Date: 2010-01-21 11:18:18 +0000 (Thu, 21 Jan 2010) Log Message: ----------- fontconfig: upgrade to 2.8.0 Modified Paths: -------------- csw/mgar/pkg/fontconfig/trunk/Makefile csw/mgar/pkg/fontconfig/trunk/checksums Modified: csw/mgar/pkg/fontconfig/trunk/Makefile =================================================================== --- csw/mgar/pkg/fontconfig/trunk/Makefile 2010-01-21 11:13:10 UTC (rev 8104) +++ csw/mgar/pkg/fontconfig/trunk/Makefile 2010-01-21 11:18:18 UTC (rev 8105) @@ -1,5 +1,5 @@ GARNAME = fontconfig -GARVERSION = 2.7.3 +GARVERSION = 2.8.0 CATEGORIES = lib DESCRIPTION = A library for configuring and customizing font access. Modified: csw/mgar/pkg/fontconfig/trunk/checksums =================================================================== --- csw/mgar/pkg/fontconfig/trunk/checksums 2010-01-21 11:13:10 UTC (rev 8104) +++ csw/mgar/pkg/fontconfig/trunk/checksums 2010-01-21 11:18:18 UTC (rev 8105) @@ -1,5 +1,5 @@ -747d2c691c66b563c8e8c1784ce8d014 download/fontconfig-2.7.3.tar.gz -5a5b382b4a5e579cfc869bcffd7c034e download/CSWfconfig.postinstall -21481d18c2100203177ccab5b51e50d7 download/CSWfconfig.checkinstall -0fb83ca9bf9a7b99ab7601347e8c855d download/fontconfig.h.diff -bbdb45396408c48d50c7db5747dfae4e download/fix-zerowidth-struct.patch +21481d18c2100203177ccab5b51e50d7 CSWfconfig.checkinstall +5a5b382b4a5e579cfc869bcffd7c034e CSWfconfig.postinstall +bbdb45396408c48d50c7db5747dfae4e fix-zerowidth-struct.patch +77e15a92006ddc2adbb06f840d591c0e fontconfig-2.8.0.tar.gz +0fb83ca9bf9a7b99ab7601347e8c855d fontconfig.h.diff This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From a_o_m at users.sourceforge.net Thu Jan 21 14:01:18 2010 From: a_o_m at users.sourceforge.net (a_o_m at users.sourceforge.net) Date: Thu, 21 Jan 2010 13:01:18 +0000 Subject: [csw-devel] SF.net SVN: gar:[8106] csw/mgar/pkg/fontconfig/trunk Message-ID: Revision: 8106 http://gar.svn.sourceforge.net/gar/?rev=8106&view=rev Author: a_o_m Date: 2010-01-21 13:01:18 +0000 (Thu, 21 Jan 2010) Log Message: ----------- fontconfig: removed patches for older releases, removing cache-csw-2 files during postinstall now Modified Paths: -------------- csw/mgar/pkg/fontconfig/trunk/Makefile csw/mgar/pkg/fontconfig/trunk/files/CSWfconfig.postinstall Removed Paths: ------------- csw/mgar/pkg/fontconfig/trunk/files/CSWfconfig.checkinstall csw/mgar/pkg/fontconfig/trunk/files/fix-zerowidth-struct.patch csw/mgar/pkg/fontconfig/trunk/files/fontconfig.h.diff Modified: csw/mgar/pkg/fontconfig/trunk/Makefile =================================================================== --- csw/mgar/pkg/fontconfig/trunk/Makefile 2010-01-21 11:18:18 UTC (rev 8105) +++ csw/mgar/pkg/fontconfig/trunk/Makefile 2010-01-21 13:01:18 UTC (rev 8106) @@ -13,11 +13,7 @@ MASTER_SITES = http://www.fontconfig.org/release/ DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz DISTFILES += CSWfconfig.postinstall -DISTFILES += CSWfconfig.checkinstall -PATCHFILES = fontconfig.h.diff -PATCHFILES += fix-zerowidth-struct.patch - REQUIRED_PKGS = CSWexpat CSWftype2 CSWzlib CSWiconv # We define upstream file regex so we can be notifed of new upstream software release @@ -35,6 +31,4 @@ CONFIGURE_ARGS += --with-cache-dir=/var/opt/csw/cache/fontconfig CONFIGURE_ARGS += --with-confdir=/opt/csw/etc/fontconfig -EXTRA_MERGE_EXCLUDE_FILES = .*/fonts.conf.bak - include gar/category.mk Deleted: csw/mgar/pkg/fontconfig/trunk/files/CSWfconfig.checkinstall =================================================================== --- csw/mgar/pkg/fontconfig/trunk/files/CSWfconfig.checkinstall 2010-01-21 11:18:18 UTC (rev 8105) +++ csw/mgar/pkg/fontconfig/trunk/files/CSWfconfig.checkinstall 2010-01-21 13:01:18 UTC (rev 8106) @@ -1,8 +0,0 @@ -#!/bin/sh - -if [ ! -f ${BASEDIR}/opt/csw/lib/libexpat.so.1 ]; then - echo Expat XML parser version 2.0 or higher required. Please upgrade CSWexpat first. - exit 1 -fi - -exit 0 Modified: csw/mgar/pkg/fontconfig/trunk/files/CSWfconfig.postinstall =================================================================== --- csw/mgar/pkg/fontconfig/trunk/files/CSWfconfig.postinstall 2010-01-21 11:18:18 UTC (rev 8105) +++ csw/mgar/pkg/fontconfig/trunk/files/CSWfconfig.postinstall 2010-01-21 13:01:18 UTC (rev 8106) @@ -3,8 +3,8 @@ CHROOTDIR=${BASEDIR:-/} echo -echo fc-cache is running now to build font information caches -echo this may take up to several minutes on slow workstations +echo Fontconfig needs to update its font cache. +echo This can take up to a couple of minutes. echo ${BASEDIR}/usr/sbin/chroot ${CHROOTDIR} /opt/csw/bin/fc-cache -f -s @@ -15,6 +15,8 @@ find ${BASEDIR}/usr/openwin/lib/X11/fonts -user root -name fonts.cache-csw-1 -exec rm -f {} \; find ${BASEDIR}/usr/openwin/lib/locale -user root -name fonts.cache-csw-1 -exec rm -f {} \; find ${BASEDIR}/opt/csw -user root -name fonts.cache-csw-1 -exec rm -f {} \; +# removing ancient *.cache-csw-2 files +rm "${BASEDIR}/opt/csw/var/cache/fontconfig/*.cache-csw-2" 2>/dev/null # remove obsolete cache dir [ -d "${BASEDIR}/opt/csw/var/cache-fontconfig" ] && rm -r "${BASEDIR}/opt/csw/var/cache-fontconfig" 2>/dev/null Deleted: csw/mgar/pkg/fontconfig/trunk/files/fix-zerowidth-struct.patch =================================================================== --- csw/mgar/pkg/fontconfig/trunk/files/fix-zerowidth-struct.patch 2010-01-21 11:18:18 UTC (rev 8105) +++ csw/mgar/pkg/fontconfig/trunk/files/fix-zerowidth-struct.patch 2010-01-21 13:01:18 UTC (rev 8106) @@ -1,12 +0,0 @@ -diff -Naur fontconfig-2.7.3.orig/src/fcint.h fontconfig-2.7.3.patched/src/fcint.h ---- fontconfig-2.7.3.orig/src/fcint.h 2009-06-28 19:46:36.000000000 +0200 -+++ fontconfig-2.7.3.patched/src/fcint.h 2009-09-28 15:47:07.195049714 +0200 -@@ -253,7 +253,7 @@ - FcExprPage *next_page; - FcExpr *next; - FcExpr exprs[(1024 - 2/* two pointers */ - 2/* malloc overhead */) * sizeof (void *) / sizeof (FcExpr)]; -- FcExpr end[0]; -+ FcExpr end[]; - }; - - typedef enum _FcQual { Deleted: csw/mgar/pkg/fontconfig/trunk/files/fontconfig.h.diff =================================================================== --- csw/mgar/pkg/fontconfig/trunk/files/fontconfig.h.diff 2010-01-21 11:18:18 UTC (rev 8105) +++ csw/mgar/pkg/fontconfig/trunk/files/fontconfig.h.diff 2010-01-21 13:01:18 UTC (rev 8106) @@ -1,15 +0,0 @@ ---- fontconfig-2.6.0/fontconfig/fontconfig.h_orig 2008-06-01 04:24:34.000000000 +0200 -+++ fontconfig-2.6.0/fontconfig/fontconfig.h 2009-04-24 12:14:14.404366000 +0200 -@@ -113,9 +113,9 @@ - #define FC_DECORATIVE "decorative" /* Bool - true if style is a decorative variant */ - #define FC_LCD_FILTER "lcdfilter" /* Int */ - --#define FC_CACHE_SUFFIX ".cache-"FC_CACHE_VERSION --#define FC_DIR_CACHE_FILE "fonts.cache-"FC_CACHE_VERSION --#define FC_USER_CACHE_FILE ".fonts.cache-"FC_CACHE_VERSION -+#define FC_CACHE_SUFFIX ".cache-csw-"FC_CACHE_VERSION -+#define FC_DIR_CACHE_FILE "fonts.cache-csw-"FC_CACHE_VERSION -+#define FC_USER_CACHE_FILE ".fonts.cache-csw-"FC_CACHE_VERSION - - /* Adjust outline rasterizer */ - #define FC_CHAR_WIDTH "charwidth" /* Int */ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From a_o_m at users.sourceforge.net Thu Jan 21 14:03:21 2010 From: a_o_m at users.sourceforge.net (a_o_m at users.sourceforge.net) Date: Thu, 21 Jan 2010 13:03:21 +0000 Subject: [csw-devel] SF.net SVN: gar:[8107] csw/mgar/pkg/fontconfig/trunk/checksums Message-ID: Revision: 8107 http://gar.svn.sourceforge.net/gar/?rev=8107&view=rev Author: a_o_m Date: 2010-01-21 13:03:21 +0000 (Thu, 21 Jan 2010) Log Message: ----------- fontconfig: checksums updated Modified Paths: -------------- csw/mgar/pkg/fontconfig/trunk/checksums Modified: csw/mgar/pkg/fontconfig/trunk/checksums =================================================================== --- csw/mgar/pkg/fontconfig/trunk/checksums 2010-01-21 13:01:18 UTC (rev 8106) +++ csw/mgar/pkg/fontconfig/trunk/checksums 2010-01-21 13:03:21 UTC (rev 8107) @@ -1,5 +1,2 @@ -21481d18c2100203177ccab5b51e50d7 CSWfconfig.checkinstall -5a5b382b4a5e579cfc869bcffd7c034e CSWfconfig.postinstall -bbdb45396408c48d50c7db5747dfae4e fix-zerowidth-struct.patch +8749af801a9e33c61092da59354bbceb CSWfconfig.postinstall 77e15a92006ddc2adbb06f840d591c0e fontconfig-2.8.0.tar.gz -0fb83ca9bf9a7b99ab7601347e8c855d fontconfig.h.diff This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From a_o_m at users.sourceforge.net Thu Jan 21 14:42:33 2010 From: a_o_m at users.sourceforge.net (a_o_m at users.sourceforge.net) Date: Thu, 21 Jan 2010 13:42:33 +0000 Subject: [csw-devel] SF.net SVN: gar:[8108] csw/mgar/pkg/fontconfig/trunk Message-ID: Revision: 8108 http://gar.svn.sourceforge.net/gar/?rev=8108&view=rev Author: a_o_m Date: 2010-01-21 13:42:33 +0000 (Thu, 21 Jan 2010) Log Message: ----------- fontconfig: fix-zerowidth-struct patch readded Modified Paths: -------------- csw/mgar/pkg/fontconfig/trunk/Makefile csw/mgar/pkg/fontconfig/trunk/checksums Added Paths: ----------- csw/mgar/pkg/fontconfig/trunk/files/fix-zerowidth-struct.patch Modified: csw/mgar/pkg/fontconfig/trunk/Makefile =================================================================== --- csw/mgar/pkg/fontconfig/trunk/Makefile 2010-01-21 13:03:21 UTC (rev 8107) +++ csw/mgar/pkg/fontconfig/trunk/Makefile 2010-01-21 13:42:33 UTC (rev 8108) @@ -14,6 +14,8 @@ DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz DISTFILES += CSWfconfig.postinstall +PATCHFILES = fix-zerowidth-struct.patch + REQUIRED_PKGS = CSWexpat CSWftype2 CSWzlib CSWiconv # We define upstream file regex so we can be notifed of new upstream software release Modified: csw/mgar/pkg/fontconfig/trunk/checksums =================================================================== --- csw/mgar/pkg/fontconfig/trunk/checksums 2010-01-21 13:03:21 UTC (rev 8107) +++ csw/mgar/pkg/fontconfig/trunk/checksums 2010-01-21 13:42:33 UTC (rev 8108) @@ -1,2 +1,3 @@ 8749af801a9e33c61092da59354bbceb CSWfconfig.postinstall +bbdb45396408c48d50c7db5747dfae4e fix-zerowidth-struct.patch 77e15a92006ddc2adbb06f840d591c0e fontconfig-2.8.0.tar.gz Added: csw/mgar/pkg/fontconfig/trunk/files/fix-zerowidth-struct.patch =================================================================== --- csw/mgar/pkg/fontconfig/trunk/files/fix-zerowidth-struct.patch (rev 0) +++ csw/mgar/pkg/fontconfig/trunk/files/fix-zerowidth-struct.patch 2010-01-21 13:42:33 UTC (rev 8108) @@ -0,0 +1,12 @@ +diff -Naur fontconfig-2.7.3.orig/src/fcint.h fontconfig-2.7.3.patched/src/fcint.h +--- fontconfig-2.7.3.orig/src/fcint.h 2009-06-28 19:46:36.000000000 +0200 ++++ fontconfig-2.7.3.patched/src/fcint.h 2009-09-28 15:47:07.195049714 +0200 +@@ -253,7 +253,7 @@ + FcExprPage *next_page; + FcExpr *next; + FcExpr exprs[(1024 - 2/* two pointers */ - 2/* malloc overhead */) * sizeof (void *) / sizeof (FcExpr)]; +- FcExpr end[0]; ++ FcExpr end[]; + }; + + typedef enum _FcQual { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Thu Jan 21 14:51:08 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Thu, 21 Jan 2010 13:51:08 +0000 Subject: [csw-devel] SF.net SVN: gar:[8109] csw/mgar/gar/v2/bin/checkpkg.d/checkpkg.py Message-ID: Revision: 8109 http://gar.svn.sourceforge.net/gar/?rev=8109&view=rev Author: wahwah Date: 2010-01-21 13:51:06 +0000 (Thu, 21 Jan 2010) Log Message: ----------- mGAR v2: checkpkg, don't report SUNWcslx in missing packages, it's a core package. Modified Paths: -------------- csw/mgar/gar/v2/bin/checkpkg.d/checkpkg.py Modified: csw/mgar/gar/v2/bin/checkpkg.d/checkpkg.py =================================================================== --- csw/mgar/gar/v2/bin/checkpkg.d/checkpkg.py 2010-01-21 13:42:33 UTC (rev 8108) +++ csw/mgar/gar/v2/bin/checkpkg.d/checkpkg.py 2010-01-21 13:51:06 UTC (rev 8109) @@ -23,7 +23,8 @@ CONFIG_MTIME = "mtime" DO_NOT_REPORT_SURPLUS = set([u"CSWcommon", u"CSWcswclassutils", u"CSWisaexec"]) DO_NOT_REPORT_MISSING = set([u"SUNWlibC", u"SUNWcsl", u"SUNWlibms", - u"*SUNWcslr", u"*SUNWlibC", u"*SUNWlibms"]) + u"*SUNWcslr", u"*SUNWlibC", u"*SUNWlibms", + u"SUNWcslx"]) SYSTEM_SYMLINKS = ( ("/opt/csw/bdb4", ["/opt/csw/bdb42"]), ("/64", ["/amd64", "/sparcv9"]), This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Thu Jan 21 14:52:57 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Thu, 21 Jan 2010 13:52:57 +0000 Subject: [csw-devel] SF.net SVN: gar:[8110] csw/mgar/pkg Message-ID: Revision: 8110 http://gar.svn.sourceforge.net/gar/?rev=8110&view=rev Author: wahwah Date: 2010-01-21 13:52:51 +0000 (Thu, 21 Jan 2010) Log Message: ----------- pycurl: Initial commit Modified Paths: -------------- csw/mgar/pkg/pycurl/trunk/Makefile csw/mgar/pkg/pycurl/trunk/checksums Added Paths: ----------- csw/mgar/pkg/pycurl/ csw/mgar/pkg/pycurl/trunk/files/remove-static-libs.patch Modified: csw/mgar/pkg/pycurl/trunk/Makefile =================================================================== --- csw/mgar/pkg/template/trunk/Makefile 2010-01-21 13:03:21 UTC (rev 8107) +++ csw/mgar/pkg/pycurl/trunk/Makefile 2010-01-21 13:52:51 UTC (rev 8110) @@ -2,184 +2,23 @@ # Distributed under the terms of the GNU General Public License v2 # $Id$ -## This file contains comments to guide you through various GAR settings. -## Please remove unnecessary comments before committing your code to the code -## repository. The comments to remove are marked with double hashes. -## If you want to remove them all in-place, use: -## gsed -i -e '/^##/d' Makefile -## -## For more information about GAR variables, please see: -## https://sourceforge.net/apps/trac/gar/wiki/GAR%20Variable%20Reference -## -GARNAME = mypkg -GARVERSION = 1.0 -## -## The category that your software fits in. This is not a descriptive field, but -## influences the build process. Depending on the CATEGORIES setting, different -## Makefiles are included from gar/categories/ in your trunk directory, which -## adjust the build settings for the respective category. -## -## Possible settings are: -## apps, cpan, devel, gnome, java, kde, lang, lib, meta, net, python, server, -## utils, x11, xfce, xorg, xtra -CATEGORIES = lib -## -## A one-line description of the package, which will appear in the pkginfo. -DESCRIPTION = -## -## A longer description of the package. This is only for descriptive purposes -## inside the Makefile and is not used elsewhere. +GARNAME = pycurl +GARVERSION = 7.19.0 +CATEGORIES = python +DESCRIPTION = PycURL is a Python interface to libcurl +PACKAGES = CSWpy-curl +CATALOGNAME_CSWpy-curl = py_curl define BLURB - endef -## -## Upstream URL that should show up in the VENDOR field as well as on -## http://opencsw.org/packages/. -SPKG_SOURCEURL = -## -## Whitespace-separated list of URLs to download the source package from. -## There are presets: $(SF_MIRRORS), $(GNU_MIRRORS) and $(GOOGLE_MIRROR). -MASTER_SITES = -## -## SF_PROJ is required if you set $(MASTER_SITES) to $(SF_MIRRORS) and the -## Sourceforge project name differs from $(GARNAME). Specifies the Sourceforge -## project name of the software you wish to download. -## SF_PROJ = -## -## A list of space separated patch filenames from files/ that are to be applied -## to the extracted software before the ./configure stage. Patches need to be -## included in the DISTFILES variable as well. -## PATCHFILES = -## -## Whitespace-separated list of files which comprise this build. mGAR will look -## for the files in the $(FILEDIR) (trunk/files) directory and on the -## $(MASTER_SITES). +SPKG_SOURCEURL = http://pycurl.sourceforge.net/ +MASTER_SITES = http://pycurl.sourceforge.net/download/ +PATCHFILES = remove-static-libs.patch DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz -## -## We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz -## -## Catalog name is the name to be used with pkg{-get,util} -i . -## It is different from the system package name, which by convention is CSWpkgname. -## CATALOGNAME = -## -## Set to 1 to mark the package as architecture-independent. -## ARCHALL = 0 -## -## A list of files / patterns that should be excluded from the package. Amends -## the default list of excluded filenames $(MERGE_EXCLUDE_DEFAULT), which -## contains things like libtool .la files and files with a leading ~. -## EXTRA_MERGE_EXCLUDE_FILES = -## -## A list of space separated package names that should be marked as -## incompatible with the current package. This will go into the depend file. -## When a user has one of the incompatible packages installed and installs -## your package, he will be prompted that the incompatible package must be -## removed. He will however not be prevented to install your package without -## removing the conflicting package first. -## INCOMPATIBLE_PKGS = -## -## The name of the license file that should be included in your package. Defaults -## to COPYING. See http://sourceforge.net/apps/trac/gar/wiki/CopyRightfor details -## on including and displaying licenses. -## LICENSE = -## -## A list of space separated package names that should be produced from your -## Makefile. This is used when a software has different components that can be -## packaged and used individually (think runtime libraries, client tools, server -## files, development headers). You don't need to set this when you just want to -## produce one package. -## -## When you set this variable to include more than one package, you also need to -## set PKGFILES_CSWpkgname for each package (except for the first one in your -## $(PACKAGES) list) to define which files go into each package. The first -## package from $(PACKAGES) one will hold all files that are not matched by -## PKGFILES_ for other packages. -## PACKAGES = -## -## If specified, GAR feeds the almost-final package prototype file to -## $(PROTOTYPE_FILTER) and reads the final package prototype file from it. -## $(PROTOTYPE_FILTER) is usually a sed/awk/perl one-liner, which was mostly used -## to prepare the prototype file for use with cswclassutils (see -## $(SPKG_CLASSES)). Now that there are convenience variables for cswclassutils, -## you will rarely have to use this. A still valid use case would be to change -## the file permissions of a file to be set-UID. -## See http://wiki.opencsw.org/cswclassutils-package for common usage information -## PROTOTYPE_FILTER = -## -## cswclassutils settings -## -## A list of action classes. Possible values are: -## none cswpreserveconf cswcpsampleconf cswpycompile cswusergroup cswinitsmf -## cswinetd cswetcservices -## The class 'cswinitsmf' must be the last class listed. When you use cswclassutils, -## you need to add CSWcswclassutils to REQUIRED_PKGS. -## SPKG_CLASSES = none -## Simplified settings for classes: -## PRESERVECONF = -## SAMPLECONF = -## INITSMF = -## USERGROUP = -## ETCSERVICES = -## INETDCONF = -## A list of runtime package dependencies in the form of CSWfoo. -## REQUIRED_PKGS = -## -## A list of packages necessary to build this package -## PREREQUISITE_PKGS = $(REQUIRED_PKGS) -## -## When using non-empty $(PACKAGES): -## REQUIRED_PKGS_CSWpkgname = -## SPKG_DESC_CSWpkgname = -## PKGFILES_CSWpkgname = -## CATALOGNAME_CSWpkgname = -## -## A list of space separated directories where objects should be stripped in -## addition to the bin/ and sbin/ directories. -## STRIP_DIRS = -## -## Define a custom target for the configure phase. When you set this, the target -## that will be used instead of configure: target, is named -## configure-$(CONFIGURE_SCRIPTS) and you will need to define it in your Makefile -## after including gar/gar.include.mk. If you want to skip the configure phase -## completely (for example when your software doesn't need to be compiled) assign -## this variable an empty value. The procedure works for configure, build, -## install and test steps. -## CONFIGURE_SCRIPTS = -## BUILD_SCRIPTS = -## INSTALL_SCRIPTS = -## TEST_SCRIPTS = -## -## Compilation settings -## -## The build directory. -## WORKSRC = $(WORKDIR)/$(GARNAME)-$(GARVERSION) -## -## BUILD_ARGS is passed as an argument to gmake during the build phase. Use this -## for example, if you need to override Makefile variables. -## BUILD_ARGS = -## -## Arguments passed to the ./configure script. -CONFIGURE_ARGS = $(DIRPATHS) -## -## BUILD64 = -## CONFIGURE_ENV = -## EXTRA_CFLAGS = -## EXTRA_LDFLAGS = -## EXTRA_INC = -## EXTRA_LIB = -## GARFLAVOR = -## INSTALL_ARGS = -## OPT_FLAGS_SOS = -xO3 -## OPT_FLAGS_GCC = -O2 -pipe -## -## The compiler to use. Defaults to SOS11, can be also: SOS12, GCC3, GCC4. -## GARCOMPILER = SOS11 -## -# Remove the following rules and uncomment the -# include before building. -all: .DEFAULT -.DEFAULT: - @true - -#include gar/category.mk +REQUIRED_PKGS += CSWcurlrt +REQUIRED_PKGS += CSWlibidn +REQUIRED_PKGS += CSWoldaprt +REQUIRED_PKGS += CSWosslrt +REQUIRED_PKGS += CSWzlib +TEST_SCRIPTS = +include gar/category.mk Modified: csw/mgar/pkg/pycurl/trunk/checksums =================================================================== --- csw/mgar/pkg/template/trunk/checksums 2010-01-21 13:03:21 UTC (rev 8107) +++ csw/mgar/pkg/pycurl/trunk/checksums 2010-01-21 13:52:51 UTC (rev 8110) @@ -0,0 +1,2 @@ +919d58fe37e69fe87ce4534d8b6a1c7b pycurl-7.19.0.tar.gz +530dc7258db23c9a1d1e39082011a6c1 remove-static-libs.patch Added: csw/mgar/pkg/pycurl/trunk/files/remove-static-libs.patch =================================================================== --- csw/mgar/pkg/pycurl/trunk/files/remove-static-libs.patch (rev 0) +++ csw/mgar/pkg/pycurl/trunk/files/remove-static-libs.patch 2010-01-21 13:52:51 UTC (rev 8110) @@ -0,0 +1,12 @@ +--- pycurl-7.19.0/setup.py.orig 2010-01-21 14:37:49.752839487 +0100 ++++ pycurl-7.19.0/setup.py 2010-01-21 14:38:07.351889431 +0100 +@@ -97,8 +97,7 @@ + else: + extra_compile_args.append(e) + libs = split_quoted( +- os.popen("'%s' --libs" % CURL_CONFIG).read()+\ +- os.popen("'%s' --static-libs" % CURL_CONFIG).read()) ++ os.popen("'%s' --libs" % CURL_CONFIG).read()) + for e in libs: + if e[:2] == "-l": + libraries.append(e[2:]) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From hson at users.sourceforge.net Thu Jan 21 15:06:25 2010 From: hson at users.sourceforge.net (hson at users.sourceforge.net) Date: Thu, 21 Jan 2010 14:06:25 +0000 Subject: [csw-devel] SF.net SVN: gar:[8111] csw/mgar/pkg Message-ID: Revision: 8111 http://gar.svn.sourceforge.net/gar/?rev=8111&view=rev Author: hson Date: 2010-01-21 14:06:24 +0000 (Thu, 21 Jan 2010) Log Message: ----------- exempi: Initial commit Added Paths: ----------- csw/mgar/pkg/exempi/ csw/mgar/pkg/exempi/Makefile csw/mgar/pkg/exempi/branches/ csw/mgar/pkg/exempi/tags/ csw/mgar/pkg/exempi/trunk/ csw/mgar/pkg/exempi/trunk/Makefile csw/mgar/pkg/exempi/trunk/checksums csw/mgar/pkg/exempi/trunk/files/ csw/mgar/pkg/exempi/trunk/files/Makefiles.patch csw/mgar/pkg/exempi/trunk/files/RIFF_Support.cpp csw/mgar/pkg/exempi/trunk/files/XML_Node.cpp csw/mgar/pkg/exempi/trunk/files/boost.m4.patch csw/mgar/pkg/exempi/trunk/files/configure.patch csw/mgar/pkg/exempi/trunk/files/exempi.cpp.patch csw/mgar/pkg/exempi/trunk/files/utils.cpp.patch csw/mgar/pkg/exempi/trunk/files/xmp.h.patch Added: csw/mgar/pkg/exempi/Makefile =================================================================== --- csw/mgar/pkg/exempi/Makefile (rev 0) +++ csw/mgar/pkg/exempi/Makefile 2010-01-21 14:06:24 UTC (rev 8111) @@ -0,0 +1,15 @@ +# vim: ft=make ts=4 sw=4 noet + +default: + @echo "You are in the pkg/ directory." + +%: + $(MAKE) -C trunk $* + +paranoid-%: + $(MAKE) -C trunk $* || exit 2 + +export BUILDLOG ?= $(shell pwd)/buildlog.txt + +report-%: + $(MAKE) -C trunk $* || echo " *** make $* in $$i failed ***" >> $(BUILDLOG) Property changes on: csw/mgar/pkg/exempi/trunk ___________________________________________________________________ Added: svn:ignore + cookies download work Added: svn:externals + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 Added: csw/mgar/pkg/exempi/trunk/Makefile =================================================================== --- csw/mgar/pkg/exempi/trunk/Makefile (rev 0) +++ csw/mgar/pkg/exempi/trunk/Makefile 2010-01-21 14:06:24 UTC (rev 8111) @@ -0,0 +1,47 @@ +GARNAME = exempi +GARVERSION = 2.1.1 +CATEGORIES = lib + +DESCRIPTION = Exempi is an implementation of XMP +define BLURB + Exempi is an implementation of XMP. Version 2.x is based on Adobe XMP SDK + 4.1.1 and released under a BSD-style license like Adobe's. The 3 clause + BSD (aka New-BSD) license is compatible with GPL. The licensing is kept + identical in order to allow two-way merging of the code (ie sending our + change to the XMP SDK to Adobe for integration). + + The API is C based and means to be used from any language and be easier + to maintain ABI stability. +endef + +MASTER_SITES = http://libopenraw.freedesktop.org/download/ +DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz + +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + +REQUIRED_PKGS += CSWexpat CSWstlport CSWzlib +PREREQUISITE_PKGS += CSWiconv CSWboostrt CSWboostdevel + +PATCHFILES += Makefiles.patch +PATCHFILES += RIFF_Support.cpp +PATCHFILES += XML_Node.cpp +PATCHFILES += configure.patch +PATCHFILES += exempi.cpp.patch +PATCHFILES += utils.cpp.patch +PATCHFILES += xmp.h.patch +PATCHFILES += boost.m4.patch + +EXTRA_CXXFLAGS = -D__EXTENSIONS__ -library=stlport4 -DHAVE_NATIVE_TLS=0 +EXTRA_LINKER_FLAGS = -liconv + +CONFIGURE_ARGS = $(DIRPATHS) +CONFIGURE_ARGS += --with-boost=/opt/csw + +TEST_TARGET = check + +include gar/category.mk + +pre-configure-modulated: + @echo " ==> Regenerating build tools..." + @(cd $(WORKSRC) ; autoconf) + @$(MAKECOOKIE) Added: csw/mgar/pkg/exempi/trunk/checksums =================================================================== --- csw/mgar/pkg/exempi/trunk/checksums (rev 0) +++ csw/mgar/pkg/exempi/trunk/checksums 2010-01-21 14:06:24 UTC (rev 8111) @@ -0,0 +1,9 @@ +8fded282d0b747d5be8d401f268e6c87 Makefiles.patch +58df21dd4e8418040ef8e422b7f50fe9 RIFF_Support.cpp +2624b4b7c56c09d1311716c28aa94424 XML_Node.cpp +ad7b0d343edb20fdca06f7a2b66e3b46 boost.m4.patch +432f995204aff834ac8ac6a5d6ff4a1f configure.patch +62ecb5a01387b9f940a5429b3df67e65 exempi-2.1.1.tar.gz +9919b1d4e37a3b48a8d9977c433e6193 exempi.cpp.patch +24f2cde07cbd4d999d9ec30625841158 utils.cpp.patch +eede9560fa348ca476dc37ae2dc93271 xmp.h.patch Added: csw/mgar/pkg/exempi/trunk/files/Makefiles.patch =================================================================== --- csw/mgar/pkg/exempi/trunk/files/Makefiles.patch (rev 0) +++ csw/mgar/pkg/exempi/trunk/files/Makefiles.patch 2010-01-21 14:06:24 UTC (rev 8111) @@ -0,0 +1,159 @@ +diff -Nru exempi-2.1.1.orig/exempi/Makefile.in exempi-2.1.1/exempi/Makefile.in +--- exempi-2.1.1.orig/exempi/Makefile.in 2009-05-16 05:25:19.000000000 +0200 ++++ exempi-2.1.1/exempi/Makefile.in 2010-01-20 21:17:55.040718572 +0100 +@@ -276,7 +276,7 @@ + exempidir = $(includedir)/@EXEMPI_INCLUDE_BASE@/exempi + exempi_HEADERS = xmp.h xmpconsts.h xmperrors.h + INCLUDES = -I$(top_srcdir)/public/include +-AM_CPPFLAGS = -Wall -D at EXEMPI_PLATFORM_DEF@=1 ++AM_CPPFLAGS = -D at EXEMPI_PLATFORM_DEF@=1 + lib_LTLIBRARIES = libexempi.la + pkgconfig_DATA = exempi- at EXEMPI_MAJOR_VERSION@.pc + libexempi_la_SOURCES = exempi.cpp +diff -Nru exempi-2.1.1.orig/exempi/tests/Makefile.in exempi-2.1.1/exempi/tests/Makefile.in +--- exempi-2.1.1.orig/exempi/tests/Makefile.in 2009-05-16 01:33:41.000000000 +0200 ++++ exempi-2.1.1/exempi/tests/Makefile.in 2010-01-21 07:54:09.406465019 +0100 +@@ -188,6 +188,8 @@ + AUTOMAKE = @AUTOMAKE@ + AWK = @AWK@ + BOOST_CPPFLAGS = @BOOST_CPPFLAGS@ ++BOOST_TEST_EXEC_MONITOR_LDFLAGS = @BOOST_TEST_EXEC_MONITOR_LDFLAGS@ ++BOOST_TEST_EXEC_MONITOR_LIBS = @BOOST_TEST_EXEC_MONITOR_LIBS@ + BOOST_UNIT_TEST_FRAMEWORK_LDFLAGS = @BOOST_UNIT_TEST_FRAMEWORK_LDFLAGS@ + BOOST_UNIT_TEST_FRAMEWORK_LIBS = @BOOST_UNIT_TEST_FRAMEWORK_LIBS@ + CC = @CC@ +@@ -323,32 +325,32 @@ + EXTRA_DIST = $(check_DATA) $(check_SCRIPTS) + CLEANFILES = test.jpg + testinit_SOURCES = testinit.cpp utils.cpp +-testinit_LDADD = ../libexempi.la @BOOST_UNIT_TEST_FRAMEWORK_LIBS@ +-testinit_LDFLAGS = -static @BOOST_UNIT_TEST_FRAMEWORK_LDFLAGS@ ++testinit_LDADD = ../libexempi.la @BOOST_UNIT_TEST_FRAMEWORK_LIBS@ @BOOST_TEST_EXEC_MONITOR_LIBS@ ++testinit_LDFLAGS = -static @BOOST_UNIT_TEST_FRAMEWORK_LDFLAGS@ @BOOST_TEST_EXEC_MONITOR_LDFLAGS@ + testexempicore_SOURCES = test-exempi-core.cpp utils.cpp +-testexempicore_LDADD = ../libexempi.la @BOOST_UNIT_TEST_FRAMEWORK_LIBS@ +-testexempicore_LDFLAGS = -static @BOOST_UNIT_TEST_FRAMEWORK_LDFLAGS@ ++testexempicore_LDADD = ../libexempi.la @BOOST_UNIT_TEST_FRAMEWORK_LIBS@ @BOOST_TEST_EXEC_MONITOR_LIBS@ ++testexempicore_LDFLAGS = -static @BOOST_UNIT_TEST_FRAMEWORK_LDFLAGS@ @BOOST_TEST_EXEC_MONITOR_LDFLAGS@ + testserialise_SOURCES = test-serialise.cpp utils.cpp +-testserialise_LDADD = ../libexempi.la @BOOST_UNIT_TEST_FRAMEWORK_LIBS@ +-testserialise_LDFLAGS = -static @BOOST_UNIT_TEST_FRAMEWORK_LDFLAGS@ ++testserialise_LDADD = ../libexempi.la @BOOST_UNIT_TEST_FRAMEWORK_LIBS@ @BOOST_TEST_EXEC_MONITOR_LIBS@ ++testserialise_LDFLAGS = -static @BOOST_UNIT_TEST_FRAMEWORK_LDFLAGS@ @BOOST_TEST_EXEC_MONITOR_LDFLAGS@ + testwritenewprop_SOURCES = test-write-new-prop.cpp utils.cpp +-testwritenewprop_LDADD = ../libexempi.la @BOOST_UNIT_TEST_FRAMEWORK_LIBS@ +-testwritenewprop_LDFLAGS = -static @BOOST_UNIT_TEST_FRAMEWORK_LDFLAGS@ ++testwritenewprop_LDADD = ../libexempi.la @BOOST_UNIT_TEST_FRAMEWORK_LIBS@ @BOOST_TEST_EXEC_MONITOR_LIBS@ ++testwritenewprop_LDFLAGS = -static @BOOST_UNIT_TEST_FRAMEWORK_LDFLAGS@ @BOOST_TEST_EXEC_MONITOR_LDFLAGS@ + testtiffleak_SOURCES = test-tiff-leak.cpp utils.cpp +-testtiffleak_LDADD = ../libexempi.la @BOOST_UNIT_TEST_FRAMEWORK_LIBS@ +-testtiffleak_LDFLAGS = -static @BOOST_UNIT_TEST_FRAMEWORK_LDFLAGS@ ++testtiffleak_LDADD = ../libexempi.la @BOOST_UNIT_TEST_FRAMEWORK_LIBS@ @BOOST_TEST_EXEC_MONITOR_LIBS@ ++testtiffleak_LDFLAGS = -static @BOOST_UNIT_TEST_FRAMEWORK_LDFLAGS@ @BOOST_TEST_EXEC_MONITOR_LDFLAGS@ + testxmpfiles_SOURCES = test-xmpfiles.cpp utils.cpp +-testxmpfiles_LDADD = ../libexempi.la @BOOST_UNIT_TEST_FRAMEWORK_LIBS@ +-testxmpfiles_LDFLAGS = -static @BOOST_UNIT_TEST_FRAMEWORK_LDFLAGS@ ++testxmpfiles_LDADD = ../libexempi.la @BOOST_UNIT_TEST_FRAMEWORK_LIBS@ @BOOST_TEST_EXEC_MONITOR_LIBS@ ++testxmpfiles_LDFLAGS = -static @BOOST_UNIT_TEST_FRAMEWORK_LDFLAGS@ @BOOST_TEST_EXEC_MONITOR_LDFLAGS@ + testxmpfileswrite_SOURCES = test-xmpfiles-write.cpp utils.cpp +-testxmpfileswrite_LDADD = ../libexempi.la @BOOST_UNIT_TEST_FRAMEWORK_LIBS@ +-testxmpfileswrite_LDFLAGS = -static @BOOST_UNIT_TEST_FRAMEWORK_LDFLAGS@ ++testxmpfileswrite_LDADD = ../libexempi.la @BOOST_UNIT_TEST_FRAMEWORK_LIBS@ @BOOST_TEST_EXEC_MONITOR_LIBS@ ++testxmpfileswrite_LDFLAGS = -static @BOOST_UNIT_TEST_FRAMEWORK_LDFLAGS@ @BOOST_TEST_EXEC_MONITOR_LDFLAGS@ + test3_SOURCES = test3.cpp utils.cpp +-test3_LDADD = ../libexempi.la @BOOST_UNIT_TEST_FRAMEWORK_LIBS@ +-test3_LDFLAGS = -static @BOOST_UNIT_TEST_FRAMEWORK_LDFLAGS@ ++test3_LDADD = ../libexempi.la @BOOST_UNIT_TEST_FRAMEWORK_LIBS@ @BOOST_TEST_EXEC_MONITOR_LIBS@ ++test3_LDFLAGS = -static @BOOST_UNIT_TEST_FRAMEWORK_LDFLAGS@ @BOOST_TEST_EXEC_MONITOR_LDFLAGS@ + testfdo18635_SOURCES = test-bgo.cpp utils.cpp +-testfdo18635_LDADD = ../libexempi.la @BOOST_UNIT_TEST_FRAMEWORK_LIBS@ +-testfdo18635_LDFLAGS = -static @BOOST_UNIT_TEST_FRAMEWORK_LDFLAGS@ ++testfdo18635_LDADD = ../libexempi.la @BOOST_UNIT_TEST_FRAMEWORK_LIBS@ @BOOST_TEST_EXEC_MONITOR_LIBS@ ++testfdo18635_LDFLAGS = -static @BOOST_UNIT_TEST_FRAMEWORK_LDFLAGS@ @BOOST_TEST_EXEC_MONITOR_LDFLAGS@ + all: all-am + + .SUFFIXES: +diff -Nru exempi-2.1.1.orig/samples/source/Makefile.in exempi-2.1.1/samples/source/Makefile.in +--- exempi-2.1.1.orig/samples/source/Makefile.in 2009-05-16 01:33:42.000000000 +0200 ++++ exempi-2.1.1/samples/source/Makefile.in 2010-01-21 04:13:57.049873855 +0100 +@@ -273,8 +273,7 @@ + top_build_prefix = @top_build_prefix@ + top_builddir = @top_builddir@ + top_srcdir = @top_srcdir@ +-AM_CXXFLAGS = -fexceptions -funsigned-char -fPIC \ +- -Wno-multichar -Wno-implicit -Wno-ctor-dtor-privacy ++AM_CXXFLAGS = -xchar=unsigned -KPIC + + AM_CPPFLAGS = -D at EXEMPI_PLATFORM_DEF@=1 -D_FILE_OFFSET_BITS=64 + XMPLIBS = $(top_builddir)/source/XMPCore/libXMPCore.la \ +diff -Nru exempi-2.1.1.orig/source/XMPCore/Makefile.in exempi-2.1.1/source/XMPCore/Makefile.in +--- exempi-2.1.1.orig/source/XMPCore/Makefile.in 2009-05-16 01:33:42.000000000 +0200 ++++ exempi-2.1.1/source/XMPCore/Makefile.in 2010-01-20 21:31:48.303689677 +0100 +@@ -252,10 +252,9 @@ + -I$(srcdir)/../common/ \ + -I$(top_srcdir)/third-party/MD5 + +-AM_CXXFLAGS = -Wno-multichar -Wno-implicit -Wno-ctor-dtor-privacy \ +- -funsigned-char -fexceptions ++AM_CXXFLAGS = -xchar=unsigned + +-AM_CPPFLAGS = -Wall \ ++AM_CPPFLAGS = \ + -D at EXEMPI_PLATFORM_DEF@=1 -DXMP_IMPL=1 -DXMP_ClientBuild=0 \ + -D_FILE_OFFSET_BITS=64 -DHAVE_EXPAT_CONFIG_H=1 -DXML_STATIC=1 + +diff -Nru exempi-2.1.1.orig/source/XMPFiles/FileHandlers/Makefile.in exempi-2.1.1/source/XMPFiles/FileHandlers/Makefile.in +--- exempi-2.1.1.orig/source/XMPFiles/FileHandlers/Makefile.in 2009-05-16 01:33:42.000000000 +0200 ++++ exempi-2.1.1/source/XMPFiles/FileHandlers/Makefile.in 2010-01-20 21:33:24.157916525 +0100 +@@ -260,6 +260,8 @@ + -I$(top_srcdir)/public/include/ -I$(top_srcdir)/build/ \ + -I$(top_srcdir)/third-party/MD5 + ++AM_CXXFLAGS = ++ + AM_CPPFLAGS = \ + -D at EXEMPI_PLATFORM_DEF@=1 -DXMP_IMPL=1 -DXMP_ClientBuild=0 \ + -D_FILE_OFFSET_BITS=64 -DHAVE_EXPAT_CONFIG_H=1 -DXML_STATIC=1 +diff -Nru exempi-2.1.1.orig/source/XMPFiles/FormatSupport/Makefile.in exempi-2.1.1/source/XMPFiles/FormatSupport/Makefile.in +--- exempi-2.1.1.orig/source/XMPFiles/FormatSupport/Makefile.in 2009-05-16 01:33:42.000000000 +0200 ++++ exempi-2.1.1/source/XMPFiles/FormatSupport/Makefile.in 2010-01-20 21:34:48.039865264 +0100 +@@ -266,7 +266,9 @@ + -I$(top_srcdir)/public/include/ -I$(top_srcdir)/build/ \ + -I$(top_srcdir)/third-party/MD5 + +-AM_CPPFLAGS = -Wno-multichar\ ++AM_CXXFLAGS = ++ ++AM_CPPFLAGS = \ + -D at EXEMPI_PLATFORM_DEF@=1 -DXMP_IMPL=1 -DXMP_ClientBuild=0 \ + -D_FILE_OFFSET_BITS=64 -DHAVE_EXPAT_CONFIG_H=1 -DXML_STATIC=1 + +diff -Nru exempi-2.1.1.orig/source/XMPFiles/Makefile.in exempi-2.1.1/source/XMPFiles/Makefile.in +--- exempi-2.1.1.orig/source/XMPFiles/Makefile.in 2009-05-16 01:33:42.000000000 +0200 ++++ exempi-2.1.1/source/XMPFiles/Makefile.in 2010-01-20 21:33:54.330126061 +0100 +@@ -261,10 +261,9 @@ + -I$(srcdir)/../common/ \ + -I$(top_srcdir)/third-party/MD5 + +-AM_CXXFLAGS = -Wno-multichar -Wno-implicit -Wno-ctor-dtor-privacy \ +- -funsigned-char -fexceptions -fno-strict-aliasing ++AM_CXXFLAGS = -xchar=unsigned + +-AM_CPPFLAGS = -Wall\ ++AM_CPPFLAGS = \ + -D at EXEMPI_PLATFORM_DEF@=1 -DXMP_IMPL=1 -DXMP_ClientBuild=0 \ + -D_FILE_OFFSET_BITS=64 -DHAVE_EXPAT_CONFIG_H=1 -DXML_STATIC=1 \ + -DDISABLE_QUICKTIME +diff -Nru exempi-2.1.1.orig/source/common/Makefile.in exempi-2.1.1/source/common/Makefile.in +--- exempi-2.1.1.orig/source/common/Makefile.in 2009-05-16 01:33:42.000000000 +0200 ++++ exempi-2.1.1/source/common/Makefile.in 2010-01-20 21:28:47.770546778 +0100 +@@ -246,8 +246,7 @@ + INCLUDES = -I$(top_srcdir)/public/include \ + -I$(top_srcdir)/public/include/client-glue + +-AM_CXXFLAGS = -Wno-multichar -Wno-implicit -Wno-ctor-dtor-privacy \ +- -funsigned-char -fexceptions ++AM_CXXFLAGS = -xchar=unsigned + + AM_CPPFLAGS = \ + -D at EXEMPI_PLATFORM_DEF@=1 -DXMP_IMPL=1 -DXMP_ClientBuild=0 \ Added: csw/mgar/pkg/exempi/trunk/files/RIFF_Support.cpp =================================================================== --- csw/mgar/pkg/exempi/trunk/files/RIFF_Support.cpp (rev 0) +++ csw/mgar/pkg/exempi/trunk/files/RIFF_Support.cpp 2010-01-21 14:06:24 UTC (rev 8111) @@ -0,0 +1,21 @@ +diff -Nru exempi-2.1.1.orig/source/XMPFiles/FormatSupport/RIFF_Support.cpp exempi-2.1.1/source/XMPFiles/FormatSupport/RIFF_Support.cpp +--- exempi-2.1.1.orig/source/XMPFiles/FormatSupport/RIFF_Support.cpp 2009-02-17 05:10:42.000000000 +0100 ++++ exempi-2.1.1/source/XMPFiles/FormatSupport/RIFF_Support.cpp 2010-01-20 21:35:32.833002097 +0100 +@@ -550,7 +550,7 @@ + + // *** Could be moved to a separate header + +-#pragma pack(push,1) ++//#pragma pack(push,1) + + // [TODO] Can we switch to using just a full path here? + struct FSSpecLegacy +@@ -603,7 +603,7 @@ + FSSpecLegacy fullPath; // Full path of the project file + }; + +-#pragma pack(pop) ++//#pragma pack(pop) + + // ------------------------------------------------------------------------------------------------- + Added: csw/mgar/pkg/exempi/trunk/files/XML_Node.cpp =================================================================== --- csw/mgar/pkg/exempi/trunk/files/XML_Node.cpp (rev 0) +++ csw/mgar/pkg/exempi/trunk/files/XML_Node.cpp 2010-01-21 14:06:24 UTC (rev 8111) @@ -0,0 +1,11 @@ +diff -Nru exempi-2.1.1.orig/source/common/XML_Node.cpp exempi-2.1.1/source/common/XML_Node.cpp +--- exempi-2.1.1.orig/source/common/XML_Node.cpp 2009-02-17 05:10:42.000000000 +0100 ++++ exempi-2.1.1/source/common/XML_Node.cpp 2010-01-20 21:30:44.823511273 +0100 +@@ -9,6 +9,7 @@ + #include "XMP_Environment.h" // ! Must be the first #include! + #include "XMLParserAdapter.hpp" + ++#include + #include + #include + #include Added: csw/mgar/pkg/exempi/trunk/files/boost.m4.patch =================================================================== --- csw/mgar/pkg/exempi/trunk/files/boost.m4.patch (rev 0) +++ csw/mgar/pkg/exempi/trunk/files/boost.m4.patch 2010-01-21 14:06:24 UTC (rev 8111) @@ -0,0 +1,12 @@ +--- exempi-2.1.1.orig/m4/boost.m4 2009-02-17 05:10:40.000000000 +0100 ++++ exempi-2.1.1/m4/boost.m4 2010-01-21 07:23:38.252002318 +0100 +@@ -489,6 +489,9 @@ + BOOST_FIND_LIB([unit_test_framework], [$1], + [boost/test/unit_test.hpp], [BOOST_CHECK(2==2);], + [using boost::unit_test::test_suite; test_suite* init_unit_test_suite( int argc, char ** argv ) { return NULL;}]) ++BOOST_FIND_LIB([test_exec_monitor], [$1], ++ [boost/test/test_tools.hpp], [BOOST_CHECK(1==1);], ++ [int test_main( int argc, char ** argv ) {return 0;}]) + ])# BOOST_TEST + + Added: csw/mgar/pkg/exempi/trunk/files/configure.patch =================================================================== --- csw/mgar/pkg/exempi/trunk/files/configure.patch (rev 0) +++ csw/mgar/pkg/exempi/trunk/files/configure.patch 2010-01-21 14:06:24 UTC (rev 8111) @@ -0,0 +1,11 @@ +diff -Nru exempi-2.1.1.orig/configure exempi-2.1.1/configure +--- exempi-2.1.1.orig/configure 2009-05-16 01:32:11.000000000 +0200 ++++ exempi-2.1.1/configure 2010-01-20 21:14:55.409183278 +0100 +@@ -16528,6 +16528,7 @@ + "defined _MSC_VER && _MSC_VER == 1300 @ vc7" \ + "defined __GNUC__ && __GNUC__ == 4 && __GNUC_MINOR__ == 3 && !defined __ICC @ gcc43" \ + "defined __GNUC__ && __GNUC__ == 2 && __GNUC_MINOR__ == 95 && !defined __ICC @ gcc295" \ ++ "defined __SUNPRO_CC @ sun" \ + "defined __MWERKS__ && __MWERKS__ <= 0x32FF @ cw9" \ + "defined _MSC_VER && _MSC_VER < 1300 && !defined UNDER_CE @ vc6" \ + "defined _MSC_VER && _MSC_VER < 1300 && defined UNDER_CE @ evc4" \ Added: csw/mgar/pkg/exempi/trunk/files/exempi.cpp.patch =================================================================== --- csw/mgar/pkg/exempi/trunk/files/exempi.cpp.patch (rev 0) +++ csw/mgar/pkg/exempi/trunk/files/exempi.cpp.patch 2010-01-21 14:06:24 UTC (rev 8111) @@ -0,0 +1,21 @@ +diff -Nru exempi-2.1.1.orig/exempi/exempi.cpp exempi-2.1.1/exempi/exempi.cpp +--- exempi-2.1.1.orig/exempi/exempi.cpp 2009-05-16 05:25:05.000000000 +0200 ++++ exempi-2.1.1/exempi/exempi.cpp 2010-01-21 04:42:31.483045937 +0100 +@@ -587,7 +587,7 @@ + SXMPMeta *txmp = (SXMPMeta *)xmp; + XMP_OptionBits optionBits; + // the long converstion is needed until XMPCore is fixed it use proper types. +- ret = txmp->GetProperty_Int(schema, name, property, &optionBits); ++ ret = txmp->GetProperty_Int(schema, name, (long *) property, &optionBits); + if(propsBits) { + *propsBits = optionBits; + } +@@ -988,7 +988,7 @@ + return titer->Next(reinterpret_cast(schema), + reinterpret_cast(propName), + reinterpret_cast(propValue), +- options); ++ (unsigned long *)options); + } + + bool xmp_iterator_skip(XmpIteratorPtr iter, XmpIterSkipOptions options) Added: csw/mgar/pkg/exempi/trunk/files/utils.cpp.patch =================================================================== --- csw/mgar/pkg/exempi/trunk/files/utils.cpp.patch (rev 0) +++ csw/mgar/pkg/exempi/trunk/files/utils.cpp.patch 2010-01-21 14:06:24 UTC (rev 8111) @@ -0,0 +1,12 @@ +diff -Nru exempi-2.1.1.orig/exempi/tests/utils.cpp exempi-2.1.1/exempi/tests/utils.cpp +--- exempi-2.1.1.orig/exempi/tests/utils.cpp 2009-02-17 05:10:40.000000000 +0100 ++++ exempi-2.1.1/exempi/tests/utils.cpp 2010-01-20 21:24:39.303070019 +0100 +@@ -34,6 +34,8 @@ + * OF THE POSSIBILITY OF SUCH DAMAGE. + */ + ++#include ++#include + #include + + #include Added: csw/mgar/pkg/exempi/trunk/files/xmp.h.patch =================================================================== --- csw/mgar/pkg/exempi/trunk/files/xmp.h.patch (rev 0) +++ csw/mgar/pkg/exempi/trunk/files/xmp.h.patch 2010-01-21 14:06:24 UTC (rev 8111) @@ -0,0 +1,15 @@ +diff -Nru exempi-2.1.1.orig/exempi/xmp.h exempi-2.1.1/exempi/xmp.h +--- exempi-2.1.1.orig/exempi/xmp.h 2009-02-17 05:10:40.000000000 +0100 ++++ exempi-2.1.1/exempi/xmp.h 2010-01-21 04:16:45.610494834 +0100 +@@ -43,8 +43,10 @@ + /* stdbool choke on Sun (bug# 14612) */ + #if !defined(__sun) + #include +-#endif + #include ++#else ++#include ++#endif + + #include + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Thu Jan 21 15:15:25 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Thu, 21 Jan 2010 14:15:25 +0000 Subject: [csw-devel] SF.net SVN: gar:[8112] csw/mgar/gar/v2/bin Message-ID: Revision: 8112 http://gar.svn.sourceforge.net/gar/?rev=8112&view=rev Author: wahwah Date: 2010-01-21 14:15:25 +0000 (Thu, 21 Jan 2010) Log Message: ----------- mGAR v2: checkpkg, don't print long output by default, display a hint how to run in the debug mode Modified Paths: -------------- csw/mgar/gar/v2/bin/checkpkg csw/mgar/gar/v2/bin/checkpkg.d/checkpkg-libs.py Modified: csw/mgar/gar/v2/bin/checkpkg =================================================================== --- csw/mgar/gar/v2/bin/checkpkg 2010-01-21 14:06:24 UTC (rev 8111) +++ csw/mgar/gar/v2/bin/checkpkg 2010-01-21 14:15:25 UTC (rev 8112) @@ -42,6 +42,9 @@ COLOR_RESET="" fi +readonly selfpath="$0" +readonly selfargs="$*" + # always print out a warning message. (to stderr) # exit script, if quit_on_warn set @@ -79,6 +82,8 @@ print ERROR: $* >/dev/fd/2 cleanup cleanupset + print "To run checkpkg in the debug mode, add the '-d' flag:" + print "${selfpath} -d ${selfargs}" exit 1 } @@ -203,8 +208,7 @@ case $software in *[A-Z]*) - echo ERROR: $software must be all lowercase - exit 1 + errmsg "$software must be all lowercase" ;; esac @@ -273,8 +277,7 @@ case $version in *-*) - print ERROR: VERSION field not allowed to have '"-"' in it - exit 1 + errmsg "VERSION field not allowed to have \"-\" in it" ;; *,REV=20[01][0-9].[0-9][0-9].[0-9][0-9]*) : @@ -494,8 +497,7 @@ # sanity check against "depends on self" nawk '$2=="'$pkgname'" {exit 1}' $EXTRACTDIR/$pkgname/install/depend if [[ $? -ne 0 ]] ; then - print ERROR: $pkgname references self in depend file - exit 1 + errmsg "$pkgname references self in depend file" fi # Verify that there are no multiple depends Modified: csw/mgar/gar/v2/bin/checkpkg.d/checkpkg-libs.py =================================================================== --- csw/mgar/gar/v2/bin/checkpkg.d/checkpkg-libs.py 2010-01-21 14:06:24 UTC (rev 8111) +++ csw/mgar/gar/v2/bin/checkpkg.d/checkpkg-libs.py 2010-01-21 14:15:25 UTC (rev 8112) @@ -121,7 +121,7 @@ # same bit of code with do checking and reporting. # # TODO: Rewrite this using cheetah templates - if needed_sonames: + if options.debug and needed_sonames: print "Analysis of sonames needed by the package set:" binaries_with_missing_sonames = set([]) for soname in needed_sonames: This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Thu Jan 21 15:35:36 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Thu, 21 Jan 2010 14:35:36 +0000 Subject: [csw-devel] SF.net SVN: gar:[8113] csw/mgar/gar/v2/bin/checkpkg Message-ID: Revision: 8113 http://gar.svn.sourceforge.net/gar/?rev=8113&view=rev Author: wahwah Date: 2010-01-21 14:35:32 +0000 (Thu, 21 Jan 2010) Log Message: ----------- mGAR v2: checkpkg, don't output log markers unless in the debug mode. Modified Paths: -------------- csw/mgar/gar/v2/bin/checkpkg Modified: csw/mgar/gar/v2/bin/checkpkg =================================================================== --- csw/mgar/gar/v2/bin/checkpkg 2010-01-21 14:15:25 UTC (rev 8112) +++ csw/mgar/gar/v2/bin/checkpkg 2010-01-21 14:35:32 UTC (rev 8113) @@ -599,11 +599,11 @@ echo for log_file in ${log_files}; do if [[ -s "${log_file}" ]]; then - echo "LOG START: ${log_file}" - echo + debugmsg "LOG START: ${log_file}" + debugmsg cat "${log_file}" - echo - echo "LOG END: ${log_file}" + debugmsg + debugmsg "LOG END: ${log_file}" fi done echo @@ -611,7 +611,7 @@ if [[ ${test_suite_ok} -ne 1 ]]; then errmsg "One or more modular tests have failed." else - print "All tests were successful." + print "All modular tests were successful." fi print "" This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From hson at users.sourceforge.net Thu Jan 21 16:37:59 2010 From: hson at users.sourceforge.net (hson at users.sourceforge.net) Date: Thu, 21 Jan 2010 15:37:59 +0000 Subject: [csw-devel] SF.net SVN: gar:[8114] csw/mgar/pkg/exempi/trunk/Makefile Message-ID: Revision: 8114 http://gar.svn.sourceforge.net/gar/?rev=8114&view=rev Author: hson Date: 2010-01-21 15:37:58 +0000 (Thu, 21 Jan 2010) Log Message: ----------- exempi: Prepare Makefile for package release Modified Paths: -------------- csw/mgar/pkg/exempi/trunk/Makefile Modified: csw/mgar/pkg/exempi/trunk/Makefile =================================================================== --- csw/mgar/pkg/exempi/trunk/Makefile 2010-01-21 14:35:32 UTC (rev 8113) +++ csw/mgar/pkg/exempi/trunk/Makefile 2010-01-21 15:37:58 UTC (rev 8114) @@ -19,9 +19,20 @@ UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz -REQUIRED_PKGS += CSWexpat CSWstlport CSWzlib -PREREQUISITE_PKGS += CSWiconv CSWboostrt CSWboostdevel +PACKAGES = CSWexempi CSWexempidevel +CATALOGNAME_CSWexempi = exempi +CATALOGNAME_CSWexempidevel = exempi_devel +SPKG_DESC_CSWexempi = Exempi is an implementation of XMP +SPKG_DESC_CSWexempidevel = Exempi is an implementation of XMP - developer package +REQUIRED_PKGS_CSWexempi += CSWexpat CSWstlport CSWzlib CSWiconv +REQUIRED_PKGS_CSWexempidevel += CSWexempi + +PREREQUISITE_PKGS += $(REQUIRED_PKGS_CSWexempi) +PREREQUISITE_PKGS += CSWboostrt CSWboostdevel + +PKGFILES_CSWexempidevel = $(PKGFILES_DEVEL) + PATCHFILES += Makefiles.patch PATCHFILES += RIFF_Support.cpp PATCHFILES += XML_Node.cpp @@ -31,7 +42,9 @@ PATCHFILES += xmp.h.patch PATCHFILES += boost.m4.patch -EXTRA_CXXFLAGS = -D__EXTENSIONS__ -library=stlport4 -DHAVE_NATIVE_TLS=0 +EXTRA_CXXFLAGS = -D__EXTENSIONS__ -library=stlport4 +# Ugly, but need to owerwrite this since autoconf system doesn't work +EXTRA_CXXFLAGS += -DHAVE_NATIVE_TLS=0 EXTRA_LINKER_FLAGS = -liconv CONFIGURE_ARGS = $(DIRPATHS) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Fri Jan 22 11:08:09 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Fri, 22 Jan 2010 10:08:09 +0000 Subject: [csw-devel] SF.net SVN: gar:[8115] csw/mgar/gar/v2/bin/checkpkg.d/checkpkg_test.py Message-ID: Revision: 8115 http://gar.svn.sourceforge.net/gar/?rev=8115&view=rev Author: wahwah Date: 2010-01-22 10:08:08 +0000 (Fri, 22 Jan 2010) Log Message: ----------- mGAR v2: checkpkg, update the expected test result, SUNWcslx should not be reported as missing dependency. Modified Paths: -------------- csw/mgar/gar/v2/bin/checkpkg.d/checkpkg_test.py Modified: csw/mgar/gar/v2/bin/checkpkg.d/checkpkg_test.py =================================================================== --- csw/mgar/gar/v2/bin/checkpkg.d/checkpkg_test.py 2010-01-21 15:37:58 UTC (rev 8114) +++ csw/mgar/gar/v2/bin/checkpkg.d/checkpkg_test.py 2010-01-22 10:08:08 UTC (rev 8115) @@ -202,7 +202,7 @@ self.assertEquals(set([]), self.orphan_sonames) def testMissingDeps(self): - expected = set([u'SUNWcslx']) + expected = set([]) self.assertEquals(expected, self.missing_deps) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From trygvis at users.sourceforge.net Fri Jan 22 21:13:17 2010 From: trygvis at users.sourceforge.net (trygvis at users.sourceforge.net) Date: Fri, 22 Jan 2010 20:13:17 +0000 Subject: [csw-devel] SF.net SVN: gar:[8116] csw/mgar/pkg Message-ID: Revision: 8116 http://gar.svn.sourceforge.net/gar/?rev=8116&view=rev Author: trygvis Date: 2010-01-22 20:13:17 +0000 (Fri, 22 Jan 2010) Log Message: ----------- ngspice: Initial commit, seems to work. Added Paths: ----------- csw/mgar/pkg/ngspice/ csw/mgar/pkg/ngspice/branches/ csw/mgar/pkg/ngspice/tags/ csw/mgar/pkg/ngspice/trunk/ csw/mgar/pkg/ngspice/trunk/Makefile csw/mgar/pkg/ngspice/trunk/checksums csw/mgar/pkg/ngspice/trunk/files/ csw/mgar/pkg/ngspice/trunk/files/fix-missing-include-in-src-spicelib-parser-inpptree.c.patch Property changes on: csw/mgar/pkg/ngspice/trunk ___________________________________________________________________ Added: svn:ignore + cookies download work Added: svn:externals + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 Added: csw/mgar/pkg/ngspice/trunk/Makefile =================================================================== --- csw/mgar/pkg/ngspice/trunk/Makefile (rev 0) +++ csw/mgar/pkg/ngspice/trunk/Makefile 2010-01-22 20:13:17 UTC (rev 8116) @@ -0,0 +1,19 @@ +GARNAME = ngspice +GARVERSION = 20 +CATEGORIES = apps + + +DESCRIPTION = Brief description +define BLURB + Long description +endef + +MASTER_SITES = http://downloads.sourceforge.net/project/ngspice/ng-spice-rework/$(GARVERSION)/ +DISTFILES = ng-spice-rework-$(GARVERSION).tar.gz +PATCHFILES = fix-missing-include-in-src-spicelib-parser-inpptree.c.patch + +CONFIGURE_ARGS = $(DIRPATHS) + +TEST_SCRIPTS = + +include gar/category.mk Added: csw/mgar/pkg/ngspice/trunk/checksums =================================================================== --- csw/mgar/pkg/ngspice/trunk/checksums (rev 0) +++ csw/mgar/pkg/ngspice/trunk/checksums 2010-01-22 20:13:17 UTC (rev 8116) @@ -0,0 +1,2 @@ +fa207497c3b314dd79fc2cdc366a2b40 fix-missing-include-in-src-spicelib-parser-inpptree.c.patch +81bc667a4190ef31081a6957d3c7f7b5 ng-spice-rework-20.tar.gz Added: csw/mgar/pkg/ngspice/trunk/files/fix-missing-include-in-src-spicelib-parser-inpptree.c.patch =================================================================== --- csw/mgar/pkg/ngspice/trunk/files/fix-missing-include-in-src-spicelib-parser-inpptree.c.patch (rev 0) +++ csw/mgar/pkg/ngspice/trunk/files/fix-missing-include-in-src-spicelib-parser-inpptree.c.patch 2010-01-22 20:13:17 UTC (rev 8116) @@ -0,0 +1,12 @@ +diff -u -r ngspice-20.orig/src/spicelib/parser/inpptree.c ngspice-20/src/spicelib/parser/inpptree.c +--- ngspice-20.orig/src/spicelib/parser/inpptree.c 2010-01-19 01:07:08.590249587 +0100 ++++ ngspice-20/src/spicelib/parser/inpptree.c 2010-01-19 01:07:57.394826730 +0100 +@@ -10,6 +10,8 @@ + #include "inpptree.h" + #include "inp.h" + ++#include ++ + static INPparseNode *mkcon(double value); + static INPparseNode *mkb(int type, INPparseNode * left, + INPparseNode * right); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From chninkel at users.sourceforge.net Fri Jan 22 22:14:47 2010 From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net) Date: Fri, 22 Jan 2010 21:14:47 +0000 Subject: [csw-devel] SF.net SVN: gar:[8117] csw/mgar/pkg/bash/trunk Message-ID: Revision: 8117 http://gar.svn.sourceforge.net/gar/?rev=8117&view=rev Author: chninkel Date: 2010-01-22 21:14:47 +0000 (Fri, 22 Jan 2010) Log Message: ----------- bash: added patches 001 and 002 Modified Paths: -------------- csw/mgar/pkg/bash/trunk/Makefile csw/mgar/pkg/bash/trunk/checksums csw/mgar/pkg/bash/trunk/files/changelog.CSW Removed Paths: ------------- csw/mgar/pkg/bash/trunk/files/vsnprintf.patch Modified: csw/mgar/pkg/bash/trunk/Makefile =================================================================== --- csw/mgar/pkg/bash/trunk/Makefile 2010-01-22 20:13:17 UTC (rev 8116) +++ csw/mgar/pkg/bash/trunk/Makefile 2010-01-22 21:14:47 UTC (rev 8117) @@ -13,7 +13,7 @@ ###### Package information ####### GARNAME = bash -GARVERSION = 4.1.0 +GARVERSION = 4.1.2 CATEGORIES = devel DESCRIPTION = A sh-compatible command language interpreter @@ -67,8 +67,6 @@ # opencsw bash use /etc/bash.bashrc and /etc/bash.bash_logout files PATCHFILES += use_system_bashrc_and_logout.patch -# Temporary fix for vsnprintf definition -PATCHFILES += vsnprintf.patch ##### Build and installation information ##### Modified: csw/mgar/pkg/bash/trunk/checksums =================================================================== --- csw/mgar/pkg/bash/trunk/checksums 2010-01-22 20:13:17 UTC (rev 8116) +++ csw/mgar/pkg/bash/trunk/checksums 2010-01-22 21:14:47 UTC (rev 8117) @@ -1,6 +1,7 @@ f93b41b44ce6b023df65b72f00386ac5 CSWbash.prototype 9800d8724815fd84994d9be65ab5e7b8 bash-4.1.tar.gz -c2f23fbca9f119574b933d4f335a838d changelog.CSW +582dea5671b557f783e18629c2f77b68 bash41-001 +118d465095d4a4706eb1d34696a2666a bash41-002 +0cdd3f1f6e96a3307d83317231d9b170 changelog.CSW 60956e6be20f69dafbb06fcc83bab88e shells 29607316cff22f7427322d8f190cbadf use_system_bashrc_and_logout.patch -44859f2b196b79f037134d32c4ee79ea vsnprintf.patch Modified: csw/mgar/pkg/bash/trunk/files/changelog.CSW =================================================================== --- csw/mgar/pkg/bash/trunk/files/changelog.CSW 2010-01-22 20:13:17 UTC (rev 8116) +++ csw/mgar/pkg/bash/trunk/files/changelog.CSW 2010-01-22 21:14:47 UTC (rev 8117) @@ -1,3 +1,10 @@ +bash (4.1.02,REV=2010.01.07) unstable + + * Added bash patches bash41-001 and bash41-002. + * Removed patch vsnprintf.patch applied upstream. + + -- Yann Rouillard Fri, 22 Jan 2010 22:04:28 +0100 + bash (4.1,REV=2010.01.07) unstable * New upstream release. Deleted: csw/mgar/pkg/bash/trunk/files/vsnprintf.patch =================================================================== --- csw/mgar/pkg/bash/trunk/files/vsnprintf.patch 2010-01-22 20:13:17 UTC (rev 8116) +++ csw/mgar/pkg/bash/trunk/files/vsnprintf.patch 2010-01-22 21:14:47 UTC (rev 8117) @@ -1,15 +0,0 @@ -*** ../bash-4.1/builtins/printf.def 2009-11-20 15:31:23.000000000 -0500 ---- builtins/printf.def 2010-01-07 08:50:06.000000000 -0500 -*************** -*** 173,177 **** - - #if !HAVE_VSNPRINTF -! extern int vsnprintf __P((char *, size_t, const char *, ...)) __attribute__((__format__ (printf, 3, 4))); - #endif - ---- 173,177 ---- - - #if !HAVE_VSNPRINTF -! extern int vsnprintf __P((char *, size_t, const char *, va_list)) __attribute__((__format__ (printf, 3, 0))); - #endif - This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From chninkel at users.sourceforge.net Sat Jan 23 01:00:25 2010 From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net) Date: Sat, 23 Jan 2010 00:00:25 +0000 Subject: [csw-devel] SF.net SVN: gar:[8118] csw/mgar/pkg/bash/trunk Message-ID: Revision: 8118 http://gar.svn.sourceforge.net/gar/?rev=8118&view=rev Author: chninkel Date: 2010-01-23 00:00:25 +0000 (Sat, 23 Jan 2010) Log Message: ----------- bash: updated changelog.CSW Modified Paths: -------------- csw/mgar/pkg/bash/trunk/checksums csw/mgar/pkg/bash/trunk/files/changelog.CSW Modified: csw/mgar/pkg/bash/trunk/checksums =================================================================== --- csw/mgar/pkg/bash/trunk/checksums 2010-01-22 21:14:47 UTC (rev 8117) +++ csw/mgar/pkg/bash/trunk/checksums 2010-01-23 00:00:25 UTC (rev 8118) @@ -2,6 +2,6 @@ 9800d8724815fd84994d9be65ab5e7b8 bash-4.1.tar.gz 582dea5671b557f783e18629c2f77b68 bash41-001 118d465095d4a4706eb1d34696a2666a bash41-002 -0cdd3f1f6e96a3307d83317231d9b170 changelog.CSW +a3e2dc4ade9f1b1dafc8185e7f1c737e changelog.CSW 60956e6be20f69dafbb06fcc83bab88e shells 29607316cff22f7427322d8f190cbadf use_system_bashrc_and_logout.patch Modified: csw/mgar/pkg/bash/trunk/files/changelog.CSW =================================================================== --- csw/mgar/pkg/bash/trunk/files/changelog.CSW 2010-01-22 21:14:47 UTC (rev 8117) +++ csw/mgar/pkg/bash/trunk/files/changelog.CSW 2010-01-23 00:00:25 UTC (rev 8118) @@ -1,4 +1,4 @@ -bash (4.1.02,REV=2010.01.07) unstable +bash (4.1.02,REV=2010.01.23) unstable * Added bash patches bash41-001 and bash41-002. * Removed patch vsnprintf.patch applied upstream. This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Sat Jan 23 10:58:11 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Sat, 23 Jan 2010 09:58:11 +0000 Subject: [csw-devel] SF.net SVN: gar:[8119] csw/mgar/pkg/xerces-c/trunk/Makefile Message-ID: Revision: 8119 http://gar.svn.sourceforge.net/gar/?rev=8119&view=rev Author: dmichelsen Date: 2010-01-23 09:58:11 +0000 (Sat, 23 Jan 2010) Log Message: ----------- xerces-c: Fix test target Modified Paths: -------------- csw/mgar/pkg/xerces-c/trunk/Makefile Modified: csw/mgar/pkg/xerces-c/trunk/Makefile =================================================================== --- csw/mgar/pkg/xerces-c/trunk/Makefile 2010-01-23 00:00:25 UTC (rev 8118) +++ csw/mgar/pkg/xerces-c/trunk/Makefile 2010-01-23 09:58:11 UTC (rev 8119) @@ -26,4 +26,6 @@ BUILD64 = 1 CONFIGURE_ARGS = $(DIRPATHS) +TEST_TARGET = check + include gar/category.mk This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Sat Jan 23 14:43:57 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Sat, 23 Jan 2010 13:43:57 +0000 Subject: [csw-devel] SF.net SVN: gar:[8120] csw/mgar/pkg/tcpwrappers/trunk/Makefile Message-ID: Revision: 8120 http://gar.svn.sourceforge.net/gar/?rev=8120&view=rev Author: dmichelsen Date: 2010-01-23 13:43:56 +0000 (Sat, 23 Jan 2010) Log Message: ----------- tcpwrap: Add file migration from /opt/csw/etc to /etc/opt/csw Modified Paths: -------------- csw/mgar/pkg/tcpwrappers/trunk/Makefile Modified: csw/mgar/pkg/tcpwrappers/trunk/Makefile =================================================================== --- csw/mgar/pkg/tcpwrappers/trunk/Makefile 2010-01-23 09:58:11 UTC (rev 8119) +++ csw/mgar/pkg/tcpwrappers/trunk/Makefile 2010-01-23 13:43:56 UTC (rev 8120) @@ -71,6 +71,8 @@ MERGE_SCRIPTS_isa-amd64-extended-on = copy-relocated-only MERGE_DIRS_isa-amd64-extended-on = $(libdir) +MIGRATE_FILES = hosts.allow hosts.deny + include gar/category.mk build-custom: This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bensons at users.sourceforge.net Sat Jan 23 18:03:21 2010 From: bensons at users.sourceforge.net (bensons at users.sourceforge.net) Date: Sat, 23 Jan 2010 17:03:21 +0000 Subject: [csw-devel] SF.net SVN: gar:[8121] csw/mgar/pkg/xpdf/trunk Message-ID: Revision: 8121 http://gar.svn.sourceforge.net/gar/?rev=8121&view=rev Author: bensons Date: 2010-01-23 17:03:21 +0000 (Sat, 23 Jan 2010) Log Message: ----------- bumped to xpdf-3.02pl4 Modified Paths: -------------- csw/mgar/pkg/xpdf/trunk/Makefile csw/mgar/pkg/xpdf/trunk/checksums Added Paths: ----------- csw/mgar/pkg/xpdf/trunk/files/xpdf-3.02pl4.patch Modified: csw/mgar/pkg/xpdf/trunk/Makefile =================================================================== --- csw/mgar/pkg/xpdf/trunk/Makefile 2010-01-23 13:43:56 UTC (rev 8120) +++ csw/mgar/pkg/xpdf/trunk/Makefile 2010-01-23 17:03:21 UTC (rev 8121) @@ -1,7 +1,7 @@ GARNAME = xpdf GARVERSION = 3.02 CATEGORIES = utils -RELEASE = rev=p3 +RELEASE = rev=p4 DESCRIPTION = Open source viewer for Portable Document Format (PDF) files define BLURB @@ -34,6 +34,7 @@ PATCHFILES = xpdf-3.02pl1.patch PATCHFILES += xpdf-3.02pl2.patch PATCHFILES += xpdf-3.02pl3.patch +PATCHFILES += xpdf-3.02pl4.patch PATCHFILES += patch-GString.cc PATCHFILES += patch-XPDFCore.cc Modified: csw/mgar/pkg/xpdf/trunk/checksums =================================================================== --- csw/mgar/pkg/xpdf/trunk/checksums 2010-01-23 13:43:56 UTC (rev 8120) +++ csw/mgar/pkg/xpdf/trunk/checksums 2010-01-23 17:03:21 UTC (rev 8121) @@ -1,6 +1,7 @@ -28cd772ed42159f2dbbe3a0e8e9e4dfa download/patch-GString.cc -4c23bc375fbb6096fb8b2266d0ef527d download/patch-XPDFCore.cc -599dc4cc65a07ee868cf92a667a913d2 download/xpdf-3.02.tar.gz -877118786dfe27d1b7aa5a6759cc6e45 download/xpdf-3.02pl1.patch -3a5cb165ae66781e0b21e6219ae06795 download/xpdf-3.02pl2.patch -581963ede0fb5715e1a69f01b5b8ce63 download/xpdf-3.02pl3.patch +28cd772ed42159f2dbbe3a0e8e9e4dfa patch-GString.cc +4c23bc375fbb6096fb8b2266d0ef527d patch-XPDFCore.cc +599dc4cc65a07ee868cf92a667a913d2 xpdf-3.02.tar.gz +877118786dfe27d1b7aa5a6759cc6e45 xpdf-3.02pl1.patch +3a5cb165ae66781e0b21e6219ae06795 xpdf-3.02pl2.patch +581963ede0fb5715e1a69f01b5b8ce63 xpdf-3.02pl3.patch +70b752716798dd341a4bf890df5f6fdc xpdf-3.02pl4.patch Added: csw/mgar/pkg/xpdf/trunk/files/xpdf-3.02pl4.patch =================================================================== --- csw/mgar/pkg/xpdf/trunk/files/xpdf-3.02pl4.patch (rev 0) +++ csw/mgar/pkg/xpdf/trunk/files/xpdf-3.02pl4.patch 2010-01-23 17:03:21 UTC (rev 8121) @@ -0,0 +1,282 @@ +*** xpdf-3.02.orig/xpdf/Stream.cc Fri Jul 24 14:30:46 2009 +--- xpdf-3.02/xpdf/Stream.cc Mon Oct 5 11:07:49 2009 +*************** +*** 323,328 **** +--- 323,332 ---- + } else { + imgLineSize = nVals; + } ++ if (width > INT_MAX / nComps) { ++ // force a call to gmallocn(-1,...), which will throw an exception ++ imgLineSize = -1; ++ } + imgLine = (Guchar *)gmallocn(imgLineSize, sizeof(Guchar)); + imgIdx = nVals; + } +*** xpdf-3.02.orig/xpdf/PSOutputDev.cc Tue Feb 27 14:05:52 2007 +--- xpdf-3.02/xpdf/PSOutputDev.cc Fri Oct 2 12:38:58 2009 +*************** +*** 4301,4307 **** + width, -height, height); + + // allocate a line buffer +! lineBuf = (Guchar *)gmalloc(4 * width); + + // set up to process the data stream + imgStr = new ImageStream(str, width, colorMap->getNumPixelComps(), +--- 4301,4307 ---- + width, -height, height); + + // allocate a line buffer +! lineBuf = (Guchar *)gmallocn(width, 4); + + // set up to process the data stream + imgStr = new ImageStream(str, width, colorMap->getNumPixelComps(), +diff -r -c xpdf-3.02.orig/splash/Splash.cc xpdf-3.02/splash/Splash.cc +*** xpdf-3.02.orig/splash/Splash.cc Tue Feb 27 14:05:52 2007 +--- xpdf-3.02/splash/Splash.cc Fri Aug 14 14:05:08 2009 +*************** +*** 12,17 **** +--- 12,18 ---- + + #include + #include ++ #include + #include "gmem.h" + #include "SplashErrorCodes.h" + #include "SplashMath.h" +*************** +*** 1912,1918 **** + xq = w % scaledWidth; + + // allocate pixel buffer +! pixBuf = (SplashColorPtr)gmalloc((yp + 1) * w); + + // initialize the pixel pipe + pipeInit(&pipe, 0, 0, state->fillPattern, NULL, state->fillAlpha, +--- 1913,1922 ---- + xq = w % scaledWidth; + + // allocate pixel buffer +! if (yp < 0 || yp > INT_MAX - 1) { +! return splashErrBadArg; +! } +! pixBuf = (SplashColorPtr)gmallocn(yp + 1, w); + + // initialize the pixel pipe + pipeInit(&pipe, 0, 0, state->fillPattern, NULL, state->fillAlpha, +*************** +*** 2208,2216 **** + xq = w % scaledWidth; + + // allocate pixel buffers +! colorBuf = (SplashColorPtr)gmalloc((yp + 1) * w * nComps); + if (srcAlpha) { +! alphaBuf = (Guchar *)gmalloc((yp + 1) * w); + } else { + alphaBuf = NULL; + } +--- 2212,2223 ---- + xq = w % scaledWidth; + + // allocate pixel buffers +! if (yp < 0 || yp > INT_MAX - 1 || w > INT_MAX / nComps) { +! return splashErrBadArg; +! } +! colorBuf = (SplashColorPtr)gmallocn(yp + 1, w * nComps); + if (srcAlpha) { +! alphaBuf = (Guchar *)gmallocn(yp + 1, w); + } else { + alphaBuf = NULL; + } +diff -r -c xpdf-3.02.orig/splash/SplashErrorCodes.h xpdf-3.02/splash/SplashErrorCodes.h +*** xpdf-3.02.orig/splash/SplashErrorCodes.h Tue Feb 27 14:05:52 2007 +--- xpdf-3.02/splash/SplashErrorCodes.h Fri Aug 14 14:03:46 2009 +*************** +*** 29,32 **** +--- 29,34 ---- + + #define splashErrSingularMatrix 8 // matrix is singular + ++ #define splashErrBadArg 9 // bad argument ++ + #endif +*** xpdf-3.02.orig/splash/SplashBitmap.cc Tue Feb 27 14:05:52 2007 +--- xpdf-3.02/splash/SplashBitmap.cc Wed Aug 19 14:55:39 2009 +*************** +*** 11,16 **** +--- 11,17 ---- + #endif + + #include ++ #include + #include "gmem.h" + #include "SplashErrorCodes.h" + #include "SplashBitmap.h" +*************** +*** 27,56 **** + mode = modeA; + switch (mode) { + case splashModeMono1: +! rowSize = (width + 7) >> 3; + break; + case splashModeMono8: +! rowSize = width; + break; + case splashModeRGB8: + case splashModeBGR8: +! rowSize = width * 3; + break; + #if SPLASH_CMYK + case splashModeCMYK8: +! rowSize = width * 4; + break; + #endif + } +! rowSize += rowPad - 1; +! rowSize -= rowSize % rowPad; +! data = (SplashColorPtr)gmalloc(rowSize * height); + if (!topDown) { + data += (height - 1) * rowSize; + rowSize = -rowSize; + } + if (alphaA) { +! alpha = (Guchar *)gmalloc(width * height); + } else { + alpha = NULL; + } +--- 28,75 ---- + mode = modeA; + switch (mode) { + case splashModeMono1: +! if (width > 0) { +! rowSize = (width + 7) >> 3; +! } else { +! rowSize = -1; +! } + break; + case splashModeMono8: +! if (width > 0) { +! rowSize = width; +! } else { +! rowSize = -1; +! } + break; + case splashModeRGB8: + case splashModeBGR8: +! if (width > 0 && width <= INT_MAX / 3) { +! rowSize = width * 3; +! } else { +! rowSize = -1; +! } + break; + #if SPLASH_CMYK + case splashModeCMYK8: +! if (width > 0 && width <= INT_MAX / 4) { +! rowSize = width * 4; +! } else { +! rowSize = -1; +! } + break; + #endif + } +! if (rowSize > 0) { +! rowSize += rowPad - 1; +! rowSize -= rowSize % rowPad; +! } +! data = (SplashColorPtr)gmallocn(height, rowSize); + if (!topDown) { + data += (height - 1) * rowSize; + rowSize = -rowSize; + } + if (alphaA) { +! alpha = (Guchar *)gmallocn(width, height); + } else { + alpha = NULL; + } +*** xpdf-3.02.orig/xpdf/XRef.cc Tue Feb 27 14:05:52 2007 +--- xpdf-3.02/xpdf/XRef.cc Tue Oct 13 11:57:24 2009 +*************** +*** 52,57 **** +--- 52,59 ---- + // generation 0. + ObjectStream(XRef *xref, int objStrNumA); + ++ GBool isOk() { return ok; } ++ + ~ObjectStream(); + + // Return the object number of this object stream. +*************** +*** 67,72 **** +--- 69,75 ---- + int nObjects; // number of objects in the stream + Object *objs; // the objects (length = nObjects) + int *objNums; // the object numbers (length = nObjects) ++ GBool ok; + }; + + ObjectStream::ObjectStream(XRef *xref, int objStrNumA) { +*************** +*** 80,85 **** +--- 83,89 ---- + nObjects = 0; + objs = NULL; + objNums = NULL; ++ ok = gFalse; + + if (!xref->fetch(objStrNum, 0, &objStr)->isStream()) { + goto err1; +*************** +*** 105,110 **** +--- 109,121 ---- + goto err1; + } + ++ // this is an arbitrary limit to avoid integer overflow problems ++ // in the 'new Object[nObjects]' call (Acrobat apparently limits ++ // object streams to 100-200 objects) ++ if (nObjects > 1000000) { ++ error(-1, "Too many objects in an object stream"); ++ goto err1; ++ } + objs = new Object[nObjects]; + objNums = (int *)gmallocn(nObjects, sizeof(int)); + offsets = (int *)gmallocn(nObjects, sizeof(int)); +*************** +*** 161,170 **** + } + + gfree(offsets); + + err1: + objStr.free(); +- return; + } + + ObjectStream::~ObjectStream() { +--- 172,181 ---- + } + + gfree(offsets); ++ ok = gTrue; + + err1: + objStr.free(); + } + + ObjectStream::~ObjectStream() { +*************** +*** 837,842 **** +--- 848,858 ---- + delete objStr; + } + objStr = new ObjectStream(this, e->offset); ++ if (!objStr->isOk()) { ++ delete objStr; ++ objStr = NULL; ++ goto err; ++ } + } + objStr->getObject(e->gen, num, obj); + break; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bensons at users.sourceforge.net Sat Jan 23 18:54:18 2010 From: bensons at users.sourceforge.net (bensons at users.sourceforge.net) Date: Sat, 23 Jan 2010 17:54:18 +0000 Subject: [csw-devel] SF.net SVN: gar:[8122] csw/mgar/pkg/xpdf/trunk/Makefile Message-ID: Revision: 8122 http://gar.svn.sourceforge.net/gar/?rev=8122&view=rev Author: bensons Date: 2010-01-23 17:54:00 +0000 (Sat, 23 Jan 2010) Log Message: ----------- adjust the package name Modified Paths: -------------- csw/mgar/pkg/xpdf/trunk/Makefile Modified: csw/mgar/pkg/xpdf/trunk/Makefile =================================================================== --- csw/mgar/pkg/xpdf/trunk/Makefile 2010-01-23 17:03:21 UTC (rev 8121) +++ csw/mgar/pkg/xpdf/trunk/Makefile 2010-01-23 17:54:00 UTC (rev 8122) @@ -1,7 +1,7 @@ GARNAME = xpdf GARVERSION = 3.02 CATEGORIES = utils -RELEASE = rev=p4 +RELEASE = p4 DESCRIPTION = Open source viewer for Portable Document Format (PDF) files define BLURB @@ -42,7 +42,7 @@ TEST_SCRIPTS = include gar/category.mk -SPKG_REVSTAMP := $(SPKG_REVSTAMP)_$(RELEASE) +SPKG_VERSION := $(SPKG_VERSION)$(RELEASE) pre-build-modulated: @cp files/xpdfrc ${WORKSRC}/doc/sample-xpdfrc This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bensons at users.sourceforge.net Sat Jan 23 19:51:36 2010 From: bensons at users.sourceforge.net (bensons at users.sourceforge.net) Date: Sat, 23 Jan 2010 18:51:36 +0000 Subject: [csw-devel] SF.net SVN: gar:[8123] csw/mgar/pkg/pureftpd/trunk Message-ID: Revision: 8123 http://gar.svn.sourceforge.net/gar/?rev=8123&view=rev Author: bensons Date: 2010-01-23 18:51:35 +0000 (Sat, 23 Jan 2010) Log Message: ----------- bump to version 1.0.27 Modified Paths: -------------- csw/mgar/pkg/pureftpd/trunk/Makefile csw/mgar/pkg/pureftpd/trunk/checksums Modified: csw/mgar/pkg/pureftpd/trunk/Makefile =================================================================== --- csw/mgar/pkg/pureftpd/trunk/Makefile 2010-01-23 17:54:00 UTC (rev 8122) +++ csw/mgar/pkg/pureftpd/trunk/Makefile 2010-01-23 18:51:35 UTC (rev 8123) @@ -1,5 +1,5 @@ GARNAME = pureftpd -GARVERSION = 1.0.22 +GARVERSION = 1.0.27 CATEGORIES = net SRCNAME = pure-ftpd Modified: csw/mgar/pkg/pureftpd/trunk/checksums =================================================================== --- csw/mgar/pkg/pureftpd/trunk/checksums 2010-01-23 17:54:00 UTC (rev 8122) +++ csw/mgar/pkg/pureftpd/trunk/checksums 2010-01-23 18:51:35 UTC (rev 8123) @@ -1 +1 @@ -51857369794ba5d305e37bec55eb06c5 download/pure-ftpd-1.0.22.tar.gz +63bc52cfbcf99aae84f9b6472ed31ae1 pure-ftpd-1.0.27.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Sat Jan 23 21:34:29 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Sat, 23 Jan 2010 20:34:29 +0000 Subject: [csw-devel] SF.net SVN: gar:[8124] csw/mgar/gar/v2-dirpackage/ Message-ID: Revision: 8124 http://gar.svn.sourceforge.net/gar/?rev=8124&view=rev Author: dmichelsen Date: 2010-01-23 20:34:29 +0000 (Sat, 23 Jan 2010) Log Message: ----------- mGAR v2: Make dirpackage branch Added Paths: ----------- csw/mgar/gar/v2-dirpackage/ Property changes on: csw/mgar/gar/v2-dirpackage ___________________________________________________________________ Added: svn:mergeinfo + /csw/mgar/gar/v2:4936-6678 /csw/mgar/gar/v2-checkpkg:7722-7855 /csw/mgar/gar/v2-collapsed-modulations:6895 /csw/mgar/gar/v2-migrateconf:7082-7211 /csw/mgar/gar/v2-skayser:6087-6132 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Sat Jan 23 21:38:05 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Sat, 23 Jan 2010 20:38:05 +0000 Subject: [csw-devel] SF.net SVN: gar:[8125] csw/mgar/gar/v2/categories/cpan/category.mk Message-ID: Revision: 8125 http://gar.svn.sourceforge.net/gar/?rev=8125&view=rev Author: dmichelsen Date: 2010-01-23 20:38:04 +0000 (Sat, 23 Jan 2010) Log Message: ----------- mGAR v2: Add PERLBUILD_INSTALL_ARGS Modified Paths: -------------- csw/mgar/gar/v2/categories/cpan/category.mk Modified: csw/mgar/gar/v2/categories/cpan/category.mk =================================================================== --- csw/mgar/gar/v2/categories/cpan/category.mk 2010-01-23 20:34:29 UTC (rev 8124) +++ csw/mgar/gar/v2/categories/cpan/category.mk 2010-01-23 20:38:04 UTC (rev 8125) @@ -88,9 +88,10 @@ @( cd $* ; $(TEST_ENV) ./Build test ) @$(MAKECOOKIE) +PERLBUILD_INSTALL_ARGS ?= destdir=$(DESTDIR) $(EXTRA_PERLBUILD_INSTALL_ARGS) install-%/Build: @echo " ==> Running Build install in $*" - @( cd $* ; $(INSTALL_ENV) ./Build install destdir=$(DESTDIR) ) + ( cd $* ; $(INSTALL_ENV) ./Build install $(PERLBUILD_INSTALL_ARGS) ) @$(MAKECOOKIE) # Check for a CPAN module version update This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Sat Jan 23 21:45:12 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Sat, 23 Jan 2010 20:45:12 +0000 Subject: [csw-devel] SF.net SVN: gar:[8126] csw/mgar/gar/v2-dirpackage/gar.pkg.mk Message-ID: Revision: 8126 http://gar.svn.sourceforge.net/gar/?rev=8126&view=rev Author: dmichelsen Date: 2010-01-23 20:45:12 +0000 (Sat, 23 Jan 2010) Log Message: ----------- mGAR v2 dirpackage: Add new target 'dirpackage' Modified Paths: -------------- csw/mgar/gar/v2-dirpackage/gar.pkg.mk Modified: csw/mgar/gar/v2-dirpackage/gar.pkg.mk =================================================================== --- csw/mgar/gar/v2-dirpackage/gar.pkg.mk 2010-01-23 20:38:04 UTC (rev 8125) +++ csw/mgar/gar/v2-dirpackage/gar.pkg.mk 2010-01-23 20:45:12 UTC (rev 8126) @@ -693,7 +693,7 @@ # We depend on extract as the additional package files (like .gspec) must be # unpacked to global/ for packaging. E. g. 'merge' depends only on the specific # modulations and does not fill global/. -ENABLE_CHECK ?= 1 +_package: ENABLE_CHECK ?= 1 _package: validateplatform extract-global merge $(SPKG_DESTDIRS) pre-package $(PACKAGE_TARGETS) post-package $(if $(ENABLE_CHECK),pkgcheck) @$(MAKECOOKIE) @@ -705,6 +705,18 @@ @echo @$(DONADA) +dirpackage: _DIRPACKAGE=1 +dirpackage: ENABLE_CHECK= +dirpackage: _package + @echo "The following packages have been built:" + @echo + @$(MAKE) -s PLATFORM=$(PLATFORM) _dirpkgshow + @echo + @$(DONADA) + +_dirpkgshow: + @$(foreach SPEC,$(_PKG_SPECS),echo " $(SPKG_SPOOLDIR)/$(SPEC)";) + _pkgshow: @$(foreach SPEC,$(_PKG_SPECS),printf " %-20s %s\n" $(SPEC) $(SPKG_EXPORT)/$(shell $(call _PKG_ENV,$(SPEC)) $(GARBIN)/mkpackage -qs $(WORKDIR)/$(SPEC).gspec -D pkgfile).gz;) @@ -720,7 +732,7 @@ --pkgbase $(SPKG_PKGBASE) \ --pkgroot $(SPKG_PKGROOT) \ -v WORKDIR_FIRSTMOD=../build-$(firstword $(MODULATIONS)) \ - --compress \ + $(if $(_DIRPACKAGE),--notransfer --nocompress,--compress) \ $(MKPACKAGE_ARGS) ) || exit 2 @$(MAKECOOKIE) @@ -754,6 +766,8 @@ repackage: pkgreset package +redirpackage: pkgreset dirpackage + # This rule automatically logs into every host where a package for this software should # be built. It is especially suited for automated build bots. platforms: This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bensons at users.sourceforge.net Sat Jan 23 23:25:06 2010 From: bensons at users.sourceforge.net (bensons at users.sourceforge.net) Date: Sat, 23 Jan 2010 22:25:06 +0000 Subject: [csw-devel] SF.net SVN: gar:[8127] csw/mgar/pkg/pureftpd/trunk/Makefile Message-ID: Revision: 8127 http://gar.svn.sourceforge.net/gar/?rev=8127&view=rev Author: bensons Date: 2010-01-23 22:24:56 +0000 (Sat, 23 Jan 2010) Log Message: ----------- include example config Modified Paths: -------------- csw/mgar/pkg/pureftpd/trunk/Makefile Modified: csw/mgar/pkg/pureftpd/trunk/Makefile =================================================================== --- csw/mgar/pkg/pureftpd/trunk/Makefile 2010-01-23 20:45:12 UTC (rev 8126) +++ csw/mgar/pkg/pureftpd/trunk/Makefile 2010-01-23 22:24:56 UTC (rev 8127) @@ -1,3 +1,9 @@ +# known build facts +# +# no linkage against +# - ldap +# - mysql +# - pgsql GARNAME = pureftpd GARVERSION = 1.0.27 CATEGORIES = net @@ -40,6 +46,9 @@ # No test suite available TEST_SCRIPTS = +sysconfdir = /etc/opt/csw +SAMPLECONF = $(sysconfdir)/$(SRCNAME)/*.conf + include gar/category.mk # make sure, the linker uses libcrypt before libssl @@ -57,7 +66,19 @@ # create config directory pre-install-modulated: ginstall -d $(DESTDIR)$(sysconfdir)/$(SRCNAME) + ginstall -d $(DESTDIR)$(docdir)/$(SRCNAME) ginstall -d $(DESTDIR)/var/opt/csw/run perl -pi -e 's@/var/run@/var/opt/csw/run@' ${WORKSRC}/src/ftpd.h perl -pi -e 's@/var/run@/var/opt/csw/run@' ${WORKSRC}/src/ftpwho-update.h perl -pi -e 's@/var/run@/var/opt/csw/run@' ${WORKSRC}/src/upload-pipe.h + @$(MAKECOOKIE) + +conf-list = $(WORKSRC)/pureftpd-ldap.conf +conf-list += $(WORKSRC)/pureftpd-mysql.conf +conf-list += $(WORKSRC)/pureftpd-pgsql.conf +post-install-modulated: + ( for file in $(conf-list) ; do \ + ginstall -m 644 $$file $(DESTDIR)$(sysconfdir)/$(SRCNAME) ; \ + done ) + ginstall -m 644 $(WORKSRC)/pureftpd.schema $(DESTDIR)$(docdir)/$(SRCNAME) + @$(MAKECOOKIE) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bensons at users.sourceforge.net Sun Jan 24 00:44:01 2010 From: bensons at users.sourceforge.net (bensons at users.sourceforge.net) Date: Sat, 23 Jan 2010 23:44:01 +0000 Subject: [csw-devel] SF.net SVN: gar:[8128] csw/mgar/pkg/siege/trunk Message-ID: Revision: 8128 http://gar.svn.sourceforge.net/gar/?rev=8128&view=rev Author: bensons Date: 2010-01-23 23:44:00 +0000 (Sat, 23 Jan 2010) Log Message: ----------- bump to version 2.69 Modified Paths: -------------- csw/mgar/pkg/siege/trunk/Makefile csw/mgar/pkg/siege/trunk/checksums csw/mgar/pkg/siege/trunk/files/patch-configure Added Paths: ----------- csw/mgar/pkg/siege/trunk/files/patch-auth.c Modified: csw/mgar/pkg/siege/trunk/Makefile =================================================================== --- csw/mgar/pkg/siege/trunk/Makefile 2010-01-23 22:24:56 UTC (rev 8127) +++ csw/mgar/pkg/siege/trunk/Makefile 2010-01-23 23:44:00 UTC (rev 8128) @@ -1,5 +1,5 @@ GARNAME = siege -GARVERSION = 2.66 +GARVERSION = 2.69 CATEGORIES = xtra DESCRIPTION = A http regression testing and benchmarking utility @@ -26,6 +26,7 @@ # patch bombardment PATCHFILES = patch-bombardment.in PATCHFILES += patch-configure +PATCHFILES += patch-auth.c CONFIGURE_ARGS = $(DIRPATHS) CONFIGURE_ARGS += --with-ssl=$(prefix) @@ -37,6 +38,10 @@ include gar/category.mk +pre-configure-modulated: + gsed -ie 's,^LIBTOOL=.*,LIBTOOL=/opt/csw/bin/libtool,' \ + $(WORKSRC)/configure + x-post-configure-modulated: find $(WORKSRC) -name Makefile | xargs grep -l '^CFLAGS' \ | xargs perl -pi -e 's at CFLAGS =@CFLAGS = $(CFLAGS)@' Modified: csw/mgar/pkg/siege/trunk/checksums =================================================================== --- csw/mgar/pkg/siege/trunk/checksums 2010-01-23 22:24:56 UTC (rev 8127) +++ csw/mgar/pkg/siege/trunk/checksums 2010-01-23 23:44:00 UTC (rev 8128) @@ -1,3 +1,4 @@ -4acf8817dc68474af49acd8a73353559 download/patch-bombardment.in -e71b9d49cf017469f779448b32102468 download/patch-configure -a5592e42d4217572d8035dec000f479c download/siege-2.66.tar.gz +8921c3aa03b87a4c02ac977bee5f415e patch-auth.c +4acf8817dc68474af49acd8a73353559 patch-bombardment.in +a48a4fb226a52894fdf59d0e0f67cf06 patch-configure +77190ad255dfa14232137d03fd0d994b siege-2.69.tar.gz Added: csw/mgar/pkg/siege/trunk/files/patch-auth.c =================================================================== --- csw/mgar/pkg/siege/trunk/files/patch-auth.c (rev 0) +++ csw/mgar/pkg/siege/trunk/files/patch-auth.c 2010-01-23 23:44:00 UTC (rev 8128) @@ -0,0 +1,11 @@ +--- siege-2.69.orig/src/auth.c 2008-08-19 15:53:31.000000000 +0200 ++++ siege-2.69/src/auth.c 2010-01-24 00:37:36.433891267 +0100 +@@ -491,7 +491,7 @@ + } + } + else { +- fprintf(stderr, "invalid call to %s algorithm is [%s]\n", __FUNCTION__, challenge->algorithm); ++ fprintf(stderr, "invalid call to %s algorithm is [%s]\n", __func__, challenge->algorithm); + return NULL; + } + Modified: csw/mgar/pkg/siege/trunk/files/patch-configure =================================================================== --- csw/mgar/pkg/siege/trunk/files/patch-configure 2010-01-23 22:24:56 UTC (rev 8127) +++ csw/mgar/pkg/siege/trunk/files/patch-configure 2010-01-23 23:44:00 UTC (rev 8128) @@ -1,6 +1,6 @@ ---- siege-2.66.orig/configure 2007-03-29 20:07:30.000000000 +0200 -+++ siege-2.66/configure 2009-07-22 17:21:11.798205557 +0200 -@@ -20688,9 +20688,8 @@ +--- siege-2.69.orig/configure 2009-05-08 19:59:04.000000000 +0200 ++++ siege-2.69/configure 2010-01-23 23:56:00.558503364 +0100 +@@ -19745,9 +19745,8 @@ ;; esac @@ -11,7 +11,7 @@ echo "$as_me:$LINENO: checking for buggy pthread mutex initializers" >&5 echo $ECHO_N "checking for buggy pthread mutex initializers... $ECHO_C" >&6 -@@ -26980,9 +26979,9 @@ +@@ -26094,9 +26093,9 @@ AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir" prefix=$prefix sysconfdir=$sysconfdir localstatedir=$localstatedir VERSION=$VERSION DATE="$DATE" PROGRAM="$PROGRAM" AUTHOR="$AUTHOR" EMAIL="$EMAIL" @@ -24,10 +24,10 @@ PLATFORM=$PLATFORM _ACEOF -@@ -27891,7 +27890,7 @@ - +@@ -27008,7 +27007,7 @@ #define SIEGE_HOME "$prefix" - #define CNF_FILE "$sysconfdir/urls.txt" + #define URL_FILE "$sysconfdir/urls.txt" + #define CNF_FILE "$sysconfdir/siegerc" -#define LOG_FILE "$localstatedir/siege.log" +#define LOG_FILE "$localstatedir/log/siege.log" This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Sun Jan 24 00:49:43 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Sat, 23 Jan 2010 23:49:43 +0000 Subject: [csw-devel] SF.net SVN: gar:[8129] csw/mgar/gar/v2/gar.mk Message-ID: Revision: 8129 http://gar.svn.sourceforge.net/gar/?rev=8129&view=rev Author: dmichelsen Date: 2010-01-23 23:49:42 +0000 (Sat, 23 Jan 2010) Log Message: ----------- mGAR v2: Call garchive per default on makesum target Modified Paths: -------------- csw/mgar/gar/v2/gar.mk Modified: csw/mgar/gar/v2/gar.mk =================================================================== --- csw/mgar/gar/v2/gar.mk 2010-01-23 23:44:00 UTC (rev 8128) +++ csw/mgar/gar/v2/gar.mk 2010-01-23 23:49:42 UTC (rev 8129) @@ -356,9 +356,11 @@ @$(foreach COOKIEFILE,$(CHECKSUM_TARGETS), test -e $(COOKIEDIR)/$(COOKIEFILE) ;) # makesum - Generate distinfo (only do this for your own ports!). +GARCHIVE_TARGETS = $(addprefix $(GARCHIVEDIR)/,$(filter-out $(ALLFILES_DYNSCRIPTS), $(ALLFILES))) + MAKESUM_TARGETS = $(filter-out $(_NOCHECKSUM) $(NOCHECKSUM),$(ALLFILES)) -makesum: fetch $(addprefix $(DOWNLOADDIR)/,$(MAKESUM_TARGETS)) +makesum: fetch $(addprefix $(DOWNLOADDIR)/,$(MAKESUM_TARGETS)) $(GARCHIVE_TARGETS) @if test "x$(MAKESUM_TARGETS)" != "x "; then \ (cd $(DOWNLOADDIR) && gmd5sum $(MAKESUM_TARGETS)) > $(CHECKSUM_FILE) ; \ echo "Checksums made for $(MAKESUM_TARGETS)" ; \ @@ -368,8 +370,6 @@ # I am always typing this by mistake makesums: makesum -GARCHIVE_TARGETS = $(addprefix $(GARCHIVEDIR)/,$(filter-out $(ALLFILES_DYNSCRIPTS), $(ALLFILES))) - garchive: checksum $(GARCHIVE_TARGETS) ; # extract - Unpacks $(DISTFILES) into $(EXTRACTDIR) (patches are "zcatted" into the patch program) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Sun Jan 24 00:56:45 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Sat, 23 Jan 2010 23:56:45 +0000 Subject: [csw-devel] SF.net SVN: gar:[8130] csw/mgar/pkg/cpan/Unix-Statgrab/trunk/Makefile Message-ID: Revision: 8130 http://gar.svn.sourceforge.net/gar/?rev=8130&view=rev Author: dmichelsen Date: 2010-01-23 23:56:45 +0000 (Sat, 23 Jan 2010) Log Message: ----------- cpan/Unix-Statgrab: Fix configure args Modified Paths: -------------- csw/mgar/pkg/cpan/Unix-Statgrab/trunk/Makefile Modified: csw/mgar/pkg/cpan/Unix-Statgrab/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/Unix-Statgrab/trunk/Makefile 2010-01-23 23:49:42 UTC (rev 8129) +++ csw/mgar/pkg/cpan/Unix-Statgrab/trunk/Makefile 2010-01-23 23:56:45 UTC (rev 8130) @@ -13,4 +13,6 @@ REQUIRED_PKGS = CSWlibstatgrab PREREQUISITE_PKGS = $(REQUIRED_PKGS) +EXTRA_PERL_CONFIGURE_ARGS = CC=$(CC) LIBS="-L$(libdir) -lstatgrab -lperl" INC="-I$(includedir)" + include gar/category.mk This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bensons at users.sourceforge.net Sun Jan 24 01:00:33 2010 From: bensons at users.sourceforge.net (bensons at users.sourceforge.net) Date: Sun, 24 Jan 2010 00:00:33 +0000 Subject: [csw-devel] SF.net SVN: gar:[8131] csw/mgar/pkg/siege/trunk/Makefile Message-ID: Revision: 8131 http://gar.svn.sourceforge.net/gar/?rev=8131&view=rev Author: bensons Date: 2010-01-24 00:00:33 +0000 (Sun, 24 Jan 2010) Log Message: ----------- siege: cleanup Makefile Modified Paths: -------------- csw/mgar/pkg/siege/trunk/Makefile Modified: csw/mgar/pkg/siege/trunk/Makefile =================================================================== --- csw/mgar/pkg/siege/trunk/Makefile 2010-01-23 23:56:45 UTC (rev 8130) +++ csw/mgar/pkg/siege/trunk/Makefile 2010-01-24 00:00:33 UTC (rev 8131) @@ -21,7 +21,7 @@ REQUIRED_PKGS = CSWosslrt # handle config file -PRESERVECONF = $(sysconfdir)/urls.txt.CSW +PRESERVECONF = $(sysconfdir)/urls.txt # patch bombardment PATCHFILES = patch-bombardment.in @@ -41,10 +41,12 @@ pre-configure-modulated: gsed -ie 's,^LIBTOOL=.*,LIBTOOL=/opt/csw/bin/libtool,' \ $(WORKSRC)/configure + @$(MAKECOOKIE) x-post-configure-modulated: find $(WORKSRC) -name Makefile | xargs grep -l '^CFLAGS' \ | xargs perl -pi -e 's at CFLAGS =@CFLAGS = $(CFLAGS)@' + @$(MAKECOOKIE) # install is broken.. bin-list = $(WORKSRC)/src/siege @@ -59,11 +61,13 @@ @( for file in $(bin-list) ; do \ ginstall -m 751 $$file $(DESTDIR)$(bindir) ; \ done ) + @$(MAKECOOKIE) install-additional: ginstall -d $(DESTDIR)$(sysconfdir) ginstall -m 644 $(WORKSRC)/doc/urls.txt \ - $(DESTDIR)$(sysconfdir)/urls.txt.CSW + $(DESTDIR)$(sysconfdir)/urls.txt + @$(MAKECOOKIE) install-man: ginstall -d $(DESTDIR)$(mandir)/man1 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bensons at users.sourceforge.net Sun Jan 24 01:22:39 2010 From: bensons at users.sourceforge.net (bensons at users.sourceforge.net) Date: Sun, 24 Jan 2010 00:22:39 +0000 Subject: [csw-devel] SF.net SVN: gar:[8132] csw/mgar/pkg/pbzip2/trunk/Makefile Message-ID: Revision: 8132 http://gar.svn.sourceforge.net/gar/?rev=8132&view=rev Author: bensons Date: 2010-01-24 00:22:39 +0000 (Sun, 24 Jan 2010) Log Message: ----------- pbzip2: add 64bit build Modified Paths: -------------- csw/mgar/pkg/pbzip2/trunk/Makefile Modified: csw/mgar/pkg/pbzip2/trunk/Makefile =================================================================== --- csw/mgar/pkg/pbzip2/trunk/Makefile 2010-01-24 00:00:33 UTC (rev 8131) +++ csw/mgar/pkg/pbzip2/trunk/Makefile 2010-01-24 00:22:39 UTC (rev 8132) @@ -26,6 +26,10 @@ # since there is no configure script, this is intentionally left empty CONFIGURE_SCRIPTS = +# build 64bit binary +BUILD64 = 1 +NO_ISAEXEC = 1 + # no build tests SKIPTEST = 1 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Sun Jan 24 02:31:18 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sun, 24 Jan 2010 01:31:18 +0000 Subject: [csw-devel] SF.net SVN: gar:[8133] csw/mgar/pkg Message-ID: Revision: 8133 http://gar.svn.sourceforge.net/gar/?rev=8133&view=rev Author: wahwah Date: 2010-01-24 01:31:18 +0000 (Sun, 24 Jan 2010) Log Message: ----------- tests: The first sketch of end-to-end testing of GAR Added Paths: ----------- csw/mgar/pkg/tests/ csw/mgar/pkg/tests/gartest.py Added: csw/mgar/pkg/tests/gartest.py =================================================================== --- csw/mgar/pkg/tests/gartest.py (rev 0) +++ csw/mgar/pkg/tests/gartest.py 2010-01-24 01:31:18 UTC (rev 8133) @@ -0,0 +1,168 @@ +# $Id$ + +import Cheetah.Template +import shutil +import tempfile +import unittest +import os +import os.path +import subprocess +import opencsw + +"""A module used to do end-to-end testing of GAR.""" + +MAKEFILE_TMPL = """# GAR Makefile generated by $test_id +# +GARNAME = $garname +GARVERSION = $garversion +CATEGORIES = $profile +DESCRIPTION = $description +#if $blurb +define BLURB + blurb +endef +#end if +#if $upstream_url +SPKG_SOURCEURL = $upstream_url +#end if +#if $master_sites +MASTER_SITES = $master_sites +#end if +## PATCHFILES = +## DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz +## UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz +## CATALOGNAME = +## ARCHALL = 0 +## PACKAGES = +CONFIGURE_SCRIPTS = +BUILD_SCRIPTS = +INSTALL_SCRIPTS = +TEST_SCRIPTS = +#if $configure_args +CONFIGURE_ARGS = $configure_args +#end if +## BUILD64 = +include gar/category.mk +#if $install_files +post-install-modulated: +#for filedir_name, directory, file_name, content in $install_files +\tginstall -m 755 -d \$(DESTDIR)$directory +\tginstall -m 644 $tmpdir/\$(FILEDIR)/$filedir_name \$(DESTDIR)$directory/$file_name +#end for +#end if +# GAR recipe ends here. +""" +TMPDIR_PREFIX = "garpkg" +DIR_PKG_OUT_DIR = "/home/maciej/spool.5.8-sparc" + +class Error(Exception): + pass + +class GarBuild(object): + """Represents a GAR build. + + Can create a GAR build and execute it. + """ + def __init__(self): + self.tmpdir = tempfile.mkdtemp(prefix=TMPDIR_PREFIX) + self.filedir = os.path.join(self.tmpdir, "files") + self.makefile_filename = os.path.join(self.tmpdir, "Makefile") + os.mkdir(self.filedir) + self.install_files = [] + self.built = False + self.tmpldata = { + "garname": "testbuild", + "garsrc": "/home/maciej/src/opencsw/gar/v2-dirpackage", + "blurb": None, + "description": u"A test package from %s" % self, + "profile": "lib", + "configure_args": "$(DIRPATHS)", + "upstream_url": "http://www.opencsw.org/", + "master_sites": None, + "install_files": self.install_files, + "garversion": "0.0.1", + "tmpdir": self.tmpdir, + "test_id": "$Id$", + } + os.symlink(self.tmpldata["garsrc"], os.path.join(self.tmpdir, "gar")) + + def WriteGarFiles(self): + # print "The tmpdir is", self.tmpdir + for filedir_name, directory, filename, content in self.install_files: + file_path = os.path.join(self.filedir, filedir_name) + print "Writing to %s" % file_path + fp = open(file_path, "w") + fp.write(content) + fp.close() + searchlist = [self.tmpldata] + t = Cheetah.Template.Template(MAKEFILE_TMPL, searchlist) + print t + fp = open(self.makefile_filename, "w") + fp.write(str(t)) + fp.close() + + def Build(self): + if self.built: + return 0 + args = ["gmake", "dirpackage"] + gar_proc = subprocess.Popen(args, cwd=self.tmpdir, + stdout=subprocess.PIPE, + stderr=subprocess.PIPE) + stdout, stderr = gar_proc.communicate() + ret = gar_proc.wait() + if ret: + print "ERROR: GAR run has failed." + self.built = False + else: + self.built = True + return ret + + def GetBuiltPackages(self): + if not self.built: + raise Error("The packages have not been built yet.") + args = ["gmake", "pkglist"] + gar_proc = subprocess.Popen(args, cwd=self.tmpdir, stdout=subprocess.PIPE) + stdout, stderr = gar_proc.communicate() + ret = gar_proc.wait() + pkglist = [] + for line in stdout.splitlines(): + # directory, catalogname, pkgname + pkglist.append(tuple(line.split("\t"))) + packages = [opencsw.DirectoryFormatPackage(os.path.join(DIR_PKG_OUT_DIR, z)) for x, y, z in pkglist] + return packages + + def AddInstallFile(self, file_path, content): + filedir_name = file_path.replace("/", "-") + directory, file_name = os.path.split(file_path) + self.install_files.append((filedir_name, directory, + file_name, content)) + + def __del__(self): + shutil.rmtree(self.tmpdir) + + +class FooUnitTest(unittest.TestCase): + """This is the docstring for the FooUnitTest.""" + + def testSomething(self): + """This is a doc string for the test method. + + You can write more text here. + """ + mybuild = GarBuild() + mybuild.tmpldata["garname"] = "blah" + mybuild.AddInstallFile("/opt/csw/share/foo", "bar!\n") + mybuild.WriteGarFiles() + self.assertEquals(0, mybuild.Build()) + packages = mybuild.GetBuiltPackages() + for pkg in packages: + print pkg + print pkg.GetParsedPkginfo() + # package = mybuild.GetFirstDirFormatPackage() + # self.assertEqual("blah", package.catalogname) + + +if __name__ == '__main__': + unittest.main() + +# vim:set ts=2 sts=2 sw=2 expandtab: Property changes on: csw/mgar/pkg/tests/gartest.py ___________________________________________________________________ Added: svn:keywords + Id This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Sun Jan 24 08:18:53 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sun, 24 Jan 2010 07:18:53 +0000 Subject: [csw-devel] SF.net SVN: gar:[8134] csw/mgar/pkg/tests Message-ID: Revision: 8134 http://gar.svn.sourceforge.net/gar/?rev=8134&view=rev Author: wahwah Date: 2010-01-24 07:18:53 +0000 (Sun, 24 Jan 2010) Log Message: ----------- mGAR v2: tests, separated the library and the executable, better API for variables. Modified Paths: -------------- csw/mgar/pkg/tests/gartest.py Added Paths: ----------- csw/mgar/pkg/tests/run_tests.py Modified: csw/mgar/pkg/tests/gartest.py =================================================================== --- csw/mgar/pkg/tests/gartest.py 2010-01-24 01:31:18 UTC (rev 8133) +++ csw/mgar/pkg/tests/gartest.py 2010-01-24 07:18:53 UTC (rev 8134) @@ -12,36 +12,14 @@ """A module used to do end-to-end testing of GAR.""" MAKEFILE_TMPL = """# GAR Makefile generated by $test_id -# -GARNAME = $garname -GARVERSION = $garversion -CATEGORIES = $profile -DESCRIPTION = $description +#for varname in $garvars +$varname = $garvars[$varname] +#end for #if $blurb define BLURB blurb endef #end if -#if $upstream_url -SPKG_SOURCEURL = $upstream_url -#end if -#if $master_sites -MASTER_SITES = $master_sites -#end if -## PATCHFILES = -## DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz -## UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz -## CATALOGNAME = -## ARCHALL = 0 -## PACKAGES = -CONFIGURE_SCRIPTS = -BUILD_SCRIPTS = -INSTALL_SCRIPTS = -TEST_SCRIPTS = -#if $configure_args -CONFIGURE_ARGS = $configure_args -#end if -## BUILD64 = include gar/category.mk #if $install_files post-install-modulated: @@ -64,36 +42,47 @@ Can create a GAR build and execute it. """ def __init__(self): + self.packages = None self.tmpdir = tempfile.mkdtemp(prefix=TMPDIR_PREFIX) self.filedir = os.path.join(self.tmpdir, "files") self.makefile_filename = os.path.join(self.tmpdir, "Makefile") os.mkdir(self.filedir) self.install_files = [] self.built = False + self.garvars = { + "GARNAME": "testbuild", + "DESCRIPTION": u"A test package from %s" % self, + "CATEGORIES": "lib", + "CONFIGURE_ARGS": "$(DIRPATHS)", + "SPKG_SOURCEURL": "http://www.opencsw.org/", + "MASTER_SITES": "", + "GARVERSION": "0.0.1", + "CONFIGURE_SCRIPTS": "", + "BUILD_SCRIPTS": "", + "TEST_SCRIPTS": "", + "INSTALL_SCRIPTS": "", + } self.tmpldata = { - "garname": "testbuild", + "garvars": self.garvars, "garsrc": "/home/maciej/src/opencsw/gar/v2-dirpackage", "blurb": None, - "description": u"A test package from %s" % self, - "profile": "lib", - "configure_args": "$(DIRPATHS)", - "upstream_url": "http://www.opencsw.org/", - "master_sites": None, "install_files": self.install_files, - "garversion": "0.0.1", "tmpdir": self.tmpdir, "test_id": "$Id$", } os.symlink(self.tmpldata["garsrc"], os.path.join(self.tmpdir, "gar")) + def SetGarVariable(self, varname, value): + self.garvars[varname] = value + def WriteGarFiles(self): # print "The tmpdir is", self.tmpdir for filedir_name, directory, filename, content in self.install_files: - file_path = os.path.join(self.filedir, filedir_name) - print "Writing to %s" % file_path - fp = open(file_path, "w") - fp.write(content) - fp.close() + file_path = os.path.join(self.filedir, filedir_name) + print "Writing to %s" % file_path + fp = open(file_path, "w") + fp.write(content) + fp.close() searchlist = [self.tmpldata] t = Cheetah.Template.Template(MAKEFILE_TMPL, searchlist) print t @@ -103,7 +92,7 @@ def Build(self): if self.built: - return 0 + return 0 args = ["gmake", "dirpackage"] gar_proc = subprocess.Popen(args, cwd=self.tmpdir, stdout=subprocess.PIPE, @@ -112,26 +101,38 @@ ret = gar_proc.wait() if ret: print "ERROR: GAR run has failed." + print stdout + print stderr self.built = False else: - self.built = True + self.built = True return ret def GetBuiltPackages(self): if not self.built: - raise Error("The packages have not been built yet.") + raise Error("The packages have not been built yet.") args = ["gmake", "pkglist"] gar_proc = subprocess.Popen(args, cwd=self.tmpdir, stdout=subprocess.PIPE) stdout, stderr = gar_proc.communicate() ret = gar_proc.wait() pkglist = [] for line in stdout.splitlines(): - # directory, catalogname, pkgname - pkglist.append(tuple(line.split("\t"))) - packages = [opencsw.DirectoryFormatPackage(os.path.join(DIR_PKG_OUT_DIR, z)) for x, y, z in pkglist] - return packages + # directory, catalogname, pkgname + pkglist.append(tuple(line.split("\t"))) + self.packages = [ + opencsw.DirectoryFormatPackage( + os.path.join(DIR_PKG_OUT_DIR, z)) + for x, y, z in pkglist] + return self.packages + def GetFirstBuiltPackage(self): + """Returns only the first package. Easy to use.""" + packages = self.GetBuiltPackages() + if packages: + return packages[0] + def AddInstallFile(self, file_path, content): + """Creates a file in the package, with the given path and content.""" filedir_name = file_path.replace("/", "-") directory, file_name = os.path.split(file_path) self.install_files.append((filedir_name, directory, @@ -140,29 +141,4 @@ def __del__(self): shutil.rmtree(self.tmpdir) - -class FooUnitTest(unittest.TestCase): - """This is the docstring for the FooUnitTest.""" - - def testSomething(self): - """This is a doc string for the test method. - - You can write more text here. - """ - mybuild = GarBuild() - mybuild.tmpldata["garname"] = "blah" - mybuild.AddInstallFile("/opt/csw/share/foo", "bar!\n") - mybuild.WriteGarFiles() - self.assertEquals(0, mybuild.Build()) - packages = mybuild.GetBuiltPackages() - for pkg in packages: - print pkg - print pkg.GetParsedPkginfo() - # package = mybuild.GetFirstDirFormatPackage() - # self.assertEqual("blah", package.catalogname) - - -if __name__ == '__main__': - unittest.main() - # vim:set ts=2 sts=2 sw=2 expandtab: Added: csw/mgar/pkg/tests/run_tests.py =================================================================== --- csw/mgar/pkg/tests/run_tests.py (rev 0) +++ csw/mgar/pkg/tests/run_tests.py 2010-01-24 07:18:53 UTC (rev 8134) @@ -0,0 +1,26 @@ +# $Id$ + +import unittest +import gartest + +class ExampleEndToEndTest(unittest.TestCase): + """An example end-to-end test of GAR.""" + + def testPkginfoName(self): + """Checks that the GARNAME makes it to the NAME in pkginfo.""" + mybuild = gartest.GarBuild() + mybuild.SetGarVariable("GARNAME", "foo") + mybuild.AddInstallFile("/opt/csw/share/foo", "bar!\n") + mybuild.WriteGarFiles() + self.assertEquals(0, mybuild.Build()) + pkg = mybuild.GetFirstBuiltPackage() + pkginfo = pkg.GetParsedPkginfo() + # By default, the garname should be used to create the catalog name, which + # in turn ends up in the NAME field in pkginfo. + self.assertTrue(pkginfo["NAME"].startswith("foo")) + + +if __name__ == '__main__': + unittest.main() + +# vim:set ts=2 sts=2 sw=2 expandtab: Property changes on: csw/mgar/pkg/tests/run_tests.py ___________________________________________________________________ Added: svn:executable + * Added: svn:keywords + Id This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Sun Jan 24 08:24:07 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sun, 24 Jan 2010 07:24:07 +0000 Subject: [csw-devel] SF.net SVN: gar:[8135] csw/mgar/pkg/tests/run_tests.py Message-ID: Revision: 8135 http://gar.svn.sourceforge.net/gar/?rev=8135&view=rev Author: wahwah Date: 2010-01-24 07:24:06 +0000 (Sun, 24 Jan 2010) Log Message: ----------- mGAR v2: tests, setting shebang for the executable Modified Paths: -------------- csw/mgar/pkg/tests/run_tests.py Modified: csw/mgar/pkg/tests/run_tests.py =================================================================== --- csw/mgar/pkg/tests/run_tests.py 2010-01-24 07:18:53 UTC (rev 8134) +++ csw/mgar/pkg/tests/run_tests.py 2010-01-24 07:24:06 UTC (rev 8135) @@ -1,3 +1,4 @@ +#!/opt/csw/bin/python2.6 # $Id$ import unittest This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bensons at users.sourceforge.net Sun Jan 24 10:30:18 2010 From: bensons at users.sourceforge.net (bensons at users.sourceforge.net) Date: Sun, 24 Jan 2010 09:30:18 +0000 Subject: [csw-devel] SF.net SVN: gar:[8136] csw/mgar/pkg/p7zip/trunk Message-ID: Revision: 8136 http://gar.svn.sourceforge.net/gar/?rev=8136&view=rev Author: bensons Date: 2010-01-24 09:30:17 +0000 (Sun, 24 Jan 2010) Log Message: ----------- p7zip: upgraded to version 9.04 Modified Paths: -------------- csw/mgar/pkg/p7zip/trunk/Makefile csw/mgar/pkg/p7zip/trunk/checksums Modified: csw/mgar/pkg/p7zip/trunk/Makefile =================================================================== --- csw/mgar/pkg/p7zip/trunk/Makefile 2010-01-24 07:24:06 UTC (rev 8135) +++ csw/mgar/pkg/p7zip/trunk/Makefile 2010-01-24 09:30:17 UTC (rev 8136) @@ -1,5 +1,5 @@ GARNAME = p7zip -GARVERSION = 4.65 +GARVERSION = 9.04 CATEGORIES = utils DESCRIPTION = File archiver with high compression ratio Modified: csw/mgar/pkg/p7zip/trunk/checksums =================================================================== --- csw/mgar/pkg/p7zip/trunk/checksums 2010-01-24 07:24:06 UTC (rev 8135) +++ csw/mgar/pkg/p7zip/trunk/checksums 2010-01-24 09:30:17 UTC (rev 8136) @@ -1,3 +1,3 @@ -f78ed232436dc8f8be25a2f95d4e5f9a download/p7zip_4.65_src_all.tar.bz2 -6d31812ad3facefbc8ba8bd750522be7 download/patch-CPP-7zip-Archive-Zip-ZipHandler.cpp -06482af0e45c61b245b2f664602e4742 download/patch-install.sh +9194ebf9a2b3735d236aed001de5f6f8 p7zip_9.04_src_all.tar.bz2 +6d31812ad3facefbc8ba8bd750522be7 patch-CPP-7zip-Archive-Zip-ZipHandler.cpp +06482af0e45c61b245b2f664602e4742 patch-install.sh This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bensons at users.sourceforge.net Sun Jan 24 11:00:23 2010 From: bensons at users.sourceforge.net (bensons at users.sourceforge.net) Date: Sun, 24 Jan 2010 10:00:23 +0000 Subject: [csw-devel] SF.net SVN: gar:[8137] csw/mgar/pkg/cpan Message-ID: Revision: 8137 http://gar.svn.sourceforge.net/gar/?rev=8137&view=rev Author: bensons Date: 2010-01-24 10:00:22 +0000 (Sun, 24 Jan 2010) Log Message: ----------- cpan File-Cat: initial GARify Added Paths: ----------- csw/mgar/pkg/cpan/File-Cat/ csw/mgar/pkg/cpan/File-Cat/branches/ csw/mgar/pkg/cpan/File-Cat/tags/ csw/mgar/pkg/cpan/File-Cat/trunk/ csw/mgar/pkg/cpan/File-Cat/trunk/Makefile csw/mgar/pkg/cpan/File-Cat/trunk/checksums csw/mgar/pkg/cpan/File-Cat/trunk/files/ Property changes on: csw/mgar/pkg/cpan/File-Cat/trunk ___________________________________________________________________ Added: svn:ignore + cookies download work Added: svn:externals + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 Added: csw/mgar/pkg/cpan/File-Cat/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/File-Cat/trunk/Makefile (rev 0) +++ csw/mgar/pkg/cpan/File-Cat/trunk/Makefile 2010-01-24 10:00:22 UTC (rev 8137) @@ -0,0 +1,19 @@ +GARNAME = File-Cat +GARVERSION = 1.2 +CATEGORIES = cpan +AUTHOR = FIMM + +DESCRIPTION = Perl implementation of cat(1) +define BLURB + File::Cat is a module of adventure, danger, and low cunning. + With it, you will explore some of the most inane programs ever seen + by mortals. No computer should be without one! +endef + +# Disable interactive tests +# PATCHFILES = itest.diff +# Fix names +PACKAGES = CSWpmfilecat +CATALOGNAME = pm_filecat + +include gar/category.mk Added: csw/mgar/pkg/cpan/File-Cat/trunk/checksums =================================================================== --- csw/mgar/pkg/cpan/File-Cat/trunk/checksums (rev 0) +++ csw/mgar/pkg/cpan/File-Cat/trunk/checksums 2010-01-24 10:00:22 UTC (rev 8137) @@ -0,0 +1 @@ +300600b3786cec4360e88947f775f4fb File-Cat-1.2.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bensons at users.sourceforge.net Sun Jan 24 11:14:03 2010 From: bensons at users.sourceforge.net (bensons at users.sourceforge.net) Date: Sun, 24 Jan 2010 10:14:03 +0000 Subject: [csw-devel] SF.net SVN: gar:[8138] csw/mgar/pkg/cpan Message-ID: Revision: 8138 http://gar.svn.sourceforge.net/gar/?rev=8138&view=rev Author: bensons Date: 2010-01-24 10:14:02 +0000 (Sun, 24 Jan 2010) Log Message: ----------- cpan Net-Pcap: inital GAR commit Added Paths: ----------- csw/mgar/pkg/cpan/Net-Pcap/ csw/mgar/pkg/cpan/Net-Pcap/branches/ csw/mgar/pkg/cpan/Net-Pcap/tags/ csw/mgar/pkg/cpan/Net-Pcap/trunk/ csw/mgar/pkg/cpan/Net-Pcap/trunk/Makefile csw/mgar/pkg/cpan/Net-Pcap/trunk/checksums csw/mgar/pkg/cpan/Net-Pcap/trunk/files/ Property changes on: csw/mgar/pkg/cpan/Net-Pcap/trunk ___________________________________________________________________ Added: svn:ignore + cookies download work Added: svn:externals + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 Added: csw/mgar/pkg/cpan/Net-Pcap/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/Net-Pcap/trunk/Makefile (rev 0) +++ csw/mgar/pkg/cpan/Net-Pcap/trunk/Makefile 2010-01-24 10:14:02 UTC (rev 8138) @@ -0,0 +1,18 @@ +GARNAME = Net-Pcap +GARVERSION = 0.16 +CATEGORIES = cpan +AUTHOR = SAPER + +DESCRIPTION = Interface to pcap(3) LBL packet capture library +define BLURB + Net::Pcap is a Perl binding to the LBL pcap(3) library. + The README for libpcap describes itself as: +endef + +PACKAGES = CSWpmnetpcap +CATALOGNAME = pm_netpcap + +# depends +PREREQUISITE_PKGS = CSWlibpcap CSWlibpcapdevel + +include gar/category.mk Added: csw/mgar/pkg/cpan/Net-Pcap/trunk/checksums =================================================================== --- csw/mgar/pkg/cpan/Net-Pcap/trunk/checksums (rev 0) +++ csw/mgar/pkg/cpan/Net-Pcap/trunk/checksums 2010-01-24 10:14:02 UTC (rev 8138) @@ -0,0 +1 @@ +b150d8e0a40137fad2a7df792d80cab4 Net-Pcap-0.16.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bensons at users.sourceforge.net Sun Jan 24 11:18:20 2010 From: bensons at users.sourceforge.net (bensons at users.sourceforge.net) Date: Sun, 24 Jan 2010 10:18:20 +0000 Subject: [csw-devel] SF.net SVN: gar:[8139] csw/mgar/pkg/cpan/Net-Pcap/trunk/Makefile Message-ID: Revision: 8139 http://gar.svn.sourceforge.net/gar/?rev=8139&view=rev Author: bensons Date: 2010-01-24 10:18:20 +0000 (Sun, 24 Jan 2010) Log Message: ----------- cpan Net-Pcap: adjust dependency Modified Paths: -------------- csw/mgar/pkg/cpan/Net-Pcap/trunk/Makefile Modified: csw/mgar/pkg/cpan/Net-Pcap/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/Net-Pcap/trunk/Makefile 2010-01-24 10:14:02 UTC (rev 8138) +++ csw/mgar/pkg/cpan/Net-Pcap/trunk/Makefile 2010-01-24 10:18:20 UTC (rev 8139) @@ -13,6 +13,6 @@ CATALOGNAME = pm_netpcap # depends -PREREQUISITE_PKGS = CSWlibpcap CSWlibpcapdevel +PREREQUISITE_PKGS = CSWlibpcap include gar/category.mk This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From a_o_m at users.sourceforge.net Sun Jan 24 11:19:30 2010 From: a_o_m at users.sourceforge.net (a_o_m at users.sourceforge.net) Date: Sun, 24 Jan 2010 10:19:30 +0000 Subject: [csw-devel] SF.net SVN: gar:[8140] csw/mgar/pkg/fontconfig/trunk Message-ID: Revision: 8140 http://gar.svn.sourceforge.net/gar/?rev=8140&view=rev Author: a_o_m Date: 2010-01-24 10:19:30 +0000 (Sun, 24 Jan 2010) Log Message: ----------- fontconfig: conf migrated to /etc/opt/csw Modified Paths: -------------- csw/mgar/pkg/fontconfig/trunk/Makefile csw/mgar/pkg/fontconfig/trunk/checksums csw/mgar/pkg/fontconfig/trunk/files/CSWfconfig.postinstall Modified: csw/mgar/pkg/fontconfig/trunk/Makefile =================================================================== --- csw/mgar/pkg/fontconfig/trunk/Makefile 2010-01-24 10:18:20 UTC (rev 8139) +++ csw/mgar/pkg/fontconfig/trunk/Makefile 2010-01-24 10:19:30 UTC (rev 8140) @@ -27,10 +27,12 @@ SPKG_SOURCEURL = http://www.fontconfig.org/ +MIGRATE_FILES = fontconfig + CONFIGURE_ARGS = $(DIRPATHS) CONFIGURE_ARGS += --with-default-fonts=/usr/openwin/lib/X11/fonts CONFIGURE_ARGS += --with-add-fonts=/usr/openwin/lib/locale,/usr/share/fonts,/opt/csw/share/fonts CONFIGURE_ARGS += --with-cache-dir=/var/opt/csw/cache/fontconfig -CONFIGURE_ARGS += --with-confdir=/opt/csw/etc/fontconfig +CONFIGURE_ARGS += --with-confdir=/etc/opt/csw/fontconfig include gar/category.mk Modified: csw/mgar/pkg/fontconfig/trunk/checksums =================================================================== --- csw/mgar/pkg/fontconfig/trunk/checksums 2010-01-24 10:18:20 UTC (rev 8139) +++ csw/mgar/pkg/fontconfig/trunk/checksums 2010-01-24 10:19:30 UTC (rev 8140) @@ -1,3 +1,3 @@ -8749af801a9e33c61092da59354bbceb CSWfconfig.postinstall +0d3f1e7200a203a89dee4324a421e275 CSWfconfig.postinstall bbdb45396408c48d50c7db5747dfae4e fix-zerowidth-struct.patch 77e15a92006ddc2adbb06f840d591c0e fontconfig-2.8.0.tar.gz Modified: csw/mgar/pkg/fontconfig/trunk/files/CSWfconfig.postinstall =================================================================== --- csw/mgar/pkg/fontconfig/trunk/files/CSWfconfig.postinstall 2010-01-24 10:18:20 UTC (rev 8139) +++ csw/mgar/pkg/fontconfig/trunk/files/CSWfconfig.postinstall 2010-01-24 10:19:30 UTC (rev 8140) @@ -8,6 +8,7 @@ echo ${BASEDIR}/usr/sbin/chroot ${CHROOTDIR} /opt/csw/bin/fc-cache -f -s +touch ${BASEDIR}/var/opt/csw/cache/fontconfig/.fc-cache_done 2>/dev/null ${BASEDIR}/usr/sbin/chroot ${CHROOTDIR} /opt/csw/bin/fc-list 2>&1 >/dev/null & @@ -15,8 +16,8 @@ find ${BASEDIR}/usr/openwin/lib/X11/fonts -user root -name fonts.cache-csw-1 -exec rm -f {} \; find ${BASEDIR}/usr/openwin/lib/locale -user root -name fonts.cache-csw-1 -exec rm -f {} \; find ${BASEDIR}/opt/csw -user root -name fonts.cache-csw-1 -exec rm -f {} \; -# removing ancient *.cache-csw-2 files -rm "${BASEDIR}/opt/csw/var/cache/fontconfig/*.cache-csw-2" 2>/dev/null +# removing ancient *.cache-2 files +rm ${BASEDIR}/var/opt/csw/cache/fontconfig/*.cache-2 2>/dev/null # remove obsolete cache dir [ -d "${BASEDIR}/opt/csw/var/cache-fontconfig" ] && rm -r "${BASEDIR}/opt/csw/var/cache-fontconfig" 2>/dev/null This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bensons at users.sourceforge.net Sun Jan 24 11:32:38 2010 From: bensons at users.sourceforge.net (bensons at users.sourceforge.net) Date: Sun, 24 Jan 2010 10:32:38 +0000 Subject: [csw-devel] SF.net SVN: gar:[8141] csw/mgar/pkg/cpan Message-ID: Revision: 8141 http://gar.svn.sourceforge.net/gar/?rev=8141&view=rev Author: bensons Date: 2010-01-24 10:32:38 +0000 (Sun, 24 Jan 2010) Log Message: ----------- cpan NetPacket: inital GAR checkin Added Paths: ----------- csw/mgar/pkg/cpan/NetPacket/ csw/mgar/pkg/cpan/NetPacket/branches/ csw/mgar/pkg/cpan/NetPacket/tags/ csw/mgar/pkg/cpan/NetPacket/trunk/ csw/mgar/pkg/cpan/NetPacket/trunk/Makefile csw/mgar/pkg/cpan/NetPacket/trunk/checksums csw/mgar/pkg/cpan/NetPacket/trunk/files/ Property changes on: csw/mgar/pkg/cpan/NetPacket/trunk ___________________________________________________________________ Added: svn:ignore + cookies download work Added: svn:externals + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 Added: csw/mgar/pkg/cpan/NetPacket/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/NetPacket/trunk/Makefile (rev 0) +++ csw/mgar/pkg/cpan/NetPacket/trunk/Makefile 2010-01-24 10:32:38 UTC (rev 8141) @@ -0,0 +1,17 @@ +GARNAME = NetPacket +GARVERSION = 0.41.1 +CATEGORIES = cpan +AUTHOR = YANICK + +DESCRIPTION = Modules to assemble/disassemble network packets +define BLURB + NetPacket provides a base class for a cluster of modules related to + decoding and encoding of network protocols. Each NetPacket descendent + module knows how to encode and decode packets for the network protocol + it implements. +endef + +PACKAGES = CSWpmnetpacket +CATALOGNAME = pm_netpacket + +include gar/category.mk Added: csw/mgar/pkg/cpan/NetPacket/trunk/checksums =================================================================== --- csw/mgar/pkg/cpan/NetPacket/trunk/checksums (rev 0) +++ csw/mgar/pkg/cpan/NetPacket/trunk/checksums 2010-01-24 10:32:38 UTC (rev 8141) @@ -0,0 +1 @@ +77c1482927c6892b9571404485ffe591 NetPacket-0.41.1.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From a_o_m at users.sourceforge.net Sun Jan 24 11:42:24 2010 From: a_o_m at users.sourceforge.net (a_o_m at users.sourceforge.net) Date: Sun, 24 Jan 2010 10:42:24 +0000 Subject: [csw-devel] SF.net SVN: gar:[8142] csw/mgar/pkg/fontconfig/trunk Message-ID: Revision: 8142 http://gar.svn.sourceforge.net/gar/?rev=8142&view=rev Author: a_o_m Date: 2010-01-24 10:42:24 +0000 (Sun, 24 Jan 2010) Log Message: ----------- fontconfig: fixed file name of old cache files Modified Paths: -------------- csw/mgar/pkg/fontconfig/trunk/checksums csw/mgar/pkg/fontconfig/trunk/files/CSWfconfig.postinstall Modified: csw/mgar/pkg/fontconfig/trunk/checksums =================================================================== --- csw/mgar/pkg/fontconfig/trunk/checksums 2010-01-24 10:32:38 UTC (rev 8141) +++ csw/mgar/pkg/fontconfig/trunk/checksums 2010-01-24 10:42:24 UTC (rev 8142) @@ -1,3 +1,3 @@ -0d3f1e7200a203a89dee4324a421e275 CSWfconfig.postinstall +efa9e30f80c303a90f0e42110ea0f933 CSWfconfig.postinstall bbdb45396408c48d50c7db5747dfae4e fix-zerowidth-struct.patch 77e15a92006ddc2adbb06f840d591c0e fontconfig-2.8.0.tar.gz Modified: csw/mgar/pkg/fontconfig/trunk/files/CSWfconfig.postinstall =================================================================== --- csw/mgar/pkg/fontconfig/trunk/files/CSWfconfig.postinstall 2010-01-24 10:32:38 UTC (rev 8141) +++ csw/mgar/pkg/fontconfig/trunk/files/CSWfconfig.postinstall 2010-01-24 10:42:24 UTC (rev 8142) @@ -16,8 +16,8 @@ find ${BASEDIR}/usr/openwin/lib/X11/fonts -user root -name fonts.cache-csw-1 -exec rm -f {} \; find ${BASEDIR}/usr/openwin/lib/locale -user root -name fonts.cache-csw-1 -exec rm -f {} \; find ${BASEDIR}/opt/csw -user root -name fonts.cache-csw-1 -exec rm -f {} \; -# removing ancient *.cache-2 files -rm ${BASEDIR}/var/opt/csw/cache/fontconfig/*.cache-2 2>/dev/null +# removing ancient *.cache-csw-2 files +rm ${BASEDIR}/var/opt/csw/cache/fontconfig/*.cache-csw-2 2>/dev/null # remove obsolete cache dir [ -d "${BASEDIR}/opt/csw/var/cache-fontconfig" ] && rm -r "${BASEDIR}/opt/csw/var/cache-fontconfig" 2>/dev/null This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bensons at users.sourceforge.net Sun Jan 24 11:42:55 2010 From: bensons at users.sourceforge.net (bensons at users.sourceforge.net) Date: Sun, 24 Jan 2010 10:42:55 +0000 Subject: [csw-devel] SF.net SVN: gar:[8143] csw/mgar/pkg/cpan Message-ID: Revision: 8143 http://gar.svn.sourceforge.net/gar/?rev=8143&view=rev Author: bensons Date: 2010-01-24 10:42:52 +0000 (Sun, 24 Jan 2010) Log Message: ----------- cpan Net-Analysis: initial GAR checkin Added Paths: ----------- csw/mgar/pkg/cpan/Net-Analysis/ csw/mgar/pkg/cpan/Net-Analysis/branches/ csw/mgar/pkg/cpan/Net-Analysis/tags/ csw/mgar/pkg/cpan/Net-Analysis/trunk/ csw/mgar/pkg/cpan/Net-Analysis/trunk/Makefile csw/mgar/pkg/cpan/Net-Analysis/trunk/checksums csw/mgar/pkg/cpan/Net-Analysis/trunk/files/ Property changes on: csw/mgar/pkg/cpan/Net-Analysis/trunk ___________________________________________________________________ Added: svn:ignore + cookies download work Added: svn:externals + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 Added: csw/mgar/pkg/cpan/Net-Analysis/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/Net-Analysis/trunk/Makefile (rev 0) +++ csw/mgar/pkg/cpan/Net-Analysis/trunk/Makefile 2010-01-24 10:42:52 UTC (rev 8143) @@ -0,0 +1,19 @@ +GARNAME = Net-Analysis +GARVERSION = 0.40 +CATEGORIES = cpan +AUTHOR = WORRALL + +DESCRIPTION = Modules for analysing network traffic +define BLURB + Net::Analysis is a suite of modules that parse tcpdump files, + reconstruct TCP sessions from the packets, and provide a very + lightweight framework for writing protocol anaylsers. +endef + +PACKAGES = CSWpmnetanalysis +CATALOGNAME = pm_netanalysis + +# depends +PREREQUISITE_PKGS = CSWpmnetpcap CSWpmnetpacket CSWpmtstmockobject + +include gar/category.mk Added: csw/mgar/pkg/cpan/Net-Analysis/trunk/checksums =================================================================== --- csw/mgar/pkg/cpan/Net-Analysis/trunk/checksums (rev 0) +++ csw/mgar/pkg/cpan/Net-Analysis/trunk/checksums 2010-01-24 10:42:52 UTC (rev 8143) @@ -0,0 +1 @@ +54a247f75ad2e5f5e3e3618bf5ae6b97 Net-Analysis-0.40.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From janholzh at users.sourceforge.net Sun Jan 24 13:38:19 2010 From: janholzh at users.sourceforge.net (janholzh at users.sourceforge.net) Date: Sun, 24 Jan 2010 12:38:19 +0000 Subject: [csw-devel] SF.net SVN: gar:[8144] csw/mgar/pkg/transmission/trunk Message-ID: Revision: 8144 http://gar.svn.sourceforge.net/gar/?rev=8144&view=rev Author: janholzh Date: 2010-01-24 12:38:19 +0000 (Sun, 24 Jan 2010) Log Message: ----------- transmission: Update to 1.82 Modified Paths: -------------- csw/mgar/pkg/transmission/trunk/Makefile csw/mgar/pkg/transmission/trunk/checksums Modified: csw/mgar/pkg/transmission/trunk/Makefile =================================================================== --- csw/mgar/pkg/transmission/trunk/Makefile 2010-01-24 10:42:52 UTC (rev 8143) +++ csw/mgar/pkg/transmission/trunk/Makefile 2010-01-24 12:38:19 UTC (rev 8144) @@ -1,5 +1,5 @@ GARNAME = transmission -GARVERSION = 1.80 +GARVERSION = 1.82 CATEGORIES = net DESCRIPTION = Fast, easy, and free multi-platform BitTorrent client Modified: csw/mgar/pkg/transmission/trunk/checksums =================================================================== --- csw/mgar/pkg/transmission/trunk/checksums 2010-01-24 10:42:52 UTC (rev 8143) +++ csw/mgar/pkg/transmission/trunk/checksums 2010-01-24 12:38:19 UTC (rev 8144) @@ -1,3 +1,3 @@ cbdb5cfaf24b68727042c3828b252534 icons-makefile.patch 7124b4836210a10fe649bba75c706cc9 linker-include.patch -19a7d7dd60527199d05cf5e2e775929e transmission-1.80.tar.bz2 +00fe9cc2c4f8e004c89825812e387fc4 transmission-1.82.tar.bz2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Sun Jan 24 14:26:16 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Sun, 24 Jan 2010 13:26:16 +0000 Subject: [csw-devel] SF.net SVN: gar:[8145] csw/mgar/pkg Message-ID: Revision: 8145 http://gar.svn.sourceforge.net/gar/?rev=8145&view=rev Author: dmichelsen Date: 2010-01-24 13:26:16 +0000 (Sun, 24 Jan 2010) Log Message: ----------- r: Initial commit Added Paths: ----------- csw/mgar/pkg/r/ csw/mgar/pkg/r/branches/ csw/mgar/pkg/r/tags/ csw/mgar/pkg/r/trunk/ csw/mgar/pkg/r/trunk/Makefile csw/mgar/pkg/r/trunk/checksums csw/mgar/pkg/r/trunk/files/ Property changes on: csw/mgar/pkg/r/trunk ___________________________________________________________________ Added: svn:ignore + cookies download work Added: svn:externals + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 Added: csw/mgar/pkg/r/trunk/Makefile =================================================================== --- csw/mgar/pkg/r/trunk/Makefile (rev 0) +++ csw/mgar/pkg/r/trunk/Makefile 2010-01-24 13:26:16 UTC (rev 8145) @@ -0,0 +1,26 @@ +GARNAME = R +GARVERSION = 2.10.1 +CATEGORIES = apps + +DESCRIPTION = A language and environment for statistical computing and graphics +define BLURB +endef + +MASTER_SITES = http://stat.ethz.ch/CRAN/src/base/R-2/ +DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz + +PACKAGES = CSWr +CATALOGNAME = r + +REQUIRED_PKGS = CSWggettextrt CSWiconv CSWlibicu CSWperl CSWreadline CSWsunmath + +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + +SPKG_SOURCEURL = http://www.r-project.org/ + +CONFIGURE_ARGS = $(DIRPATHS) + +TEST_TARGET = check-recommended + +include gar/category.mk Added: csw/mgar/pkg/r/trunk/checksums =================================================================== --- csw/mgar/pkg/r/trunk/checksums (rev 0) +++ csw/mgar/pkg/r/trunk/checksums 2010-01-24 13:26:16 UTC (rev 8145) @@ -0,0 +1 @@ +75f8b7e875b846ea96a4c6cc0abc00a4 R-2.10.1.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Sun Jan 24 15:16:53 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Sun, 24 Jan 2010 14:16:53 +0000 Subject: [csw-devel] SF.net SVN: gar:[8146] csw/mgar/pkg/scala/trunk/Makefile Message-ID: Revision: 8146 http://gar.svn.sourceforge.net/gar/?rev=8146&view=rev Author: dmichelsen Date: 2010-01-24 14:16:53 +0000 (Sun, 24 Jan 2010) Log Message: ----------- scala: Use new mGAR features Modified Paths: -------------- csw/mgar/pkg/scala/trunk/Makefile Modified: csw/mgar/pkg/scala/trunk/Makefile =================================================================== --- csw/mgar/pkg/scala/trunk/Makefile 2010-01-24 13:26:16 UTC (rev 8145) +++ csw/mgar/pkg/scala/trunk/Makefile 2010-01-24 14:16:53 UTC (rev 8146) @@ -15,8 +15,6 @@ DISTNAME = $(GARNAME)-$(GARVERSION).final SPKG_SOURCEURL = http://www.scala-lang.org/ -SPKG_CLASSES = none cswpreserveconf -REQUIRED_PKGS = CSWcswclassutils ARCHALL = 1 # We define upstream file regex so we can be notifed of new upstream software release @@ -28,10 +26,7 @@ TEST_SCRIPTS = INSTALL_SCRIPTS = custom -PROTOTYPE_FILTER = awk '\ - $$$$3 ~ /meta\/[^/]+.CSW$$$$/ { $$$$2 = "cswpreserveconf" } \ - $$$$3 ~ /config\/[^/]+.CSW$$$$/ { $$$$2 = "cswpreserveconf" } \ - { print }' +PRESERVECONF = .*/meta/[^/]+ .*/config/[^/]+ include gar/category.mk This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From idogan23 at users.sourceforge.net Sun Jan 24 19:58:22 2010 From: idogan23 at users.sourceforge.net (idogan23 at users.sourceforge.net) Date: Sun, 24 Jan 2010 18:58:22 +0000 Subject: [csw-devel] SF.net SVN: gar:[8147] csw/mgar/pkg/rrdtool/trunk Message-ID: Revision: 8147 http://gar.svn.sourceforge.net/gar/?rev=8147&view=rev Author: idogan23 Date: 2010-01-24 18:58:22 +0000 (Sun, 24 Jan 2010) Log Message: ----------- rrdtool: fixes from hson Modified Paths: -------------- csw/mgar/pkg/rrdtool/trunk/Makefile csw/mgar/pkg/rrdtool/trunk/checksums Modified: csw/mgar/pkg/rrdtool/trunk/Makefile =================================================================== --- csw/mgar/pkg/rrdtool/trunk/Makefile 2010-01-24 14:16:53 UTC (rev 8146) +++ csw/mgar/pkg/rrdtool/trunk/Makefile 2010-01-24 18:58:22 UTC (rev 8147) @@ -1,5 +1,5 @@ GARNAME = rrdtool -GARVERSION = 1.3.8 +GARVERSION = 1.4.2 CATEGORIES = utils DESCRIPTION = time-series data logging and graphing. @@ -36,13 +36,18 @@ EXTRA_PKG_CONFIG_DIRS = $(prefix)/X11/lib -CONFIGURE_ARGS = $(DIRPATHS) +EXTRA_SOS_LD_FLAGS = -L$(abspath $(prefix)/X11/lib/$(MM_LIBDIR)) +EXTRA_SOS_LD_OPTIONS = -R$(abspath $(prefix)/X11/lib/$(MM_LIBDIR)) + +CONFIGURE_ARS = $(DIRPATHS) CONFIGURE_ARGS += --with-docdir=$(sharedstatedir)/doc/$(GARNAME) CONFIGURE_ARGS += --disable-python CONFIGURE_ARGS += --enable-ruby CONFIGURE_ARGS += --disable-libintl CONFIGURE_ARGS += --enable-perl CONFIGURE_ARGS += --with-perl-options=INSTALLDIRS=vendor +CONFIGURE_ARGS += --x-includes=$(prefix)/X11/include +CONFIGURE_ARGS += --x-libraries=$(abspath $(prefix)/X11/lib/$(MM_LIBDIR)) EXTRA_MERGE_EXCLUDE_FILES = .*~ .*perllocal\.pod Modified: csw/mgar/pkg/rrdtool/trunk/checksums =================================================================== --- csw/mgar/pkg/rrdtool/trunk/checksums 2010-01-24 14:16:53 UTC (rev 8146) +++ csw/mgar/pkg/rrdtool/trunk/checksums 2010-01-24 18:58:22 UTC (rev 8147) @@ -1,2 +1,2 @@ -48a9b258cf8b4b943dbaf30ea939c315 download/CSWrrdtool.gspec -0de79494ab969cebfbfae3d237de18fe download/rrdtool-1.3.8.tar.gz +48a9b258cf8b4b943dbaf30ea939c315 CSWrrdtool.gspec +9318d3b4016dd9dd9897f1eac7548032 rrdtool-1.4.2.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From hson at users.sourceforge.net Mon Jan 25 00:26:33 2010 From: hson at users.sourceforge.net (hson at users.sourceforge.net) Date: Sun, 24 Jan 2010 23:26:33 +0000 Subject: [csw-devel] SF.net SVN: gar:[8148] csw/mgar/pkg/tiff/trunk Message-ID: Revision: 8148 http://gar.svn.sourceforge.net/gar/?rev=8148&view=rev Author: hson Date: 2010-01-24 23:26:33 +0000 (Sun, 24 Jan 2010) Log Message: ----------- tiff: Add runtime package Modified Paths: -------------- csw/mgar/pkg/tiff/trunk/Makefile Added Paths: ----------- csw/mgar/pkg/tiff/trunk/files/libtiff-CVE-2009-2347.patch csw/mgar/pkg/tiff/trunk/files/libtiff-jpeg-scanline.patch csw/mgar/pkg/tiff/trunk/files/libtiff-mantypo.patch csw/mgar/pkg/tiff/trunk/files/libtiff-scanlinesize.patch Modified: csw/mgar/pkg/tiff/trunk/Makefile =================================================================== --- csw/mgar/pkg/tiff/trunk/Makefile 2010-01-24 18:58:22 UTC (rev 8147) +++ csw/mgar/pkg/tiff/trunk/Makefile 2010-01-24 23:26:33 UTC (rev 8148) @@ -10,19 +10,23 @@ DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz DISTNAME = $(GARNAME)-$(GARVERSION) -PACKAGES = CSWtiff CSWtiffdevel CSWtiffdoc +PACKAGES = CSWtiff CSWtiffrt CSWtiffdevel CSWtiffdoc CATALOGNAME_CSWtiff = tiff +CATALOGNAME_CSWtiffrt = tiffrt CATALOGNAME_CSWtiffdevel = tiff_devel CATALOGNAME_CSWtiffdoc = tiff_doc -SPKG_DESC_CSWtiff += Library for writing single instance application -SPKG_DESC_CSWtiffdevel += Library for writing single instance application - developer package -SPKG_DESC_CSWtiffdoc += Library for writing single instance application - documentation +SPKG_DESC_CSWtiff += lib and tools for Tag Image File Format +SPKG_DESC_CSWtiffrt += lib and tools for Tag Image File Format - runtime package +SPKG_DESC_CSWtiffdevel += lib and tools for Tag Image File Format - developer package +SPKG_DESC_CSWtiffdoc += lib and tools for Tag Image File Format - documentation -REQUIRED_PKGS_CSWtiff += CSWjbigkit CSWjpeg CSWzlib -REQUIRED_PKGS_CSWtiffdevel += CSWtiff -REQUIRED_PKGS_CSWtiffdoc += CSWtiff +REQUIRED_PKGS_CSWtiff += CSWtiffrtCSWjbigkit CSWjpeg CSWzlib +REQUIRED_PKGS_CSWtiffrt += CSWjbigkit CSWjpeg CSWzlib +REQUIRED_PKGS_CSWtiffdevel += CSWtiffrt +REQUIRED_PKGS_CSWtiffdoc += +PKGFILES_CSWtiffrt = $(PKGFILES_RT) PKGFILES_CSWtiffdevel = $(PKGFILES_DEVEL) PKGFILES_CSWtiffdoc = $(sharedstatedir)/doc/.* @@ -32,6 +36,12 @@ SPKG_SOURCEURL = http://www.remotesensing.org/libtiff/ +# Patches from upstream (found via src.opensolaris.org), not applied for now +#PATCHFILES += libtiff-mantypo.patch +#PATCHFILES += libtiff-scanlinesize.patch +#PATCHFILES += libtiff-jpeg-scanline.patch +#PATCHFILES += libtiff-CVE-2009-2347.patch + BUILD64 = 1 STRIP_LIBTOOL = 1 Added: csw/mgar/pkg/tiff/trunk/files/libtiff-CVE-2009-2347.patch =================================================================== --- csw/mgar/pkg/tiff/trunk/files/libtiff-CVE-2009-2347.patch (rev 0) +++ csw/mgar/pkg/tiff/trunk/files/libtiff-CVE-2009-2347.patch 2010-01-24 23:26:33 UTC (rev 8148) @@ -0,0 +1,90 @@ +http://bugzilla.maptools.org/show_bug.cgi?id=2079 + + +diff -Naur tiff-3.9.2.orig/tools/tiff2rgba.c tiff-3.9.2/tools/tiff2rgba.c +--- tiff-3.9.2.orig/tools/tiff2rgba.c 2009-08-20 16:23:53.000000000 -0400 ++++ tiff-3.9.2/tools/tiff2rgba.c 2009-12-03 12:19:07.000000000 -0500 +@@ -125,6 +125,17 @@ + return (0); + } + ++static tsize_t ++multiply(tsize_t m1, tsize_t m2) ++{ ++ tsize_t prod = m1 * m2; ++ ++ if (m1 && prod / m1 != m2) ++ prod = 0; /* overflow */ ++ ++ return prod; ++} ++ + static int + cvt_by_tile( TIFF *in, TIFF *out ) + +@@ -134,6 +145,7 @@ + uint32 tile_width, tile_height; + uint32 row, col; + uint32 *wrk_line; ++ tsize_t raster_size; + int ok = 1; + + TIFFGetField(in, TIFFTAG_IMAGEWIDTH, &width); +@@ -151,7 +163,14 @@ + /* + * Allocate tile buffer + */ +- raster = (uint32*)_TIFFmalloc(tile_width * tile_height * sizeof (uint32)); ++ raster_size = multiply(multiply(tile_width, tile_height), sizeof (uint32)); ++ if (!raster_size) { ++ TIFFError(TIFFFileName(in), ++ "Can't allocate buffer for raster of size %lux%lu", ++ (unsigned long) tile_width, (unsigned long) tile_height); ++ return (0); ++ } ++ raster = (uint32*)_TIFFmalloc(raster_size); + if (raster == 0) { + TIFFError(TIFFFileName(in), "No space for raster buffer"); + return (0); +@@ -159,7 +178,7 @@ + + /* + * Allocate a scanline buffer for swapping during the vertical +- * mirroring pass. ++ * mirroring pass. (Request can't overflow given prior checks.) + */ + wrk_line = (uint32*)_TIFFmalloc(tile_width * sizeof (uint32)); + if (!wrk_line) { +@@ -236,6 +255,7 @@ + uint32 width, height; /* image width & height */ + uint32 row; + uint32 *wrk_line; ++ tsize_t raster_size; + int ok = 1; + + TIFFGetField(in, TIFFTAG_IMAGEWIDTH, &width); +@@ -251,7 +271,14 @@ + /* + * Allocate strip buffer + */ +- raster = (uint32*)_TIFFmalloc(width * rowsperstrip * sizeof (uint32)); ++ raster_size = multiply(multiply(width, rowsperstrip), sizeof (uint32)); ++ if (!raster_size) { ++ TIFFError(TIFFFileName(in), ++ "Can't allocate buffer for raster of size %lux%lu", ++ (unsigned long) width, (unsigned long) rowsperstrip); ++ return (0); ++ } ++ raster = (uint32*)_TIFFmalloc(raster_size); + if (raster == 0) { + TIFFError(TIFFFileName(in), "No space for raster buffer"); + return (0); +@@ -259,7 +286,7 @@ + + /* + * Allocate a scanline buffer for swapping during the vertical +- * mirroring pass. ++ * mirroring pass. (Request can't overflow given prior checks.) + */ + wrk_line = (uint32*)_TIFFmalloc(width * sizeof (uint32)); + if (!wrk_line) { Added: csw/mgar/pkg/tiff/trunk/files/libtiff-jpeg-scanline.patch =================================================================== --- csw/mgar/pkg/tiff/trunk/files/libtiff-jpeg-scanline.patch (rev 0) +++ csw/mgar/pkg/tiff/trunk/files/libtiff-jpeg-scanline.patch 2010-01-24 23:26:33 UTC (rev 8148) @@ -0,0 +1,59 @@ +http://bugzilla.maptools.org/show_bug.cgi?id=1936 + + +diff -Naur tiff-3.9.2.orig/libtiff/tif_dir.c tiff-3.9.2/libtiff/tif_dir.c +--- tiff-3.9.2.orig/libtiff/tif_dir.c 2008-12-31 19:10:43.000000000 -0500 ++++ tiff-3.9.2/libtiff/tif_dir.c 2010-01-05 19:59:12.000000000 -0500 +@@ -1100,6 +1100,13 @@ + */ + tif->tif_flags &= ~TIFF_ISTILED; + ++ /* ++ * Clear other directory-specific fields. ++ */ ++ tif->tif_tilesize = -1; ++ tif->tif_scanlinesize = -1; ++ ++ + return (1); + } + +diff -Naur tiff-3.9.2.orig/libtiff/tif_jpeg.c tiff-3.9.2/libtiff/tif_jpeg.c +--- tiff-3.9.2.orig/libtiff/tif_jpeg.c 2009-08-30 12:21:46.000000000 -0400 ++++ tiff-3.9.2/libtiff/tif_jpeg.c 2010-01-05 19:59:12.000000000 -0500 +@@ -1613,7 +1613,11 @@ + * Must recalculate cached tile size in case sampling state changed. + * Should we really be doing this now if image size isn't set? + */ +- tif->tif_tilesize = isTiled(tif) ? TIFFTileSize(tif) : (tsize_t) -1; ++ if( tif->tif_tilesize > 0 ) ++ tif->tif_tilesize = isTiled(tif) ? TIFFTileSize(tif) : (tsize_t) -1; ++ ++ if(tif->tif_scanlinesize > 0 ) ++ tif->tif_scanlinesize = TIFFScanlineSize(tif); + } + + static int +@@ -1741,13 +1745,21 @@ + return; + } + else +- { ++ { + if( !TIFFFillStrip( tif, 0 ) ) + return; + } + + TIFFSetField( tif, TIFFTAG_YCBCRSUBSAMPLING, + (uint16) sp->h_sampling, (uint16) sp->v_sampling ); ++ ++ /* ++ ** We want to clear the loaded strip so the application has time ++ ** to set JPEGCOLORMODE or other behavior modifiers. This essentially ++ ** undoes the JPEGPreDecode triggers by TIFFFileStrip(). (#1936) ++ */ ++ tif->tif_curstrip = -1; ++ + #endif /* CHECK_JPEG_YCBCR_SUBSAMPLING */ + } + Added: csw/mgar/pkg/tiff/trunk/files/libtiff-mantypo.patch =================================================================== --- csw/mgar/pkg/tiff/trunk/files/libtiff-mantypo.patch (rev 0) +++ csw/mgar/pkg/tiff/trunk/files/libtiff-mantypo.patch 2010-01-24 23:26:33 UTC (rev 8148) @@ -0,0 +1,15 @@ +http://bugzilla.maptools.org/show_bug.cgi?id=2129 + + +diff -Naur tiff-3.9.2.orig/man/tiffset.1 tiff-3.9.2/man/tiffset.1 +--- tiff-3.9.2.orig/man/tiffset.1 2006-04-20 08:17:19.000000000 -0400 ++++ tiff-3.9.2/man/tiffset.1 2009-12-03 12:11:58.000000000 -0500 +@@ -60,7 +60,7 @@ + ``Anonymous'': + .RS + .nf +-tiffset \-s 305 Anonymous a.tif ++tiffset \-s 315 Anonymous a.tif + .fi + .RE + .PP Added: csw/mgar/pkg/tiff/trunk/files/libtiff-scanlinesize.patch =================================================================== --- csw/mgar/pkg/tiff/trunk/files/libtiff-scanlinesize.patch (rev 0) +++ csw/mgar/pkg/tiff/trunk/files/libtiff-scanlinesize.patch 2010-01-24 23:26:33 UTC (rev 8148) @@ -0,0 +1,68 @@ +http://bugzilla.maptools.org/show_bug.cgi?id=2140 + + +diff -Naur tiff-3.9.2.orig/libtiff/tif_jpeg.c tiff-3.9.2/libtiff/tif_jpeg.c +--- tiff-3.9.2.orig/libtiff/tif_jpeg.c 2009-08-30 12:21:46.000000000 -0400 ++++ tiff-3.9.2/libtiff/tif_jpeg.c 2010-01-05 22:40:40.000000000 -0500 +@@ -988,8 +988,15 @@ + tsize_t nrows; + (void) s; + +- /* data is expected to be read in multiples of a scanline */ +- if ( (nrows = sp->cinfo.d.image_height) ) { ++ nrows = cc / sp->bytesperline; ++ if (cc % sp->bytesperline) ++ TIFFWarningExt(tif->tif_clientdata, tif->tif_name, "fractional scanline not read"); ++ ++ if( nrows > (int) sp->cinfo.d.image_height ) ++ nrows = sp->cinfo.d.image_height; ++ ++ /* data is expected to be read in multiples of a scanline */ ++ if (nrows) { + /* Cb,Cr both have sampling factors 1, so this is correct */ + JDIMENSION clumps_per_line = sp->cinfo.d.comp_info[1].downsampled_width; + int samples_per_clump = sp->samplesperclump; +@@ -1087,8 +1094,7 @@ + * TODO: resolve this */ + buf += sp->bytesperline; + cc -= sp->bytesperline; +- nrows -= sp->v_sampling; +- } while (nrows > 0); ++ } while (--nrows > 0); + + #ifdef JPEG_LIB_MK1 + _TIFFfree(tmpbuf); +diff -Naur tiff-3.9.2.orig/libtiff/tif_strip.c tiff-3.9.2/libtiff/tif_strip.c +--- tiff-3.9.2.orig/libtiff/tif_strip.c 2006-03-25 13:04:35.000000000 -0500 ++++ tiff-3.9.2/libtiff/tif_strip.c 2010-01-05 21:39:20.000000000 -0500 +@@ -238,23 +238,19 @@ + ycbcrsubsampling + 0, + ycbcrsubsampling + 1); + +- if (ycbcrsubsampling[0] == 0) { ++ if (ycbcrsubsampling[0]*ycbcrsubsampling[1] == 0) { + TIFFErrorExt(tif->tif_clientdata, tif->tif_name, + "Invalid YCbCr subsampling"); + return 0; + } + +- scanline = TIFFroundup(td->td_imagewidth, ++ /* number of sample clumps per line */ ++ scanline = TIFFhowmany(td->td_imagewidth, + ycbcrsubsampling[0]); +- scanline = TIFFhowmany8(multiply(tif, scanline, +- td->td_bitspersample, +- "TIFFScanlineSize")); +- return ((tsize_t) +- summarize(tif, scanline, +- multiply(tif, 2, +- scanline / ycbcrsubsampling[0], +- "TIFFVStripSize"), +- "TIFFVStripSize")); ++ /* number of samples per line */ ++ scanline = multiply(tif, scanline, ++ ycbcrsubsampling[0]*ycbcrsubsampling[1] + 2, ++ "TIFFScanlineSize"); + } else { + scanline = multiply(tif, td->td_imagewidth, + td->td_samplesperpixel, This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From hson at users.sourceforge.net Mon Jan 25 00:29:13 2010 From: hson at users.sourceforge.net (hson at users.sourceforge.net) Date: Sun, 24 Jan 2010 23:29:13 +0000 Subject: [csw-devel] SF.net SVN: gar:[8149] csw/mgar/pkg/jpeg Message-ID: Revision: 8149 http://gar.svn.sourceforge.net/gar/?rev=8149&view=rev Author: hson Date: 2010-01-24 23:29:13 +0000 (Sun, 24 Jan 2010) Log Message: ----------- Split package in tree Add intermediate makefile Modified Paths: -------------- csw/mgar/pkg/jpeg/trunk/Makefile Added Paths: ----------- csw/mgar/pkg/jpeg/Makefile Added: csw/mgar/pkg/jpeg/Makefile =================================================================== --- csw/mgar/pkg/jpeg/Makefile (rev 0) +++ csw/mgar/pkg/jpeg/Makefile 2010-01-24 23:29:13 UTC (rev 8149) @@ -0,0 +1,15 @@ +# vim: ft=make ts=4 sw=4 noet + +default: + @echo "You are in the pkg/ directory." + +%: + $(MAKE) -C trunk $* + +paranoid-%: + $(MAKE) -C trunk $* || exit 2 + +export BUILDLOG ?= $(shell pwd)/buildlog.txt + +report-%: + $(MAKE) -C trunk $* || echo " *** make $* in $$i failed ***" >> $(BUILDLOG) Modified: csw/mgar/pkg/jpeg/trunk/Makefile =================================================================== --- csw/mgar/pkg/jpeg/trunk/Makefile 2010-01-24 23:26:33 UTC (rev 8148) +++ csw/mgar/pkg/jpeg/trunk/Makefile 2010-01-24 23:29:13 UTC (rev 8149) @@ -1,5 +1,5 @@ GARNAME = jpeg -GARVERSION = 6 +GARVERSION = 7 CATEGORIES = lib DESCRIPTION = JPEG library and tools by the Independent JPEG Group @@ -10,14 +10,35 @@ MASTER_SITES = http://www.ijg.org/files/ DISTFILES = $(GARNAME)src.v$(GARVERSION).tar.gz -CONFIGURE_ARGS = $(DIRPATHS) -CONFIGURE_ARGS += --enable-shared +PACKAGES = CSWjpeg CSWjpegrt CSWjpegdevel +CATALOGNAME_CSWjpeg = jpeg +CATALOGNAME_CSWjpegrt = jpeg_rt +CATALOGNAME_CSWjpegdevel = jpeg_devel -EXTRA_CC_FLAGS = -g -w -EXTRA_CXX_FLAGS = -g -w -EXTRA_LD_FLAGS = -g -OPT_FLAGS_SOS = +SPKG_DESC_CSWjpeg += JPEG library and tools by the Independent JPEG Group +SPKG_DESC_CSWjpegrt += JPEG library and tools by the Independent JPEG Group - runtime package +SPKG_DESC_CSWjpegdevel += JPEG library and tools by the Independent JPEG Group - developer pa ckage +REQUIRED_PKGS_CSWjpeg += CSWjpegrt +REQUIRED_PKGS_CSWjpegrt += +REQUIRED_PKGS_CSWjpegdevel += CSWjpegrt + +PKGFILES_CSWjpegrt = $(PKGFILES_RT) +PKGFILES_CSWjpegdevel = $(PKGFILES_DEVEL) + +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.bz2 + +SPKG_SOURCEURL = http://www.ijg.org + +BUILD64 = 1 + STRIP_LIBTOOL = 1 +EXTRA_INC = $(prefix)/X11/include +EXTRA_LIB = $(prefix)/X11/lib +EXTRA_PKG_CONFIG_DIRS = $(prefix)/X11/lib + +CONFIGURE_ARGS = $(DIRPATHS) +CONFIGURE_ARGS += --enable-shared + include gar/category.mk This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From hson at users.sourceforge.net Mon Jan 25 00:42:58 2010 From: hson at users.sourceforge.net (hson at users.sourceforge.net) Date: Sun, 24 Jan 2010 23:42:58 +0000 Subject: [csw-devel] SF.net SVN: gar:[8150] csw/mgar/pkg/libcairo/trunk/Makefile Message-ID: Revision: 8150 http://gar.svn.sourceforge.net/gar/?rev=8150&view=rev Author: hson Date: 2010-01-24 23:42:57 +0000 (Sun, 24 Jan 2010) Log Message: ----------- libcairo: Update prerequsites Modified Paths: -------------- csw/mgar/pkg/libcairo/trunk/Makefile Modified: csw/mgar/pkg/libcairo/trunk/Makefile =================================================================== --- csw/mgar/pkg/libcairo/trunk/Makefile 2010-01-24 23:29:13 UTC (rev 8149) +++ csw/mgar/pkg/libcairo/trunk/Makefile 2010-01-24 23:42:57 UTC (rev 8150) @@ -28,7 +28,8 @@ PKGFILES_CSWlibcairodoc = $(sharedstatedir)/gtk-doc.* PKGFILES_CSWlibcairodoc += $(docdir)/libcairo_doc/.* -PREREQUISITE_PKGS = CSWlibxrenderdevel +PREREQUISITE_PKGS += CSWlibxrenderdevel CSWkbproto CSWrenderproto +PREREQUISITE_PKGS += CSWlibspectre REQUIRED_PKGS_CSWlibcairo = CSWfconfig REQUIRED_PKGS_CSWlibcairo += CSWftype2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From hson at users.sourceforge.net Mon Jan 25 00:47:44 2010 From: hson at users.sourceforge.net (hson at users.sourceforge.net) Date: Sun, 24 Jan 2010 23:47:44 +0000 Subject: [csw-devel] SF.net SVN: gar:[8151] csw/mgar/pkg/json-glib/trunk/Makefile Message-ID: Revision: 8151 http://gar.svn.sourceforge.net/gar/?rev=8151&view=rev Author: hson Date: 2010-01-24 23:47:44 +0000 (Sun, 24 Jan 2010) Log Message: ----------- json-glib: Package naming update Modified Paths: -------------- csw/mgar/pkg/json-glib/trunk/Makefile Modified: csw/mgar/pkg/json-glib/trunk/Makefile =================================================================== --- csw/mgar/pkg/json-glib/trunk/Makefile 2010-01-24 23:42:57 UTC (rev 8150) +++ csw/mgar/pkg/json-glib/trunk/Makefile 2010-01-24 23:47:44 UTC (rev 8151) @@ -18,27 +18,24 @@ MASTER_SITES = $(GNOME_MIRROR) DISTFILES = $(GARNAME)-$(GARVERSION).tar.bz2 -PACKAGES = CSWjsonglib CSWjsonglibdevel CSWjsonglibdoc -CATALOGNAME_CSWjsonglib = json_glib -CATALOGNAME_CSWjsonglibdevel = json_glib_devel -CATALOGNAME_CSWjsonglibdoc = json_glib_doc +PACKAGES = CSWjson-glib CSWjson-glibdevel CSWjson-glibdoc +CATALOGNAME_CSWjson-glib = json_glib +CATALOGNAME_CSWjson-glibdevel = json_glib_devel +CATALOGNAME_CSWjson-glibdoc = json_glib_doc -SPKG_DESC_CSWjsonglib += Library providing serialization and deserialization support for the JSON format -SPKG_DESC_CSWjsonglibdevel += Library providing serialization and deserialization support for the JSON format develiper package -SPKG_DESC_CSWjsonglibdoc += Library providing serialization and deserialization support for the JSON format documentation +SPKG_DESC_CSWjson-glib += Library providing serialization and deserialization support for the JSON format +SPKG_DESC_CSWjson-glibdevel += Library providing serialization and deserialization support for the JSON format develiper package +SPKG_DESC_CSWjson-glibdoc += Library providing serialization and deserialization support for the JSON format documentation -#PREREQUISITE_PKGS += CSWlibxcbdevel CSWlibpthreadstubs CSWlibxaudevel -#PREREQUISITE_PKGS += CSWxproto CSWrenderproto CSWkbproto CSWpython-devel +PKGFILES_CSWjson-glibdevel = $(PKGFILES_DEVEL) +PKGFILES_CSWjson-glibdoc = $(sharedstatedir)/gtk-doc/.* -#REQUIRED_PKGS += CSWbonobo2 CSWgconf2 CSWggettextrt CSWglib2 CSWgnomekeyring -#REQUIRED_PKGS += CSWgnomevfs2 CSWgtk2 CSWlibart CSWlibatk CSWlibbonoboui -#REQUIRED_PKGS += CSWlibcairo CSWlibglade2 CSWlibgnome CSWlibgnomecanvas -#REQUIRED_PKGS += CSWlibgnomeui CSWlibgoffice CSWlibgsf CSWlibpopt CSWlibxml2 -#REQUIRED_PKGS += CSWorbit2 CSWpango CSWperl CSWzlib -REQUIRED_PKGS_CSWjsonglib += CSWggettextrt CSWglib2 -REQUIRED_PKGS_CSWjsonglibdevel += CSWjsonglib -REQUIRED_PKGS_CSWjsonglibdoc += CSWjsonglib +ARCHALL_CSWjson-glibdoc = 1 +REQUIRED_PKGS_CSWjson-glib += CSWggettextrt CSWglib2 +REQUIRED_PKGS_CSWjson-glibdevel += CSWjson-glib +REQUIRED_PKGS_CSWjson-glibdoc += CSWjson-glib + UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.bz2 SPKG_SOURCEURL = http://live.gnome.org/JsonGlib @@ -47,8 +44,8 @@ EXTRA_LIB = $(prefix)/X11/lib EXTRA_PKG_CONFIG_DIRS = $(prefix)/X11/lib -NO_ISAEXEC = 1 -NOISALIST = 1 +#NO_ISAEXEC = 1 +#NOISALIST = 1 BUILD64 = 1 CONFIGURE_ARGS = $(DIRPATHS) @@ -57,11 +54,6 @@ SHELL = /opt/csw/bin/bash -PKGFILES_CSWjsonglibdevel = $(PKGFILES_DEVEL) -PKGFILES_CSWjsonglibdoc = $(sharedstatedir)/gtk-doc/.* - -ARCHALL_CSWjsonglibdoc = 1 - CONFIGURE_ARGS = $(DIRPATHS) include gar/category.mk This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From hson at users.sourceforge.net Mon Jan 25 00:53:15 2010 From: hson at users.sourceforge.net (hson at users.sourceforge.net) Date: Sun, 24 Jan 2010 23:53:15 +0000 Subject: [csw-devel] SF.net SVN: gar:[8152] csw/mgar/pkg/goocanvas/trunk/Makefile Message-ID: Revision: 8152 http://gar.svn.sourceforge.net/gar/?rev=8152&view=rev Author: hson Date: 2010-01-24 23:53:15 +0000 (Sun, 24 Jan 2010) Log Message: ----------- goocanvas: Fix link flags for X11 Modified Paths: -------------- csw/mgar/pkg/goocanvas/trunk/Makefile Modified: csw/mgar/pkg/goocanvas/trunk/Makefile =================================================================== --- csw/mgar/pkg/goocanvas/trunk/Makefile 2010-01-24 23:47:44 UTC (rev 8151) +++ csw/mgar/pkg/goocanvas/trunk/Makefile 2010-01-24 23:53:15 UTC (rev 8152) @@ -33,11 +33,7 @@ EXTRA_INC = $(prefix)/X11/include EXTRA_LIB = $(prefix)/X11/lib EXTRA_PKG_CONFIG_DIRS = $(prefix)/X11/lib -EXTRA_LINKER_FLAGS_isa-i386 = /usr/openwin/lib/libXext.so -EXTRA_LINKER_FLAGS_isa-sparcv8 = /usr/openwin/lib/libXext.so -EXTRA_LINKER_FLAGS_isa-amd64 = /usr/openwin/lib/amd64/libXext.so -EXTRA_LINKER_FLAGS_isa-sparcv9 = /usr/openwin/lib/sparcv9/libXext.so -EXTRA_LINKER_FLAGS += $(EXTRA_LINKER_FLAGS_$(MODULATION)) +EXTRA_SOS_LD_FLAGS = -L$(abspath $(prefix)/X11/lib/$(MM_LIBDIR)) #NO_ISAEXEC = 1 #NOISALIST = 1 @@ -54,6 +50,8 @@ STRIP_LIBTOOL = 1 CONFIGURE_ARGS = $(DIRPATHS) +CONFIGURE_ARGS += --x-include=$(prefix)/X11/include +CONFIGURE_ARGS += --x-libraries=$(abspath $(prefix)/X11/lib/$(MM_LIBDIR)) TEST_TARGET = check This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From hson at users.sourceforge.net Mon Jan 25 00:55:41 2010 From: hson at users.sourceforge.net (hson at users.sourceforge.net) Date: Sun, 24 Jan 2010 23:55:41 +0000 Subject: [csw-devel] SF.net SVN: gar:[8153] csw/mgar/pkg/gtksourceview/trunk/Makefile Message-ID: Revision: 8153 http://gar.svn.sourceforge.net/gar/?rev=8153&view=rev Author: hson Date: 2010-01-24 23:55:40 +0000 (Sun, 24 Jan 2010) Log Message: ----------- gtksourceview: Fix link flags for X11 Modified Paths: -------------- csw/mgar/pkg/gtksourceview/trunk/Makefile Modified: csw/mgar/pkg/gtksourceview/trunk/Makefile =================================================================== --- csw/mgar/pkg/gtksourceview/trunk/Makefile 2010-01-24 23:53:15 UTC (rev 8152) +++ csw/mgar/pkg/gtksourceview/trunk/Makefile 2010-01-24 23:55:40 UTC (rev 8153) @@ -37,12 +37,7 @@ EXTRA_INC = $(prefix)/X11/include EXTRA_LIB = $(prefix)/X11/lib EXTRA_PKG_CONFIG_DIRS = $(prefix)/X11/lib -#This is ugly, should be EXTRA_LINKER_FLAGS, but due to libtool it doesn't work -EXTRA_LD_FLAGS_isa-i386 = -L/usr/openwin/lib -lXext -EXTRA_LD_FLAGS_isa-sparcv8 = -L/usr/openwin/lib -lXext -EXTRA_LD_FLAGS_isa-amd64 = -L/usr/openwin/lib/amd64 -lXext -EXTRA_LD_FLAGS_isa-sparcv9 = -L/usr/openwin/lib/sparcv9 -lXext -EXTRA_LD_FLAGS += $(EXTRA_LD_FLAGS_$(MODULATION)) +EXTRA_SOS_LD_FLAGS = -L$(abspath $(prefix)/X11/lib/$(MM_LIBDIR)) #NO_ISAEXEC = 1 #NOISALIST = 1 @@ -55,6 +50,8 @@ ARCHALL_CSWgtksourceviewdoc = 1 CONFIGURE_ARGS = $(DIRPATHS) +CONFIGURE_ARGS += --x-include=$(prefix)/X11/include +CONFIGURE_ARGS += --x-libraries=$(abspath $(prefix)/X11/lib/$(MM_LIBDIR)) # Test fails due to: # Xlib: extension "Generic Event Extension" missing on display ":0.0". This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From hson at users.sourceforge.net Mon Jan 25 01:06:52 2010 From: hson at users.sourceforge.net (hson at users.sourceforge.net) Date: Mon, 25 Jan 2010 00:06:52 +0000 Subject: [csw-devel] SF.net SVN: gar:[8154] csw/mgar/pkg/lcms/trunk/Makefile Message-ID: Revision: 8154 http://gar.svn.sourceforge.net/gar/?rev=8154&view=rev Author: hson Date: 2010-01-25 00:06:47 +0000 (Mon, 25 Jan 2010) Log Message: ----------- Add runtime package Don't build static lib Modified Paths: -------------- csw/mgar/pkg/lcms/trunk/Makefile Modified: csw/mgar/pkg/lcms/trunk/Makefile =================================================================== --- csw/mgar/pkg/lcms/trunk/Makefile 2010-01-24 23:55:40 UTC (rev 8153) +++ csw/mgar/pkg/lcms/trunk/Makefile 2010-01-25 00:06:47 UTC (rev 8154) @@ -18,32 +18,33 @@ DISTFILES = $(GARNAME)-$(GARVERSION)$(GARSUBREV).tar.gz #DISTFILES = $(GARNAME)-$(GARVERSION)$(GARSUBREV).tar.gz -PACKAGES = CSWlcms CSWlcmsdevel +PACKAGES = CSWlcms CSWlcmsrt CSWlcmsdevel CATALOGNAME_CSWlcms = lcms +CATALOGNAME_CSWlcmsrt = lcms_rt CATALOGNAME_CSWlcmsdevel = lcms_devel SPKG_DESC_CSWlcms += The little color management system and tools +SPKG_DESC_CSWlcmsrt += The little color management system and tools - runtime package SPKG_DESC_CSWlcmsdevel += The little color management system and tools - developer package -REQUIRED_PKGS_CSWlcms += CSWjpeg CSWtiff CSWzlib +REQUIRED_PKGS_CSWlcms += CSWlcmsrt CSWjpeg CSWtiff CSWzlib +REQUIRED_PKGS_CSWlcmsrt += REQUIRED_PKGS_CSWlcmsdevel += CSWlcms +PKGFILES_CSWlcmsrt = $(PKGFILES_RT) PKGFILES_CSWlcmsdevel = $(PKGFILES_DEVEL) SPKG_SOURCEURL = http://www.littlecms.com LICENSE = COPYING -# We define upstream file regex so we can be notifed of new upstream software release UPSTREAM_MASTER_SITES = $(SF_PROJECT_SHOWFILE)=26279 UPSTREAM_USE_SF = 1 UFILES_REGEX = (\d+(?:\.\d+)*) -# If the url used to check for software update is different of MASTER_SITES, then -# uncomment the next line. Otherwise it is set by default to the value of MASTER_SITES -# UPSTREAM_MASTER_SITES = - CONFIGURE_ARGS = $(DIRPATHS) +CONFIGURE_ARGS += --enable-static=no +CONFIGURE_ARGS += --with-python BUILD64 = 1 @@ -51,4 +52,3 @@ include gar/category.mk -#SPKG_REVSTAMP := $(SPKG_REVSTAMP)_rev=$(GARSUBREV) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From hson at users.sourceforge.net Mon Jan 25 01:07:19 2010 From: hson at users.sourceforge.net (hson at users.sourceforge.net) Date: Mon, 25 Jan 2010 00:07:19 +0000 Subject: [csw-devel] SF.net SVN: gar:[8155] csw/mgar/pkg/ImageMagick/trunk/Makefile Message-ID: Revision: 8155 http://gar.svn.sourceforge.net/gar/?rev=8155&view=rev Author: hson Date: 2010-01-25 00:07:18 +0000 (Mon, 25 Jan 2010) Log Message: ----------- Add 64-bit support (even though not all modules can be built on 64-bit) Modified Paths: -------------- csw/mgar/pkg/ImageMagick/trunk/Makefile Modified: csw/mgar/pkg/ImageMagick/trunk/Makefile =================================================================== --- csw/mgar/pkg/ImageMagick/trunk/Makefile 2010-01-25 00:06:47 UTC (rev 8154) +++ csw/mgar/pkg/ImageMagick/trunk/Makefile 2010-01-25 00:07:18 UTC (rev 8155) @@ -32,14 +32,22 @@ #CPPFLAGS += -I/usr/openwin/include -I/usr/openwin/include/X11 -CONFIGURE_ARGS = $(DIRPATHS) -CONFIGURE_ARGS += --with-perl=$(bindir)/perl -CONFIGURE_ARGS += --enable-shared --disable-static -CONFIGURE_ARGS += --with-dps=yes --with-gslib=yes -CONFIGURE_ARGS += --x-includes=/opt/csw/X11/include -CONFIGURE_ARGS += --x-libraries=/opt/csw/X11/lib -CONFIGURE_ARGS += --disable-openmp +CONFIGURE_ARGS_COMMON = $(DIRPATHS) +CONFIGURE_ARGS_COMMON += --with-perl=$(bindir)/perl +CONFIGURE_ARGS_COMMON += --enable-shared --disable-static +CONFIGURE_ARGS_COMMON += --with-dps=yes --with-gslib=yes +CONFIGURE_ARGS_COMMON += --x-includes=/opt/csw/X11/include +CONFIGURE_ARGS_COMMON += --x-libraries=/opt/csw/X11/lib +CONFIGURE_ARGS_COMMON += --disable-openmp +CONFIGURE_ARGS_isa-amd64 += --without-gvc +CONFIGURE_ARGS_isa-amd64 += --without-rsvg +CONFIGURE_ARGS_isa-amd64 += --without-perl +CONFIGURE_ARGS_isa-sparcv9 += --without-gvc +CONFIGURE_ARGS_isa-sparcv9 += --without-rsvg +CONFIGURE_ARGS_isa-sparcv9 += --without-perl +CONFIGURE_ARGS ?= $(CONFIGURE_ARGS_COMMON) $(foreach M,$(MODULATIONS),$(CONFIGURE_ARGS_$M)) + PATCHFILES += Makefile.patch # Temporary patch until upstream make a more permenent fix #PATCHFILES += djvu.c.diff @@ -48,13 +56,17 @@ #TEST_TARGET = check TEST_TARGET = +BUILD64 = 1 + EXTRA_INC = $(prefix)/X11/include EXTRA_LIB = $(prefix)/X11/lib EXTRA_PKG_CONFIG_DIRS = $(prefix)/X11/lib -EXTRA_LD_OPTIONS = -L./magick/.libs +#EXTRA_LDFLAGS = -L./magick/.libs +#EXTRA_LD_OPTIONS = -L./magick/.libs # We want to be link with Xrender from $(prefix)/X11/lib not $(prefix)/lib # since the latter is linked to /usr/openwin/lib/libX11.so.4 -EXTRA_SOS_LD_FLAGS = -L$(abspath $(prefix)/X11/lib/$(MM_LIBDIR)) +EXTRA_SOS_LD_FLAGS = -L./magick/.libs +EXTRA_SOS_LD_FLAGS +=-L$(abspath $(prefix)/X11/lib/$(MM_LIBDIR)) MERGE_EXCLUDE_LIBTOOL ?= $(libdir)/lib.*\.la EXTRA_MERGE_EXCLUDE_FILES = .*/perllocal.pod @@ -73,7 +85,7 @@ @( if [ ! -r $(INSTALLISADIR)$(libdir)/libWand.so.10.0.4 ] ; then ln -s libWand.so.10.0.4 $(INSTALLISADIR)$(libdir)/libWand.so.10 ; fi ) @( if [ ! -r $(INSTALLISADIR)$(libdir)/libMagick++.so.10.0.4 ] ; then ln -s libMagick++.so.10.0.4 $(INSTALLISADIR)$(libdir)/libMagick++.so.10 ; fi ) @ln -s ImageMagick-$(GARVERSION) $(INSTALLISADIR)$(docdir)/ImageMagick - @( cd $(INSTALLISADIR)$(libdir) ; gzip -dc $(DESTDIR)/../../$(FILEDIR)/lib_6.2.9_s.tar.gz |tar xf -) + @( cd $(INSTALLISADIR)$(libdir) ; gzip -dc $(CURDIR)/$(FILEDIR)/lib_6.2.9_s.tar.gz |tar xf -) @mv $(INSTALLISADIR)$(mandir)/man1/compare.1 $(INSTALLISADIR)$(mandir)/man1/compare2.1 @mv $(INSTALLISADIR)$(bindir)/compare $(INSTALLISADIR)$(bindir)/compare2 @$(MAKECOOKIE) @@ -86,7 +98,7 @@ @( if [ ! -r $(INSTALLISADIR)$(libdir)/libWand.so.10.0.4 ] ; then ln -s libWand.so.10.0.4 $(INSTALLISADIR)$(libdir)/libWand.so.10 ; fi ) @( if [ ! -r $(INSTALLISADIR)$(libdir)/libMagick++.so.10.0.4 ] ; then ln -s libMagick++.so.10.0.4 $(INSTALLISADIR)$(libdir)/libMagick++.so.10 ; fi ) @ln -s ImageMagick-$(GARVERSION) $(INSTALLISADIR)$(docdir)/ImageMagick - @( cd $(INSTALLISADIR)$(libdir) ; gzip -dc $(DESTDIR)/../../$(FILEDIR)/lib_6.2.9_i.tar.gz |tar xf -) + @( cd $(INSTALLISADIR)$(libdir) ; gzip -dc $(CURDIR)/$(FILEDIR)/lib_6.2.9_i.tar.gz |tar xf -) @mv $(INSTALLISADIR)$(mandir)/man1/compare.1 $(INSTALLISADIR)$(mandir)/man1/compare2.1 @mv $(INSTALLISADIR)$(bindir)/compare $(INSTALLISADIR)$(bindir)/compare2 @$(MAKECOOKIE) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From hson at users.sourceforge.net Mon Jan 25 01:29:13 2010 From: hson at users.sourceforge.net (hson at users.sourceforge.net) Date: Mon, 25 Jan 2010 00:29:13 +0000 Subject: [csw-devel] SF.net SVN: gar:[8156] csw/mgar/pkg/librsvg/trunk/Makefile Message-ID: Revision: 8156 http://gar.svn.sourceforge.net/gar/?rev=8156&view=rev Author: hson Date: 2010-01-25 00:29:13 +0000 (Mon, 25 Jan 2010) Log Message: ----------- librsvg: Add some missing dependecy Modified Paths: -------------- csw/mgar/pkg/librsvg/trunk/Makefile Modified: csw/mgar/pkg/librsvg/trunk/Makefile =================================================================== --- csw/mgar/pkg/librsvg/trunk/Makefile 2010-01-25 00:07:18 UTC (rev 8155) +++ csw/mgar/pkg/librsvg/trunk/Makefile 2010-01-25 00:29:13 UTC (rev 8156) @@ -28,11 +28,13 @@ REQUIRED_PKGS += CSWbzip2 CSWfconfig CSWftype2 CSWggettextrt REQUIRED_PKGS += CSWglib2 CSWgs CSWgtk2 CSWiconv CSWlibatk -REQUIRED_PKGS += CSWlibcairo CSWlibcroco CSWlibgsf +REQUIRED_PKGS += CSWlibcairo CSWlibcroco CSWlibgsf CSWlibx11 REQUIRED_PKGS += CSWlibxml2 CSWlibxml2devel CSWpango CSWpng CSWzlib REQUIRED_PKGS += CSWbonobo2 CSWgconf2 CSWgnomevfs2 CSWlibxrender CSWorbit2 -# We define upstream file regex so we can be notifed of new upstream software release +# Only if building mozilla plugin +#PREREQUISITE_PKGS += CSWmozilla + UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.bz2 # Upstream develops on gcc only @@ -40,8 +42,8 @@ PATCHFILES += perceptualdiff.patch # Upstream have missed adding some required libs PATCHFILES += test_makefiles.patch -# gtkdoc-rebase doesn't exist -PATCHFILES += doc_makefile.patch +# gtkdoc-rebase doesn't exist (now it does) +#PATCHFILES += doc_makefile.patch LIBS=-lm EXTRA_COMMON_EXPORTS = LIBS This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From hson at users.sourceforge.net Mon Jan 25 01:31:23 2010 From: hson at users.sourceforge.net (hson at users.sourceforge.net) Date: Mon, 25 Jan 2010 00:31:23 +0000 Subject: [csw-devel] SF.net SVN: gar:[8157] csw/mgar/pkg/ImageMagick/trunk Message-ID: Revision: 8157 http://gar.svn.sourceforge.net/gar/?rev=8157&view=rev Author: hson Date: 2010-01-25 00:31:22 +0000 (Mon, 25 Jan 2010) Log Message: ----------- Update to 6.5.9-0 Disable silent build Modified Paths: -------------- csw/mgar/pkg/ImageMagick/trunk/Makefile csw/mgar/pkg/ImageMagick/trunk/checksums Modified: csw/mgar/pkg/ImageMagick/trunk/Makefile =================================================================== --- csw/mgar/pkg/ImageMagick/trunk/Makefile 2010-01-25 00:29:13 UTC (rev 8156) +++ csw/mgar/pkg/ImageMagick/trunk/Makefile 2010-01-25 00:31:22 UTC (rev 8157) @@ -1,6 +1,6 @@ GARNAME = imagemagick -GARVERSION = 6.5.8 -GARSUBREV = 10 +GARVERSION = 6.5.9 +GARSUBREV = 0 CATEGORIES = lib DESCRIPTION = A comprehensive package supporting automated and interative manipulation of images @@ -30,8 +30,6 @@ # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = ImageMagick-((\d+(?:\.\d+)*)-(\d+)?).tar.bz2 -#CPPFLAGS += -I/usr/openwin/include -I/usr/openwin/include/X11 - CONFIGURE_ARGS_COMMON = $(DIRPATHS) CONFIGURE_ARGS_COMMON += --with-perl=$(bindir)/perl CONFIGURE_ARGS_COMMON += --enable-shared --disable-static @@ -39,6 +37,7 @@ CONFIGURE_ARGS_COMMON += --x-includes=/opt/csw/X11/include CONFIGURE_ARGS_COMMON += --x-libraries=/opt/csw/X11/lib CONFIGURE_ARGS_COMMON += --disable-openmp +CONFIGURE_ARGS_COMMON += --disable-silent-rules CONFIGURE_ARGS_isa-amd64 += --without-gvc CONFIGURE_ARGS_isa-amd64 += --without-rsvg CONFIGURE_ARGS_isa-amd64 += --without-perl Modified: csw/mgar/pkg/ImageMagick/trunk/checksums =================================================================== --- csw/mgar/pkg/ImageMagick/trunk/checksums 2010-01-25 00:29:13 UTC (rev 8156) +++ csw/mgar/pkg/ImageMagick/trunk/checksums 2010-01-25 00:31:22 UTC (rev 8157) @@ -1,2 +1,2 @@ -fc04d56c32bb2eebba7885d0db042f9a ImageMagick-6.5.8-10.tar.bz2 +58130d17863449ad1b7c6d04cee95943 ImageMagick-6.5.9-0.tar.bz2 6bd361fe352c7d497d60d8d2cbe7cfd4 Makefile.patch This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From hson at users.sourceforge.net Mon Jan 25 01:31:40 2010 From: hson at users.sourceforge.net (hson at users.sourceforge.net) Date: Mon, 25 Jan 2010 00:31:40 +0000 Subject: [csw-devel] SF.net SVN: gar:[8158] csw/mgar/pkg/libpaper/trunk/Makefile Message-ID: Revision: 8158 http://gar.svn.sourceforge.net/gar/?rev=8158&view=rev Author: hson Date: 2010-01-25 00:31:39 +0000 (Mon, 25 Jan 2010) Log Message: ----------- libpaper: Build 64-bit Modified Paths: -------------- csw/mgar/pkg/libpaper/trunk/Makefile Modified: csw/mgar/pkg/libpaper/trunk/Makefile =================================================================== --- csw/mgar/pkg/libpaper/trunk/Makefile 2010-01-25 00:31:22 UTC (rev 8157) +++ csw/mgar/pkg/libpaper/trunk/Makefile 2010-01-25 00:31:39 UTC (rev 8158) @@ -29,6 +29,8 @@ EXTRA_CFLAGS = -Xc +BUILD64 = 1 + CONFIGURE_ARGS = $(DIRPATHS) TEST_TARGET = check This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From hson at users.sourceforge.net Mon Jan 25 03:02:24 2010 From: hson at users.sourceforge.net (hson at users.sourceforge.net) Date: Mon, 25 Jan 2010 02:02:24 +0000 Subject: [csw-devel] SF.net SVN: gar:[8159] csw/mgar/pkg/libsoup Message-ID: Revision: 8159 http://gar.svn.sourceforge.net/gar/?rev=8159&view=rev Author: hson Date: 2010-01-25 02:02:24 +0000 (Mon, 25 Jan 2010) Log Message: ----------- libsoup: Inital commit Added Paths: ----------- csw/mgar/pkg/libsoup/branches/ csw/mgar/pkg/libsoup/tags/ csw/mgar/pkg/libsoup/trunk/Makefile csw/mgar/pkg/libsoup/trunk/checksums csw/mgar/pkg/libsoup/trunk/files/ Property Changed: ---------------- csw/mgar/pkg/libsoup/trunk/ Property changes on: csw/mgar/pkg/libsoup/trunk ___________________________________________________________________ Added: svn:ignore + cookies download work Added: csw/mgar/pkg/libsoup/trunk/Makefile =================================================================== --- csw/mgar/pkg/libsoup/trunk/Makefile (rev 0) +++ csw/mgar/pkg/libsoup/trunk/Makefile 2010-01-25 02:02:24 UTC (rev 8159) @@ -0,0 +1,56 @@ +GARNAME = libsoup +GARVERSION = 2.26.3 +CATEGORIES = lib + + +DESCRIPTION = HTTP client/server library for GNOME +define BLURB +endef +MASTER_SITES = $(GNOME_MIRROR) +DISTFILES = $(GARNAME)-$(GARVERSION).tar.bz2 + + +PACKAGES = CSWlibsoup CSWlibsoupdevel CSWlibsoupdoc +CATALOGNAME_CSWlibsoup = libsoup +CATALOGNAME_CSWlibsoupdevel = libsoup_devel +CATALOGNAME_CSWlibsoupdoc = libsoup_doc + +SPKG_DESC_CSWlibsoup += HTTP client/server library for GNOME +SPKG_DESC_CSWlibsoupdevel += HTTP client/server library for GNOME - developer package +SPKG_DESC_CSWlibsoupdoc += HTTP client/server library for GNOME - documentation + +REQUIRED_PKGS_CSWlibsoup += CSWgconf2 CSWgcrypt CSWggettextrt CSWglib2 +REQUIRED_PKGS_CSWlibsoup += CSWgnutls CSWgpgerr CSWlibproxy CSWlibxml2 +REQUIRED_PKGS_CSWlibsoup += CSWsqlite3rt +REQUIRED_PKGS_CSWlibsoupdevel += CSWlibsoup +REQUIRED_PKGS_CSWlibsoupdoc += + +PREREQUISITE_PKGS += CSWlibproxy + +PKGFILES_CSWlibsoupdevel = $(PKGFILES_DEVEL) +PKGFILES_CSWlibsoupdoc = $(sharedstatedir)/gtk-doc/.* + +ARCHALL_CSWlibsoupdoc = 1 + +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.bz2 + +EXTRA_INC = /opt/csw/X11/include +EXTRA_LIB = /opt/csw/X11/lib +EXTRA_PKG_CONFIG_DIRS = $(prefix)/X11/lib +EXTRA_SOS_LD_FLAGS = -L$(abspath $(prefix)/X11/lib/$(MM_LIBDIR)) + +CONFIGURE_ARGS = $(DIRPATHS) +CONFIGURE_ARGS += --x-includes=$(prefix)/X11/include +CONFIGURE_ARGS += --x-libraries=$(abspath $(prefix)/X11/lib/$(MM_LIBDIR)) + +STRIP_LIBTOOL = 1 + +# Not working until gconf2 is 64-bit +#BUILD64 = 1 + +# One test fails for some unknown reason +#TEST_TARGET = check +TEST_TARGET = + +include gar/category.mk Added: csw/mgar/pkg/libsoup/trunk/checksums =================================================================== --- csw/mgar/pkg/libsoup/trunk/checksums (rev 0) +++ csw/mgar/pkg/libsoup/trunk/checksums 2010-01-25 02:02:24 UTC (rev 8159) @@ -0,0 +1 @@ +19f15636380a9a08a0f071cc53069b80 libsoup-2.26.3.tar.bz2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From hson at users.sourceforge.net Mon Jan 25 03:04:10 2010 From: hson at users.sourceforge.net (hson at users.sourceforge.net) Date: Mon, 25 Jan 2010 02:04:10 +0000 Subject: [csw-devel] SF.net SVN: gar:[8160] csw/mgar/pkg/libsoup/trunk/ Message-ID: Revision: 8160 http://gar.svn.sourceforge.net/gar/?rev=8160&view=rev Author: hson Date: 2010-01-25 02:04:09 +0000 (Mon, 25 Jan 2010) Log Message: ----------- libsoup: Add gar Property Changed: ---------------- csw/mgar/pkg/libsoup/trunk/ Property changes on: csw/mgar/pkg/libsoup/trunk ___________________________________________________________________ Added: svn:externals + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From hson at users.sourceforge.net Mon Jan 25 03:47:29 2010 From: hson at users.sourceforge.net (hson at users.sourceforge.net) Date: Mon, 25 Jan 2010 02:47:29 +0000 Subject: [csw-devel] SF.net SVN: gar:[8161] csw/mgar/pkg/librsvg/trunk/Makefile Message-ID: Revision: 8161 http://gar.svn.sourceforge.net/gar/?rev=8161&view=rev Author: hson Date: 2010-01-25 02:47:29 +0000 (Mon, 25 Jan 2010) Log Message: ----------- librsvg: Split package Modified Paths: -------------- csw/mgar/pkg/librsvg/trunk/Makefile Modified: csw/mgar/pkg/librsvg/trunk/Makefile =================================================================== --- csw/mgar/pkg/librsvg/trunk/Makefile 2010-01-25 02:04:09 UTC (rev 8160) +++ csw/mgar/pkg/librsvg/trunk/Makefile 2010-01-25 02:47:29 UTC (rev 8161) @@ -26,14 +26,36 @@ LICENSE = COPYING.LIB -REQUIRED_PKGS += CSWbzip2 CSWfconfig CSWftype2 CSWggettextrt -REQUIRED_PKGS += CSWglib2 CSWgs CSWgtk2 CSWiconv CSWlibatk -REQUIRED_PKGS += CSWlibcairo CSWlibcroco CSWlibgsf CSWlibx11 -REQUIRED_PKGS += CSWlibxml2 CSWlibxml2devel CSWpango CSWpng CSWzlib -REQUIRED_PKGS += CSWbonobo2 CSWgconf2 CSWgnomevfs2 CSWlibxrender CSWorbit2 +PACKAGES = CSWlibrsvg CSWlibrsvgdevel CSWlibrsvgdoc CSWlibrsvgmozilla +CATALOGNAME_CSWlibrsvg = librsvg +CATALOGNAME_CSWlibrsvgdevel = librsvg_devel +CATALOGNAME_CSWlibrsvgdoc = librsvg_doc +CATALOGNAME_CSWlibrsvgmozilla = librsvg_mozilla + +SPKG_DESC_CSWlibrsvg += Scalable Vector Graphics library +SPKG_DESC_CSWlibrsvgdevel += Scalable Vector Graphics library - developer package +SPKG_DESC_CSWlibrsvgdoc += Scalable Vector Graphics library - documentation +SPKG_DESC_CSWlibrsvgmozilla += Scalable Vector Graphics library - Mozilla plugin + +REQUIRED_PKGS_CSWlibrsvg += CSWfconfig CSWftype2 CSWggettextrt +REQUIRED_PKGS_CSWlibrsvg += CSWglib2 CSWgtk2 CSWlibatk +REQUIRED_PKGS_CSWlibrsvg += CSWlibcairo CSWlibcroco CSWlibgsf CSWlibx11 +REQUIRED_PKGS_CSWlibrsvg += CSWlibxml2 CSWpango CSWpng CSWzlib CSWorbit2 +REQUIRED_PKGS_CSWlibrsvg += CSWbonobo2 CSWgconf2 CSWgnomevfs2 CSWlibxrender +REQUIRED_PKGS_CSWlibrsvgdevel += CSWlibrsvg +REQUIRED_PKGS_CSWlibrsvgdoc += +REQUIRED_PKGS_CSWlibrsvgmozilla += CSWggettextrt CSWglib2 + +PKGFILES_CSWlibrsvgdevel = $(PKGFILES_DEVEL) +PKGFILES_CSWlibrsvgmozilla = $(libdir)/mozilla/.* +PKGFILES_CSWlibrsvgdoc = $(sharedstatedir)/gtk-doc/.* + +ARCHALL_CSWlibrsvgdoc = 1 + # Only if building mozilla plugin -#PREREQUISITE_PKGS += CSWmozilla +PREREQUISITE_PKGS += CSWmozilla +PREREQUISITE_PKGS += CSWlibxml2devel UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.bz2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From hson at users.sourceforge.net Mon Jan 25 04:03:22 2010 From: hson at users.sourceforge.net (hson at users.sourceforge.net) Date: Mon, 25 Jan 2010 03:03:22 +0000 Subject: [csw-devel] SF.net SVN: gar:[8162] csw/mgar/pkg/ghostscript/trunk Message-ID: Revision: 8162 http://gar.svn.sourceforge.net/gar/?rev=8162&view=rev Author: hson Date: 2010-01-25 03:03:21 +0000 (Mon, 25 Jan 2010) Log Message: ----------- ghostscript: Final fixes for GAR package Modified Paths: -------------- csw/mgar/pkg/ghostscript/trunk/Makefile csw/mgar/pkg/ghostscript/trunk/checksums Added Paths: ----------- csw/mgar/pkg/ghostscript/trunk/files/0004-PLATFORM-is-used-by-GAR.patch csw/mgar/pkg/ghostscript/trunk/files/0005-Fix-pathes-according-to-old-package.patch csw/mgar/pkg/ghostscript/trunk/files/0006-Fix-dynamic-link-flag.patch Modified: csw/mgar/pkg/ghostscript/trunk/Makefile =================================================================== --- csw/mgar/pkg/ghostscript/trunk/Makefile 2010-01-25 02:47:29 UTC (rev 8161) +++ csw/mgar/pkg/ghostscript/trunk/Makefile 2010-01-25 03:03:21 UTC (rev 8162) @@ -9,11 +9,17 @@ MASTER_SITES = $(SF_MIRRORS) DISTFILES = $(GARNAME)-$(GARVERSION).tar.bz2 -SPKG_SOURCEURL = http://www.ghostscript.com +PACKAGES = CSWgs +CATALOGNAME_CSWgs = ghostscript +SPKG_DESC_CSWgs = Ghostscript, a PostScript and PDF interpreter for previewing, conversion and printing -LICENSE = COPYING +REQUIRED_PKGS_CSWgs += CSWfconfig CSWjpeg CSWlibcairo CSWgsfonts +REQUIRED_PKGS_CSWgs += CSWftype2 CSWggettextrt CSWglib2 CSWgnutls CSWgtk2 +REQUIRED_PKGS_CSWgs += CSWkrb5lib CSWlibatk CSWlibcups CSWpango CSWperl CSWzlib +# Pending release of libpaper +#REQUIRED_PKGS_CSWgs += CSWlibpaper -REQUIRED_PKGS += +SPKG_SOURCEURL = http://www.ghostscript.com UPSTREAM_MASTER_SITES = $(SF_PROJECT_SHOWFILE)= UPSTREAM_USE_SF = 1 @@ -22,21 +28,40 @@ #PATCHFILES += 0001-Support-libjpeg7.patch PATCHFILES += 0002-Rearrange-compiler-flags.patch PATCHFILES += 0003-Change-gcc-flags-to-sun.patch +PATCHFILES += 0004-PLATFORM-is-used-by-GAR.patch +PATCHFILES += 0005-Fix-pathes-according-to-old-package.patch +PATCHFILES += 0006-Fix-dynamic-link-flag.patch -#BUILD64 = 1 +# Not until libcupsimage.so libcups.so libkrb5.so libk5crypto.so +# libcom_err.so libkrb5support.so are 64-bit EXTRA_INC = $(prefix)/X11/include EXTRA_LIB = $(prefix)/X11/lib EXTRA_PKG_CONFIG_DIRS = $(prefix)/X11/lib +# We want to be linked with Xrender from $(prefix)/X11/lib not +# $(prefix)/lib since the latter is linked to /usr/openwin/lib/libX11.so.4 +EXTRA_SOS_LD_FLAGS = -L$(abspath $(prefix)/X11/lib/$(MM_LIBDIR)) CONFIGURE_ARGS = $(DIRPATHS) CONFIGURE_ARGS += --enable-dynamic +CONFIGURE_ARGS += --enable-cups +CONFIGURE_ARGS += --with-fontpath=$(datadir)/ghostscript/fonts CONFIGURE_ARGS += --x-includes=$(prefix)/X11/include CONFIGURE_ARGS += --x-libraries=$(prefix)/X11/lib +# This fails due to ghostscript using PLATFORM for internal use which gets set +# by GAR +#TEST_TARGET = check +TEST_TARGET = + include gar/category.mk +BUILD_ARGS = std so +INSTALL_ARGS = install install-so + +# Use CSW build packages instead of bundled stuff pre-configure-$(MODULATION): - @(echo "~~~ Removing bundled jpeglib ~~~") + @(echo "~~~ Removing bundled stuff ~~~") @rm -rf $(WORKSRC)/jpeg + @rm -rf $(WORKSRC)/jbig2dec # @rm -rf $(WORKSRC)/jasper Modified: csw/mgar/pkg/ghostscript/trunk/checksums =================================================================== --- csw/mgar/pkg/ghostscript/trunk/checksums 2010-01-25 02:47:29 UTC (rev 8161) +++ csw/mgar/pkg/ghostscript/trunk/checksums 2010-01-25 03:03:21 UTC (rev 8162) @@ -1,3 +1,7 @@ +251419464651542627742f241455a935 0001-Support-libjpeg7.patch 5ebe8476ccc2170e4f2d620fe284f875 0002-Rearrange-compiler-flags.patch 5c142b23f91c2b2f48ba1f354e26346f 0003-Change-gcc-flags-to-sun.patch +c3b8108ba2a09ce9473e785cdea12662 0004-PLATFORM-is-used-by-GAR.patch +b4957c4667d2bf767c2a18707429477d 0005-Fix-pathes-according-to-old-package.patch +0ac8a3bc8cc018a695c892328f65f2cf 0006-Fix-dynamic-link-flag.patch 526366f8cb4fda0d3d293597cc5b984b ghostscript-8.70.tar.bz2 Added: csw/mgar/pkg/ghostscript/trunk/files/0004-PLATFORM-is-used-by-GAR.patch =================================================================== --- csw/mgar/pkg/ghostscript/trunk/files/0004-PLATFORM-is-used-by-GAR.patch (rev 0) +++ csw/mgar/pkg/ghostscript/trunk/files/0004-PLATFORM-is-used-by-GAR.patch 2010-01-25 03:03:21 UTC (rev 8162) @@ -0,0 +1,116 @@ +diff -Nru ghostscript-8.70.orig/base/gs.mak ghostscript-8.70/base/gs.mak +--- ghostscript-8.70.orig/base/gs.mak 2009-01-27 21:43:37.000000000 +0100 ++++ ghostscript-8.70/base/gs.mak 2010-01-10 23:24:54.511788159 +0100 +@@ -363,7 +363,7 @@ + FEATURE_DEVS_EXTRA= + DEVICE_DEVS_EXTRA= + +-DEVS_ALL=$(GLGENDIR)$(D)$(PLATFORM).dev\ ++DEVS_ALL=$(GLGENDIR)$(D)$(BUILD_PLATFORM).dev\ + $(FEATURE_DEVS) $(FEATURE_DEVS_EXTRA) \ + $(DEVICE_DEVS) $(DEVICE_DEVS1) \ + $(DEVICE_DEVS2) $(DEVICE_DEVS3) $(DEVICE_DEVS4) $(DEVICE_DEVS5) \ +@@ -375,7 +375,7 @@ + + devs_tr=$(GLGENDIR)$(D)devs.tr + $(devs_tr) : $(GS_MAK) $(TOP_MAKEFILES) $(ECHOGS_XE) +- $(EXP)$(ECHOGS_XE) -w $(devs_tr) - -include $(GLGENDIR)$(D)$(PLATFORM) ++ $(EXP)$(ECHOGS_XE) -w $(devs_tr) - -include $(GLGENDIR)$(D)$(BUILD_PLATFORM) + $(EXP)$(ECHOGS_XE) -a $(devs_tr) -+ $(FEATURE_DEVS) + $(EXP)$(ECHOGS_XE) -a $(devs_tr) -+ $(FEATURE_DEVS_EXTRA) + $(EXP)$(ECHOGS_XE) -a $(devs_tr) -+ $(DEVICE_DEVS) +diff -Nru ghostscript-8.70.orig/base/macos-mcp.mak ghostscript-8.70/base/macos-mcp.mak +--- ghostscript-8.70.orig/base/macos-mcp.mak 2009-01-08 10:17:18.000000000 +0100 ++++ ghostscript-8.70/base/macos-mcp.mak 2010-01-10 23:25:55.154224777 +0100 +@@ -75,7 +75,7 @@ + + # Define the platform name. + +-PLATFORM=macos_ ++BUILD_PLATFORM=macos_ + + + # don't use any shared libraries, they are compiled into the Ghostscript Lib +@@ -267,7 +267,7 @@ + include $(GLSRCDIR)/unixhead.mak + + # Redefine the platform name before going on +-PLATFORM=macos_ ++BUILD_PLATFORM=macos_ + + include $(GLSRCDIR)/gs.mak + # psromfs.mak must precede lib.mak +diff -Nru ghostscript-8.70.orig/base/msvclib.mak ghostscript-8.70/base/msvclib.mak +--- ghostscript-8.70.orig/base/msvclib.mak 2008-08-29 01:16:39.000000000 +0200 ++++ ghostscript-8.70/base/msvclib.mak 2010-01-10 23:26:01.887097616 +0100 +@@ -445,7 +445,7 @@ + + LIB_ONLY=$(GLOBJDIR)\gslib.obj $(GLOBJDIR)\gsnogc.obj $(GLOBJDIR)\gconfig.obj $(GLOBJDIR)\gscdefs.obj $(GLOBJDIR)\gsromfs$(COMPILE_INITS).obj + MAKEDLL=0 +-PLATFORM=mslib32_ ++BUILD_PLATFORM=mslib32_ + + !include $(GLSRCDIR)\version.mak + !include $(GLSRCDIR)\msvccmd.mak +diff -Nru ghostscript-8.70.orig/base/openvms.mak ghostscript-8.70/base/openvms.mak +--- ghostscript-8.70.orig/base/openvms.mak 2009-01-08 10:17:18.000000000 +0100 ++++ ghostscript-8.70/base/openvms.mak 2010-01-10 23:25:36.911773955 +0100 +@@ -270,7 +270,7 @@ + + # Define the platform name. + +-PLATFORM=openvms_ ++BUILD_PLATFORM=openvms_ + + # Define the name of the makefile -- used in dependencies. + +diff -Nru ghostscript-8.70.orig/base/openvms.mmk ghostscript-8.70/base/openvms.mmk +--- ghostscript-8.70.orig/base/openvms.mmk 2009-01-08 10:17:18.000000000 +0100 ++++ ghostscript-8.70/base/openvms.mmk 2010-01-10 23:25:27.461102799 +0100 +@@ -298,7 +298,7 @@ + + # Define the platform name. + +-PLATFORM=openvms_ ++BUILD_PLATFORM=openvms_ + + # Define the name of the makefile -- used in dependencies. + +diff -Nru ghostscript-8.70.orig/base/unixhead.mak ghostscript-8.70/base/unixhead.mak +--- ghostscript-8.70.orig/base/unixhead.mak 2007-12-31 19:07:59.000000000 +0100 ++++ ghostscript-8.70/base/unixhead.mak 2010-01-10 23:22:33.391601312 +0100 +@@ -21,7 +21,7 @@ + # Define the platform name. For a "stock" System V platform, + # use sysv_ instead of unix_. + +-PLATFORM=unix_ ++BUILD_PLATFORM=unix_ + + # Define the syntax for command, object, and executable files. + +diff -Nru ghostscript-8.70.orig/base/watclib.mak ghostscript-8.70/base/watclib.mak +--- ghostscript-8.70.orig/base/watclib.mak 2009-01-08 10:17:18.000000000 +0100 ++++ ghostscript-8.70/base/watclib.mak 2010-01-10 23:25:03.490859364 +0100 +@@ -115,7 +115,7 @@ + SYNC=winsync + !endif + +-PLATFORM=watclib_ ++BUILD_PLATFORM=watclib_ + MAKEFILE=$(GLSRCDIR)\watclib.mak + TOP_MAKEFILES=$(MAKEFILE) $(GLSRCDIR)\wccommon.mak + PLATOPT= +diff -Nru ghostscript-8.70.orig/base/winlib.mak ghostscript-8.70/base/winlib.mak +--- ghostscript-8.70.orig/base/winlib.mak 2009-02-21 21:59:34.000000000 +0100 ++++ ghostscript-8.70/base/winlib.mak 2010-01-10 23:25:12.830496306 +0100 +@@ -28,8 +28,8 @@ + + # Define the platform name. + +-!ifndef PLATFORM +-PLATFORM=mswin32_ ++!ifndef BUILD_PLATFORM ++BUILD_PLATFORM=mswin32_ + !endif + + # Define the auxiliary program dependency. We use this to Added: csw/mgar/pkg/ghostscript/trunk/files/0005-Fix-pathes-according-to-old-package.patch =================================================================== --- csw/mgar/pkg/ghostscript/trunk/files/0005-Fix-pathes-according-to-old-package.patch (rev 0) +++ csw/mgar/pkg/ghostscript/trunk/files/0005-Fix-pathes-according-to-old-package.patch 2010-01-25 03:03:21 UTC (rev 8162) @@ -0,0 +1,27 @@ +--- ../../../work.old/solaris8-sparc/build-isa-sparcv8/ghostscript-8.70.orig/Makefile.in 2009-05-22 01:46:45.000000000 +0200 ++++ ghostscript-8.70/Makefile.in 2010-01-11 04:36:20.575145752 +0100 +@@ -67,11 +67,11 @@ + # The following must be substituted using @datadir@ and @libdir@ + # to avoid adding RPM generation paths (CUPS STR #1112) + gsdir = @datadir@/ghostscript +-gsdatadir = $(gsdir)/$(GS_DOT_VERSION) ++gsdatadir = $(gsdir) + gssharedir = @libdir@/ghostscript/$(GS_DOT_VERSION) + gsincludedir = @includedir@/ghostscript/ + +-docdir=$(gsdatadir)/doc ++docdir=$(gsdir)/doc/ghostscript + exdir=$(gsdatadir)/examples + GS_DOCDIR=$(docdir) + +@@ -342,8 +342,8 @@ + RM=rm -f + + # ------ Dynamic loader options ------- # +-SOC_CFLAGS = @SOC_CFLAGS@ +-SOC_LIBS = @SOC_LIBS@ ++SOC_CFLAGS = -I/opt/csw/X11/include @SOC_CFLAGS@ ++SOC_LIBS = -L/opt/csw/X11/lib @SOC_LIBS@ + SOC_LOADER = @SOC_LOADER@ + + Added: csw/mgar/pkg/ghostscript/trunk/files/0006-Fix-dynamic-link-flag.patch =================================================================== --- csw/mgar/pkg/ghostscript/trunk/files/0006-Fix-dynamic-link-flag.patch (rev 0) +++ csw/mgar/pkg/ghostscript/trunk/files/0006-Fix-dynamic-link-flag.patch 2010-01-25 03:03:21 UTC (rev 8162) @@ -0,0 +1,11 @@ +--- ghostscript-8.70.orig/base/unix-dll.mak 2008-09-13 22:22:25.000000000 +0200 ++++ ghostscript-8.70/base/unix-dll.mak 2010-01-11 03:00:54.165762459 +0100 +@@ -49,7 +49,7 @@ + GS_SONAME=$(GS_SONAME_BASE).$(GS_SOEXT) + GS_SONAME_MAJOR=$(GS_SONAME).$(GS_VERSION_MAJOR) + GS_SONAME_MAJOR_MINOR=$(GS_SONAME).$(GS_VERSION_MAJOR).$(GS_VERSION_MINOR) +-LDFLAGS_SO=-shared -Wl,-soname=$(GS_SONAME_MAJOR) ++LDFLAGS_SO=-G -h$(GS_SONAME_MAJOR) + + # MacOS X + #GS_SOEXT=dylib This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bonivart at users.sourceforge.net Mon Jan 25 11:30:29 2010 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Mon, 25 Jan 2010 10:30:29 +0000 Subject: [csw-devel] SF.net SVN: gar:[8163] csw/mgar/pkg/bind/trunk Message-ID: Revision: 8163 http://gar.svn.sourceforge.net/gar/?rev=8163&view=rev Author: bonivart Date: 2010-01-25 10:30:29 +0000 (Mon, 25 Jan 2010) Log Message: ----------- bind: update to 9.6.1-P3 Modified Paths: -------------- csw/mgar/pkg/bind/trunk/Makefile csw/mgar/pkg/bind/trunk/checksums Modified: csw/mgar/pkg/bind/trunk/Makefile =================================================================== --- csw/mgar/pkg/bind/trunk/Makefile 2010-01-25 03:03:21 UTC (rev 8162) +++ csw/mgar/pkg/bind/trunk/Makefile 2010-01-25 10:30:29 UTC (rev 8163) @@ -1,6 +1,9 @@ +# readme for chroot pkg? +# owner/group for device files? (root:sys) + GARNAME = bind GARVERSION = 9.6.1 -RELEASE = P2 +RELEASE = P3 DISTVERSION = $(GARVERSION)-$(RELEASE) SPKG_VERSION = $(GARVERSION)$(RELEASE) DISTNAME = $(GARNAME)-$(GARVERSION)-$(RELEASE) @@ -44,7 +47,6 @@ REQUIRED_PKGS_CSWbindutils = CSWlibbind CSWiconv CSWlibxml2 CSWosslrt CSWzlib REQUIRED_PKGS_CSWbindchroot = CSWbind -# We define upstream file regex so we can be notifed of new upstream software release UPSTREAM_MASTER_SITES = http://ftp.isc.org/isc/bind9/ UFILES_REGEX = (\d+(?:\.\d+)*) Modified: csw/mgar/pkg/bind/trunk/checksums =================================================================== --- csw/mgar/pkg/bind/trunk/checksums 2010-01-25 03:03:21 UTC (rev 8162) +++ csw/mgar/pkg/bind/trunk/checksums 2010-01-25 10:30:29 UTC (rev 8163) @@ -1,2 +1,2 @@ dbbc839888d11d22aad3ccb65942d2e5 CSWbindchroot.postinstall -435bc2e26e470d46ddf2acb24abb6ea6 bind-9.6.1-P2.tar.gz +a0952d589b3051538033387be4c983f9 bind-9.6.1-P3.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Mon Jan 25 12:26:35 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Mon, 25 Jan 2010 11:26:35 +0000 Subject: [csw-devel] SF.net SVN: gar:[8164] csw/mgar Message-ID: Revision: 8164 http://gar.svn.sourceforge.net/gar/?rev=8164&view=rev Author: wahwah Date: 2010-01-25 11:26:34 +0000 (Mon, 25 Jan 2010) Log Message: ----------- mGAR v2-dirpackage: Static build tests. Added Paths: ----------- csw/mgar/gar/v2-dirpackage/lib/ csw/mgar/gar/v2-dirpackage/lib/python/ csw/mgar/gar/v2-dirpackage/lib/python/opencsw.py csw/mgar/gar/v2-dirpackage/tests/ csw/mgar/gar/v2-dirpackage/tests/gartest.py csw/mgar/gar/v2-dirpackage/tests/run_tests.py csw/mgar/gar/v2-dirpackage/tests/static/ csw/mgar/gar/v2-dirpackage/tests/static/example/ csw/mgar/gar/v2-dirpackage/tests/static/example/Makefile csw/mgar/gar/v2-dirpackage/tests/static/example/checksums csw/mgar/gar/v2-dirpackage/tests/static/example/gar Removed Paths: ------------- csw/mgar/gar/v2-dirpackage/tests/gartest.py csw/mgar/pkg/tests/gartest.py csw/mgar/pkg/tests/run_tests.py Added: csw/mgar/gar/v2-dirpackage/lib/python/opencsw.py =================================================================== --- csw/mgar/gar/v2-dirpackage/lib/python/opencsw.py (rev 0) +++ csw/mgar/gar/v2-dirpackage/lib/python/opencsw.py 2010-01-25 11:26:34 UTC (rev 8164) @@ -0,0 +1,718 @@ +#!/opt/csw/bin/python2.6 +# coding=utf-8 +# +# $Id$ +# +# vim:set sw=2 ts=2 sts=2 expandtab: +# +# Copyright (c) 2009 OpenCSW +# Author: Maciej Blizi?ski +# +# This program is free software; you can redistribute it and/or modify it under +# the terms of the GNU General Public License version 2 as published by the +# Free Software Foundation. + +import copy +import datetime +import difflib +import logging +import os +import os.path +import re +import shutil +import subprocess +import tempfile +import urllib2 + +ARCHITECTURES = ["i386", "sparc", "all"] +MAJOR_VERSION = "major version" +MINOR_VERSION = "minor version" +PATCHLEVEL = "patchlevel" +REVISION = "revision" +OTHER_VERSION_INFO = "other version info" +NEW_PACKAGE = "new package" +NO_VERSION_CHANGE = "no version change" +REVISION_ADDED = "revision number added" +PKG_URL_TMPL = "http://www.opencsw.org/packages/%s" +CATALOG_URL = "http://mirror.opencsw.org/opencsw/current/i386/5.10/catalog" +ADMIN_FILE_CONTENT = """ +basedir=default +runlevel=nocheck +conflict=nocheck +setuid=nocheck +action=nocheck +partial=nocheck +instance=unique +idepend=quit +rdepend=quit +space=quit +authentication=nocheck +networktimeout=10 +networkretries=5 +keystore=/var/sadm/security +proxy= +""" +EMAIL_TMPL = """From: %(from)s +To: %(to)s +Cc: %(cc)s +Date: %(date)s +Subject: newpkgs %(pkgnames)s + +%(body)s + +-- +$Id$ +""" + + +class Error(Exception): + pass + + +class PackageError(Error): + pass + + +def ParsePackageFileName(p): + bits = p.split("-") + catalogname = bits[0] + version, version_info, revision_info = ParseVersionString(bits[1]) + data = { + 'catalogname': catalogname, + 'full_version_string': bits[1], + 'version': version, + 'version_info': version_info, + 'revision_info': revision_info, + } + return data + +def ParseVersionString(s): + version_bits = re.split("_|,", s) + version_str = version_bits[0] + revision_bits = version_bits[1:] + revision_info = {} + version_info = {} + version_number_bits = version_str.split(".") + version_info[MAJOR_VERSION] = version_number_bits[0] + if len(version_number_bits) >= 2: + version_info[MINOR_VERSION] = version_number_bits[1] + if len(version_number_bits) >= 3: + version_info[PATCHLEVEL] = version_number_bits[2] + for version_bit in revision_bits: + if "=" in version_bit: + (var_name, var_value) = version_bit.split("=") + revision_info[var_name] = var_value + else: + if not "extra_strings" in revision_info: + revision_info["extra_strings"] = [] + revision_info["extra_strings"].append(version_bit) + return version_str, version_info, revision_info + + +class CatalogBasedOpencswPackage(object): + + catalog_downloaded = False + + def __init__(self, catalogname): + self.catalogname = catalogname + + def IsOnTheWeb(self): + url = PKG_URL_TMPL % self.catalogname + logging.debug("Opening %s", repr(url)) + package_page = urllib2.urlopen(url) + html = package_page.read() + # Since beautifulsoup is not installed on the buildfarm yet, a quirk in + # package page display is going to be used. + package_not_in_mantis_pattern = u"cannot find maintainer" + return html.find(package_not_in_mantis_pattern) >= 0 + + def IsNew(self): + return not self.IsOnTheWeb() + + def UpgradeType(self, new_version_string): + """What kind of upgrade would it be if the new version was X. + + This function contains ugly logic. It has many unit tests to prove that it + does the right thing. + + Args: + New (candidate) version string + + Returns: + Revision type, message, (old_data, new_data) + """ + (new_version, + new_version_info, + new_revision_info) = ParseVersionString(new_version_string) + catalog_data = self.GetCatalogPkgData() + if not catalog_data: + return (NEW_PACKAGE, + "/dev/null -> %s" % new_version_string, + (None, new_version_string)) + cat_version_info = catalog_data["version_info"] + levels = (MAJOR_VERSION, MINOR_VERSION, PATCHLEVEL) + for level in levels: + if level in cat_version_info and level in new_version_info: + if (cat_version_info[level] != new_version_info[level]): + versions = (catalog_data["full_version_string"], new_version_string) + msg = "%s --> %s" % versions + return level, msg, versions + cat_rev_info = catalog_data["revision_info"] + for rev_kw in new_revision_info: + if rev_kw in cat_rev_info: + if cat_rev_info[rev_kw] != new_revision_info[rev_kw]: + msg = "%s: %s --> %s" % (rev_kw, + cat_rev_info[rev_kw], + new_revision_info[rev_kw]) + versions = cat_rev_info[rev_kw], new_revision_info[rev_kw] + return REVISION, msg, versions + else: + # This revision info is missing from the old package + msg = "new tag %s: %s" % (repr(rev_kw), + new_revision_info[rev_kw]) + return REVISION_ADDED, msg, (None, new_revision_info[rev_kw]) + if (catalog_data["version"] == new_version + and + catalog_data["revision_info"] == new_revision_info): + return NO_VERSION_CHANGE, "no", (new_version, new_version) + return OTHER_VERSION_INFO, "other", (None, None) + + @classmethod + def LazyDownloadCatalogData(cls, catalog_source=None): + if not cls.catalog_downloaded: + cls.DownloadCatalogData(catalog_source) + cls.catalog_downloaded = True + + @classmethod + def DownloadCatalogData(cls, catalog_source): + """Downloads catalog data.""" + logging.debug("Downloading catalog data from %s.", repr(CATALOG_URL)) + if not catalog_source: + catalog_source = urllib2.urlopen(CATALOG_URL) + cls.catalog = {} + for line in catalog_source: + # Working around the GPG signature + if line.startswith("#"): continue + if "BEGIN PGP SIGNED MESSAGE" in line: continue + if line.startswith("Hash:"): continue + if len(line.strip()) <= 0: continue + if "BEGIN PGP SIGNATURE" in line: break + fields = re.split(r"\s+", line) + try: + cls.catalog[fields[0]] = ParsePackageFileName(fields[3]) + except IndexError, e: + print repr(line) + print fields + print e + raise + + @classmethod + def _GetCatalogPkgData(cls, catalogname): + cls.LazyDownloadCatalogData() + if catalogname in cls.catalog: + return cls.catalog[catalogname] + else: + return None + + def GetCatalogPkgData(self): + """A wrapper for the classmethod _GetCatalogPkgData, supplying the catalogname.""" + return self._GetCatalogPkgData(self.catalogname) + + +class StagingDir(object): + """Represents a staging directory.""" + + def __init__(self, dir_path): + self.dir_path = dir_path + + def GetLatest(self, software, architectures=ARCHITECTURES): + files = os.listdir(self.dir_path) + package_files = [] + for a in architectures: + relevant_pkgs = sorted(shutil.fnmatch.filter(files, + "*-%s-*.pkg.gz" % a)) + relevant_pkgs = sorted(shutil.fnmatch.filter(relevant_pkgs, + "%s-*.pkg.gz" % software)) + if relevant_pkgs: + package_files.append(relevant_pkgs[-1]) + if not package_files: + raise PackageError("Could not find %s in %s" % (software, self.dir_path)) + logging.debug("The latest packages %s in %s are %s", + repr(software), + repr(self.dir_path), + repr(package_files)) + return [os.path.join(self.dir_path, x) for x in package_files] + + +class NewpkgMailer(object): + + def __init__(self, pkgnames, paths, + release_mgr_name, + release_mgr_email, + sender_name, + sender_email, + release_cc): + self.sender = u"%s <%s>" % (sender_name, sender_email) + self.pkgnames = pkgnames + self.paths = paths + self.release_mgr = u"%s <%s>" % (release_mgr_name, release_mgr_email) + self.release_cc = u"%s" % release_cc + + def FormatMail(self): + body_list = ["The following package files are ready to be released:"] + body_list.append("") + # Gathering package information, grouping packages that are upgraded + # together. + pkgs_data = {} + for p in self.paths: + base_file_name = os.path.split(p)[1] + catalogname = base_file_name.split("-")[0] + pkg = CatalogBasedOpencswPackage(catalogname) + new_data = ParsePackageFileName(base_file_name) + new_version_str = new_data["full_version_string"] + catalog_data = pkg.GetCatalogPkgData() + if catalog_data: + catalog_version_str = catalog_data["full_version_string"] + else: + catalog_version_str = "package not in the catalog" + upgrade_type, upgrade_msg, versions = pkg.UpgradeType(new_version_str) + pkgs_data_key = (upgrade_type, upgrade_msg, versions) + if pkgs_data_key not in pkgs_data: + pkgs_data[pkgs_data_key] = [] + pkg.srv4path = p + pkg.cat_version_str = catalog_version_str + pkg.new_version_str = new_version_str + pkgs_data[pkgs_data_key].append(pkg) + # Formatting grouped packages: + for upgrade_type, upgrade_msg, versions in pkgs_data: + msg = [] + pkgs = pkgs_data[(upgrade_type, upgrade_msg, versions)] + group_name = CatalogNameGroupName([pkg.catalogname for pkg in pkgs]) + if upgrade_type == NEW_PACKAGE: + msg.append("* %s: %s" % (upgrade_type, group_name)) + elif upgrade_type == NO_VERSION_CHANGE: + msg.append("* WARNING: no version change of %s" % group_name) + else: + msg.append("* %s: %s upgrade" % (group_name, upgrade_type)) + msg.append(" - from: %s" % versions[0]) + msg.append(" - to: %s" % versions[1]) + for pkg in pkgs: + msg.append(" + %s" % os.path.split(pkg.srv4path)[1]) + body_list.extend(msg) + body_list.append("") + body = "\n".join(body_list) + d = { + 'from': self.sender, + 'to': self.release_mgr, + 'cc': self.release_cc, + 'pkgnames': ", ".join(self.pkgnames), + 'body': body, + 'date': datetime.datetime.now(), + } + mail_text = EMAIL_TMPL % d + return mail_text + + def GetEditorName(self, env): + editor = "/opt/csw/bin/vim" + if "EDITOR" in env: + editor = env["EDITOR"] + if "VISUAL" in env: + editor = env["VISUAL"] + return editor + + +class ShellMixin(object): + + def ShellCommand(self, args, quiet=False): + logging.debug("Calling: %s", repr(args)) + if quiet: + sub_stdout = subprocess.PIPE + sub_stderr = subprocess.PIPE + else: + sub_stdout = None + sub_stderr = None + retcode = subprocess.call(args, + stdout=sub_stdout, + stderr=sub_stderr) + if retcode: + raise Error("Running %s has failed." % repr(args)) + return retcode + + +class CswSrv4File(ShellMixin, object): + """Represents a package in the srv4 format (pkg).""" + + def __init__(self, pkg_path): + self.pkg_path = pkg_path + self.workdir = None + self.gunzipped_path = None + self.transformed = False + self.dir_format_pkg = None + + def GetWorkDir(self): + if not self.workdir: + self.workdir = tempfile.mkdtemp(prefix="pkg_") + fd = open(os.path.join(self.workdir, "admin"), "w") + fd.write(ADMIN_FILE_CONTENT) + fd.close() + return self.workdir + + def GetAdminFilePath(self): + return os.path.join(self.GetWorkDir(), "admin") + + def GetGunzippedPath(self): + gzip_suffix = ".gz" + pkg_suffix = ".pkg" + if not self.gunzipped_path: + if self.pkg_path.endswith("%s%s" % (pkg_suffix, gzip_suffix)): + base_name_gz = os.path.split(self.pkg_path)[1] + shutil.copy(self.pkg_path, self.GetWorkDir()) + self.pkg_path = os.path.join(self.GetWorkDir(), base_name_gz) + args = ["gunzip", "-f", self.pkg_path] + retcode = self.ShellCommand(args) + self.gunzipped_path = self.pkg_path[:(-len(gzip_suffix))] + elif self.pkg_path.endswith(pkg_suffix): + self.gunzipped_path = self.pkg_path + else: + raise Error("The file name should end in either " + "%s or %s." % (gzip_suffix, pkg_suffix)) + return self.gunzipped_path + + def TransformToDir(self): + if not self.transformed: + args = ["pkgtrans", "-a", self.GetAdminFilePath(), + self.GetGunzippedPath(), self.GetWorkDir(), "all"] + retcode = self.ShellCommand(args, quiet=True) + dirs = self.GetDirs() + if len(dirs) != 1: + raise Error("Need exactly one package in the package stream: " + "%s." % (dirs)) + self.dir_format_pkg = DirectoryFormatPackage(dirs[0]) + self.transformed = True + + def GetDirFormatPkg(self): + self.TransformToDir(self) + return self.dir_format_pkg + + def GetDirs(self): + paths = os.listdir(self.GetWorkDir()) + dirs = [] + for p in paths: + abspath = os.path.join(self.GetWorkDir(), p) + if os.path.isdir(abspath): + dirs.append(abspath) + return dirs + + def GetPkgmap(self, analyze_permissions, strip=None): + dir_format_pkg = self.GetDirFormatPkg() + return dir_format_pkg.GetPkgmap(analyze_permissions, strip) + + def __del__(self): + if self.workdir: + logging.debug("Removing %s", repr(self.workdir)) + shutil.rmtree(self.workdir) + + +def ParsePkginfo(lines): + """Parses a pkginfo data.""" + d = {} + for line in lines: + try: + # Can't use split, because there might be multiple '=' characters. + line = line.strip() + # Skip empty and commented lines + if not line: continue + if line.startswith("#"): continue + var_name, var_value = line.split("=", 1) + d[var_name] = var_value + except ValueError, e: + raise PackageError("Can't parse %s: %s" % (repr(line), e)) + return d + + +def PkgnameToCatName(pkgname): + """Creates a catalog name based on the pkgname. + + SUNWbash --> sunw_bash + SUNWbashS --> sunw_bash_s + SUNWPython --> sunw_python + + Incomprehensible, but unit tested! + """ + known_prefixes = ["SUNW", "FJSV", "CSW"] + for prefix in known_prefixes: + if pkgname.startswith(prefix): + unused, tmp_prefix, the_rest = pkgname.partition(prefix) + pkgname = tmp_prefix + "_" + the_rest + return "_".join(SplitByCase(pkgname)) + + +def SplitByCase(s): + def CharType(c): + if c.isalnum(): + if c.isupper(): + return 1 + else: + return 2 + else: + return 3 + chartype_list = [CharType(x) for x in s] + neighbors = zip(chartype_list, chartype_list[1:]) + casechange = [False] + [x != y for x, y in neighbors] + str_list = [(cc * "_") + l.lower() for l, cc in zip(s, casechange)] + s2 = "".join(str_list) + return re.findall(r"[a-z]+", s2) + + +def CatalogNameGroupName(catalogname_list): + """Uses heuristics to guess the common name of a group of packages.""" + catalogname_list = copy.copy(catalogname_list) + if len(catalogname_list) == 1: + return catalogname_list[0] + current_substring = catalogname_list.pop() + while catalogname_list and current_substring: + substring_set = LongestCommonSubstring(current_substring, + catalogname_list.pop()) + if substring_set: + current_substring = list(substring_set)[0] + if len(current_substring) >= 2: + return current_substring + return "various packages" + + +def LongestCommonSubstring(S, T): + """Stolen from Wikibooks + + http://en.wikibooks.org/wiki/Algorithm_Implementation/Strings/Longest_common_substring#Python""" + m = len(S); n = len(T) + L = [[0] * (n+1) for i in xrange(m+1)] + LCS = set() + longest = 0 + for i in xrange(m): + for j in xrange(n): + if S[i] == T[j]: + v = L[i][j] + 1 + L[i+1][j+1] = v + if v > longest: + longest = v + LCS = set() + if v == longest: + LCS.add(S[i-v+1:i+1]) + return LCS + + +def PkginfoToSrv4Name(pkginfo_dict): + SRV4_FN_TMPL = "%(catalog_name)s-%(version)s-%(osver)s-%(arch)s-%(tag)s.pkg" + fn_data = {} + fn_data["catalog_name"] = PkgnameToCatName(pkginfo_dict["PKG"]) + fn_data["version"] = pkginfo_dict["VERSION"] + # os_version = pkginfo_dict["SUNW_PRODVERS"].split("/", 1)[0] + # fn_data["osver"] = pkginfo_dict["SUNW_PRODNAME"] + os_version + fn_data["osver"] = "SunOS5.10" # Hardcoded, because the original data contains + # trash. + fn_data["arch"] = pkginfo_dict["ARCH"] + fn_data["tag"] = "SUNW" + return SRV4_FN_TMPL % fn_data + + +class DirectoryFormatPackage(ShellMixin, object): + + def __init__(self, directory): + self.directory = directory + self.pkginfo_dict = None + + def GetParsedPkginfo(self): + if not self.pkginfo_dict: + pkginfo_fd = open(self.GetPkginfoFilename(), "r") + self.pkginfo_dict = ParsePkginfo(pkginfo_fd) + pkginfo_fd.close() + return self.pkginfo_dict + + def GetSrv4FileName(self): + """Guesses the Srv4FileName based on the package directory contents.""" + return PkginfoToSrv4Name(self.GetParsedPkginfo()) + + def ToSrv4(self, target_dir): + target_file_name = self.GetSrv4FileName() + target_path = os.path.join(target_dir, target_file_name) + if os.path.exists(target_path): + return target_path + pkg_container_dir, pkg_dir = os.path.split(self.directory) + if not os.path.isdir(target_dir): + os.makedirs(target_dir) + args = ["pkgtrans", "-s", pkg_container_dir, target_path, pkg_dir] + self.ShellCommand(args, quiet=True) + args = ["gzip", "-f", target_path] + self.ShellCommand(args, quiet=True) + return target_path + + def GetPkgmap(self, analyze_permissions=False, strip=None): + fd = open(os.path.join(self.directory, "pkgmap"), "r") + return Pkgmap(fd, analyze_permissions, strip) + + def SetPkginfoEntry(self, key, value): + pkginfo = self.GetParsedPkginfo() + logging.debug("Setting %s to %s", repr(key), repr(value)) + pkginfo[key] = value + self.WritePkginfo(pkginfo) + pkgmap_path = os.path.join(self.directory, "pkgmap") + pkgmap_fd = open(pkgmap_path, "r") + new_pkgmap_lines = [] + pkginfo_re = re.compile("1 i pkginfo") + ws_re = re.compile(r"\s+") + for line in pkgmap_fd: + if pkginfo_re.search(line): + fields = ws_re.split(line) + # 3: size + # 4: sum + pkginfo_path = os.path.join(self.directory, "pkginfo") + args = ["cksum", pkginfo_path] + cksum_process = subprocess.Popen(args, stdout=subprocess.PIPE) + stdout, stderr = cksum_process.communicate() + cksum_process.wait() + size = ws_re.split(stdout)[1] + args = ["sum", pkginfo_path] + sum_process = subprocess.Popen(args, stdout=subprocess.PIPE) + stdout, stderr = sum_process.communicate() + sum_process.wait() + sum = ws_re.split(stdout)[0] + fields[3] = size + fields[4] = sum + logging.debug("New pkgmap line: %s", fields) + line = " ".join(fields) + new_pkgmap_lines.append(line.strip()) + pkgmap_fd.close() + # Write that back + pkgmap_path_new = pkgmap_path + ".new" + logging.debug("Writing back to %s", pkgmap_path_new) + pkgmap_fd = open(pkgmap_path_new, "w") + pkgmap_fd.write("\n".join(new_pkgmap_lines)) + pkgmap_fd.close() + shutil.move(pkgmap_path_new, pkgmap_path) + + # TODO(maciej): Need to update the relevant line on pkgmap too + + def GetPkginfoFilename(self): + return os.path.join(self.directory, "pkginfo") + + def WritePkginfo(self, pkginfo_dict): + # Some packages extract read-only. To be sure, change them to be + # user-writable. + args = ["chmod", "-R", "u+w", self.directory] + self.ShellCommand(args) + pkginfo_filename = self.GetPkginfoFilename() + os.chmod(pkginfo_filename, 0644) + pkginfo_fd = open(pkginfo_filename, "w") + pkginfo_dict = self.GetParsedPkginfo() + for k, v in pkginfo_dict.items(): + pkginfo_fd.write("%s=%s\n" % (k, pkginfo_dict[k])) + pkginfo_fd.close() + + def ResetNameProperty(self): + """Sometimes, NAME= contains useless data. This method resets them.""" + pkginfo_dict = self.GetParsedPkginfo() + catalog_name = PkgnameToCatName(pkginfo_dict["PKG"]) + description = pkginfo_dict["DESC"] + pkginfo_name = "%s - %s" % (catalog_name, description) + self.SetPkginfoEntry("NAME", pkginfo_name) + +class Pkgmap(object): + + def __init__(self, input, permissions=False, + strip=None): + self.paths = set() + self.analyze_permissions = permissions + for line in input: + fields = re.split(r'\s+', line) + if strip: + strip_re = re.compile(r"^%s" % strip) + fields = [re.sub(strip_re, "", x) for x in fields] + logging.debug(fields) + line_to_add = None + if len(fields) < 2: + continue + elif fields[1] in ('f', 'd'): + line_to_add = fields[3] + if self.analyze_permissions: + line_to_add += " %s" % fields[4] + elif fields[1] in ('s', 'l'): + link_from, link_to = fields[3].split("=") + line_to_add = "%s --> %s" % (link_from, link_to) + if line_to_add: + self.paths.add(line_to_add) + + +class PackageComparator(object): + + def __init__(self, file_name_a, file_name_b, + permissions=False, + strip_a=None, + strip_b=None): + self.analyze_permissions = permissions + self.pkg_a = CswSrv4File(file_name_a) + self.pkg_b = CswSrv4File(file_name_b) + self.strip_a = strip_a + self.strip_b = strip_b + + def Run(self): + pkgmap_a = self.pkg_a.GetPkgmap(self.analyze_permissions, strip=self.strip_a) + pkgmap_b = self.pkg_b.GetPkgmap(self.analyze_permissions, strip=self.strip_b) + diff_ab = difflib.unified_diff(sorted(pkgmap_a.paths), + sorted(pkgmap_b.paths), + fromfile=self.pkg_a.pkg_path, + tofile=self.pkg_b.pkg_path) + diff_text = "\n".join(diff_ab) + if diff_text: + less_proc = subprocess.Popen(["less"], stdin=subprocess.PIPE) + less_stdout, less_stderr = less_proc.communicate(input=diff_text) + less_proc.wait() + else: + print "No differences found." + + +class OpencswCatalogBuilder(object): + + def __init__(self, product_dir, catalog_dir): + self.product_dir = product_dir + self.catalog_dir = catalog_dir + + def Run(self): + pkg_dirs = os.listdir(self.product_dir) + for pkg_dir in pkg_dirs: + pkg_path = os.path.join(self.product_dir, pkg_dir) + pkginfo_path = os.path.join(pkg_path, "pkginfo") + if (os.path.isdir(pkg_path) + and + os.path.exists(pkginfo_path)): + if not self.Srv4Exists(pkg_path): + pkg = None + tmpdir = None + try: + tmpdir = tempfile.mkdtemp(prefix="sunw-pkg-") + logging.debug("Copying %s to %s", repr(pkg_path), repr(tmpdir)) + tmp_pkg_dir = os.path.join(tmpdir, pkg_dir) + shutil.copytree(pkg_path, tmp_pkg_dir, symlinks=True) + pkg = DirectoryFormatPackage(tmp_pkg_dir) + # Replacing NAME= in the pkginfo, setting it to the catalog name. + pkg.ResetNameProperty() + pkg.ToSrv4(self.catalog_dir) + except IOError, e: + logging.warn("%s has failed: %s", pkg_path, e) + finally: + if pkg: + del(pkg) + if os.path.exists(tmpdir): + shutil.rmtree(tmpdir) + else: + logging.warn("srv4 file for %s already exists, skipping", pkg_path) + else: + logging.warn("%s is not a directory.", pkg_path) + + def Srv4Exists(self, pkg_dir): + pkg = DirectoryFormatPackage(pkg_dir) + srv4_name = pkg.GetSrv4FileName() + srv4_name += ".gz" + srv4_path = os.path.join(self.catalog_dir, srv4_name) + result = os.path.exists(srv4_path) + logging.debug("Srv4Exists(%s) => %s, %s", pkg_dir, repr(srv4_path), result) + return result Property changes on: csw/mgar/gar/v2-dirpackage/lib/python/opencsw.py ___________________________________________________________________ Added: svn:keywords + Id Deleted: csw/mgar/gar/v2-dirpackage/tests/gartest.py =================================================================== --- csw/mgar/pkg/tests/gartest.py 2010-01-24 01:31:18 UTC (rev 8133) +++ csw/mgar/gar/v2-dirpackage/tests/gartest.py 2010-01-25 11:26:34 UTC (rev 8164) @@ -1,168 +0,0 @@ -# $Id$ - -import Cheetah.Template -import shutil -import tempfile -import unittest -import os -import os.path -import subprocess -import opencsw - -"""A module used to do end-to-end testing of GAR.""" - -MAKEFILE_TMPL = """# GAR Makefile generated by $test_id -# -GARNAME = $garname -GARVERSION = $garversion -CATEGORIES = $profile -DESCRIPTION = $description -#if $blurb -define BLURB - blurb -endef -#end if -#if $upstream_url -SPKG_SOURCEURL = $upstream_url -#end if -#if $master_sites -MASTER_SITES = $master_sites -#end if -## PATCHFILES = -## DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz -## UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz -## CATALOGNAME = -## ARCHALL = 0 -## PACKAGES = -CONFIGURE_SCRIPTS = -BUILD_SCRIPTS = -INSTALL_SCRIPTS = -TEST_SCRIPTS = -#if $configure_args -CONFIGURE_ARGS = $configure_args -#end if -## BUILD64 = -include gar/category.mk -#if $install_files -post-install-modulated: -#for filedir_name, directory, file_name, content in $install_files -\tginstall -m 755 -d \$(DESTDIR)$directory -\tginstall -m 644 $tmpdir/\$(FILEDIR)/$filedir_name \$(DESTDIR)$directory/$file_name -#end for -#end if -# GAR recipe ends here. -""" -TMPDIR_PREFIX = "garpkg" -DIR_PKG_OUT_DIR = "/home/maciej/spool.5.8-sparc" - -class Error(Exception): - pass - -class GarBuild(object): - """Represents a GAR build. - - Can create a GAR build and execute it. - """ - def __init__(self): - self.tmpdir = tempfile.mkdtemp(prefix=TMPDIR_PREFIX) - self.filedir = os.path.join(self.tmpdir, "files") - self.makefile_filename = os.path.join(self.tmpdir, "Makefile") - os.mkdir(self.filedir) - self.install_files = [] - self.built = False - self.tmpldata = { - "garname": "testbuild", - "garsrc": "/home/maciej/src/opencsw/gar/v2-dirpackage", - "blurb": None, - "description": u"A test package from %s" % self, - "profile": "lib", - "configure_args": "$(DIRPATHS)", - "upstream_url": "http://www.opencsw.org/", - "master_sites": None, - "install_files": self.install_files, - "garversion": "0.0.1", - "tmpdir": self.tmpdir, - "test_id": "$Id$", - } - os.symlink(self.tmpldata["garsrc"], os.path.join(self.tmpdir, "gar")) - - def WriteGarFiles(self): - # print "The tmpdir is", self.tmpdir - for filedir_name, directory, filename, content in self.install_files: - file_path = os.path.join(self.filedir, filedir_name) - print "Writing to %s" % file_path - fp = open(file_path, "w") - fp.write(content) - fp.close() - searchlist = [self.tmpldata] - t = Cheetah.Template.Template(MAKEFILE_TMPL, searchlist) - print t - fp = open(self.makefile_filename, "w") - fp.write(str(t)) - fp.close() - - def Build(self): - if self.built: - return 0 - args = ["gmake", "dirpackage"] - gar_proc = subprocess.Popen(args, cwd=self.tmpdir, - stdout=subprocess.PIPE, - stderr=subprocess.PIPE) - stdout, stderr = gar_proc.communicate() - ret = gar_proc.wait() - if ret: - print "ERROR: GAR run has failed." - self.built = False - else: - self.built = True - return ret - - def GetBuiltPackages(self): - if not self.built: - raise Error("The packages have not been built yet.") - args = ["gmake", "pkglist"] - gar_proc = subprocess.Popen(args, cwd=self.tmpdir, stdout=subprocess.PIPE) - stdout, stderr = gar_proc.communicate() - ret = gar_proc.wait() - pkglist = [] - for line in stdout.splitlines(): - # directory, catalogname, pkgname - pkglist.append(tuple(line.split("\t"))) - packages = [opencsw.DirectoryFormatPackage(os.path.join(DIR_PKG_OUT_DIR, z)) for x, y, z in pkglist] - return packages - - def AddInstallFile(self, file_path, content): - filedir_name = file_path.replace("/", "-") - directory, file_name = os.path.split(file_path) - self.install_files.append((filedir_name, directory, - file_name, content)) - - def __del__(self): - shutil.rmtree(self.tmpdir) - - -class FooUnitTest(unittest.TestCase): - """This is the docstring for the FooUnitTest.""" - - def testSomething(self): - """This is a doc string for the test method. - - You can write more text here. - """ - mybuild = GarBuild() - mybuild.tmpldata["garname"] = "blah" - mybuild.AddInstallFile("/opt/csw/share/foo", "bar!\n") - mybuild.WriteGarFiles() - self.assertEquals(0, mybuild.Build()) - packages = mybuild.GetBuiltPackages() - for pkg in packages: - print pkg - print pkg.GetParsedPkginfo() - # package = mybuild.GetFirstDirFormatPackage() - # self.assertEqual("blah", package.catalogname) - - -if __name__ == '__main__': - unittest.main() - -# vim:set ts=2 sts=2 sw=2 expandtab: Copied: csw/mgar/gar/v2-dirpackage/tests/gartest.py (from rev 8134, csw/mgar/pkg/tests/gartest.py) =================================================================== --- csw/mgar/gar/v2-dirpackage/tests/gartest.py (rev 0) +++ csw/mgar/gar/v2-dirpackage/tests/gartest.py 2010-01-25 11:26:34 UTC (rev 8164) @@ -0,0 +1,176 @@ +# $Id$ + +import Cheetah.Template +import shutil +import tempfile +import unittest +import os +import os.path +import subprocess +import opencsw + +"""A module used to do end-to-end testing of GAR.""" + +MAKEFILE_TMPL = """# GAR Makefile generated by $test_id +#for varname in $sorted($garvars) +$varname = $garvars[$varname] +#end for +#if $blurb +define BLURB + blurb +endef +#end if +include gar/category.mk +#if $install_files +post-install-modulated: +#for filedir_name, directory, file_name, content in $install_files +\tginstall -m 755 -d \$(DESTDIR)$directory +\tginstall -m 644 \$(FILEDIR)/$filedir_name \$(DESTDIR)$directory/$file_name +#end for +#end if +# GAR recipe ends here. +""" +TMPDIR_PREFIX = "gartest-" +# FIXME: This information should be pulled out from GAR +DIR_PKG_OUT_DIR = os.path.join(os.environ["HOME"], "spool.5.8-sparc") + +class Error(Exception): + pass + + +class GarBuild(object): + + def __init__(self): + self.built = False + self.packages = None + self.cleanup = True + + def GetDebugHelp(self): + """To be overriden in subclasses.""" + return "" + + def Build(self): + if self.built: + return 0 + args = ["gmake", "dirpackage"] + gar_proc = subprocess.Popen(args, cwd=self.tmpdir, + stdout=subprocess.PIPE, + stderr=subprocess.PIPE) + stdout, stderr = gar_proc.communicate() + ret = gar_proc.wait() + if ret: + print "ERROR: GAR run has failed." + print stdout + print stderr + self.built = False + # To allow debugging + self.cleanup = False + print self.GetDebugHelp() + else: + self.built = True + return ret + + def GetBuiltPackages(self): + if not self.built: + raise Error("The packages have not been built yet.") + args = ["gmake", "pkglist"] + gar_proc = subprocess.Popen(args, cwd=self.tmpdir, stdout=subprocess.PIPE) + stdout, stderr = gar_proc.communicate() + ret = gar_proc.wait() + pkglist = [] + for line in stdout.splitlines(): + # directory, catalogname, pkgname + pkglist.append(tuple(line.split("\t"))) + self.packages = [ + opencsw.DirectoryFormatPackage( + os.path.join(DIR_PKG_OUT_DIR, z)) + for x, y, z in pkglist] + return self.packages + + def GetFirstBuiltPackage(self): + """Returns only the first package. Easy to use.""" + packages = self.GetBuiltPackages() + if packages: + return packages[0] + + +class DynamicGarBuild(GarBuild): + """Represents a GAR build. + + Can create a GAR build and execute it. + """ + def __init__(self): + super(DynamicGarBuild, self).__init__() + self.tmpdir = tempfile.mkdtemp(prefix=TMPDIR_PREFIX) + self.filedir = os.path.join(self.tmpdir, "files") + self.makefile_filename = os.path.join(self.tmpdir, "Makefile") + os.mkdir(self.filedir) + self.install_files = [] + self.garvars = { + "GARNAME": "testbuild", + "DESCRIPTION": u"A test package from %s" % self, + "CATEGORIES": "lib", + "CONFIGURE_ARGS": "$(DIRPATHS)", + "SPKG_SOURCEURL": "http://www.opencsw.org/", + "MASTER_SITES": "", + "GARVERSION": "0.0.1", + "CONFIGURE_SCRIPTS": "", + "BUILD_SCRIPTS": "", + "TEST_SCRIPTS": "", + "INSTALL_SCRIPTS": "", + } + self.tmpldata = { + "garvars": self.garvars, + "garsrc": os.path.join(os.getcwd(), ".."), + "blurb": None, + "install_files": self.install_files, + "tmpdir": self.tmpdir, + "test_id": "$Id$", + } + os.symlink(self.tmpldata["garsrc"], os.path.join(self.tmpdir, "gar")) + + def SetGarVariable(self, varname, value): + self.garvars[varname] = value + + def WriteGarFiles(self): + # print "The tmpdir is", self.tmpdir + for filedir_name, directory, filename, content in self.install_files: + file_path = os.path.join(self.filedir, filedir_name) + print "Writing to %s" % file_path + fp = open(file_path, "w") + fp.write(content) + fp.close() + searchlist = [self.tmpldata] + t = Cheetah.Template.Template(MAKEFILE_TMPL, searchlist) + # For easy debugging, but only until we find a better solution, because it + # clutters the screen. + print t + fp = open(self.makefile_filename, "w") + fp.write(str(t)) + fp.close() + + def AddInstallFile(self, file_path, content): + """Creates a file in the package, with the given path and content.""" + filedir_name = file_path.replace("/", "-") + directory, file_name = os.path.split(file_path) + self.install_files.append((filedir_name, directory, + file_name, content)) + + def GetDebugHelp(self): + return ("Please look into %s.\n" + "Remember to remove it when you're done debugging." + % repr(self.tmpdir)) + + def __del__(self): + if self.cleanup: + shutil.rmtree(self.tmpdir) + + +class StaticGarBuild(GarBuild): + + def __init__(self, build_dir): + super(StaticGarBuild, self).__init__() + self.build_dir = build_dir + self.tmpdir = build_dir + +# vim:set ts=2 sts=2 sw=2 expandtab: Copied: csw/mgar/gar/v2-dirpackage/tests/run_tests.py (from rev 8135, csw/mgar/pkg/tests/run_tests.py) =================================================================== --- csw/mgar/gar/v2-dirpackage/tests/run_tests.py (rev 0) +++ csw/mgar/gar/v2-dirpackage/tests/run_tests.py 2010-01-25 11:26:34 UTC (rev 8164) @@ -0,0 +1,44 @@ +#!/opt/csw/bin/python2.6 +# $Id$ + +import unittest +import sys +sys.path.append("../lib/python") +import gartest + +class ExampleEndToEndTest(unittest.TestCase): + """An example end-to-end test of GAR.""" + + def testPkginfoName(self): + """Checks that the GARNAME makes it to the NAME in pkginfo.""" + mybuild = gartest.DynamicGarBuild() + mybuild.SetGarVariable("GARNAME", "foo") + mybuild.AddInstallFile("/opt/csw/share/foo", "bar!\n") + mybuild.WriteGarFiles() + self.assertEquals(0, mybuild.Build()) + pkg = mybuild.GetFirstBuiltPackage() + pkginfo = pkg.GetParsedPkginfo() + # By default, the garname should be used to create the catalog name, which + # in turn ends up in the NAME field in pkginfo. + self.assertTrue(pkginfo["NAME"].startswith("foo")) + + +class StaticBuildTestExample(unittest.TestCase): + """An example of a static build. + + This uses a static directory where GAR can be called. + """ + + def testLooseFiles(self): + mybuild = gartest.StaticGarBuild("static/example") + mybuild.Build() + pkg = mybuild.GetFirstBuiltPackage() + pkginfo = pkg.GetParsedPkginfo() + # This part would often use "self.assertEqual(, )" + self.assertTrue(pkginfo["NAME"].startswith("loose")) + + +if __name__ == '__main__': + unittest.main() + +# vim:set ts=2 sts=2 sw=2 expandtab: Property changes on: csw/mgar/gar/v2-dirpackage/tests/static/example ___________________________________________________________________ Added: svn:ignore + work gar Added: csw/mgar/gar/v2-dirpackage/tests/static/example/Makefile =================================================================== --- csw/mgar/gar/v2-dirpackage/tests/static/example/Makefile (rev 0) +++ csw/mgar/gar/v2-dirpackage/tests/static/example/Makefile 2010-01-25 11:26:34 UTC (rev 8164) @@ -0,0 +1,39 @@ +# Copyright 2009 OpenCSW +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +GARNAME = loose-files +GARVERSION = 1.0 +CATEGORIES = utils +DESCRIPTION = An example of a package created from loose files. +define BLURB +endef +SPKG_SOURCEURL = http://gar.sf.net + +PACKAGES = CSWloosefilesexa +CATALOGNAME = loose_files_example + +# The directory where all the sources are kept. The slash at the end is +# necessary. +LOCAL_SRC = /usr/xpg4/ + +# The list of files to include, relative to LOCAL_SRC +FILES = bin/grep +FILES += include/curses.h + +MASTER_SITES = $(sort $(addprefix file://$(LOCAL_SRC),$(dir $(FILES)))) +DISTFILES = $(notdir $(FILES)) + +CONFIGURE_SCRIPTS = +BUILD_SCRIPTS = +INSTALL_SCRIPTS = custom +TEST_SCRIPTS = + +include gar/category.mk + +install-custom: + $(foreach F,$(FILES),ginstall \ + -d $(DESTDIR)$(prefix)/$(dir $F) \ + && ginstall $(WORKDIR)/$(notdir $F) \ + $(DESTDIR)$(prefix)/$(dir $F);) + @$(MAKECOOKIE) Property changes on: csw/mgar/gar/v2-dirpackage/tests/static/example/Makefile ___________________________________________________________________ Added: svn:keywords + Id Added: csw/mgar/gar/v2-dirpackage/tests/static/example/checksums =================================================================== --- csw/mgar/gar/v2-dirpackage/tests/static/example/checksums (rev 0) +++ csw/mgar/gar/v2-dirpackage/tests/static/example/checksums 2010-01-25 11:26:34 UTC (rev 8164) @@ -0,0 +1,2 @@ +d388c5613c830fb4571d0457f53580a0 curses.h +492eba390abe4fe74c185d0d343c2b81 grep Added: csw/mgar/gar/v2-dirpackage/tests/static/example/gar =================================================================== --- csw/mgar/gar/v2-dirpackage/tests/static/example/gar (rev 0) +++ csw/mgar/gar/v2-dirpackage/tests/static/example/gar 2010-01-25 11:26:34 UTC (rev 8164) @@ -0,0 +1 @@ +link ../../.. \ No newline at end of file Property changes on: csw/mgar/gar/v2-dirpackage/tests/static/example/gar ___________________________________________________________________ Added: svn:special + * Deleted: csw/mgar/pkg/tests/gartest.py =================================================================== --- csw/mgar/pkg/tests/gartest.py 2010-01-25 10:30:29 UTC (rev 8163) +++ csw/mgar/pkg/tests/gartest.py 2010-01-25 11:26:34 UTC (rev 8164) @@ -1,144 +0,0 @@ -# $Id$ - -import Cheetah.Template -import shutil -import tempfile -import unittest -import os -import os.path -import subprocess -import opencsw - -"""A module used to do end-to-end testing of GAR.""" - -MAKEFILE_TMPL = """# GAR Makefile generated by $test_id -#for varname in $garvars -$varname = $garvars[$varname] -#end for -#if $blurb -define BLURB - blurb -endef -#end if -include gar/category.mk -#if $install_files -post-install-modulated: -#for filedir_name, directory, file_name, content in $install_files -\tginstall -m 755 -d \$(DESTDIR)$directory -\tginstall -m 644 $tmpdir/\$(FILEDIR)/$filedir_name \$(DESTDIR)$directory/$file_name -#end for -#end if -# GAR recipe ends here. -""" -TMPDIR_PREFIX = "garpkg" -DIR_PKG_OUT_DIR = "/home/maciej/spool.5.8-sparc" - -class Error(Exception): - pass - -class GarBuild(object): - """Represents a GAR build. - - Can create a GAR build and execute it. - """ - def __init__(self): - self.packages = None - self.tmpdir = tempfile.mkdtemp(prefix=TMPDIR_PREFIX) - self.filedir = os.path.join(self.tmpdir, "files") - self.makefile_filename = os.path.join(self.tmpdir, "Makefile") - os.mkdir(self.filedir) - self.install_files = [] - self.built = False - self.garvars = { - "GARNAME": "testbuild", - "DESCRIPTION": u"A test package from %s" % self, - "CATEGORIES": "lib", - "CONFIGURE_ARGS": "$(DIRPATHS)", - "SPKG_SOURCEURL": "http://www.opencsw.org/", - "MASTER_SITES": "", - "GARVERSION": "0.0.1", - "CONFIGURE_SCRIPTS": "", - "BUILD_SCRIPTS": "", - "TEST_SCRIPTS": "", - "INSTALL_SCRIPTS": "", - } - self.tmpldata = { - "garvars": self.garvars, - "garsrc": "/home/maciej/src/opencsw/gar/v2-dirpackage", - "blurb": None, - "install_files": self.install_files, - "tmpdir": self.tmpdir, - "test_id": "$Id$", - } - os.symlink(self.tmpldata["garsrc"], os.path.join(self.tmpdir, "gar")) - - def SetGarVariable(self, varname, value): - self.garvars[varname] = value - - def WriteGarFiles(self): - # print "The tmpdir is", self.tmpdir - for filedir_name, directory, filename, content in self.install_files: - file_path = os.path.join(self.filedir, filedir_name) - print "Writing to %s" % file_path - fp = open(file_path, "w") - fp.write(content) - fp.close() - searchlist = [self.tmpldata] - t = Cheetah.Template.Template(MAKEFILE_TMPL, searchlist) - print t - fp = open(self.makefile_filename, "w") - fp.write(str(t)) - fp.close() - - def Build(self): - if self.built: - return 0 - args = ["gmake", "dirpackage"] - gar_proc = subprocess.Popen(args, cwd=self.tmpdir, - stdout=subprocess.PIPE, - stderr=subprocess.PIPE) - stdout, stderr = gar_proc.communicate() - ret = gar_proc.wait() - if ret: - print "ERROR: GAR run has failed." - print stdout - print stderr - self.built = False - else: - self.built = True - return ret - - def GetBuiltPackages(self): - if not self.built: - raise Error("The packages have not been built yet.") - args = ["gmake", "pkglist"] - gar_proc = subprocess.Popen(args, cwd=self.tmpdir, stdout=subprocess.PIPE) - stdout, stderr = gar_proc.communicate() - ret = gar_proc.wait() - pkglist = [] - for line in stdout.splitlines(): - # directory, catalogname, pkgname - pkglist.append(tuple(line.split("\t"))) - self.packages = [ - opencsw.DirectoryFormatPackage( - os.path.join(DIR_PKG_OUT_DIR, z)) - for x, y, z in pkglist] - return self.packages - - def GetFirstBuiltPackage(self): - """Returns only the first package. Easy to use.""" - packages = self.GetBuiltPackages() - if packages: - return packages[0] - - def AddInstallFile(self, file_path, content): - """Creates a file in the package, with the given path and content.""" - filedir_name = file_path.replace("/", "-") - directory, file_name = os.path.split(file_path) - self.install_files.append((filedir_name, directory, - file_name, content)) - - def __del__(self): - shutil.rmtree(self.tmpdir) - -# vim:set ts=2 sts=2 sw=2 expandtab: Deleted: csw/mgar/pkg/tests/run_tests.py =================================================================== --- csw/mgar/pkg/tests/run_tests.py 2010-01-25 10:30:29 UTC (rev 8163) +++ csw/mgar/pkg/tests/run_tests.py 2010-01-25 11:26:34 UTC (rev 8164) @@ -1,27 +0,0 @@ -#!/opt/csw/bin/python2.6 -# $Id$ - -import unittest -import gartest - -class ExampleEndToEndTest(unittest.TestCase): - """An example end-to-end test of GAR.""" - - def testPkginfoName(self): - """Checks that the GARNAME makes it to the NAME in pkginfo.""" - mybuild = gartest.GarBuild() - mybuild.SetGarVariable("GARNAME", "foo") - mybuild.AddInstallFile("/opt/csw/share/foo", "bar!\n") - mybuild.WriteGarFiles() - self.assertEquals(0, mybuild.Build()) - pkg = mybuild.GetFirstBuiltPackage() - pkginfo = pkg.GetParsedPkginfo() - # By default, the garname should be used to create the catalog name, which - # in turn ends up in the NAME field in pkginfo. - self.assertTrue(pkginfo["NAME"].startswith("foo")) - - -if __name__ == '__main__': - unittest.main() - -# vim:set ts=2 sts=2 sw=2 expandtab: This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Mon Jan 25 12:29:54 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Mon, 25 Jan 2010 11:29:54 +0000 Subject: [csw-devel] SF.net SVN: gar:[8165] csw/mgar/pkg/tests/ Message-ID: Revision: 8165 http://gar.svn.sourceforge.net/gar/?rev=8165&view=rev Author: wahwah Date: 2010-01-25 11:29:54 +0000 (Mon, 25 Jan 2010) Log Message: ----------- mGAR v2-dirpackage: Removing an empty directory Removed Paths: ------------- csw/mgar/pkg/tests/ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bonivart at users.sourceforge.net Mon Jan 25 12:42:45 2010 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Mon, 25 Jan 2010 11:42:45 +0000 Subject: [csw-devel] SF.net SVN: gar:[8166] csw/mgar/pkg/spamassassin/trunk Message-ID: Revision: 8166 http://gar.svn.sourceforge.net/gar/?rev=8166&view=rev Author: bonivart Date: 2010-01-25 11:42:45 +0000 (Mon, 25 Jan 2010) Log Message: ----------- spamassassin: update to 3.3 Modified Paths: -------------- csw/mgar/pkg/spamassassin/trunk/Makefile csw/mgar/pkg/spamassassin/trunk/checksums Modified: csw/mgar/pkg/spamassassin/trunk/Makefile =================================================================== --- csw/mgar/pkg/spamassassin/trunk/Makefile 2010-01-25 11:29:54 UTC (rev 8165) +++ csw/mgar/pkg/spamassassin/trunk/Makefile 2010-01-25 11:42:45 UTC (rev 8166) @@ -11,9 +11,9 @@ endef #MASTER_SITES = http://apache.jumper.nu/spamassassin/source/ -MASTER_SITES = http://people.apache.org/~wtogami/devel/3.3.0-rc3.unofficial/ -#DISTFILES = $(SPKG_NAME)-$(GARVERSION).tar.gz -DISTFILES = $(SPKG_NAME)-$(GARVERSION)-rc3.tar.gz +MASTER_SITES = http://people.apache.org/~jm/devel/ +DISTFILES = $(SPKG_NAME)-$(GARVERSION).tar.gz +#DISTFILES = $(SPKG_NAME)-$(GARVERSION)-rc3.tar.gz DISTFILES += COPYING REQUIRED_PKGS = CSWosslrt CSWperl CSWpmarchivetar CSWpmdbi CSWpmdigestsha @@ -40,18 +40,24 @@ WORKSRC = $(WORKDIR)/$(SPKG_NAME)-$(GARVERSION) SPKG_SOURCEURL = http://spamassassin.apache.org/ +ifeq ($(shell uname -p), sparc) + SEDCFLAGS = -xarch=v8 +else + SEDCFLAGS = +endif + configure-custom: @echo " ==> Configuring $(GARNAME) (custom)" @( cd $(WORKSRC) ; \ perl Makefile.PL INSTALLDIRS=vendor DESTDIR=$(DESTDIR) CONFDIR=/opt/csw/etc/spamassassin LOCALSTATEDIR=/var/opt/csw/spamassassin CONTACT_ADDRESS=postmaster ) @$(MAKECOOKIE) -#pre-build-modulated: -# @echo " ==> Pre-build $(GARNAME) (custom)" -# @( cd $(WORKSRC)/spamc ; \ -# sed 's/CFLAGS = /CFLAGS = -xarch=v8 /' Makefile.in > Makefile.tmp ; \ -# cp Makefile.tmp Makefile.in ) -# @$(MAKECOOKIE) +pre-build-modulated: + @echo " ==> Pre-build $(GARNAME) (custom)" + @( cd $(WORKSRC)/spamc ; \ + sed 's/CFLAGS = /CFLAGS = $(SEDCFLAGS) /' Makefile.in > Makefile.tmp ; \ + cp Makefile.tmp Makefile.in ) + @$(MAKECOOKIE) build-custom: @echo " ==> Building $(GARNAME) (custom)" Modified: csw/mgar/pkg/spamassassin/trunk/checksums =================================================================== --- csw/mgar/pkg/spamassassin/trunk/checksums 2010-01-25 11:29:54 UTC (rev 8165) +++ csw/mgar/pkg/spamassassin/trunk/checksums 2010-01-25 11:42:45 UTC (rev 8166) @@ -1,2 +1,2 @@ 3b83ef96387f14655fc854ddc3c6bd57 COPYING -98ad221b18c6c881f609d1a35bb800a0 Mail-SpamAssassin-3.3.0-rc3.tar.gz +38078b07396c0ab92b46386bc70ef086 Mail-SpamAssassin-3.3.0.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Mon Jan 25 12:56:00 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Mon, 25 Jan 2010 11:56:00 +0000 Subject: [csw-devel] SF.net SVN: gar:[8167] csw/mgar/pkg Message-ID: Revision: 8167 http://gar.svn.sourceforge.net/gar/?rev=8167&view=rev Author: dmichelsen Date: 2010-01-25 11:56:00 +0000 (Mon, 25 Jan 2010) Log Message: ----------- gzip: Initial commit Added Paths: ----------- csw/mgar/pkg/gzip/ csw/mgar/pkg/gzip/branches/ csw/mgar/pkg/gzip/tags/ csw/mgar/pkg/gzip/trunk/ csw/mgar/pkg/gzip/trunk/Makefile csw/mgar/pkg/gzip/trunk/checksums csw/mgar/pkg/gzip/trunk/files/ Property changes on: csw/mgar/pkg/gzip/trunk ___________________________________________________________________ Added: svn:ignore + cookies download work Added: svn:externals + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 Added: csw/mgar/pkg/gzip/trunk/Makefile =================================================================== --- csw/mgar/pkg/gzip/trunk/Makefile (rev 0) +++ csw/mgar/pkg/gzip/trunk/Makefile 2010-01-25 11:56:00 UTC (rev 8167) @@ -0,0 +1,19 @@ +GARNAME = gzip +GARVERSION = 1.4 +CATEGORIES = utils + +DESCRIPTION = GNU zip +define BLURB +endef + +MASTER_SITES = $(GNU_MIRROR) +DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz + +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + +CONFIGURE_ARGS = $(DIRPATHS) + +TEST_TARGET = check + +include gar/category.mk Added: csw/mgar/pkg/gzip/trunk/checksums =================================================================== --- csw/mgar/pkg/gzip/trunk/checksums (rev 0) +++ csw/mgar/pkg/gzip/trunk/checksums 2010-01-25 11:56:00 UTC (rev 8167) @@ -0,0 +1 @@ +e381b8506210c794278f5527cba0e765 gzip-1.4.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Mon Jan 25 13:13:20 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Mon, 25 Jan 2010 12:13:20 +0000 Subject: [csw-devel] SF.net SVN: gar:[8168] csw/mgar/pkg/gzip/trunk/Makefile Message-ID: Revision: 8168 http://gar.svn.sourceforge.net/gar/?rev=8168&view=rev Author: dmichelsen Date: 2010-01-25 12:13:20 +0000 (Mon, 25 Jan 2010) Log Message: ----------- gzip: Exclude charset.alias Modified Paths: -------------- csw/mgar/pkg/gzip/trunk/Makefile Modified: csw/mgar/pkg/gzip/trunk/Makefile =================================================================== --- csw/mgar/pkg/gzip/trunk/Makefile 2010-01-25 11:56:00 UTC (rev 8167) +++ csw/mgar/pkg/gzip/trunk/Makefile 2010-01-25 12:13:20 UTC (rev 8168) @@ -16,4 +16,6 @@ TEST_TARGET = check +EXTRA_MERGE_EXCLUDE_FILES = $(libdir)/charset.alias + include gar/category.mk This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Mon Jan 25 13:35:39 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Mon, 25 Jan 2010 12:35:39 +0000 Subject: [csw-devel] SF.net SVN: gar:[8169] csw/mgar/pkg/gzip/trunk Message-ID: Revision: 8169 http://gar.svn.sourceforge.net/gar/?rev=8169&view=rev Author: dmichelsen Date: 2010-01-25 12:35:39 +0000 (Mon, 25 Jan 2010) Log Message: ----------- gzip: Force use of ggrep or zgrep won't work Modified Paths: -------------- csw/mgar/pkg/gzip/trunk/Makefile csw/mgar/pkg/gzip/trunk/checksums Added Paths: ----------- csw/mgar/pkg/gzip/trunk/files/0001-Force-ggrep-as-Solaris-grep-doesn-t-understand-the-f.patch Modified: csw/mgar/pkg/gzip/trunk/Makefile =================================================================== --- csw/mgar/pkg/gzip/trunk/Makefile 2010-01-25 12:13:20 UTC (rev 8168) +++ csw/mgar/pkg/gzip/trunk/Makefile 2010-01-25 12:35:39 UTC (rev 8169) @@ -8,10 +8,13 @@ MASTER_SITES = $(GNU_MIRROR) DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz +PATCHFILES = 0001-Force-ggrep-as-Solaris-grep-doesn-t-understand-the-f.patch # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz +REQUIRED_PKGS = CSWggrep + CONFIGURE_ARGS = $(DIRPATHS) TEST_TARGET = check Modified: csw/mgar/pkg/gzip/trunk/checksums =================================================================== --- csw/mgar/pkg/gzip/trunk/checksums 2010-01-25 12:13:20 UTC (rev 8168) +++ csw/mgar/pkg/gzip/trunk/checksums 2010-01-25 12:35:39 UTC (rev 8169) @@ -1 +1,2 @@ +54776a402c7f43e4ece76c96a8e6518d 0001-Force-ggrep-as-Solaris-grep-doesn-t-understand-the-f.patch e381b8506210c794278f5527cba0e765 gzip-1.4.tar.gz Added: csw/mgar/pkg/gzip/trunk/files/0001-Force-ggrep-as-Solaris-grep-doesn-t-understand-the-f.patch =================================================================== --- csw/mgar/pkg/gzip/trunk/files/0001-Force-ggrep-as-Solaris-grep-doesn-t-understand-the-f.patch (rev 0) +++ csw/mgar/pkg/gzip/trunk/files/0001-Force-ggrep-as-Solaris-grep-doesn-t-understand-the-f.patch 2010-01-25 12:35:39 UTC (rev 8169) @@ -0,0 +1,25 @@ +From 1cfa061d805fa9b65113df02030a1460b62b90e5 Mon Sep 17 00:00:00 2001 +From: Dagobert Michelsen +Date: Mon, 25 Jan 2010 13:33:28 +0100 +Subject: [PATCH] Force ggrep as Solaris grep doesn't understand the flags + +--- + zgrep.in | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/zgrep.in b/zgrep.in +index a828bbc..94d04da 100644 +--- a/zgrep.in ++++ b/zgrep.in +@@ -26,7 +26,7 @@ case $1 in + esac + PATH=$bindir:$PATH + +-grep='${GREP-grep}' ++grep='${GREP-/opt/csw/bin/ggrep}' + + version='zgrep (gzip) @VERSION@ + Copyright (C) 2007, 2009-2010 Free Software Foundation, Inc. +-- +1.6.6 + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Mon Jan 25 13:49:00 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Mon, 25 Jan 2010 12:49:00 +0000 Subject: [csw-devel] SF.net SVN: gar:[8170] csw/mgar/pkg/cups/trunk/Makefile Message-ID: Revision: 8170 http://gar.svn.sourceforge.net/gar/?rev=8170&view=rev Author: wahwah Date: 2010-01-25 12:48:59 +0000 (Mon, 25 Jan 2010) Log Message: ----------- cups: A bugfix for http://www.opencsw.org/mantis/view.php?id=4168 and a dependency cleanup (using checkpkg-libs.py) Modified Paths: -------------- csw/mgar/pkg/cups/trunk/Makefile Modified: csw/mgar/pkg/cups/trunk/Makefile =================================================================== --- csw/mgar/pkg/cups/trunk/Makefile 2010-01-25 12:35:39 UTC (rev 8169) +++ csw/mgar/pkg/cups/trunk/Makefile 2010-01-25 12:48:59 UTC (rev 8170) @@ -72,28 +72,34 @@ SPKG_CLASSES = none cswcpsampleconf cswinitsmf PACKAGES = CSWlibcups CSWcupsd CSWcupsclient CSWcupsdoc CSWcupsdev CSWcups -PACKAGES += CSWcupsclient-ln +PACKAGES += CSWcupslinks -INCOMPATIBLE_PKGS_CSWcupsclient-ln = SUNWpcr SUNWpcu -CATALOGNAME_CSWcupsclient-ln = cupsclient_ln -ARCHALL_CSWcupsclient-ln = 1 +INCOMPATIBLE_PKGS_CSWcupslinks = SUNWpcr SUNWpcu +CATALOGNAME_CSWcupslinks = cups_links +ARCHALL_CSWcupslinks = 1 ARCHALL_CSWcupsdoc = 1 ARCHALL_CSWcupsdev = 1 REQUIRED_PKGS_CSWcups = CSWcupsd CSWcupsclient -REQUIRED_PKGS_CSWcupsd = CSWlibcups CSWoldaprt CSWzlib -REQUIRED_PKGS_CSWcupsd += CSWjpeg CSWpng CSWtiff CSWlibtasn1 -REQUIRED_PKGS_CSWcupsd += CSWgcrypt CSWgnutls CSWgpgerr CSWlibdbus -REQUIRED_PKGS_CSWcupsd += CSWkrb5lib CSWosslrt CSWcupsdoc -REQUIRED_PKGS_CSWcupsd += CSWdbusglib CSWggettextrt CSWglib2 -REQUIRED_PKGS_CSWcupsclient = CSWlibcups CSWoldaprt CSWzlib -REQUIRED_PKGS_CSWcupsclient += CSWgcrypt CSWgnutls CSWgpgerr CSWlibtasn1 CSWosslrt +REQUIRED_PKGS_CSWcupsd += CSWgnutls +REQUIRED_PKGS_CSWcupsd += CSWkrb5lib +REQUIRED_PKGS_CSWcupsd += CSWlibcups +REQUIRED_PKGS_CSWcupsd += CSWlibdbus +REQUIRED_PKGS_CSWcupsd += CSWoldaprt +REQUIRED_PKGS_CSWcupsd += CSWzlib + +REQUIRED_PKGS_CSWcupsclient = CSWgnutls +REQUIRED_PKGS_CSWcupsclient += CSWlibcups +REQUIRED_PKGS_CSWcupsclient += CSWzlib REQUIRED_PKGS_CSWcupsdoc = -REQUIRED_PKGS_CSWcupsdev = -REQUIRED_PKGS_CSWlibcups = CSWjpeg CSWpng CSWtiff CSWzlib -REQUIRED_PKGS_CSWlibcups += CSWgcrypt CSWgnutls CSWgpgerr CSWlibtasn1 CSWosslrt -REQUIRED_PKGS_CSWcupsclient-ln = CSWcupsclient +REQUIRED_PKGS_CSWcupsdev = CSWcupsd +REQUIRED_PKGS_CSWlibcups += CSWgnutls +REQUIRED_PKGS_CSWlibcups += CSWjpeg +REQUIRED_PKGS_CSWlibcups += CSWpng +REQUIRED_PKGS_CSWlibcups += CSWtiff +REQUIRED_PKGS_CSWlibcups += CSWzlib +REQUIRED_PKGS_CSWcupslinks = CSWcupsclient PKGFILES_CSWlibcups = $(libdir)/libcups.* @@ -150,8 +156,8 @@ PKGFILES_CSWcupsclient += $(mandir)/man5/ppdcfile\.5 PKGFILES_CSWcupsclient += $(mandir)/man7/(drv|notifier)\.7 PKGFILES_CSWcupsclient += $(sysconfdir)/cups/client\.conf\.CSW -PKGFILES_CSWcupsclient-ln = /usr/sbin/.* -PKGFILES_CSWcupsclient-ln += /usr/bin/.* +PKGFILES_CSWcupslinks = /usr/sbin/.* +PKGFILES_CSWcupslinks += /usr/bin/.* SPKG_DESC_CSWcups = Common Unix Printing System SPKG_DESC_CSWlibcups = CUPS libraries @@ -159,7 +165,7 @@ SPKG_DESC_CSWcupsclient = CUPS client binaries SPKG_DESC_CSWcupsdoc = CUPS documentation SPKG_DESC_CSWcupsdev = CUPS header files -SPKG_DESC_CSWcupsclient-ln = Drop-in replacement for SUNWpcu and SUNWpcr +SPKG_DESC_CSWcupslinks = Drop-in replacement for SUNWpcu and SUNWpcr # http://lists.opencsw.org/pipermail/maintainers/2009-September/004249.html SAMPLECONF = $(sysconfdir)/cups/cupsd\.conf\.CSW @@ -208,7 +214,7 @@ include gar/category.mk -post-install: +post-install-modulated: (cd $(DESTDIR)$(sysconfdir)/cups; \ echo "Making .CSW configs in $(DESTDIR)$(sysconfdir)/cups"; \ for i in cupsd.conf; do \ @@ -229,4 +235,7 @@ for f in accept lpadmin lpc lpinfo lpmove reject; do \ ln -s ../../opt/csw/sbin/$$f $(DESTDIR)/usr/sbin/$$f; \ done + for f in $(DESTDIR)$(libdir)/cups/backend/*; do \ + chmod 0700 $${f}; \ + done @$(MAKECOOKIE) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Mon Jan 25 14:20:30 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Mon, 25 Jan 2010 13:20:30 +0000 Subject: [csw-devel] SF.net SVN: gar:[8171] csw/mgar/pkg/gzip/trunk Message-ID: Revision: 8171 http://gar.svn.sourceforge.net/gar/?rev=8171&view=rev Author: dmichelsen Date: 2010-01-25 13:20:30 +0000 (Mon, 25 Jan 2010) Log Message: ----------- diff: Add patches for rsyncable (not done yet) Modified Paths: -------------- csw/mgar/pkg/gzip/trunk/Makefile csw/mgar/pkg/gzip/trunk/checksums Added Paths: ----------- csw/mgar/pkg/gzip/trunk/files/gzip.rsync.patch csw/mgar/pkg/gzip/trunk/files/gzip.rsync.patch2 Modified: csw/mgar/pkg/gzip/trunk/Makefile =================================================================== --- csw/mgar/pkg/gzip/trunk/Makefile 2010-01-25 12:48:59 UTC (rev 8170) +++ csw/mgar/pkg/gzip/trunk/Makefile 2010-01-25 13:20:30 UTC (rev 8171) @@ -10,6 +10,20 @@ DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz PATCHFILES = 0001-Force-ggrep-as-Solaris-grep-doesn-t-understand-the-f.patch +# From TODO: +# - Add a block size (-b) option to improve error recovery in case of +# failure of a complete sector. Each block could be extracted +# independently, but this reduces the compression ratio. +# +# For one possible approach to this, please see: +# http://www.samba.org/netfilter/diary/gzip.rsync.patch +# +# An updated version is available at +# http://ozlabs.org/~rusty/gzip.rsync.patch2 +# +# Unfortunately both don't apply cleanly. Disable for now. +# PATCHFILES += gzip.rsync.patch2 + # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz Modified: csw/mgar/pkg/gzip/trunk/checksums =================================================================== --- csw/mgar/pkg/gzip/trunk/checksums 2010-01-25 12:48:59 UTC (rev 8170) +++ csw/mgar/pkg/gzip/trunk/checksums 2010-01-25 13:20:30 UTC (rev 8171) @@ -1,2 +1,3 @@ 54776a402c7f43e4ece76c96a8e6518d 0001-Force-ggrep-as-Solaris-grep-doesn-t-understand-the-f.patch e381b8506210c794278f5527cba0e765 gzip-1.4.tar.gz +ee3a4df1c68f911ca9f05515346b3b3e gzip.rsync.patch2 Added: csw/mgar/pkg/gzip/trunk/files/gzip.rsync.patch =================================================================== --- csw/mgar/pkg/gzip/trunk/files/gzip.rsync.patch (rev 0) +++ csw/mgar/pkg/gzip/trunk/files/gzip.rsync.patch 2010-01-25 13:20:30 UTC (rev 8171) @@ -0,0 +1,252 @@ +diff -ur gzip-1.2.4.debian/deflate.c gzip-1.2.4-working/deflate.c +--- gzip-1.2.4.debian/deflate.c Fri Aug 13 22:35:31 1993 ++++ gzip-1.2.4-working/deflate.c Wed Oct 18 18:03:04 2000 +@@ -121,6 +121,14 @@ + #endif + /* Matches of length 3 are discarded if their distance exceeds TOO_FAR */ + ++#ifndef RSYNC_WIN ++# define RSYNC_WIN 8192 ++#endif ++/* Size of rsync window, must be < MAX_DIST */ ++ ++#define RSYNC_SUM_MATCH(sum) (((sum) & (RSYNC_WIN - 1)) == 0) ++/* Whether window sum matches magic value */ ++ + /* =========================================================================== + * Local data used by the "longest match" routines. + */ +@@ -202,6 +210,8 @@ + unsigned near good_match; + /* Use a faster search when the previous match is longer than this */ + ++local ulg rsync_sum; /* rolling sum of rsync window */ ++local ulg rsync_chunk_end; /* next rsync sequence point */ + + /* Values for max_lazy_match, good_match and max_chain_length, depending on + * the desired pack level (0..9). The values given below have been tuned to +@@ -300,6 +310,10 @@ + #endif + /* prev will be initialized on the fly */ + ++ /* rsync params */ ++ rsync_chunk_end = 0xFFFFFFFFUL; ++ rsync_sum = 0; ++ + /* Set the default configuration parameters: + */ + max_lazy_match = configuration_table[pack_level].max_lazy; +@@ -317,6 +331,7 @@ + + strstart = 0; + block_start = 0L; ++ rsync_chunk_end = 0xFFFFFFFFUL; + #ifdef ASMV + match_init(); /* initialize the asm code */ + #endif +@@ -536,6 +551,8 @@ + memcpy((char*)window, (char*)window+WSIZE, (unsigned)WSIZE); + match_start -= WSIZE; + strstart -= WSIZE; /* we now have strstart >= MAX_DIST: */ ++ if (rsync_chunk_end != 0xFFFFFFFFUL) ++ rsync_chunk_end -= WSIZE; + + block_start -= (long) WSIZE; + +@@ -563,6 +580,39 @@ + } + } + ++local void rsync_roll(start, num) ++ unsigned start; ++ unsigned num; ++{ ++ unsigned i; ++ ++ if (start < RSYNC_WIN) { ++ /* before window fills. */ ++ for (i = start; i < RSYNC_WIN; i++) { ++ if (i == start + num) return; ++ rsync_sum += (ulg)window[i]; ++ } ++ num -= (RSYNC_WIN - start); ++ start = RSYNC_WIN; ++ } ++ ++ /* buffer after window full */ ++ for (i = start; i < start+num; i++) { ++ /* New character in */ ++ rsync_sum += (ulg)window[i]; ++ /* Old character out */ ++ rsync_sum -= (ulg)window[i - RSYNC_WIN]; ++ if (rsync_chunk_end == 0xFFFFFFFFUL && RSYNC_SUM_MATCH(rsync_sum)) ++ rsync_chunk_end = i; ++ } ++} ++ ++/* =========================================================================== ++ * Set rsync_chunk_end if window sum matches magic value. ++ */ ++#define RSYNC_ROLL(s, n) \ ++ do { if (rsync) rsync_roll((s), (n)); } while(0) ++ + /* =========================================================================== + * Flush the current block, with given end-of-file flag. + * IN assertion: strstart is set to the end of the current match. +@@ -609,6 +659,7 @@ + + lookahead -= match_length; + ++ RSYNC_ROLL(strstart, match_length); + /* Insert new strings in the hash table only if the match length + * is not too large. This saves time but degrades compression. + */ +@@ -637,9 +688,18 @@ + /* No match, output a literal byte */ + Tracevv((stderr,"%c",window[strstart])); + flush = ct_tally (0, window[strstart]); ++ RSYNC_ROLL(strstart, 1); + lookahead--; + strstart++; + } ++ if (rsync && strstart > rsync_chunk_end) { ++ ush attr = 0; /* ascii/binary flag */ ++ ++ flush = 1; ++ /* Reset huffman tree */ ++ ct_init(&attr, &method); ++ rsync_chunk_end = 0xFFFFFFFFUL; ++ } + if (flush) FLUSH_BLOCK(0), block_start = strstart; + + /* Make sure that we always have enough lookahead, except +@@ -715,6 +775,7 @@ + */ + lookahead -= prev_length-1; + prev_length -= 2; ++ RSYNC_ROLL(strstart, prev_length+1); + do { + strstart++; + INSERT_STRING(strstart, hash_head); +@@ -727,24 +788,51 @@ + match_available = 0; + match_length = MIN_MATCH-1; + strstart++; +- if (flush) FLUSH_BLOCK(0), block_start = strstart; + ++ if (rsync && strstart > rsync_chunk_end) { ++ ush attr = 0; /* ascii/binary flag */ ++ ++ /* Reset huffman tree */ ++ ct_init(&attr, &method); ++ rsync_chunk_end = 0xFFFFFFFFUL; ++ flush = 1; ++ } ++ if (flush) FLUSH_BLOCK(0), block_start = strstart; + } else if (match_available) { + /* If there was no match at the previous position, output a + * single literal. If there was a match but the current match + * is longer, truncate the previous match to a single literal. + */ + Tracevv((stderr,"%c",window[strstart-1])); +- if (ct_tally (0, window[strstart-1])) { +- FLUSH_BLOCK(0), block_start = strstart; +- } ++ flush = ct_tally (0, window[strstart-1]); ++ if (rsync && strstart > rsync_chunk_end) { ++ ush attr = 0; /* ascii/binary flag */ ++ ++ /* Reset huffman tree */ ++ ct_init(&attr, &method); ++ rsync_chunk_end = 0xFFFFFFFFUL; ++ ++ flush = 1; ++ } ++ if (flush) FLUSH_BLOCK(0), block_start = strstart; ++ RSYNC_ROLL(strstart, 1); + strstart++; + lookahead--; + } else { + /* There is no previous match to compare with, wait for + * the next step to decide. + */ ++ if (rsync && strstart > rsync_chunk_end) { ++ ush attr = 0; /* ascii/binary flag */ ++ ++ /* Reset huffman tree */ ++ ct_init(&attr, &method); ++ rsync_chunk_end = 0xFFFFFFFFUL; ++ ++ FLUSH_BLOCK(0), block_start = strstart; ++ } + match_available = 1; ++ RSYNC_ROLL(strstart, 1); + strstart++; + lookahead--; + } +diff -ur gzip-1.2.4.debian/gzip.c gzip-1.2.4-working/gzip.c +--- gzip-1.2.4.debian/gzip.c Wed Oct 18 16:05:08 2000 ++++ gzip-1.2.4-working/gzip.c Wed Oct 18 15:42:59 2000 +@@ -239,6 +239,7 @@ + unsigned insize; /* valid bytes in inbuf */ + unsigned inptr; /* index of next byte to be processed in inbuf */ + unsigned outcnt; /* bytes in output buffer */ ++int rsync = 0; /* make ryncable chunks */ + + struct option longopts[] = + { +@@ -268,6 +269,7 @@ + {"best", 0, 0, '9'}, /* compress better */ + {"lzw", 0, 0, 'Z'}, /* make output compatible with old compress */ + {"bits", 1, 0, 'b'}, /* max number of bits per code (implies -Z) */ ++ {"rsyncable", 0, 0, 'R'}, /* make rsync-friendly archive */ + { 0, 0, 0, 0 } + }; + +@@ -357,6 +359,7 @@ + " -Z --lzw produce output compatible with old compress", + " -b --bits maxbits max number of bits per code (implies -Z)", + #endif ++ " --rsyncable Make rsync-friendly archive", + " file... files to (de)compress. If none given, use standard input.", + 0}; + char **p = help_msg; +@@ -516,6 +519,9 @@ + #else + recursive = 1; break; + #endif ++ case 'R': ++ rsync = 1; break; ++ + case 'S': + #ifdef NO_MULTIPLE_DOTS + if (*optarg == '.') optarg++; +diff -ur gzip-1.2.4.debian/gzip.h gzip-1.2.4-working/gzip.h +--- gzip-1.2.4.debian/gzip.h Wed Oct 18 16:05:08 2000 ++++ gzip-1.2.4-working/gzip.h Wed Oct 18 17:57:48 2000 +@@ -131,6 +131,7 @@ + extern unsigned insize; /* valid bytes in inbuf */ + extern unsigned inptr; /* index of next byte to be processed in inbuf */ + extern unsigned outcnt; /* bytes in output buffer */ ++extern int rsync; /* deflate into rsyncable chunks */ + + extern long bytes_in; /* number of input bytes */ + extern long bytes_out; /* number of output bytes */ +diff -ur gzip-1.2.4.debian/gzip.texi gzip-1.2.4-working/gzip.texi +--- gzip-1.2.4.debian/gzip.texi Thu Aug 19 06:42:50 1993 ++++ gzip-1.2.4-working/gzip.texi Wed Oct 18 16:58:05 2000 +@@ -316,6 +316,14 @@ + into the directory and compress all the files it finds there (or + decompress them in the case of @code{gunzip}). + ++ at item --rsyncable ++While compressing, synchronize the output occasionally based on the ++input. This can reduce the compression slightly in some cases, but ++means that the @code{rsync} program can take advantage of similarities ++in the uncompressed input when syncronizing two files compressed with ++this flag. @code{gunzip} cannot tell the difference between a ++compressed file created with this option, and one created without it. ++ + @item --suffix @var{suf} + @itemx -S @var{suf} + Use suffix @samp{@var{suf}} instead of @samp{.gz}. Any suffix can be Added: csw/mgar/pkg/gzip/trunk/files/gzip.rsync.patch2 =================================================================== --- csw/mgar/pkg/gzip/trunk/files/gzip.rsync.patch2 (rev 0) +++ csw/mgar/pkg/gzip/trunk/files/gzip.rsync.patch2 2010-01-25 13:20:30 UTC (rev 8171) @@ -0,0 +1,280 @@ +diff -ur gzip-1.2.4.orig/deflate.c gzip-1.2.4-rsync/deflate.c +--- gzip-1.2.4.orig/deflate.c Fri Aug 13 22:35:31 1993 ++++ gzip-1.2.4-rsync/deflate.c Sat Dec 30 15:33:25 2000 +@@ -121,6 +121,14 @@ + #endif + /* Matches of length 3 are discarded if their distance exceeds TOO_FAR */ + ++#ifndef RSYNC_WIN ++# define RSYNC_WIN 4096 ++#endif ++/* Size of rsync window, must be < MAX_DIST */ ++ ++#define RSYNC_SUM_MATCH(sum) ((sum) % RSYNC_WIN == 0) ++/* Whether window sum matches magic value */ ++ + /* =========================================================================== + * Local data used by the "longest match" routines. + */ +@@ -202,6 +210,8 @@ + unsigned near good_match; + /* Use a faster search when the previous match is longer than this */ + ++local ulg rsync_sum; /* rolling sum of rsync window */ ++local ulg rsync_chunk_end; /* next rsync sequence point */ + + /* Values for max_lazy_match, good_match and max_chain_length, depending on + * the desired pack level (0..9). The values given below have been tuned to +@@ -300,6 +310,10 @@ + #endif + /* prev will be initialized on the fly */ + ++ /* rsync params */ ++ rsync_chunk_end = 0xFFFFFFFFUL; ++ rsync_sum = 0; ++ + /* Set the default configuration parameters: + */ + max_lazy_match = configuration_table[pack_level].max_lazy; +@@ -536,6 +550,8 @@ + memcpy((char*)window, (char*)window+WSIZE, (unsigned)WSIZE); + match_start -= WSIZE; + strstart -= WSIZE; /* we now have strstart >= MAX_DIST: */ ++ if (rsync_chunk_end != 0xFFFFFFFFUL) ++ rsync_chunk_end -= WSIZE; + + block_start -= (long) WSIZE; + +@@ -563,13 +579,46 @@ + } + } + ++local void rsync_roll(start, num) ++ unsigned start; ++ unsigned num; ++{ ++ unsigned i; ++ ++ if (start < RSYNC_WIN) { ++ /* before window fills. */ ++ for (i = start; i < RSYNC_WIN; i++) { ++ if (i == start + num) return; ++ rsync_sum += (ulg)window[i]; ++ } ++ num -= (RSYNC_WIN - start); ++ start = RSYNC_WIN; ++ } ++ ++ /* buffer after window full */ ++ for (i = start; i < start+num; i++) { ++ /* New character in */ ++ rsync_sum += (ulg)window[i]; ++ /* Old character out */ ++ rsync_sum -= (ulg)window[i - RSYNC_WIN]; ++ if (rsync_chunk_end == 0xFFFFFFFFUL && RSYNC_SUM_MATCH(rsync_sum)) ++ rsync_chunk_end = i; ++ } ++} ++ ++/* =========================================================================== ++ * Set rsync_chunk_end if window sum matches magic value. ++ */ ++#define RSYNC_ROLL(s, n) \ ++ do { if (rsync) rsync_roll((s), (n)); } while(0) ++ + /* =========================================================================== + * Flush the current block, with given end-of-file flag. + * IN assertion: strstart is set to the end of the current match. + */ + #define FLUSH_BLOCK(eof) \ + flush_block(block_start >= 0L ? (char*)&window[(unsigned)block_start] : \ +- (char*)NULL, (long)strstart - block_start, (eof)) ++ (char*)NULL, (long)strstart - block_start, flush-1, (eof)) + + /* =========================================================================== + * Processes a new input file and return its compressed length. This +@@ -580,7 +629,7 @@ + local ulg deflate_fast() + { + IPos hash_head; /* head of the hash chain */ +- int flush; /* set if current block must be flushed */ ++ int flush; /* set if current block must be flushed, 2=>and padded */ + unsigned match_length = 0; /* length of best match */ + + prev_length = MIN_MATCH-1; +@@ -609,6 +658,7 @@ + + lookahead -= match_length; + ++ RSYNC_ROLL(strstart, match_length); + /* Insert new strings in the hash table only if the match length + * is not too large. This saves time but degrades compression. + */ +@@ -637,9 +687,14 @@ + /* No match, output a literal byte */ + Tracevv((stderr,"%c",window[strstart])); + flush = ct_tally (0, window[strstart]); ++ RSYNC_ROLL(strstart, 1); + lookahead--; + strstart++; + } ++ if (rsync && strstart > rsync_chunk_end) { ++ rsync_chunk_end = 0xFFFFFFFFUL; ++ flush = 2; ++ } + if (flush) FLUSH_BLOCK(0), block_start = strstart; + + /* Make sure that we always have enough lookahead, except +@@ -715,6 +770,7 @@ + */ + lookahead -= prev_length-1; + prev_length -= 2; ++ RSYNC_ROLL(strstart, prev_length+1); + do { + strstart++; + INSERT_STRING(strstart, hash_head); +@@ -727,24 +783,39 @@ + match_available = 0; + match_length = MIN_MATCH-1; + strstart++; +- if (flush) FLUSH_BLOCK(0), block_start = strstart; + ++ if (rsync && strstart > rsync_chunk_end) { ++ rsync_chunk_end = 0xFFFFFFFFUL; ++ flush = 2; ++ } ++ if (flush) FLUSH_BLOCK(0), block_start = strstart; + } else if (match_available) { + /* If there was no match at the previous position, output a + * single literal. If there was a match but the current match + * is longer, truncate the previous match to a single literal. + */ + Tracevv((stderr,"%c",window[strstart-1])); +- if (ct_tally (0, window[strstart-1])) { +- FLUSH_BLOCK(0), block_start = strstart; +- } ++ flush = ct_tally (0, window[strstart-1]); ++ if (rsync && strstart > rsync_chunk_end) { ++ rsync_chunk_end = 0xFFFFFFFFUL; ++ flush = 2; ++ } ++ if (flush) FLUSH_BLOCK(0), block_start = strstart; ++ RSYNC_ROLL(strstart, 1); + strstart++; + lookahead--; + } else { + /* There is no previous match to compare with, wait for + * the next step to decide. + */ ++ if (rsync && strstart > rsync_chunk_end) { ++ /* Reset huffman tree */ ++ rsync_chunk_end = 0xFFFFFFFFUL; ++ flush = 2; ++ FLUSH_BLOCK(0), block_start = strstart; ++ } + match_available = 1; ++ RSYNC_ROLL(strstart, 1); + strstart++; + lookahead--; + } +diff -ur gzip-1.2.4.orig/gzip.c gzip-1.2.4-rsync/gzip.c +--- gzip-1.2.4.orig/gzip.c Thu Aug 19 23:39:43 1993 ++++ gzip-1.2.4-rsync/gzip.c Fri Dec 29 21:20:54 2000 +@@ -239,6 +239,7 @@ + unsigned insize; /* valid bytes in inbuf */ + unsigned inptr; /* index of next byte to be processed in inbuf */ + unsigned outcnt; /* bytes in output buffer */ ++int rsync = 0; /* make ryncable chunks */ + + struct option longopts[] = + { +@@ -268,6 +269,7 @@ + {"best", 0, 0, '9'}, /* compress better */ + {"lzw", 0, 0, 'Z'}, /* make output compatible with old compress */ + {"bits", 1, 0, 'b'}, /* max number of bits per code (implies -Z) */ ++ {"rsyncable", 0, 0, 'R'}, /* make rsync-friendly archive */ + { 0, 0, 0, 0 } + }; + +@@ -357,6 +359,7 @@ + " -Z --lzw produce output compatible with old compress", + " -b --bits maxbits max number of bits per code (implies -Z)", + #endif ++ " --rsyncable Make rsync-friendly archive", + " file... files to (de)compress. If none given, use standard input.", + 0}; + char **p = help_msg; +@@ -516,6 +519,9 @@ + #else + recursive = 1; break; + #endif ++ case 'R': ++ rsync = 1; break; ++ + case 'S': + #ifdef NO_MULTIPLE_DOTS + if (*optarg == '.') optarg++; +diff -ur gzip-1.2.4.orig/gzip.h gzip-1.2.4-rsync/gzip.h +--- gzip-1.2.4.orig/gzip.h Fri Aug 13 22:35:33 1993 ++++ gzip-1.2.4-rsync/gzip.h Sat Dec 30 15:26:56 2000 +@@ -131,6 +131,7 @@ + extern unsigned insize; /* valid bytes in inbuf */ + extern unsigned inptr; /* index of next byte to be processed in inbuf */ + extern unsigned outcnt; /* bytes in output buffer */ ++extern int rsync; /* deflate into rsyncable chunks */ + + extern long bytes_in; /* number of input bytes */ + extern long bytes_out; /* number of output bytes */ +@@ -282,7 +283,7 @@ + /* in trees.c */ + void ct_init OF((ush *attr, int *method)); + int ct_tally OF((int dist, int lc)); +-ulg flush_block OF((char *buf, ulg stored_len, int eof)); ++ulg flush_block OF((char *buf, ulg stored_len, int pad, int eof)); + + /* in bits.c */ + void bi_init OF((file_t zipfile)); +diff -ur gzip-1.2.4.orig/gzip.texi gzip-1.2.4-rsync/gzip.texi +--- gzip-1.2.4.orig/gzip.texi Thu Aug 19 06:42:50 1993 ++++ gzip-1.2.4-rsync/gzip.texi Fri Dec 29 21:20:54 2000 +@@ -316,6 +316,14 @@ + into the directory and compress all the files it finds there (or + decompress them in the case of @code{gunzip}). + ++ at item --rsyncable ++While compressing, synchronize the output occasionally based on the ++input. This reduces compression by about 1 percent most cases, but ++means that the @code{rsync} program can take advantage of similarities ++in the uncompressed input when syncronizing two files compressed with ++this flag. @code{gunzip} cannot tell the difference between a ++compressed file created with this option, and one created without it. ++ + @item --suffix @var{suf} + @itemx -S @var{suf} + Use suffix @samp{@var{suf}} instead of @samp{.gz}. Any suffix can be +diff -ur gzip-1.2.4.orig/trees.c gzip-1.2.4-rsync/trees.c +--- gzip-1.2.4.orig/trees.c Wed Aug 18 03:36:32 1993 ++++ gzip-1.2.4-rsync/trees.c Sat Dec 30 15:37:00 2000 +@@ -850,9 +850,10 @@ + * trees or store, and output the encoded block to the zip file. This function + * returns the total compressed length for the file so far. + */ +-ulg flush_block(buf, stored_len, eof) ++ulg flush_block(buf, stored_len, pad, eof) + char *buf; /* input block, or NULL if too old */ + ulg stored_len; /* length of input block */ ++ int pad; /* pad output to byte boundary */ + int eof; /* true if this is the last block for a file */ + { + ulg opt_lenb, static_lenb; /* opt_len and static_len in bytes */ +@@ -944,6 +967,10 @@ + Assert (input_len == isize, "bad input size"); + bi_windup(); + compressed_len += 7; /* align on byte boundary */ ++ } else if (pad && (compressed_len % 8) != 0) { ++ send_bits((STORED_BLOCK<<1)+eof, 3); /* send block type */ ++ compressed_len = (compressed_len + 3 + 7) & ~7L; ++ copy_block(buf, 0, 1); /* with header */ + } + Tracev((stderr,"\ncomprlen %lu(%lu) ", compressed_len>>3, + compressed_len-7*eof)); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Mon Jan 25 16:00:42 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Mon, 25 Jan 2010 15:00:42 +0000 Subject: [csw-devel] SF.net SVN: gar:[8172] csw/mgar/pkg Message-ID: Revision: 8172 http://gar.svn.sourceforge.net/gar/?rev=8172&view=rev Author: wahwah Date: 2010-01-25 15:00:42 +0000 (Mon, 25 Jan 2010) Log Message: ----------- pychecker: Initial commit Modified Paths: -------------- csw/mgar/pkg/pychecker/trunk/Makefile csw/mgar/pkg/pychecker/trunk/checksums Added Paths: ----------- csw/mgar/pkg/pychecker/ Modified: csw/mgar/pkg/pychecker/trunk/Makefile =================================================================== --- csw/mgar/pkg/template/trunk/Makefile 2010-01-25 11:29:54 UTC (rev 8165) +++ csw/mgar/pkg/pychecker/trunk/Makefile 2010-01-25 15:00:42 UTC (rev 8172) @@ -11,8 +11,9 @@ ## For more information about GAR variables, please see: ## https://sourceforge.net/apps/trac/gar/wiki/GAR%20Variable%20Reference ## -GARNAME = mypkg -GARVERSION = 1.0 +GARNAME = pychecker +GARVERSION = 0.8.18 +# pychecker-0.8.18.tar.gz ## ## The category that your software fits in. This is not a descriptive field, but ## influences the build process. Depending on the CATEGORIES setting, different @@ -22,24 +23,23 @@ ## Possible settings are: ## apps, cpan, devel, gnome, java, kde, lang, lib, meta, net, python, server, ## utils, x11, xfce, xorg, xtra -CATEGORIES = lib +CATEGORIES = python ## ## A one-line description of the package, which will appear in the pkginfo. -DESCRIPTION = +DESCRIPTION = static analysis tool for Python ## ## A longer description of the package. This is only for descriptive purposes ## inside the Makefile and is not used elsewhere. define BLURB - endef ## ## Upstream URL that should show up in the VENDOR field as well as on ## http://opencsw.org/packages/. -SPKG_SOURCEURL = +SPKG_SOURCEURL = http://pychecker.sourceforge.net/ ## ## Whitespace-separated list of URLs to download the source package from. ## There are presets: $(SF_MIRRORS), $(GNU_MIRRORS) and $(GOOGLE_MIRROR). -MASTER_SITES = +MASTER_SITES = $(SF_MIRRORS) ## ## SF_PROJ is required if you set $(MASTER_SITES) to $(SF_MIRRORS) and the ## Sourceforge project name differs from $(GARNAME). Specifies the Sourceforge @@ -56,7 +56,6 @@ ## $(MASTER_SITES). DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz ## -## We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz ## ## Catalog name is the name to be used with pkg{-get,util} -i . @@ -148,7 +147,7 @@ ## CONFIGURE_SCRIPTS = ## BUILD_SCRIPTS = ## INSTALL_SCRIPTS = -## TEST_SCRIPTS = +TEST_SCRIPTS = ## ## Compilation settings ## @@ -160,7 +159,7 @@ ## BUILD_ARGS = ## ## Arguments passed to the ./configure script. -CONFIGURE_ARGS = $(DIRPATHS) +## CONFIGURE_ARGS = $(DIRPATHS) ## ## BUILD64 = ## CONFIGURE_ENV = @@ -176,10 +175,4 @@ ## The compiler to use. Defaults to SOS11, can be also: SOS12, GCC3, GCC4. ## GARCOMPILER = SOS11 ## -# Remove the following rules and uncomment the -# include before building. -all: .DEFAULT -.DEFAULT: - @true - -#include gar/category.mk +include gar/category.mk Modified: csw/mgar/pkg/pychecker/trunk/checksums =================================================================== --- csw/mgar/pkg/template/trunk/checksums 2010-01-25 11:29:54 UTC (rev 8165) +++ csw/mgar/pkg/pychecker/trunk/checksums 2010-01-25 15:00:42 UTC (rev 8172) @@ -0,0 +1 @@ +ef156a631df46de150a364912f2e36c8 pychecker-0.8.18.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Mon Jan 25 16:01:55 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Mon, 25 Jan 2010 15:01:55 +0000 Subject: [csw-devel] SF.net SVN: gar:[8174] csw/mgar/pkg/pychecker/trunk/Makefile Message-ID: Revision: 8174 http://gar.svn.sourceforge.net/gar/?rev=8174&view=rev Author: wahwah Date: 2010-01-25 15:01:55 +0000 (Mon, 25 Jan 2010) Log Message: ----------- pychecker: ARCHALL = 1, removed template comments. Modified Paths: -------------- csw/mgar/pkg/pychecker/trunk/Makefile Modified: csw/mgar/pkg/pychecker/trunk/Makefile =================================================================== --- csw/mgar/pkg/pychecker/trunk/Makefile 2010-01-25 15:01:11 UTC (rev 8173) +++ csw/mgar/pkg/pychecker/trunk/Makefile 2010-01-25 15:01:55 UTC (rev 8174) @@ -2,177 +2,17 @@ # Distributed under the terms of the GNU General Public License v2 # $Id$ -## This file contains comments to guide you through various GAR settings. -## Please remove unnecessary comments before committing your code to the code -## repository. The comments to remove are marked with double hashes. -## If you want to remove them all in-place, use: -## gsed -i -e '/^##/d' Makefile -## -## For more information about GAR variables, please see: -## https://sourceforge.net/apps/trac/gar/wiki/GAR%20Variable%20Reference -## GARNAME = pychecker GARVERSION = 0.8.18 # pychecker-0.8.18.tar.gz -## -## The category that your software fits in. This is not a descriptive field, but -## influences the build process. Depending on the CATEGORIES setting, different -## Makefiles are included from gar/categories/ in your trunk directory, which -## adjust the build settings for the respective category. -## -## Possible settings are: -## apps, cpan, devel, gnome, java, kde, lang, lib, meta, net, python, server, -## utils, x11, xfce, xorg, xtra CATEGORIES = python -## -## A one-line description of the package, which will appear in the pkginfo. DESCRIPTION = static analysis tool for Python -## -## A longer description of the package. This is only for descriptive purposes -## inside the Makefile and is not used elsewhere. define BLURB endef -## -## Upstream URL that should show up in the VENDOR field as well as on -## http://opencsw.org/packages/. SPKG_SOURCEURL = http://pychecker.sourceforge.net/ -## -## Whitespace-separated list of URLs to download the source package from. -## There are presets: $(SF_MIRRORS), $(GNU_MIRRORS) and $(GOOGLE_MIRROR). MASTER_SITES = $(SF_MIRRORS) -## -## SF_PROJ is required if you set $(MASTER_SITES) to $(SF_MIRRORS) and the -## Sourceforge project name differs from $(GARNAME). Specifies the Sourceforge -## project name of the software you wish to download. -## SF_PROJ = -## -## A list of space separated patch filenames from files/ that are to be applied -## to the extracted software before the ./configure stage. Patches need to be -## included in the DISTFILES variable as well. -## PATCHFILES = -## -## Whitespace-separated list of files which comprise this build. mGAR will look -## for the files in the $(FILEDIR) (trunk/files) directory and on the -## $(MASTER_SITES). DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz -## UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz -## -## Catalog name is the name to be used with pkg{-get,util} -i . -## It is different from the system package name, which by convention is CSWpkgname. -## CATALOGNAME = -## -## Set to 1 to mark the package as architecture-independent. -## ARCHALL = 0 -## -## A list of files / patterns that should be excluded from the package. Amends -## the default list of excluded filenames $(MERGE_EXCLUDE_DEFAULT), which -## contains things like libtool .la files and files with a leading ~. -## EXTRA_MERGE_EXCLUDE_FILES = -## -## A list of space separated package names that should be marked as -## incompatible with the current package. This will go into the depend file. -## When a user has one of the incompatible packages installed and installs -## your package, he will be prompted that the incompatible package must be -## removed. He will however not be prevented to install your package without -## removing the conflicting package first. -## INCOMPATIBLE_PKGS = -## -## The name of the license file that should be included in your package. Defaults -## to COPYING. See http://sourceforge.net/apps/trac/gar/wiki/CopyRightfor details -## on including and displaying licenses. -## LICENSE = -## -## A list of space separated package names that should be produced from your -## Makefile. This is used when a software has different components that can be -## packaged and used individually (think runtime libraries, client tools, server -## files, development headers). You don't need to set this when you just want to -## produce one package. -## -## When you set this variable to include more than one package, you also need to -## set PKGFILES_CSWpkgname for each package (except for the first one in your -## $(PACKAGES) list) to define which files go into each package. The first -## package from $(PACKAGES) one will hold all files that are not matched by -## PKGFILES_ for other packages. -## PACKAGES = -## -## If specified, GAR feeds the almost-final package prototype file to -## $(PROTOTYPE_FILTER) and reads the final package prototype file from it. -## $(PROTOTYPE_FILTER) is usually a sed/awk/perl one-liner, which was mostly used -## to prepare the prototype file for use with cswclassutils (see -## $(SPKG_CLASSES)). Now that there are convenience variables for cswclassutils, -## you will rarely have to use this. A still valid use case would be to change -## the file permissions of a file to be set-UID. -## See http://wiki.opencsw.org/cswclassutils-package for common usage information -## PROTOTYPE_FILTER = -## -## cswclassutils settings -## -## A list of action classes. Possible values are: -## none cswpreserveconf cswcpsampleconf cswpycompile cswusergroup cswinitsmf -## cswinetd cswetcservices -## The class 'cswinitsmf' must be the last class listed. When you use cswclassutils, -## you need to add CSWcswclassutils to REQUIRED_PKGS. -## SPKG_CLASSES = none -## Simplified settings for classes: -## PRESERVECONF = -## SAMPLECONF = -## INITSMF = -## USERGROUP = -## ETCSERVICES = -## INETDCONF = -## A list of runtime package dependencies in the form of CSWfoo. -## REQUIRED_PKGS = -## -## A list of packages necessary to build this package -## PREREQUISITE_PKGS = $(REQUIRED_PKGS) -## -## When using non-empty $(PACKAGES): -## REQUIRED_PKGS_CSWpkgname = -## SPKG_DESC_CSWpkgname = -## PKGFILES_CSWpkgname = -## CATALOGNAME_CSWpkgname = -## -## A list of space separated directories where objects should be stripped in -## addition to the bin/ and sbin/ directories. -## STRIP_DIRS = -## -## Define a custom target for the configure phase. When you set this, the target -## that will be used instead of configure: target, is named -## configure-$(CONFIGURE_SCRIPTS) and you will need to define it in your Makefile -## after including gar/gar.include.mk. If you want to skip the configure phase -## completely (for example when your software doesn't need to be compiled) assign -## this variable an empty value. The procedure works for configure, build, -## install and test steps. -## CONFIGURE_SCRIPTS = -## BUILD_SCRIPTS = -## INSTALL_SCRIPTS = +ARCHALL = 0 TEST_SCRIPTS = -## -## Compilation settings -## -## The build directory. -## WORKSRC = $(WORKDIR)/$(GARNAME)-$(GARVERSION) -## -## BUILD_ARGS is passed as an argument to gmake during the build phase. Use this -## for example, if you need to override Makefile variables. -## BUILD_ARGS = -## -## Arguments passed to the ./configure script. -## CONFIGURE_ARGS = $(DIRPATHS) -## -## BUILD64 = -## CONFIGURE_ENV = -## EXTRA_CFLAGS = -## EXTRA_LDFLAGS = -## EXTRA_INC = -## EXTRA_LIB = -## GARFLAVOR = -## INSTALL_ARGS = -## OPT_FLAGS_SOS = -xO3 -## OPT_FLAGS_GCC = -O2 -pipe -## -## The compiler to use. Defaults to SOS11, can be also: SOS12, GCC3, GCC4. -## GARCOMPILER = SOS11 -## include gar/category.mk This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Mon Jan 25 16:02:54 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Mon, 25 Jan 2010 15:02:54 +0000 Subject: [csw-devel] SF.net SVN: gar:[8175] csw/mgar/pkg/automake/trunk/Makefile Message-ID: Revision: 8175 http://gar.svn.sourceforge.net/gar/?rev=8175&view=rev Author: dmichelsen Date: 2010-01-25 15:02:54 +0000 (Mon, 25 Jan 2010) Log Message: ----------- automake: Exclude old tecinfo doc Modified Paths: -------------- csw/mgar/pkg/automake/trunk/Makefile Modified: csw/mgar/pkg/automake/trunk/Makefile =================================================================== --- csw/mgar/pkg/automake/trunk/Makefile 2010-01-25 15:01:55 UTC (rev 8174) +++ csw/mgar/pkg/automake/trunk/Makefile 2010-01-25 15:02:54 UTC (rev 8175) @@ -40,11 +40,11 @@ $(foreach VERSION,$(MODULATIONS_GARVERSION),$(eval MERGE_SCRIPTS_isa-$(ISA)-garversion-$(VERSION) = copy-all)) # These are hardlinks to the versioned versions and will confuse the merging -EXTRA_MERGE_EXCLUDE_FILES_isa-sparcv8-garversion-1.6.3 = $(bindir)/automake $(bindir)/aclocal -EXTRA_MERGE_EXCLUDE_FILES_isa-sparcv8-garversion-1.7.9 = $(bindir)/automake $(bindir)/aclocal -EXTRA_MERGE_EXCLUDE_FILES_isa-sparcv8-garversion-1.8.5 = $(bindir)/automake $(bindir)/aclocal -EXTRA_MERGE_EXCLUDE_FILES_isa-sparcv8-garversion-1.9.6 = $(bindir)/automake $(bindir)/aclocal -EXTRA_MERGE_EXCLUDE_FILES_isa-sparcv8-garversion-1.10.3 = $(bindir)/automake $(bindir)/aclocal +EXTRA_MERGE_EXCLUDE_FILES_isa-sparcv8-garversion-1.6.3 = $(bindir)/automake $(bindir)/aclocal $(infodir)/.* +EXTRA_MERGE_EXCLUDE_FILES_isa-sparcv8-garversion-1.7.9 = $(bindir)/automake $(bindir)/aclocal $(infodir)/.* +EXTRA_MERGE_EXCLUDE_FILES_isa-sparcv8-garversion-1.8.5 = $(bindir)/automake $(bindir)/aclocal $(infodir)/.* +EXTRA_MERGE_EXCLUDE_FILES_isa-sparcv8-garversion-1.9.6 = $(bindir)/automake $(bindir)/aclocal $(infodir)/.* +EXTRA_MERGE_EXCLUDE_FILES_isa-sparcv8-garversion-1.10.3 = $(bindir)/automake $(bindir)/aclocal $(infodir)/.* include gar/category.mk This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Mon Jan 25 16:09:11 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Mon, 25 Jan 2010 15:09:11 +0000 Subject: [csw-devel] SF.net SVN: gar:[8176] csw/mgar/gar/v2/bin/checkpkg.d Message-ID: Revision: 8176 http://gar.svn.sourceforge.net/gar/?rev=8176&view=rev Author: wahwah Date: 2010-01-25 15:09:11 +0000 (Mon, 25 Jan 2010) Log Message: ----------- mGAR v2: a motivational checking module. Added Paths: ----------- csw/mgar/gar/v2/bin/checkpkg.d/checkpkg-you-can-write-your-own.py Removed Paths: ------------- csw/mgar/gar/v2/bin/checkpkg.d/checkpkg-dummy.py Deleted: csw/mgar/gar/v2/bin/checkpkg.d/checkpkg-dummy.py =================================================================== --- csw/mgar/gar/v2/bin/checkpkg.d/checkpkg-dummy.py 2010-01-25 15:02:54 UTC (rev 8175) +++ csw/mgar/gar/v2/bin/checkpkg.d/checkpkg-dummy.py 2010-01-25 15:09:11 UTC (rev 8176) @@ -1,21 +0,0 @@ -#!/opt/csw/bin/python2.6 -# $Id$ - -import checkpkg -import os.path -import logging - -def main(): - options, args = checkpkg.GetOptions() - if not os.path.isdir(options.extractdir): - raise checkpkg.PackageError("The extract base directory doesn't exist: %s" % options.extractdir) - for pkgname in args: - pkgpath = os.path.join(options.extractdir, pkgname) - if not os.path.isdir(pkgpath): - raise checkpkg.PackageError("The package directory doesn't exist: %s" % pkgpath) - logging.debug("Dummy plugin says the package %s is extracted to %s", - pkgname, options.extractdir) - - -if __name__ == '__main__': - main() Copied: csw/mgar/gar/v2/bin/checkpkg.d/checkpkg-you-can-write-your-own.py (from rev 8165, csw/mgar/gar/v2/bin/checkpkg.d/checkpkg-dummy.py) =================================================================== --- csw/mgar/gar/v2/bin/checkpkg.d/checkpkg-you-can-write-your-own.py (rev 0) +++ csw/mgar/gar/v2/bin/checkpkg.d/checkpkg-you-can-write-your-own.py 2010-01-25 15:09:11 UTC (rev 8176) @@ -0,0 +1,26 @@ +#!/opt/csw/bin/python2.6 +# $Id$ + +"""This is a dummy check. You can use it as a boilerplate for your own checks. + +Copy it and modify. +""" + +import checkpkg +import logging +import os.path + +def main(): + options, args = checkpkg.GetOptions() + if not os.path.isdir(options.extractdir): + raise checkpkg.PackageError("The extract base directory doesn't exist: %s" % options.extractdir) + for pkgname in args: + pkgpath = os.path.join(options.extractdir, pkgname) + if not os.path.isdir(pkgpath): + raise checkpkg.PackageError("The package directory doesn't exist: %s" % pkgpath) + logging.debug("Dummy plugin says the package %s is extracted to %s", + pkgname, options.extractdir) + + +if __name__ == '__main__': + main() This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Mon Jan 25 16:01:11 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Mon, 25 Jan 2010 15:01:11 +0000 Subject: [csw-devel] SF.net SVN: gar:[8173] csw/mgar/pkg/automake/trunk/Makefile Message-ID: Revision: 8173 http://gar.svn.sourceforge.net/gar/?rev=8173&view=rev Author: dmichelsen Date: 2010-01-25 15:01:11 +0000 (Mon, 25 Jan 2010) Log Message: ----------- automake: Exclude merging of automake and aclocal for old versions as hardlinks confuse the merging, this fixes #4184 Modified Paths: -------------- csw/mgar/pkg/automake/trunk/Makefile Modified: csw/mgar/pkg/automake/trunk/Makefile =================================================================== --- csw/mgar/pkg/automake/trunk/Makefile 2010-01-25 15:00:42 UTC (rev 8172) +++ csw/mgar/pkg/automake/trunk/Makefile 2010-01-25 15:01:11 UTC (rev 8173) @@ -3,7 +3,6 @@ CATEGORIES = devel EXTRA_MODULATORS = GARVERSION -# Version 1.1.2 is the last to contain libflac.so.7 where most of the binaries depend on MODULATIONS_GARVERSION = 1.6.3 1.7.9 1.8.5 1.9.6 1.10.3 1.11.1 DESCRIPTION = A tool for automatically generating Makefiles. @@ -40,7 +39,12 @@ $(foreach VERSION,$(MODULATIONS_GARVERSION),$(eval MERGE_SCRIPTS_isa-$(ISA)-garversion-$(VERSION) = copy-all)) -#CLEAN_SCRIPTS = custom +# These are hardlinks to the versioned versions and will confuse the merging +EXTRA_MERGE_EXCLUDE_FILES_isa-sparcv8-garversion-1.6.3 = $(bindir)/automake $(bindir)/aclocal +EXTRA_MERGE_EXCLUDE_FILES_isa-sparcv8-garversion-1.7.9 = $(bindir)/automake $(bindir)/aclocal +EXTRA_MERGE_EXCLUDE_FILES_isa-sparcv8-garversion-1.8.5 = $(bindir)/automake $(bindir)/aclocal +EXTRA_MERGE_EXCLUDE_FILES_isa-sparcv8-garversion-1.9.6 = $(bindir)/automake $(bindir)/aclocal +EXTRA_MERGE_EXCLUDE_FILES_isa-sparcv8-garversion-1.10.3 = $(bindir)/automake $(bindir)/aclocal include gar/category.mk This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Mon Jan 25 17:24:22 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Mon, 25 Jan 2010 16:24:22 +0000 Subject: [csw-devel] SF.net SVN: gar:[8177] csw/mgar/pkg/gzip/trunk Message-ID: Revision: 8177 http://gar.svn.sourceforge.net/gar/?rev=8177&view=rev Author: dmichelsen Date: 2010-01-25 16:24:21 +0000 (Mon, 25 Jan 2010) Log Message: ----------- gzip: Fix rsyncable Modified Paths: -------------- csw/mgar/pkg/gzip/trunk/Makefile csw/mgar/pkg/gzip/trunk/checksums Added Paths: ----------- csw/mgar/pkg/gzip/trunk/files/gzip-1.3.9-rsync.patch Removed Paths: ------------- csw/mgar/pkg/gzip/trunk/files/gzip.rsync.patch Modified: csw/mgar/pkg/gzip/trunk/Makefile =================================================================== --- csw/mgar/pkg/gzip/trunk/Makefile 2010-01-25 15:09:11 UTC (rev 8176) +++ csw/mgar/pkg/gzip/trunk/Makefile 2010-01-25 16:24:21 UTC (rev 8177) @@ -18,11 +18,9 @@ # For one possible approach to this, please see: # http://www.samba.org/netfilter/diary/gzip.rsync.patch # -# An updated version is available at -# http://ozlabs.org/~rusty/gzip.rsync.patch2 -# -# Unfortunately both don't apply cleanly. Disable for now. -# PATCHFILES += gzip.rsync.patch2 +# Update patch from +# http://cvs.fedoraproject.org/viewvc/rpms/gzip/F-12/gzip-1.3.9-rsync.patch?revision=1.2&content-type=text%2Fplain&view=co +PATCHFILES += gzip-1.3.9-rsync.patch # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz Modified: csw/mgar/pkg/gzip/trunk/checksums =================================================================== --- csw/mgar/pkg/gzip/trunk/checksums 2010-01-25 15:09:11 UTC (rev 8176) +++ csw/mgar/pkg/gzip/trunk/checksums 2010-01-25 16:24:21 UTC (rev 8177) @@ -1,3 +1,3 @@ 54776a402c7f43e4ece76c96a8e6518d 0001-Force-ggrep-as-Solaris-grep-doesn-t-understand-the-f.patch +d2e81e20767a85f799f56812d74b547a gzip-1.3.9-rsync.patch e381b8506210c794278f5527cba0e765 gzip-1.4.tar.gz -ee3a4df1c68f911ca9f05515346b3b3e gzip.rsync.patch2 Added: csw/mgar/pkg/gzip/trunk/files/gzip-1.3.9-rsync.patch =================================================================== --- csw/mgar/pkg/gzip/trunk/files/gzip-1.3.9-rsync.patch (rev 0) +++ csw/mgar/pkg/gzip/trunk/files/gzip-1.3.9-rsync.patch 2010-01-25 16:24:21 UTC (rev 8177) @@ -0,0 +1,280 @@ +diff -up gzip-1.3.12/trees.c.rsync gzip-1.3.12/trees.c +--- gzip-1.3.12/trees.c.rsync 2006-11-20 09:40:33.000000000 +0100 ++++ gzip-1.3.12/trees.c 2008-09-01 14:35:12.000000000 +0200 +@@ -860,9 +860,10 @@ local void send_all_trees(lcodes, dcodes + * trees or store, and output the encoded block to the zip file. This function + * returns the total compressed length for the file so far. + */ +-off_t flush_block(buf, stored_len, eof) ++off_t flush_block(buf, stored_len, pad, eof) + char *buf; /* input block, or NULL if too old */ + ulg stored_len; /* length of input block */ ++ int pad; /* pad output to byte boundary */ + int eof; /* true if this is the last block for a file */ + { + ulg opt_lenb, static_lenb; /* opt_len and static_len in bytes */ +@@ -955,6 +956,10 @@ off_t flush_block(buf, stored_len, eof) + Assert (input_len == bytes_in, "bad input size"); + bi_windup(); + compressed_len += 7; /* align on byte boundary */ ++ } else if (pad && (compressed_len % 8) != 0) { ++ send_bits((STORED_BLOCK<<1)+eof, 3); /* send block type */ ++ compressed_len = (compressed_len + 3 + 7) & ~7L; ++ copy_block(buf, 0, 1); /* with header */ + } + + return compressed_len >> 3; +diff -up gzip-1.3.12/deflate.c.rsync gzip-1.3.12/deflate.c +--- gzip-1.3.12/deflate.c.rsync 2006-12-08 00:53:00.000000000 +0100 ++++ gzip-1.3.12/deflate.c 2008-09-01 14:35:12.000000000 +0200 +@@ -135,6 +135,14 @@ static char rcsid[] = "$Id: deflate.c,v + #endif + /* Matches of length 3 are discarded if their distance exceeds TOO_FAR */ + ++#ifndef RSYNC_WIN ++# define RSYNC_WIN 4096 ++#endif ++/* Size of rsync window, must be < MAX_DIST */ ++ ++#define RSYNC_SUM_MATCH(sum) ((sum) % RSYNC_WIN == 0) ++/* Whether window sum matches magic value */ ++ + /* =========================================================================== + * Local data used by the "longest match" routines. + */ +@@ -216,6 +224,8 @@ local int compr_level; + unsigned near good_match; + /* Use a faster search when the previous match is longer than this */ + ++local ulg rsync_sum; /* rolling sum of rsync window */ ++local ulg rsync_chunk_end; /* next rsync sequence point */ + + /* Values for max_lazy_match, good_match and max_chain_length, depending on + * the desired pack level (0..9). The values given below have been tuned to +@@ -314,6 +324,10 @@ void lm_init (pack_level, flags) + #endif + /* prev will be initialized on the fly */ + ++ /* rsync params */ ++ rsync_chunk_end = 0xFFFFFFFFUL; ++ rsync_sum = 0; ++ + /* Set the default configuration parameters: + */ + max_lazy_match = configuration_table[pack_level].max_lazy; +@@ -550,6 +564,8 @@ local void fill_window() + memcpy((char*)window, (char*)window+WSIZE, (unsigned)WSIZE); + match_start -= WSIZE; + strstart -= WSIZE; /* we now have strstart >= MAX_DIST: */ ++ if (rsync_chunk_end != 0xFFFFFFFFUL) ++ rsync_chunk_end -= WSIZE; + + block_start -= (long) WSIZE; + +@@ -577,13 +593,46 @@ local void fill_window() + } + } + ++local void rsync_roll(start, num) ++ unsigned start; ++ unsigned num; ++{ ++ unsigned i; ++ ++ if (start < RSYNC_WIN) { ++ /* before window fills. */ ++ for (i = start; i < RSYNC_WIN; i++) { ++ if (i == start + num) return; ++ rsync_sum += (ulg)window[i]; ++ } ++ num -= (RSYNC_WIN - start); ++ start = RSYNC_WIN; ++ } ++ ++ /* buffer after window full */ ++ for (i = start; i < start+num; i++) { ++ /* New character in */ ++ rsync_sum += (ulg)window[i]; ++ /* Old character out */ ++ rsync_sum -= (ulg)window[i - RSYNC_WIN]; ++ if (rsync_chunk_end == 0xFFFFFFFFUL && RSYNC_SUM_MATCH(rsync_sum)) ++ rsync_chunk_end = i; ++ } ++} ++ ++/* =========================================================================== ++ * Set rsync_chunk_end if window sum matches magic value. ++ */ ++#define RSYNC_ROLL(s, n) \ ++ do { if (rsync) rsync_roll((s), (n)); } while(0) ++ + /* =========================================================================== + * Flush the current block, with given end-of-file flag. + * IN assertion: strstart is set to the end of the current match. + */ + #define FLUSH_BLOCK(eof) \ + flush_block(block_start >= 0L ? (char*)&window[(unsigned)block_start] : \ +- (char*)NULL, (long)strstart - block_start, (eof)) ++ (char*)NULL, (long)strstart - block_start, flush-1, (eof)) + + /* =========================================================================== + * Processes a new input file and return its compressed length. This +@@ -594,7 +643,7 @@ local void fill_window() + local off_t deflate_fast() + { + IPos hash_head; /* head of the hash chain */ +- int flush; /* set if current block must be flushed */ ++ int flush; /* set if current block must be flushed, 2=>and padded */ + unsigned match_length = 0; /* length of best match */ + + prev_length = MIN_MATCH-1; +@@ -624,6 +673,7 @@ local off_t deflate_fast() + + lookahead -= match_length; + ++ RSYNC_ROLL(strstart, match_length); + /* Insert new strings in the hash table only if the match length + * is not too large. This saves time but degrades compression. + */ +@@ -652,9 +702,14 @@ local off_t deflate_fast() + /* No match, output a literal byte */ + Tracevv((stderr,"%c",window[strstart])); + flush = ct_tally (0, window[strstart]); ++ RSYNC_ROLL(strstart, 1); + lookahead--; + strstart++; + } ++ if (rsync && strstart > rsync_chunk_end) { ++ rsync_chunk_end = 0xFFFFFFFFUL; ++ flush = 2; ++ } + if (flush) FLUSH_BLOCK(0), block_start = strstart; + + /* Make sure that we always have enough lookahead, except +@@ -728,6 +783,7 @@ off_t deflate() + */ + lookahead -= prev_length-1; + prev_length -= 2; ++ RSYNC_ROLL(strstart, prev_length+1); + do { + strstart++; + INSERT_STRING(strstart, hash_head); +@@ -740,24 +796,40 @@ off_t deflate() + match_available = 0; + match_length = MIN_MATCH-1; + strstart++; +- if (flush) FLUSH_BLOCK(0), block_start = strstart; + ++ if (rsync && strstart > rsync_chunk_end) { ++ rsync_chunk_end = 0xFFFFFFFFUL; ++ flush = 2; ++ } ++ if (flush) FLUSH_BLOCK(0), block_start = strstart; + } else if (match_available) { + /* If there was no match at the previous position, output a + * single literal. If there was a match but the current match + * is longer, truncate the previous match to a single literal. + */ + Tracevv((stderr,"%c",window[strstart-1])); +- if (ct_tally (0, window[strstart-1])) { +- FLUSH_BLOCK(0), block_start = strstart; ++ flush = ct_tally (0, window[strstart-1]); ++ if (rsync && strstart > rsync_chunk_end) { ++ rsync_chunk_end = 0xFFFFFFFFUL; ++ flush = 2; + } ++ if (flush) FLUSH_BLOCK(0), block_start = strstart; ++ RSYNC_ROLL(strstart, 1); + strstart++; + lookahead--; + } else { + /* There is no previous match to compare with, wait for + * the next step to decide. + */ ++ if (rsync && strstart > rsync_chunk_end) { ++ /* Reset huffman tree */ ++ rsync_chunk_end = 0xFFFFFFFFUL; ++ flush = 2; ++ FLUSH_BLOCK(0), block_start = strstart; ++ } ++ + match_available = 1; ++ RSYNC_ROLL(strstart, 1); + strstart++; + lookahead--; + } +diff -up gzip-1.3.12/gzip.c.rsync gzip-1.3.12/gzip.c +--- gzip-1.3.12/gzip.c.rsync 2007-03-20 06:09:51.000000000 +0100 ++++ gzip-1.3.12/gzip.c 2008-09-01 14:35:12.000000000 +0200 +@@ -231,6 +231,7 @@ int ofd; /* output fil + unsigned insize; /* valid bytes in inbuf */ + unsigned inptr; /* index of next byte to be processed in inbuf */ + unsigned outcnt; /* bytes in output buffer */ ++int rsync = 0; /* make ryncable chunks */ + + struct option longopts[] = + { +@@ -260,6 +261,7 @@ struct option longopts[] = + {"best", 0, 0, '9'}, /* compress better */ + {"lzw", 0, 0, 'Z'}, /* make output compatible with old compress */ + {"bits", 1, 0, 'b'}, /* max number of bits per code (implies -Z) */ ++ {"rsyncable", 0, 0, 'R'}, /* make rsync-friendly archive */ + { 0, 0, 0, 0 } + }; + +@@ -341,6 +343,7 @@ local void help() + " -Z, --lzw produce output compatible with old compress", + " -b, --bits=BITS max number of bits per code (implies -Z)", + #endif ++ " --rsyncable Make rsync-friendly archive", + "", + "With no FILE, or when FILE is -, read standard input.", + "", +@@ -469,6 +472,9 @@ int main (argc, argv) + recursive = 1; + #endif + break; ++ ++ case 'R': ++ rsync = 1; break; + case 'S': + #ifdef NO_MULTIPLE_DOTS + if (*optarg == '.') optarg++; +diff -up gzip-1.3.12/gzip.h.rsync gzip-1.3.12/gzip.h +--- gzip-1.3.12/gzip.h.rsync 2007-03-20 06:09:51.000000000 +0100 ++++ gzip-1.3.12/gzip.h 2008-09-01 14:35:12.000000000 +0200 +@@ -158,6 +158,7 @@ EXTERN(uch, window); /* Sliding + extern unsigned insize; /* valid bytes in inbuf */ + extern unsigned inptr; /* index of next byte to be processed in inbuf */ + extern unsigned outcnt; /* bytes in output buffer */ ++extern int rsync; /* deflate into rsyncable chunks */ + + extern off_t bytes_in; /* number of input bytes */ + extern off_t bytes_out; /* number of output bytes */ +@@ -306,7 +307,7 @@ off_t deflate OF((void)); + /* in trees.c */ + void ct_init OF((ush *attr, int *method)); + int ct_tally OF((int dist, int lc)); +-off_t flush_block OF((char *buf, ulg stored_len, int eof)); ++off_t flush_block OF((char *buf, ulg stored_len, int pad, int eof)); + + /* in bits.c */ + void bi_init OF((file_t zipfile)); +diff -up gzip-1.3.12/doc/gzip.texi.rsync gzip-1.3.12/doc/gzip.texi +--- gzip-1.3.12/doc/gzip.texi.rsync 2007-02-06 00:29:04.000000000 +0100 ++++ gzip-1.3.12/doc/gzip.texi 2008-09-01 14:35:12.000000000 +0200 +@@ -350,6 +350,14 @@ specified on the command line are direct + into the directory and compress all the files it finds there (or + decompress them in the case of @command{gunzip}). + ++ at item --rsyncable ++While compressing, synchronize the output occasionally based on the ++input. This reduces compression by about 1 percent most cases, but ++means that the @code{rsync} program can take advantage of similarities ++in the uncompressed input when syncronizing two files compressed with ++this flag. @code{gunzip} cannot tell the difference between a ++compressed file created with this option, and one created without it. ++ + @item --suffix @var{suf} + @itemx -S @var{suf} + Use suffix @var{suf} instead of @samp{.gz}. Any suffix can be Deleted: csw/mgar/pkg/gzip/trunk/files/gzip.rsync.patch =================================================================== --- csw/mgar/pkg/gzip/trunk/files/gzip.rsync.patch 2010-01-25 15:09:11 UTC (rev 8176) +++ csw/mgar/pkg/gzip/trunk/files/gzip.rsync.patch 2010-01-25 16:24:21 UTC (rev 8177) @@ -1,252 +0,0 @@ -diff -ur gzip-1.2.4.debian/deflate.c gzip-1.2.4-working/deflate.c ---- gzip-1.2.4.debian/deflate.c Fri Aug 13 22:35:31 1993 -+++ gzip-1.2.4-working/deflate.c Wed Oct 18 18:03:04 2000 -@@ -121,6 +121,14 @@ - #endif - /* Matches of length 3 are discarded if their distance exceeds TOO_FAR */ - -+#ifndef RSYNC_WIN -+# define RSYNC_WIN 8192 -+#endif -+/* Size of rsync window, must be < MAX_DIST */ -+ -+#define RSYNC_SUM_MATCH(sum) (((sum) & (RSYNC_WIN - 1)) == 0) -+/* Whether window sum matches magic value */ -+ - /* =========================================================================== - * Local data used by the "longest match" routines. - */ -@@ -202,6 +210,8 @@ - unsigned near good_match; - /* Use a faster search when the previous match is longer than this */ - -+local ulg rsync_sum; /* rolling sum of rsync window */ -+local ulg rsync_chunk_end; /* next rsync sequence point */ - - /* Values for max_lazy_match, good_match and max_chain_length, depending on - * the desired pack level (0..9). The values given below have been tuned to -@@ -300,6 +310,10 @@ - #endif - /* prev will be initialized on the fly */ - -+ /* rsync params */ -+ rsync_chunk_end = 0xFFFFFFFFUL; -+ rsync_sum = 0; -+ - /* Set the default configuration parameters: - */ - max_lazy_match = configuration_table[pack_level].max_lazy; -@@ -317,6 +331,7 @@ - - strstart = 0; - block_start = 0L; -+ rsync_chunk_end = 0xFFFFFFFFUL; - #ifdef ASMV - match_init(); /* initialize the asm code */ - #endif -@@ -536,6 +551,8 @@ - memcpy((char*)window, (char*)window+WSIZE, (unsigned)WSIZE); - match_start -= WSIZE; - strstart -= WSIZE; /* we now have strstart >= MAX_DIST: */ -+ if (rsync_chunk_end != 0xFFFFFFFFUL) -+ rsync_chunk_end -= WSIZE; - - block_start -= (long) WSIZE; - -@@ -563,6 +580,39 @@ - } - } - -+local void rsync_roll(start, num) -+ unsigned start; -+ unsigned num; -+{ -+ unsigned i; -+ -+ if (start < RSYNC_WIN) { -+ /* before window fills. */ -+ for (i = start; i < RSYNC_WIN; i++) { -+ if (i == start + num) return; -+ rsync_sum += (ulg)window[i]; -+ } -+ num -= (RSYNC_WIN - start); -+ start = RSYNC_WIN; -+ } -+ -+ /* buffer after window full */ -+ for (i = start; i < start+num; i++) { -+ /* New character in */ -+ rsync_sum += (ulg)window[i]; -+ /* Old character out */ -+ rsync_sum -= (ulg)window[i - RSYNC_WIN]; -+ if (rsync_chunk_end == 0xFFFFFFFFUL && RSYNC_SUM_MATCH(rsync_sum)) -+ rsync_chunk_end = i; -+ } -+} -+ -+/* =========================================================================== -+ * Set rsync_chunk_end if window sum matches magic value. -+ */ -+#define RSYNC_ROLL(s, n) \ -+ do { if (rsync) rsync_roll((s), (n)); } while(0) -+ - /* =========================================================================== - * Flush the current block, with given end-of-file flag. - * IN assertion: strstart is set to the end of the current match. -@@ -609,6 +659,7 @@ - - lookahead -= match_length; - -+ RSYNC_ROLL(strstart, match_length); - /* Insert new strings in the hash table only if the match length - * is not too large. This saves time but degrades compression. - */ -@@ -637,9 +688,18 @@ - /* No match, output a literal byte */ - Tracevv((stderr,"%c",window[strstart])); - flush = ct_tally (0, window[strstart]); -+ RSYNC_ROLL(strstart, 1); - lookahead--; - strstart++; - } -+ if (rsync && strstart > rsync_chunk_end) { -+ ush attr = 0; /* ascii/binary flag */ -+ -+ flush = 1; -+ /* Reset huffman tree */ -+ ct_init(&attr, &method); -+ rsync_chunk_end = 0xFFFFFFFFUL; -+ } - if (flush) FLUSH_BLOCK(0), block_start = strstart; - - /* Make sure that we always have enough lookahead, except -@@ -715,6 +775,7 @@ - */ - lookahead -= prev_length-1; - prev_length -= 2; -+ RSYNC_ROLL(strstart, prev_length+1); - do { - strstart++; - INSERT_STRING(strstart, hash_head); -@@ -727,24 +788,51 @@ - match_available = 0; - match_length = MIN_MATCH-1; - strstart++; -- if (flush) FLUSH_BLOCK(0), block_start = strstart; - -+ if (rsync && strstart > rsync_chunk_end) { -+ ush attr = 0; /* ascii/binary flag */ -+ -+ /* Reset huffman tree */ -+ ct_init(&attr, &method); -+ rsync_chunk_end = 0xFFFFFFFFUL; -+ flush = 1; -+ } -+ if (flush) FLUSH_BLOCK(0), block_start = strstart; - } else if (match_available) { - /* If there was no match at the previous position, output a - * single literal. If there was a match but the current match - * is longer, truncate the previous match to a single literal. - */ - Tracevv((stderr,"%c",window[strstart-1])); -- if (ct_tally (0, window[strstart-1])) { -- FLUSH_BLOCK(0), block_start = strstart; -- } -+ flush = ct_tally (0, window[strstart-1]); -+ if (rsync && strstart > rsync_chunk_end) { -+ ush attr = 0; /* ascii/binary flag */ -+ -+ /* Reset huffman tree */ -+ ct_init(&attr, &method); -+ rsync_chunk_end = 0xFFFFFFFFUL; -+ -+ flush = 1; -+ } -+ if (flush) FLUSH_BLOCK(0), block_start = strstart; -+ RSYNC_ROLL(strstart, 1); - strstart++; - lookahead--; - } else { - /* There is no previous match to compare with, wait for - * the next step to decide. - */ -+ if (rsync && strstart > rsync_chunk_end) { -+ ush attr = 0; /* ascii/binary flag */ -+ -+ /* Reset huffman tree */ -+ ct_init(&attr, &method); -+ rsync_chunk_end = 0xFFFFFFFFUL; -+ -+ FLUSH_BLOCK(0), block_start = strstart; -+ } - match_available = 1; -+ RSYNC_ROLL(strstart, 1); - strstart++; - lookahead--; - } -diff -ur gzip-1.2.4.debian/gzip.c gzip-1.2.4-working/gzip.c ---- gzip-1.2.4.debian/gzip.c Wed Oct 18 16:05:08 2000 -+++ gzip-1.2.4-working/gzip.c Wed Oct 18 15:42:59 2000 -@@ -239,6 +239,7 @@ - unsigned insize; /* valid bytes in inbuf */ - unsigned inptr; /* index of next byte to be processed in inbuf */ - unsigned outcnt; /* bytes in output buffer */ -+int rsync = 0; /* make ryncable chunks */ - - struct option longopts[] = - { -@@ -268,6 +269,7 @@ - {"best", 0, 0, '9'}, /* compress better */ - {"lzw", 0, 0, 'Z'}, /* make output compatible with old compress */ - {"bits", 1, 0, 'b'}, /* max number of bits per code (implies -Z) */ -+ {"rsyncable", 0, 0, 'R'}, /* make rsync-friendly archive */ - { 0, 0, 0, 0 } - }; - -@@ -357,6 +359,7 @@ - " -Z --lzw produce output compatible with old compress", - " -b --bits maxbits max number of bits per code (implies -Z)", - #endif -+ " --rsyncable Make rsync-friendly archive", - " file... files to (de)compress. If none given, use standard input.", - 0}; - char **p = help_msg; -@@ -516,6 +519,9 @@ - #else - recursive = 1; break; - #endif -+ case 'R': -+ rsync = 1; break; -+ - case 'S': - #ifdef NO_MULTIPLE_DOTS - if (*optarg == '.') optarg++; -diff -ur gzip-1.2.4.debian/gzip.h gzip-1.2.4-working/gzip.h ---- gzip-1.2.4.debian/gzip.h Wed Oct 18 16:05:08 2000 -+++ gzip-1.2.4-working/gzip.h Wed Oct 18 17:57:48 2000 -@@ -131,6 +131,7 @@ - extern unsigned insize; /* valid bytes in inbuf */ - extern unsigned inptr; /* index of next byte to be processed in inbuf */ - extern unsigned outcnt; /* bytes in output buffer */ -+extern int rsync; /* deflate into rsyncable chunks */ - - extern long bytes_in; /* number of input bytes */ - extern long bytes_out; /* number of output bytes */ -diff -ur gzip-1.2.4.debian/gzip.texi gzip-1.2.4-working/gzip.texi ---- gzip-1.2.4.debian/gzip.texi Thu Aug 19 06:42:50 1993 -+++ gzip-1.2.4-working/gzip.texi Wed Oct 18 16:58:05 2000 -@@ -316,6 +316,14 @@ - into the directory and compress all the files it finds there (or - decompress them in the case of @code{gunzip}). - -+ at item --rsyncable -+While compressing, synchronize the output occasionally based on the -+input. This can reduce the compression slightly in some cases, but -+means that the @code{rsync} program can take advantage of similarities -+in the uncompressed input when syncronizing two files compressed with -+this flag. @code{gunzip} cannot tell the difference between a -+compressed file created with this option, and one created without it. -+ - @item --suffix @var{suf} - @itemx -S @var{suf} - Use suffix @samp{@var{suf}} instead of @samp{.gz}. Any suffix can be This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Mon Jan 25 17:44:36 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Mon, 25 Jan 2010 16:44:36 +0000 Subject: [csw-devel] SF.net SVN: gar:[8178] csw/mgar/gar/v2-dirpackage Message-ID: Revision: 8178 http://gar.svn.sourceforge.net/gar/?rev=8178&view=rev Author: wahwah Date: 2010-01-25 16:44:20 +0000 (Mon, 25 Jan 2010) Log Message: ----------- mGAR v2-dirpackage: moving the library to lib/python, moving the test definitions to a separate file. Modified Paths: -------------- csw/mgar/gar/v2-dirpackage/tests/run_tests.py Added Paths: ----------- csw/mgar/gar/v2-dirpackage/lib/python/gartest.py csw/mgar/gar/v2-dirpackage/lib/python/opencsw_test.py csw/mgar/gar/v2-dirpackage/tests/example_test.py Removed Paths: ------------- csw/mgar/gar/v2-dirpackage/tests/gartest.py Copied: csw/mgar/gar/v2-dirpackage/lib/python/gartest.py (from rev 8165, csw/mgar/gar/v2-dirpackage/tests/gartest.py) =================================================================== --- csw/mgar/gar/v2-dirpackage/lib/python/gartest.py (rev 0) +++ csw/mgar/gar/v2-dirpackage/lib/python/gartest.py 2010-01-25 16:44:20 UTC (rev 8178) @@ -0,0 +1,185 @@ +# $Id$ +# +# Style guide: +# http://code.google.com/p/soc/wiki/PythonStyleGuide + +import Cheetah.Template +import shutil +import tempfile +import unittest +import os +import os.path +import subprocess +import sys +import opencsw + +"""A module used to do end-to-end testing of GAR.""" + +MAKEFILE_TMPL = """# GAR Makefile generated by $test_id +#for varname in $sorted($garvars) +$varname = $garvars[$varname] +#end for +#if $blurb +define BLURB + $blurb +endef +#end if +include gar/category.mk +#if $install_files +post-install-modulated: +#for filedir_name, directory, file_name, content in $install_files +\tginstall -m 755 -d \$(DESTDIR)$directory +\tginstall -m 644 \$(FILEDIR)/$filedir_name \$(DESTDIR)$directory/$file_name +#end for +#end if +# GAR recipe ends here. +""" +TMPDIR_PREFIX = "gartest-" +# FIXME: This information should be pulled out from GAR +DIR_PKG_OUT_DIR = os.path.join(os.environ["HOME"], "spool.5.8-sparc") + + +class Error(Exception): + pass + + +class GarBuild(object): + + def __init__(self): + self.built = False + self.packages = None + self.cleanup = True + + def GetDebugHelp(self): + """To be overriden in subclasses.""" + return ("When subclassing GarBuild, add here " + "information about how to reproduce\n" + "the build problem.") + + def Build(self): + if self.built: + return 0 + args = ["gmake", "dirpackage"] + gar_proc = subprocess.Popen(args, cwd=self.build_dir, + stdout=subprocess.PIPE, + stderr=subprocess.PIPE) + stdout, stderr = gar_proc.communicate() + ret = gar_proc.wait() + if ret: + print "ERROR: GAR run has failed." + print stdout + print stderr + self.built = False + # To allow debugging, don't clean up, leaving the files for inspection. + self.cleanup = False + print self.GetDebugHelp() + else: + self.built = True + return ret + + def GetBuiltPackages(self): + if not self.built: + raise Error("The packages have not been built yet.") + args = ["gmake", "pkglist"] + gar_proc = subprocess.Popen(args, cwd=self.build_dir, stdout=subprocess.PIPE) + stdout, stderr = gar_proc.communicate() + ret = gar_proc.wait() + pkglist = [] + for line in stdout.splitlines(): + # directory, catalogname, pkgname + pkglist.append(tuple(line.split("\t"))) + self.packages = [ + opencsw.DirectoryFormatPackage( + os.path.join(DIR_PKG_OUT_DIR, z)) + for x, y, z in pkglist] + return self.packages + + def GetFirstBuiltPackage(self): + """Returns only the first package. Easy to use.""" + packages = self.GetBuiltPackages() + if packages: + return packages[0] + + +class DynamicGarBuild(GarBuild): + """Represents a GAR build. + + Can create a GAR build and execute it. + """ + def __init__(self): + super(DynamicGarBuild, self).__init__() + self.build_dir = tempfile.mkdtemp(prefix=TMPDIR_PREFIX) + self.filedir = os.path.join(self.build_dir, "files") + self.makefile_filename = os.path.join(self.build_dir, "Makefile") + os.mkdir(self.filedir) + self.install_files = [] + self.garvars = { + "GARNAME": "testbuild", + "DESCRIPTION": u"A test package from %s" % self, + "CATEGORIES": "lib", + "CONFIGURE_ARGS": "$(DIRPATHS)", + "SPKG_SOURCEURL": "http://www.opencsw.org/", + "MASTER_SITES": "", + "GARVERSION": "0.0.1", + "CONFIGURE_SCRIPTS": "", + "BUILD_SCRIPTS": "", + "TEST_SCRIPTS": "", + "INSTALL_SCRIPTS": "", + } + self.tmpldata = { + "garvars": self.garvars, + "garsrc": os.path.join(os.getcwd(), ".."), + "blurb": None, + "install_files": self.install_files, + "build_dir": self.build_dir, + "test_id": "$Id$", + } + os.symlink(self.tmpldata["garsrc"], os.path.join(self.build_dir, "gar")) + + def SetGarVariable(self, varname, value): + self.garvars[varname] = value + + def WriteGarFiles(self): + for filedir_name, directory, filename, content in self.install_files: + file_path = os.path.join(self.filedir, filedir_name) + # print "Writing to %s" % file_path + fp = open(file_path, "w") + fp.write(content) + fp.close() + searchlist = [self.tmpldata] + t = Cheetah.Template.Template(MAKEFILE_TMPL, searchlist) + # For easy debugging, but only until we find a better solution, because it + # clutters the screen. + # print t + fp = open(self.makefile_filename, "w") + fp.write(str(t)) + fp.close() + + def AddInstallFile(self, file_path, content): + """Creates a file in the package, with the given path and content.""" + filedir_name = file_path.replace("/", "-") + directory, file_name = os.path.split(file_path) + self.install_files.append((filedir_name, directory, + file_name, content)) + + def GetDebugHelp(self): + return ("Please look into %s.\n" + "Remember to remove it when you're done debugging." + % repr(self.build_dir)) + + def __del__(self): + if self.cleanup: + shutil.rmtree(self.build_dir) + + +class StaticGarBuild(GarBuild): + + def __init__(self, build_dir): + super(StaticGarBuild, self).__init__() + self.build_dir = build_dir + + def __del__(self): + if self.cleanup: + shutil.rmtree(os.path.join(self.build_dir, "work")) + +# vim:set ts=2 sts=2 sw=2 expandtab: Added: csw/mgar/gar/v2-dirpackage/lib/python/opencsw_test.py =================================================================== --- csw/mgar/gar/v2-dirpackage/lib/python/opencsw_test.py (rev 0) +++ csw/mgar/gar/v2-dirpackage/lib/python/opencsw_test.py 2010-01-25 16:44:20 UTC (rev 8178) @@ -0,0 +1,232 @@ +#!/opt/csw/bin/python2.6 +# $Id$ + +import opencsw +import unittest +import re + +CATALOG_DATA_1 = """amavisd_new 2.6.3,REV=2009.04.23 CSWamavisdnew amavisd_new-2.6.3,REV=2009.04.23-SunOS5.8-all-CSW.pkg.gz 831f063d1ba20eb8bea0e0e60ceef3cb 813802 CSWperl|CSWcswclassutils|CSWpmunixsyslog|CSWpmiostringy|CSWpmnetserver|CSWpmmailtools|CSWpmmimetools|CSWpmcompresszlib|CSWpmarchivetar|CSWpmarchivezip|CSWspamassassin|CSWpmberkeleydb|CSWpmconverttnef|CSWpmconvertuulib|CSWpmmaildkim|CSWcommon none +amsn 0.94 CSWamsn amsn-0.94-SunOS5.8-all-CSW.pkg.gz 99afd828dd38fb39a37cb8ffd448b098 2420919 CSWtcl|CSWtk|CSWtcltls none +analog 5.32,REV=2003.9.12 CSWanalog analog-5.32,REV=2003.9.12-SunOS5.8-sparc-CSW.pkg.gz a2550ef2e37c67d475a19348b7276a38 711992 CSWcommon none +angband 3.0.3 CSWangband angband-3.0.3-SunOS5.8-sparc-CSW.pkg.gz 9280ff14bde4523d6032ede46c7630e3 1402841 CSWcommon|CSWgtk none +anjuta 1.2.2,REV=2005.03.01 CSWanjuta anjuta-1.2.2,REV=2005.03.01-SunOS5.8-sparc-CSW.pkg.gz 095ba6d763f157b0ce38922447c923b2 6502489 CSWaudiofile|CSWbonobo2|CSWcommon|CSWesound|CSWexpat|CSWfconfig|CSWftype2|CSWgconf2|CSWggettext|CSWglib2|CSWgnomekeyring|CSWgnomevfs2|CSWgtk2|CSWiconv|CSWjpeg|CSWlibart|CSWlibatk|CSWlibbonoboui|CSWlibglade2|CSWlibgnome|CSWlibgnomecanvas|CSWlibgnomeprint|CSWlibgnomeprintui|CSWlibgnomeui|CSWlibpopt|CSWlibxft2|CSWlibxml2|CSWlibxrender|CSWorbit2|CSWossl|CSWpango|CSWpcre|CSWvte|CSWzlib none +ant 1.7.1,REV=2008.10.29 CSWant ant-1.7.1,REV=2008.10.29-SunOS5.8-all-CSW.pkg.gz 0945884a52a3b43b743650c60ac21236 2055045 CSWcommon|CSWxercesj|CSWxmlcommonsext none +foo 1.7.1,REV=2008.10.29 CSWfoo foo-1.7.1,REV=2008.10.29-SunOS5.8-all-CSW.pkg.gz 0945884a52a3b43b743650c60ac21236 2055045 CSWcommon|CSWxercesj|CSWxmlcommonsext none +foo_devel 1.7.1,REV=2008.10.29 CSWfoo_devel foo_devel-1.7.1,REV=2008.10.29-SunOS5.8-all-CSW.pkg.gz 0945884a52a3b43b743650c60ac21236 2055045 CSWcommon|CSWxercesj|CSWxmlcommonsext none +libfoo 1.7.1,REV=2008.10.29 CSWlibfoo libfoo-1.7.1,REV=2008.10.29-SunOS5.8-all-CSW.pkg.gz 0945884a52a3b43b743650c60ac21236 2055045 CSWcommon|CSWxercesj|CSWxmlcommonsext none +foodoc 1.7.1,REV=2008.10.29 CSWfoodoc foodoc-1.7.1,REV=2008.10.29-SunOS5.8-all-CSW.pkg.gz 0945884a52a3b43b743650c60ac21236 2055045 CSWcommon|CSWxercesj|CSWxmlcommonsext none +bar 1.7.1,REV=2008.10.29 CSWbar bar-1.7.1,REV=2008.10.29-SunOS5.8-all-CSW.pkg.gz 0945884a52a3b43b743650c60ac21236 2055045 CSWcommon|CSWxercesj|CSWxmlcommonsext none +antdoc 1.7.1,REV=2008.10.29 CSWantdoc antdoc-1.7.1,REV=2008.10.29-SunOS5.8-all-CSW.pkg.gz e6555e61e7e7f1740935d970e5efad57 5851724 CSWcommon none""" +TEST_PKGINFO="""ARCH=i386 +BASEDIR=/ +CATEGORY=system +DESC=GNU Bourne-Again shell (bash) version 3.0 +EMAIL= +HOTLINE=Please contact your local service provider +MAXINST=1000 +NAME=GNU Bourne-Again shell (bash) +PKG=SUNWbash +SUNW_PKGTYPE=usr +SUNW_PKGVERS=1.0 +SUNW_PRODNAME=SunOS +SUNW_PRODVERS=5.10/SunOS Development +VENDOR=Sun Microsystems, Inc. +VERSION=11.10.0,REV=2005.01.08.01.09 +PSTAMP=sfw10-patch-x20070430084427 +CLASSES=none +PATCHLIST=126547-01 +PATCH_INFO_126547-01=Installed: Mon Oct 27 08:52:07 PDT 2008 From: mum Obsoletes: Requires: Incompatibles: +PKG_SRC_NOVERIFY= none +PKG_DST_QKVERIFY= none +PKG_CAS_PASSRELATIVE= none +#FASPACD= none +""" + + +class ParsePackageFileNameTest(unittest.TestCase): + + def testParsePackageFileName1(self): + test_data = open("example-catalog.txt") + split_re = re.compile(r"\s+") + for line in test_data: + fields = re.split(split_re, line) + catalogname = fields[0] + pkg_version = fields[1] + pkgname = fields[2] + file_name = fields[3] + pkg_md5 = fields[4] + pkg_size = fields[5] + depends_on = fields[6] + compiled = opencsw.ParsePackageFileName(file_name) + self.assertTrue(compiled, "File name %s did not compile" % repr(file_name)) + self.assertEqual(catalogname, compiled["catalogname"]) + self.assertEqual(pkg_version, compiled["full_version_string"]) + + +class UpgradeTypeTest(unittest.TestCase): + + def testUpgradeType_1(self): + pkg = opencsw.CatalogBasedOpencswPackage("analog") + pkg.LazyDownloadCatalogData(CATALOG_DATA_1.splitlines()) + expected_data = { + 'catalogname': 'analog', + 'full_version_string': '5.32,REV=2003.9.12', + 'version': '5.32', + 'version_info': {opencsw.MAJOR_VERSION: '5', + opencsw.MINOR_VERSION: '32'}, + 'revision_info': {'REV': '2003.9.12'}, + } + self.assertEqual(expected_data, pkg.GetCatalogPkgData()) + + def testUpgradeType_2(self): + pkg = opencsw.CatalogBasedOpencswPackage("analog") + pkg.LazyDownloadCatalogData(CATALOG_DATA_1.splitlines()) + unused_old_version_string = "5.32,REV=2003.9.12" + new_version_string = "5.32,REV=2003.9.13" + upgrade_type, upgrade_description, vs = pkg.UpgradeType(new_version_string) + self.assertEqual(opencsw.REVISION, upgrade_type) + + def testUpgradeType_3(self): + pkg = opencsw.CatalogBasedOpencswPackage("analog") + pkg.LazyDownloadCatalogData(CATALOG_DATA_1.splitlines()) + unused_old_version_string = "5.32,REV=2003.9.12" + new_version_string = "5.33,REV=2003.9.12" + upgrade_type, upgrade_description, vs = pkg.UpgradeType(new_version_string) + self.assertEqual(opencsw.MINOR_VERSION, upgrade_type) + + def testUpgradeType_4(self): + pkg = opencsw.CatalogBasedOpencswPackage("analog") + pkg.LazyDownloadCatalogData(CATALOG_DATA_1.splitlines()) + unused_old_version_string = "5.32,REV=2003.9.12" + new_version_string = "6.0,REV=2003.9.12" + upgrade_type, upgrade_description, vs = pkg.UpgradeType(new_version_string) + self.assertEqual(opencsw.MAJOR_VERSION, upgrade_type) + + def testUpgradeType_5(self): + pkg = opencsw.CatalogBasedOpencswPackage("nonexisting") + pkg.LazyDownloadCatalogData(CATALOG_DATA_1.splitlines()) + unused_old_version_string = "5.32,REV=2003.9.12" + new_version_string = "6.0,REV=2003.9.12" + upgrade_type, upgrade_description, vs = pkg.UpgradeType(new_version_string) + self.assertEqual(opencsw.NEW_PACKAGE, upgrade_type) + + def testUpgradeType_6(self): + pkg = opencsw.CatalogBasedOpencswPackage("analog") + pkg.LazyDownloadCatalogData(CATALOG_DATA_1.splitlines()) + unused_old_version_string = "5.32,REV=2003.9.12" + new_version_string = "5.32,REV=2003.9.12" + upgrade_type, upgrade_description, vs = pkg.UpgradeType(new_version_string) + self.assertEqual(opencsw.NO_VERSION_CHANGE, upgrade_type) + + def testUpgradeType_7(self): + pkg = opencsw.CatalogBasedOpencswPackage("angband") + pkg.LazyDownloadCatalogData(CATALOG_DATA_1.splitlines()) + unused_old_version_string = "3.0.3" + new_version_string = "3.0.3,REV=2003.9.12" + upgrade_type, upgrade_description, vs = pkg.UpgradeType(new_version_string) + self.assertEqual(opencsw.REVISION_ADDED, upgrade_type) + + def testUpgradeType_8(self): + pkg = opencsw.CatalogBasedOpencswPackage("angband") + pkg.LazyDownloadCatalogData(CATALOG_DATA_1.splitlines()) + unused_old_version_string = "3.0.3" + new_version_string = "3.0.4,REV=2003.9.12" + upgrade_type, upgrade_description, vs = pkg.UpgradeType(new_version_string) + self.assertEqual(opencsw.PATCHLEVEL, upgrade_type) + +class PackageTest(unittest.TestCase): + + def test_2(self): + expected = { + 'SUNW_PRODVERS': '5.10/SunOS Development', + 'PKG_CAS_PASSRELATIVE': ' none', + 'PKG_SRC_NOVERIFY': ' none', + 'PSTAMP': 'sfw10-patch-x20070430084427', + 'ARCH': 'i386', + 'EMAIL': '', + 'MAXINST': '1000', + 'PATCH_INFO_126547-01': 'Installed: Mon Oct 27 08:52:07 PDT 2008 From: mum Obsoletes: Requires: Incompatibles:', + 'PKG': 'SUNWbash', + 'SUNW_PKGTYPE': 'usr', + 'PKG_DST_QKVERIFY': ' none', + 'SUNW_PKGVERS': '1.0', + 'VENDOR': 'Sun Microsystems, Inc.', + 'BASEDIR': '/', + 'CLASSES': 'none', + 'PATCHLIST': '126547-01', + 'DESC': 'GNU Bourne-Again shell (bash) version 3.0', + 'CATEGORY': 'system', + 'NAME': 'GNU Bourne-Again shell (bash)', + 'SUNW_PRODNAME': 'SunOS', + 'VERSION': '11.10.0,REV=2005.01.08.01.09', + 'HOTLINE': 'Please contact your local service provider', + } + self.assertEquals(expected, + opencsw.ParsePkginfo(TEST_PKGINFO.splitlines())) + + def testSplitByCase1(self): + self.assertEquals(["aaa", "bbb"], opencsw.SplitByCase("AAAbbb")) + + def testSplitByCase2(self): + self.assertEquals(["aaa", "bbb", "ccc"], opencsw.SplitByCase("AAAbbb-ccc")) + + def testPkgnameToCatName1(self): + self.assertEquals("sunw_bash", opencsw.PkgnameToCatName("SUNWbash")) + + def testPkgnameToCatName2(self): + self.assertEquals("sunw_bash_s", opencsw.PkgnameToCatName("SUNWbashS")) + + def testPkgnameToCatName3(self): + """These are the rules!""" + self.assertEquals("sunw_p_ython", opencsw.PkgnameToCatName("SUNWPython")) + + def testPkgnameToCatName4(self): + self.assertEquals("stuf_with_some_dashes", + opencsw.PkgnameToCatName("STUFwith-some-dashes")) + + def test_4(self): + pkginfo_dict = opencsw.ParsePkginfo(TEST_PKGINFO.splitlines()) + expected = "sunw_bash-11.10.0,REV=2005.01.08.01.09-SunOS5.10-i386-SUNW.pkg" + self.assertEquals(expected, opencsw.PkginfoToSrv4Name(pkginfo_dict)) + + +class PackageGroupNameTest(unittest.TestCase): + + @classmethod + def CreatePkgList(self, catalogname_list): + pkg_list = [] + for name in catalogname_list: + pkg = opencsw.CatalogBasedOpencswPackage("foo") + pkg.LazyDownloadCatalogData(CATALOG_DATA_1.splitlines()) + pkg_list.append(pkg) + return pkg_list + + def testPackageGroupName_0(self): + data = [ + ("foo", ["foo"]), + ("foo", ["foo", "libfoo"]), + ("foo", ["foo", "libfoo", "foo_devel"]), + ("various packages", ["foo", "libfoo", "foo_devel", "bar"]), + ] + for expected_name, catalogname_list in data: + result = opencsw.CatalogNameGroupName(catalogname_list) + self.assertEqual(expected_name, result, + "data: %s, expected: %s, got: %s" % (catalogname_list, + repr(expected_name), + repr(result))) + + def testLongestCommonSubstring_1(self): + self.assertEqual(set(["foo"]), opencsw.LongestCommonSubstring("foo", "foo")) + + def testLongestCommonSubstring_2(self): + self.assertEqual(set([]), opencsw.LongestCommonSubstring("foo", "bar")) + + def testLongestCommonSubstring_3(self): + self.assertEqual(set(["bar"]), opencsw.LongestCommonSubstring("barfoobar", "bar")) + + def testLongestCommonSubstring_4(self): + self.assertEqual(set(['bcd', 'hij']), opencsw.LongestCommonSubstring("abcdefghijk", "bcdhij")) + + +if __name__ == '__main__': + unittest.main() Property changes on: csw/mgar/gar/v2-dirpackage/lib/python/opencsw_test.py ___________________________________________________________________ Added: svn:executable + * Added: svn:keywords + Id Added: csw/mgar/gar/v2-dirpackage/tests/example_test.py =================================================================== --- csw/mgar/gar/v2-dirpackage/tests/example_test.py (rev 0) +++ csw/mgar/gar/v2-dirpackage/tests/example_test.py 2010-01-25 16:44:20 UTC (rev 8178) @@ -0,0 +1,40 @@ +# $Id$ + +import unittest +import sys +sys.path.append("../lib/python") +import gartest + +class ExampleEndToEndTest(unittest.TestCase): + """An example end-to-end test of GAR.""" + + def testPkginfoName(self): + """Checks that the GARNAME makes it to the NAME in pkginfo.""" + mybuild = gartest.DynamicGarBuild() + mybuild.SetGarVariable("GARNAME", "foo") + mybuild.AddInstallFile("/opt/csw/share/foo", "bar!\n") + mybuild.WriteGarFiles() + self.assertEquals(0, mybuild.Build()) + pkg = mybuild.GetFirstBuiltPackage() + pkginfo = pkg.GetParsedPkginfo() + # By default, the garname should be used to create the catalog name, which + # in turn ends up in the NAME field in pkginfo. + self.assertTrue(pkginfo["NAME"].startswith("foo")) + + +class StaticBuildTestExample(unittest.TestCase): + """An example of a static build. + + This uses a static directory where GAR can be called. + """ + + def testLooseFiles(self): + mybuild = gartest.StaticGarBuild("static/example") + mybuild.Build() + pkg = mybuild.GetFirstBuiltPackage() + pkginfo = pkg.GetParsedPkginfo() + # This part would often use "self.assertEqual(, )" + self.assertTrue(pkginfo["NAME"].startswith("loose")) + +# To add more tests, create a Python file similar to this one, and add the +# corresponding import statement to the run_tests.py file. Property changes on: csw/mgar/gar/v2-dirpackage/tests/example_test.py ___________________________________________________________________ Added: svn:keywords + Id Deleted: csw/mgar/gar/v2-dirpackage/tests/gartest.py =================================================================== --- csw/mgar/gar/v2-dirpackage/tests/gartest.py 2010-01-25 16:24:21 UTC (rev 8177) +++ csw/mgar/gar/v2-dirpackage/tests/gartest.py 2010-01-25 16:44:20 UTC (rev 8178) @@ -1,176 +0,0 @@ -# $Id$ - -import Cheetah.Template -import shutil -import tempfile -import unittest -import os -import os.path -import subprocess -import opencsw - -"""A module used to do end-to-end testing of GAR.""" - -MAKEFILE_TMPL = """# GAR Makefile generated by $test_id -#for varname in $sorted($garvars) -$varname = $garvars[$varname] -#end for -#if $blurb -define BLURB - blurb -endef -#end if -include gar/category.mk -#if $install_files -post-install-modulated: -#for filedir_name, directory, file_name, content in $install_files -\tginstall -m 755 -d \$(DESTDIR)$directory -\tginstall -m 644 \$(FILEDIR)/$filedir_name \$(DESTDIR)$directory/$file_name -#end for -#end if -# GAR recipe ends here. -""" -TMPDIR_PREFIX = "gartest-" -# FIXME: This information should be pulled out from GAR -DIR_PKG_OUT_DIR = os.path.join(os.environ["HOME"], "spool.5.8-sparc") - -class Error(Exception): - pass - - -class GarBuild(object): - - def __init__(self): - self.built = False - self.packages = None - self.cleanup = True - - def GetDebugHelp(self): - """To be overriden in subclasses.""" - return "" - - def Build(self): - if self.built: - return 0 - args = ["gmake", "dirpackage"] - gar_proc = subprocess.Popen(args, cwd=self.tmpdir, - stdout=subprocess.PIPE, - stderr=subprocess.PIPE) - stdout, stderr = gar_proc.communicate() - ret = gar_proc.wait() - if ret: - print "ERROR: GAR run has failed." - print stdout - print stderr - self.built = False - # To allow debugging - self.cleanup = False - print self.GetDebugHelp() - else: - self.built = True - return ret - - def GetBuiltPackages(self): - if not self.built: - raise Error("The packages have not been built yet.") - args = ["gmake", "pkglist"] - gar_proc = subprocess.Popen(args, cwd=self.tmpdir, stdout=subprocess.PIPE) - stdout, stderr = gar_proc.communicate() - ret = gar_proc.wait() - pkglist = [] - for line in stdout.splitlines(): - # directory, catalogname, pkgname - pkglist.append(tuple(line.split("\t"))) - self.packages = [ - opencsw.DirectoryFormatPackage( - os.path.join(DIR_PKG_OUT_DIR, z)) - for x, y, z in pkglist] - return self.packages - - def GetFirstBuiltPackage(self): - """Returns only the first package. Easy to use.""" - packages = self.GetBuiltPackages() - if packages: - return packages[0] - - -class DynamicGarBuild(GarBuild): - """Represents a GAR build. - - Can create a GAR build and execute it. - """ - def __init__(self): - super(DynamicGarBuild, self).__init__() - self.tmpdir = tempfile.mkdtemp(prefix=TMPDIR_PREFIX) - self.filedir = os.path.join(self.tmpdir, "files") - self.makefile_filename = os.path.join(self.tmpdir, "Makefile") - os.mkdir(self.filedir) - self.install_files = [] - self.garvars = { - "GARNAME": "testbuild", - "DESCRIPTION": u"A test package from %s" % self, - "CATEGORIES": "lib", - "CONFIGURE_ARGS": "$(DIRPATHS)", - "SPKG_SOURCEURL": "http://www.opencsw.org/", - "MASTER_SITES": "", - "GARVERSION": "0.0.1", - "CONFIGURE_SCRIPTS": "", - "BUILD_SCRIPTS": "", - "TEST_SCRIPTS": "", - "INSTALL_SCRIPTS": "", - } - self.tmpldata = { - "garvars": self.garvars, - "garsrc": os.path.join(os.getcwd(), ".."), - "blurb": None, - "install_files": self.install_files, - "tmpdir": self.tmpdir, - "test_id": "$Id$", - } - os.symlink(self.tmpldata["garsrc"], os.path.join(self.tmpdir, "gar")) - - def SetGarVariable(self, varname, value): - self.garvars[varname] = value - - def WriteGarFiles(self): - # print "The tmpdir is", self.tmpdir - for filedir_name, directory, filename, content in self.install_files: - file_path = os.path.join(self.filedir, filedir_name) - print "Writing to %s" % file_path - fp = open(file_path, "w") - fp.write(content) - fp.close() - searchlist = [self.tmpldata] - t = Cheetah.Template.Template(MAKEFILE_TMPL, searchlist) - # For easy debugging, but only until we find a better solution, because it - # clutters the screen. - print t - fp = open(self.makefile_filename, "w") - fp.write(str(t)) - fp.close() - - def AddInstallFile(self, file_path, content): - """Creates a file in the package, with the given path and content.""" - filedir_name = file_path.replace("/", "-") - directory, file_name = os.path.split(file_path) - self.install_files.append((filedir_name, directory, - file_name, content)) - - def GetDebugHelp(self): - return ("Please look into %s.\n" - "Remember to remove it when you're done debugging." - % repr(self.tmpdir)) - - def __del__(self): - if self.cleanup: - shutil.rmtree(self.tmpdir) - - -class StaticGarBuild(GarBuild): - - def __init__(self, build_dir): - super(StaticGarBuild, self).__init__() - self.build_dir = build_dir - self.tmpdir = build_dir - -# vim:set ts=2 sts=2 sw=2 expandtab: Modified: csw/mgar/gar/v2-dirpackage/tests/run_tests.py =================================================================== --- csw/mgar/gar/v2-dirpackage/tests/run_tests.py 2010-01-25 16:24:21 UTC (rev 8177) +++ csw/mgar/gar/v2-dirpackage/tests/run_tests.py 2010-01-25 16:44:20 UTC (rev 8178) @@ -2,42 +2,11 @@ # $Id$ import unittest -import sys -sys.path.append("../lib/python") -import gartest -class ExampleEndToEndTest(unittest.TestCase): - """An example end-to-end test of GAR.""" +# To add more test files, create .py file and add a corresponding line +# here: +from example_test import * - def testPkginfoName(self): - """Checks that the GARNAME makes it to the NAME in pkginfo.""" - mybuild = gartest.DynamicGarBuild() - mybuild.SetGarVariable("GARNAME", "foo") - mybuild.AddInstallFile("/opt/csw/share/foo", "bar!\n") - mybuild.WriteGarFiles() - self.assertEquals(0, mybuild.Build()) - pkg = mybuild.GetFirstBuiltPackage() - pkginfo = pkg.GetParsedPkginfo() - # By default, the garname should be used to create the catalog name, which - # in turn ends up in the NAME field in pkginfo. - self.assertTrue(pkginfo["NAME"].startswith("foo")) - - -class StaticBuildTestExample(unittest.TestCase): - """An example of a static build. - - This uses a static directory where GAR can be called. - """ - - def testLooseFiles(self): - mybuild = gartest.StaticGarBuild("static/example") - mybuild.Build() - pkg = mybuild.GetFirstBuiltPackage() - pkginfo = pkg.GetParsedPkginfo() - # This part would often use "self.assertEqual(, )" - self.assertTrue(pkginfo["NAME"].startswith("loose")) - - if __name__ == '__main__': unittest.main() This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Tue Jan 26 10:54:00 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Tue, 26 Jan 2010 09:54:00 +0000 Subject: [csw-devel] SF.net SVN: gar:[8179] csw/mgar/pkg/gar/trunk/Makefile Message-ID: Revision: 8179 http://gar.svn.sourceforge.net/gar/?rev=8179&view=rev Author: wahwah Date: 2010-01-26 09:54:00 +0000 (Tue, 26 Jan 2010) Log Message: ----------- gar: Enabling checkpkg, using svn revision in SPKG_REVSTAMP instead of VERSION. Modified Paths: -------------- csw/mgar/pkg/gar/trunk/Makefile Modified: csw/mgar/pkg/gar/trunk/Makefile =================================================================== --- csw/mgar/pkg/gar/trunk/Makefile 2010-01-25 16:44:20 UTC (rev 8178) +++ csw/mgar/pkg/gar/trunk/Makefile 2010-01-26 09:54:00 UTC (rev 8179) @@ -24,8 +24,6 @@ SPKG_DESC_CSWgar = The GAR package build system -SPKG_VERSION_CSWgar = $(call _REVISION) - CONFIGURE_SCRIPTS = BUILD_SCRIPTS = TEST_SCRIPTS = @@ -37,6 +35,8 @@ include gar/category.mk +SPKG_REVSTAMP := $(SPKG_REVSTAMP)_rev=$(call _REVISION) + install-gar: @echo " ==> Installing $(GARNAME)" @@ -45,3 +45,11 @@ ginstall $(WORKSRC)/garit $(DESTDIR)$(bindir)/garit ginstall -d $(DESTDIR)$(prefix)/src/gar cd $(WORKSRC) && pax -r -w -v -s ,.*/\.svn.*,, v1 v2 $(DESTDIR)$(prefix)/src/gar + +# This is a workaround for builds that are done with umask 0027. There's a +# problem in which pax does not preserve the access bits. +post-install-modulated: + gfind $(DESTDIR) -type f -perm /u+x -exec chmod a+x,a+r,u+w {} \; + gfind $(DESTDIR) -type d -perm /u+x -exec chmod a+x,a+r,u+w {} \; + gfind $(DESTDIR) -type f -perm /u+r -exec chmod a+r,u+w {} \; + @$(MAKECOOKIE) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Tue Jan 26 11:26:13 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Tue, 26 Jan 2010 10:26:13 +0000 Subject: [csw-devel] SF.net SVN: gar:[8180] csw/mgar/gar/v2-dirpackage Message-ID: Revision: 8180 http://gar.svn.sourceforge.net/gar/?rev=8180&view=rev Author: wahwah Date: 2010-01-26 10:26:12 +0000 (Tue, 26 Jan 2010) Log Message: ----------- mGAR v2-dirpackage: Moving checkpkg.py into the lib/python directory. It introduces a little bit of ugly boilerplate code at the front of each executable. Modified Paths: -------------- csw/mgar/gar/v2-dirpackage/bin/checkpkg.d/checkpkg-dummy.py csw/mgar/gar/v2-dirpackage/bin/checkpkg.d/checkpkg-libs.py csw/mgar/gar/v2-dirpackage/bin/checkpkg.d/checkpkg-obsolete-deps.py csw/mgar/gar/v2-dirpackage/bin/checkpkg.d/update_contents_cache.py Added Paths: ----------- csw/mgar/gar/v2-dirpackage/lib/python/checkpkg.py csw/mgar/gar/v2-dirpackage/lib/python/checkpkg_test.py csw/mgar/gar/v2-dirpackage/lib/python/testdata/ Removed Paths: ------------- csw/mgar/gar/v2-dirpackage/bin/checkpkg.d/checkpkg.py csw/mgar/gar/v2-dirpackage/bin/checkpkg.d/checkpkg_test.py csw/mgar/gar/v2-dirpackage/bin/checkpkg.d/testdata/ Modified: csw/mgar/gar/v2-dirpackage/bin/checkpkg.d/checkpkg-dummy.py =================================================================== --- csw/mgar/gar/v2-dirpackage/bin/checkpkg.d/checkpkg-dummy.py 2010-01-26 09:54:00 UTC (rev 8179) +++ csw/mgar/gar/v2-dirpackage/bin/checkpkg.d/checkpkg-dummy.py 2010-01-26 10:26:12 UTC (rev 8180) @@ -1,10 +1,18 @@ #!/opt/csw/bin/python2.6 # $Id$ -import checkpkg import os.path import logging +import sys +# The following bit of code sets the correct path to Python libraries +# distributed with GAR. +path_list = [os.getcwd(), + os.path.split(sys.argv[0])[0], + "..", "..", "lib", "python"] +sys.path.append(os.path.join(*path_list)) +import checkpkg + def main(): options, args = checkpkg.GetOptions() if not os.path.isdir(options.extractdir): Modified: csw/mgar/gar/v2-dirpackage/bin/checkpkg.d/checkpkg-libs.py =================================================================== --- csw/mgar/gar/v2-dirpackage/bin/checkpkg.d/checkpkg-libs.py 2010-01-26 09:54:00 UTC (rev 8179) +++ csw/mgar/gar/v2-dirpackage/bin/checkpkg.d/checkpkg-libs.py 2010-01-26 10:26:12 UTC (rev 8180) @@ -8,7 +8,6 @@ # unit tests and it appears to be working. The main problem is that it's not # divided into smaller testable sections. -import checkpkg import os import os.path import copy @@ -18,6 +17,14 @@ import sys import textwrap +# The following bit of code sets the correct path to Python libraries +# distributed with GAR. +path_list = [os.getcwd(), + os.path.split(sys.argv[0])[0], + "..", "..", "lib", "python"] +sys.path.append(os.path.join(*path_list)) +import checkpkg + DUMP_BIN = "/usr/ccs/bin/dump" def GetIsalist(): Modified: csw/mgar/gar/v2-dirpackage/bin/checkpkg.d/checkpkg-obsolete-deps.py =================================================================== --- csw/mgar/gar/v2-dirpackage/bin/checkpkg.d/checkpkg-obsolete-deps.py 2010-01-26 09:54:00 UTC (rev 8179) +++ csw/mgar/gar/v2-dirpackage/bin/checkpkg.d/checkpkg-obsolete-deps.py 2010-01-26 10:26:12 UTC (rev 8180) @@ -1,11 +1,18 @@ #!/opt/csw/bin/python2.6 # $Id$ -import checkpkg import logging import os.path import sys +# The following bit of code sets the correct path to Python libraries +# distributed with GAR. +path_list = [os.getcwd(), + os.path.split(sys.argv[0])[0], + "..", "..", "lib", "python"] +sys.path.append(os.path.join(*path_list)) +import checkpkg + OBSOLETE_DEPS = { # "CSWfoo": { # "hint": "Do this...", Deleted: csw/mgar/gar/v2-dirpackage/bin/checkpkg.d/checkpkg.py =================================================================== --- csw/mgar/gar/v2-dirpackage/bin/checkpkg.d/checkpkg.py 2010-01-26 09:54:00 UTC (rev 8179) +++ csw/mgar/gar/v2-dirpackage/bin/checkpkg.d/checkpkg.py 2010-01-26 10:26:12 UTC (rev 8180) @@ -1,569 +0,0 @@ -# $Id$ -# -# This is the checkpkg library, common for all checkpkg tests written in -# Python. - -import itertools -import logging -import optparse -import os -import os.path -import re -import socket -import sqlite3 -import subprocess -import StringIO -from Cheetah import Template - -SYSTEM_PKGMAP = "/var/sadm/install/contents" -WS_RE = re.compile(r"\s+") -NEEDED_SONAMES = "needed sonames" -RUNPATH = "runpath" -SONAME = "soname" -CONFIG_MTIME = "mtime" -DO_NOT_REPORT_SURPLUS = set([u"CSWcommon", u"CSWcswclassutils", u"CSWisaexec"]) -DO_NOT_REPORT_MISSING = set([u"SUNWlibC", u"SUNWcsl", u"SUNWlibms", - u"*SUNWcslr", u"*SUNWlibC", u"*SUNWlibms", - u"SUNWcslx"]) -SYSTEM_SYMLINKS = ( - ("/opt/csw/bdb4", ["/opt/csw/bdb42"]), - ("/64", ["/amd64", "/sparcv9"]), - ("/opt/csw/lib/i386", ["/opt/csw/lib"]), -) - -# This shared library is present on Solaris 10 on amd64, but it's missing on -# Solaris 8 on i386. It's okay if it's missing. -ALLOWED_ORPHAN_SONAMES = set([u"libm.so.2"]) -DEPENDENCY_FILENAME_REGEXES = ( - (r".*\.pl", u"CSWperl"), - (r".*\.pm", u"CSWperl"), - (r".*\.py", u"CSWpython"), - (r".*\.rb", u"CSWruby"), -) - -REPORT_TMPL = u"""$pkgname: -#if $missing_deps -SUGGESTION: you may want to add some or all of the following as depends: - (Feel free to ignore SUNW or SPRO packages) -#for $pkg in $sorted($missing_deps) -> $pkg -#end for -#end if -#if $surplus_deps -The following packages might be unnecessary dependencies: -#for $pkg in $sorted($surplus_deps) -? $pkg -#end for -#end if -#if $orphan_sonames -The following sonames don't belong to any package: -#for $soname in $sorted($orphan_sonames) -! $soname -#end for -#end if -#if not $missing_deps and not $surplus_deps and not $orphan_sonames -+ Dependencies of $pkgname look good. -#end if -""" - -class Error(Exception): - pass - - -class ConfigurationError(Error): - pass - - -class PackageError(Error): - pass - - -def GetOptions(): - parser = optparse.OptionParser() - parser.add_option("-e", dest="extractdir", - help="The directory into which the package has been extracted") - parser.add_option("-d", "--debug", dest="debug", - default=False, action="store_true", - help="Turn on debugging messages") - (options, args) = parser.parse_args() - if not options.extractdir: - raise ConfigurationError("ERROR: -e option is missing.") - # Using set() to make the arguments unique. - return options, set(args) - - -class CheckpkgBase(object): - """This class has functionality overlapping with DirectoryFormatPackage - from the opencsw.py library. The classes should be merged. - """ - - def __init__(self, extractdir, pkgname): - self.extractdir = extractdir - self.pkgname = pkgname - self.pkgpath = os.path.join(self.extractdir, self.pkgname) - - def CheckPkgpathExists(self): - if not os.path.isdir(self.pkgpath): - raise PackageError("%s does not exist or is not a directory" - % self.pkgpath) - - def ListBinaries(self): - """Shells out to list all the binaries from a given package. - - Original checkpkg code: - - # ######################################### - # # find all executables and dynamic libs,and list their filenames. - # listbinaries() { - # if [ ! -d $1 ] ; then - # print errmsg $1 not a directory - # rm -rf $EXTRACTDIR - # exit 1 - # fi - # - # find $1 -print | xargs file |grep ELF |nawk -F: '{print $1}' - # } - """ - self.CheckPkgpathExists() - find_tmpl = "find %s -print | xargs file | grep ELF | nawk -F: '{print $1}'" - find_proc = subprocess.Popen(find_tmpl % self.pkgpath, - shell=True, stdout=subprocess.PIPE) - stdout, stderr = find_proc.communicate() - ret = find_proc.wait() - if ret: - logging.error("The find command returned an error.") - return stdout.splitlines() - - def GetAllFilenames(self): - self.CheckPkgpathExists() - file_basenames = [] - for root, dirs, files in os.walk(self.pkgpath): - file_basenames.extend(files) - return file_basenames - - def GetDependencies(self): - fd = open(os.path.join(self.pkgpath, "install", "depend"), "r") - depends = {} - for line in fd: - fields = re.split(WS_RE, line) - if fields[0] == "P": - depends[fields[1]] = " ".join(fields[1:]) - fd.close() - return depends - - def FormatDepsReport(self, missing_deps, surplus_deps, orphan_sonames): - """A intermediate version in which StringIO is used.""" - namespace = { - "pkgname": self.pkgname, - "missing_deps": missing_deps, - "surplus_deps": surplus_deps, - "orphan_sonames": orphan_sonames, - } - t = Template.Template(REPORT_TMPL, searchList=[namespace]) - return unicode(t) - - -class SystemPkgmap(object): - """A class to hold and manipulate the /var/sadm/install/contents file. - - TODO: Implement timestamp checking and refreshing the cache. - """ - - STOP_PKGS = ["SUNWbcp", "SUNWowbcp", "SUNWucb"] - CHECKPKG_DIR = ".checkpkg" - SQLITE3_DBNAME_TMPL = "var-sadm-install-contents-cache-%s" - - def __init__(self): - """There is no need to re-parse it each time. - - Read it slowly the first time and cache it for later.""" - self.cache = {} - self.checkpkg_dir = os.path.join(os.environ["HOME"], self.CHECKPKG_DIR) - self.fqdn = socket.getfqdn() - self.db_path = os.path.join(self.checkpkg_dir, - self.SQLITE3_DBNAME_TMPL % self.fqdn) - self.file_mtime = None - self.cache_mtime = None - if os.path.exists(self.db_path): - logging.debug("Connecting to the %s database.", self.db_path) - self.conn = sqlite3.connect(self.db_path) - if not self.IsDatabaseUpToDate(): - logging.warning("Rebuilding the package cache, can take a few minutes.") - self.PurgeDatabase() - self.PopulateDatabase() - else: - print "Building a cache of /var/sadm/install/contents." - print "The cache will be kept in %s." % self.db_path - if not os.path.exists(self.checkpkg_dir): - logging.debug("Creating %s", self.checkpkg_dir) - os.mkdir(self.checkpkg_dir) - self.conn = sqlite3.connect(self.db_path) - c = self.conn.cursor() - c.execute(""" - CREATE TABLE systempkgmap ( - id INTEGER PRIMARY KEY, - basename TEXT, - path TEXT, - line TEXT - ); - """) - logging.debug("Creating the config table.") - c.execute(""" - CREATE TABLE config ( - key VARCHAR(255) PRIMARY KEY, - float_value FLOAT, - str_value VARCHAR(255) - ); - """) - self.PopulateDatabase() - - def SymlinkDuringInstallation(self, p): - """Emulates the effect of some symlinks present during installations.""" - p = p.replace("/opt/csw/lib/i386", "/opt/csw/lib") - - def PopulateDatabase(self): - """Imports data into the database. - - Original bit of code from checkpkg: - - egrep -v 'SUNWbcp|SUNWowbcp|SUNWucb' /var/sadm/install/contents | - fgrep -f $EXTRACTDIR/liblist >$EXTRACTDIR/shortcatalog - """ - - system_pkgmap_fd = open(SYSTEM_PKGMAP, "r") - stop_re = re.compile("(%s)" % "|".join(self.STOP_PKGS)) - # Creating a data structure: - # soname - {: , : , ...} - logging.debug("Building sqlite3 cache db of the %s file", - SYSTEM_PKGMAP) - c = self.conn.cursor() - count = itertools.count() - for line in system_pkgmap_fd: - i = count.next() - if not i % 1000: - print "\r%s" % i, - if stop_re.search(line): - continue - fields = re.split(WS_RE, line) - pkgmap_entry_path = fields[0].split("=")[0] - pkgmap_entry_dir, pkgmap_entry_base_name = os.path.split(pkgmap_entry_path) - sql = "INSERT INTO systempkgmap (basename, path, line) VALUES (?, ?, ?);" - c.execute(sql, (pkgmap_entry_base_name, pkgmap_entry_dir, line.strip())) - print - print "Creating the main database index." - sql = "CREATE INDEX basename_idx ON systempkgmap(basename);" - c.execute(sql) - self.SetDatabaseMtime() - self.conn.commit() - - def SetDatabaseMtime(self): - c = self.conn.cursor() - sql = "DELETE FROM config WHERE key = ?;" - c.execute(sql, [CONFIG_MTIME]) - mtime = self.GetFileMtime() - logging.debug("Inserting the mtime (%s) into the database.", mtime) - sql = """ - INSERT INTO config (key, float_value) - VALUES (?, ?); - """ - c.execute(sql, [CONFIG_MTIME, mtime]) - - def GetPkgmapLineByBasename(self, filename): - if filename in self.cache: - return self.cache[filename] - sql = "SELECT path, line FROM systempkgmap WHERE basename = ?;" - c = self.conn.cursor() - c.execute(sql, [filename]) - lines = {} - for row in c: - lines[row[0]] = row[1] - if len(lines) == 0: - logging.debug("Cache doesn't contain filename %s", filename) - self.cache[filename] = lines - return lines - - def GetDatabaseMtime(self): - if not self.cache_mtime: - sql = """ - SELECT float_value FROM config - WHERE key = ?; - """ - c = self.conn.cursor() - c.execute(sql, [CONFIG_MTIME]) - row = c.fetchone() - if not row: - # raise ConfigurationError("Could not find the mtime setting") - self.cache_mtime = 1 - else: - self.cache_mtime = row[0] - return self.cache_mtime - - def GetFileMtime(self): - if not self.file_mtime: - stat_data = os.stat(SYSTEM_PKGMAP) - self.file_mtime = stat_data.st_mtime - return self.file_mtime - - def IsDatabaseUpToDate(self): - f_mtime = self.GetFileMtime() - d_mtime = self.GetDatabaseMtime() - logging.debug("f_mtime %s, d_time: %s", f_mtime, d_mtime) - return self.GetFileMtime() <= self.GetDatabaseMtime() - - def PurgeDatabase(self): - logging.info("Purging the cache database") - c = self.conn.cursor() - sql = "DELETE FROM config;" - c.execute(sql) - sql = "DELETE FROM systempkgmap;" - c.execute(sql) - sql = "DROP INDEX basename_idx;" - try: - c.execute(sql) - except sqlite3.OperationalError, e: - logging.warn(e) - -def SharedObjectDependencies(pkgname, - binaries_by_pkgname, - needed_sonames_by_binary, - pkgs_by_soname, - filenames_by_soname, - pkg_by_any_filename): - """This is one of the more obscure and more important pieces of code. - - I tried to make it simpler, but given that the operations here involve - whole sets of packages, it's not easy. - """ - so_dependencies = set() - orphan_sonames = set() - self_provided = set() - for binary in binaries_by_pkgname[pkgname]: - needed_sonames = needed_sonames_by_binary[binary][NEEDED_SONAMES] - for soname in needed_sonames: - if soname in filenames_by_soname: - filename = filenames_by_soname[soname] - pkg = pkg_by_any_filename[filename] - self_provided.add(soname) - so_dependencies.add(pkg) - elif soname in pkgs_by_soname: - so_dependencies.add(pkgs_by_soname[soname]) - else: - orphan_sonames.add(soname) - return so_dependencies, self_provided, orphan_sonames - - -def GuessDepsByFilename(pkgname, pkg_by_any_filename): - """Guesses dependencies based on filename regexes.""" - guessed_deps = set() - for pattern, dep_pkgname in DEPENDENCY_FILENAME_REGEXES: - # If any file name matches, add the dep, go to the next pattern/pkg - # combination. - pattern_re = re.compile("^%s$" % pattern) - for filename in pkg_by_any_filename: - if (re.match(pattern_re, filename) - and - pkgname == pkg_by_any_filename[filename]): - guessed_deps.add(dep_pkgname) - break - return guessed_deps - - -def GuessDepsByPkgname(pkgname, pkg_by_any_filename): - # More guessed dependencies: If one package is a substring of another, it - # might be a hint. For example, CSWmysql51test should depend on CSWmysql51. - # However, the rt (runtime) packages should not want to depend on the main - # package. - guessed_deps = set() - all_other_pkgs = set(pkg_by_any_filename.values()) - for other_pkg in all_other_pkgs: - other_pkg = unicode(other_pkg) - if pkgname == other_pkg: - continue - if pkgname.startswith(other_pkg): - endings = ["devel", "test", "bench", "dev"] - for ending in endings: - if pkgname.endswith(ending): - guessed_deps.add(other_pkg) - return guessed_deps - - -def AnalyzeDependencies(pkgname, - declared_dependencies, - binaries_by_pkgname, - needed_sonames_by_binary, - pkgs_by_soname, - filenames_by_soname, - pkg_by_any_filename): - """Gathers and merges dependency results from other functions. - - declared_dependencies: Dependencies that the package in question claims to - have. - - binaries_by_pkgname: A dictionary mapping pkgnames (CSWfoo) to binary names - (without paths) - - needed_sonames_by_binary: A dictionary mapping binary file name to - a dictionary containing: "needed sonames", - "soname", "rpath". Based on examining the binary - files within the packages. - - pkgs_by_soname: A dictionary mapping sonames to pkgnames, based on the - contents of the system wide pkgmap - (/var/sadm/install/contents) - - filenames_by_soname: A dictionary mapping shared library sonames to filenames, - based on files within packages - - pkg_by_any_filename: Mapping from file names to packages names, based on the - contents of the packages under examination. - """ - declared_dependencies_set = set(declared_dependencies) - - so_dependencies, self_provided, orphan_sonames = SharedObjectDependencies( - pkgname, - binaries_by_pkgname, - needed_sonames_by_binary, - pkgs_by_soname, - filenames_by_soname, - pkg_by_any_filename) - auto_dependencies = reduce(lambda x, y: x.union(y), - [ - so_dependencies, - GuessDepsByFilename(pkgname, pkg_by_any_filename), - GuessDepsByPkgname(pkgname, pkg_by_any_filename), - ]) - missing_deps = auto_dependencies.difference(declared_dependencies_set) - # Don't report itself as a suggested dependency. - missing_deps = missing_deps.difference(set([pkgname])) - missing_deps = missing_deps.difference(set(DO_NOT_REPORT_MISSING)) - surplus_deps = declared_dependencies_set.difference(auto_dependencies) - surplus_deps = surplus_deps.difference(DO_NOT_REPORT_SURPLUS) - orphan_sonames = orphan_sonames.difference(ALLOWED_ORPHAN_SONAMES) - return missing_deps, surplus_deps, orphan_sonames - - -def ExpandRunpath(runpath, isalist): - # Emulating $ISALIST expansion - if '$ISALIST' in runpath: - expanded_list = [runpath.replace('$ISALIST', isa) for isa in isalist] - else: - expanded_list = [runpath] - return expanded_list - -def ExpandSymlink(symlink, target, input_path): - symlink_re = re.compile(r"%s(/|$)" % symlink) - if re.search(symlink_re, input_path): - result = input_path.replace(symlink, target) - else: - result = input_path - return result - -def Emulate64BitSymlinks(runpath_list): - """Need to emulate the 64 -> amd64, 64 -> sparcv9 symlink - - Since we don't know the architecture, we'll adding both amd64 and sparcv9. - It should be safe. - """ - symlinked_list = [] - for runpath in runpath_list: - for symlink, expansion_list in SYSTEM_SYMLINKS: - for target in expansion_list: - expanded = ExpandSymlink(symlink, target, runpath) - if expanded not in symlinked_list: - symlinked_list.append(expanded) - return symlinked_list - - -def SanitizeRunpath(runpath): - ok = False - while True: - if runpath.endswith("/"): - runpath = runpath[:-1] - elif "//" in runpath: - runpath = runpath.replace("//", "/") - else: - break - return runpath - - -def GetLinesBySoname(pkgmap, needed_sonames, runpath_by_needed_soname, isalist): - """Works out which system pkgmap lines correspond to given sonames.""" - lines_by_soname = {} - for soname in needed_sonames: - # This is the critical part of the algorithm: it iterates over the - # runpath and finds the first matching one. - runpath_found = False - for runpath in runpath_by_needed_soname[soname]: - runpath = SanitizeRunpath(runpath) - runpath_list = ExpandRunpath(runpath, isalist) - runpath_list = Emulate64BitSymlinks(runpath_list) - soname_runpath_data = pkgmap.GetPkgmapLineByBasename(soname) - # Emulating the install time symlinks, for instance, if the prototype contains - # /opt/csw/lib/i386/foo.so.0 and /opt/csw/lib/i386 is a symlink to ".", - # the shared library ends up in /opt/csw/lib/foo.so.0 and should be findable even when - # RPATH does not contain $ISALIST. - new_soname_runpath_data = {} - for p in soname_runpath_data: - expanded_p_list = Emulate64BitSymlinks([p]) - for expanded_p in expanded_p_list: - new_soname_runpath_data[expanded_p] = soname_runpath_data[p] - soname_runpath_data = new_soname_runpath_data - - logging.debug("%s: will be looking for %s in %s" % - (soname, runpath_list, soname_runpath_data.keys())) - for runpath_expanded in runpath_list: - if runpath_expanded in soname_runpath_data: - lines_by_soname[soname] = soname_runpath_data[runpath_expanded] - runpath_found = True - # This break only goes out of the inner loop, - # need another one below to finish the outer loop. - break - if runpath_found: - break - return lines_by_soname - - -def BuildIndexesBySoname(needed_sonames_by_binary): - """Builds data structures indexed by soname. - - Building indexes - {"foo.so": ["/opt/csw/lib/gcc4", "/opt/csw/lib", ...], - ... - } - """ - needed_sonames = set() - binaries_by_soname = {} - runpath_by_needed_soname = {} - for binary_name, data in needed_sonames_by_binary.iteritems(): - for soname in data[NEEDED_SONAMES]: - needed_sonames.add(soname) - if soname not in runpath_by_needed_soname: - runpath_by_needed_soname[soname] = [] - runpath_by_needed_soname[soname].extend(data[RUNPATH]) - if soname not in binaries_by_soname: - binaries_by_soname[soname] = set() - binaries_by_soname[soname].add(binary_name) - return needed_sonames, binaries_by_soname, runpath_by_needed_soname - - -def ParseDumpOutput(dump_output): - binary_data = {RUNPATH: [], - NEEDED_SONAMES: []} - for line in dump_output.splitlines(): - fields = re.split(WS_RE, line) - # TODO: Make it a unit test - # logging.debug("%s says: %s", DUMP_BIN, fields) - if len(fields) < 3: - continue - if fields[1] == "NEEDED": - binary_data[NEEDED_SONAMES].append(fields[2]) - elif fields[1] == "RUNPATH": - binary_data[RUNPATH].extend(fields[2].split(":")) - elif fields[1] == "SONAME": - binary_data[SONAME] = fields[2] - # Adding the default runtime path search option. - binary_data[RUNPATH].append("/usr/lib/$ISALIST") - binary_data[RUNPATH].append("/usr/lib") - binary_data[RUNPATH].append("/lib/$ISALIST") - binary_data[RUNPATH].append("/lib") - return binary_data Deleted: csw/mgar/gar/v2-dirpackage/bin/checkpkg.d/checkpkg_test.py =================================================================== --- csw/mgar/gar/v2-dirpackage/bin/checkpkg.d/checkpkg_test.py 2010-01-26 09:54:00 UTC (rev 8179) +++ csw/mgar/gar/v2-dirpackage/bin/checkpkg.d/checkpkg_test.py 2010-01-26 10:26:12 UTC (rev 8180) @@ -1,589 +0,0 @@ -#!/opt/csw/bin/python2.6 -# $Id$ - -import unittest -import mox -import difflib -import checkpkg -import testdata.checkpkg_test_data_CSWmysql51rt as d1 -import testdata.checkpkg_test_data_CSWmysql51client as d2 -import testdata.checkpkg_test_data_CSWmysql51 as d3 -import testdata.checkpkg_test_data_CSWmysql51devel as d4 -import testdata.checkpkg_test_data_CSWlibpq_84 as d5 -import testdata.checkpkg_test_data_CSWmysql5client_8x as d6 -import testdata.checkpkg_test_data_CSWpostfix as d7 -import testdata.dump_output_1 as dump_1 -import testdata.dump_output_2 as dump_2 - -"""A set of unit tests for the library checking code. - -A bunch of lines to test in the interactive Python shell. - -import sys -sys.path.append("gar/bin/checkpkg.d") -import checkpkg -import testdata.checkpkg_test_data_CSWmysql5client_8x as d6 - -checkpkg.SharedObjectDependencies("CSWmysql5client", -d6.DATA_BINARIES_BY_PKGNAME, d6.DATA_NEEDED_SONAMES_BY_BINARY, -d6.DATA_PKGS_BY_FILENAME, d6.DATA_FILENAMES_BY_SONAME, -d6.DATA_PKG_BY_ANY_FILENAME) - -sqlite3 ~/.checkpkg/var-sadm-install-contents-cache-build8x -SELECT * FROM systempkgmap WHERE basename = 'libncursesw.so.5'; -""" - -class DependenciesUnitTest_1(unittest.TestCase): - - def setUp(self): - self.missing_deps, self.surplus_deps, self.orphan_sonames = checkpkg.AnalyzeDependencies( - d1.DATA_PKGNAME, - d1.DATA_DECLARED_DEPENDENCIES, - d1.DATA_BINARIES_BY_PKGNAME, - d1.DATA_NEEDED_SONAMES_BY_BINARY, - d1.DATA_PKGS_BY_FILENAME, - d1.DATA_FILENAMES_BY_SONAME, - d1.DATA_PKG_BY_ANY_FILENAME, - ) - - def testSurplusDeps(self): - self.assertEquals(set([]), self.surplus_deps) - - def testOrphanSonames(self): - self.assertEquals(set([]), self.orphan_sonames) - - def testMissingDeps(self): - expected = set([]) - self.assertEquals(expected, self.missing_deps) - - -class DependenciesUnitTest_2(unittest.TestCase): - - def setUp(self): - self.missing_deps, self.surplus_deps, self.orphan_sonames = checkpkg.AnalyzeDependencies( - d2.DATA_PKGNAME, - d2.DATA_DECLARED_DEPENDENCIES, - d2.DATA_BINARIES_BY_PKGNAME, - d2.DATA_NEEDED_SONAMES_BY_BINARY, - d2.DATA_PKGS_BY_FILENAME, - d2.DATA_FILENAMES_BY_SONAME, - d2.DATA_PKG_BY_ANY_FILENAME, - ) - - def testSurplusDeps(self): - self.assertEquals(set([]), self.surplus_deps) - - def testOrphanSonames(self): - self.assertEquals(set([]), self.orphan_sonames) - - def testMissingDeps(self): - expected = set([]) - self.assertEquals(expected, self.missing_deps) - - -class DependenciesUnitTest_3(unittest.TestCase): - - def setUp(self): - self.missing_deps, self.surplus_deps, self.orphan_sonames = checkpkg.AnalyzeDependencies( - d3.DATA_PKGNAME, - d3.DATA_DECLARED_DEPENDENCIES, - d3.DATA_BINARIES_BY_PKGNAME, - d3.DATA_NEEDED_SONAMES_BY_BINARY, - d3.DATA_PKGS_BY_FILENAME, - d3.DATA_FILENAMES_BY_SONAME, - d3.DATA_PKG_BY_ANY_FILENAME, - ) - - def testSurplusDeps(self): - self.assertEquals(set([u'CSWmysql51client']), self.surplus_deps) - - def testOrphanSonames(self): - self.assertEquals(set([]), self.orphan_sonames) - - def testMissingDeps(self): - expected = set(['CSWmysql51rt']) - self.assertEquals(expected, self.missing_deps) - - -class DependenciesUnitTest_4(unittest.TestCase): - - def setUp(self): - self.missing_deps, self.surplus_deps, self.orphan_sonames = checkpkg.AnalyzeDependencies( - d4.DATA_PKGNAME, - d4.DATA_DECLARED_DEPENDENCIES, - d4.DATA_BINARIES_BY_PKGNAME, - d4.DATA_NEEDED_SONAMES_BY_BINARY, - d4.DATA_PKGS_BY_FILENAME, - d4.DATA_FILENAMES_BY_SONAME, - d4.DATA_PKG_BY_ANY_FILENAME, - ) - - def testSurplusDeps(self): - self.assertEquals(set([]), self.surplus_deps) - - def testOrphanSonames(self): - self.assertEquals(set([]), self.orphan_sonames) - - def testMissingDeps(self): - expected = set([]) - self.assertEquals(expected, self.missing_deps) - - -class DependenciesUnitTest_5(unittest.TestCase): - - def setUp(self): - self.missing_deps, self.surplus_deps, self.orphan_sonames = checkpkg.AnalyzeDependencies( - d5.DATA_PKGNAME, - d5.DATA_DECLARED_DEPENDENCIES, - d5.DATA_BINARIES_BY_PKGNAME, - d5.DATA_NEEDED_SONAMES_BY_BINARY, - d5.DATA_PKGS_BY_FILENAME, - d5.DATA_FILENAMES_BY_SONAME, - d5.DATA_PKG_BY_ANY_FILENAME, - ) - - def testSurplusDeps(self): - self.assertEquals(set([]), self.surplus_deps) - - def testOrphanSonames(self): - self.assertEquals(set([]), self.orphan_sonames) - - def testMissingDeps(self): - # This tends to report itself... - expected = set([u'SUNWgss']) - self.assertEquals(expected, self.missing_deps) - - -class DependenciesUnitTest_6(unittest.TestCase): - - def setUp(self): - (self.missing_deps, - self.surplus_deps, - self.orphan_sonames) = checkpkg.AnalyzeDependencies( - d6.DATA_PKGNAME, - d6.DATA_DECLARED_DEPENDENCIES, - d6.DATA_BINARIES_BY_PKGNAME, - d6.DATA_NEEDED_SONAMES_BY_BINARY, - d6.DATA_PKGS_BY_FILENAME, - d6.DATA_FILENAMES_BY_SONAME, - d6.DATA_PKG_BY_ANY_FILENAME, - ) - - def testSurplusDeps(self): - self.assertEquals(set([]), self.surplus_deps) - - def testOrphanSonames(self): - self.assertEquals(set([]), self.orphan_sonames) - - def testMissingDeps(self): - expected = set([]) - self.assertEquals(expected, self.missing_deps) - - -class DependenciesUnitTest_7(unittest.TestCase): - - def setUp(self): - (self.missing_deps, - self.surplus_deps, - self.orphan_sonames) = checkpkg.AnalyzeDependencies( - d7.DATA_PKGNAME, - d7.DATA_DECLARED_DEPENDENCIES, - d7.DATA_BINARIES_BY_PKGNAME, - d7.DATA_NEEDED_SONAMES_BY_BINARY, - d7.DATA_PKGS_BY_FILENAME, - d7.DATA_FILENAMES_BY_SONAME, - d7.DATA_PKG_BY_ANY_FILENAME, - ) - - def testSurplusDeps(self): - self.assertEquals(set([]), self.surplus_deps) - - def testOrphanSonames(self): - self.assertEquals(set([]), self.orphan_sonames) - - def testMissingDeps(self): - expected = set([]) - self.assertEquals(expected, self.missing_deps) - - -class GuessDepsUnitTest(unittest.TestCase): - - def testGuessDepsByFilename1(self): - expected = set([u"CSWpython"]) - pkgname = u"CSWfoo" - pkg_by_filename = { - "/opt/csw/bin/bar": u"CSWfoo", - "/opt/csw/lib/python/site-packages/foo.py": u"CSWfoo", - } - self.assertEqual(expected, - checkpkg.GuessDepsByFilename(pkgname, pkg_by_filename)) - - def testGuessDepsByFilename2(self): - expected = set([]) - pkgname = u"CSWfoo" - pkg_by_filename = { - "/opt/csw/bin/bar": u"CSWfoo", - "/opt/csw/lib/python/site-packages/foo.py": u"CSWbar", - } - self.assertEqual(expected, - checkpkg.GuessDepsByFilename(pkgname, pkg_by_filename)) - - def testGuessDepsByPkgname1(self): - expected = set([u"CSWfoo"]) - pkgname = u"CSWfoo-devel" - pkg_by_filename = { - "/opt/csw/bin/bar": u"CSWfoo", - "/opt/csw/bin/barfoo": u"CSWfoobar", - "/opt/csw/lib/python/site-packages/foo.py": u"CSWfoo", - } - self.assertEqual(expected, - checkpkg.GuessDepsByPkgname(pkgname, pkg_by_filename)) - - def testGuessDepsByPkgname2(self): - expected = set([]) - pkgname = u"CSWzfoo-devel" - pkg_by_filename = { - "/opt/csw/bin/bar": u"CSWfoo", - "/opt/csw/bin/barfoo": u"CSWfoobar", - "/opt/csw/lib/python/site-packages/foo.py": u"CSWfoo", - } - self.assertEqual(expected, - checkpkg.GuessDepsByPkgname(pkgname, pkg_by_filename)) - - def testGuessDepsByPkgname3(self): - self.assertEqual(set([u"CSWmysql51"]), - checkpkg.GuessDepsByPkgname(u"CSWmysql51devel", - d4.DATA_PKG_BY_ANY_FILENAME)) - - def testGuessDepsByPkgname4(self): - data1 = set(['CSWmysql51', 'CSWmysql51rt', 'CSWmysql51test', - 'CSWmysql51client', 'CSWmysql51bench', 'CSWmysql51devel']) - data2 = dict(((x, x) for x in data1)) - self.assertEqual(set([u"CSWmysql51"]), checkpkg.GuessDepsByPkgname(u"CSWmysql51devel", data2)) - - def testGuessDepsByPkgname4(self): - data1 = set(['CSWmysql51', 'CSWmysql51rt', 'CSWmysql51test', - 'CSWmysql51client', 'CSWmysql51bench', 'CSWmysql51devel']) - data2 = dict(((x, x) for x in data1)) - self.assertEqual(set([]), checkpkg.GuessDepsByPkgname(u"CSWmysql51rt", data2)) - - -class GetLinesBySonameUnitTest(unittest.TestCase): - - class PkgmapStub(object): - - def __init__(self, cache): - self.cache = cache - - def GetPkgmapLineByBasename(self, soname): - return self.cache[soname] - - def setUp(self): - self.pkgmap_mocker = mox.Mox() - - def testExpandRunpath_1(self): - isalist = ["foo", "bar"] - runpath = "/opt/csw/lib/$ISALIST" - expected = ["/opt/csw/lib/foo", "/opt/csw/lib/bar"] - self.assertEquals(expected, checkpkg.ExpandRunpath(runpath, isalist)) - - def testExpandRunpath_2(self): - isalist = ["foo", "bar"] - runpath = "/opt/csw/mysql5/lib/$ISALIST/mysql" - expected = ["/opt/csw/mysql5/lib/foo/mysql", "/opt/csw/mysql5/lib/bar/mysql"] - self.assertEquals(expected, checkpkg.ExpandRunpath(runpath, isalist)) - - def testEmulate64BitSymlinks_1(self): - runpath_list = ["/opt/csw/mysql5/lib/foo/mysql/64"] - expected = "/opt/csw/mysql5/lib/foo/mysql/amd64" - self.assertTrue(expected in checkpkg.Emulate64BitSymlinks(runpath_list)) - - def testEmulate64BitSymlinks_2(self): - runpath_list = ["/opt/csw/mysql5/lib/64/mysql/foo"] - expected = "/opt/csw/mysql5/lib/amd64/mysql/foo" - result = checkpkg.Emulate64BitSymlinks(runpath_list) - self.assertTrue(expected in result, "%s not in %s" % (expected, result)) - - def testEmulate64BitSymlinks_3(self): - runpath_list = ["/opt/csw/mysql5/lib/64/mysql/foo"] - expected = "/opt/csw/mysql5/lib/sparcv9/mysql/foo" - result = checkpkg.Emulate64BitSymlinks(runpath_list) - self.assertTrue(expected in result, "%s not in %s" % (expected, result)) - - def testEmulate64BitSymlinks_4(self): - """No repeated paths because of symlink expansion""" - runpath_list = ["/opt/csw/lib"] - expected = "/opt/csw/lib" - result = checkpkg.Emulate64BitSymlinks(runpath_list) - self.assertEquals(1, len(result), "len(%s) != %s" % (result, 1)) - - def testEmulateSymlinks_3(self): - runpath_list = ["/opt/csw/bdb4"] - expected = "/opt/csw/bdb42" - result = checkpkg.Emulate64BitSymlinks(runpath_list) - self.assertTrue(expected in result, "%s not in %s" % (expected, result)) - - def testEmulateSymlinks_4(self): - runpath_list = ["/opt/csw/bdb42"] - expected = "/opt/csw/bdb42" - not_expected = "/opt/csw/bdb422" - result = checkpkg.Emulate64BitSymlinks(runpath_list) - self.assertTrue(expected in result, "%s not in %s" % (expected, result)) - self.assertFalse(not_expected in result, "%s is in %s" % (not_expected, result)) - - def testEmulateSymlinks_5(self): - """Install time symlink expansion.""" - runpath_list = ["/opt/csw/lib/i386"] - expected = "/opt/csw/lib" - result = checkpkg.Emulate64BitSymlinks(runpath_list) - self.assertTrue(expected in result, "%s not in %s" % (expected, result)) - - def testEmulateSymlinks_6(self): - """ExpandSymlink for /opt/csw/lib/i386.""" - runpath_list = ["/opt/csw/lib/i386"] - expected = "/opt/csw/lib" - not_expected = "/opt/csw/lib/i386" - result = checkpkg.ExpandSymlink("/opt/csw/lib/i386", "/opt/csw/lib", "/opt/csw/lib/i386") - self.assertTrue(expected in result, "%s not in %s" % (expected, result)) - self.assertFalse(not_expected in result, "%s is in %s" % (not_expected, result)) - - def testGetLinesBySoname(self): - expected = {'foo.so.1': '/opt/csw/lib/isa-value-1/foo.so.1 foo'} - pkgmap = self.pkgmap_mocker.CreateMock(checkpkg.SystemPkgmap) - pkgmap.GetPkgmapLineByBasename("foo") - lines1 = {"/opt/csw/lib/isa-value-1": "/opt/csw/lib/isa-value-1/foo.so.1 foo", - "/usr/lib": "/usr/lib/foo.so.1 foo"} - # pkgmap.GetPkgmapLineByBasename("foo.so.1").AndReturn(lines1) - pkgmap.GetPkgmapLineByBasename("foo.so.1").AndReturn(lines1) - self.pkgmap_mocker.ReplayAll() - pkgmap.GetPkgmapLineByBasename("foo") - needed_sonames = set(["foo.so.1"]) - runpath_by_needed_soname = {"foo.so.1": ["/opt/csw/lib/$ISALIST", "/usr/lib"]} - isalist = ["isa-value-1", "isa-value-2"] - result = checkpkg.GetLinesBySoname(pkgmap, needed_sonames, runpath_by_needed_soname, isalist) - self.pkgmap_mocker.VerifyAll() - self.assertEqual(expected, result) - - def testGetLinesBySoname_3(self): - expected = {'foo.so.1': '/opt/csw/lib/isa-value-1/foo.so.1 foo'} - pkgmap = self.pkgmap_mocker.CreateMock(checkpkg.SystemPkgmap) - pkgmap.GetPkgmapLineByBasename("foo") - lines1 = { - "/opt/csw/lib/isa-value-1": "/opt/csw/lib/isa-value-1/foo.so.1 foo", - "/opt/csw/lib": "/opt/csw/lib/foo.so.1 foo", - "/usr/lib": "/usr/lib/foo.so.1 foo"} - # pkgmap.GetPkgmapLineByBasename("foo.so.1").AndReturn(lines1) - pkgmap.GetPkgmapLineByBasename("foo.so.1").AndReturn(lines1) - self.pkgmap_mocker.ReplayAll() - pkgmap.GetPkgmapLineByBasename("foo") - needed_sonames = set(["foo.so.1"]) - runpath_by_needed_soname = { - "foo.so.1": ["/opt/csw/lib/$ISALIST", "/usr/lib"]} - isalist = ["isa-value-1", "isa-value-2"] - result = checkpkg.GetLinesBySoname( - pkgmap, needed_sonames, runpath_by_needed_soname, isalist) - self.pkgmap_mocker.VerifyAll() - self.assertEqual(expected, result) - - def testGetLinesBySoname_4(self): - """A more complex test, four ISAs.""" - expected = {'foo.so.1': '/opt/csw/lib/isa-value-1/foo.so.1 foo'} - pkgmap = self.pkgmap_mocker.CreateMock(checkpkg.SystemPkgmap) - pkgmap.GetPkgmapLineByBasename("foo") - lines1 = { - "/opt/csw/lib/isa-value-1": - "/opt/csw/lib/isa-value-1/foo.so.1 foo", - "/opt/csw/mysql5/lib/isa-value-2": - "/opt/csw/mysql5/lib/isa-value-2/foo.so.1 foo", - "/opt/csw/mysql5/lib/isa-value-1": - "/opt/csw/mysql5/lib/isa-value-1/foo.so.1 foo", - "/opt/csw/lib": - "/opt/csw/lib/foo.so.1 foo", - "/usr/lib": - "/usr/lib/foo.so.1 foo"} - pkgmap.GetPkgmapLineByBasename("foo.so.1").AndReturn(lines1) - pkgmap.GetPkgmapLineByBasename("foo.so.1").AndReturn(lines1) - self.pkgmap_mocker.ReplayAll() - pkgmap.GetPkgmapLineByBasename("foo") - needed_sonames = set(["foo.so.1"]) - runpath_by_needed_soname = { - "foo.so.1": ["/opt/csw/mysql5/lib/$ISALIST/mysql", - "/opt/csw/lib/$ISALIST", - "/usr/lib"]} - isalist = ["isa-value-1", "isa-value-2"] - result = checkpkg.GetLinesBySoname( - pkgmap, needed_sonames, runpath_by_needed_soname, isalist) - self.pkgmap_mocker.VerifyAll() - self.assertEqual(expected, result) - - def testGetLinesBySoname_5(self): - """Based on CSWmysql5client on build8x.""" - soname = u'libm.so.1' - expected = {u'libm.so.1': u'/usr/lib/libm.so.1 f none 0755 root bin ' - u'99844 3884 1050525375 SUNWlibms\n'} - - pkgmap_stub = self.PkgmapStub(d6.DATA_PKGMAP_CACHE) - (needed_sonames, - binaries_by_soname, - runpath_by_needed_soname) = checkpkg.BuildIndexesBySoname( - d6.DATA_NEEDED_SONAMES_BY_BINARY) - result = checkpkg.GetLinesBySoname( - pkgmap_stub, - set([soname]), - runpath_by_needed_soname, - d6.DATA_ISALIST) - self.assertEqual(expected, result) - - def testGetLinesBySoname_6(self): - """Based on CSWmysql5client on build8x.""" - soname = u'libz.so.1' - expected = {u'libz.so.1': u'/opt/csw/lib/pentium_pro+mmx/libz.so.1=libz.so.1.2.3 ' - u's none CSWzlib\n'} - pkgmap_stub = self.PkgmapStub(d6.DATA_PKGMAP_CACHE) - (needed_sonames, - binaries_by_soname, - runpath_by_needed_soname) = checkpkg.BuildIndexesBySoname( - d6.DATA_NEEDED_SONAMES_BY_BINARY) - result = checkpkg.GetLinesBySoname( - pkgmap_stub, - set([soname]), - runpath_by_needed_soname, - d6.DATA_ISALIST) - self.assertEqual(expected, result) - - def testGetLinesBySoname_7(self): - """A test for 64-bit symlink expansion.""" - soname = u'libncursesw.so.5' - # To test the 64-bit symlink expansion - expected = { - u'libncursesw.so.5': - u'/opt/csw/lib/amd64/libncursesw.so.5=libncursesw.so.5.7 ' - u's none CSWncurses\n'} - pkgmap_stub = self.PkgmapStub(d6.DATA_PKGMAP_CACHE) - (needed_sonames, - binaries_by_soname, - runpath_by_needed_soname) = checkpkg.BuildIndexesBySoname( - d6.DATA_NEEDED_SONAMES_BY_BINARY) - # The original data did not have amd64 in the isalist. - isalist = ['amd64', 'pentium_pro+mmx', 'pentium_pro', 'pentium+mmx', - 'pentium', 'i486', 'i386', 'i86'] - result = checkpkg.GetLinesBySoname( - pkgmap_stub, - set([soname]), - runpath_by_needed_soname, - isalist) - self.assertEqual(expected, result) - - def testGetLinesBySoname_8(self): - expected = {'foo.so.1': '/opt/csw/postgresql/lib/foo.so.1 foo'} - lines1 = {"/opt/csw/postgresql/lib": "/opt/csw/postgresql/lib/foo.so.1 foo"} - pkgmap = self.pkgmap_mocker.CreateMock(checkpkg.SystemPkgmap) - pkgmap.GetPkgmapLineByBasename("foo.so.1").AndReturn(lines1) - self.pkgmap_mocker.ReplayAll() - needed_sonames = set(["foo.so.1"]) - runpath_by_needed_soname = {"foo.so.1": ["/opt/csw/postgresql/lib/", "/usr/lib"]} - isalist = ["isa-value-1", "isa-value-2"] - result = checkpkg.GetLinesBySoname(pkgmap, needed_sonames, runpath_by_needed_soname, isalist) - self.pkgmap_mocker.VerifyAll() - self.assertEqual(expected, result) - - def testGetLinesBySoname_9(self): - """Emulation of binaries installed into /opt/csw/lib/i386. - - The problem is that /opt/csw/lib/i386 is a symlink and the binaries - end up in /opt/csw/lib instead. - """ - expected = {'foo.so.0': '/opt/csw/lib/i386/foo.so.0 foo'} - lines1 = {"/opt/csw/lib/i386": "/opt/csw/lib/i386/foo.so.0 foo"} - pkgmap = self.pkgmap_mocker.CreateMock(checkpkg.SystemPkgmap) - pkgmap.GetPkgmapLineByBasename("foo.so.0").AndReturn(lines1) - self.pkgmap_mocker.ReplayAll() - needed_sonames = set(["foo.so.0"]) - runpath_by_needed_soname = {"foo.so.0": ["/opt/csw/lib", "/usr/lib"]} - isalist = ["isa-value-1", "isa-value-2"] - result = checkpkg.GetLinesBySoname(pkgmap, needed_sonames, runpath_by_needed_soname, isalist) - self.pkgmap_mocker.VerifyAll() - self.assertEqual(expected, result) - - def testSanitizeRunpath_1(self): - self.assertEqual("/opt/csw/lib", checkpkg.SanitizeRunpath("/opt/csw/lib/")) - - def testSanitizeRunpath_2(self): - self.assertEqual("/opt/csw/lib", checkpkg.SanitizeRunpath("/opt//csw////lib/")) - - - -class ParseDumpOutputUnitTest(unittest.TestCase): - - def test_1(self): - expected = { - 'soname': 'libmysqlclient.so.15', - 'runpath': ['/opt/csw/lib/$ISALIST', - '/opt/csw/lib', - '/opt/csw/mysql5/lib/$ISALIST', - '/opt/csw/mysql5/lib', - '/opt/csw/mysql5/lib/$ISALIST/mysql', - # These four are artificially appended - '/usr/lib/$ISALIST', - '/usr/lib', - '/lib/$ISALIST', - '/lib'], - 'needed sonames': ['librt.so.1', - 'libresolv.so.2', - 'libc.so.1', - 'libgen.so.1', - 'libsocket.so.1', - 'libnsl.so.1', - 'libm.so.1', - 'libz.so.1']} - self.assertEqual(expected, - checkpkg.ParseDumpOutput(dump_1.DATA_DUMP_OUTPUT)) - - def test_2(self): - expected_runpath = ['/usr/lib/$ISALIST', '/usr/lib', '/lib/$ISALIST', '/lib'] - self.assertEqual( - expected_runpath, - checkpkg.ParseDumpOutput(dump_2.DATA_DUMP_OUTPUT)["runpath"]) - - -class FormatDepsReportUnitTest(unittest.TestCase): - - def AssertTextEqual(self, text1, text2): - difference = "\n".join(difflib.context_diff(text2.splitlines(), text1.splitlines())) - self.assertEqual(text1, text2, difference) - - def testAll(self): - missing_deps = set([u'SUNWgss', u'*SUNWlxsl']) - surplus_deps = set(['CSWsudo', 'CSWlibxslt']) - orphan_sonames = set([u'libm.so.2']) - testdata = (missing_deps, surplus_deps, orphan_sonames) - checker = checkpkg.CheckpkgBase("/tmp/nonexistent", "CSWfoo") - expected = u"""CSWfoo: -SUGGESTION: you may want to add some or all of the following as depends: - (Feel free to ignore SUNW or SPRO packages) -> *SUNWlxsl -> SUNWgss -The following packages might be unnecessary dependencies: -? CSWlibxslt -? CSWsudo -The following sonames don't belong to any package: -! libm.so.2 -""" - result = checker.FormatDepsReport(*testdata) - self.AssertTextEqual(result, expected) - - def testNone(self): - missing_deps = set([]) - surplus_deps = set([]) - orphan_sonames = set([]) - testdata = (missing_deps, surplus_deps, orphan_sonames) - checker = checkpkg.CheckpkgBase("/tmp/nonexistent", "CSWfoo") - expected = u"""CSWfoo: -+ Dependencies of CSWfoo look good. -""" - result = checker.FormatDepsReport(*testdata) - self.AssertTextEqual(result, expected) - - -if __name__ == '__main__': - unittest.main() Modified: csw/mgar/gar/v2-dirpackage/bin/checkpkg.d/update_contents_cache.py =================================================================== --- csw/mgar/gar/v2-dirpackage/bin/checkpkg.d/update_contents_cache.py 2010-01-26 09:54:00 UTC (rev 8179) +++ csw/mgar/gar/v2-dirpackage/bin/checkpkg.d/update_contents_cache.py 2010-01-26 10:26:12 UTC (rev 8180) @@ -5,9 +5,18 @@ # This file only creates an instance of SystemPkgmap in order to update the # package cache (if necessary), and display the information about the update. -import checkpkg +import os +import os.path +import sys import logging +# The following bit of code sets the correct path to Python libraries +# distributed with GAR. +path_list = [os.getcwd(), + os.path.split(sys.argv[0])[0], + "..", "..", "lib", "python"] +sys.path.append(os.path.join(*path_list)) +import checkpkg def main(): print "Checking if the package cache is up to date." Copied: csw/mgar/gar/v2-dirpackage/lib/python/checkpkg.py (from rev 8178, csw/mgar/gar/v2-dirpackage/bin/checkpkg.d/checkpkg.py) =================================================================== --- csw/mgar/gar/v2-dirpackage/lib/python/checkpkg.py (rev 0) +++ csw/mgar/gar/v2-dirpackage/lib/python/checkpkg.py 2010-01-26 10:26:12 UTC (rev 8180) @@ -0,0 +1,569 @@ +# $Id$ +# +# This is the checkpkg library, common for all checkpkg tests written in +# Python. + +import itertools +import logging +import optparse +import os +import os.path +import re +import socket +import sqlite3 +import subprocess +import StringIO +from Cheetah import Template + +SYSTEM_PKGMAP = "/var/sadm/install/contents" +WS_RE = re.compile(r"\s+") +NEEDED_SONAMES = "needed sonames" +RUNPATH = "runpath" +SONAME = "soname" +CONFIG_MTIME = "mtime" +DO_NOT_REPORT_SURPLUS = set([u"CSWcommon", u"CSWcswclassutils", u"CSWisaexec"]) +DO_NOT_REPORT_MISSING = set([u"SUNWlibC", u"SUNWcsl", u"SUNWlibms", + u"*SUNWcslr", u"*SUNWlibC", u"*SUNWlibms", + u"SUNWcslx"]) +SYSTEM_SYMLINKS = ( + ("/opt/csw/bdb4", ["/opt/csw/bdb42"]), + ("/64", ["/amd64", "/sparcv9"]), + ("/opt/csw/lib/i386", ["/opt/csw/lib"]), +) + +# This shared library is present on Solaris 10 on amd64, but it's missing on +# Solaris 8 on i386. It's okay if it's missing. +ALLOWED_ORPHAN_SONAMES = set([u"libm.so.2"]) +DEPENDENCY_FILENAME_REGEXES = ( + (r".*\.pl", u"CSWperl"), + (r".*\.pm", u"CSWperl"), + (r".*\.py", u"CSWpython"), + (r".*\.rb", u"CSWruby"), +) + +REPORT_TMPL = u"""$pkgname: +#if $missing_deps +SUGGESTION: you may want to add some or all of the following as depends: + (Feel free to ignore SUNW or SPRO packages) +#for $pkg in $sorted($missing_deps) +> $pkg +#end for +#end if +#if $surplus_deps +The following packages might be unnecessary dependencies: +#for $pkg in $sorted($surplus_deps) +? $pkg +#end for +#end if +#if $orphan_sonames +The following sonames don't belong to any package: +#for $soname in $sorted($orphan_sonames) +! $soname +#end for +#end if +#if not $missing_deps and not $surplus_deps and not $orphan_sonames ++ Dependencies of $pkgname look good. +#end if +""" + +class Error(Exception): + pass + + +class ConfigurationError(Error): + pass + + +class PackageError(Error): + pass + + +def GetOptions(): + parser = optparse.OptionParser() + parser.add_option("-e", dest="extractdir", + help="The directory into which the package has been extracted") + parser.add_option("-d", "--debug", dest="debug", + default=False, action="store_true", + help="Turn on debugging messages") + (options, args) = parser.parse_args() + if not options.extractdir: + raise ConfigurationError("ERROR: -e option is missing.") + # Using set() to make the arguments unique. + return options, set(args) + + +class CheckpkgBase(object): + """This class has functionality overlapping with DirectoryFormatPackage + from the opencsw.py library. The classes should be merged. + """ + + def __init__(self, extractdir, pkgname): + self.extractdir = extractdir + self.pkgname = pkgname + self.pkgpath = os.path.join(self.extractdir, self.pkgname) + + def CheckPkgpathExists(self): + if not os.path.isdir(self.pkgpath): + raise PackageError("%s does not exist or is not a directory" + % self.pkgpath) + + def ListBinaries(self): + """Shells out to list all the binaries from a given package. + + Original checkpkg code: + + # ######################################### + # # find all executables and dynamic libs,and list their filenames. + # listbinaries() { + # if [ ! -d $1 ] ; then + # print errmsg $1 not a directory + # rm -rf $EXTRACTDIR + # exit 1 + # fi + # + # find $1 -print | xargs file |grep ELF |nawk -F: '{print $1}' + # } + """ + self.CheckPkgpathExists() + find_tmpl = "find %s -print | xargs file | grep ELF | nawk -F: '{print $1}'" + find_proc = subprocess.Popen(find_tmpl % self.pkgpath, + shell=True, stdout=subprocess.PIPE) + stdout, stderr = find_proc.communicate() + ret = find_proc.wait() + if ret: + logging.error("The find command returned an error.") + return stdout.splitlines() + + def GetAllFilenames(self): + self.CheckPkgpathExists() + file_basenames = [] + for root, dirs, files in os.walk(self.pkgpath): + file_basenames.extend(files) + return file_basenames + + def GetDependencies(self): + fd = open(os.path.join(self.pkgpath, "install", "depend"), "r") + depends = {} + for line in fd: + fields = re.split(WS_RE, line) + if fields[0] == "P": + depends[fields[1]] = " ".join(fields[1:]) + fd.close() + return depends + + def FormatDepsReport(self, missing_deps, surplus_deps, orphan_sonames): + """A intermediate version in which StringIO is used.""" + namespace = { + "pkgname": self.pkgname, + "missing_deps": missing_deps, + "surplus_deps": surplus_deps, + "orphan_sonames": orphan_sonames, + } + t = Template.Template(REPORT_TMPL, searchList=[namespace]) + return unicode(t) + + +class SystemPkgmap(object): + """A class to hold and manipulate the /var/sadm/install/contents file. + + TODO: Implement timestamp checking and refreshing the cache. + """ + + STOP_PKGS = ["SUNWbcp", "SUNWowbcp", "SUNWucb"] + CHECKPKG_DIR = ".checkpkg" + SQLITE3_DBNAME_TMPL = "var-sadm-install-contents-cache-%s" + + def __init__(self): + """There is no need to re-parse it each time. + + Read it slowly the first time and cache it for later.""" + self.cache = {} + self.checkpkg_dir = os.path.join(os.environ["HOME"], self.CHECKPKG_DIR) + self.fqdn = socket.getfqdn() + self.db_path = os.path.join(self.checkpkg_dir, + self.SQLITE3_DBNAME_TMPL % self.fqdn) + self.file_mtime = None + self.cache_mtime = None + if os.path.exists(self.db_path): + logging.debug("Connecting to the %s database.", self.db_path) + self.conn = sqlite3.connect(self.db_path) + if not self.IsDatabaseUpToDate(): + logging.warning("Rebuilding the package cache, can take a few minutes.") + self.PurgeDatabase() + self.PopulateDatabase() + else: + print "Building a cache of /var/sadm/install/contents." + print "The cache will be kept in %s." % self.db_path + if not os.path.exists(self.checkpkg_dir): + logging.debug("Creating %s", self.checkpkg_dir) + os.mkdir(self.checkpkg_dir) + self.conn = sqlite3.connect(self.db_path) + c = self.conn.cursor() + c.execute(""" + CREATE TABLE systempkgmap ( + id INTEGER PRIMARY KEY, + basename TEXT, + path TEXT, + line TEXT + ); + """) + logging.debug("Creating the config table.") + c.execute(""" + CREATE TABLE config ( + key VARCHAR(255) PRIMARY KEY, + float_value FLOAT, + str_value VARCHAR(255) + ); + """) + self.PopulateDatabase() + + def SymlinkDuringInstallation(self, p): + """Emulates the effect of some symlinks present during installations.""" + p = p.replace("/opt/csw/lib/i386", "/opt/csw/lib") + + def PopulateDatabase(self): + """Imports data into the database. + + Original bit of code from checkpkg: + + egrep -v 'SUNWbcp|SUNWowbcp|SUNWucb' /var/sadm/install/contents | + fgrep -f $EXTRACTDIR/liblist >$EXTRACTDIR/shortcatalog + """ + + system_pkgmap_fd = open(SYSTEM_PKGMAP, "r") + stop_re = re.compile("(%s)" % "|".join(self.STOP_PKGS)) + # Creating a data structure: + # soname - {: , : , ...} + logging.debug("Building sqlite3 cache db of the %s file", + SYSTEM_PKGMAP) + c = self.conn.cursor() + count = itertools.count() + for line in system_pkgmap_fd: + i = count.next() + if not i % 1000: + print "\r%s" % i, + if stop_re.search(line): + continue + fields = re.split(WS_RE, line) + pkgmap_entry_path = fields[0].split("=")[0] + pkgmap_entry_dir, pkgmap_entry_base_name = os.path.split(pkgmap_entry_path) + sql = "INSERT INTO systempkgmap (basename, path, line) VALUES (?, ?, ?);" + c.execute(sql, (pkgmap_entry_base_name, pkgmap_entry_dir, line.strip())) + print + print "Creating the main database index." + sql = "CREATE INDEX basename_idx ON systempkgmap(basename);" + c.execute(sql) + self.SetDatabaseMtime() + self.conn.commit() + + def SetDatabaseMtime(self): + c = self.conn.cursor() + sql = "DELETE FROM config WHERE key = ?;" + c.execute(sql, [CONFIG_MTIME]) + mtime = self.GetFileMtime() + logging.debug("Inserting the mtime (%s) into the database.", mtime) + sql = """ + INSERT INTO config (key, float_value) + VALUES (?, ?); + """ + c.execute(sql, [CONFIG_MTIME, mtime]) + + def GetPkgmapLineByBasename(self, filename): + if filename in self.cache: + return self.cache[filename] + sql = "SELECT path, line FROM systempkgmap WHERE basename = ?;" + c = self.conn.cursor() + c.execute(sql, [filename]) + lines = {} + for row in c: + lines[row[0]] = row[1] + if len(lines) == 0: + logging.debug("Cache doesn't contain filename %s", filename) + self.cache[filename] = lines + return lines + + def GetDatabaseMtime(self): + if not self.cache_mtime: + sql = """ + SELECT float_value FROM config + WHERE key = ?; + """ + c = self.conn.cursor() + c.execute(sql, [CONFIG_MTIME]) + row = c.fetchone() + if not row: + # raise ConfigurationError("Could not find the mtime setting") + self.cache_mtime = 1 + else: + self.cache_mtime = row[0] + return self.cache_mtime + + def GetFileMtime(self): + if not self.file_mtime: + stat_data = os.stat(SYSTEM_PKGMAP) + self.file_mtime = stat_data.st_mtime + return self.file_mtime + + def IsDatabaseUpToDate(self): + f_mtime = self.GetFileMtime() + d_mtime = self.GetDatabaseMtime() + logging.debug("f_mtime %s, d_time: %s", f_mtime, d_mtime) + return self.GetFileMtime() <= self.GetDatabaseMtime() + + def PurgeDatabase(self): + logging.info("Purging the cache database") + c = self.conn.cursor() + sql = "DELETE FROM config;" + c.execute(sql) + sql = "DELETE FROM systempkgmap;" + c.execute(sql) + sql = "DROP INDEX basename_idx;" + try: + c.execute(sql) + except sqlite3.OperationalError, e: + logging.warn(e) + +def SharedObjectDependencies(pkgname, + binaries_by_pkgname, + needed_sonames_by_binary, + pkgs_by_soname, + filenames_by_soname, + pkg_by_any_filename): + """This is one of the more obscure and more important pieces of code. + + I tried to make it simpler, but given that the operations here involve + whole sets of packages, it's not easy. + """ + so_dependencies = set() + orphan_sonames = set() + self_provided = set() + for binary in binaries_by_pkgname[pkgname]: + needed_sonames = needed_sonames_by_binary[binary][NEEDED_SONAMES] + for soname in needed_sonames: + if soname in filenames_by_soname: + filename = filenames_by_soname[soname] + pkg = pkg_by_any_filename[filename] + self_provided.add(soname) + so_dependencies.add(pkg) + elif soname in pkgs_by_soname: + so_dependencies.add(pkgs_by_soname[soname]) + else: + orphan_sonames.add(soname) + return so_dependencies, self_provided, orphan_sonames + + +def GuessDepsByFilename(pkgname, pkg_by_any_filename): + """Guesses dependencies based on filename regexes.""" + guessed_deps = set() + for pattern, dep_pkgname in DEPENDENCY_FILENAME_REGEXES: + # If any file name matches, add the dep, go to the next pattern/pkg + # combination. + pattern_re = re.compile("^%s$" % pattern) + for filename in pkg_by_any_filename: + if (re.match(pattern_re, filename) + and + pkgname == pkg_by_any_filename[filename]): + guessed_deps.add(dep_pkgname) + break + return guessed_deps + + +def GuessDepsByPkgname(pkgname, pkg_by_any_filename): + # More guessed dependencies: If one package is a substring of another, it + # might be a hint. For example, CSWmysql51test should depend on CSWmysql51. + # However, the rt (runtime) packages should not want to depend on the main + # package. + guessed_deps = set() + all_other_pkgs = set(pkg_by_any_filename.values()) + for other_pkg in all_other_pkgs: + other_pkg = unicode(other_pkg) + if pkgname == other_pkg: + continue + if pkgname.startswith(other_pkg): + endings = ["devel", "test", "bench", "dev"] + for ending in endings: + if pkgname.endswith(ending): + guessed_deps.add(other_pkg) + return guessed_deps + + +def AnalyzeDependencies(pkgname, + declared_dependencies, + binaries_by_pkgname, + needed_sonames_by_binary, + pkgs_by_soname, + filenames_by_soname, + pkg_by_any_filename): + """Gathers and merges dependency results from other functions. + + declared_dependencies: Dependencies that the package in question claims to + have. + + binaries_by_pkgname: A dictionary mapping pkgnames (CSWfoo) to binary names + (without paths) + + needed_sonames_by_binary: A dictionary mapping binary file name to + a dictionary containing: "needed sonames", + "soname", "rpath". Based on examining the binary + files within the packages. + + pkgs_by_soname: A dictionary mapping sonames to pkgnames, based on the + contents of the system wide pkgmap + (/var/sadm/install/contents) + + filenames_by_soname: A dictionary mapping shared library sonames to filenames, + based on files within packages + + pkg_by_any_filename: Mapping from file names to packages names, based on the + contents of the packages under examination. + """ + declared_dependencies_set = set(declared_dependencies) + + so_dependencies, self_provided, orphan_sonames = SharedObjectDependencies( + pkgname, + binaries_by_pkgname, + needed_sonames_by_binary, + pkgs_by_soname, + filenames_by_soname, + pkg_by_any_filename) + auto_dependencies = reduce(lambda x, y: x.union(y), + [ + so_dependencies, + GuessDepsByFilename(pkgname, pkg_by_any_filename), + GuessDepsByPkgname(pkgname, pkg_by_any_filename), + ]) + missing_deps = auto_dependencies.difference(declared_dependencies_set) + # Don't report itself as a suggested dependency. + missing_deps = missing_deps.difference(set([pkgname])) + missing_deps = missing_deps.difference(set(DO_NOT_REPORT_MISSING)) + surplus_deps = declared_dependencies_set.difference(auto_dependencies) + surplus_deps = surplus_deps.difference(DO_NOT_REPORT_SURPLUS) + orphan_sonames = orphan_sonames.difference(ALLOWED_ORPHAN_SONAMES) + return missing_deps, surplus_deps, orphan_sonames + + +def ExpandRunpath(runpath, isalist): + # Emulating $ISALIST expansion + if '$ISALIST' in runpath: + expanded_list = [runpath.replace('$ISALIST', isa) for isa in isalist] + else: + expanded_list = [runpath] + return expanded_list + +def ExpandSymlink(symlink, target, input_path): + symlink_re = re.compile(r"%s(/|$)" % symlink) + if re.search(symlink_re, input_path): + result = input_path.replace(symlink, target) + else: + result = input_path + return result + +def Emulate64BitSymlinks(runpath_list): + """Need to emulate the 64 -> amd64, 64 -> sparcv9 symlink + + Since we don't know the architecture, we'll adding both amd64 and sparcv9. + It should be safe. + """ + symlinked_list = [] + for runpath in runpath_list: + for symlink, expansion_list in SYSTEM_SYMLINKS: + for target in expansion_list: + expanded = ExpandSymlink(symlink, target, runpath) + if expanded not in symlinked_list: + symlinked_list.append(expanded) + return symlinked_list + + +def SanitizeRunpath(runpath): + ok = False + while True: + if runpath.endswith("/"): + runpath = runpath[:-1] + elif "//" in runpath: + runpath = runpath.replace("//", "/") + else: + break + return runpath + + +def GetLinesBySoname(pkgmap, needed_sonames, runpath_by_needed_soname, isalist): + """Works out which system pkgmap lines correspond to given sonames.""" + lines_by_soname = {} + for soname in needed_sonames: + # This is the critical part of the algorithm: it iterates over the + # runpath and finds the first matching one. + runpath_found = False + for runpath in runpath_by_needed_soname[soname]: + runpath = SanitizeRunpath(runpath) + runpath_list = ExpandRunpath(runpath, isalist) + runpath_list = Emulate64BitSymlinks(runpath_list) + soname_runpath_data = pkgmap.GetPkgmapLineByBasename(soname) + # Emulating the install time symlinks, for instance, if the prototype contains + # /opt/csw/lib/i386/foo.so.0 and /opt/csw/lib/i386 is a symlink to ".", + # the shared library ends up in /opt/csw/lib/foo.so.0 and should be findable even when + # RPATH does not contain $ISALIST. + new_soname_runpath_data = {} + for p in soname_runpath_data: + expanded_p_list = Emulate64BitSymlinks([p]) + for expanded_p in expanded_p_list: + new_soname_runpath_data[expanded_p] = soname_runpath_data[p] + soname_runpath_data = new_soname_runpath_data + + logging.debug("%s: will be looking for %s in %s" % + (soname, runpath_list, soname_runpath_data.keys())) + for runpath_expanded in runpath_list: + if runpath_expanded in soname_runpath_data: + lines_by_soname[soname] = soname_runpath_data[runpath_expanded] + runpath_found = True + # This break only goes out of the inner loop, + # need another one below to finish the outer loop. + break + if runpath_found: + break + return lines_by_soname + + +def BuildIndexesBySoname(needed_sonames_by_binary): + """Builds data structures indexed by soname. + + Building indexes + {"foo.so": ["/opt/csw/lib/gcc4", "/opt/csw/lib", ...], + ... + } + """ + needed_sonames = set() + binaries_by_soname = {} + runpath_by_needed_soname = {} + for binary_name, data in needed_sonames_by_binary.iteritems(): + for soname in data[NEEDED_SONAMES]: + needed_sonames.add(soname) + if soname not in runpath_by_needed_soname: + runpath_by_needed_soname[soname] = [] + runpath_by_needed_soname[soname].extend(data[RUNPATH]) + if soname not in binaries_by_soname: + binaries_by_soname[soname] = set() + binaries_by_soname[soname].add(binary_name) + return needed_sonames, binaries_by_soname, runpath_by_needed_soname + + +def ParseDumpOutput(dump_output): + binary_data = {RUNPATH: [], + NEEDED_SONAMES: []} + for line in dump_output.splitlines(): + fields = re.split(WS_RE, line) + # TODO: Make it a unit test + # logging.debug("%s says: %s", DUMP_BIN, fields) + if len(fields) < 3: + continue + if fields[1] == "NEEDED": + binary_data[NEEDED_SONAMES].append(fields[2]) + elif fields[1] == "RUNPATH": + binary_data[RUNPATH].extend(fields[2].split(":")) + elif fields[1] == "SONAME": + binary_data[SONAME] = fields[2] + # Adding the default runtime path search option. + binary_data[RUNPATH].append("/usr/lib/$ISALIST") + binary_data[RUNPATH].append("/usr/lib") + binary_data[RUNPATH].append("/lib/$ISALIST") + binary_data[RUNPATH].append("/lib") + return binary_data Copied: csw/mgar/gar/v2-dirpackage/lib/python/checkpkg_test.py (from rev 8178, csw/mgar/gar/v2-dirpackage/bin/checkpkg.d/checkpkg_test.py) =================================================================== --- csw/mgar/gar/v2-dirpackage/lib/python/checkpkg_test.py (rev 0) +++ csw/mgar/gar/v2-dirpackage/lib/python/checkpkg_test.py 2010-01-26 10:26:12 UTC (rev 8180) @@ -0,0 +1,589 @@ +#!/opt/csw/bin/python2.6 +# $Id$ + +import unittest +import mox +import difflib +import checkpkg +import testdata.checkpkg_test_data_CSWmysql51rt as d1 +import testdata.checkpkg_test_data_CSWmysql51client as d2 +import testdata.checkpkg_test_data_CSWmysql51 as d3 +import testdata.checkpkg_test_data_CSWmysql51devel as d4 +import testdata.checkpkg_test_data_CSWlibpq_84 as d5 +import testdata.checkpkg_test_data_CSWmysql5client_8x as d6 +import testdata.checkpkg_test_data_CSWpostfix as d7 +import testdata.dump_output_1 as dump_1 +import testdata.dump_output_2 as dump_2 + +"""A set of unit tests for the library checking code. + +A bunch of lines to test in the interactive Python shell. + +import sys +sys.path.append("gar/bin/checkpkg.d") +import checkpkg +import testdata.checkpkg_test_data_CSWmysql5client_8x as d6 + +checkpkg.SharedObjectDependencies("CSWmysql5client", +d6.DATA_BINARIES_BY_PKGNAME, d6.DATA_NEEDED_SONAMES_BY_BINARY, +d6.DATA_PKGS_BY_FILENAME, d6.DATA_FILENAMES_BY_SONAME, +d6.DATA_PKG_BY_ANY_FILENAME) + +sqlite3 ~/.checkpkg/var-sadm-install-contents-cache-build8x +SELECT * FROM systempkgmap WHERE basename = 'libncursesw.so.5'; +""" + +class DependenciesUnitTest_1(unittest.TestCase): + + def setUp(self): + self.missing_deps, self.surplus_deps, self.orphan_sonames = checkpkg.AnalyzeDependencies( + d1.DATA_PKGNAME, + d1.DATA_DECLARED_DEPENDENCIES, + d1.DATA_BINARIES_BY_PKGNAME, + d1.DATA_NEEDED_SONAMES_BY_BINARY, + d1.DATA_PKGS_BY_FILENAME, + d1.DATA_FILENAMES_BY_SONAME, + d1.DATA_PKG_BY_ANY_FILENAME, + ) + + def testSurplusDeps(self): + self.assertEquals(set([]), self.surplus_deps) + + def testOrphanSonames(self): + self.assertEquals(set([]), self.orphan_sonames) + + def testMissingDeps(self): + expected = set([]) + self.assertEquals(expected, self.missing_deps) + + +class DependenciesUnitTest_2(unittest.TestCase): + + def setUp(self): + self.missing_deps, self.surplus_deps, self.orphan_sonames = checkpkg.AnalyzeDependencies( + d2.DATA_PKGNAME, + d2.DATA_DECLARED_DEPENDENCIES, + d2.DATA_BINARIES_BY_PKGNAME, + d2.DATA_NEEDED_SONAMES_BY_BINARY, + d2.DATA_PKGS_BY_FILENAME, + d2.DATA_FILENAMES_BY_SONAME, + d2.DATA_PKG_BY_ANY_FILENAME, + ) + + def testSurplusDeps(self): + self.assertEquals(set([]), self.surplus_deps) + + def testOrphanSonames(self): + self.assertEquals(set([]), self.orphan_sonames) + + def testMissingDeps(self): + expected = set([]) + self.assertEquals(expected, self.missing_deps) + + +class DependenciesUnitTest_3(unittest.TestCase): + + def setUp(self): + self.missing_deps, self.surplus_deps, self.orphan_sonames = checkpkg.AnalyzeDependencies( + d3.DATA_PKGNAME, + d3.DATA_DECLARED_DEPENDENCIES, + d3.DATA_BINARIES_BY_PKGNAME, + d3.DATA_NEEDED_SONAMES_BY_BINARY, + d3.DATA_PKGS_BY_FILENAME, + d3.DATA_FILENAMES_BY_SONAME, + d3.DATA_PKG_BY_ANY_FILENAME, + ) + + def testSurplusDeps(self): + self.assertEquals(set([u'CSWmysql51client']), self.surplus_deps) + + def testOrphanSonames(self): + self.assertEquals(set([]), self.orphan_sonames) + + def testMissingDeps(self): + expected = set(['CSWmysql51rt']) + self.assertEquals(expected, self.missing_deps) + + +class DependenciesUnitTest_4(unittest.TestCase): + + def setUp(self): + self.missing_deps, self.surplus_deps, self.orphan_sonames = checkpkg.AnalyzeDependencies( + d4.DATA_PKGNAME, + d4.DATA_DECLARED_DEPENDENCIES, + d4.DATA_BINARIES_BY_PKGNAME, + d4.DATA_NEEDED_SONAMES_BY_BINARY, + d4.DATA_PKGS_BY_FILENAME, + d4.DATA_FILENAMES_BY_SONAME, + d4.DATA_PKG_BY_ANY_FILENAME, + ) + + def testSurplusDeps(self): + self.assertEquals(set([]), self.surplus_deps) + + def testOrphanSonames(self): + self.assertEquals(set([]), self.orphan_sonames) + + def testMissingDeps(self): + expected = set([]) + self.assertEquals(expected, self.missing_deps) + + +class DependenciesUnitTest_5(unittest.TestCase): + + def setUp(self): + self.missing_deps, self.surplus_deps, self.orphan_sonames = checkpkg.AnalyzeDependencies( + d5.DATA_PKGNAME, + d5.DATA_DECLARED_DEPENDENCIES, + d5.DATA_BINARIES_BY_PKGNAME, + d5.DATA_NEEDED_SONAMES_BY_BINARY, + d5.DATA_PKGS_BY_FILENAME, + d5.DATA_FILENAMES_BY_SONAME, + d5.DATA_PKG_BY_ANY_FILENAME, + ) + + def testSurplusDeps(self): + self.assertEquals(set([]), self.surplus_deps) + + def testOrphanSonames(self): + self.assertEquals(set([]), self.orphan_sonames) + + def testMissingDeps(self): + # This tends to report itself... + expected = set([u'SUNWgss']) + self.assertEquals(expected, self.missing_deps) + + +class DependenciesUnitTest_6(unittest.TestCase): + + def setUp(self): + (self.missing_deps, + self.surplus_deps, + self.orphan_sonames) = checkpkg.AnalyzeDependencies( + d6.DATA_PKGNAME, + d6.DATA_DECLARED_DEPENDENCIES, + d6.DATA_BINARIES_BY_PKGNAME, + d6.DATA_NEEDED_SONAMES_BY_BINARY, + d6.DATA_PKGS_BY_FILENAME, + d6.DATA_FILENAMES_BY_SONAME, + d6.DATA_PKG_BY_ANY_FILENAME, + ) + + def testSurplusDeps(self): + self.assertEquals(set([]), self.surplus_deps) + + def testOrphanSonames(self): + self.assertEquals(set([]), self.orphan_sonames) + + def testMissingDeps(self): + expected = set([]) + self.assertEquals(expected, self.missing_deps) + + +class DependenciesUnitTest_7(unittest.TestCase): + + def setUp(self): + (self.missing_deps, + self.surplus_deps, + self.orphan_sonames) = checkpkg.AnalyzeDependencies( + d7.DATA_PKGNAME, + d7.DATA_DECLARED_DEPENDENCIES, + d7.DATA_BINARIES_BY_PKGNAME, + d7.DATA_NEEDED_SONAMES_BY_BINARY, + d7.DATA_PKGS_BY_FILENAME, + d7.DATA_FILENAMES_BY_SONAME, + d7.DATA_PKG_BY_ANY_FILENAME, + ) + + def testSurplusDeps(self): + self.assertEquals(set([]), self.surplus_deps) + + def testOrphanSonames(self): + self.assertEquals(set([]), self.orphan_sonames) + + def testMissingDeps(self): + expected = set([]) + self.assertEquals(expected, self.missing_deps) + + +class GuessDepsUnitTest(unittest.TestCase): + + def testGuessDepsByFilename1(self): + expected = set([u"CSWpython"]) + pkgname = u"CSWfoo" + pkg_by_filename = { + "/opt/csw/bin/bar": u"CSWfoo", + "/opt/csw/lib/python/site-packages/foo.py": u"CSWfoo", + } + self.assertEqual(expected, + checkpkg.GuessDepsByFilename(pkgname, pkg_by_filename)) + + def testGuessDepsByFilename2(self): + expected = set([]) + pkgname = u"CSWfoo" + pkg_by_filename = { + "/opt/csw/bin/bar": u"CSWfoo", + "/opt/csw/lib/python/site-packages/foo.py": u"CSWbar", + } + self.assertEqual(expected, + checkpkg.GuessDepsByFilename(pkgname, pkg_by_filename)) + + def testGuessDepsByPkgname1(self): + expected = set([u"CSWfoo"]) + pkgname = u"CSWfoo-devel" + pkg_by_filename = { + "/opt/csw/bin/bar": u"CSWfoo", + "/opt/csw/bin/barfoo": u"CSWfoobar", + "/opt/csw/lib/python/site-packages/foo.py": u"CSWfoo", + } + self.assertEqual(expected, + checkpkg.GuessDepsByPkgname(pkgname, pkg_by_filename)) + + def testGuessDepsByPkgname2(self): + expected = set([]) + pkgname = u"CSWzfoo-devel" + pkg_by_filename = { + "/opt/csw/bin/bar": u"CSWfoo", + "/opt/csw/bin/barfoo": u"CSWfoobar", + "/opt/csw/lib/python/site-packages/foo.py": u"CSWfoo", + } + self.assertEqual(expected, + checkpkg.GuessDepsByPkgname(pkgname, pkg_by_filename)) + + def testGuessDepsByPkgname3(self): + self.assertEqual(set([u"CSWmysql51"]), + checkpkg.GuessDepsByPkgname(u"CSWmysql51devel", + d4.DATA_PKG_BY_ANY_FILENAME)) + + def testGuessDepsByPkgname4(self): + data1 = set(['CSWmysql51', 'CSWmysql51rt', 'CSWmysql51test', + 'CSWmysql51client', 'CSWmysql51bench', 'CSWmysql51devel']) + data2 = dict(((x, x) for x in data1)) + self.assertEqual(set([u"CSWmysql51"]), checkpkg.GuessDepsByPkgname(u"CSWmysql51devel", data2)) + + def testGuessDepsByPkgname4(self): + data1 = set(['CSWmysql51', 'CSWmysql51rt', 'CSWmysql51test', + 'CSWmysql51client', 'CSWmysql51bench', 'CSWmysql51devel']) + data2 = dict(((x, x) for x in data1)) + self.assertEqual(set([]), checkpkg.GuessDepsByPkgname(u"CSWmysql51rt", data2)) + + +class GetLinesBySonameUnitTest(unittest.TestCase): + + class PkgmapStub(object): + + def __init__(self, cache): + self.cache = cache + + def GetPkgmapLineByBasename(self, soname): + return self.cache[soname] + + def setUp(self): + self.pkgmap_mocker = mox.Mox() + + def testExpandRunpath_1(self): + isalist = ["foo", "bar"] + runpath = "/opt/csw/lib/$ISALIST" + expected = ["/opt/csw/lib/foo", "/opt/csw/lib/bar"] + self.assertEquals(expected, checkpkg.ExpandRunpath(runpath, isalist)) + + def testExpandRunpath_2(self): + isalist = ["foo", "bar"] + runpath = "/opt/csw/mysql5/lib/$ISALIST/mysql" + expected = ["/opt/csw/mysql5/lib/foo/mysql", "/opt/csw/mysql5/lib/bar/mysql"] + self.assertEquals(expected, checkpkg.ExpandRunpath(runpath, isalist)) + + def testEmulate64BitSymlinks_1(self): + runpath_list = ["/opt/csw/mysql5/lib/foo/mysql/64"] + expected = "/opt/csw/mysql5/lib/foo/mysql/amd64" + self.assertTrue(expected in checkpkg.Emulate64BitSymlinks(runpath_list)) + + def testEmulate64BitSymlinks_2(self): + runpath_list = ["/opt/csw/mysql5/lib/64/mysql/foo"] + expected = "/opt/csw/mysql5/lib/amd64/mysql/foo" + result = checkpkg.Emulate64BitSymlinks(runpath_list) + self.assertTrue(expected in result, "%s not in %s" % (expected, result)) + + def testEmulate64BitSymlinks_3(self): + runpath_list = ["/opt/csw/mysql5/lib/64/mysql/foo"] + expected = "/opt/csw/mysql5/lib/sparcv9/mysql/foo" + result = checkpkg.Emulate64BitSymlinks(runpath_list) + self.assertTrue(expected in result, "%s not in %s" % (expected, result)) + + def testEmulate64BitSymlinks_4(self): + """No repeated paths because of symlink expansion""" + runpath_list = ["/opt/csw/lib"] + expected = "/opt/csw/lib" + result = checkpkg.Emulate64BitSymlinks(runpath_list) + self.assertEquals(1, len(result), "len(%s) != %s" % (result, 1)) + + def testEmulateSymlinks_3(self): + runpath_list = ["/opt/csw/bdb4"] + expected = "/opt/csw/bdb42" + result = checkpkg.Emulate64BitSymlinks(runpath_list) + self.assertTrue(expected in result, "%s not in %s" % (expected, result)) + + def testEmulateSymlinks_4(self): + runpath_list = ["/opt/csw/bdb42"] + expected = "/opt/csw/bdb42" + not_expected = "/opt/csw/bdb422" + result = checkpkg.Emulate64BitSymlinks(runpath_list) + self.assertTrue(expected in result, "%s not in %s" % (expected, result)) + self.assertFalse(not_expected in result, "%s is in %s" % (not_expected, result)) + + def testEmulateSymlinks_5(self): + """Install time symlink expansion.""" + runpath_list = ["/opt/csw/lib/i386"] + expected = "/opt/csw/lib" + result = checkpkg.Emulate64BitSymlinks(runpath_list) + self.assertTrue(expected in result, "%s not in %s" % (expected, result)) + + def testEmulateSymlinks_6(self): + """ExpandSymlink for /opt/csw/lib/i386.""" + runpath_list = ["/opt/csw/lib/i386"] + expected = "/opt/csw/lib" + not_expected = "/opt/csw/lib/i386" + result = checkpkg.ExpandSymlink("/opt/csw/lib/i386", "/opt/csw/lib", "/opt/csw/lib/i386") + self.assertTrue(expected in result, "%s not in %s" % (expected, result)) + self.assertFalse(not_expected in result, "%s is in %s" % (not_expected, result)) + + def testGetLinesBySoname(self): + expected = {'foo.so.1': '/opt/csw/lib/isa-value-1/foo.so.1 foo'} + pkgmap = self.pkgmap_mocker.CreateMock(checkpkg.SystemPkgmap) + pkgmap.GetPkgmapLineByBasename("foo") + lines1 = {"/opt/csw/lib/isa-value-1": "/opt/csw/lib/isa-value-1/foo.so.1 foo", + "/usr/lib": "/usr/lib/foo.so.1 foo"} + # pkgmap.GetPkgmapLineByBasename("foo.so.1").AndReturn(lines1) + pkgmap.GetPkgmapLineByBasename("foo.so.1").AndReturn(lines1) + self.pkgmap_mocker.ReplayAll() + pkgmap.GetPkgmapLineByBasename("foo") + needed_sonames = set(["foo.so.1"]) + runpath_by_needed_soname = {"foo.so.1": ["/opt/csw/lib/$ISALIST", "/usr/lib"]} + isalist = ["isa-value-1", "isa-value-2"] + result = checkpkg.GetLinesBySoname(pkgmap, needed_sonames, runpath_by_needed_soname, isalist) + self.pkgmap_mocker.VerifyAll() + self.assertEqual(expected, result) + + def testGetLinesBySoname_3(self): + expected = {'foo.so.1': '/opt/csw/lib/isa-value-1/foo.so.1 foo'} + pkgmap = self.pkgmap_mocker.CreateMock(checkpkg.SystemPkgmap) + pkgmap.GetPkgmapLineByBasename("foo") + lines1 = { + "/opt/csw/lib/isa-value-1": "/opt/csw/lib/isa-value-1/foo.so.1 foo", + "/opt/csw/lib": "/opt/csw/lib/foo.so.1 foo", + "/usr/lib": "/usr/lib/foo.so.1 foo"} + # pkgmap.GetPkgmapLineByBasename("foo.so.1").AndReturn(lines1) + pkgmap.GetPkgmapLineByBasename("foo.so.1").AndReturn(lines1) + self.pkgmap_mocker.ReplayAll() + pkgmap.GetPkgmapLineByBasename("foo") + needed_sonames = set(["foo.so.1"]) + runpath_by_needed_soname = { + "foo.so.1": ["/opt/csw/lib/$ISALIST", "/usr/lib"]} + isalist = ["isa-value-1", "isa-value-2"] + result = checkpkg.GetLinesBySoname( + pkgmap, needed_sonames, runpath_by_needed_soname, isalist) + self.pkgmap_mocker.VerifyAll() + self.assertEqual(expected, result) + + def testGetLinesBySoname_4(self): + """A more complex test, four ISAs.""" + expected = {'foo.so.1': '/opt/csw/lib/isa-value-1/foo.so.1 foo'} + pkgmap = self.pkgmap_mocker.CreateMock(checkpkg.SystemPkgmap) + pkgmap.GetPkgmapLineByBasename("foo") + lines1 = { + "/opt/csw/lib/isa-value-1": + "/opt/csw/lib/isa-value-1/foo.so.1 foo", + "/opt/csw/mysql5/lib/isa-value-2": + "/opt/csw/mysql5/lib/isa-value-2/foo.so.1 foo", + "/opt/csw/mysql5/lib/isa-value-1": + "/opt/csw/mysql5/lib/isa-value-1/foo.so.1 foo", + "/opt/csw/lib": + "/opt/csw/lib/foo.so.1 foo", + "/usr/lib": + "/usr/lib/foo.so.1 foo"} + pkgmap.GetPkgmapLineByBasename("foo.so.1").AndReturn(lines1) + pkgmap.GetPkgmapLineByBasename("foo.so.1").AndReturn(lines1) + self.pkgmap_mocker.ReplayAll() + pkgmap.GetPkgmapLineByBasename("foo") + needed_sonames = set(["foo.so.1"]) + runpath_by_needed_soname = { + "foo.so.1": ["/opt/csw/mysql5/lib/$ISALIST/mysql", + "/opt/csw/lib/$ISALIST", + "/usr/lib"]} + isalist = ["isa-value-1", "isa-value-2"] + result = checkpkg.GetLinesBySoname( + pkgmap, needed_sonames, runpath_by_needed_soname, isalist) + self.pkgmap_mocker.VerifyAll() + self.assertEqual(expected, result) + + def testGetLinesBySoname_5(self): + """Based on CSWmysql5client on build8x.""" + soname = u'libm.so.1' + expected = {u'libm.so.1': u'/usr/lib/libm.so.1 f none 0755 root bin ' + u'99844 3884 1050525375 SUNWlibms\n'} + + pkgmap_stub = self.PkgmapStub(d6.DATA_PKGMAP_CACHE) + (needed_sonames, + binaries_by_soname, + runpath_by_needed_soname) = checkpkg.BuildIndexesBySoname( + d6.DATA_NEEDED_SONAMES_BY_BINARY) + result = checkpkg.GetLinesBySoname( + pkgmap_stub, + set([soname]), + runpath_by_needed_soname, + d6.DATA_ISALIST) + self.assertEqual(expected, result) + + def testGetLinesBySoname_6(self): + """Based on CSWmysql5client on build8x.""" + soname = u'libz.so.1' + expected = {u'libz.so.1': u'/opt/csw/lib/pentium_pro+mmx/libz.so.1=libz.so.1.2.3 ' + u's none CSWzlib\n'} + pkgmap_stub = self.PkgmapStub(d6.DATA_PKGMAP_CACHE) + (needed_sonames, + binaries_by_soname, + runpath_by_needed_soname) = checkpkg.BuildIndexesBySoname( + d6.DATA_NEEDED_SONAMES_BY_BINARY) + result = checkpkg.GetLinesBySoname( + pkgmap_stub, + set([soname]), + runpath_by_needed_soname, + d6.DATA_ISALIST) + self.assertEqual(expected, result) + + def testGetLinesBySoname_7(self): + """A test for 64-bit symlink expansion.""" + soname = u'libncursesw.so.5' + # To test the 64-bit symlink expansion + expected = { + u'libncursesw.so.5': + u'/opt/csw/lib/amd64/libncursesw.so.5=libncursesw.so.5.7 ' + u's none CSWncurses\n'} + pkgmap_stub = self.PkgmapStub(d6.DATA_PKGMAP_CACHE) + (needed_sonames, + binaries_by_soname, + runpath_by_needed_soname) = checkpkg.BuildIndexesBySoname( + d6.DATA_NEEDED_SONAMES_BY_BINARY) + # The original data did not have amd64 in the isalist. + isalist = ['amd64', 'pentium_pro+mmx', 'pentium_pro', 'pentium+mmx', + 'pentium', 'i486', 'i386', 'i86'] + result = checkpkg.GetLinesBySoname( + pkgmap_stub, + set([soname]), + runpath_by_needed_soname, + isalist) + self.assertEqual(expected, result) + + def testGetLinesBySoname_8(self): + expected = {'foo.so.1': '/opt/csw/postgresql/lib/foo.so.1 foo'} + lines1 = {"/opt/csw/postgresql/lib": "/opt/csw/postgresql/lib/foo.so.1 foo"} + pkgmap = self.pkgmap_mocker.CreateMock(checkpkg.SystemPkgmap) + pkgmap.GetPkgmapLineByBasename("foo.so.1").AndReturn(lines1) + self.pkgmap_mocker.ReplayAll() + needed_sonames = set(["foo.so.1"]) + runpath_by_needed_soname = {"foo.so.1": ["/opt/csw/postgresql/lib/", "/usr/lib"]} + isalist = ["isa-value-1", "isa-value-2"] + result = checkpkg.GetLinesBySoname(pkgmap, needed_sonames, runpath_by_needed_soname, isalist) + self.pkgmap_mocker.VerifyAll() + self.assertEqual(expected, result) + + def testGetLinesBySoname_9(self): + """Emulation of binaries installed into /opt/csw/lib/i386. + + The problem is that /opt/csw/lib/i386 is a symlink and the binaries + end up in /opt/csw/lib instead. + """ + expected = {'foo.so.0': '/opt/csw/lib/i386/foo.so.0 foo'} + lines1 = {"/opt/csw/lib/i386": "/opt/csw/lib/i386/foo.so.0 foo"} + pkgmap = self.pkgmap_mocker.CreateMock(checkpkg.SystemPkgmap) + pkgmap.GetPkgmapLineByBasename("foo.so.0").AndReturn(lines1) + self.pkgmap_mocker.ReplayAll() + needed_sonames = set(["foo.so.0"]) + runpath_by_needed_soname = {"foo.so.0": ["/opt/csw/lib", "/usr/lib"]} + isalist = ["isa-value-1", "isa-value-2"] + result = checkpkg.GetLinesBySoname(pkgmap, needed_sonames, runpath_by_needed_soname, isalist) + self.pkgmap_mocker.VerifyAll() + self.assertEqual(expected, result) + + def testSanitizeRunpath_1(self): + self.assertEqual("/opt/csw/lib", checkpkg.SanitizeRunpath("/opt/csw/lib/")) + + def testSanitizeRunpath_2(self): + self.assertEqual("/opt/csw/lib", checkpkg.SanitizeRunpath("/opt//csw////lib/")) + + + +class ParseDumpOutputUnitTest(unittest.TestCase): + + def test_1(self): + expected = { + 'soname': 'libmysqlclient.so.15', + 'runpath': ['/opt/csw/lib/$ISALIST', + '/opt/csw/lib', + '/opt/csw/mysql5/lib/$ISALIST', + '/opt/csw/mysql5/lib', + '/opt/csw/mysql5/lib/$ISALIST/mysql', + # These four are artificially appended + '/usr/lib/$ISALIST', + '/usr/lib', + '/lib/$ISALIST', + '/lib'], + 'needed sonames': ['librt.so.1', + 'libresolv.so.2', + 'libc.so.1', + 'libgen.so.1', + 'libsocket.so.1', + 'libnsl.so.1', + 'libm.so.1', + 'libz.so.1']} + self.assertEqual(expected, + checkpkg.ParseDumpOutput(dump_1.DATA_DUMP_OUTPUT)) + + def test_2(self): + expected_runpath = ['/usr/lib/$ISALIST', '/usr/lib', '/lib/$ISALIST', '/lib'] + self.assertEqual( + expected_runpath, + checkpkg.ParseDumpOutput(dump_2.DATA_DUMP_OUTPUT)["runpath"]) + + +class FormatDepsReportUnitTest(unittest.TestCase): + + def AssertTextEqual(self, text1, text2): + difference = "\n".join(difflib.context_diff(text2.splitlines(), text1.splitlines())) + self.assertEqual(text1, text2, difference) + + def testAll(self): + missing_deps = set([u'SUNWgss', u'*SUNWlxsl']) + surplus_deps = set(['CSWsudo', 'CSWlibxslt']) + orphan_sonames = set([u'libm.so.2']) + testdata = (missing_deps, surplus_deps, orphan_sonames) + checker = checkpkg.CheckpkgBase("/tmp/nonexistent", "CSWfoo") + expected = u"""CSWfoo: +SUGGESTION: you may want to add some or all of the following as depends: + (Feel free to ignore SUNW or SPRO packages) +> *SUNWlxsl +> SUNWgss +The following packages might be unnecessary dependencies: +? CSWlibxslt +? CSWsudo +The following sonames don't belong to any package: +! libm.so.2 +""" + result = checker.FormatDepsReport(*testdata) + self.AssertTextEqual(result, expected) + + def testNone(self): + missing_deps = set([]) + surplus_deps = set([]) + orphan_sonames = set([]) + testdata = (missing_deps, surplus_deps, orphan_sonames) + checker = checkpkg.CheckpkgBase("/tmp/nonexistent", "CSWfoo") + expected = u"""CSWfoo: ++ Dependencies of CSWfoo look good. +""" + result = checker.FormatDepsReport(*testdata) + self.AssertTextEqual(result, expected) + + +if __name__ == '__main__': + unittest.main() This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Tue Jan 26 11:44:13 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Tue, 26 Jan 2010 10:44:13 +0000 Subject: [csw-devel] SF.net SVN: gar:[8182] csw/mgar/gar/v2-checkpkg/ Message-ID: Revision: 8182 http://gar.svn.sourceforge.net/gar/?rev=8182&view=rev Author: wahwah Date: 2010-01-26 10:44:12 +0000 (Tue, 26 Jan 2010) Log Message: ----------- mGAR v2-checkpkg: Removing an old branch Removed Paths: ------------- csw/mgar/gar/v2-checkpkg/ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Tue Jan 26 11:44:58 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Tue, 26 Jan 2010 10:44:58 +0000 Subject: [csw-devel] SF.net SVN: gar:[8183] csw/mgar/gar/v2-dirpackage/ Message-ID: Revision: 8183 http://gar.svn.sourceforge.net/gar/?rev=8183&view=rev Author: wahwah Date: 2010-01-26 10:44:58 +0000 (Tue, 26 Jan 2010) Log Message: ----------- mGAR v2-dirpackage: Removing an old branch Removed Paths: ------------- csw/mgar/gar/v2-dirpackage/ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Tue Jan 26 11:43:08 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Tue, 26 Jan 2010 10:43:08 +0000 Subject: [csw-devel] SF.net SVN: gar:[8181] csw/mgar/gar/v2 Message-ID: Revision: 8181 http://gar.svn.sourceforge.net/gar/?rev=8181&view=rev Author: wahwah Date: 2010-01-26 10:43:08 +0000 (Tue, 26 Jan 2010) Log Message: ----------- mGAR v2: Merging v2-dirpackage (started at Wintercamp) Modified Paths: -------------- csw/mgar/gar/v2/bin/checkpkg.d/checkpkg-libs.py csw/mgar/gar/v2/bin/checkpkg.d/checkpkg-obsolete-deps.py csw/mgar/gar/v2/bin/checkpkg.d/checkpkg-you-can-write-your-own.py csw/mgar/gar/v2/bin/checkpkg.d/update_contents_cache.py csw/mgar/gar/v2/gar.pkg.mk Added Paths: ----------- csw/mgar/gar/v2/lib/ csw/mgar/gar/v2/lib/python/ csw/mgar/gar/v2/lib/python/checkpkg.py csw/mgar/gar/v2/lib/python/checkpkg_test.py csw/mgar/gar/v2/lib/python/gartest.py csw/mgar/gar/v2/lib/python/opencsw.py csw/mgar/gar/v2/lib/python/opencsw_test.py csw/mgar/gar/v2/lib/python/testdata/ csw/mgar/gar/v2/lib/python/testdata/README csw/mgar/gar/v2/lib/python/testdata/__init__.py csw/mgar/gar/v2/lib/python/testdata/checkpkg_test_data_CSWlibpq_84.py csw/mgar/gar/v2/lib/python/testdata/checkpkg_test_data_CSWmysql51.py csw/mgar/gar/v2/lib/python/testdata/checkpkg_test_data_CSWmysql51client.py csw/mgar/gar/v2/lib/python/testdata/checkpkg_test_data_CSWmysql51devel.py csw/mgar/gar/v2/lib/python/testdata/checkpkg_test_data_CSWmysql51rt.py csw/mgar/gar/v2/lib/python/testdata/checkpkg_test_data_CSWmysql5client_8x.py csw/mgar/gar/v2/lib/python/testdata/checkpkg_test_data_CSWpostfix.py csw/mgar/gar/v2/lib/python/testdata/dump_output_1.py csw/mgar/gar/v2/lib/python/testdata/dump_output_2.py csw/mgar/gar/v2/tests/ csw/mgar/gar/v2/tests/example_test.py csw/mgar/gar/v2/tests/run_tests.py csw/mgar/gar/v2/tests/static/ csw/mgar/gar/v2/tests/static/example/ csw/mgar/gar/v2/tests/static/example/Makefile csw/mgar/gar/v2/tests/static/example/checksums csw/mgar/gar/v2/tests/static/example/gar Removed Paths: ------------- csw/mgar/gar/v2/bin/checkpkg.d/checkpkg.py csw/mgar/gar/v2/bin/checkpkg.d/checkpkg_test.py csw/mgar/gar/v2/bin/checkpkg.d/testdata/ csw/mgar/gar/v2/lib/python/ csw/mgar/gar/v2/lib/python/checkpkg.py csw/mgar/gar/v2/lib/python/checkpkg_test.py csw/mgar/gar/v2/lib/python/gartest.py csw/mgar/gar/v2/lib/python/opencsw.py csw/mgar/gar/v2/lib/python/opencsw_test.py csw/mgar/gar/v2/lib/python/testdata/ csw/mgar/gar/v2/lib/python/testdata/README csw/mgar/gar/v2/lib/python/testdata/__init__.py csw/mgar/gar/v2/lib/python/testdata/checkpkg_test_data_CSWlibpq_84.py csw/mgar/gar/v2/lib/python/testdata/checkpkg_test_data_CSWmysql51.py csw/mgar/gar/v2/lib/python/testdata/checkpkg_test_data_CSWmysql51client.py csw/mgar/gar/v2/lib/python/testdata/checkpkg_test_data_CSWmysql51devel.py csw/mgar/gar/v2/lib/python/testdata/checkpkg_test_data_CSWmysql51rt.py csw/mgar/gar/v2/lib/python/testdata/checkpkg_test_data_CSWmysql5client_8x.py csw/mgar/gar/v2/lib/python/testdata/checkpkg_test_data_CSWpostfix.py csw/mgar/gar/v2/lib/python/testdata/dump_output_1.py csw/mgar/gar/v2/lib/python/testdata/dump_output_2.py csw/mgar/gar/v2/tests/example_test.py csw/mgar/gar/v2/tests/run_tests.py csw/mgar/gar/v2/tests/static/ csw/mgar/gar/v2/tests/static/example/ csw/mgar/gar/v2/tests/static/example/Makefile csw/mgar/gar/v2/tests/static/example/checksums csw/mgar/gar/v2/tests/static/example/gar Property Changed: ---------------- csw/mgar/gar/v2/ csw/mgar/gar/v2/pkglib/csw/depend Property changes on: csw/mgar/gar/v2 ___________________________________________________________________ Modified: svn:mergeinfo - /csw/mgar/gar/v2:4936-6678 /csw/mgar/gar/v2-checkpkg:7722-7855 /csw/mgar/gar/v2-collapsed-modulations:6895 /csw/mgar/gar/v2-migrateconf:7082-7211 /csw/mgar/gar/v2-skayser:6087-6132 + /csw/mgar/gar/v2:4936-6678 /csw/mgar/gar/v2-checkpkg:7722-7855 /csw/mgar/gar/v2-collapsed-modulations:6895 /csw/mgar/gar/v2-dirpackage:8125-8180 /csw/mgar/gar/v2-migrateconf:7082-7211 /csw/mgar/gar/v2-skayser:6087-6132 Modified: csw/mgar/gar/v2/bin/checkpkg.d/checkpkg-libs.py =================================================================== --- csw/mgar/gar/v2/bin/checkpkg.d/checkpkg-libs.py 2010-01-26 10:26:12 UTC (rev 8180) +++ csw/mgar/gar/v2/bin/checkpkg.d/checkpkg-libs.py 2010-01-26 10:43:08 UTC (rev 8181) @@ -8,7 +8,6 @@ # unit tests and it appears to be working. The main problem is that it's not # divided into smaller testable sections. -import checkpkg import os import os.path import copy @@ -18,6 +17,14 @@ import sys import textwrap +# The following bit of code sets the correct path to Python libraries +# distributed with GAR. +path_list = [os.getcwd(), + os.path.split(sys.argv[0])[0], + "..", "..", "lib", "python"] +sys.path.append(os.path.join(*path_list)) +import checkpkg + DUMP_BIN = "/usr/ccs/bin/dump" def GetIsalist(): Modified: csw/mgar/gar/v2/bin/checkpkg.d/checkpkg-obsolete-deps.py =================================================================== --- csw/mgar/gar/v2/bin/checkpkg.d/checkpkg-obsolete-deps.py 2010-01-26 10:26:12 UTC (rev 8180) +++ csw/mgar/gar/v2/bin/checkpkg.d/checkpkg-obsolete-deps.py 2010-01-26 10:43:08 UTC (rev 8181) @@ -1,11 +1,18 @@ #!/opt/csw/bin/python2.6 # $Id$ -import checkpkg import logging import os.path import sys +# The following bit of code sets the correct path to Python libraries +# distributed with GAR. +path_list = [os.getcwd(), + os.path.split(sys.argv[0])[0], + "..", "..", "lib", "python"] +sys.path.append(os.path.join(*path_list)) +import checkpkg + OBSOLETE_DEPS = { # "CSWfoo": { # "hint": "Do this...", @@ -39,5 +46,6 @@ else: sys.exit(1) + if __name__ == '__main__': main() Modified: csw/mgar/gar/v2/bin/checkpkg.d/checkpkg-you-can-write-your-own.py =================================================================== --- csw/mgar/gar/v2/bin/checkpkg.d/checkpkg-you-can-write-your-own.py 2010-01-26 10:26:12 UTC (rev 8180) +++ csw/mgar/gar/v2/bin/checkpkg.d/checkpkg-you-can-write-your-own.py 2010-01-26 10:43:08 UTC (rev 8181) @@ -6,10 +6,18 @@ Copy it and modify. """ -import checkpkg import logging import os.path +import sys +# The following bit of code sets the correct path to Python libraries +# distributed with GAR. +path_list = [os.getcwd(), + os.path.split(sys.argv[0])[0], + "..", "..", "lib", "python"] +sys.path.append(os.path.join(*path_list)) +import checkpkg + def main(): options, args = checkpkg.GetOptions() if not os.path.isdir(options.extractdir): @@ -23,4 +31,4 @@ if __name__ == '__main__': - main() + main() Deleted: csw/mgar/gar/v2/bin/checkpkg.d/checkpkg.py =================================================================== --- csw/mgar/gar/v2/bin/checkpkg.d/checkpkg.py 2010-01-26 10:26:12 UTC (rev 8180) +++ csw/mgar/gar/v2/bin/checkpkg.d/checkpkg.py 2010-01-26 10:43:08 UTC (rev 8181) @@ -1,569 +0,0 @@ -# $Id$ -# -# This is the checkpkg library, common for all checkpkg tests written in -# Python. - -import itertools -import logging -import optparse -import os -import os.path -import re -import socket -import sqlite3 -import subprocess -import StringIO -from Cheetah import Template - -SYSTEM_PKGMAP = "/var/sadm/install/contents" -WS_RE = re.compile(r"\s+") -NEEDED_SONAMES = "needed sonames" -RUNPATH = "runpath" -SONAME = "soname" -CONFIG_MTIME = "mtime" -DO_NOT_REPORT_SURPLUS = set([u"CSWcommon", u"CSWcswclassutils", u"CSWisaexec"]) -DO_NOT_REPORT_MISSING = set([u"SUNWlibC", u"SUNWcsl", u"SUNWlibms", - u"*SUNWcslr", u"*SUNWlibC", u"*SUNWlibms", - u"SUNWcslx"]) -SYSTEM_SYMLINKS = ( - ("/opt/csw/bdb4", ["/opt/csw/bdb42"]), - ("/64", ["/amd64", "/sparcv9"]), - ("/opt/csw/lib/i386", ["/opt/csw/lib"]), -) - -# This shared library is present on Solaris 10 on amd64, but it's missing on -# Solaris 8 on i386. It's okay if it's missing. -ALLOWED_ORPHAN_SONAMES = set([u"libm.so.2"]) -DEPENDENCY_FILENAME_REGEXES = ( - (r".*\.pl", u"CSWperl"), - (r".*\.pm", u"CSWperl"), - (r".*\.py", u"CSWpython"), - (r".*\.rb", u"CSWruby"), -) - -REPORT_TMPL = u"""$pkgname: -#if $missing_deps -SUGGESTION: you may want to add some or all of the following as depends: - (Feel free to ignore SUNW or SPRO packages) -#for $pkg in $sorted($missing_deps) -> $pkg -#end for -#end if -#if $surplus_deps -The following packages might be unnecessary dependencies: -#for $pkg in $sorted($surplus_deps) -? $pkg -#end for -#end if -#if $orphan_sonames -The following sonames don't belong to any package: -#for $soname in $sorted($orphan_sonames) -! $soname -#end for -#end if -#if not $missing_deps and not $surplus_deps and not $orphan_sonames -+ Dependencies of $pkgname look good. -#end if -""" - -class Error(Exception): - pass - - -class ConfigurationError(Error): - pass - - -class PackageError(Error): - pass - - -def GetOptions(): - parser = optparse.OptionParser() - parser.add_option("-e", dest="extractdir", - help="The directory into which the package has been extracted") - parser.add_option("-d", "--debug", dest="debug", - default=False, action="store_true", - help="Turn on debugging messages") - (options, args) = parser.parse_args() - if not options.extractdir: - raise ConfigurationError("ERROR: -e option is missing.") - # Using set() to make the arguments unique. - return options, set(args) - - -class CheckpkgBase(object): - """This class has functionality overlapping with DirectoryFormatPackage - from the opencsw.py library. The classes should be merged. - """ - - def __init__(self, extractdir, pkgname): - self.extractdir = extractdir - self.pkgname = pkgname - self.pkgpath = os.path.join(self.extractdir, self.pkgname) - - def CheckPkgpathExists(self): - if not os.path.isdir(self.pkgpath): - raise PackageError("%s does not exist or is not a directory" - % self.pkgpath) - - def ListBinaries(self): - """Shells out to list all the binaries from a given package. - - Original checkpkg code: - - # ######################################### - # # find all executables and dynamic libs,and list their filenames. - # listbinaries() { - # if [ ! -d $1 ] ; then - # print errmsg $1 not a directory - # rm -rf $EXTRACTDIR - # exit 1 - # fi - # - # find $1 -print | xargs file |grep ELF |nawk -F: '{print $1}' - # } - """ - self.CheckPkgpathExists() - find_tmpl = "find %s -print | xargs file | grep ELF | nawk -F: '{print $1}'" - find_proc = subprocess.Popen(find_tmpl % self.pkgpath, - shell=True, stdout=subprocess.PIPE) - stdout, stderr = find_proc.communicate() - ret = find_proc.wait() - if ret: - logging.error("The find command returned an error.") - return stdout.splitlines() - - def GetAllFilenames(self): - self.CheckPkgpathExists() - file_basenames = [] - for root, dirs, files in os.walk(self.pkgpath): - file_basenames.extend(files) - return file_basenames - - def GetDependencies(self): - fd = open(os.path.join(self.pkgpath, "install", "depend"), "r") - depends = {} - for line in fd: - fields = re.split(WS_RE, line) - if fields[0] == "P": - depends[fields[1]] = " ".join(fields[1:]) - fd.close() - return depends - - def FormatDepsReport(self, missing_deps, surplus_deps, orphan_sonames): - """A intermediate version in which StringIO is used.""" - namespace = { - "pkgname": self.pkgname, - "missing_deps": missing_deps, - "surplus_deps": surplus_deps, - "orphan_sonames": orphan_sonames, - } - t = Template.Template(REPORT_TMPL, searchList=[namespace]) - return unicode(t) - - -class SystemPkgmap(object): - """A class to hold and manipulate the /var/sadm/install/contents file. - - TODO: Implement timestamp checking and refreshing the cache. - """ - - STOP_PKGS = ["SUNWbcp", "SUNWowbcp", "SUNWucb"] - CHECKPKG_DIR = ".checkpkg" - SQLITE3_DBNAME_TMPL = "var-sadm-install-contents-cache-%s" - - def __init__(self): - """There is no need to re-parse it each time. - - Read it slowly the first time and cache it for later.""" - self.cache = {} - self.checkpkg_dir = os.path.join(os.environ["HOME"], self.CHECKPKG_DIR) - self.fqdn = socket.getfqdn() - self.db_path = os.path.join(self.checkpkg_dir, - self.SQLITE3_DBNAME_TMPL % self.fqdn) - self.file_mtime = None - self.cache_mtime = None - if os.path.exists(self.db_path): - logging.debug("Connecting to the %s database.", self.db_path) - self.conn = sqlite3.connect(self.db_path) - if not self.IsDatabaseUpToDate(): - logging.warning("Rebuilding the package cache, can take a few minutes.") - self.PurgeDatabase() - self.PopulateDatabase() - else: - print "Building a cache of /var/sadm/install/contents." - print "The cache will be kept in %s." % self.db_path - if not os.path.exists(self.checkpkg_dir): - logging.debug("Creating %s", self.checkpkg_dir) - os.mkdir(self.checkpkg_dir) - self.conn = sqlite3.connect(self.db_path) - c = self.conn.cursor() - c.execute(""" - CREATE TABLE systempkgmap ( - id INTEGER PRIMARY KEY, - basename TEXT, - path TEXT, - line TEXT - ); - """) - logging.debug("Creating the config table.") - c.execute(""" - CREATE TABLE config ( - key VARCHAR(255) PRIMARY KEY, - float_value FLOAT, - str_value VARCHAR(255) - ); - """) - self.PopulateDatabase() - - def SymlinkDuringInstallation(self, p): - """Emulates the effect of some symlinks present during installations.""" - p = p.replace("/opt/csw/lib/i386", "/opt/csw/lib") - - def PopulateDatabase(self): - """Imports data into the database. - - Original bit of code from checkpkg: - - egrep -v 'SUNWbcp|SUNWowbcp|SUNWucb' /var/sadm/install/contents | - fgrep -f $EXTRACTDIR/liblist >$EXTRACTDIR/shortcatalog - """ - - system_pkgmap_fd = open(SYSTEM_PKGMAP, "r") - stop_re = re.compile("(%s)" % "|".join(self.STOP_PKGS)) - # Creating a data structure: - # soname - {: , : , ...} - logging.debug("Building sqlite3 cache db of the %s file", - SYSTEM_PKGMAP) - c = self.conn.cursor() - count = itertools.count() - for line in system_pkgmap_fd: - i = count.next() - if not i % 1000: - print "\r%s" % i, - if stop_re.search(line): - continue - fields = re.split(WS_RE, line) - pkgmap_entry_path = fields[0].split("=")[0] - pkgmap_entry_dir, pkgmap_entry_base_name = os.path.split(pkgmap_entry_path) - sql = "INSERT INTO systempkgmap (basename, path, line) VALUES (?, ?, ?);" - c.execute(sql, (pkgmap_entry_base_name, pkgmap_entry_dir, line.strip())) - print - print "Creating the main database index." - sql = "CREATE INDEX basename_idx ON systempkgmap(basename);" - c.execute(sql) - self.SetDatabaseMtime() - self.conn.commit() - - def SetDatabaseMtime(self): - c = self.conn.cursor() - sql = "DELETE FROM config WHERE key = ?;" - c.execute(sql, [CONFIG_MTIME]) - mtime = self.GetFileMtime() - logging.debug("Inserting the mtime (%s) into the database.", mtime) - sql = """ - INSERT INTO config (key, float_value) - VALUES (?, ?); - """ - c.execute(sql, [CONFIG_MTIME, mtime]) - - def GetPkgmapLineByBasename(self, filename): - if filename in self.cache: - return self.cache[filename] - sql = "SELECT path, line FROM systempkgmap WHERE basename = ?;" - c = self.conn.cursor() - c.execute(sql, [filename]) - lines = {} - for row in c: - lines[row[0]] = row[1] - if len(lines) == 0: - logging.debug("Cache doesn't contain filename %s", filename) - self.cache[filename] = lines - return lines - - def GetDatabaseMtime(self): - if not self.cache_mtime: - sql = """ - SELECT float_value FROM config - WHERE key = ?; - """ - c = self.conn.cursor() - c.execute(sql, [CONFIG_MTIME]) - row = c.fetchone() - if not row: - # raise ConfigurationError("Could not find the mtime setting") - self.cache_mtime = 1 - else: - self.cache_mtime = row[0] - return self.cache_mtime - - def GetFileMtime(self): - if not self.file_mtime: - stat_data = os.stat(SYSTEM_PKGMAP) - self.file_mtime = stat_data.st_mtime - return self.file_mtime - - def IsDatabaseUpToDate(self): - f_mtime = self.GetFileMtime() - d_mtime = self.GetDatabaseMtime() - logging.debug("f_mtime %s, d_time: %s", f_mtime, d_mtime) - return self.GetFileMtime() <= self.GetDatabaseMtime() - - def PurgeDatabase(self): - logging.info("Purging the cache database") - c = self.conn.cursor() - sql = "DELETE FROM config;" - c.execute(sql) - sql = "DELETE FROM systempkgmap;" - c.execute(sql) - sql = "DROP INDEX basename_idx;" - try: - c.execute(sql) - except sqlite3.OperationalError, e: - logging.warn(e) - -def SharedObjectDependencies(pkgname, - binaries_by_pkgname, - needed_sonames_by_binary, - pkgs_by_soname, - filenames_by_soname, - pkg_by_any_filename): - """This is one of the more obscure and more important pieces of code. - - I tried to make it simpler, but given that the operations here involve - whole sets of packages, it's not easy. - """ - so_dependencies = set() - orphan_sonames = set() - self_provided = set() - for binary in binaries_by_pkgname[pkgname]: - needed_sonames = needed_sonames_by_binary[binary][NEEDED_SONAMES] - for soname in needed_sonames: - if soname in filenames_by_soname: - filename = filenames_by_soname[soname] - pkg = pkg_by_any_filename[filename] - self_provided.add(soname) - so_dependencies.add(pkg) - elif soname in pkgs_by_soname: - so_dependencies.add(pkgs_by_soname[soname]) - else: - orphan_sonames.add(soname) - return so_dependencies, self_provided, orphan_sonames - - -def GuessDepsByFilename(pkgname, pkg_by_any_filename): - """Guesses dependencies based on filename regexes.""" - guessed_deps = set() - for pattern, dep_pkgname in DEPENDENCY_FILENAME_REGEXES: - # If any file name matches, add the dep, go to the next pattern/pkg - # combination. - pattern_re = re.compile("^%s$" % pattern) - for filename in pkg_by_any_filename: - if (re.match(pattern_re, filename) - and - pkgname == pkg_by_any_filename[filename]): - guessed_deps.add(dep_pkgname) - break - return guessed_deps - - -def GuessDepsByPkgname(pkgname, pkg_by_any_filename): - # More guessed dependencies: If one package is a substring of another, it - # might be a hint. For example, CSWmysql51test should depend on CSWmysql51. - # However, the rt (runtime) packages should not want to depend on the main - # package. - guessed_deps = set() - all_other_pkgs = set(pkg_by_any_filename.values()) - for other_pkg in all_other_pkgs: - other_pkg = unicode(other_pkg) - if pkgname == other_pkg: - continue - if pkgname.startswith(other_pkg): - endings = ["devel", "test", "bench", "dev"] - for ending in endings: - if pkgname.endswith(ending): - guessed_deps.add(other_pkg) - return guessed_deps - - -def AnalyzeDependencies(pkgname, - declared_dependencies, - binaries_by_pkgname, - needed_sonames_by_binary, - pkgs_by_soname, - filenames_by_soname, - pkg_by_any_filename): - """Gathers and merges dependency results from other functions. - - declared_dependencies: Dependencies that the package in question claims to - have. - - binaries_by_pkgname: A dictionary mapping pkgnames (CSWfoo) to binary names - (without paths) - - needed_sonames_by_binary: A dictionary mapping binary file name to - a dictionary containing: "needed sonames", - "soname", "rpath". Based on examining the binary - files within the packages. - - pkgs_by_soname: A dictionary mapping sonames to pkgnames, based on the - contents of the system wide pkgmap - (/var/sadm/install/contents) - - filenames_by_soname: A dictionary mapping shared library sonames to filenames, - based on files within packages - - pkg_by_any_filename: Mapping from file names to packages names, based on the - contents of the packages under examination. - """ - declared_dependencies_set = set(declared_dependencies) - - so_dependencies, self_provided, orphan_sonames = SharedObjectDependencies( - pkgname, - binaries_by_pkgname, - needed_sonames_by_binary, - pkgs_by_soname, - filenames_by_soname, - pkg_by_any_filename) - auto_dependencies = reduce(lambda x, y: x.union(y), - [ - so_dependencies, - GuessDepsByFilename(pkgname, pkg_by_any_filename), - GuessDepsByPkgname(pkgname, pkg_by_any_filename), - ]) - missing_deps = auto_dependencies.difference(declared_dependencies_set) - # Don't report itself as a suggested dependency. - missing_deps = missing_deps.difference(set([pkgname])) - missing_deps = missing_deps.difference(set(DO_NOT_REPORT_MISSING)) - surplus_deps = declared_dependencies_set.difference(auto_dependencies) - surplus_deps = surplus_deps.difference(DO_NOT_REPORT_SURPLUS) - orphan_sonames = orphan_sonames.difference(ALLOWED_ORPHAN_SONAMES) - return missing_deps, surplus_deps, orphan_sonames - - -def ExpandRunpath(runpath, isalist): - # Emulating $ISALIST expansion - if '$ISALIST' in runpath: - expanded_list = [runpath.replace('$ISALIST', isa) for isa in isalist] - else: - expanded_list = [runpath] - return expanded_list - -def ExpandSymlink(symlink, target, input_path): - symlink_re = re.compile(r"%s(/|$)" % symlink) - if re.search(symlink_re, input_path): - result = input_path.replace(symlink, target) - else: - result = input_path - return result - -def Emulate64BitSymlinks(runpath_list): - """Need to emulate the 64 -> amd64, 64 -> sparcv9 symlink - - Since we don't know the architecture, we'll adding both amd64 and sparcv9. - It should be safe. - """ - symlinked_list = [] - for runpath in runpath_list: - for symlink, expansion_list in SYSTEM_SYMLINKS: - for target in expansion_list: - expanded = ExpandSymlink(symlink, target, runpath) - if expanded not in symlinked_list: - symlinked_list.append(expanded) - return symlinked_list - - -def SanitizeRunpath(runpath): - ok = False - while True: - if runpath.endswith("/"): - runpath = runpath[:-1] - elif "//" in runpath: - runpath = runpath.replace("//", "/") - else: - break - return runpath - - -def GetLinesBySoname(pkgmap, needed_sonames, runpath_by_needed_soname, isalist): - """Works out which system pkgmap lines correspond to given sonames.""" - lines_by_soname = {} - for soname in needed_sonames: - # This is the critical part of the algorithm: it iterates over the - # runpath and finds the first matching one. - runpath_found = False - for runpath in runpath_by_needed_soname[soname]: - runpath = SanitizeRunpath(runpath) - runpath_list = ExpandRunpath(runpath, isalist) - runpath_list = Emulate64BitSymlinks(runpath_list) - soname_runpath_data = pkgmap.GetPkgmapLineByBasename(soname) - # Emulating the install time symlinks, for instance, if the prototype contains - # /opt/csw/lib/i386/foo.so.0 and /opt/csw/lib/i386 is a symlink to ".", - # the shared library ends up in /opt/csw/lib/foo.so.0 and should be findable even when - # RPATH does not contain $ISALIST. - new_soname_runpath_data = {} - for p in soname_runpath_data: - expanded_p_list = Emulate64BitSymlinks([p]) - for expanded_p in expanded_p_list: - new_soname_runpath_data[expanded_p] = soname_runpath_data[p] - soname_runpath_data = new_soname_runpath_data - - logging.debug("%s: will be looking for %s in %s" % - (soname, runpath_list, soname_runpath_data.keys())) - for runpath_expanded in runpath_list: - if runpath_expanded in soname_runpath_data: - lines_by_soname[soname] = soname_runpath_data[runpath_expanded] - runpath_found = True - # This break only goes out of the inner loop, - # need another one below to finish the outer loop. - break - if runpath_found: - break - return lines_by_soname - - -def BuildIndexesBySoname(needed_sonames_by_binary): - """Builds data structures indexed by soname. - - Building indexes - {"foo.so": ["/opt/csw/lib/gcc4", "/opt/csw/lib", ...], - ... - } - """ - needed_sonames = set() - binaries_by_soname = {} - runpath_by_needed_soname = {} - for binary_name, data in needed_sonames_by_binary.iteritems(): - for soname in data[NEEDED_SONAMES]: - needed_sonames.add(soname) - if soname not in runpath_by_needed_soname: - runpath_by_needed_soname[soname] = [] - runpath_by_needed_soname[soname].extend(data[RUNPATH]) - if soname not in binaries_by_soname: - binaries_by_soname[soname] = set() - binaries_by_soname[soname].add(binary_name) - return needed_sonames, binaries_by_soname, runpath_by_needed_soname - - -def ParseDumpOutput(dump_output): - binary_data = {RUNPATH: [], - NEEDED_SONAMES: []} - for line in dump_output.splitlines(): - fields = re.split(WS_RE, line) - # TODO: Make it a unit test - # logging.debug("%s says: %s", DUMP_BIN, fields) - if len(fields) < 3: - continue - if fields[1] == "NEEDED": - binary_data[NEEDED_SONAMES].append(fields[2]) - elif fields[1] == "RUNPATH": - binary_data[RUNPATH].extend(fields[2].split(":")) - elif fields[1] == "SONAME": - binary_data[SONAME] = fields[2] - # Adding the default runtime path search option. - binary_data[RUNPATH].append("/usr/lib/$ISALIST") - binary_data[RUNPATH].append("/usr/lib") - binary_data[RUNPATH].append("/lib/$ISALIST") - binary_data[RUNPATH].append("/lib") - return binary_data Deleted: csw/mgar/gar/v2/bin/checkpkg.d/checkpkg_test.py =================================================================== --- csw/mgar/gar/v2/bin/checkpkg.d/checkpkg_test.py 2010-01-26 10:26:12 UTC (rev 8180) +++ csw/mgar/gar/v2/bin/checkpkg.d/checkpkg_test.py 2010-01-26 10:43:08 UTC (rev 8181) @@ -1,589 +0,0 @@ -#!/opt/csw/bin/python2.6 -# $Id$ - -import unittest -import mox -import difflib -import checkpkg -import testdata.checkpkg_test_data_CSWmysql51rt as d1 -import testdata.checkpkg_test_data_CSWmysql51client as d2 -import testdata.checkpkg_test_data_CSWmysql51 as d3 -import testdata.checkpkg_test_data_CSWmysql51devel as d4 -import testdata.checkpkg_test_data_CSWlibpq_84 as d5 -import testdata.checkpkg_test_data_CSWmysql5client_8x as d6 -import testdata.checkpkg_test_data_CSWpostfix as d7 -import testdata.dump_output_1 as dump_1 -import testdata.dump_output_2 as dump_2 - -"""A set of unit tests for the library checking code. - -A bunch of lines to test in the interactive Python shell. - -import sys -sys.path.append("gar/bin/checkpkg.d") -import checkpkg -import testdata.checkpkg_test_data_CSWmysql5client_8x as d6 - -checkpkg.SharedObjectDependencies("CSWmysql5client", -d6.DATA_BINARIES_BY_PKGNAME, d6.DATA_NEEDED_SONAMES_BY_BINARY, -d6.DATA_PKGS_BY_FILENAME, d6.DATA_FILENAMES_BY_SONAME, -d6.DATA_PKG_BY_ANY_FILENAME) - -sqlite3 ~/.checkpkg/var-sadm-install-contents-cache-build8x -SELECT * FROM systempkgmap WHERE basename = 'libncursesw.so.5'; -""" - -class DependenciesUnitTest_1(unittest.TestCase): - - def setUp(self): - self.missing_deps, self.surplus_deps, self.orphan_sonames = checkpkg.AnalyzeDependencies( - d1.DATA_PKGNAME, - d1.DATA_DECLARED_DEPENDENCIES, - d1.DATA_BINARIES_BY_PKGNAME, - d1.DATA_NEEDED_SONAMES_BY_BINARY, - d1.DATA_PKGS_BY_FILENAME, - d1.DATA_FILENAMES_BY_SONAME, - d1.DATA_PKG_BY_ANY_FILENAME, - ) - - def testSurplusDeps(self): - self.assertEquals(set([]), self.surplus_deps) - - def testOrphanSonames(self): - self.assertEquals(set([]), self.orphan_sonames) - - def testMissingDeps(self): - expected = set([]) - self.assertEquals(expected, self.missing_deps) - - -class DependenciesUnitTest_2(unittest.TestCase): - - def setUp(self): - self.missing_deps, self.surplus_deps, self.orphan_sonames = checkpkg.AnalyzeDependencies( - d2.DATA_PKGNAME, - d2.DATA_DECLARED_DEPENDENCIES, - d2.DATA_BINARIES_BY_PKGNAME, - d2.DATA_NEEDED_SONAMES_BY_BINARY, - d2.DATA_PKGS_BY_FILENAME, - d2.DATA_FILENAMES_BY_SONAME, - d2.DATA_PKG_BY_ANY_FILENAME, - ) - - def testSurplusDeps(self): - self.assertEquals(set([]), self.surplus_deps) - - def testOrphanSonames(self): - self.assertEquals(set([]), self.orphan_sonames) - - def testMissingDeps(self): - expected = set([]) - self.assertEquals(expected, self.missing_deps) - - -class DependenciesUnitTest_3(unittest.TestCase): - - def setUp(self): - self.missing_deps, self.surplus_deps, self.orphan_sonames = checkpkg.AnalyzeDependencies( - d3.DATA_PKGNAME, - d3.DATA_DECLARED_DEPENDENCIES, - d3.DATA_BINARIES_BY_PKGNAME, - d3.DATA_NEEDED_SONAMES_BY_BINARY, - d3.DATA_PKGS_BY_FILENAME, - d3.DATA_FILENAMES_BY_SONAME, - d3.DATA_PKG_BY_ANY_FILENAME, - ) - - def testSurplusDeps(self): - self.assertEquals(set([u'CSWmysql51client']), self.surplus_deps) - - def testOrphanSonames(self): - self.assertEquals(set([]), self.orphan_sonames) - - def testMissingDeps(self): - expected = set(['CSWmysql51rt']) - self.assertEquals(expected, self.missing_deps) - - -class DependenciesUnitTest_4(unittest.TestCase): - - def setUp(self): - self.missing_deps, self.surplus_deps, self.orphan_sonames = checkpkg.AnalyzeDependencies( - d4.DATA_PKGNAME, - d4.DATA_DECLARED_DEPENDENCIES, - d4.DATA_BINARIES_BY_PKGNAME, - d4.DATA_NEEDED_SONAMES_BY_BINARY, - d4.DATA_PKGS_BY_FILENAME, - d4.DATA_FILENAMES_BY_SONAME, - d4.DATA_PKG_BY_ANY_FILENAME, - ) - - def testSurplusDeps(self): - self.assertEquals(set([]), self.surplus_deps) - - def testOrphanSonames(self): - self.assertEquals(set([]), self.orphan_sonames) - - def testMissingDeps(self): - expected = set([]) - self.assertEquals(expected, self.missing_deps) - - -class DependenciesUnitTest_5(unittest.TestCase): - - def setUp(self): - self.missing_deps, self.surplus_deps, self.orphan_sonames = checkpkg.AnalyzeDependencies( - d5.DATA_PKGNAME, - d5.DATA_DECLARED_DEPENDENCIES, - d5.DATA_BINARIES_BY_PKGNAME, - d5.DATA_NEEDED_SONAMES_BY_BINARY, - d5.DATA_PKGS_BY_FILENAME, - d5.DATA_FILENAMES_BY_SONAME, - d5.DATA_PKG_BY_ANY_FILENAME, - ) - - def testSurplusDeps(self): - self.assertEquals(set([]), self.surplus_deps) - - def testOrphanSonames(self): - self.assertEquals(set([]), self.orphan_sonames) - - def testMissingDeps(self): - # This tends to report itself... - expected = set([u'SUNWgss']) - self.assertEquals(expected, self.missing_deps) - - -class DependenciesUnitTest_6(unittest.TestCase): - - def setUp(self): - (self.missing_deps, - self.surplus_deps, - self.orphan_sonames) = checkpkg.AnalyzeDependencies( - d6.DATA_PKGNAME, - d6.DATA_DECLARED_DEPENDENCIES, - d6.DATA_BINARIES_BY_PKGNAME, - d6.DATA_NEEDED_SONAMES_BY_BINARY, - d6.DATA_PKGS_BY_FILENAME, - d6.DATA_FILENAMES_BY_SONAME, - d6.DATA_PKG_BY_ANY_FILENAME, - ) - - def testSurplusDeps(self): - self.assertEquals(set([]), self.surplus_deps) - - def testOrphanSonames(self): - self.assertEquals(set([]), self.orphan_sonames) - - def testMissingDeps(self): - expected = set([]) - self.assertEquals(expected, self.missing_deps) - - -class DependenciesUnitTest_7(unittest.TestCase): - - def setUp(self): - (self.missing_deps, - self.surplus_deps, - self.orphan_sonames) = checkpkg.AnalyzeDependencies( - d7.DATA_PKGNAME, - d7.DATA_DECLARED_DEPENDENCIES, - d7.DATA_BINARIES_BY_PKGNAME, - d7.DATA_NEEDED_SONAMES_BY_BINARY, - d7.DATA_PKGS_BY_FILENAME, - d7.DATA_FILENAMES_BY_SONAME, - d7.DATA_PKG_BY_ANY_FILENAME, - ) - - def testSurplusDeps(self): - self.assertEquals(set([]), self.surplus_deps) - - def testOrphanSonames(self): - self.assertEquals(set([]), self.orphan_sonames) - - def testMissingDeps(self): - expected = set([]) - self.assertEquals(expected, self.missing_deps) - - -class GuessDepsUnitTest(unittest.TestCase): - - def testGuessDepsByFilename1(self): - expected = set([u"CSWpython"]) - pkgname = u"CSWfoo" - pkg_by_filename = { - "/opt/csw/bin/bar": u"CSWfoo", - "/opt/csw/lib/python/site-packages/foo.py": u"CSWfoo", - } - self.assertEqual(expected, - checkpkg.GuessDepsByFilename(pkgname, pkg_by_filename)) - - def testGuessDepsByFilename2(self): - expected = set([]) - pkgname = u"CSWfoo" - pkg_by_filename = { - "/opt/csw/bin/bar": u"CSWfoo", - "/opt/csw/lib/python/site-packages/foo.py": u"CSWbar", - } - self.assertEqual(expected, - checkpkg.GuessDepsByFilename(pkgname, pkg_by_filename)) - - def testGuessDepsByPkgname1(self): - expected = set([u"CSWfoo"]) - pkgname = u"CSWfoo-devel" - pkg_by_filename = { - "/opt/csw/bin/bar": u"CSWfoo", - "/opt/csw/bin/barfoo": u"CSWfoobar", - "/opt/csw/lib/python/site-packages/foo.py": u"CSWfoo", - } - self.assertEqual(expected, - checkpkg.GuessDepsByPkgname(pkgname, pkg_by_filename)) - - def testGuessDepsByPkgname2(self): - expected = set([]) - pkgname = u"CSWzfoo-devel" - pkg_by_filename = { - "/opt/csw/bin/bar": u"CSWfoo", - "/opt/csw/bin/barfoo": u"CSWfoobar", - "/opt/csw/lib/python/site-packages/foo.py": u"CSWfoo", - } - self.assertEqual(expected, - checkpkg.GuessDepsByPkgname(pkgname, pkg_by_filename)) - - def testGuessDepsByPkgname3(self): - self.assertEqual(set([u"CSWmysql51"]), - checkpkg.GuessDepsByPkgname(u"CSWmysql51devel", - d4.DATA_PKG_BY_ANY_FILENAME)) - - def testGuessDepsByPkgname4(self): - data1 = set(['CSWmysql51', 'CSWmysql51rt', 'CSWmysql51test', - 'CSWmysql51client', 'CSWmysql51bench', 'CSWmysql51devel']) - data2 = dict(((x, x) for x in data1)) - self.assertEqual(set([u"CSWmysql51"]), checkpkg.GuessDepsByPkgname(u"CSWmysql51devel", data2)) - - def testGuessDepsByPkgname4(self): - data1 = set(['CSWmysql51', 'CSWmysql51rt', 'CSWmysql51test', - 'CSWmysql51client', 'CSWmysql51bench', 'CSWmysql51devel']) - data2 = dict(((x, x) for x in data1)) - self.assertEqual(set([]), checkpkg.GuessDepsByPkgname(u"CSWmysql51rt", data2)) - - -class GetLinesBySonameUnitTest(unittest.TestCase): - - class PkgmapStub(object): - - def __init__(self, cache): - self.cache = cache - - def GetPkgmapLineByBasename(self, soname): - return self.cache[soname] - - def setUp(self): - self.pkgmap_mocker = mox.Mox() - - def testExpandRunpath_1(self): - isalist = ["foo", "bar"] - runpath = "/opt/csw/lib/$ISALIST" - expected = ["/opt/csw/lib/foo", "/opt/csw/lib/bar"] - self.assertEquals(expected, checkpkg.ExpandRunpath(runpath, isalist)) - - def testExpandRunpath_2(self): - isalist = ["foo", "bar"] - runpath = "/opt/csw/mysql5/lib/$ISALIST/mysql" - expected = ["/opt/csw/mysql5/lib/foo/mysql", "/opt/csw/mysql5/lib/bar/mysql"] - self.assertEquals(expected, checkpkg.ExpandRunpath(runpath, isalist)) - - def testEmulate64BitSymlinks_1(self): - runpath_list = ["/opt/csw/mysql5/lib/foo/mysql/64"] - expected = "/opt/csw/mysql5/lib/foo/mysql/amd64" - self.assertTrue(expected in checkpkg.Emulate64BitSymlinks(runpath_list)) - - def testEmulate64BitSymlinks_2(self): - runpath_list = ["/opt/csw/mysql5/lib/64/mysql/foo"] - expected = "/opt/csw/mysql5/lib/amd64/mysql/foo" - result = checkpkg.Emulate64BitSymlinks(runpath_list) - self.assertTrue(expected in result, "%s not in %s" % (expected, result)) - - def testEmulate64BitSymlinks_3(self): - runpath_list = ["/opt/csw/mysql5/lib/64/mysql/foo"] - expected = "/opt/csw/mysql5/lib/sparcv9/mysql/foo" - result = checkpkg.Emulate64BitSymlinks(runpath_list) - self.assertTrue(expected in result, "%s not in %s" % (expected, result)) - - def testEmulate64BitSymlinks_4(self): - """No repeated paths because of symlink expansion""" - runpath_list = ["/opt/csw/lib"] - expected = "/opt/csw/lib" - result = checkpkg.Emulate64BitSymlinks(runpath_list) - self.assertEquals(1, len(result), "len(%s) != %s" % (result, 1)) - - def testEmulateSymlinks_3(self): - runpath_list = ["/opt/csw/bdb4"] - expected = "/opt/csw/bdb42" - result = checkpkg.Emulate64BitSymlinks(runpath_list) - self.assertTrue(expected in result, "%s not in %s" % (expected, result)) - - def testEmulateSymlinks_4(self): - runpath_list = ["/opt/csw/bdb42"] - expected = "/opt/csw/bdb42" - not_expected = "/opt/csw/bdb422" - result = checkpkg.Emulate64BitSymlinks(runpath_list) - self.assertTrue(expected in result, "%s not in %s" % (expected, result)) - self.assertFalse(not_expected in result, "%s is in %s" % (not_expected, result)) - - def testEmulateSymlinks_5(self): - """Install time symlink expansion.""" - runpath_list = ["/opt/csw/lib/i386"] - expected = "/opt/csw/lib" - result = checkpkg.Emulate64BitSymlinks(runpath_list) - self.assertTrue(expected in result, "%s not in %s" % (expected, result)) - - def testEmulateSymlinks_6(self): - """ExpandSymlink for /opt/csw/lib/i386.""" - runpath_list = ["/opt/csw/lib/i386"] - expected = "/opt/csw/lib" - not_expected = "/opt/csw/lib/i386" - result = checkpkg.ExpandSymlink("/opt/csw/lib/i386", "/opt/csw/lib", "/opt/csw/lib/i386") - self.assertTrue(expected in result, "%s not in %s" % (expected, result)) - self.assertFalse(not_expected in result, "%s is in %s" % (not_expected, result)) - - def testGetLinesBySoname(self): - expected = {'foo.so.1': '/opt/csw/lib/isa-value-1/foo.so.1 foo'} - pkgmap = self.pkgmap_mocker.CreateMock(checkpkg.SystemPkgmap) - pkgmap.GetPkgmapLineByBasename("foo") - lines1 = {"/opt/csw/lib/isa-value-1": "/opt/csw/lib/isa-value-1/foo.so.1 foo", - "/usr/lib": "/usr/lib/foo.so.1 foo"} - # pkgmap.GetPkgmapLineByBasename("foo.so.1").AndReturn(lines1) - pkgmap.GetPkgmapLineByBasename("foo.so.1").AndReturn(lines1) - self.pkgmap_mocker.ReplayAll() - pkgmap.GetPkgmapLineByBasename("foo") - needed_sonames = set(["foo.so.1"]) - runpath_by_needed_soname = {"foo.so.1": ["/opt/csw/lib/$ISALIST", "/usr/lib"]} - isalist = ["isa-value-1", "isa-value-2"] - result = checkpkg.GetLinesBySoname(pkgmap, needed_sonames, runpath_by_needed_soname, isalist) - self.pkgmap_mocker.VerifyAll() - self.assertEqual(expected, result) - - def testGetLinesBySoname_3(self): - expected = {'foo.so.1': '/opt/csw/lib/isa-value-1/foo.so.1 foo'} - pkgmap = self.pkgmap_mocker.CreateMock(checkpkg.SystemPkgmap) - pkgmap.GetPkgmapLineByBasename("foo") - lines1 = { - "/opt/csw/lib/isa-value-1": "/opt/csw/lib/isa-value-1/foo.so.1 foo", - "/opt/csw/lib": "/opt/csw/lib/foo.so.1 foo", - "/usr/lib": "/usr/lib/foo.so.1 foo"} - # pkgmap.GetPkgmapLineByBasename("foo.so.1").AndReturn(lines1) - pkgmap.GetPkgmapLineByBasename("foo.so.1").AndReturn(lines1) - self.pkgmap_mocker.ReplayAll() - pkgmap.GetPkgmapLineByBasename("foo") - needed_sonames = set(["foo.so.1"]) - runpath_by_needed_soname = { - "foo.so.1": ["/opt/csw/lib/$ISALIST", "/usr/lib"]} - isalist = ["isa-value-1", "isa-value-2"] - result = checkpkg.GetLinesBySoname( - pkgmap, needed_sonames, runpath_by_needed_soname, isalist) - self.pkgmap_mocker.VerifyAll() - self.assertEqual(expected, result) - - def testGetLinesBySoname_4(self): - """A more complex test, four ISAs.""" - expected = {'foo.so.1': '/opt/csw/lib/isa-value-1/foo.so.1 foo'} - pkgmap = self.pkgmap_mocker.CreateMock(checkpkg.SystemPkgmap) - pkgmap.GetPkgmapLineByBasename("foo") - lines1 = { - "/opt/csw/lib/isa-value-1": - "/opt/csw/lib/isa-value-1/foo.so.1 foo", - "/opt/csw/mysql5/lib/isa-value-2": - "/opt/csw/mysql5/lib/isa-value-2/foo.so.1 foo", - "/opt/csw/mysql5/lib/isa-value-1": - "/opt/csw/mysql5/lib/isa-value-1/foo.so.1 foo", - "/opt/csw/lib": - "/opt/csw/lib/foo.so.1 foo", - "/usr/lib": - "/usr/lib/foo.so.1 foo"} - pkgmap.GetPkgmapLineByBasename("foo.so.1").AndReturn(lines1) - pkgmap.GetPkgmapLineByBasename("foo.so.1").AndReturn(lines1) - self.pkgmap_mocker.ReplayAll() - pkgmap.GetPkgmapLineByBasename("foo") - needed_sonames = set(["foo.so.1"]) - runpath_by_needed_soname = { - "foo.so.1": ["/opt/csw/mysql5/lib/$ISALIST/mysql", - "/opt/csw/lib/$ISALIST", - "/usr/lib"]} - isalist = ["isa-value-1", "isa-value-2"] - result = checkpkg.GetLinesBySoname( - pkgmap, needed_sonames, runpath_by_needed_soname, isalist) - self.pkgmap_mocker.VerifyAll() - self.assertEqual(expected, result) - - def testGetLinesBySoname_5(self): - """Based on CSWmysql5client on build8x.""" - soname = u'libm.so.1' - expected = {u'libm.so.1': u'/usr/lib/libm.so.1 f none 0755 root bin ' - u'99844 3884 1050525375 SUNWlibms\n'} - - pkgmap_stub = self.PkgmapStub(d6.DATA_PKGMAP_CACHE) - (needed_sonames, - binaries_by_soname, - runpath_by_needed_soname) = checkpkg.BuildIndexesBySoname( - d6.DATA_NEEDED_SONAMES_BY_BINARY) - result = checkpkg.GetLinesBySoname( - pkgmap_stub, - set([soname]), - runpath_by_needed_soname, - d6.DATA_ISALIST) - self.assertEqual(expected, result) - - def testGetLinesBySoname_6(self): - """Based on CSWmysql5client on build8x.""" - soname = u'libz.so.1' - expected = {u'libz.so.1': u'/opt/csw/lib/pentium_pro+mmx/libz.so.1=libz.so.1.2.3 ' - u's none CSWzlib\n'} - pkgmap_stub = self.PkgmapStub(d6.DATA_PKGMAP_CACHE) - (needed_sonames, - binaries_by_soname, - runpath_by_needed_soname) = checkpkg.BuildIndexesBySoname( - d6.DATA_NEEDED_SONAMES_BY_BINARY) - result = checkpkg.GetLinesBySoname( - pkgmap_stub, - set([soname]), - runpath_by_needed_soname, - d6.DATA_ISALIST) - self.assertEqual(expected, result) - - def testGetLinesBySoname_7(self): - """A test for 64-bit symlink expansion.""" - soname = u'libncursesw.so.5' - # To test the 64-bit symlink expansion - expected = { - u'libncursesw.so.5': - u'/opt/csw/lib/amd64/libncursesw.so.5=libncursesw.so.5.7 ' - u's none CSWncurses\n'} - pkgmap_stub = self.PkgmapStub(d6.DATA_PKGMAP_CACHE) - (needed_sonames, - binaries_by_soname, - runpath_by_needed_soname) = checkpkg.BuildIndexesBySoname( - d6.DATA_NEEDED_SONAMES_BY_BINARY) - # The original data did not have amd64 in the isalist. - isalist = ['amd64', 'pentium_pro+mmx', 'pentium_pro', 'pentium+mmx', - 'pentium', 'i486', 'i386', 'i86'] - result = checkpkg.GetLinesBySoname( - pkgmap_stub, - set([soname]), - runpath_by_needed_soname, - isalist) - self.assertEqual(expected, result) - - def testGetLinesBySoname_8(self): - expected = {'foo.so.1': '/opt/csw/postgresql/lib/foo.so.1 foo'} - lines1 = {"/opt/csw/postgresql/lib": "/opt/csw/postgresql/lib/foo.so.1 foo"} - pkgmap = self.pkgmap_mocker.CreateMock(checkpkg.SystemPkgmap) - pkgmap.GetPkgmapLineByBasename("foo.so.1").AndReturn(lines1) - self.pkgmap_mocker.ReplayAll() - needed_sonames = set(["foo.so.1"]) - runpath_by_needed_soname = {"foo.so.1": ["/opt/csw/postgresql/lib/", "/usr/lib"]} - isalist = ["isa-value-1", "isa-value-2"] - result = checkpkg.GetLinesBySoname(pkgmap, needed_sonames, runpath_by_needed_soname, isalist) - self.pkgmap_mocker.VerifyAll() - self.assertEqual(expected, result) - - def testGetLinesBySoname_9(self): - """Emulation of binaries installed into /opt/csw/lib/i386. - - The problem is that /opt/csw/lib/i386 is a symlink and the binaries - end up in /opt/csw/lib instead. - """ - expected = {'foo.so.0': '/opt/csw/lib/i386/foo.so.0 foo'} - lines1 = {"/opt/csw/lib/i386": "/opt/csw/lib/i386/foo.so.0 foo"} - pkgmap = self.pkgmap_mocker.CreateMock(checkpkg.SystemPkgmap) - pkgmap.GetPkgmapLineByBasename("foo.so.0").AndReturn(lines1) - self.pkgmap_mocker.ReplayAll() - needed_sonames = set(["foo.so.0"]) - runpath_by_needed_soname = {"foo.so.0": ["/opt/csw/lib", "/usr/lib"]} - isalist = ["isa-value-1", "isa-value-2"] - result = checkpkg.GetLinesBySoname(pkgmap, needed_sonames, runpath_by_needed_soname, isalist) - self.pkgmap_mocker.VerifyAll() - self.assertEqual(expected, result) - - def testSanitizeRunpath_1(self): - self.assertEqual("/opt/csw/lib", checkpkg.SanitizeRunpath("/opt/csw/lib/")) - - def testSanitizeRunpath_2(self): - self.assertEqual("/opt/csw/lib", checkpkg.SanitizeRunpath("/opt//csw////lib/")) - - - -class ParseDumpOutputUnitTest(unittest.TestCase): - - def test_1(self): - expected = { - 'soname': 'libmysqlclient.so.15', - 'runpath': ['/opt/csw/lib/$ISALIST', - '/opt/csw/lib', - '/opt/csw/mysql5/lib/$ISALIST', - '/opt/csw/mysql5/lib', - '/opt/csw/mysql5/lib/$ISALIST/mysql', - # These four are artificially appended - '/usr/lib/$ISALIST', - '/usr/lib', - '/lib/$ISALIST', - '/lib'], - 'needed sonames': ['librt.so.1', - 'libresolv.so.2', - 'libc.so.1', - 'libgen.so.1', - 'libsocket.so.1', - 'libnsl.so.1', - 'libm.so.1', - 'libz.so.1']} - self.assertEqual(expected, - checkpkg.ParseDumpOutput(dump_1.DATA_DUMP_OUTPUT)) - - def test_2(self): - expected_runpath = ['/usr/lib/$ISALIST', '/usr/lib', '/lib/$ISALIST', '/lib'] - self.assertEqual( - expected_runpath, - checkpkg.ParseDumpOutput(dump_2.DATA_DUMP_OUTPUT)["runpath"]) - - -class FormatDepsReportUnitTest(unittest.TestCase): - - def AssertTextEqual(self, text1, text2): - difference = "\n".join(difflib.context_diff(text2.splitlines(), text1.splitlines())) - self.assertEqual(text1, text2, difference) - - def testAll(self): - missing_deps = set([u'SUNWgss', u'*SUNWlxsl']) - surplus_deps = set(['CSWsudo', 'CSWlibxslt']) - orphan_sonames = set([u'libm.so.2']) - testdata = (missing_deps, surplus_deps, orphan_sonames) - checker = checkpkg.CheckpkgBase("/tmp/nonexistent", "CSWfoo") - expected = u"""CSWfoo: -SUGGESTION: you may want to add some or all of the following as depends: - (Feel free to ignore SUNW or SPRO packages) -> *SUNWlxsl -> SUNWgss -The following packages might be unnecessary dependencies: -? CSWlibxslt -? CSWsudo -The following sonames don't belong to any package: -! libm.so.2 -""" - result = checker.FormatDepsReport(*testdata) - self.AssertTextEqual(result, expected) - - def testNone(self): - missing_deps = set([]) - surplus_deps = set([]) - orphan_sonames = set([]) - testdata = (missing_deps, surplus_deps, orphan_sonames) - checker = checkpkg.CheckpkgBase("/tmp/nonexistent", "CSWfoo") - expected = u"""CSWfoo: -+ Dependencies of CSWfoo look good. -""" - result = checker.FormatDepsReport(*testdata) - self.AssertTextEqual(result, expected) - - -if __name__ == '__main__': - unittest.main() Modified: csw/mgar/gar/v2/bin/checkpkg.d/update_contents_cache.py =================================================================== --- csw/mgar/gar/v2/bin/checkpkg.d/update_contents_cache.py 2010-01-26 10:26:12 UTC (rev 8180) +++ csw/mgar/gar/v2/bin/checkpkg.d/update_contents_cache.py 2010-01-26 10:43:08 UTC (rev 8181) @@ -5,9 +5,18 @@ # This file only creates an instance of SystemPkgmap in order to update the # package cache (if necessary), and display the information about the update. -import checkpkg +import os +import os.path +import sys import logging +# The following bit of code sets the correct path to Python libraries +# distributed with GAR. +path_list = [os.getcwd(), + os.path.split(sys.argv[0])[0], + "..", "..", "lib", "python"] +sys.path.append(os.path.join(*path_list)) +import checkpkg def main(): print "Checking if the package cache is up to date." Modified: csw/mgar/gar/v2/gar.pkg.mk =================================================================== --- csw/mgar/gar/v2/gar.pkg.mk 2010-01-26 10:26:12 UTC (rev 8180) +++ csw/mgar/gar/v2/gar.pkg.mk 2010-01-26 10:43:08 UTC (rev 8181) @@ -693,7 +693,7 @@ # We depend on extract as the additional package files (like .gspec) must be # unpacked to global/ for packaging. E. g. 'merge' depends only on the specific # modulations and does not fill global/. -ENABLE_CHECK ?= 1 +_package: ENABLE_CHECK ?= 1 _package: validateplatform extract-global merge $(SPKG_DESTDIRS) pre-package $(PACKAGE_TARGETS) post-package $(if $(ENABLE_CHECK),pkgcheck) @$(MAKECOOKIE) @@ -705,6 +705,18 @@ @echo @$(DONADA) +dirpackage: _DIRPACKAGE=1 +dirpackage: ENABLE_CHECK= +dirpackage: _package + @echo "The following packages have been built:" + @echo + @$(MAKE) -s PLATFORM=$(PLATFORM) _dirpkgshow + @echo + @$(DONADA) + +_dirpkgshow: + @$(foreach SPEC,$(_PKG_SPECS),echo " $(SPKG_SPOOLDIR)/$(SPEC)";) + _pkgshow: @$(foreach SPEC,$(_PKG_SPECS),printf " %-20s %s\n" $(SPEC) $(SPKG_EXPORT)/$(shell $(call _PKG_ENV,$(SPEC)) $(GARBIN)/mkpackage -qs $(WORKDIR)/$(SPEC).gspec -D pkgfile).gz;) @@ -720,7 +732,7 @@ --pkgbase $(SPKG_PKGBASE) \ --pkgroot $(SPKG_PKGROOT) \ -v WORKDIR_FIRSTMOD=../build-$(firstword $(MODULATIONS)) \ - --compress \ + $(if $(_DIRPACKAGE),--notransfer --nocompress,--compress) \ $(MKPACKAGE_ARGS) ) || exit 2 @$(MAKECOOKIE) @@ -754,6 +766,8 @@ repackage: pkgreset package +redirpackage: pkgreset dirpackage + # This rule automatically logs into every host where a package for this software should # be built. It is especially suited for automated build bots. platforms: Deleted: csw/mgar/gar/v2/lib/python/checkpkg.py =================================================================== --- csw/mgar/gar/v2-dirpackage/lib/python/checkpkg.py 2010-01-26 10:26:12 UTC (rev 8180) +++ csw/mgar/gar/v2/lib/python/checkpkg.py 2010-01-26 10:43:08 UTC (rev 8181) @@ -1,569 +0,0 @@ -# $Id$ -# -# This is the checkpkg library, common for all checkpkg tests written in -# Python. - -import itertools -import logging -import optparse -import os -import os.path -import re -import socket -import sqlite3 -import subprocess -import StringIO -from Cheetah import Template - -SYSTEM_PKGMAP = "/var/sadm/install/contents" -WS_RE = re.compile(r"\s+") -NEEDED_SONAMES = "needed sonames" -RUNPATH = "runpath" -SONAME = "soname" -CONFIG_MTIME = "mtime" -DO_NOT_REPORT_SURPLUS = set([u"CSWcommon", u"CSWcswclassutils", u"CSWisaexec"]) -DO_NOT_REPORT_MISSING = set([u"SUNWlibC", u"SUNWcsl", u"SUNWlibms", - u"*SUNWcslr", u"*SUNWlibC", u"*SUNWlibms", - u"SUNWcslx"]) -SYSTEM_SYMLINKS = ( - ("/opt/csw/bdb4", ["/opt/csw/bdb42"]), - ("/64", ["/amd64", "/sparcv9"]), - ("/opt/csw/lib/i386", ["/opt/csw/lib"]), -) - -# This shared library is present on Solaris 10 on amd64, but it's missing on -# Solaris 8 on i386. It's okay if it's missing. -ALLOWED_ORPHAN_SONAMES = set([u"libm.so.2"]) -DEPENDENCY_FILENAME_REGEXES = ( - (r".*\.pl", u"CSWperl"), - (r".*\.pm", u"CSWperl"), - (r".*\.py", u"CSWpython"), - (r".*\.rb", u"CSWruby"), -) - -REPORT_TMPL = u"""$pkgname: -#if $missing_deps -SUGGESTION: you may want to add some or all of the following as depends: - (Feel free to ignore SUNW or SPRO packages) -#for $pkg in $sorted($missing_deps) -> $pkg -#end for -#end if -#if $surplus_deps -The following packages might be unnecessary dependencies: -#for $pkg in $sorted($surplus_deps) -? $pkg -#end for -#end if -#if $orphan_sonames -The following sonames don't belong to any package: -#for $soname in $sorted($orphan_sonames) -! $soname -#end for -#end if -#if not $missing_deps and not $surplus_deps and not $orphan_sonames -+ Dependencies of $pkgname look good. -#end if -""" - -class Error(Exception): - pass - - -class ConfigurationError(Error): - pass - - -class PackageError(Error): - pass - - -def GetOptions(): - parser = optparse.OptionParser() - parser.add_option("-e", dest="extractdir", - help="The directory into which the package has been extracted") - parser.add_option("-d", "--debug", dest="debug", - default=False, action="store_true", - help="Turn on debugging messages") - (options, args) = parser.parse_args() - if not options.extractdir: - raise ConfigurationError("ERROR: -e option is missing.") - # Using set() to make the arguments unique. - return options, set(args) - - -class CheckpkgBase(object): - """This class has functionality overlapping with DirectoryFormatPackage - from the opencsw.py library. The classes should be merged. - """ - - def __init__(self, extractdir, pkgname): - self.extractdir = extractdir - self.pkgname = pkgname - self.pkgpath = os.path.join(self.extractdir, self.pkgname) - - def CheckPkgpathExists(self): - if not os.path.isdir(self.pkgpath): - raise PackageError("%s does not exist or is not a directory" - % self.pkgpath) - - def ListBinaries(self): - """Shells out to list all the binaries from a given package. - - Original checkpkg code: - - # ######################################### - # # find all executables and dynamic libs,and list their filenames. - # listbinaries() { - # if [ ! -d $1 ] ; then - # print errmsg $1 not a directory - # rm -rf $EXTRACTDIR - # exit 1 - # fi - # - # find $1 -print | xargs file |grep ELF |nawk -F: '{print $1}' - # } - """ - self.CheckPkgpathExists() - find_tmpl = "find %s -print | xargs file | grep ELF | nawk -F: '{print $1}'" - find_proc = subprocess.Popen(find_tmpl % self.pkgpath, - shell=True, stdout=subprocess.PIPE) - stdout, stderr = find_proc.communicate() - ret = find_proc.wait() - if ret: - logging.error("The find command returned an error.") - return stdout.splitlines() - - def GetAllFilenames(self): - self.CheckPkgpathExists() - file_basenames = [] - for root, dirs, files in os.walk(self.pkgpath): - file_basenames.extend(files) - return file_basenames - - def GetDependencies(self): - fd = open(os.path.join(self.pkgpath, "install", "depend"), "r") - depends = {} - for line in fd: - fields = re.split(WS_RE, line) - if fields[0] == "P": - depends[fields[1]] = " ".join(fields[1:]) - fd.close() - return depends - - def FormatDepsReport(self, missing_deps, surplus_deps, orphan_sonames): - """A intermediate version in which StringIO is used.""" - namespace = { - "pkgname": self.pkgname, - "missing_deps": missing_deps, - "surplus_deps": surplus_deps, - "orphan_sonames": orphan_sonames, - } - t = Template.Template(REPORT_TMPL, searchList=[namespace]) - return unicode(t) - - -class SystemPkgmap(object): - """A class to hold and manipulate the /var/sadm/install/contents file. - - TODO: Implement timestamp checking and refreshing the cache. - """ - - STOP_PKGS = ["SUNWbcp", "SUNWowbcp", "SUNWucb"] - CHECKPKG_DIR = ".checkpkg" - SQLITE3_DBNAME_TMPL = "var-sadm-install-contents-cache-%s" - - def __init__(self): - """There is no need to re-parse it each time. - - Read it slowly the first time and cache it for later.""" - self.cache = {} - self.checkpkg_dir = os.path.join(os.environ["HOME"], self.CHECKPKG_DIR) - self.fqdn = socket.getfqdn() - self.db_path = os.path.join(self.checkpkg_dir, - self.SQLITE3_DBNAME_TMPL % self.fqdn) - self.file_mtime = None - self.cache_mtime = None - if os.path.exists(self.db_path): - logging.debug("Connecting to the %s database.", self.db_path) - self.conn = sqlite3.connect(self.db_path) - if not self.IsDatabaseUpToDate(): - logging.warning("Rebuilding the package cache, can take a few minutes.") - self.PurgeDatabase() - self.PopulateDatabase() - else: - print "Building a cache of /var/sadm/install/contents." - print "The cache will be kept in %s." % self.db_path - if not os.path.exists(self.checkpkg_dir): - logging.debug("Creating %s", self.checkpkg_dir) - os.mkdir(self.checkpkg_dir) - self.conn = sqlite3.connect(self.db_path) - c = self.conn.cursor() - c.execute(""" - CREATE TABLE systempkgmap ( - id INTEGER PRIMARY KEY, - basename TEXT, - path TEXT, - line TEXT - ); - """) - logging.debug("Creating the config table.") - c.execute(""" - CREATE TABLE config ( - key VARCHAR(255) PRIMARY KEY, - float_value FLOAT, - str_value VARCHAR(255) - ); - """) - self.PopulateDatabase() - - def SymlinkDuringInstallation(self, p): - """Emulates the effect of some symlinks present during installations.""" - p = p.replace("/opt/csw/lib/i386", "/opt/csw/lib") - - def PopulateDatabase(self): - """Imports data into the database. - - Original bit of code from checkpkg: - - egrep -v 'SUNWbcp|SUNWowbcp|SUNWucb' /var/sadm/install/contents | - fgrep -f $EXTRACTDIR/liblist >$EXTRACTDIR/shortcatalog - """ - - system_pkgmap_fd = open(SYSTEM_PKGMAP, "r") - stop_re = re.compile("(%s)" % "|".join(self.STOP_PKGS)) - # Creating a data structure: - # soname - {: , : , ...} - logging.debug("Building sqlite3 cache db of the %s file", - SYSTEM_PKGMAP) - c = self.conn.cursor() - count = itertools.count() - for line in system_pkgmap_fd: - i = count.next() - if not i % 1000: - print "\r%s" % i, - if stop_re.search(line): - continue - fields = re.split(WS_RE, line) - pkgmap_entry_path = fields[0].split("=")[0] - pkgmap_entry_dir, pkgmap_entry_base_name = os.path.split(pkgmap_entry_path) - sql = "INSERT INTO systempkgmap (basename, path, line) VALUES (?, ?, ?);" - c.execute(sql, (pkgmap_entry_base_name, pkgmap_entry_dir, line.strip())) - print - print "Creating the main database index." - sql = "CREATE INDEX basename_idx ON systempkgmap(basename);" - c.execute(sql) - self.SetDatabaseMtime() - self.conn.commit() - - def SetDatabaseMtime(self): - c = self.conn.cursor() - sql = "DELETE FROM config WHERE key = ?;" - c.execute(sql, [CONFIG_MTIME]) - mtime = self.GetFileMtime() - logging.debug("Inserting the mtime (%s) into the database.", mtime) - sql = """ - INSERT INTO config (key, float_value) - VALUES (?, ?); - """ - c.execute(sql, [CONFIG_MTIME, mtime]) - - def GetPkgmapLineByBasename(self, filename): - if filename in self.cache: - return self.cache[filename] - sql = "SELECT path, line FROM systempkgmap WHERE basename = ?;" - c = self.conn.cursor() - c.execute(sql, [filename]) - lines = {} - for row in c: - lines[row[0]] = row[1] - if len(lines) == 0: - logging.debug("Cache doesn't contain filename %s", filename) - self.cache[filename] = lines - return lines - - def GetDatabaseMtime(self): - if not self.cache_mtime: - sql = """ - SELECT float_value FROM config - WHERE key = ?; - """ - c = self.conn.cursor() - c.execute(sql, [CONFIG_MTIME]) - row = c.fetchone() - if not row: - # raise ConfigurationError("Could not find the mtime setting") - self.cache_mtime = 1 - else: - self.cache_mtime = row[0] - return self.cache_mtime - - def GetFileMtime(self): - if not self.file_mtime: - stat_data = os.stat(SYSTEM_PKGMAP) - self.file_mtime = stat_data.st_mtime - return self.file_mtime - - def IsDatabaseUpToDate(self): - f_mtime = self.GetFileMtime() - d_mtime = self.GetDatabaseMtime() - logging.debug("f_mtime %s, d_time: %s", f_mtime, d_mtime) - return self.GetFileMtime() <= self.GetDatabaseMtime() - - def PurgeDatabase(self): - logging.info("Purging the cache database") - c = self.conn.cursor() - sql = "DELETE FROM config;" - c.execute(sql) - sql = "DELETE FROM systempkgmap;" - c.execute(sql) - sql = "DROP INDEX basename_idx;" - try: - c.execute(sql) - except sqlite3.OperationalError, e: - logging.warn(e) - -def SharedObjectDependencies(pkgname, - binaries_by_pkgname, - needed_sonames_by_binary, - pkgs_by_soname, - filenames_by_soname, - pkg_by_any_filename): - """This is one of the more obscure and more important pieces of code. - - I tried to make it simpler, but given that the operations here involve - whole sets of packages, it's not easy. - """ - so_dependencies = set() - orphan_sonames = set() - self_provided = set() - for binary in binaries_by_pkgname[pkgname]: - needed_sonames = needed_sonames_by_binary[binary][NEEDED_SONAMES] - for soname in needed_sonames: - if soname in filenames_by_soname: - filename = filenames_by_soname[soname] - pkg = pkg_by_any_filename[filename] - self_provided.add(soname) - so_dependencies.add(pkg) - elif soname in pkgs_by_soname: - so_dependencies.add(pkgs_by_soname[soname]) - else: - orphan_sonames.add(soname) - return so_dependencies, self_provided, orphan_sonames - - -def GuessDepsByFilename(pkgname, pkg_by_any_filename): - """Guesses dependencies based on filename regexes.""" - guessed_deps = set() - for pattern, dep_pkgname in DEPENDENCY_FILENAME_REGEXES: - # If any file name matches, add the dep, go to the next pattern/pkg - # combination. - pattern_re = re.compile("^%s$" % pattern) - for filename in pkg_by_any_filename: - if (re.match(pattern_re, filename) - and - pkgname == pkg_by_any_filename[filename]): - guessed_deps.add(dep_pkgname) - break - return guessed_deps - - -def GuessDepsByPkgname(pkgname, pkg_by_any_filename): - # More guessed dependencies: If one package is a substring of another, it - # might be a hint. For example, CSWmysql51test should depend on CSWmysql51. - # However, the rt (runtime) packages should not want to depend on the main - # package. - guessed_deps = set() - all_other_pkgs = set(pkg_by_any_filename.values()) - for other_pkg in all_other_pkgs: - other_pkg = unicode(other_pkg) - if pkgname == other_pkg: - continue - if pkgname.startswith(other_pkg): - endings = ["devel", "test", "bench", "dev"] - for ending in endings: - if pkgname.endswith(ending): - guessed_deps.add(other_pkg) - return guessed_deps - - -def AnalyzeDependencies(pkgname, - declared_dependencies, - binaries_by_pkgname, - needed_sonames_by_binary, - pkgs_by_soname, - filenames_by_soname, - pkg_by_any_filename): - """Gathers and merges dependency results from other functions. - - declared_dependencies: Dependencies that the package in question claims to - have. - - binaries_by_pkgname: A dictionary mapping pkgnames (CSWfoo) to binary names - (without paths) - - needed_sonames_by_binary: A dictionary mapping binary file name to - a dictionary containing: "needed sonames", - "soname", "rpath". Based on examining the binary - files within the packages. - - pkgs_by_soname: A dictionary mapping sonames to pkgnames, based on the - contents of the system wide pkgmap - (/var/sadm/install/contents) - - filenames_by_soname: A dictionary mapping shared library sonames to filenames, - based on files within packages - - pkg_by_any_filename: Mapping from file names to packages names, based on the - contents of the packages under examination. - """ - declared_dependencies_set = set(declared_dependencies) - - so_dependencies, self_provided, orphan_sonames = SharedObjectDependencies( - pkgname, - binaries_by_pkgname, - needed_sonames_by_binary, - pkgs_by_soname, - filenames_by_soname, - pkg_by_any_filename) - auto_dependencies = reduce(lambda x, y: x.union(y), - [ - so_dependencies, - GuessDepsByFilename(pkgname, pkg_by_any_filename), - GuessDepsByPkgname(pkgname, pkg_by_any_filename), - ]) - missing_deps = auto_dependencies.difference(declared_dependencies_set) - # Don't report itself as a suggested dependency. - missing_deps = missing_deps.difference(set([pkgname])) - missing_deps = missing_deps.difference(set(DO_NOT_REPORT_MISSING)) - surplus_deps = declared_dependencies_set.difference(auto_dependencies) - surplus_deps = surplus_deps.difference(DO_NOT_REPORT_SURPLUS) - orphan_sonames = orphan_sonames.difference(ALLOWED_ORPHAN_SONAMES) - return missing_deps, surplus_deps, orphan_sonames - - -def ExpandRunpath(runpath, isalist): - # Emulating $ISALIST expansion - if '$ISALIST' in runpath: - expanded_list = [runpath.replace('$ISALIST', isa) for isa in isalist] - else: - expanded_list = [runpath] - return expanded_list - -def ExpandSymlink(symlink, target, input_path): - symlink_re = re.compile(r"%s(/|$)" % symlink) - if re.search(symlink_re, input_path): - result = input_path.replace(symlink, target) - else: - result = input_path - return result - -def Emulate64BitSymlinks(runpath_list): - """Need to emulate the 64 -> amd64, 64 -> sparcv9 symlink - - Since we don't know the architecture, we'll adding both amd64 and sparcv9. - It should be safe. - """ - symlinked_list = [] - for runpath in runpath_list: - for symlink, expansion_list in SYSTEM_SYMLINKS: - for target in expansion_list: - expanded = ExpandSymlink(symlink, target, runpath) - if expanded not in symlinked_list: - symlinked_list.append(expanded) - return symlinked_list - - -def SanitizeRunpath(runpath): - ok = False - while True: - if runpath.endswith("/"): - runpath = runpath[:-1] - elif "//" in runpath: - runpath = runpath.replace("//", "/") - else: - break - return runpath - - -def GetLinesBySoname(pkgmap, needed_sonames, runpath_by_needed_soname, isalist): - """Works out which system pkgmap lines correspond to given sonames.""" - lines_by_soname = {} - for soname in needed_sonames: - # This is the critical part of the algorithm: it iterates over the - # runpath and finds the first matching one. - runpath_found = False - for runpath in runpath_by_needed_soname[soname]: - runpath = SanitizeRunpath(runpath) - runpath_list = ExpandRunpath(runpath, isalist) - runpath_list = Emulate64BitSymlinks(runpath_list) - soname_runpath_data = pkgmap.GetPkgmapLineByBasename(soname) - # Emulating the install time symlinks, for instance, if the prototype contains - # /opt/csw/lib/i386/foo.so.0 and /opt/csw/lib/i386 is a symlink to ".", - # the shared library ends up in /opt/csw/lib/foo.so.0 and should be findable even when - # RPATH does not contain $ISALIST. - new_soname_runpath_data = {} - for p in soname_runpath_data: - expanded_p_list = Emulate64BitSymlinks([p]) - for expanded_p in expanded_p_list: - new_soname_runpath_data[expanded_p] = soname_runpath_data[p] - soname_runpath_data = new_soname_runpath_data - - logging.debug("%s: will be looking for %s in %s" % - (soname, runpath_list, soname_runpath_data.keys())) - for runpath_expanded in runpath_list: - if runpath_expanded in soname_runpath_data: - lines_by_soname[soname] = soname_runpath_data[runpath_expanded] - runpath_found = True - # This break only goes out of the inner loop, - # need another one below to finish the outer loop. - break - if runpath_found: - break - return lines_by_soname - - -def BuildIndexesBySoname(needed_sonames_by_binary): - """Builds data structures indexed by soname. - - Building indexes - {"foo.so": ["/opt/csw/lib/gcc4", "/opt/csw/lib", ...], - ... - } - """ - needed_sonames = set() - binaries_by_soname = {} - runpath_by_needed_soname = {} - for binary_name, data in needed_sonames_by_binary.iteritems(): - for soname in data[NEEDED_SONAMES]: - needed_sonames.add(soname) - if soname not in runpath_by_needed_soname: - runpath_by_needed_soname[soname] = [] - runpath_by_needed_soname[soname].extend(data[RUNPATH]) - if soname not in binaries_by_soname: - binaries_by_soname[soname] = set() - binaries_by_soname[soname].add(binary_name) - return needed_sonames, binaries_by_soname, runpath_by_needed_soname - - -def ParseDumpOutput(dump_output): - binary_data = {RUNPATH: [], - NEEDED_SONAMES: []} - for line in dump_output.splitlines(): - fields = re.split(WS_RE, line) - # TODO: Make it a unit test - # logging.debug("%s says: %s", DUMP_BIN, fields) - if len(fields) < 3: - continue - if fields[1] == "NEEDED": - binary_data[NEEDED_SONAMES].append(fields[2]) - elif fields[1] == "RUNPATH": - binary_data[RUNPATH].extend(fields[2].split(":")) - elif fields[1] == "SONAME": - binary_data[SONAME] = fields[2] - # Adding the default runtime path search option. - binary_data[RUNPATH].append("/usr/lib/$ISALIST") - binary_data[RUNPATH].append("/usr/lib") - binary_data[RUNPATH].append("/lib/$ISALIST") - binary_data[RUNPATH].append("/lib") - return binary_data Copied: csw/mgar/gar/v2/lib/python/checkpkg.py (from rev 8180, csw/mgar/gar/v2-dirpackage/lib/python/checkpkg.py) =================================================================== --- csw/mgar/gar/v2/lib/python/checkpkg.py (rev 0) +++ csw/mgar/gar/v2/lib/python/checkpkg.py 2010-01-26 10:43:08 UTC (rev 8181) @@ -0,0 +1,569 @@ +# $Id$ +# +# This is the checkpkg library, common for all checkpkg tests written in +# Python. + +import itertools +import logging +import optparse +import os +import os.path +import re +import socket +import sqlite3 +import subprocess +import StringIO +from Cheetah import Template + +SYSTEM_PKGMAP = "/var/sadm/install/contents" +WS_RE = re.compile(r"\s+") +NEEDED_SONAMES = "needed sonames" +RUNPATH = "runpath" +SONAME = "soname" +CONFIG_MTIME = "mtime" +DO_NOT_REPORT_SURPLUS = set([u"CSWcommon", u"CSWcswclassutils", u"CSWisaexec"]) +DO_NOT_REPORT_MISSING = set([u"SUNWlibC", u"SUNWcsl", u"SUNWlibms", + u"*SUNWcslr", u"*SUNWlibC", u"*SUNWlibms", + u"SUNWcslx"]) +SYSTEM_SYMLINKS = ( + ("/opt/csw/bdb4", ["/opt/csw/bdb42"]), + ("/64", ["/amd64", "/sparcv9"]), + ("/opt/csw/lib/i386", ["/opt/csw/lib"]), +) + +# This shared library is present on Solaris 10 on amd64, but it's missing on +# Solaris 8 on i386. It's okay if it's missing. +ALLOWED_ORPHAN_SONAMES = set([u"libm.so.2"]) +DEPENDENCY_FILENAME_REGEXES = ( + (r".*\.pl", u"CSWperl"), + (r".*\.pm", u"CSWperl"), + (r".*\.py", u"CSWpython"), + (r".*\.rb", u"CSWruby"), +) + +REPORT_TMPL = u"""$pkgname: +#if $missing_deps +SUGGESTION: you may want to add some or all of the following as depends: + (Feel free to ignore SUNW or SPRO packages) +#for $pkg in $sorted($missing_deps) +> $pkg +#end for +#end if +#if $surplus_deps +The following packages might be unnecessary dependencies: +#for $pkg in $sorted($surplus_deps) +? $pkg +#end for +#end if +#if $orphan_sonames +The following sonames don't belong to any package: +#for $soname in $sorted($orphan_sonames) +! $soname +#end for +#end if +#if not $missing_deps and not $surplus_deps and not $orphan_sonames ++ Dependencies of $pkgname look good. +#end if +""" + +class Error(Exception): + pass + + +class ConfigurationError(Error): + pass + + +class PackageError(Error): + pass + + +def GetOptions(): + parser = optparse.OptionParser() + parser.add_option("-e", dest="extractdir", + help="The directory into which the package has been extracted") + parser.add_option("-d", "--debug", dest="debug", + default=False, action="store_true", + help="Turn on debugging messages") + (options, args) = parser.parse_args() + if not options.extractdir: + raise ConfigurationError("ERROR: -e option is missing.") + # Using set() to make the arguments unique. + return options, set(args) + + +class CheckpkgBase(object): + """This class has functionality overlapping with DirectoryFormatPackage + from the opencsw.py library. The classes should be merged. + """ + + def __init__(self, extractdir, pkgname): + self.extractdir = extractdir + self.pkgname = pkgname + self.pkgpath = os.path.join(self.extractdir, self.pkgname) + + def CheckPkgpathExists(self): + if not os.path.isdir(self.pkgpath): + raise PackageError("%s does not exist or is not a directory" + % self.pkgpath) + + def ListBinaries(self): + """Shells out to list all the binaries from a given package. + + Original checkpkg code: + + # ######################################### + # # find all executables and dynamic libs,and list their filenames. + # listbinaries() { + # if [ ! -d $1 ] ; then + # print errmsg $1 not a directory + # rm -rf $EXTRACTDIR + # exit 1 + # fi + # + # find $1 -print | xargs file |grep ELF |nawk -F: '{print $1}' + # } + """ + self.CheckPkgpathExists() + find_tmpl = "find %s -print | xargs file | grep ELF | nawk -F: '{print $1}'" + find_proc = subprocess.Popen(find_tmpl % self.pkgpath, + shell=True, stdout=subprocess.PIPE) + stdout, stderr = find_proc.communicate() + ret = find_proc.wait() + if ret: + logging.error("The find command returned an error.") + return stdout.splitlines() + + def GetAllFilenames(self): + self.CheckPkgpathExists() + file_basenames = [] + for root, dirs, files in os.walk(self.pkgpath): + file_basenames.extend(files) + return file_basenames + + def GetDependencies(self): + fd = open(os.path.join(self.pkgpath, "install", "depend"), "r") + depends = {} + for line in fd: + fields = re.split(WS_RE, line) + if fields[0] == "P": + depends[fields[1]] = " ".join(fields[1:]) + fd.close() + return depends + + def FormatDepsReport(self, missing_deps, surplus_deps, orphan_sonames): + """A intermediate version in which StringIO is used.""" + namespace = { + "pkgname": self.pkgname, + "missing_deps": missing_deps, + "surplus_deps": surplus_deps, + "orphan_sonames": orphan_sonames, + } + t = Template.Template(REPORT_TMPL, searchList=[namespace]) + return unicode(t) + + +class SystemPkgmap(object): + """A class to hold and manipulate the /var/sadm/install/contents file. + + TODO: Implement timestamp checking and refreshing the cache. + """ + + STOP_PKGS = ["SUNWbcp", "SUNWowbcp", "SUNWucb"] + CHECKPKG_DIR = ".checkpkg" + SQLITE3_DBNAME_TMPL = "var-sadm-install-contents-cache-%s" + + def __init__(self): + """There is no need to re-parse it each time. + + Read it slowly the first time and cache it for later.""" + self.cache = {} + self.checkpkg_dir = os.path.join(os.environ["HOME"], self.CHECKPKG_DIR) + self.fqdn = socket.getfqdn() + self.db_path = os.path.join(self.checkpkg_dir, + self.SQLITE3_DBNAME_TMPL % self.fqdn) + self.file_mtime = None + self.cache_mtime = None + if os.path.exists(self.db_path): + logging.debug("Connecting to the %s database.", self.db_path) + self.conn = sqlite3.connect(self.db_path) + if not self.IsDatabaseUpToDate(): + logging.warning("Rebuilding the package cache, can take a few minutes.") + self.PurgeDatabase() + self.PopulateDatabase() + else: + print "Building a cache of /var/sadm/install/contents." + print "The cache will be kept in %s." % self.db_path + if not os.path.exists(self.checkpkg_dir): + logging.debug("Creating %s", self.checkpkg_dir) + os.mkdir(self.checkpkg_dir) + self.conn = sqlite3.connect(self.db_path) + c = self.conn.cursor() + c.execute(""" + CREATE TABLE systempkgmap ( + id INTEGER PRIMARY KEY, + basename TEXT, + path TEXT, + line TEXT + ); + """) + logging.debug("Creating the config table.") + c.execute(""" + CREATE TABLE config ( + key VARCHAR(255) PRIMARY KEY, + float_value FLOAT, + str_value VARCHAR(255) + ); + """) + self.PopulateDatabase() + + def SymlinkDuringInstallation(self, p): + """Emulates the effect of some symlinks present during installations.""" + p = p.replace("/opt/csw/lib/i386", "/opt/csw/lib") + + def PopulateDatabase(self): + """Imports data into the database. + + Original bit of code from checkpkg: + + egrep -v 'SUNWbcp|SUNWowbcp|SUNWucb' /var/sadm/install/contents | + fgrep -f $EXTRACTDIR/liblist >$EXTRACTDIR/shortcatalog + """ + + system_pkgmap_fd = open(SYSTEM_PKGMAP, "r") + stop_re = re.compile("(%s)" % "|".join(self.STOP_PKGS)) + # Creating a data structure: + # soname - {: , : , ...} + logging.debug("Building sqlite3 cache db of the %s file", + SYSTEM_PKGMAP) + c = self.conn.cursor() + count = itertools.count() + for line in system_pkgmap_fd: + i = count.next() + if not i % 1000: + print "\r%s" % i, + if stop_re.search(line): + continue + fields = re.split(WS_RE, line) + pkgmap_entry_path = fields[0].split("=")[0] + pkgmap_entry_dir, pkgmap_entry_base_name = os.path.split(pkgmap_entry_path) + sql = "INSERT INTO systempkgmap (basename, path, line) VALUES (?, ?, ?);" + c.execute(sql, (pkgmap_entry_base_name, pkgmap_entry_dir, line.strip())) + print + print "Creating the main database index." + sql = "CREATE INDEX basename_idx ON systempkgmap(basename);" + c.execute(sql) + self.SetDatabaseMtime() + self.conn.commit() + + def SetDatabaseMtime(self): + c = self.conn.cursor() + sql = "DELETE FROM config WHERE key = ?;" + c.execute(sql, [CONFIG_MTIME]) + mtime = self.GetFileMtime() + logging.debug("Inserting the mtime (%s) into the database.", mtime) + sql = """ + INSERT INTO config (key, float_value) + VALUES (?, ?); + """ + c.execute(sql, [CONFIG_MTIME, mtime]) + + def GetPkgmapLineByBasename(self, filename): + if filename in self.cache: + return self.cache[filename] + sql = "SELECT path, line FROM systempkgmap WHERE basename = ?;" + c = self.conn.cursor() + c.execute(sql, [filename]) + lines = {} + for row in c: + lines[row[0]] = row[1] + if len(lines) == 0: + logging.debug("Cache doesn't contain filename %s", filename) + self.cache[filename] = lines + return lines + + def GetDatabaseMtime(self): + if not self.cache_mtime: + sql = """ + SELECT float_value FROM config + WHERE key = ?; + """ + c = self.conn.cursor() + c.execute(sql, [CONFIG_MTIME]) + row = c.fetchone() + if not row: + # raise ConfigurationError("Could not find the mtime setting") + self.cache_mtime = 1 + else: + self.cache_mtime = row[0] + return self.cache_mtime + + def GetFileMtime(self): + if not self.file_mtime: + stat_data = os.stat(SYSTEM_PKGMAP) + self.file_mtime = stat_data.st_mtime + return self.file_mtime + + def IsDatabaseUpToDate(self): + f_mtime = self.GetFileMtime() + d_mtime = self.GetDatabaseMtime() + logging.debug("f_mtime %s, d_time: %s", f_mtime, d_mtime) + return self.GetFileMtime() <= self.GetDatabaseMtime() + + def PurgeDatabase(self): + logging.info("Purging the cache database") + c = self.conn.cursor() + sql = "DELETE FROM config;" + c.execute(sql) + sql = "DELETE FROM systempkgmap;" + c.execute(sql) + sql = "DROP INDEX basename_idx;" + try: + c.execute(sql) + except sqlite3.OperationalError, e: + logging.warn(e) + +def SharedObjectDependencies(pkgname, + binaries_by_pkgname, + needed_sonames_by_binary, + pkgs_by_soname, + filenames_by_soname, + pkg_by_any_filename): + """This is one of the more obscure and more important pieces of code. + + I tried to make it simpler, but given that the operations here involve + whole sets of packages, it's not easy. + """ + so_dependencies = set() + orphan_sonames = set() + self_provided = set() + for binary in binaries_by_pkgname[pkgname]: + needed_sonames = needed_sonames_by_binary[binary][NEEDED_SONAMES] + for soname in needed_sonames: + if soname in filenames_by_soname: + filename = filenames_by_soname[soname] + pkg = pkg_by_any_filename[filename] + self_provided.add(soname) + so_dependencies.add(pkg) + elif soname in pkgs_by_soname: + so_dependencies.add(pkgs_by_soname[soname]) + else: + orphan_sonames.add(soname) + return so_dependencies, self_provided, orphan_sonames + + +def GuessDepsByFilename(pkgname, pkg_by_any_filename): + """Guesses dependencies based on filename regexes.""" + guessed_deps = set() + for pattern, dep_pkgname in DEPENDENCY_FILENAME_REGEXES: + # If any file name matches, add the dep, go to the next pattern/pkg + # combination. + pattern_re = re.compile("^%s$" % pattern) + for filename in pkg_by_any_filename: + if (re.match(pattern_re, filename) + and + pkgname == pkg_by_any_filename[filename]): + guessed_deps.add(dep_pkgname) + break + return guessed_deps + + +def GuessDepsByPkgname(pkgname, pkg_by_any_filename): + # More guessed dependencies: If one package is a substring of another, it + # might be a hint. For example, CSWmysql51test should depend on CSWmysql51. + # However, the rt (runtime) packages should not want to depend on the main + # package. + guessed_deps = set() + all_other_pkgs = set(pkg_by_any_filename.values()) + for other_pkg in all_other_pkgs: + other_pkg = unicode(other_pkg) + if pkgname == other_pkg: + continue + if pkgname.startswith(other_pkg): + endings = ["devel", "test", "bench", "dev"] + for ending in endings: + if pkgname.endswith(ending): + guessed_deps.add(other_pkg) + return guessed_deps + + +def AnalyzeDependencies(pkgname, + declared_dependencies, + binaries_by_pkgname, + needed_sonames_by_binary, + pkgs_by_soname, + filenames_by_soname, + pkg_by_any_filename): + """Gathers and merges dependency results from other functions. + + declared_dependencies: Dependencies that the package in question claims to + have. + + binaries_by_pkgname: A dictionary mapping pkgnames (CSWfoo) to binary names + (without paths) + + needed_sonames_by_binary: A dictionary mapping binary file name to + a dictionary containing: "needed sonames", + "soname", "rpath". Based on examining the binary + files within the packages. + + pkgs_by_soname: A dictionary mapping sonames to pkgnames, based on the + contents of the system wide pkgmap + (/var/sadm/install/contents) + + filenames_by_soname: A dictionary mapping shared library sonames to filenames, + based on files within packages + + pkg_by_any_filename: Mapping from file names to packages names, based on the + contents of the packages under examination. + """ + declared_dependencies_set = set(declared_dependencies) + + so_dependencies, self_provided, orphan_sonames = SharedObjectDependencies( + pkgname, + binaries_by_pkgname, + needed_sonames_by_binary, + pkgs_by_soname, + filenames_by_soname, + pkg_by_any_filename) + auto_dependencies = reduce(lambda x, y: x.union(y), + [ + so_dependencies, + GuessDepsByFilename(pkgname, pkg_by_any_filename), + GuessDepsByPkgname(pkgname, pkg_by_any_filename), + ]) + missing_deps = auto_dependencies.difference(declared_dependencies_set) + # Don't report itself as a suggested dependency. + missing_deps = missing_deps.difference(set([pkgname])) + missing_deps = missing_deps.difference(set(DO_NOT_REPORT_MISSING)) + surplus_deps = declared_dependencies_set.difference(auto_dependencies) + surplus_deps = surplus_deps.difference(DO_NOT_REPORT_SURPLUS) + orphan_sonames = orphan_sonames.difference(ALLOWED_ORPHAN_SONAMES) + return missing_deps, surplus_deps, orphan_sonames + + +def ExpandRunpath(runpath, isalist): + # Emulating $ISALIST expansion + if '$ISALIST' in runpath: + expanded_list = [runpath.replace('$ISALIST', isa) for isa in isalist] + else: + expanded_list = [runpath] + return expanded_list + +def ExpandSymlink(symlink, target, input_path): + symlink_re = re.compile(r"%s(/|$)" % symlink) + if re.search(symlink_re, input_path): + result = input_path.replace(symlink, target) + else: + result = input_path + return result + +def Emulate64BitSymlinks(runpath_list): + """Need to emulate the 64 -> amd64, 64 -> sparcv9 symlink + + Since we don't know the architecture, we'll adding both amd64 and sparcv9. + It should be safe. + """ + symlinked_list = [] + for runpath in runpath_list: + for symlink, expansion_list in SYSTEM_SYMLINKS: + for target in expansion_list: + expanded = ExpandSymlink(symlink, target, runpath) + if expanded not in symlinked_list: + symlinked_list.append(expanded) + return symlinked_list + + +def SanitizeRunpath(runpath): + ok = False + while True: + if runpath.endswith("/"): + runpath = runpath[:-1] + elif "//" in runpath: + runpath = runpath.replace("//", "/") + else: + break + return runpath + + +def GetLinesBySoname(pkgmap, needed_sonames, runpath_by_needed_soname, isalist): + """Works out which system pkgmap lines correspond to given sonames.""" + lines_by_soname = {} + for soname in needed_sonames: + # This is the critical part of the algorithm: it iterates over the + # runpath and finds the first matching one. + runpath_found = False + for runpath in runpath_by_needed_soname[soname]: + runpath = SanitizeRunpath(runpath) + runpath_list = ExpandRunpath(runpath, isalist) + runpath_list = Emulate64BitSymlinks(runpath_list) + soname_runpath_data = pkgmap.GetPkgmapLineByBasename(soname) + # Emulating the install time symlinks, for instance, if the prototype contains + # /opt/csw/lib/i386/foo.so.0 and /opt/csw/lib/i386 is a symlink to ".", + # the shared library ends up in /opt/csw/lib/foo.so.0 and should be findable even when + # RPATH does not contain $ISALIST. + new_soname_runpath_data = {} + for p in soname_runpath_data: + expanded_p_list = Emulate64BitSymlinks([p]) + for expanded_p in expanded_p_list: + new_soname_runpath_data[expanded_p] = soname_runpath_data[p] + soname_runpath_data = new_soname_runpath_data + + logging.debug("%s: will be looking for %s in %s" % + (soname, runpath_list, soname_runpath_data.keys())) + for runpath_expanded in runpath_list: + if runpath_expanded in soname_runpath_data: + lines_by_soname[soname] = soname_runpath_data[runpath_expanded] + runpath_found = True + # This break only goes out of the inner loop, + # need another one below to finish the outer loop. + break + if runpath_found: + break + return lines_by_soname + + +def BuildIndexesBySoname(needed_sonames_by_binary): + """Builds data structures indexed by soname. + + Building indexes + {"foo.so": ["/opt/csw/lib/gcc4", "/opt/csw/lib", ...], + ... + } + """ + needed_sonames = set() + binaries_by_soname = {} + runpath_by_needed_soname = {} + for binary_name, data in needed_sonames_by_binary.iteritems(): + for soname in data[NEEDED_SONAMES]: + needed_sonames.add(soname) + if soname not in runpath_by_needed_soname: + runpath_by_needed_soname[soname] = [] + runpath_by_needed_soname[soname].extend(data[RUNPATH]) + if soname not in binaries_by_soname: + binaries_by_soname[soname] = set() + binaries_by_soname[soname].add(binary_name) + return needed_sonames, binaries_by_soname, runpath_by_needed_soname + + +def ParseDumpOutput(dump_output): + binary_data = {RUNPATH: [], + NEEDED_SONAMES: []} + for line in dump_output.splitlines(): + fields = re.split(WS_RE, line) + # TODO: Make it a unit test + # logging.debug("%s says: %s", DUMP_BIN, fields) + if len(fields) < 3: + continue + if fields[1] == "NEEDED": + binary_data[NEEDED_SONAMES].append(fields[2]) + elif fields[1] == "RUNPATH": + binary_data[RUNPATH].extend(fields[2].split(":")) + elif fields[1] == "SONAME": + binary_data[SONAME] = fields[2] + # Adding the default runtime path search option. + binary_data[RUNPATH].append("/usr/lib/$ISALIST") + binary_data[RUNPATH].append("/usr/lib") + binary_data[RUNPATH].append("/lib/$ISALIST") + binary_data[RUNPATH].append("/lib") + return binary_data Deleted: csw/mgar/gar/v2/lib/python/checkpkg_test.py =================================================================== --- csw/mgar/gar/v2-dirpackage/lib/python/checkpkg_test.py 2010-01-26 10:26:12 UTC (rev 8180) +++ csw/mgar/gar/v2/lib/python/checkpkg_test.py 2010-01-26 10:43:08 UTC (rev 8181) @@ -1,589 +0,0 @@ -#!/opt/csw/bin/python2.6 -# $Id$ - -import unittest -import mox -import difflib -import checkpkg -import testdata.checkpkg_test_data_CSWmysql51rt as d1 -import testdata.checkpkg_test_data_CSWmysql51client as d2 -import testdata.checkpkg_test_data_CSWmysql51 as d3 -import testdata.checkpkg_test_data_CSWmysql51devel as d4 -import testdata.checkpkg_test_data_CSWlibpq_84 as d5 -import testdata.checkpkg_test_data_CSWmysql5client_8x as d6 -import testdata.checkpkg_test_data_CSWpostfix as d7 -import testdata.dump_output_1 as dump_1 -import testdata.dump_output_2 as dump_2 - -"""A set of unit tests for the library checking code. - -A bunch of lines to test in the interactive Python shell. - -import sys -sys.path.append("gar/bin/checkpkg.d") -import checkpkg -import testdata.checkpkg_test_data_CSWmysql5client_8x as d6 - -checkpkg.SharedObjectDependencies("CSWmysql5client", -d6.DATA_BINARIES_BY_PKGNAME, d6.DATA_NEEDED_SONAMES_BY_BINARY, -d6.DATA_PKGS_BY_FILENAME, d6.DATA_FILENAMES_BY_SONAME, -d6.DATA_PKG_BY_ANY_FILENAME) - -sqlite3 ~/.checkpkg/var-sadm-install-contents-cache-build8x -SELECT * FROM systempkgmap WHERE basename = 'libncursesw.so.5'; -""" - -class DependenciesUnitTest_1(unittest.TestCase): - - def setUp(self): - self.missing_deps, self.surplus_deps, self.orphan_sonames = checkpkg.AnalyzeDependencies( - d1.DATA_PKGNAME, - d1.DATA_DECLARED_DEPENDENCIES, - d1.DATA_BINARIES_BY_PKGNAME, - d1.DATA_NEEDED_SONAMES_BY_BINARY, - d1.DATA_PKGS_BY_FILENAME, - d1.DATA_FILENAMES_BY_SONAME, - d1.DATA_PKG_BY_ANY_FILENAME, - ) - - def testSurplusDeps(self): - self.assertEquals(set([]), self.surplus_deps) - - def testOrphanSonames(self): - self.assertEquals(set([]), self.orphan_sonames) - - def testMissingDeps(self): - expected = set([]) - self.assertEquals(expected, self.missing_deps) - - -class DependenciesUnitTest_2(unittest.TestCase): - - def setUp(self): - self.missing_deps, self.surplus_deps, self.orphan_sonames = checkpkg.AnalyzeDependencies( - d2.DATA_PKGNAME, - d2.DATA_DECLARED_DEPENDENCIES, - d2.DATA_BINARIES_BY_PKGNAME, - d2.DATA_NEEDED_SONAMES_BY_BINARY, - d2.DATA_PKGS_BY_FILENAME, - d2.DATA_FILENAMES_BY_SONAME, - d2.DATA_PKG_BY_ANY_FILENAME, - ) - - def testSurplusDeps(self): - self.assertEquals(set([]), self.surplus_deps) - - def testOrphanSonames(self): - self.assertEquals(set([]), self.orphan_sonames) - - def testMissingDeps(self): - expected = set([]) - self.assertEquals(expected, self.missing_deps) - - -class DependenciesUnitTest_3(unittest.TestCase): - - def setUp(self): - self.missing_deps, self.surplus_deps, self.orphan_sonames = checkpkg.AnalyzeDependencies( - d3.DATA_PKGNAME, - d3.DATA_DECLARED_DEPENDENCIES, - d3.DATA_BINARIES_BY_PKGNAME, - d3.DATA_NEEDED_SONAMES_BY_BINARY, - d3.DATA_PKGS_BY_FILENAME, - d3.DATA_FILENAMES_BY_SONAME, - d3.DATA_PKG_BY_ANY_FILENAME, - ) - - def testSurplusDeps(self): - self.assertEquals(set([u'CSWmysql51client']), self.surplus_deps) - - def testOrphanSonames(self): - self.assertEquals(set([]), self.orphan_sonames) - - def testMissingDeps(self): - expected = set(['CSWmysql51rt']) - self.assertEquals(expected, self.missing_deps) - - -class DependenciesUnitTest_4(unittest.TestCase): - - def setUp(self): - self.missing_deps, self.surplus_deps, self.orphan_sonames = checkpkg.AnalyzeDependencies( - d4.DATA_PKGNAME, - d4.DATA_DECLARED_DEPENDENCIES, - d4.DATA_BINARIES_BY_PKGNAME, - d4.DATA_NEEDED_SONAMES_BY_BINARY, - d4.DATA_PKGS_BY_FILENAME, - d4.DATA_FILENAMES_BY_SONAME, - d4.DATA_PKG_BY_ANY_FILENAME, - ) - - def testSurplusDeps(self): - self.assertEquals(set([]), self.surplus_deps) - - def testOrphanSonames(self): - self.assertEquals(set([]), self.orphan_sonames) - - def testMissingDeps(self): - expected = set([]) - self.assertEquals(expected, self.missing_deps) - - -class DependenciesUnitTest_5(unittest.TestCase): - - def setUp(self): - self.missing_deps, self.surplus_deps, self.orphan_sonames = checkpkg.AnalyzeDependencies( - d5.DATA_PKGNAME, - d5.DATA_DECLARED_DEPENDENCIES, - d5.DATA_BINARIES_BY_PKGNAME, - d5.DATA_NEEDED_SONAMES_BY_BINARY, - d5.DATA_PKGS_BY_FILENAME, - d5.DATA_FILENAMES_BY_SONAME, - d5.DATA_PKG_BY_ANY_FILENAME, - ) - - def testSurplusDeps(self): - self.assertEquals(set([]), self.surplus_deps) - - def testOrphanSonames(self): - self.assertEquals(set([]), self.orphan_sonames) - - def testMissingDeps(self): - # This tends to report itself... - expected = set([u'SUNWgss']) - self.assertEquals(expected, self.missing_deps) - - -class DependenciesUnitTest_6(unittest.TestCase): - - def setUp(self): - (self.missing_deps, - self.surplus_deps, - self.orphan_sonames) = checkpkg.AnalyzeDependencies( - d6.DATA_PKGNAME, - d6.DATA_DECLARED_DEPENDENCIES, - d6.DATA_BINARIES_BY_PKGNAME, - d6.DATA_NEEDED_SONAMES_BY_BINARY, - d6.DATA_PKGS_BY_FILENAME, - d6.DATA_FILENAMES_BY_SONAME, - d6.DATA_PKG_BY_ANY_FILENAME, - ) - - def testSurplusDeps(self): - self.assertEquals(set([]), self.surplus_deps) - - def testOrphanSonames(self): - self.assertEquals(set([]), self.orphan_sonames) - - def testMissingDeps(self): - expected = set([]) - self.assertEquals(expected, self.missing_deps) - - -class DependenciesUnitTest_7(unittest.TestCase): - - def setUp(self): - (self.missing_deps, - self.surplus_deps, - self.orphan_sonames) = checkpkg.AnalyzeDependencies( - d7.DATA_PKGNAME, - d7.DATA_DECLARED_DEPENDENCIES, - d7.DATA_BINARIES_BY_PKGNAME, - d7.DATA_NEEDED_SONAMES_BY_BINARY, - d7.DATA_PKGS_BY_FILENAME, - d7.DATA_FILENAMES_BY_SONAME, - d7.DATA_PKG_BY_ANY_FILENAME, - ) - - def testSurplusDeps(self): - self.assertEquals(set([]), self.surplus_deps) - - def testOrphanSonames(self): - self.assertEquals(set([]), self.orphan_sonames) - - def testMissingDeps(self): - expected = set([]) - self.assertEquals(expected, self.missing_deps) - - -class GuessDepsUnitTest(unittest.TestCase): - - def testGuessDepsByFilename1(self): - expected = set([u"CSWpython"]) - pkgname = u"CSWfoo" - pkg_by_filename = { - "/opt/csw/bin/bar": u"CSWfoo", - "/opt/csw/lib/python/site-packages/foo.py": u"CSWfoo", - } - self.assertEqual(expected, - checkpkg.GuessDepsByFilename(pkgname, pkg_by_filename)) - - def testGuessDepsByFilename2(self): - expected = set([]) - pkgname = u"CSWfoo" - pkg_by_filename = { - "/opt/csw/bin/bar": u"CSWfoo", - "/opt/csw/lib/python/site-packages/foo.py": u"CSWbar", - } - self.assertEqual(expected, - checkpkg.GuessDepsByFilename(pkgname, pkg_by_filename)) - - def testGuessDepsByPkgname1(self): - expected = set([u"CSWfoo"]) - pkgname = u"CSWfoo-devel" - pkg_by_filename = { - "/opt/csw/bin/bar": u"CSWfoo", - "/opt/csw/bin/barfoo": u"CSWfoobar", - "/opt/csw/lib/python/site-packages/foo.py": u"CSWfoo", - } - self.assertEqual(expected, - checkpkg.GuessDepsByPkgname(pkgname, pkg_by_filename)) - - def testGuessDepsByPkgname2(self): - expected = set([]) - pkgname = u"CSWzfoo-devel" - pkg_by_filename = { - "/opt/csw/bin/bar": u"CSWfoo", - "/opt/csw/bin/barfoo": u"CSWfoobar", - "/opt/csw/lib/python/site-packages/foo.py": u"CSWfoo", - } - self.assertEqual(expected, - checkpkg.GuessDepsByPkgname(pkgname, pkg_by_filename)) - - def testGuessDepsByPkgname3(self): - self.assertEqual(set([u"CSWmysql51"]), - checkpkg.GuessDepsByPkgname(u"CSWmysql51devel", - d4.DATA_PKG_BY_ANY_FILENAME)) - - def testGuessDepsByPkgname4(self): - data1 = set(['CSWmysql51', 'CSWmysql51rt', 'CSWmysql51test', - 'CSWmysql51client', 'CSWmysql51bench', 'CSWmysql51devel']) - data2 = dict(((x, x) for x in data1)) - self.assertEqual(set([u"CSWmysql51"]), checkpkg.GuessDepsByPkgname(u"CSWmysql51devel", data2)) - - def testGuessDepsByPkgname4(self): - data1 = set(['CSWmysql51', 'CSWmysql51rt', 'CSWmysql51test', - 'CSWmysql51client', 'CSWmysql51bench', 'CSWmysql51devel']) - data2 = dict(((x, x) for x in data1)) - self.assertEqual(set([]), checkpkg.GuessDepsByPkgname(u"CSWmysql51rt", data2)) - - -class GetLinesBySonameUnitTest(unittest.TestCase): - - class PkgmapStub(object): - - def __init__(self, cache): - self.cache = cache - - def GetPkgmapLineByBasename(self, soname): - return self.cache[soname] - - def setUp(self): - self.pkgmap_mocker = mox.Mox() - - def testExpandRunpath_1(self): - isalist = ["foo", "bar"] - runpath = "/opt/csw/lib/$ISALIST" - expected = ["/opt/csw/lib/foo", "/opt/csw/lib/bar"] - self.assertEquals(expected, checkpkg.ExpandRunpath(runpath, isalist)) - - def testExpandRunpath_2(self): - isalist = ["foo", "bar"] - runpath = "/opt/csw/mysql5/lib/$ISALIST/mysql" - expected = ["/opt/csw/mysql5/lib/foo/mysql", "/opt/csw/mysql5/lib/bar/mysql"] - self.assertEquals(expected, checkpkg.ExpandRunpath(runpath, isalist)) - - def testEmulate64BitSymlinks_1(self): - runpath_list = ["/opt/csw/mysql5/lib/foo/mysql/64"] - expected = "/opt/csw/mysql5/lib/foo/mysql/amd64" - self.assertTrue(expected in checkpkg.Emulate64BitSymlinks(runpath_list)) - - def testEmulate64BitSymlinks_2(self): - runpath_list = ["/opt/csw/mysql5/lib/64/mysql/foo"] - expected = "/opt/csw/mysql5/lib/amd64/mysql/foo" - result = checkpkg.Emulate64BitSymlinks(runpath_list) - self.assertTrue(expected in result, "%s not in %s" % (expected, result)) - - def testEmulate64BitSymlinks_3(self): - runpath_list = ["/opt/csw/mysql5/lib/64/mysql/foo"] - expected = "/opt/csw/mysql5/lib/sparcv9/mysql/foo" - result = checkpkg.Emulate64BitSymlinks(runpath_list) - self.assertTrue(expected in result, "%s not in %s" % (expected, result)) - - def testEmulate64BitSymlinks_4(self): - """No repeated paths because of symlink expansion""" - runpath_list = ["/opt/csw/lib"] - expected = "/opt/csw/lib" - result = checkpkg.Emulate64BitSymlinks(runpath_list) - self.assertEquals(1, len(result), "len(%s) != %s" % (result, 1)) - - def testEmulateSymlinks_3(self): - runpath_list = ["/opt/csw/bdb4"] - expected = "/opt/csw/bdb42" - result = checkpkg.Emulate64BitSymlinks(runpath_list) - self.assertTrue(expected in result, "%s not in %s" % (expected, result)) - - def testEmulateSymlinks_4(self): - runpath_list = ["/opt/csw/bdb42"] - expected = "/opt/csw/bdb42" - not_expected = "/opt/csw/bdb422" - result = checkpkg.Emulate64BitSymlinks(runpath_list) - self.assertTrue(expected in result, "%s not in %s" % (expected, result)) - self.assertFalse(not_expected in result, "%s is in %s" % (not_expected, result)) - - def testEmulateSymlinks_5(self): - """Install time symlink expansion.""" - runpath_list = ["/opt/csw/lib/i386"] - expected = "/opt/csw/lib" - result = checkpkg.Emulate64BitSymlinks(runpath_list) - self.assertTrue(expected in result, "%s not in %s" % (expected, result)) - - def testEmulateSymlinks_6(self): - """ExpandSymlink for /opt/csw/lib/i386.""" - runpath_list = ["/opt/csw/lib/i386"] - expected = "/opt/csw/lib" - not_expected = "/opt/csw/lib/i386" - result = checkpkg.ExpandSymlink("/opt/csw/lib/i386", "/opt/csw/lib", "/opt/csw/lib/i386") - self.assertTrue(expected in result, "%s not in %s" % (expected, result)) - self.assertFalse(not_expected in result, "%s is in %s" % (not_expected, result)) - - def testGetLinesBySoname(self): - expected = {'foo.so.1': '/opt/csw/lib/isa-value-1/foo.so.1 foo'} - pkgmap = self.pkgmap_mocker.CreateMock(checkpkg.SystemPkgmap) - pkgmap.GetPkgmapLineByBasename("foo") - lines1 = {"/opt/csw/lib/isa-value-1": "/opt/csw/lib/isa-value-1/foo.so.1 foo", - "/usr/lib": "/usr/lib/foo.so.1 foo"} - # pkgmap.GetPkgmapLineByBasename("foo.so.1").AndReturn(lines1) - pkgmap.GetPkgmapLineByBasename("foo.so.1").AndReturn(lines1) - self.pkgmap_mocker.ReplayAll() - pkgmap.GetPkgmapLineByBasename("foo") - needed_sonames = set(["foo.so.1"]) - runpath_by_needed_soname = {"foo.so.1": ["/opt/csw/lib/$ISALIST", "/usr/lib"]} - isalist = ["isa-value-1", "isa-value-2"] - result = checkpkg.GetLinesBySoname(pkgmap, needed_sonames, runpath_by_needed_soname, isalist) - self.pkgmap_mocker.VerifyAll() - self.assertEqual(expected, result) - - def testGetLinesBySoname_3(self): - expected = {'foo.so.1': '/opt/csw/lib/isa-value-1/foo.so.1 foo'} - pkgmap = self.pkgmap_mocker.CreateMock(checkpkg.SystemPkgmap) - pkgmap.GetPkgmapLineByBasename("foo") - lines1 = { - "/opt/csw/lib/isa-value-1": "/opt/csw/lib/isa-value-1/foo.so.1 foo", - "/opt/csw/lib": "/opt/csw/lib/foo.so.1 foo", - "/usr/lib": "/usr/lib/foo.so.1 foo"} - # pkgmap.GetPkgmapLineByBasename("foo.so.1").AndReturn(lines1) - pkgmap.GetPkgmapLineByBasename("foo.so.1").AndReturn(lines1) - self.pkgmap_mocker.ReplayAll() - pkgmap.GetPkgmapLineByBasename("foo") - needed_sonames = set(["foo.so.1"]) - runpath_by_needed_soname = { - "foo.so.1": ["/opt/csw/lib/$ISALIST", "/usr/lib"]} - isalist = ["isa-value-1", "isa-value-2"] - result = checkpkg.GetLinesBySoname( - pkgmap, needed_sonames, runpath_by_needed_soname, isalist) - self.pkgmap_mocker.VerifyAll() - self.assertEqual(expected, result) - - def testGetLinesBySoname_4(self): - """A more complex test, four ISAs.""" @@ Diff output truncated at 100000 characters. @@ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Tue Jan 26 16:16:58 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Tue, 26 Jan 2010 15:16:58 +0000 Subject: [csw-devel] SF.net SVN: gar:[8184] csw/mgar/gar/v2 Message-ID: Revision: 8184 http://gar.svn.sourceforge.net/gar/?rev=8184&view=rev Author: wahwah Date: 2010-01-26 15:16:53 +0000 (Tue, 26 Jan 2010) Log Message: ----------- mGAR v2: checkpkg, introduce abstractions to reduce the amount of boilerplate code per module. Modified Paths: -------------- csw/mgar/gar/v2/bin/checkpkg csw/mgar/gar/v2/bin/checkpkg.d/checkpkg-libs.py csw/mgar/gar/v2/bin/checkpkg.d/checkpkg-obsolete-deps.py csw/mgar/gar/v2/bin/checkpkg.d/checkpkg-you-can-write-your-own.py csw/mgar/gar/v2/lib/python/checkpkg.py csw/mgar/gar/v2/lib/python/opencsw.py Modified: csw/mgar/gar/v2/bin/checkpkg =================================================================== --- csw/mgar/gar/v2/bin/checkpkg 2010-01-26 10:44:58 UTC (rev 8183) +++ csw/mgar/gar/v2/bin/checkpkg 2010-01-26 15:16:53 UTC (rev 8184) @@ -599,11 +599,11 @@ echo for log_file in ${log_files}; do if [[ -s "${log_file}" ]]; then - debugmsg "LOG START: ${log_file}" - debugmsg + debugmsg ">> LOG START: ${log_file}" cat "${log_file}" - debugmsg - debugmsg "LOG END: ${log_file}" + debugmsg "<< LOG END: ${log_file}" + else + debugmsg "-- LOG ${log_file} is empty" fi done echo Modified: csw/mgar/gar/v2/bin/checkpkg.d/checkpkg-libs.py =================================================================== --- csw/mgar/gar/v2/bin/checkpkg.d/checkpkg-libs.py 2010-01-26 10:44:58 UTC (rev 8183) +++ csw/mgar/gar/v2/bin/checkpkg.d/checkpkg-libs.py 2010-01-26 15:16:53 UTC (rev 8184) @@ -24,6 +24,7 @@ "..", "..", "lib", "python"] sys.path.append(os.path.join(*path_list)) import checkpkg +import opencsw DUMP_BIN = "/usr/ccs/bin/dump" @@ -164,7 +165,8 @@ dependent_pkgs = {} for checker in checkers: pkgname = checker.pkgname - declared_dependencies = checker.GetDependencies() + dir_format_pkg = opencsw.DirectoryFormatPackage(checker.pkgpath) + declared_dependencies = dir_format_pkg.GetDependencies() if options.debug: sanitized_pkgname = pkgname.replace("-", "_") data_file_name = "/var/tmp/checkpkg_test_data_%s.py" % sanitized_pkgname Modified: csw/mgar/gar/v2/bin/checkpkg.d/checkpkg-obsolete-deps.py =================================================================== --- csw/mgar/gar/v2/bin/checkpkg.d/checkpkg-obsolete-deps.py 2010-01-26 10:44:58 UTC (rev 8183) +++ csw/mgar/gar/v2/bin/checkpkg.d/checkpkg-obsolete-deps.py 2010-01-26 15:16:53 UTC (rev 8184) @@ -1,6 +1,9 @@ #!/opt/csw/bin/python2.6 # $Id$ +"""Makes sure that obsolete packages are not added as dependencies. +""" + import logging import os.path import sys @@ -24,27 +27,37 @@ }, } +def CheckObsoleteDeps(pkg): + """Checks for obsolete dependencies.""" + errors = [] + deps = set(pkg.GetDependencies()) + obsolete_pkg_deps = deps.intersection(set(OBSOLETE_DEPS)) + if obsolete_pkg_deps: + for obsolete_pkg in obsolete_pkg_deps: + errors.append( + checkpkg.PackageError( + "Package %s should not depend on %s." + % (pkg.pkgname, obsolete_pkg))) + if "hint" in OBSOLETE_DEPS[obsolete_pkg]: + errors.append( + checkpkg.PackageError("Hint: %s" % OBSOLETE_DEPS[obsolete_pkg]["hint"])) + if "url" in OBSOLETE_DEPS[obsolete_pkg]: + errors.append( + checkpkg.PackageError("URL: %s" % OBSOLETE_DEPS[obsolete_pkg]["url"])) + return errors + + def main(): options, args = checkpkg.GetOptions() - ok = True - for pkgname in args: - pkgpath = os.path.join(options.extractdir, pkgname) - checker = checkpkg.CheckpkgBase(options.extractdir, pkgname) - deps = set(checker.GetDependencies()) - obsolete_pkg_deps = deps.intersection(set(OBSOLETE_DEPS)) - if obsolete_pkg_deps: - ok = False - for pkg in obsolete_pkg_deps: - print ("ERROR: Package %s should not depend on %s." - % (checker.pkgname, pkg)) - if "hint" in OBSOLETE_DEPS[pkg]: - print "Hint:", OBSOLETE_DEPS[pkg]["hint"] - if "url" in OBSOLETE_DEPS[pkg]: - print "URL:", OBSOLETE_DEPS[pkg]["url"] - if ok: - sys.exit(0) - else: - sys.exit(1) + pkgnames = args + check_manager = checkpkg.CheckpkgManager("obsolete dependencies", + options.extractdir, + pkgnames, + options.debug) + check_manager.RegisterIndividualCheck(CheckObsoleteDeps) + exit_code, report = check_manager.Run() + print report.strip() + sys.exit(exit_code) if __name__ == '__main__': Modified: csw/mgar/gar/v2/bin/checkpkg.d/checkpkg-you-can-write-your-own.py =================================================================== --- csw/mgar/gar/v2/bin/checkpkg.d/checkpkg-you-can-write-your-own.py 2010-01-26 10:44:58 UTC (rev 8183) +++ csw/mgar/gar/v2/bin/checkpkg.d/checkpkg-you-can-write-your-own.py 2010-01-26 15:16:53 UTC (rev 8184) @@ -18,16 +18,51 @@ sys.path.append(os.path.join(*path_list)) import checkpkg +# Defining checking functions. + +def CheckIndividualPackage(pkg): + """Checks an individual package. + + Gets a DirctoryFormatPackage as an argument, and returns a list of errors. + + Errors should be a list of checkpkg.PackageError objects: + + errors.append(checkpkg.PackageError("There's something wrong.")) + """ + errors = [] + # Checking code for an individual package goes here. + return errors + + +def CheckAsetOfPackages(pkgs): + """Checks a set of packages. + + Sometimes individual checks aren't enough. If you need to write code which + needs to examine multiple packages at the same time, use this function. + + Gets a list of packages. + """ + errors = [] + # Checking code goes here. + return errors + + def main(): options, args = checkpkg.GetOptions() - if not os.path.isdir(options.extractdir): - raise checkpkg.PackageError("The extract base directory doesn't exist: %s" % options.extractdir) - for pkgname in args: - pkgpath = os.path.join(options.extractdir, pkgname) - if not os.path.isdir(pkgpath): - raise checkpkg.PackageError("The package directory doesn't exist: %s" % pkgpath) - logging.debug("Dummy plugin says the package %s is extracted to %s", - pkgname, options.extractdir) + pkgnames = args + # CheckpkgManager class abstracts away things such as the collection of + # results. + check_manager = checkpkg.CheckpkgManager("a template of a checkpkg module", + options.extractdir, + pkgnames, + options.debug) + # Registering previously defined checks. + check_manager.RegisterIndividualCheck(CheckIndividualPackage) + check_manager.RegisterSetCheck(CheckAsetOfPackages) + # Running the checks, reporting and exiting. + exit_code, report = check_manager.Run() + print report.strip() + sys.exit(exit_code) if __name__ == '__main__': Modified: csw/mgar/gar/v2/lib/python/checkpkg.py =================================================================== --- csw/mgar/gar/v2/lib/python/checkpkg.py 2010-01-26 10:44:58 UTC (rev 8183) +++ csw/mgar/gar/v2/lib/python/checkpkg.py 2010-01-26 15:16:53 UTC (rev 8184) @@ -14,6 +14,7 @@ import subprocess import StringIO from Cheetah import Template +import opencsw SYSTEM_PKGMAP = "/var/sadm/install/contents" WS_RE = re.compile(r"\s+") @@ -66,6 +67,18 @@ #end if """ +ERROR_REPORT_TMPL = u"""#if $errors +ERROR: One or more errors have been found by $name. +#for $error in $errors +$repr($error) +#end for +#else +#if $debug +OK: $name found no problems. +#end if +#end if +""" + class Error(Exception): pass @@ -141,18 +154,8 @@ file_basenames.extend(files) return file_basenames - def GetDependencies(self): - fd = open(os.path.join(self.pkgpath, "install", "depend"), "r") - depends = {} - for line in fd: - fields = re.split(WS_RE, line) - if fields[0] == "P": - depends[fields[1]] = " ".join(fields[1:]) - fd.close() - return depends - def FormatDepsReport(self, missing_deps, surplus_deps, orphan_sonames): - """A intermediate version in which StringIO is used.""" + """To be removed.""" namespace = { "pkgname": self.pkgname, "missing_deps": missing_deps, @@ -567,3 +570,48 @@ binary_data[RUNPATH].append("/lib/$ISALIST") binary_data[RUNPATH].append("/lib") return binary_data + + +class CheckpkgManager(object): + """Takes care of calling checking functions""" + + def __init__(self, name, extractdir, pkgname_list, debug=False): + self.debug = debug + self.name = name + self.extractdir = extractdir + self.pkgname_list = pkgname_list + self.errors = [] + self.individual_checks = [] + self.set_checks = [] + self.packages = [] + + def RegisterIndividualCheck(self, function): + self.individual_checks.append(function) + + def RegisterSetCheck(self, function): + self.set_checks.append(function) + + def Run(self): + """Runs all the checks + + Returns a tuple of an exit code and a report. + """ + packages = [] + errors = [] + for pkgname in self.pkgname_list: + pkg_path = os.path.join(self.extractdir, pkgname) + packages.append(opencsw.DirectoryFormatPackage(pkg_path)) + for pkg in packages: + for function in self.individual_checks: + errors.extend(function(pkg)) + # Set checks + for function in self.set_checks: + errors.extend(function(packages)) + namespace = { + "name": self.name, + "errors": errors, + "debug": self.debug, + } + t = Template.Template(ERROR_REPORT_TMPL, searchList=[namespace]) + exit_code = bool(errors) + return (exit_code, unicode(t)) Modified: csw/mgar/gar/v2/lib/python/opencsw.py =================================================================== --- csw/mgar/gar/v2/lib/python/opencsw.py 2010-01-26 10:44:58 UTC (rev 8183) +++ csw/mgar/gar/v2/lib/python/opencsw.py 2010-01-26 15:16:53 UTC (rev 8184) @@ -35,6 +35,8 @@ REVISION_ADDED = "revision number added" PKG_URL_TMPL = "http://www.opencsw.org/packages/%s" CATALOG_URL = "http://mirror.opencsw.org/opencsw/current/i386/5.10/catalog" +WS_RE = re.compile(r"\s+") + ADMIN_FILE_CONTENT = """ basedir=default runlevel=nocheck @@ -52,6 +54,7 @@ keystore=/var/sadm/security proxy= """ + EMAIL_TMPL = """From: %(from)s To: %(to)s Cc: %(cc)s @@ -616,6 +619,17 @@ pkginfo_name = "%s - %s" % (catalog_name, description) self.SetPkginfoEntry("NAME", pkginfo_name) + def GetDependencies(self): + fd = open(os.path.join(self.directory, "install", "depend"), "r") + depends = {} + for line in fd: + fields = re.split(WS_RE, line) + if fields[0] == "P": + depends[fields[1]] = " ".join(fields[1:]) + fd.close() + return depends + + class Pkgmap(object): def __init__(self, input, permissions=False, This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Tue Jan 26 17:31:51 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Tue, 26 Jan 2010 16:31:51 +0000 Subject: [csw-devel] SF.net SVN: gar:[8185] csw/mgar/gar/v2/gar.pkg.mk Message-ID: Revision: 8185 http://gar.svn.sourceforge.net/gar/?rev=8185&view=rev Author: wahwah Date: 2010-01-26 16:31:47 +0000 (Tue, 26 Jan 2010) Log Message: ----------- mGAR v2: ENABLE_CHECK was not taking effect, reverting the change of the v2-dirpackage merge. Modified Paths: -------------- csw/mgar/gar/v2/gar.pkg.mk Modified: csw/mgar/gar/v2/gar.pkg.mk =================================================================== --- csw/mgar/gar/v2/gar.pkg.mk 2010-01-26 15:16:53 UTC (rev 8184) +++ csw/mgar/gar/v2/gar.pkg.mk 2010-01-26 16:31:47 UTC (rev 8185) @@ -693,7 +693,7 @@ # We depend on extract as the additional package files (like .gspec) must be # unpacked to global/ for packaging. E. g. 'merge' depends only on the specific # modulations and does not fill global/. -_package: ENABLE_CHECK ?= 1 +ENABLE_CHECK ?= 1 _package: validateplatform extract-global merge $(SPKG_DESTDIRS) pre-package $(PACKAGE_TARGETS) post-package $(if $(ENABLE_CHECK),pkgcheck) @$(MAKECOOKIE) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Tue Jan 26 17:33:01 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Tue, 26 Jan 2010 16:33:01 +0000 Subject: [csw-devel] SF.net SVN: gar:[8186] csw/mgar/gar/v2/lib/python/checkpkg.py Message-ID: Revision: 8186 http://gar.svn.sourceforge.net/gar/?rev=8186&view=rev Author: wahwah Date: 2010-01-26 16:32:54 +0000 (Tue, 26 Jan 2010) Log Message: ----------- mGAR v2: Making the library report more GAR-friendly, by printing code ready to copy/paste. Modified Paths: -------------- csw/mgar/gar/v2/lib/python/checkpkg.py Modified: csw/mgar/gar/v2/lib/python/checkpkg.py =================================================================== --- csw/mgar/gar/v2/lib/python/checkpkg.py 2010-01-26 16:31:47 UTC (rev 8185) +++ csw/mgar/gar/v2/lib/python/checkpkg.py 2010-01-26 16:32:54 UTC (rev 8186) @@ -42,28 +42,28 @@ (r".*\.rb", u"CSWruby"), ) -REPORT_TMPL = u"""$pkgname: +REPORT_TMPL = u"""# $pkgname: #if $missing_deps -SUGGESTION: you may want to add some or all of the following as depends: - (Feel free to ignore SUNW or SPRO packages) +# SUGGESTION: you may want to add some or all of the following as depends: +# (Feel free to ignore SUNW or SPRO packages) #for $pkg in $sorted($missing_deps) -> $pkg +REQUIRED_PKGS_$pkgname += $pkg #end for #end if #if $surplus_deps -The following packages might be unnecessary dependencies: +# The following dependencies might be unnecessary: #for $pkg in $sorted($surplus_deps) -? $pkg +# ? $pkg #end for #end if #if $orphan_sonames -The following sonames don't belong to any package: +# The following required sonames would not be found at runtime: #for $soname in $sorted($orphan_sonames) -! $soname +# ! $soname #end for #end if #if not $missing_deps and not $surplus_deps and not $orphan_sonames -+ Dependencies of $pkgname look good. +# + Dependencies of $pkgname look good. #end if """ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Tue Jan 26 17:46:46 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Tue, 26 Jan 2010 16:46:46 +0000 Subject: [csw-devel] SF.net SVN: gar:[8187] csw/mgar/gar/v2/lib/python Message-ID: Revision: 8187 http://gar.svn.sourceforge.net/gar/?rev=8187&view=rev Author: wahwah Date: 2010-01-26 16:46:41 +0000 (Tue, 26 Jan 2010) Log Message: ----------- mGAR v2: checkpkg, updating the test data. Modified Paths: -------------- csw/mgar/gar/v2/lib/python/checkpkg_test.py csw/mgar/gar/v2/lib/python/opencsw_test.py Added Paths: ----------- csw/mgar/gar/v2/lib/python/testdata/example-catalog.txt Modified: csw/mgar/gar/v2/lib/python/checkpkg_test.py =================================================================== --- csw/mgar/gar/v2/lib/python/checkpkg_test.py 2010-01-26 16:32:54 UTC (rev 8186) +++ csw/mgar/gar/v2/lib/python/checkpkg_test.py 2010-01-26 16:46:41 UTC (rev 8187) @@ -558,16 +558,16 @@ orphan_sonames = set([u'libm.so.2']) testdata = (missing_deps, surplus_deps, orphan_sonames) checker = checkpkg.CheckpkgBase("/tmp/nonexistent", "CSWfoo") - expected = u"""CSWfoo: -SUGGESTION: you may want to add some or all of the following as depends: - (Feel free to ignore SUNW or SPRO packages) -> *SUNWlxsl -> SUNWgss -The following packages might be unnecessary dependencies: -? CSWlibxslt -? CSWsudo -The following sonames don't belong to any package: -! libm.so.2 + expected = u"""# CSWfoo: +# SUGGESTION: you may want to add some or all of the following as depends: +# (Feel free to ignore SUNW or SPRO packages) +REQUIRED_PKGS_CSWfoo += *SUNWlxsl +REQUIRED_PKGS_CSWfoo += SUNWgss +# The following dependencies might be unnecessary: +# ? CSWlibxslt +# ? CSWsudo +# The following required sonames would not be found at runtime: +# ! libm.so.2 """ result = checker.FormatDepsReport(*testdata) self.AssertTextEqual(result, expected) @@ -578,8 +578,8 @@ orphan_sonames = set([]) testdata = (missing_deps, surplus_deps, orphan_sonames) checker = checkpkg.CheckpkgBase("/tmp/nonexistent", "CSWfoo") - expected = u"""CSWfoo: -+ Dependencies of CSWfoo look good. + expected = u"""# CSWfoo: +# + Dependencies of CSWfoo look good. """ result = checker.FormatDepsReport(*testdata) self.AssertTextEqual(result, expected) Modified: csw/mgar/gar/v2/lib/python/opencsw_test.py =================================================================== --- csw/mgar/gar/v2/lib/python/opencsw_test.py 2010-01-26 16:32:54 UTC (rev 8186) +++ csw/mgar/gar/v2/lib/python/opencsw_test.py 2010-01-26 16:46:41 UTC (rev 8187) @@ -46,7 +46,9 @@ class ParsePackageFileNameTest(unittest.TestCase): def testParsePackageFileName1(self): - test_data = open("example-catalog.txt") + # FIXME: it doesn't find the file if the pwd is not the same as the + # location of this file. + test_data = open("testdata/example-catalog.txt") split_re = re.compile(r"\s+") for line in test_data: fields = re.split(split_re, line) Added: csw/mgar/gar/v2/lib/python/testdata/example-catalog.txt =================================================================== --- csw/mgar/gar/v2/lib/python/testdata/example-catalog.txt (rev 0) +++ csw/mgar/gar/v2/lib/python/testdata/example-catalog.txt 2010-01-26 16:46:41 UTC (rev 8187) @@ -0,0 +1,2146 @@ +9menu 1.8,REV=2006.05.19 CSW9menu 9menu-1.8,REV=2006.05.19-SunOS5.8-sparc-CSW.pkg.gz 3a483f192e2e9d788e922895ef1261e9 15613 CSWcommon none +a2ps 4.13b CSWa2ps a2ps-4.13b-SunOS5.8-sparc-CSW.pkg.gz 979c2e321d5388939de7e06ebc29bf20 1371107 CSWcommon|CSWtexinfo none +aalib 1.4.0,REV=2008.04.13_rev=rc5 CSWaalib aalib-1.4.0,REV=2008.04.13_rev=rc5-SunOS5.8-sparc-CSW.pkg.gz 1121cfb5f88a538745a48e7d9a3138c8 200471 CSWcommon|CSWncurses none +achievo 0.8.4 CSWachievo achievo-0.8.4-all-CSW.pkg.gz 3a2ec554599a94a405af93721b37eb5d 272303 none none +ack 1.88,REV=2009.07.15 CSWack ack-1.88,REV=2009.07.15-SunOS5.8-all-CSW.pkg.gz 418233106813f882bb34f690da8207c1 41037 CSWcommon|CSWperl none +acpidump 20071116,REV=2008.05.10 CSWacpidump acpidump-20071116,REV=2008.05.10-SunOS5.8-sparc-CSW.pkg.gz b491fc7e2364e848d5eb8fc0a36e2d19 21170 CSWcommon none +aggregate 1.6,REV=2008.03.22 CSWaggregate aggregate-1.6,REV=2008.03.22-SunOS5.8-sparc-CSW.pkg.gz 04e8ec3684fe08f7e0181baa1d4713c6 10589 CSWcommon user +albumshaper 2.1,REV=2009.06.07 CSWalbumshaper albumshaper-2.1,REV=2009.06.07-SunOS5.8-sparc-CSW.pkg.gz 20d8e0b627bf810ef2c1d60f6f79d97d 391718 CSWcommon|CSWalbumshapercommon|CSWgcc3corert|CSWgcc3g++rt|CSWiconv|CSWjpeg|CSWlibxml2|CSWlibxslt|CSWqtgcc|CSWzlib none +albumshaper_common 2.1,REV=2009.06.07 CSWalbumshapercommon albumshaper_common-2.1,REV=2009.06.07-SunOS5.8-all-CSW.pkg.gz 8cfc9c05ed39592f89ef1b5d778f9848 4027647 CSWcommon none +alpine 2.00,REV=2009.04.29 CSWalpine alpine-2.00,REV=2009.04.29-SunOS5.8-sparc-CSW.pkg.gz fb1fedba78f5d7d77073002e3f8438e8 8493651 CSWggettextrt|CSWiconv|CSWtcl|CSWsasl|CSWosslrt|CSWkrb5lib|CSWlibnet|CSWncurses|CSWoldaprt|CSWcommon none +amanda 2.6.1,REV=2009.05.28_rev=p1 CSWamanda amanda-2.6.1,REV=2009.05.28_rev=p1-SunOS5.8-sparc-CSW.pkg.gz cd0874b07be426d7420a926303c81696 5130370 CSWmtx|CSWgnuplot|CSWgtar|CSWstar|CSWreadline|CSWcommon|CSWcurlrt|CSWggettextrt|CSWglib2|CSWlibidn|CSWlibnet|CSWoldaprt|CSWosslrt|CSWsasl|CSWzlib|CSWsambaclient|CSWperl|CSWgawk|CSWcswclassutils|CSWgzip none +amarok 1.4.8,REV=2008.02.26 CSWamarok amarok-1.4.8,REV=2008.02.26-SunOS5.8-sparc-CSW.pkg.gz 250516d6e48dcd26bbb592bf22a591f7 13434161 CSWftype2|CSWgcc3corert|CSWgcc3g++rt|CSWggettext|CSWglib2|CSWgtk2|CSWiconv|CSWjpeg|CSWkdebasegcc|CSWkdelibsgcc|CSWlibart|CSWlibidn|CSWlibgpod|CSWlibxine|CSWlibxrender|CSWpcre|CSWpng|CSWqtgcc|CSWruby|CSWsunmath|CSWtaglibgcc|CSWzlib|CSWcommon none +amavisd_new 2.6.3,REV=2009.04.23 CSWamavisdnew amavisd_new-2.6.3,REV=2009.04.23-SunOS5.8-all-CSW.pkg.gz 831f063d1ba20eb8bea0e0e60ceef3cb 813802 CSWperl|CSWcswclassutils|CSWpmunixsyslog|CSWpmiostringy|CSWpmnetserver|CSWpmmailtools|CSWpmmimetools|CSWpmcompresszlib|CSWpmarchivetar|CSWpmarchivezip|CSWspamassassin|CSWpmberkeleydb|CSWpmconverttnef|CSWpmconvertuulib|CSWpmmaildkim|CSWcommon none +amsn 0.94 CSWamsn amsn-0.94-SunOS5.8-all-CSW.pkg.gz 99afd828dd38fb39a37cb8ffd448b098 2420919 CSWtcl|CSWtk|CSWtcltls none +analog 5.32,REV=2003.9.12 CSWanalog analog-5.32,REV=2003.9.12-SunOS5.8-sparc-CSW.pkg.gz a2550ef2e37c67d475a19348b7276a38 711992 CSWcommon none +angband 3.0.3 CSWangband angband-3.0.3-SunOS5.8-sparc-CSW.pkg.gz 9280ff14bde4523d6032ede46c7630e3 1402841 CSWcommon|CSWgtk none +anjuta 1.2.2,REV=2005.03.01 CSWanjuta anjuta-1.2.2,REV=2005.03.01-SunOS5.8-sparc-CSW.pkg.gz 095ba6d763f157b0ce38922447c923b2 6502489 CSWaudiofile|CSWbonobo2|CSWcommon|CSWesound|CSWexpat|CSWfconfig|CSWftype2|CSWgconf2|CSWggettext|CSWglib2|CSWgnomekeyring|CSWgnomevfs2|CSWgtk2|CSWiconv|CSWjpeg|CSWlibart|CSWlibatk|CSWlibbonoboui|CSWlibglade2|CSWlibgnome|CSWlibgnomecanvas|CSWlibgnomeprint|CSWlibgnomeprintui|CSWlibgnomeui|CSWlibpopt|CSWlibxft2|CSWlibxml2|CSWlibxrender|CSWorbit2|CSWossl|CSWpango|CSWpcre|CSWvte|CSWzlib none +ant 1.7.1,REV=2008.10.29 CSWant ant-1.7.1,REV=2008.10.29-SunOS5.8-all-CSW.pkg.gz 0945884a52a3b43b743650c60ac21236 2055045 CSWcommon|CSWxercesj|CSWxmlcommonsext none +antdoc 1.7.1,REV=2008.10.29 CSWantdoc antdoc-1.7.1,REV=2008.10.29-SunOS5.8-all-CSW.pkg.gz e6555e61e7e7f1740935d970e5efad57 5851724 CSWcommon none +antiword 0.37,REV=2009.09.17 CSWantiword antiword-0.37,REV=2009.09.17-SunOS5.8-sparc-CSW.pkg.gz 4b609ea1fa33e1bf6f011a0676b29a82 182110 CSWcommon none +ap2_mod_jk 1.2.25,REV=2007.10.25 CSWap2modjk ap2_mod_jk-1.2.25,REV=2007.10.25-SunOS5.8-sparc-CSW.pkg.gz d25cc2b0efec1be048e9da279a3df275 182509 CSWap2prefork|CSWcommon none +ap2_modapreq2 2.08,REV=2007.10.25 CSWap2modapreq2 ap2_modapreq2-2.08,REV=2007.10.25-SunOS5.8-sparc-CSW.pkg.gz bdee05d0758fb869dadf1c8f2b3690b2 12779 CSWapache2|CSWapache2rt|CSWbdb44|CSWexpat|CSWiconv|CSWlibapreq2|CSWoldaprt|CSWsqlite3|CSWperl none +ap2_modevasive 1.10.1,REV=2007.10.25 CSWap2modevasive ap2_modevasive-1.10.1,REV=2007.10.25-SunOS5.8-sparc-CSW.pkg.gz 2b91d6563726bd4407bf1a946ca5ccc8 23831 CSWapache2|CSWcommon none +ap2_modfastcgi 2.4.6,REV=2008.10.29 CSWap2modfastcgi ap2_modfastcgi-2.4.6,REV=2008.10.29-SunOS5.8-sparc-CSW.pkg.gz 97fcbb829eac4ecadd47f13ad0d1273b 69017 CSWap2prefork|CSWcommon none +ap2_modgeoip 1.2.5,REV=2008.10.17 CSWap2modgeoip ap2_modgeoip-1.2.5,REV=2008.10.17-SunOS5.8-sparc-CSW.pkg.gz 6c02136756c2786b2e013f6eaf352d68 16368 CSWapache2|CSWgeoip|CSWcommon none +ap2_modmacro 1.1.10,REV=2009.07.30 CSWap2modmacro ap2_modmacro-1.1.10,REV=2009.07.30-SunOS5.8-sparc-CSW.pkg.gz e037fbe5a0a68f8021695353b442a82a 15465 CSWap2prefork|CSWcommon none +ap2_modperl 2.0.3,REV=2007.10.25 CSWap2modperl ap2_modperl-2.0.3,REV=2007.10.25-SunOS5.8-sparc-CSW.pkg.gz 375a6e3f4ce17a2d14d67e0bc677f106 2204013 CSWapache2|CSWapache2rt|CSWexpat|CSWiconv|CSWoldaprt|CSWperl|CSWsqlite3|CSWcommon none +ap2_modphp4 4.4.9,REV=2009.05.28 CSWap2modphp4 ap2_modphp4-4.4.9,REV=2009.05.28-SunOS5.8-sparc-CSW.pkg.gz e6ce7fc808a8fcbefbfeff358d380328 731054 CSWphp4cgi|CSWbdb44|CSWexpat|CSWap2prefork|CSWcommon none +ap2_modphp5 5.2.9,REV=2009.04.30 CSWap2modphp5 ap2_modphp5-5.2.9,REV=2009.04.30-SunOS5.8-sparc-CSW.pkg.gz e2ffea5a046516a6f0774dc835caec2e 1378529 CSWphp5|CSWap2prefork|CSWiconv|CSWexpat|CSWlibxml2|CSWzlib|CSWcommon none +ap2_modpython 3.3.1,REV=2009.06.05 CSWap2modpython ap2_modpython-3.3.1,REV=2009.06.05-SunOS5.8-sparc-CSW.pkg.gz ad576598439df954046a84f164d2f7c0 280493 CSWap2prefork|CSWpython-rt|CSWcswclassutils|CSWcommon none +ap2_modwsgi 2.5,REV=2009.06.21 CSWap2modwsgi ap2_modwsgi-2.5,REV=2009.06.21-SunOS5.8-sparc-CSW.pkg.gz 8ee28b2928b9d5dd1b31d35e8c7928ab 64358 CSWap2prefork|CSWpython|CSWcommon none +ap2_prefork 2.2.13,REV=2009.08.22 CSWap2prefork ap2_prefork-2.2.13,REV=2009.08.22-SunOS5.8-sparc-CSW.pkg.gz 793085d9d3d953569839ceae7a5f5b84 190824 CSWapache2c|CSWapache2rt|CSWbdb|CSWexpat|CSWgdbm|CSWiconv|CSWlibnet|CSWoldaprt|CSWosslrt|CSWsasl|CSWzlib|CSWsqlite3|CSWcommon none +ap2_subversion 1.6.2,REV=2009.06.13 CSWap2svn ap2_subversion-1.6.2,REV=2009.06.13-SunOS5.8-sparc-CSW.pkg.gz 29c3bb76f612bb03ff3288bfe7894d0d 81651 CSWsvn|CSWggettextrt|CSWiconv|CSWcommon none +ap2_suexec 2.2.13,REV=2009.08.22 CSWap2suexec ap2_suexec-2.2.13,REV=2009.08.22-SunOS5.8-sparc-CSW.pkg.gz 8309b6c7b3b0d161cafd71e38682b08a 18764 CSWapache2|CSWcommon none +ap2_worker 2.2.13,REV=2009.08.22 CSWap2worker ap2_worker-2.2.13,REV=2009.08.22-SunOS5.8-sparc-CSW.pkg.gz 906e6d4776dbdfdca8bf777b08fc9634 227944 CSWapache2c|CSWapache2rt|CSWbdb4|CSWexpat|CSWgdbm|CSWiconv|CSWlibnet|CSWoldaprt|CSWosslrt|CSWsasl|CSWsqlite3|CSWcommon none +apache 1.3.37,REV=2007.09.02 CSWapache apache-1.3.37,REV=2007.09.02-SunOS5.8-sparc-CSW.pkg.gz 10524bccbf08855234e6059fce9fb740 2047584 CSWcommon|CSWosslrt|CSWlibmm|CSWoldaprt|CSWexpat|CSWbdb3 none +apache2 2.2.13,REV=2009.08.22 CSWapache2 apache2-2.2.13,REV=2009.08.22-SunOS5.8-all-CSW.pkg.gz 9ad632811f58c8ba63665f7fdb44d28f 9146 CSWapache2c|CSWap2prefork|CSWcommon none +apache2_devel 2.2.13,REV=2009.08.22 CSWapache2-devel apache2_devel-2.2.13,REV=2009.08.22-SunOS5.8-sparc-CSW.pkg.gz 516e9affc6ba02f080c0122d0bc67e8f 532528 CSWapache2rt|CSWcommon none +apache2_manual 2.2.13,REV=2009.08.22 CSWapache2-manual apache2_manual-2.2.13,REV=2009.08.22-SunOS5.8-all-CSW.pkg.gz 7da6ce99eeb06ce6b2fb856e36f79673 2351496 CSWapache2|CSWcommon none +apache2c 2.2.13,REV=2009.08.22 CSWapache2c apache2c-2.2.13,REV=2009.08.22-SunOS5.8-sparc-CSW.pkg.gz 16374d294ca79eaf2a71deef682d569a 804890 CSWapache2rt|CSWbdb|CSWexpat|CSWgdbm|CSWiconv|CSWlibnet|CSWoldaprt|CSWosslrt|CSWsasl|CSWzlib|CSWsqlite3|CSWcswclassutils|CSWcommon none +apache2rt 2.2.13,REV=2009.08.22 CSWapache2rt apache2rt-2.2.13,REV=2009.08.22-SunOS5.8-sparc-CSW.pkg.gz 9184ff4e7662f57f5349682eb599042a 206820 CSWbdb|CSWexpat|CSWgdbm|CSWggettextrt|CSWgsed|CSWiconv|CSWoldaprt|CSWosslrt|CSWperl|CSWsasl|CSWzlib|CSWsqlite3|CSWlibnet|CSWsqlite3rt|CSWcommon none +apg 2.2.3 CSWapg apg-2.2.3-SunOS5.8-sparc-CSW.pkg.gz 649bdc3ff84ad7a36429262f2e80a3ba 66970 none none +arc 5.21 CSWarc arc-5.21-SunOS5.8-sparc-CSW.pkg.gz bd86d8467a433b722d4518127dfe0c79 57364 none none +archivemail 0.6.1,REV=2004.06.27 CSWarchivemail archivemail-0.6.1,REV=2004.06.27-SunOS5.8-all-CSW.pkg.gz 92015043f138c739dbc451994a592f48 26629 CSWcommon|CSWpython none +argus 2.0.6,REV=2008.11.12 CSWargus argus-2.0.6,REV=2008.11.12-SunOS5.8-sparc-CSW.pkg.gz 12e63735827915cf8a760417506fd9d2 150421 CSWcommon|CSWlibpcap|CSWtcpwrap none +armagetron 0.2.8.2 CSWarmagetron armagetron-0.2.8.2-SunOS5.8-sparc-CSW.pkg.gz 992ce82d835047e8c25d6d84dac131c6 2098660 CSWgcc3corert|CSWgcc3g++rt|CSWiconv|CSWjpeg|CSWlibnet|CSWlibsdl|CSWlibxml2|CSWmesa|CSWpng|CSWsdlimage|CSWsdlmixer|CSWzlib none +arts 1.1 CSWarts arts-1.1-SunOS5.8-sparc-CSW.pkg.gz d7f9625b2028907bb36e3ede633cb837 2827514 CSWcommon|CSWaudiofile|CSWpng|CSWqt none +arts_gcc 1.5.1 CSWartsgcc arts_gcc-1.5.1-SunOS5.8-sparc-CSW.pkg.gz b5eca0c8aafcdcad17fcd430f9378d21 1777293 CSWaudiofile|CSWesound|CSWgcc3corert|CSWgcc3g++rt|CSWggettext|CSWglib2|CSWiconv|CSWlibmad|CSWlibogg|CSWpng|CSWqtgcc|CSWvorbis|CSWzlib none +asciidoc 8.4.5,REV=2009.10.26 CSWasciidoc asciidoc-8.4.5,REV=2009.10.26-SunOS5.8-all-CSW.pkg.gz 408fade061fecd65605a1b51693e0f17 156366 CSWpython|CSWgnulinks|CSWggetopt|CSWcommon none +aspell 0.60.6,REV=2008.05.05 CSWaspell aspell-0.60.6,REV=2008.05.05-SunOS5.8-sparc-CSW.pkg.gz 89a010b45c8e5ddadd5f3b3e9161cfb6 1115467 CSWcommon|CSWgcc4corert|CSWgcc4g++rt|CSWggettext|CSWiconv none +aspellaf 0.50.0,REV=2005.06.17 CSWaspellaf aspellaf-0.50.0,REV=2005.06.17-SunOS5.8-all-CSW.pkg.gz ddd51bda98ecd7e5be5c000b70fffc0d 240784 CSWbzip2|CSWcommon|CSWaspell none +aspellam 0.03.1,REV=2005.06.17 CSWaspellam aspellam-0.03.1,REV=2005.06.17-SunOS5.8-all-CSW.pkg.gz 857ab67da2495621c734e026871a0906 37280 CSWbzip2|CSWcommon|CSWaspell none +aspellaz 0.02.0,REV=2005.06.17 CSWaspellaz aspellaz-0.02.0,REV=2005.06.17-SunOS5.8-all-CSW.pkg.gz 6d287e87da64b3e0ed95f7036b348ba3 41361 CSWbzip2|CSWcommon|CSWaspell none +aspellbe 0.01,REV=2005.06.17 CSWaspellbe aspellbe-0.01,REV=2005.06.17-SunOS5.8-all-CSW.pkg.gz b85d68e6580eaf6797121337faf52d56 648135 CSWbzip2|CSWcommon|CSWaspell none +aspellbg 4.0.0,REV=2005.06.17 CSWaspellbg aspellbg-4.0.0,REV=2005.06.17-SunOS5.8-all-CSW.pkg.gz 48555b7f3051aa5e842bc8746ac656e6 160695 CSWbzip2|CSWcommon|CSWaspell none +aspellbn 0.01.1.1,REV=2005.06.17 CSWaspellbn aspellbn-0.01.1.1,REV=2005.06.17-SunOS5.8-all-CSW.pkg.gz 146ada0e0c313d329482bade3b2489be 105467 CSWbzip2|CSWcommon|CSWaspell none +aspellbr 0.50.1_0.2.1.2mdk,REV=2005.06.17 CSWaspellbr aspellbr-0.50.1_0.2.1.2mdk,REV=2005.06.17-SunOS5.8-all-CSW.pkg.gz 488ae25cde53620999dc7d74bf7b25c1 55874 CSWbzip2|CSWcommon|CSWaspell none +aspellca 20040130.1,REV=2005.06.17 CSWaspellca aspellca-20040130.1,REV=2005.06.17-SunOS5.8-all-CSW.pkg.gz 8039fcf9518b915ccde0ffb20734c08a 199541 CSWbzip2|CSWcommon|CSWaspell none +aspellcs 20040614.1,REV=2005.06.17 CSWaspellcs aspellcs-20040614.1,REV=2005.06.17-SunOS5.8-all-CSW.pkg.gz a34a3e100e064f7cbff2327bf64bb8f9 414347 CSWbzip2|CSWcommon|CSWaspell none +aspellcsb 0.02.0,REV=2005.06.17 CSWaspellcsb aspellcsb-0.02.0,REV=2005.06.17-SunOS5.8-all-CSW.pkg.gz 1d5bac2236ca22502c82393d1b70189d 23100 CSWbzip2|CSWcommon|CSWaspell none +aspellcy 0.50.3,REV=2005.06.17 CSWaspellcy aspellcy-0.50.3,REV=2005.06.17-SunOS5.8-all-CSW.pkg.gz 213f8cdd56efcdcb8ef850c91138af28 100795 CSWbzip2|CSWcommon|CSWaspell none +aspellda 1.4.42.1,REV=2005.06.17 CSWaspellda aspellda-1.4.42.1,REV=2005.06.17-SunOS5.8-all-CSW.pkg.gz 387dde0f7fab231b32cf6e563e5aa31b 296911 CSWbzip2|CSWcommon|CSWaspell none +aspellde 20030222.1,REV=2005.06.17 CSWaspellde aspellde-20030222.1,REV=2005.06.17-SunOS5.8-all-CSW.pkg.gz 9bcd98b5c1f1214f7f639ac92c71f821 265820 CSWbzip2|CSWcommon|CSWaspell none +aspellel 0.50.3_0.03,REV=2005.06.17 CSWaspellel aspellel-0.50.3_0.03,REV=2005.06.17-SunOS5.8-all-CSW.pkg.gz 114e45f27856c33f67c8aa4a971c5804 320432 CSWbzip2|CSWcommon|CSWaspell none +aspellen 6.0.0,REV=2005.06.17 CSWaspellen aspellen-6.0.0,REV=2005.06.17-SunOS5.8-all-CSW.pkg.gz 7e78a6d8d627ef9f8180a9dec1dae1a8 174045 CSWbzip2|CSWcommon|CSWaspell none +aspelleo 0.50.1,REV=2005.06.17 CSWaspelleo aspelleo-0.50.1,REV=2005.06.17-SunOS5.8-all-CSW.pkg.gz 0afa1ed7751c10a9c7f825de70770a92 88383 CSWbzip2|CSWcommon|CSWaspell none +aspelles 0.50.1,REV=2005.06.17 CSWaspelles aspelles-0.50.1,REV=2005.06.17-SunOS5.8-all-CSW.pkg.gz 7c0e92a351892020a30330c5b05cc6d6 149062 CSWbzip2|CSWcommon|CSWaspell none +aspellet 0.1.21.1,REV=2005.06.17 CSWaspellet aspellet-0.1.21.1,REV=2005.06.17-SunOS5.8-all-CSW.pkg.gz 835d9e1591ba7b92e615d631b788356e 306116 CSWbzip2|CSWcommon|CSWaspell none +aspellfa 0.11.0 CSWaspellfa aspellfa-0.11.0-SunOS5.8-all-CSW.pkg.gz cf0f6fdbab175e8fc01f392d9ce31215 129009 CSWcommon|CSWaspell|CSWbzip2 none +aspellfi 0.7.0,REV=2005.06.17 CSWaspellfi aspellfi-0.7.0,REV=2005.06.17-SunOS5.8-all-CSW.pkg.gz 55d066b94b5ee78c52e4458116b67fb1 190097 CSWbzip2|CSWcommon|CSWaspell none +aspellfo 0.51_0.2.16.1,REV=2005.06.17 CSWaspellfo aspellfo-0.51_0.2.16.1,REV=2005.06.17-SunOS5.8-all-CSW.pkg.gz 0f5f7da336ecb183ba7271a64d0eb194 156898 CSWbzip2|CSWcommon|CSWaspell none +aspellfr 0.50.3_0.06,REV=2005.07.22 CSWaspellfr aspellfr-0.50.3_0.06,REV=2005.07.22-SunOS5.8-all-CSW.pkg.gz 51b9a5a2413c9e6d436defe1227906fc 276145 CSWbzip2|CSWcommon|CSWaspell none +aspellga 4.1.0 CSWaspellga aspellga-4.1.0-SunOS5.8-all-CSW.pkg.gz 67f8c91a16e0f995e1984bc777907bc1 240735 CSWcommon|CSWaspell|CSWbzip2 none +aspellgd 0.51_0.1.1.1,REV=2005.06.17 CSWaspellgd aspellgd-0.51_0.1.1.1,REV=2005.06.17-SunOS5.8-all-CSW.pkg.gz c96ee61d09157775d75cf2abc486e5a1 36530 CSWbzip2|CSWcommon|CSWaspell none +aspellgl 0.50.0,REV=2005.06.17 CSWaspellgl aspellgl-0.50.0,REV=2005.06.17-SunOS5.8-all-CSW.pkg.gz df67d6dfd5e18d99a00a88ab14380599 92484 CSWbzip2|CSWcommon|CSWaspell none +aspellgv 0.50.0_1.0,REV=2005.06.17 CSWaspellgv aspellgv-0.50.0_1.0,REV=2005.06.17-SunOS5.8-all-CSW.pkg.gz dbaac687a6c2381028b4315abf597e8d 60523 CSWbzip2|CSWcommon|CSWaspell none +aspellhe 1.0.0 CSWaspellhe aspellhe-1.0.0-SunOS5.8-all-CSW.pkg.gz 095714b1c9d1c8a644c6189835618432 110396 CSWcommon|CSWaspell|CSWbzip2 none +aspellhi 0.01.0,REV=2005.06.17 CSWaspellhi aspellhi-0.01.0,REV=2005.06.17-SunOS5.8-all-CSW.pkg.gz cba4148794a2d00c61bf04749d3db2f4 43204 CSWbzip2|CSWcommon|CSWaspell none +aspellhil 0.11.0,REV=2005.06.17 CSWaspellhil aspellhil-0.11.0,REV=2005.06.17-SunOS5.8-all-CSW.pkg.gz b5d6f20500202c9539a8dab8c2a41c55 37543 CSWbzip2|CSWcommon|CSWaspell none +aspellhr 0.51.0,REV=2005.06.17 CSWaspellhr aspellhr-0.51.0,REV=2005.06.17-SunOS5.8-all-CSW.pkg.gz afd7d41e14432be3f3cf29da836417f7 195547 CSWbzip2|CSWcommon|CSWaspell none +aspellhsb 0.01.1,REV=2005.06.17 CSWaspellhsb aspellhsb-0.01.1,REV=2005.06.17-SunOS5.8-all-CSW.pkg.gz d2b68e87ae33068bd4b8da4ba6e48ce6 100620 CSWbzip2|CSWcommon|CSWaspell none +aspellhu 0.99.4.2.0,REV=2005.06.17 CSWaspellhu aspellhu-0.99.4.2.0,REV=2005.06.17-SunOS5.8-all-CSW.pkg.gz a02999ec0113cab5fd2b1de969f69b5d 352490 CSWbzip2|CSWcommon|CSWaspell none +aspellia 0.50.1,REV=2005.06.17 CSWaspellia aspellia-0.50.1,REV=2005.06.17-SunOS5.8-all-CSW.pkg.gz 246baa8a0d8c018e5f8a7f8bafa18823 59849 CSWbzip2|CSWcommon|CSWaspell none +aspellid 1.2.0,REV=2005.06.17 CSWaspellid aspellid-1.2.0,REV=2005.06.17-SunOS5.8-all-CSW.pkg.gz 5c482f535d52e83ccf7917073f22509d 59311 CSWbzip2|CSWcommon|CSWaspell none +aspellis 0.51.1.0_0.51,REV=2005.06.17 CSWaspellis aspellis-0.51.1.0_0.51,REV=2005.06.17-SunOS5.8-all-CSW.pkg.gz 2804ebb60d5c3bf4534801429bf86e2e 315688 CSWbzip2|CSWcommon|CSWaspell none +aspellit 2.2_20050523.0,REV=2005.06.17 CSWaspellit aspellit-2.2_20050523.0,REV=2005.06.17-SunOS5.8-all-CSW.pkg.gz d8ee9acde19fd08c2f8ca5b5762120e9 173537 CSWbzip2|CSWcommon|CSWaspell none +aspellku 0.20.1 CSWaspellku aspellku-0.20.1-SunOS5.8-all-CSW.pkg.gz d2f73aa70f548665afe8dc4b85d1abff 14872 CSWcommon|CSWaspell|CSWbzip2 none +aspellla 20020503.0,REV=2005.06.17 CSWaspellla aspellla-20020503.0,REV=2005.06.17-SunOS5.8-all-CSW.pkg.gz f8b1c03a1ee146d6973c2e78d9f38a9a 33991 CSWbzip2|CSWcommon|CSWaspell none +aspelllt 1.0.1,REV=2005.06.17 CSWaspelllt aspelllt-1.0.1,REV=2005.06.17-SunOS5.8-all-CSW.pkg.gz 553bb5c857fcf6a3741f374a0fe32e28 151135 CSWbzip2|CSWcommon|CSWaspell none +aspelllv 0.5.5.1,REV=2005.06.17 CSWaspelllv aspelllv-0.5.5.1,REV=2005.06.17-SunOS5.8-all-CSW.pkg.gz 7f3572ff5c2ff35a17de017e306bac4e 64016 CSWbzip2|CSWcommon|CSWaspell none +aspellmg 0.03.0,REV=2005.06.17 CSWaspellmg aspellmg-0.03.0,REV=2005.06.17-SunOS5.8-all-CSW.pkg.gz 33bf7d991e15eb9e5572ff85c02273fc 36546 CSWbzip2|CSWcommon|CSWaspell none +aspellmi 0.50.0,REV=2005.06.17 CSWaspellmi aspellmi-0.50.0,REV=2005.06.17-SunOS5.8-all-CSW.pkg.gz fe844ec4bef0a269679d43e8254645b2 44062 CSWbzip2|CSWcommon|CSWaspell none +aspellmk 0.50.0,REV=2005.06.17 CSWaspellmk aspellmk-0.50.0,REV=2005.06.17-SunOS5.8-all-CSW.pkg.gz 6ee3b4fe7e1697c8ec59d2f3e5f39724 116023 CSWbzip2|CSWcommon|CSWaspell none +aspellmn 0.01.0,REV=2005.06.17 CSWaspellmn aspellmn-0.01.0,REV=2005.06.17-SunOS5.8-all-CSW.pkg.gz e426a7db22c14cbb458f67b7a2b68ebd 26361 CSWbzip2|CSWcommon|CSWaspell none +aspellmr 0.10.0,REV=2005.06.17 CSWaspellmr aspellmr-0.10.0,REV=2005.06.17-SunOS5.8-all-CSW.pkg.gz 6f898396226cd23f73c93ed1cf2a7111 143541 CSWbzip2|CSWcommon|CSWaspell none +aspellms 0.50.0_1.0.3,REV=2005.06.17 CSWaspellms aspellms-0.50.0_1.0.3,REV=2005.06.17-SunOS5.8-all-CSW.pkg.gz ef037a5895a6764d4f58ffcde4d0cba4 42109 CSWbzip2|CSWcommon|CSWaspell none +aspellmt 0.50.0_0.3,REV=2005.06.17 CSWaspellmt aspellmt-0.50.0_0.3,REV=2005.06.17-SunOS5.8-all-CSW.pkg.gz 2b1684df3b4454c930ae0983bbadbc31 113394 CSWbzip2|CSWcommon|CSWaspell none +aspellnb 0.50.1.0_2.0,REV=2005.06.17 CSWaspellnb aspellnb-0.50.1.0_2.0,REV=2005.06.17-SunOS5.8-all-CSW.pkg.gz 2242e0e6d56cb53bf0b0e84d37556915 414102 CSWbzip2|CSWcommon|CSWaspell none +aspellnds 0.01.0,REV=2005.06.17 CSWaspellnds aspellnds-0.01.0,REV=2005.06.17-SunOS5.8-all-CSW.pkg.gz d25bf2e94f11c21eacc04f4a58ea42ef 21722 CSWbzip2|CSWcommon|CSWaspell none +aspellnl 0.50.1_0.2,REV=2005.06.17 CSWaspellnl aspellnl-0.50.1_0.2,REV=2005.06.17-SunOS5.8-all-CSW.pkg.gz 8989fb8003d26988de8cbada273f374f 310668 CSWbzip2|CSWcommon|CSWaspell none +aspellnn 0.50.1.1_2.0,REV=2005.06.17 CSWaspellnn aspellnn-0.50.1.1_2.0,REV=2005.06.17-SunOS5.8-all-CSW.pkg.gz efa64cf57d573cca2f9d9c71816c0d83 325706 CSWbzip2|CSWcommon|CSWaspell none +aspellny 0.01.0,REV=2005.06.17 CSWaspellny aspellny-0.01.0,REV=2005.06.17-SunOS5.8-all-CSW.pkg.gz a03b9edeb984a773203505d96e8f0cc3 14335 CSWbzip2|CSWcommon|CSWaspell none +aspellor 0.03.1,REV=2005.06.17 CSWaspellor aspellor-0.03.1,REV=2005.06.17-SunOS5.8-all-CSW.pkg.gz d0207ee605db6dd1b20ec6a8aed8eb25 11758 CSWbzip2|CSWcommon|CSWaspell none +aspellpa 0.01.1,REV=2005.06.17 CSWaspellpa aspellpa-0.01.1,REV=2005.06.17-SunOS5.8-all-CSW.pkg.gz 4e4ca973fad4fe7b08bbc4029e20e5ee 13884 CSWbzip2|CSWcommon|CSWaspell none +aspellpl 0.51.0_20040309,REV=2005.06.17 CSWaspellpl aspellpl-0.51.0_20040309,REV=2005.06.17-SunOS5.8-all-CSW.pkg.gz 025367c318a8dba0e958b90937256734 612653 CSWbzip2|CSWcommon|CSWaspell none +aspellptbr 20070206 CSWaspellptbr aspellptbr-20070206-SunOS5.8-all-CSW.pkg.gz 06b1f5c0f54a614233afe796641c6102 820098 CSWcommon|CSWaspell|CSWbzip2 none +aspellptpt 20070206.0 CSWaspellptpt aspellptpt-20070206.0-SunOS5.8-all-CSW.pkg.gz 399109fe8ba057a4dbe9b50530057efe 88060 CSWcommon|CSWaspell|CSWbzip2 none +aspellqu 0.02.0,REV=2005.06.17 CSWaspellqu aspellqu-0.02.0,REV=2005.06.17-SunOS5.8-all-CSW.pkg.gz 2ce443ad3875fe4e601d54323187a756 75586 CSWbzip2|CSWcommon|CSWaspell none +aspellro 0.50.1,REV=2005.06.17 CSWaspellro aspellro-0.50.1,REV=2005.06.17-SunOS5.8-all-CSW.pkg.gz d809d9744218d9d99b959c2c356e2a16 62887 CSWbzip2|CSWcommon|CSWaspell none +aspellru 0.99f7.1,REV=2005.06.17 CSWaspellru aspellru-0.99f7.1,REV=2005.06.17-SunOS5.8-all-CSW.pkg.gz cf0e09d6d70751229ade25d87b7a7d6a 414212 CSWbzip2|CSWcommon|CSWaspell none +aspellrw 0.50.0_1.0,REV=2005.06.17 CSWaspellrw aspellrw-0.50.0_1.0,REV=2005.06.17-SunOS5.8-all-CSW.pkg.gz 280fb0744ee3c9dd0026ca8c6733c547 13487 CSWbzip2|CSWcommon|CSWaspell none +aspellsc 1.0,REV=2005.06.17 CSWaspellsc aspellsc-1.0,REV=2005.06.17-SunOS5.8-all-CSW.pkg.gz ae243016e9cf241a41586a44b1699ecc 261611 CSWbzip2|CSWcommon|CSWaspell none +aspellsk 0.52.0_1.4,REV=2005.06.17 CSWaspellsk aspellsk-0.52.0_1.4,REV=2005.06.17-SunOS5.8-all-CSW.pkg.gz aa24df32a788ae74cc1f13bff13be690 356558 CSWbzip2|CSWcommon|CSWaspell none +aspellsl 0.50.0,REV=2005.06.17 CSWaspellsl aspellsl-0.50.0,REV=2005.06.17-SunOS5.8-all-CSW.pkg.gz af9e336133e3da5a78a0949a1025783c 204213 CSWbzip2|CSWcommon|CSWaspell none +aspellsv 0.51.0_1.3.8,REV=2005.06.17 CSWaspellsv aspellsv-0.51.0_1.3.8,REV=2005.06.17-SunOS5.8-all-CSW.pkg.gz c6a1451720078076aa4c55a9a6d84032 83861 CSWbzip2|CSWcommon|CSWaspell none +aspellsw 0.50.0_20040316,REV=2005.06.17 CSWaspellsw aspellsw-0.50.0_20040316,REV=2005.06.17-SunOS5.8-all-CSW.pkg.gz 4bdf401b5ceebec3e2ace57b76d72e27 91771 CSWbzip2|CSWcommon|CSWaspell none +aspellta 20040424.1,REV=2005.06.17 CSWaspellta aspellta-20040424.1,REV=2005.06.17-SunOS5.8-all-CSW.pkg.gz 1cf6518c38c4892bf48154143690aca0 35933 CSWbzip2|CSWcommon|CSWaspell none +aspellte 0.01.2 CSWaspellte aspellte-0.01.2-SunOS5.8-all-CSW.pkg.gz 231732eee7fcd1b1203e49493b35e3ef 301273 CSWcommon|CSWaspell|CSWbzip2 none +aspelltet 0.1.1,REV=2005.06.17 CSWaspelltet aspelltet-0.1.1,REV=2005.06.17-SunOS5.8-all-CSW.pkg.gz 22848fbfee314c36d843adb9bea4971e 22453 CSWbzip2|CSWcommon|CSWaspell none +aspelltl 0.02.1,REV=2005.06.17 CSWaspelltl aspelltl-0.02.1,REV=2005.06.17-SunOS5.8-all-CSW.pkg.gz eea60a983f4d9408c430d3f1e70b3e49 31999 CSWbzip2|CSWcommon|CSWaspell none +aspelltn 1.0.1.0,REV=2005.06.17 CSWaspelltn aspelltn-1.0.1.0,REV=2005.06.17-SunOS5.8-all-CSW.pkg.gz 387ddf36bff1257097802d9f9618d32d 13730 CSWbzip2|CSWcommon|CSWaspell none +aspelltr 0.50.0_0.2,REV=2005.06.17 CSWaspelltr aspelltr-0.50.0_0.2,REV=2005.06.17-SunOS5.8-all-CSW.pkg.gz 77ede91c6a9ba841332755dd15ccd694 76962 CSWbzip2|CSWcommon|CSWaspell none +aspelluk 1.3.1.0 CSWaspelluk aspelluk-1.3.1.0-SunOS5.8-all-CSW.pkg.gz c0d0a53bb399cc311924bec8c20a3d0e 191037 CSWcommon|CSWaspell|CSWbzip2 none +aspelluz 0.6.0 CSWaspelluz aspelluz-0.6.0-SunOS5.8-all-CSW.pkg.gz 8ab0232883501b57600b5b21a8cf741f 82986 CSWcommon|CSWaspell|CSWbzip2 none +aspellvi 0.01.1.1,REV=2005.06.17 CSWaspellvi aspellvi-0.01.1.1,REV=2005.06.17-SunOS5.8-all-CSW.pkg.gz bd3d8e8c49221df2b6c2ded904f9a03d 22837 CSWbzip2|CSWcommon|CSWaspell none +aspellwa 0.50.0_0.4.5,REV=2005.06.17 CSWaspellwa aspellwa-0.50.0_0.4.5,REV=2005.06.17-SunOS5.8-all-CSW.pkg.gz 2c88fdb1221d0d252e09a42d9c9394d2 36064 CSWbzip2|CSWcommon|CSWaspell none +aspellyi 0.01.1.1,REV=2005.06.17 CSWaspellyi aspellyi-0.01.1.1,REV=2005.06.17-SunOS5.8-all-CSW.pkg.gz c4a626b5233c094343ca826cb2672f47 66092 CSWbzip2|CSWcommon|CSWaspell none +aspellzu 0.50.0_20030116,REV=2005.06.17 CSWaspellzu aspellzu-0.50.0_20030116,REV=2005.06.17-SunOS5.8-all-CSW.pkg.gz aa9bf6e9e5fd44bc1eb1b4c4cde7e0b3 157332 CSWbzip2|CSWcommon|CSWaspell none +atspi 1.21.92 CSWatspi atspi-1.21.92-SunOS5.8-sparc-CSW.pkg.gz 7da71498182f7742cfd39901bea7ff34 961219 CSWbonobo2|CSWexpat|CSWfconfig|CSWftype2|CSWggettext|CSWglib2|CSWgtk2|CSWiconv|CSWlibatk|CSWlibcairo|CSWlibpopt|CSWlibxrender|CSWorbit2|CSWpango|CSWpng|CSWsunmath|CSWzlib none +auctex 11.85,REV=2009.04.06 CSWauctex auctex-11.85,REV=2009.04.06-SunOS5.8-all-CSW.pkg.gz c7ca42d7b15eb60d2743ebcbc8466bf3 2802590 CSWcommon|CSWemacs|CSWtetex|CSWtexinfo none +audiofile 0.2.6,REV=2009.03.31 CSWaudiofile audiofile-0.2.6,REV=2009.03.31-SunOS5.8-sparc-CSW.pkg.gz 424d4897f6831bb07f61dead9dc3e284 205904 CSWisaexec|CSWcommon none +autoconf 2.64,REV=2009.07.29 CSWautoconf autoconf-2.64,REV=2009.07.29-SunOS5.8-sparc-CSW.pkg.gz f19ccdcb084b76b1e528ff4a17fe7c71 795280 CSWgawk|CSWgm4|CSWperl|CSWcommon none +autogen 5.9.8,REV=2009.06.15 CSWautogen autogen-5.9.8,REV=2009.06.15-SunOS5.8-sparc-CSW.pkg.gz ba1a743919aefceb425a8f0f9be90966 294064 CSWcommon|CSWautogenrt|CSWautogenrt|CSWgcc3corert|CSWguilelib12|CSWiconv|CSWlibxml2|CSWzlib none +autogen_doc 5.9.8,REV=2009.06.15 CSWautogendoc autogen_doc-5.9.8,REV=2009.06.15-SunOS5.8-all-CSW.pkg.gz 7c50fbe7bedecba73f01973522bf077f 1449123 CSWcommon|CSWtexinfo none +autogen_rt 5.9.8,REV=2009.06.15 CSWautogenrt autogen_rt-5.9.8,REV=2009.06.15-SunOS5.8-sparc-CSW.pkg.gz 2443ba32c3444afc21bb4a1ea4dec501 80341 CSWcommon|CSWgcc3corert none +automake 1.11,REV=2009.07.17 CSWautomake automake-1.11,REV=2009.07.17-SunOS5.8-all-CSW.pkg.gz b594772aa91ab91f0ce0b26a2d2212b9 1941993 CSWperl|CSWcommon none +autossh 1.4,REV=2009.06.25_b CSWautossh autossh-1.4,REV=2009.06.25_b-SunOS5.8-sparc-CSW.pkg.gz e7e610f99f5a41da0a658273dcd31f64 24243 CSWcommon none +awstats 6.4 CSWawstats awstats-6.4-SunOS5.8-all-CSW.pkg.gz 8c6bedcb38cc08e2cad69af6f59a8821 922799 CSWcommon none +axel 2.3,REV=2009.03.31 CSWaxel axel-2.3,REV=2009.03.31-SunOS5.8-sparc-CSW.pkg.gz f1b3d18e392cf466e8f4c6395346e03e 38751 CSWcswclassutils|CSWcommon none +bacula 2.2.8,REV=2008.01.28 CSWbacula bacula-2.2.8,REV=2008.01.28-SunOS5.8-sparc-CSW.pkg.gz fd5fdfcd3cfabd4dcc60ad1a6390ba04 1973223 CSWcommon|CSWbaculaclient|CSWmysql5rt|CSWmysql5client|CSWzlib|CSWggettext|CSWiconv|CSWosslrt|CSWgcc3corert|CSWgcc3g++rt|CSWperl|CSWpmdbi|CSWgawk none +bacula_client 2.2.8,REV=2008.01.28 CSWbaculaclient bacula_client-2.2.8,REV=2008.01.28-SunOS5.8-sparc-CSW.pkg.gz 8a8c6e991398a2ed8efb1dcbe833392b 369592 CSWzlib|CSWggettext|CSWiconv|CSWosslrt|CSWgcc3corert|CSWgcc3g++rt|CSWgawk|CSWglib2|CSWgtk2|CSWlibatk|CSWlibcairo|CSWpango none +bacula_docs 2.2.8,REV=2008.01.28 CSWbaculadocs bacula_docs-2.2.8,REV=2008.01.28-SunOS5.8-all-CSW.pkg.gz e8f19f03644037241d0ed515da248050 9029120 CSWcommon none +bacula_gnome 2.2.8,REV=2008.01.28 CSWbaculagnome bacula_gnome-2.2.8,REV=2008.01.28-SunOS5.8-sparc-CSW.pkg.gz 88df807a8a24dd57365cafe738dda6be 291204 CSWcommon|CSWbaculaclient|CSWbonobo2|CSWgcc3corert|CSWgcc3g++rt|CSWgconf2|CSWggettext|CSWglib2|CSWgnomekeyring|CSWgnomevfs2|CSWgtk2|CSWiconv|CSWlibart|CSWlibatk|CSWlibbonoboui|CSWlibcairo|CSWlibgnome|CSWlibgnomecanvas|CSWlibgnomeui|CSWlibpopt|CSWlibxml2|CSWorbit2|CSWosslrt|CSWpango|CSWzlib|CSWfconfig|CSWftype2|CSWlibxrender|CSWpng none +balance 3.35 CSWbalance balance-3.35-SunOS5.8-sparc-CSW.pkg.gz 0116880b9c8faf7d76f91413134f3ec2 24702 none none +bash 4.0.35,REV=2009.11.01 CSWbash bash-4.0.35,REV=2009.11.01-SunOS5.8-sparc-CSW.pkg.gz 7cb30e9e7d4b090891cf844bef154cd9 814755 CSWggettextrt|CSWiconv|CSWcommon none +bash_completion 20060301,REV=2006.05.14 CSWbashcmplt bash_completion-20060301,REV=2006.05.14-SunOS5.8-sparc-CSW.pkg.gz 4d3cbdd046b28679e091aff406964c43 113518 CSWcommon none +batik 1.5 CSWbatik batik-1.5-SunOS5.8-all-CSW.pkg.gz cd591b8c350d0c3b15cdf269003da4d0 6760563 CSWcommon none +bbkeys 0.8.6,REV=2003.11.14 CSWbbkeys bbkeys-0.8.6,REV=2003.11.14-SunOS5.8-sparc-CSW.pkg.gz 7fb8e9db6d05241e6d73c61e015855f4 94388 CSWblackbox|CSWcommon none +bbpager 0.3.1,REV=2003.11.14 CSWbbpager bbpager-0.3.1,REV=2003.11.14-SunOS5.8-sparc-CSW.pkg.gz 53f14ff95ba0d0dd36dc536602d53f12 55941 CSWblackbox|CSWcommon none +beautifulsoup 3.1.0.1,REV=2009.07.29 CSWbeautifulsoup beautifulsoup-3.1.0.1,REV=2009.07.29-SunOS5.8-all-CSW.pkg.gz 177ecf2cb7a2f7ddc3b01d286e6eac34 66605 CSWpython|CSWcswclassutils|CSWcommon none +berkeleydb 4.7.25,REV=2009.10.18 CSWbdb berkeleydb-4.7.25,REV=2009.10.18-SunOS5.8-sparc-CSW.pkg.gz 444c3f9780d423f7f504ee44f00d9e99 726 CSWbdb47|CSWcommon none +berkeleydb3 3.3.11,REV=2009.10.18_rev=p2 CSWbdb3 berkeleydb3-3.3.11,REV=2009.10.18_rev=p2-SunOS5.8-sparc-CSW.pkg.gz 050d571b7aa54ec33acbcf06b5ea97e6 1597152 CSWcommon none +berkeleydb3_devel 3.3.11,REV=2009.10.18_rev=p2 CSWbdb3devel berkeleydb3_devel-3.3.11,REV=2009.10.18_rev=p2-SunOS5.8-sparc-CSW.pkg.gz 9ffcc972e40a51f63a47fd5e98834252 25609 CSWbdb3|CSWcommon none +berkeleydb3_doc 3.3.11,REV=2009.10.18_rev=p2 CSWbdb3doc berkeleydb3_doc-3.3.11,REV=2009.10.18_rev=p2-SunOS5.8-all-CSW.pkg.gz ec8228e0801eae4e97008d0b497543eb 813064 CSWcommon none +berkeleydb4 4.2.52,REV=2009.10.18 CSWbdb4 berkeleydb4-4.2.52,REV=2009.10.18-SunOS5.8-all-CSW.pkg.gz 0a25868a37d6690acd99a25df4bc3511 696 CSWbdb42|CSWcommon none +berkeleydb42 4.2.52,REV=2009.10.18_rev=p5 CSWbdb42 berkeleydb42-4.2.52,REV=2009.10.18_rev=p5-SunOS5.8-sparc-CSW.pkg.gz ce0208ff71b3a566cabe1d5bf8cc4ec3 3989135 CSWcommon none +berkeleydb42_devel 4.2.52,REV=2009.10.18_rev=p5 CSWbdb42devel berkeleydb42_devel-4.2.52,REV=2009.10.18_rev=p5-SunOS5.8-sparc-CSW.pkg.gz e30ef097a82984fd6efd7f15f002838e 33481 CSWbdb42|CSWcommon none +berkeleydb42_doc 4.2.52,REV=2009.10.18_rev=p5 CSWbdb42doc berkeleydb42_doc-4.2.52,REV=2009.10.18_rev=p5-SunOS5.8-all-CSW.pkg.gz 96f88c527b8a90885a3462e8468b258f 1375391 CSWcommon none +berkeleydb43 4.3.29,REV=2009.10.18_rev=p1 CSWbdb43 berkeleydb43-4.3.29,REV=2009.10.18_rev=p1-SunOS5.8-sparc-CSW.pkg.gz 542a33dd2d6d8255b9e6bdcc558ec649 4352598 CSWcommon none +berkeleydb43_devel 4.3.29,REV=2009.10.18_rev=p1 CSWbdb43-devel berkeleydb43_devel-4.3.29,REV=2009.10.18_rev=p1-SunOS5.8-sparc-CSW.pkg.gz e6b164ecce11190d29a57d87e4a36395 35442 CSWbdb43|CSWcommon none +berkeleydb43_doc 4.3.29,REV=2009.10.18_rev=p1 CSWbdb43-doc berkeleydb43_doc-4.3.29,REV=2009.10.18_rev=p1-SunOS5.8-all-CSW.pkg.gz 6980f77144e1299a59deaa8996cec4c5 3032782 CSWcommon none +berkeleydb44 4.4.20,REV=2009.10.18_rev=p4 CSWbdb44 berkeleydb44-4.4.20,REV=2009.10.18_rev=p4-SunOS5.8-sparc-CSW.pkg.gz 2786ba1e019fa2b0e97e4cdbf5a6866d 4761354 CSWcommon none +berkeleydb44_devel 4.4.20,REV=2009.10.18_rev=p4 CSWbdb44-devel berkeleydb44_devel-4.4.20,REV=2009.10.18_rev=p4-SunOS5.8-sparc-CSW.pkg.gz fcaf7df9fbec4ed812c88a4dde1b6297 38365 CSWbdb44|CSWcommon none +berkeleydb44_doc 4.4.20,REV=2009.10.18_rev=p4 CSWbdb44-doc berkeleydb44_doc-4.4.20,REV=2009.10.18_rev=p4-SunOS5.8-all-CSW.pkg.gz d9c31032a088e41492eefbc45e664730 4966737 CSWcommon none +berkeleydb47 4.7.25,REV=2009.10.18_rev=p4 CSWbdb47 berkeleydb47-4.7.25,REV=2009.10.18_rev=p4-SunOS5.8-sparc-CSW.pkg.gz 88f3ccc9516793fbb7939a2d2327a08b 6476245 CSWcommon none +berkeleydb47_devel 4.7.25,REV=2009.10.18_rev=p4 CSWbdb47devel berkeleydb47_devel-4.7.25,REV=2009.10.18_rev=p4-SunOS5.8-sparc-CSW.pkg.gz ac83b73407e1866bcf437df091083e77 37144 CSWbdb47|CSWcommon none +berkeleydb47_doc 4.7.25,REV=2009.10.18_rev=p4 CSWbdb47doc berkeleydb47_doc-4.7.25,REV=2009.10.18_rev=p4-SunOS5.8-all-CSW.pkg.gz 6873aca8b0ccc073537f965adb5f2b7f 7087233 CSWcommon none +berkeleydb48 4.8.24,REV=2009.10.18_rev=p0 CSWbdb48 berkeleydb48-4.8.24,REV=2009.10.18_rev=p0-SunOS5.8-sparc-CSW.pkg.gz 1d43dc0f618cc162bb71456288fe1def 6944180 CSWcommon none +berkeleydb48_devel 4.8.24,REV=2009.10.18_rev=p0 CSWbdb48devel berkeleydb48_devel-4.8.24,REV=2009.10.18_rev=p0-SunOS5.8-sparc-CSW.pkg.gz f539d790944c2cfb4f2c399c1b1887c0 40575 CSWbdb48|CSWcommon none +berkeleydb48_doc 4.8.24,REV=2009.10.18_rev=p0 CSWbdb48doc berkeleydb48_doc-4.8.24,REV=2009.10.18_rev=p0-SunOS5.8-all-CSW.pkg.gz 4c6a00c4d08016f59122acf782a7c5b6 18498024 CSWcommon none +berkeleydb4_doc 4.2.52,REV=2008.02.26 CSWbdb4-doc berkeleydb4_doc-4.2.52,REV=2008.02.26-SunOS5.8-all-CSW.pkg.gz 36763e112668634f0a5f349e3921d1f8 1373823 CSWcommon none +berkeleydb_devel 4.7.25,REV=2009.07.01 CSWbdbdevel berkeleydb_devel-4.7.25,REV=2009.07.01-SunOS5.8-sparc-CSW.pkg.gz 4ae3a79f3cbf44e0768ac85eba5c48f4 38235 CSWbdb|CSWcommon none +berkeleydb_doc 4.7.25,REV=2009.07.01 CSWbdbdoc berkeleydb_doc-4.7.25,REV=2009.07.01-SunOS5.8-all-CSW.pkg.gz 8b6acd0a7eeb3c8c3afae5099bfc49fe 7085755 CSWcommon none +bibtex2html 1.93,REV=2009.05.05 CSWbibtex2html bibtex2html-1.93,REV=2009.05.05-SunOS5.8-sparc-CSW.pkg.gz ab97a311bcb41d97f0c2921b9dd69dce 506795 CSWcommon|CSWperl none +bind 9.6.1,REV=2009.08.07_rev=P1 CSWbind bind-9.6.1,REV=2009.08.07_rev=P1-SunOS5.8-sparc-CSW.pkg.gz 427b06d7bc41f5c4a5998ab5c6e36e62 350201 CSWlibbind|CSWbindutils|CSWcswclassutils|CSWiconv|CSWlibxml2|CSWosslrt|CSWzlib|CSWcommon none +bind_devel 9.6.1,REV=2009.08.07_rev=P1 CSWbinddevel bind_devel-9.6.1,REV=2009.08.07_rev=P1-SunOS5.8-all-CSW.pkg.gz 1d9e59b52594f4407ad69f1360444291 263476 CSWbind|CSWcommon none +bind_utils 9.6.1,REV=2009.08.07_rev=P1 CSWbindutils bind_utils-9.6.1,REV=2009.08.07_rev=P1-SunOS5.8-sparc-CSW.pkg.gz dbbcb29feeb1e38517131c6575342280 152823 CSWlibbind|CSWiconv|CSWlibxml2|CSWosslrt|CSWzlib|CSWcommon none +binutils 2.19,REV=2008.11.17 CSWbinutils binutils-2.19,REV=2008.11.17-SunOS5.8-sparc-CSW.pkg.gz 27cd3802d6e4edf68837e29e708a3bb7 9460189 CSWcommon|CSWggettext|CSWiconv|CSWzlib none +bison 2.4.1,REV=2009.05.12 CSWbison bison-2.4.1,REV=2009.05.12-SunOS5.8-sparc-CSW.pkg.gz 74c06c163b32f2ffb15f83ee810d0178 528715 CSWggettextrt|CSWiconv|CSWgm4|CSWcommon none +bittorrent 4.0.4 CSWbittorrent bittorrent-4.0.4-SunOS5.8-all-CSW.pkg.gz 9e7e65f7aefb3ddddd1ef4fb15e11899 157729 CSWcommon|CSWpython none +blackbox 0.70.0,REV=2005.05.13 CSWblackbox blackbox-0.70.0,REV=2005.05.13-SunOS5.8-sparc-CSW.pkg.gz 112e26bccb837a91fbfbad7d510bc58f 1135298 CSWcommon|CSWiconv none +blt 2.4z CSWblt blt-2.4z-SunOS5.8-sparc-CSW.pkg.gz df9c1ffa84cf32d1860db0f11331caf5 1878614 CSWcommon|CSWtcl|CSWtk none +bluefish 1.0,REV=2005.01.16 CSWbluefish bluefish-1.0,REV=2005.01.16-SunOS5.8-sparc-CSW.pkg.gz 389c4e392d795cf68ccb94b710c10619 1495792 CSWaspell|CSWaudiofile|CSWbonobo2|CSWcommon|CSWesound|CSWexpat|CSWfconfig|CSWftype2|CSWgconf2|CSWggettext|CSWglib2|CSWgnomekeyring|CSWgnomevfs2|CSWgtk2|CSWiconv|CSWjpeg|CSWlibart|CSWlibatk|CSWlibbonoboui|CSWlibgnome|CSWlibgnomecanvas|CSWlibgnomeui|CSWlibpopt|CSWlibxft2|CSWlibxml2|CSWlibxrender|CSWorbit2|CSWossl|CSWpango|CSWpcre|CSWzlib none +bmon 2.0.1,REV=2004.11.03 CSWbmon bmon-2.0.1,REV=2004.11.03-SunOS5.8-sparc-CSW.pkg.gz 797781b1a982410726f5ea602b7fe534 43534 CSWncurses none +bochs 2.2.6,REV=2006.03.14 CSWbochs bochs-2.2.6,REV=2006.03.14-SunOS5.8-sparc-CSW.pkg.gz 9dd63ae34be9d74ef47f9b8188b78ecb 2959910 CSWgcc3corert|CSWgcc3g++rt|CSWlibsdl|CSWreadline|CSWxpm|CSWzlib none +boincclient 6.7.4,REV=2009.02.05_r17141 CSWboincclient boincclient-6.7.4,REV=2009.02.05_r17141-SunOS5.8-sparc-CSW.pkg.gz f3502c92fb0a4bd99e3330bbb5da6303 305837 CSWboinclibs|CSWcurlrt|CSWgawk|CSWiconv|CSWlibidn|CSWlibnet|CSWoldaprt|CSWosslrt|CSWsasl|CSWzlib none +boincdevel 6.7.4,REV=2009.02.05_r17141 CSWboincdevel boincdevel-6.7.4,REV=2009.02.05_r17141-SunOS5.8-sparc-CSW.pkg.gz 0a0868d0e0bd856979a8f4342d148045 1550652 CSWboinclibs none +boinclibs 6.7.4,REV=2009.02.05_r17141 CSWboinclibs boinclibs-6.7.4,REV=2009.02.05_r17141-SunOS5.8-sparc-CSW.pkg.gz 9c0e3f8369ea92c7407d7baa3477a6c3 585473 CSWosslrt|CSWzlib|CSWmesa|CSWfreeglut|CSWcurlrt|CSWlibidn|CSWoldaprt none +boincmanager 6.7.4,REV=2009.02.05_r17141 CSWboincmanager boincmanager-6.7.4,REV=2009.02.05_r17141-SunOS5.8-sparc-CSW.pkg.gz ba1b30418cb21a9aaa287c6c9acdcfc8 2695408 CSWboinclibs|CSWboincclient|CSWcurlrt|CSWexpat|CSWfconfig|CSWftype2|CSWggettext|CSWglib2|CSWgtk2|CSWiconv|CSWjpeg|CSWlibatk|CSWlibcairo|CSWlibidn|CSWlibnet|CSWlibxrender|CSWoldaprt|CSWosslrt|CSWpango|CSWpng|CSWsasl|CSWsunmath|CSWtiff|CSWwxwidgetsgtk2|CSWzlib none +boost_devel 1.33.1,REV=2006.09.01 CSWboostdevel boost_devel-1.33.1,REV=2006.09.01-SunOS5.8-all-CSW.pkg.gz 998fef2a5a22a1344ea8da7f1a4b0905 2519292 CSWcommon none +boost_rt 1.33.1,REV=2006.09.01 CSWboostrt boost_rt-1.33.1,REV=2006.09.01-SunOS5.8-sparc-CSW.pkg.gz 8c72c67449650cdd3d4a012f17ec9b35 3531894 CSWbzip2|CSWcommon|CSWstlport|CSWzlib none +botnet 0.8,REV=2009.01.20 CSWbotnet botnet-0.8,REV=2009.01.20-SunOS5.8-all-CSW.pkg.gz ab301936cc0cc1a81cc60b83e3990392 21922 CSWspamassassin|CSWcswclassutils|CSWcommon none +bugbuddy 2.14.0,REV=2006.08.09 CSWbugbuddy bugbuddy-2.14.0,REV=2006.08.09-SunOS5.8-sparc-CSW.pkg.gz 923535508b817963d6aa6cc011e9ff70 523429 CSWbonobo2|CSWfconfig|CSWftype2|CSWgconf2|CSWggettext|CSWglib2|CSWgnomedesktop|CSWgnomekeyring|CSWgnomemenus|CSWgnomevfs2|CSWgtk2|CSWiconv|CSWlibart|CSWlibatk|CSWlibbonoboui|CSWlibcairo|CSWlibglade2|CSWlibgnome|CSWlibgnomecanvas|CSWlibgnomeui|CSWlibpopt|CSWlibxml2|CSWlibxrender|CSWorbit2|CSWpango|CSWpng|CSWstartupnotif|CSWsunmath|CSWzlib none +buildbot 0.7.11,REV=2009.10.23_rev=p3 CSWbuildbot buildbot-0.7.11,REV=2009.10.23_rev=p3-SunOS5.8-all-CSW.pkg.gz 3e8dd383346c07d833b6239f82b5f763 438384 CSWcswclassutils|CSWpython|CSWtwisted|CSWzope|CSWtextutils|CSWcommon none +bvi 1.3.2,REV=2009.07.04 CSWbvi bvi-1.3.2,REV=2009.07.04-SunOS5.8-sparc-CSW.pkg.gz f1a7f01c31a8ccddc964cd17c76ad981 71100 CSWcommon none +bzflag 2.0.8 CSWbzflag bzflag-2.0.8-SunOS5.8-sparc-CSW.pkg.gz efd3edaeebcf85e11bb296db7adabc67 12028831 CSWcurlrt|CSWgcc3corert|CSWgcc3g++rt|CSWiconv|CSWjpeg|CSWlibidn|CSWlibsdl|CSWmesa|CSWossl|CSWpng|CSWsdlimage|CSWzlib none +bzip2 1.0.5,REV=2009.01.17 CSWbzip2 bzip2-1.0.5,REV=2009.01.17-SunOS5.8-sparc-CSW.pkg.gz 2ae3e0c44b7b32cbad2cb3d9e60e3c79 423732 CSWcommon none +ca_certificates 20091101,REV=2009.11.01 CSWcacertificates ca_certificates-20091101,REV=2009.11.01-SunOS5.8-all-CSW.pkg.gz 2900aaab9fd765853b22ef8d7ab76831 129040 CSWcswclassutils|CSWcommon none +cabextract 1.2,REV=2008.04.27 CSWcabex cabextract-1.2,REV=2008.04.27-SunOS5.8-sparc-CSW.pkg.gz 4f3c36a730869b980b5a125f0eb0b533 42819 CSWcommon none +cadaver 0.23.2,REV=2009.04.07 CSWcadav cadaver-0.23.2,REV=2009.04.07-SunOS5.8-sparc-CSW.pkg.gz 2bfe2a9d907f8f2b54d48c24f0c73fa7 65498 CSWggettextrt|CSWiconv|CSWneon|CSWosslrt|CSWreadline|CSWzlib|CSWgcrypt|CSWgnutls|CSWgpgerr|CSWcommon none +cairomm 1.4.8,REV=2008.12.03 CSWcairomm cairomm-1.4.8,REV=2008.12.03-SunOS5.8-sparc-CSW.pkg.gz 280deb6462badb016320e4b42bd9226c 67655 CSWcommon|CSWlibcairo none +ccache 2.4,REV=2005.05.19 CSWccache ccache-2.4,REV=2005.05.19-SunOS5.8-sparc-CSW.pkg.gz 3491b1b8e305b30efdabed2878d2d35e 65269 CSWcommon none +cdecl 2.5 CSWcdecl cdecl-2.5-SunOS5.8-sparc-CSW.pkg.gz cbf6889cda9809547557697c900ab3bc 23195 CSWreadline none +cdrdao 1.2.1 CSWcdrdao cdrdao-1.2.1-SunOS5.8-sparc-CSW.pkg.gz 45474ede57492c35431437da0ff6e5eb 884843 CSWlibao|CSWlibmad|CSWlibogg|CSWvorbis none +cdrtools 2.01.01a59,REV=2009.05.29 CSWcdrtools cdrtools-2.01.01a59,REV=2009.05.29-SunOS5.8-sparc-CSW.pkg.gz 75ca08a01def688e47b0dd29911f04ce 1318635 CSWcommon|CSWschilybase|CSWschilyutils|CSWpxupgrade none +cfengine 2.1.20,REV=2006.05.25 CSWcfengine cfengine-2.1.20,REV=2006.05.25-SunOS5.8-sparc-CSW.pkg.gz 005895b6e144d159536157fe35c99b69 3343527 CSWbdb3|CSWcommon|CSWossl none +cgilib 0.5,REV=2005.11.29 CSWcgilib cgilib-0.5,REV=2005.11.29-SunOS5.8-sparc-CSW.pkg.gz 96db7f1269ed845f5de4138729053d57 22629 CSWcommon none +chkconfig 1.2.24h,REV=2006.12.12 CSWchkconfig chkconfig-1.2.24h,REV=2006.12.12-SunOS5.8-sparc-CSW.pkg.gz 4209fdd5b757344be1540131633a6f6c 52148 CSWcommon|CSWlibpopt|CSWggettext none +chmlib 0.39 CSWchmlib chmlib-0.39-SunOS5.8-sparc-CSW.pkg.gz 0359a50e4c1c7495eeb307e54e0237cb 59860 none none +chrpath 0.13,REV=2009.04.01 CSWchrpath chrpath-0.13,REV=2009.04.01-SunOS5.8-sparc-CSW.pkg.gz 238076976c995e1a54a6ccaf2b0b8d2c 26000 CSWcommon none +cinepaint 0.18.3,REV=2004.08.03 CSWcinepaint cinepaint-0.18.3,REV=2004.08.03-SunOS5.8-sparc-CSW.pkg.gz d0d48681412752efc03803682ba6915f 3948036 CSWcommon|CSWglib|CSWgtk|CSWjpeg|CSWpng|CSWtiff|CSWzlib none +cksfv 1.3,REV=2004.02.21 CSWcksfv cksfv-1.3,REV=2004.02.21-SunOS5.8-sparc-CSW.pkg.gz 5d3038de65050ee1c67fb1cdf0f41246 16023 CSWcommon none +clamav 0.95.3,REV=2009.10.29 CSWclamav clamav-0.95.3,REV=2009.10.29-SunOS5.8-sparc-CSW.pkg.gz 2e28d6013d7313da4535d13e15d0e927 25094268 CSWlibclamav|CSWzlib|CSWbzip2|CSWiconv|CSWcswclassutils|CSWncurses|CSWlibtoolrt|CSWcommon none +claws_htmlviewer 3.3.1,REV=2008.02.24 CSWclaws-htmlviewer claws_htmlviewer-3.3.1,REV=2008.02.24-SunOS5.8-sparc-CSW.pkg.gz 66cc4155c32c73a683724d02f6c76d99 39374 CSWcommon|CSWclaws-mail|CSWcurlrt|CSWggettext|CSWglib2|CSWgtk2|CSWlibatk|CSWlibcairo|CSWlibgtkhtml|CSWlibidn|CSWlibxml2|CSWoldaprt|CSWosslrt|CSWpango|CSWsunmath|CSWzlib none +claws_mail 3.3.1,REV=2008.02.23 CSWclaws-mail claws_mail-3.3.1,REV=2008.02.23-SunOS5.8-sparc-CSW.pkg.gz 26eb4e1b22c8242cbb8f58132a676ec6 4487512 CSWcommon|CSWaspell|CSWbdb4|CSWcurlrt|CSWdbusglib|CSWexpat|CSWfconfig|CSWftype2|CSWggettext|CSWglib2|CSWgpgerr|CSWgpgme|CSWgtk2|CSWiconv|CSWlibatk|CSWlibcairo|CSWlibdbus|CSWlibetpan|CSWlibidn|CSWlibnet|CSWlibxrender|CSWoldaprt|CSWosslrt|CSWpango|CSWpng|CSWsasl|CSWstartupnotif|CSWsunmath|CSWzlib none +claws_mail_devel 3.3.1,REV=2008.02.23 CSWclaws-mail-devel claws_mail_devel-3.3.1,REV=2008.02.23-SunOS5.8-all-CSW.pkg.gz c7df91365e4721ecea1fd2e209ea8b79 117434 CSWcommon none +claws_pdfviewer 3.3.1,REV=2008.02.24 CSWclaws-pdfviewer claws_pdfviewer-3.3.1,REV=2008.02.24-SunOS5.8-sparc-CSW.pkg.gz d314dde71ee0c8ce3562f08bdf443911 49479 CSWcommon|CSWclaws-mail|CSWggettext|CSWglib2|CSWgtk2|CSWlibatk|CSWlibcairo|CSWpango|CSWpoppler|CSWsunmath none +claws_themes 2.6.1,REV=2006.12.09 CSWclaws-themes claws_themes-2.6.1,REV=2006.12.09-SunOS5.8-all-CSW.pkg.gz 50063cf040ed563828b2d1b273f98f2f 1504985 CSWcommon|CSWclaws-mail none +clearsilver 0.10.4,REV=2007.10.18 CSWcs clearsilver-0.10.4,REV=2007.10.18-SunOS5.8-sparc-CSW.pkg.gz 0909be6ee6a2ac9cfb2e80566f2e4b76 336208 CSWcommon|CSWggettext|CSWzlib|CSWcommon none +clex 3.15 CSWclex clex-3.15-SunOS5.8-sparc-CSW.pkg.gz 74098649c210a6ab237188021ca8c1e6 102456 none none +clisp 2.47,REV=2008.12.27 CSWclisp clisp-2.47,REV=2008.12.27-SunOS5.8-sparc-CSW.pkg.gz 06aa232dd73c7627f3125ecd12c08a78 7984017 CSWggettext|CSWiconv|CSWncurses|CSWreadline|CSWlibsigsegv|CSWffcall none +clusterit 2.5,REV=2008.03.10 CSWclusterit clusterit-2.5,REV=2008.03.10-SunOS5.8-sparc-CSW.pkg.gz dcf24ace1f8b98df627cf1862a106423 194974 CSWcommon none +clusterssh 3.22,REV=2008.05.12 CSWclusterssh clusterssh-3.22,REV=2008.05.12-SunOS5.8-all-CSW.pkg.gz 101ad3a12e638fc5c1db057106155faf 34481 CSWcommon none +cmake 2.6.3,REV=2009.04.02 CSWcmake cmake-2.6.3,REV=2009.04.02-SunOS5.8-sparc-CSW.pkg.gz 7b68b37c6cae9002dc1587928ee20cc8 8158650 CSWcurlrt|CSWexpat|CSWlibidn|CSWoldaprt|CSWosslrt|CSWxmlrpc-c|CSWzlib|CSWcommon none +colordiff 1.0.9,REV=2009.10.08 CSWcolordiff colordiff-1.0.9,REV=2009.10.08-SunOS5.8-all-CSW.pkg.gz 10d7ed5157b7b707cb5a0014e7997fe4 16328 CSWcswclassutils|CSWdiffutils|CSWperl|CSWless|CSWcommon none +colorgcc 1.3.2 CSWcolorgcc colorgcc-1.3.2-SunOS5.8-all-CSW.pkg.gz e92cf87c51580d19a31fd8765c6218b2 12569 CSWcommon|CSWperl|CSWgcc3 none +colormake 0.2 CSWcolormake colormake-0.2-SunOS5.8-all-CSW.pkg.gz af5173ecc7546b82aa688ad44dd98e79 3485 CSWcommon|CSWshutils|CSWperl none +column 8.1,REV=2005.03.06 CSWcolumn column-8.1,REV=2005.03.06-SunOS5.8-sparc-CSW.pkg.gz 3baa8997f199a0cabb0464e38716a231 26466 CSWcommon|CSWggettext|CSWiconv none +common 1.4.7,REV=2009.09.20 CSWcommon common-1.4.7,REV=2009.09.20-SunOS5.8-sparc-CSW.pkg c53b9cbfd9b3096d6176faf5396750f9 25600 none none +commons_beanutils 1.8.0,REV=2009.03.25 CSWajcbeanutils commons_beanutils-1.8.0,REV=2009.03.25-SunOS5.8-all-CSW.pkg.gz efa943c6a4b8ce1835c5d40f133c6e3e 215181 CSWcommon none +commons_beanutl_doc 1.8.0,REV=2009.03.25 CSWajcbeanutilsdoc commons_beanutl_doc-1.8.0,REV=2009.03.25-SunOS5.8-all-CSW.pkg.gz 931e86fc92c8675733d0c284831d2c37 809637 CSWcommon none +commons_chain 1.2,REV=2009.03.25 CSWajcchain commons_chain-1.2,REV=2009.03.25-SunOS5.8-all-CSW.pkg.gz 220f58d19fff41e806b10d21da62ed82 86793 CSWcommon none +commons_chain_doc 1.2,REV=2009.03.25 CSWajcchaindoc commons_chain_doc-1.2,REV=2009.03.25-SunOS5.8-all-CSW.pkg.gz 7cc3cd0a6cb09a1705586e79f5881b35 207021 CSWcommon none +commons_cli 1.1,REV=2009.03.25 CSWajccli commons_cli-1.1,REV=2009.03.25-SunOS5.8-all-CSW.pkg.gz bf46866d6e5a2a22c0e0d41ae3416d5f 37855 CSWcommon none +commons_cli_doc 1.1,REV=2009.03.25 CSWajcclidoc commons_cli_doc-1.1,REV=2009.03.25-SunOS5.8-all-CSW.pkg.gz 0c3bfddff84c4b5471428fb8b1a38caa 273029 CSWcommon none +commons_codec 1.3,REV=2009.03.25 CSWajccodec commons_codec-1.3,REV=2009.03.25-SunOS5.8-all-CSW.pkg.gz 9710053570e219ce20f9d9b80834803c 46747 CSWcommon none +commons_codec_doc 1.3,REV=2009.03.25 CSWajccodecdoc commons_codec_doc-1.3,REV=2009.03.25-SunOS5.8-all-CSW.pkg.gz 514f6f8c9f911a0b25df8888ca37c979 91318 CSWcommon none +commons_collect 3.2.1,REV=2009.03.26 CSWajccollect commons_collect-3.2.1,REV=2009.03.26-SunOS5.8-all-CSW.pkg.gz 5d0c3711e95a2210cc76db60c6cba79c 509082 CSWajcconfig|CSWajcdigester|CSWajcemail|CSWajcnet|CSWcommon none +commons_collect_doc 3.2.1,REV=2009.03.26 CSWajccollectdoc commons_collect_doc-3.2.1,REV=2009.03.26-SunOS5.8-all-CSW.pkg.gz 2410a6373fb805982662f8c0cf766b17 882680 CSWcommon none +commons_config 1.6,REV=2009.03.27 CSWajcconfig commons_config-1.6,REV=2009.03.27-SunOS5.8-all-CSW.pkg.gz 8ff23844ae752029a4c00e57e16dfba5 274744 CSWajclogging|CSWajcdigester|CSWajccollect|CSWajcbeanutils|CSWcommon none +commons_config_doc 1.6,REV=2009.03.27 CSWajcconfigdoc commons_config_doc-1.6,REV=2009.03.27-SunOS5.8-all-CSW.pkg.gz 05afcf7b1f39d60c569ef7f5fbae74fc 2473382 CSWcommon none +commons_digester 2.0,REV=2009.04.01 CSWajcdigester commons_digester-2.0,REV=2009.04.01-SunOS5.8-all-CSW.pkg.gz 42d0517bf4d268d6bdbbcd2be43187b2 137317 CSWajclogging|CSWajcbeanutils|CSWcommon none +commons_digester_doc 2.0,REV=2009.04.01 CSWajcdigesterdoc commons_digester_doc-2.0,REV=2009.04.01-SunOS5.8-all-CSW.pkg.gz e702dadbb65361bf6fe155378719e412 669286 CSWcommon none +commons_disco_doc 0.4,REV=2009.03.26 CSWajcdiscoverydoc commons_disco_doc-0.4,REV=2009.03.26-SunOS5.8-all-CSW.pkg.gz 74cb9526c4ec43813f12dc3fa4751c14 227194 CSWcommon none +commons_discovery 0.4,REV=2009.03.26 CSWajcdiscovery commons_discovery-0.4,REV=2009.03.26-SunOS5.8-all-CSW.pkg.gz 7468f0a9f55636010b70cf609ef604f3 70633 CSWajclogging|CSWcommon none +commons_email 1.1,REV=2009.03.26 CSWajcemail commons_email-1.1,REV=2009.03.26-SunOS5.8-all-CSW.pkg.gz 0145e081cc09276d2cd2ee440b024b0d 34425 CSWajclogging|CSWajccollect|CSWajcbeanutils|CSWcommon none +commons_email_doc 1.1,REV=2009.03.26 CSWajcemaildoc commons_email_doc-1.1,REV=2009.03.26-SunOS5.8-all-CSW.pkg.gz 3425ea19e1cd335eff496023470f84da 49356 CSWcommon none +commons_httpcl_doc 3.0.1 CSWajchttpcldoc commons_httpcl_doc-3.0.1-SunOS5.8-all-CSW.pkg.gz aef603b024b3b3b9b50264a3cb06910f 1346091 CSWcommon none +commons_httpclient 3.0.1 CSWajchttpclient commons_httpclient-3.0.1-SunOS5.8-all-CSW.pkg.gz 582b171a9347d3f773ebef9df21ec409 260494 CSWcommon|CSWajclogging none +commons_io 1.4,REV=2009.03.25 CSWajcio commons_io-1.4,REV=2009.03.25-SunOS5.8-all-CSW.pkg.gz 964084792f8ec3843bdebcb183f06e84 103667 CSWcommon none +commons_io_doc 1.4,REV=2009.03.25 CSWajciodoc commons_io_doc-1.4,REV=2009.03.25-SunOS5.8-all-CSW.pkg.gz 072af7f2159dce20dc36431587915916 216934 CSWcommon none +commons_lang 2.4,REV=2009.03.26 CSWajclang commons_lang-2.4,REV=2009.03.26-SunOS5.8-all-CSW.pkg.gz b9a13366b4435ceed5130567c46d3d50 248831 CSWajcconfig|CSWcommon none +commons_lang_doc 2.4,REV=2009.03.26 CSWajclangdoc commons_lang_doc-2.4,REV=2009.03.26-SunOS5.8-all-CSW.pkg.gz 59a7a14cf7301363ef8536295277555c 418876 CSWcommon none +commons_logging 1.1.1,REV=2009.03.25 CSWajclogging commons_logging-1.1.1,REV=2009.03.25-SunOS5.8-all-CSW.pkg.gz 2dc4cdffa8315276f0a84713cc0a6128 62218 CSWlog4j|CSWcommon none +commons_logging_doc 1.1.1,REV=2009.03.25 CSWajcloggingdoc commons_logging_doc-1.1.1,REV=2009.03.25-SunOS5.8-all-CSW.pkg.gz f52d59aab115074b2c49bd68df501745 396614 CSWcommon none +commons_math 1.2,REV=2009.03.26 CSWajcmath commons_math-1.2,REV=2009.03.26-SunOS5.8-all-CSW.pkg.gz 98985fbc1aeabdc7d067b5ede57750f1 307246 CSWajcdiscovery|CSWcommon none +commons_math_doc 1.2,REV=2009.03.26 CSWajcmathdoc commons_math_doc-1.2,REV=2009.03.26-SunOS5.8-all-CSW.pkg.gz e37c682617d9e281a788ec08c47a03c5 2322376 CSWcommon none +commons_net 1.4.1 CSWajcnet commons_net-1.4.1-SunOS5.8-all-CSW.pkg.gz 37b4e20e897939cf378f9120c3456a24 166627 CSWcommon|CSWajcbeanutils|CSWajccollect|CSWajclogging none +commons_net_doc 1.4.1 CSWajcnetdoc commons_net_doc-1.4.1-SunOS5.8-all-CSW.pkg.gz 9b5129bec7f28ad6d70a280f437b92ed 455011 CSWcommon none +commons_pool 1.4,REV=2009.03.26 CSWajcpool commons_pool-1.4,REV=2009.03.26-SunOS5.8-all-CSW.pkg.gz 962c645cbcf4b69d151cc438d3c3cc82 84506 CSWajclogging|CSWajcdigester|CSWcommon none +commons_pool_doc 1.4,REV=2009.03.26 CSWajcpooldoc commons_pool_doc-1.4,REV=2009.03.26-SunOS5.8-all-CSW.pkg.gz a93ba89a8c34b4754e3378b97849db30 616508 CSWcommon none +commons_primit_doc 1.0,REV=2009.03.26 CSWajcprimitivesdoc commons_primit_doc-1.0,REV=2009.03.26-SunOS5.8-all-CSW.pkg.gz bb02270199f0768b23d76bd70a9589e4 511105 CSWcommon none +commons_primitives 1.0,REV=2009.03.26 CSWajcprimitives commons_primitives-1.0,REV=2009.03.26-SunOS5.8-all-CSW.pkg.gz 74549ff5f9ccfd49d0bd88f689a127dc 200454 CSWajclogging|CSWajccollect|CSWajcbeanutils|CSWcommon none +commons_upload 1.2,REV=2007.02.24 CSWajcpeupload commons_upload-1.2,REV=2007.02.24-SunOS5.8-all-CSW.pkg.gz a65e67d06438355cd57dde281b5fc8c4 50390 CSWcommon|CSWajclogging|CSWajcdigester none +commons_upload_doc 1.2,REV=2007.02.24 CSWajcuploaddoc commons_upload_doc-1.2,REV=2007.02.24-SunOS5.8-all-CSW.pkg.gz 1fb7035cc4287adafdb14d20d3b42958 316512 CSWcommon none +commons_validat_doc 1.3.1,REV=2009.03.25 CSWajcvalidatordoc commons_validat_doc-1.3.1,REV=2009.03.25-SunOS5.8-all-CSW.pkg.gz 73531c69d76e5d38a39a39fe3ef7fdd2 681423 CSWcommon none +commons_validator 1.3.1,REV=2009.03.25 CSWajcvalidator commons_validator-1.3.1,REV=2009.03.25-SunOS5.8-all-CSW.pkg.gz d053b090d07d62926e676b14cd9125fe 130677 CSWcommon none +conserver 8.1.11 CSWconserver conserver-8.1.11-SunOS5.8-sparc-CSW.pkg.gz 966a8d4f6b3155518ca35cd13b331e38 159753 CSWossl|CSWtcpwrap none +control_center 2.14.2,REV=2006.12.25 CSWcontrolcenter control_center-2.14.2,REV=2006.12.25-SunOS5.8-sparc-CSW.pkg.gz 12b3072ef1e001d932e5567beae92294 2640259 CSWzlib|CSWaudiofile|CSWbonobo2|CSWesound|CSWevolution-ds|CSWexpat|CSWfconfig|CSWfirefox|CSWftype2|CSWgconf2|CSWggettext|CSWglib2|CSWgnomedesktop|CSWgnomekeyring|CSWgnomemenus|CSWgnomevfs2|CSWgstplugins|CSWgstreamer|CSWgtk2|CSWiconv|CSWjpeg|CSWkrb5lib|CSWlibart|CSWlibatk|CSWlibbonoboui|CSWlibcairo|CSWlibglade2|CSWlibgnome|CSWlibgnomecanvas|CSWlibgnomeui|CSWlibnet|CSWlibpopt|CSWlibxft2|CSWlibxklavier|CSWlibxml2|CSWlibxrender|CSWmetacity|CSWnautilus|CSWorbit2|CSWossl|CSWpango|CSWpng|CSWstartupnotif|CSWsunmath none +convmv 1.14,REV=2009.05.31 CSWconvmv convmv-1.14,REV=2009.05.31-SunOS5.8-all-CSW.pkg.gz 2f421846cab32daa071580b517edf414 27706 CSWcommon none +courier_auth 0.60.2,REV=2008.02.20 CSWcourierauth courier_auth-0.60.2,REV=2008.02.20-SunOS5.8-sparc-CSW.pkg.gz b8e27784290bc2abb8bdbee36efee879 390149 CSWcommon|CSWbdb43|CSWlibpq|CSWlibtoolrt|CSWmysql5rt|CSWoldaprt|CSWsysconftool|CSWosslrt|CSWzlib|CSWexpect none +courier_imap 4.3.0,REV=2008.02.20 CSWcourierimap courier_imap-4.3.0,REV=2008.02.20-SunOS5.8-sparc-CSW.pkg.gz e4888f1cf4ffe9c100acd9d79dd06bf7 844102 CSWcommon|CSWsysconftool|CSWbdb43|CSWcourierauth|CSWosslrt|CSWfam|CSWmaildrop|CSWperl none +criticalmass 1.0.0 CSWcriticalmass criticalmass-1.0.0-SunOS5.8-sparc-CSW.pkg.gz 653c85be818af608a97f5c1651ff372a 3076576 CSWcommon|CSWgcc3corert|CSWgcc3g++rt|CSWlibsdl|CSWmesa|CSWpng|CSWsdlimage|CSWsdlmixer|CSWzlib none +cronolog 1.6.2 CSWcronolog cronolog-1.6.2-SunOS5.8-sparc-CSW.pkg.gz 63c33ea4746cf85446b8f5b8892a90e3 37725 none none +cryptopp 5.5.2 CSWcryptopp cryptopp-5.5.2-SunOS5.8-sparc-CSW.pkg.gz 508987b92f3744a699a5414f874e0605 13628211 none none +cscope 15.6,REV=2008.04.09 CSWcscope cscope-15.6,REV=2008.04.09-SunOS5.8-sparc-CSW.pkg.gz b6539fad96e2997cebac4553c97b3102 97766 CSWcommon none +csnobol4 1.0 CSWcsnobol4 csnobol4-1.0-SunOS5.8-sparc-CSW.pkg.gz 052ad4dd4a21fb4616b6c663842e3df0 210028 CSWcommon none +cswclassutils 1.27,REV=2009.10.28 CSWcswclassutils cswclassutils-1.27,REV=2009.10.28-SunOS5.8-all-CSW.pkg.gz fcb52ad4b240111152538f602e7525ea 12892 CSWcommon none +cswutils 1.14.4,REV=2009.10.02 CSWcswutils cswutils-1.14.4,REV=2009.10.02-SunOS5.8-all-CSW.pkg.gz 506eccae69f73c5fe8898b513b8e96f0 22694 CSWtextutils|CSWfakeroot|CSWperl|CSWpmyaml|CSWpmlibwww|CSWpmhtmltree|CSWcommon none +cups 1.3.9,REV=2008.11.08 CSWcups cups-1.3.9,REV=2008.11.08-SunOS5.8-all-CSW.pkg.gz fe7c88bc1096754058167b43d1c653fe 668 CSWlibcups|CSWcupsclient|CSWcupsd|CSWcupsdev|CSWcupsdoc|CSWcommon none +cupsclient 1.3.9,REV=2008.11.08 CSWcupsclient cupsclient-1.3.9,REV=2008.11.08-SunOS5.8-sparc-CSW.pkg.gz 23c99a68741e26d50905807a8e75f5f4 122161 CSWlibcups|CSWgcrypt|CSWgnutls|CSWgpgerr|CSWzlib|CSWcommon none +cupsd 1.3.9,REV=2008.11.08 CSWcupsd cupsd-1.3.9,REV=2008.11.08-SunOS5.8-sparc-CSW.pkg.gz 1b1e6ff4cf442192a88082f3d478ec35 2754671 CSWlibcups|CSWgcrypt|CSWgnutls|CSWgpgerr|CSWzlib|CSWoldaprt|CSWkrb5lib|CSWcommon none +cupsdev 1.3.9,REV=2008.11.08 CSWcupsdev cupsdev-1.3.9,REV=2008.11.08-SunOS5.8-all-CSW.pkg.gz ff467d58fde65b6528e76f7fc617c9f3 41184 CSWlibcups|CSWcommon none +cupsdoc 1.3.9,REV=2008.11.08 CSWcupsdoc cupsdoc-1.3.9,REV=2008.11.08-SunOS5.8-all-CSW.pkg.gz 779a6f1c232569244afa470a4d4a3d8d 889456 CSWcommon none +curl 7.19.6,REV=2009.09.05 CSWcurl curl-7.19.6,REV=2009.09.05-SunOS5.8-sparc-CSW.pkg.gz a2d39cd9cfb5dc51ae898a94f20a09ed 106418 CSWiconv|CSWlibidn|CSWlibnet|CSWoldaprt|CSWosslrt|CSWsasl|CSWzlib|CSWcurlrt|CSWcommon none +curldevel 7.19.6,REV=2009.09.05 CSWcurldevel curldevel-7.19.6,REV=2009.09.05-SunOS5.8-sparc-CSW.pkg.gz a8e2ccb8cf364a904d53cdf704b349c0 131795 CSWcurlrt|CSWcommon none +curlrt 7.19.6,REV=2009.09.05 CSWcurlrt curlrt-7.19.6,REV=2009.09.05-SunOS5.8-sparc-CSW.pkg.gz 75fd0c4a7694d7311cc69265a7579a19 619700 CSWlibidn|CSWlibnet|CSWoldaprt|CSWosslrt|CSWzlib|CSWsasl|CSWcommon none +cvs 1.11.23,REV=2008.11.11 CSWcvs cvs-1.11.23,REV=2008.11.11-SunOS5.8-sparc-CSW.pkg.gz 4798d41095c6d31751268be91735a8ae 624793 CSWcommon|CSWkrb5lib|CSWosslrt none +cvs_feature 1.12.13,REV=2007.12.02 CSWcvs-feature cvs_feature-1.12.13,REV=2007.12.02-SunOS5.8-sparc-CSW.pkg.gz 269e52b6a0a6b886d6e68ad0b7cd48d4 694877 CSWcommon|CSWtexinfo|CSWggettext|CSWiconv|CSWkrb5lib|CSWosslrt|CSWzlib none +cvsproxy 1.0.1 CSWcvsproxy cvsproxy-1.0.1-SunOS5.8-sparc-CSW.pkg.gz bf106a3abf7aab686cc0a53c5359dc7e 48604 CSWcommon|CSWtcpwrap none +cvsps 2.1,REV=2009.04.02 CSWcvsps cvsps-2.1,REV=2009.04.02-SunOS5.8-sparc-CSW.pkg.gz fe65301277a0dc39bd44b9a52ed4669b 57210 CSWzlib|CSWcvs|CSWcommon none +cyrus_imapd 2.3.15,REV=2009.11.01 CSWcyrusimapd cyrus_imapd-2.3.15,REV=2009.11.01-SunOS5.8-sparc-CSW.pkg.gz c71785018c02c4a1829c415354cc12c8 13947653 CSWosslrt|CSWsasl|CSWbdb42|CSWkrb5lib|CSWtcpwrap|CSWnetsnmp|CSWpcrert|CSWcommon none +cyrus_imapd_utils 2.3.15,REV=2009.11.01 CSWcyrusimapdutils cyrus_imapd_utils-2.3.15,REV=2009.11.01-SunOS5.8-sparc-CSW.pkg.gz d32069b8e059e6707d97790f12162656 83872 CSWpmcyrus|CSWosslrt|CSWsasl|CSWbdb42|CSWkrb5lib|CSWpcrert|CSWcommon none +d4x 2.5.0 CSWd4x d4x-2.5.0-SunOS5.8-sparc-CSW.pkg.gz 1a87aadaf43db2e6012440d476f65d24 1275465 CSWaudiofile|CSWesound|CSWggettext|CSWglib2|CSWgtk2|CSWiconv|CSWlibatk|CSWlibcairo|CSWpango none +daemontools 0.76,REV=2006.05.31 CSWdaemontools daemontools-0.76,REV=2006.05.31-SunOS5.8-all-CSW.pkg.gz 32ded1c9d8590985eb2794291b66392b 2315 CSWcommon|CSWdaemontools-core none +daemontools_core 0.76,REV=2006.05.31 CSWdaemontools-core daemontools_core-0.76,REV=2006.05.31-SunOS5.8-sparc-CSW.pkg.gz 154a6e88f9812531191ba8ccee04dd69 106768 CSWcommon none +dante 1.1.14,REV=2005.01.21 CSWdante dante-1.1.14,REV=2005.01.21-SunOS5.8-sparc-CSW.pkg.gz 62629e46dc5e6acb65294dda53470024 245895 CSWcommon|CSWtcpwrap|CSWlibsocks none +dasher 4.0.4,REV=2006.08.03 CSWdasher dasher-4.0.4,REV=2006.08.03-SunOS5.8-sparc-CSW.pkg.gz 2ce604c7067f844b9561cdedcb51e93d 6346506 CSWlibwnck|CSWgail|CSWaudiofile|CSWbonobo2|CSWesound|CSWexpat|CSWfconfig|CSWftype2|CSWgconf2|CSWggettext|CSWglib2|CSWgnomekeyring|CSWgnomevfs2|CSWgtk2|CSWiconv|CSWjpeg|CSWlibart|CSWlibatk|CSWlibbonoboui|CSWlibcairo|CSWlibglade2|CSWlibgnome|CSWlibgnomecanvas|CSWlibnet|CSWlibpopt|CSWlibxml2|CSWlibxrender|CSWorbit2|CSWossl|CSWpango|CSWpng|CSWsunmath|CSWatspi|CSWlibgnomeui|CSWstartupnotif|CSWzlib none +dbh 1.0.24,REV=2009.03.26 CSWdbh dbh-1.0.24,REV=2009.03.26-SunOS5.8-sparc-CSW.pkg.gz 7668ea637a7028ec8ab4223f09ac321c 25180 CSWcommon none +dbus 1.2.12,REV=2009.08.10 CSWdbus dbus-1.2.12,REV=2009.08.10-SunOS5.8-sparc-CSW.pkg.gz cc5e306ba82829afd6d852895c9bbdfe 381720 CSWexpat|CSWlibdbus|CSWcswclassutils|CSWcommon none +dbus_glib 0.80,REV=2009.03.25 CSWdbusglib dbus_glib-0.80,REV=2009.03.25-SunOS5.8-sparc-CSW.pkg.gz 97af272471a226c93c581225017df2f7 151325 CSWexpat|CSWggettextrt|CSWglib2|CSWiconv|CSWsunmath|CSWlibdbus|CSWcommon none +dbus_glibdev 0.80,REV=2009.03.25 CSWdbusglibdev dbus_glibdev-0.80,REV=2009.03.25-SunOS5.8-sparc-CSW.pkg.gz 8945b7859f0c35c478b6590634b3fab6 17861 CSWdbusglib|CSWcommon none +dbus_python 0.83.0,REV=2009.06.05 CSWdbuspython dbus_python-0.83.0,REV=2009.06.05-SunOS5.8-sparc-CSW.pkg.gz 03b5286fc7a106b33c31320a4d9083d9 129811 CSWdbusglib|CSWggettextrt|CSWglib2|CSWlibdbus|CSWcswclassutils|CSWcommon none +dcc 1.3.102,REV=2009.01.16 CSWdcc dcc-1.3.102,REV=2009.01.16-SunOS5.8-sparc-CSW.pkg.gz de579dc5e9c2c7e74cad9c24c61e83d2 1726352 CSWcswclassutils|CSWcommon none +dcraw 8.53,REV=2007.01.22 CSWdcraw dcraw-8.53,REV=2007.01.22-SunOS5.8-sparc-CSW.pkg.gz fe9b5a7f218e8403595bd9f20d166514 118312 CSWlcms|CSWjpeg none +ddd 3.3.11,REV=2007.01.23 CSWddd ddd-3.3.11,REV=2007.01.23-SunOS5.8-sparc-CSW.pkg.gz ca05e79be390899373192234c6bfc607 1793984 CSWcommon|CSWreadline|CSWxpm none +dejagnu 1.4.4,REV=2005.05.03 CSWdejagnu dejagnu-1.4.4,REV=2005.05.03-SunOS5.8-sparc-CSW.pkg.gz 8e02045de536fbdd5139c6b4ee8e7c57 613736 CSWcommon|CSWexpect|CSWtcl none +desktop_file_utils 0.11,REV=2006.10.27 CSWdskutl desktop_file_utils-0.11,REV=2006.10.27-SunOS5.8-sparc-CSW.pkg.gz 6d1ff82f333ceb19412e201d781b6ac3 60576 CSWcommon|CSWggettext|CSWglib2|CSWiconv|CSWlibpopt none +devilspie 0.22,REV=2008.04.12 CSWdevilspie devilspie-0.22,REV=2008.04.12-SunOS5.8-sparc-CSW.pkg.gz 07a0080d987828d8844fcd5a8d7a313b 28698 CSWggettext|CSWglib2|CSWgtk2|CSWlibatk|CSWlibcairo|CSWlibwnck|CSWpango none +devmon 0.2.2,REV=2006.12.12 CSWdevmon devmon-0.2.2,REV=2006.12.12-SunOS5.8-all-CSW.pkg.gz 0687a296c5486cc5edf9605d8090c5fc 102517 CSWcommon|CSWperl|CSWpmsnmpsession none +dhcp 4.1.0,REV=2009.01.27 CSWdhcp dhcp-4.1.0,REV=2009.01.27-SunOS5.8-sparc-CSW.pkg.gz 5e5306a950f9413ffdfa789875894e4c 962400 CSWcswclassutils|CSWosslrt|CSWcommon none +dhcp_devel 4.1.0,REV=2009.01.27 CSWdhcpdevel dhcp_devel-4.1.0,REV=2009.01.27-SunOS5.8-sparc-CSW.pkg.gz fe5bb915ccb7c307618d188d8d679434 26099 CSWdhcp|CSWcommon none +dhcping 1.2,REV=2009.07.01 CSWdhcping dhcping-1.2,REV=2009.07.01-SunOS5.8-sparc-CSW.pkg.gz 1e3dfbff3a0061dc2f259d96fc44bca5 14109 CSWcommon none +dia 0.94 CSWdia dia-0.94-SunOS5.8-sparc-CSW.pkg.gz aa61648572af6012570be13598625958 2806935 CSWcommon|CSWftype2|CSWggettext|CSWglib2|CSWgtk2|CSWiconv|CSWlibart|CSWlibatk|CSWlibpopt|CSWlibxml2|CSWlibxslt|CSWpango|CSWpng|CSWaudiofile|CSWbonobo2|CSWesound|CSWgconf2|CSWgnomekeyring|CSWgnomevfs2|CSWjpeg|CSWlibbonoboui|CSWlibgnome|CSWlibgnomecanvas|CSWlibgnomeui|CSWorbit2|CSWossl|CSWzlib none +dialog 0.9b_20030130,REV=2003.03.18 CSWdialog dialog-0.9b_20030130,REV=2003.03.18-SunOS5.8-sparc-CSW.pkg.gz 86033da47cb57aad2195a2a3d5338d7e 108319 none none +dict 1.9.7,REV=2004.02.20 CSWdict dict-1.9.7,REV=2004.02.20-SunOS5.8-sparc-CSW.pkg.gz 3af55ba2069d5dee83a7946a7d549931 67591 CSWcommon|CSWlibtool none +diffstat 1.50,REV=2009.10.07 CSWdiffstat diffstat-1.50,REV=2009.10.07-SunOS5.8-sparc-CSW.pkg.gz 71425e16a1d3996e6f9ad4a3f89afd14 20220 CSWcommon none +diffutils 2.8.1,REV=2005.11.10 CSWdiffutils diffutils-2.8.1,REV=2005.11.10-SunOS5.8-sparc-CSW.pkg.gz 1c16c75f5fcfbd71fb3bc99c2ee1f0cb 143465 CSWcommon none +dillo 0.8.6,REV=2007.12.28 CSWdillo dillo-0.8.6,REV=2007.12.28-SunOS5.8-sparc-CSW.pkg.gz 050770450bcc9298aa21f9f2f7973b7c 236374 CSWcommon|CSWglib|CSWgtk|CSWjpeg|CSWpng|CSWzlib|CSWosslrt|CSWgcc3corert|CSWgcc3g++rt none +dirvish 1.2.1 CSWdirvish dirvish-1.2.1-SunOS5.8-all-CSW.pkg.gz e1d55ddde7f5e20352724b9bd6b38fdd 26589 CSWperl|CSWpmtimemods|CSWpmtimeperiod|CSWrsync none +disktype 9,REV=2009.10.30 CSWdisktype disktype-9,REV=2009.10.30-SunOS5.8-sparc-CSW.pkg.gz c8e704e11b01e9081a8ecd6803116cb6 37345 CSWcommon none +distcc 3.1,REV=2009.04.05 CSWdistcc distcc-3.1,REV=2009.04.05-SunOS5.8-sparc-CSW.pkg.gz 8f60ceb59820c0d90e065affb1c02717 433642 CSWlibpopt|CSWpython|CSWcommon none +djvulibre 3.5.20.2,REV=2008.02.12 CSWdjvulibre djvulibre-3.5.20.2,REV=2008.02.12-SunOS5.8-sparc-CSW.pkg.gz 14e1d7b0471702f11547b526479ca6c5 1953611 CSWiconv|CSWjpeg|CSWqt|CSWtiff none +dnstracer 1.8 CSWdnstracer dnstracer-1.8-SunOS5.8-sparc-CSW.pkg.gz 597193c69cfe1e7a2af196080af59000 15357 none none +dnswalk 2.0.2,REV=2009.07.01 CSWdnswalk dnswalk-2.0.2,REV=2009.07.01-SunOS5.8-all-CSW.pkg.gz a21964b274775103e752d87ab1fee609 28295 CSWperl|CSWpmnetdns|CSWcommon none +docbookdsssl 1.79,REV=2009.09.15 CSWdocbookdsssl docbookdsssl-1.79,REV=2009.09.15-SunOS5.8-all-CSW.pkg.gz 7b95c2655b3b21fe90babf146d479312 325085 CSWdocbookdtds|CSWsgmlcommon|CSWopenjade|CSWperl|CSWcommon none +docbookdtds 4.5,REV=2009.09.16 CSWdocbookdtds docbookdtds-4.5,REV=2009.09.16-SunOS5.8-all-CSW.pkg.gz d262739ecfe876036120a7c09768c647 748158 CSWsgmlcommon|CSWxmlcommon|CSWlibxml2|CSWcommon none +docbookxsl 1.74.3,REV=2009.09.11 CSWdocbookxsl docbookxsl-1.74.3,REV=2009.09.11-SunOS5.8-all-CSW.pkg.gz 2b52936e167894d831ebc7d96f97d7cb 1780239 CSWsgmlcommon|CSWxmlcommon|CSWdocbookdtds|CSWlibxml2|CSWcommon none +docbookxsldoc 1.74.3,REV=2009.09.11 CSWdocbookxsldoc docbookxsldoc-1.74.3,REV=2009.09.11-SunOS5.8-all-CSW.pkg.gz 775cabf9bb52465b571d41c07a86a1bb 2559832 CSWdocbookxsl|CSWcommon none +dosexec 1.0.0 CSWdosexec dosexec-1.0.0-SunOS5.8-sparc-CSW.pkg.gz 773a8fca226e5297c1c584d607b54665 3832 none none +dotproject 2.1.2,REV=2009.09.22 CSWdotproject dotproject-2.1.2,REV=2009.09.22-SunOS5.8-all-CSW.pkg.gz 7e9ecc02661fc48935f35681869eafc4 3578784 CSWcommon|CSWphp5 none +dovecot 1.1.11,REV=2009.03.28 CSWdovecot dovecot-1.1.11,REV=2009.03.28-SunOS5.8-sparc-CSW.pkg.gz 582abedc3f9ef4492331561bac0bd01e 3596897 CSWosslrt|CSWmysql5rt|CSWoldaprt|CSWlibpq|CSWsasl|CSWsqlite3|CSWzlib|CSWlibnet|CSWbzip2|CSWiconv|CSWcswclassutils|CSWkrb5lib|CSWcommon none +dovecot_devel 1.1.11,REV=2009.03.30 CSWdovecot-devel dovecot_devel-1.1.11,REV=2009.03.30-SunOS5.8-sparc-CSW.pkg.gz 41a94253dde9e45f5a8de8bc5f38662f 120334 CSWdovecot|CSWcommon none +dovecot_sieve 1.1.6,REV=2009.03.28 CSWdovecot-sieve dovecot_sieve-1.1.6,REV=2009.03.28-SunOS5.8-sparc-CSW.pkg.gz 23cd56b3390dc9eafa7bdb2ab0e445fa 233464 CSWdovecot|CSWcommon none +doxygen 1.4.7 CSWdoxygen doxygen-1.4.7-SunOS5.8-sparc-CSW.pkg.gz 630409b075ca51762e9cffba2c35f9a2 2525597 none none +driftnet 0.1.6,REV=2004.10.09 CSWdriftnet driftnet-0.1.6,REV=2004.10.09-SunOS5.8-sparc-CSW.pkg.gz bb22edd4488e12cc327d5df225ea0d6b 34645 CSWcommon|CSWglib|CSWgtk|CSWjpeg|CSWlibpcap|CSWungif none +drill 1.6.1,REV=2009.08.22 CSWdrill drill-1.6.1,REV=2009.08.22-SunOS5.8-sparc-CSW.pkg.gz 3a5b728bb58dbf5739dfabb4950af246 35862 CSWldns|CSWosslrt|CSWcommon none +drupal 6.12,REV=2009.05.22 CSWdrupal drupal-6.12,REV=2009.05.22-SunOS5.8-all-CSW.pkg.gz e780f036dbef446c1edc9ab7b2723762 1100244 CSWapache2c|CSWphp5|CSWphp5gd|CSWphp5mbstring|CSWphp5session|CSWap2modphp5|CSWcommon none +dsniff 2.4b1,REV=2009.04.05 CSWdsniff dsniff-2.4b1,REV=2009.04.05-SunOS5.8-sparc-CSW.pkg.gz 80b2d08a5b5693eda20d10114da40ee8 132142 CSWbdb3|CSWlibnet|CSWlibnids|CSWlibpcap|CSWosslrt|CSWcommon none +dss 4.1.1 CSWdss dss-4.1.1-sparc-CSW.pkg.gz c740dbda698fae6625e53d2054d0b83f 8807300 CSWcommon|CSWgcc2rt none +easytag 2.1.5,REV=2008.02.07 CSWeasytag easytag-2.1.5,REV=2008.02.07-SunOS5.8-sparc-CSW.pkg.gz e4ab98c1550b29ec63c86b424a860fd8 1019736 CSWexpat|CSWfconfig|CSWflac|CSWftype2|CSWgcc4corert|CSWgcc4g++rt|CSWggettext|CSWglib2|CSWgtk2|CSWiconv|CSWid3lib|CSWlibatk|CSWlibcairo|CSWlibid3tag|CSWlibogg|CSWlibxrender|CSWpango|CSWpng|CSWspeex|CSWsunmath|CSWvorbis|CSWzlib|CSWcommon none +eclipse 3.3.2,REV=2008.03.30 CSWeclipse eclipse-3.3.2,REV=2008.03.30-SunOS5.8-sparc-CSW.pkg.gz aacb5f24f723ca3017fc4ddf2f7bcbe1 95850402 CSWeclipsecmn|CSWglib2|CSWgtk2 none +eclipsecmn 3.3.2,REV=2008.03.30 CSWeclipsecmn eclipsecmn-3.3.2,REV=2008.03.30-SunOS5.8-all-CSW.pkg.gz b0692ac11da968dda2f7c18eb2d0ffac 45482057 CSWcommon|CSWglib2|CSWgtk2 none +ectags 5.8,REV=2009.09.09 CSWectags ectags-5.8,REV=2009.09.09-SunOS5.8-sparc-CSW.pkg.gz 58e569186855b33deab46c9799b784b0 133070 CSWcommon none +eel 2.14.3 CSWeel eel-2.14.3-SunOS5.8-sparc-CSW.pkg.gz 52ee501e8b7c4b33879c0da4898831cf 437888 CSWiconv|CSWbonobo2|CSWfconfig|CSWftype2|CSWgail|CSWgconf2|CSWggettext|CSWglib2|CSWgnomedesktop|CSWgnomekeyring|CSWgnomemenus|CSWgnomevfs2|CSWgtk2|CSWlibart|CSWlibatk|CSWlibbonoboui|CSWlibcairo|CSWlibglade2|CSWlibgnome|CSWlibgnomecanvas|CSWlibgnomeui|CSWlibpopt|CSWlibxml2|CSWlibxrender|CSWorbit2|CSWpango|CSWpng|CSWstartupnotif|CSWsunmath|CSWzlib none +efence 2.1.13 CSWefence efence-2.1.13-SunOS5.8-sparc-CSW.pkg.gz 14f068447bd64ee4f2cd728213970c01 84906 CSWcommon|CSWgcc3rt none +elinks 0.11.7,REV=2009.10.10 CSWelinks elinks-0.11.7,REV=2009.10.10-SunOS5.8-sparc-CSW.pkg.gz bb22212ca200f7a0edff708eed09e6f5 1006373 CSWbzip2|CSWexpat|CSWiconv|CSWlibidn|CSWosslrt|CSWzlib|CSWcommon none +emacs 23.1,REV=2009.08.18 CSWemacs emacs-23.1,REV=2009.08.18-SunOS5.8-sparc-CSW.pkg.gz 73c8da3c7c557fa8f530b543d8159766 3310889 CSWcommon|CSWemacscommon|CSWemacschooser|CSWemacsbincommon|CSWbzip2|CSWexpat|CSWfconfig|CSWftype2|CSWgcc3corert|CSWggettextrt|CSWglib2|CSWgtk2|CSWiconv|CSWjpeg|CSWlibcairo|CSWlibcroco|CSWlibdbus|CSWlibgsf|CSWlibm17n|CSWlibotf|CSWlibrsvg|CSWlibx11|CSWlibxau|CSWlibxcb|CSWlibxft2|CSWlibxml2|CSWlibxrender|CSWpango|CSWpixman|CSWpng|CSWtiff|CSWungif|CSWxaw3d|CSWxcbutil|CSWxpm|CSWzlib none +emacs_bin_common 23.1,REV=2009.08.18 CSWemacsbincommon emacs_bin_common-23.1,REV=2009.08.18-SunOS5.8-sparc-CSW.pkg.gz c90ffec58d9bb032aec53ceb5d2b7071 227517 CSWcommon|CSWemacscommon none +emacs_chooser 22.3,REV=2008.12.05 CSWemacschooser emacs_chooser-22.3,REV=2008.12.05-SunOS5.8-all-CSW.pkg.gz 3dfaf2825b09c501183c830abaf1112d 9671 CSWcommon|CSWemacscommon none +emacs_common 23.1,REV=2009.08.18 CSWemacscommon emacs_common-23.1,REV=2009.08.18-SunOS5.8-all-CSW.pkg.gz e372c77a7f7ec3e5d3208e24360d75ca 21398013 CSWcommon|CSWtexinfo|CSWm17ndb none +emacs_el 23.1,REV=2009.08.18 CSWemacsel emacs_el-23.1,REV=2009.08.18-SunOS5.8-all-CSW.pkg.gz 159fca3188db3999025b5971a12e8896 12246840 CSWcommon|CSWemacscommon none +emacs_gtk 23.1,REV=2009.08.18 CSWemacsgtk emacs_gtk-23.1,REV=2009.08.18-SunOS5.8-sparc-CSW.pkg.gz 231f64dc63e6fe068fbbde7cad992169 3331785 CSWcommon|CSWemacscommon|CSWemacschooser|CSWemacsbincommon|CSWbzip2|CSWexpat|CSWfconfig|CSWftype2|CSWgcc3corert|CSWggettextrt|CSWglib2|CSWgtk2|CSWiconv|CSWjpeg|CSWlibatk|CSWlibcairo|CSWlibcroco|CSWlibdbus|CSWlibgsf|CSWlibm17n|CSWlibotf|CSWlibrsvg|CSWlibx11|CSWlibxau|CSWlibxcb|CSWlibxft2|CSWlibxml2|CSWlibxrender|CSWpango|CSWpixman|CSWpng|CSWtiff|CSWungif|CSWxcbutil|CSWxpm|CSWzlib none +emacs_nox 23.1,REV=2009.08.18 CSWemacsnox emacs_nox-23.1,REV=2009.08.18-SunOS5.8-sparc-CSW.pkg.gz 16840e38c189e6b723faf7b43d3f1ca7 2895788 CSWcommon|CSWemacscommon|CSWemacschooser|CSWemacsbincommon none +emacs_template 3.1,REV=2006.04.26_rev=c CSWemacstemplate emacs_template-3.1,REV=2006.04.26_rev=c-SunOS5.8-all-CSW.pkg.gz 4bd85af6248dc3e91fa6f2d3459783cb 77941 CSWcommon|CSWemacs none +enigma 0.81,REV=2004.07.13 CSWenigma enigma-0.81,REV=2004.07.13-SunOS5.8-sparc-CSW.pkg.gz ebe3b826e9136670a0479b1ec76302d8 4801793 CSWaudiofile|CSWcommon|CSWesound|CSWgcc3rt|CSWlibogg|CSWlibsdl|CSWsdlimage|CSWsdlmixer|CSWvorbis|CSWzlib none +enlightenment 0.16.6,REV=2004.10.26 CSWenlightenment enlightenment-0.16.6,REV=2004.10.26-SunOS5.8-sparc-CSW.pkg.gz 58e4296ae866e2b1a4e5c66f038ec6c5 11244628 CSWcommon|CSWaudiofile|CSWesound|CSWfnlib|CSWfreetype|CSWggettext|CSWimlib|CSWjpeg|CSWpng|CSWtiff|CSWungif|CSWzlib|CSWperl|CSWimagemagick none +enlightenment_dt 1.0 CSWenlightenment-dt enlightenment_dt-1.0-SunOS5.8-all-CSW.pkg.gz 4b4165ab9d7a989f78566b279413c6bf 77453 CSWcommon|CSWenlightenment none +enscript 1.6.3,REV=2003.04.27 CSWenscript enscript-1.6.3,REV=2003.04.27-SunOS5.8-sparc-CSW.pkg.gz 3c26aaddbc4a58b7e8c011a8d7255c9d 468270 CSWcommon|CSWiconv|CSWggettext none +eog 2.18.1 CSWeog eog-2.18.1-SunOS5.8-sparc-CSW.pkg.gz b6f5f441435c8465a61a08be3fe0aab9 1208704 CSWiconv|CSWbonobo2|CSWgconf2|CSWggettext|CSWglib2|CSWgnomedesktop|CSWgnomekeyring|CSWgnomevfs2|CSWgtk2|CSWjpeg|CSWlcms|CSWlibart|CSWlibatk|CSWlibbonoboui|CSWlibcairo|CSWlibexif|CSWlibglade2|CSWlibgnome|CSWlibgnomecanvas|CSWlibgnomeui|CSWlibpopt|CSWlibxml2|CSWorbit2|CSWpango|CSWstartupnotif|CSWsunmath|CSWzlib none +epiphany 1.4.8,REV=2005.03.27 CSWepiphany epiphany-1.4.8,REV=2005.03.27-SunOS5.8-sparc-CSW.pkg.gz 840f16951f8ae20b2241dd733c475899 3309188 CSWaudiofile|CSWbonobo2|CSWcommon|CSWesound|CSWexpat|CSWfconfig|CSWftype2|CSWgconf2|CSWggettext|CSWglib2|CSWgnomekeyring|CSWgnomevfs2|CSWgtk2|CSWiconv|CSWjpeg|CSWlibart|CSWlibatk|CSWlibbonoboui|CSWlibglade2|CSWlibgnome|CSWlibgnomecanvas|CSWlibgnomeui|CSWlibpopt|CSWlibxft2|CSWlibxml2|CSWlibxrender|CSWmozilla|CSWorbit2|CSWossl|CSWpango|CSWzlib none +epstool 3.08 CSWepstool epstool-3.08-SunOS5.8-sparc-CSW.pkg.gz 980076d87aea9cc52ae341b1ce2cb063 130256 CSWcommon|CSWgs|CSWpng|CSWzlib none +erlang 11,REV=2007.12.08_rev=R11B5 CSWerlang erlang-11,REV=2007.12.08_rev=R11B5-SunOS5.8-sparc-CSW.pkg.gz 0c789150eb733bf1038a236b4f03f7d5 33485746 CSWncurses|CSWossl|CSWossldevel|CSWosslutils|CSWunixodbc|CSWncurses prog|user +erlang_devel 11,REV=2007.12.08_rev=R11B5 CSWerlangdevel erlang_devel-11,REV=2007.12.08_rev=R11B5-SunOS5.8-all-CSW.pkg.gz b2789f0e7f88fd9d917e411b223d3b19 5927582 CSWerlang prog|user +erlang_doc 11,REV=2007.12.08_rev=R11B5 CSWerlangdoc erlang_doc-11,REV=2007.12.08_rev=R11B5-SunOS5.8-all-CSW.pkg.gz e7c362ddc1addf825fdc0a51db8e2b21 5889954 none prog|user +eruby 1.0.5 CSWeruby eruby-1.0.5-SunOS5.8-sparc-CSW.pkg.gz 5c700542f6778c735bb4bae69dd594d7 38277 CSWruby none +esound 0.2.41,REV=2009.10.05 CSWesound esound-0.2.41,REV=2009.10.05-SunOS5.8-sparc-CSW.pkg.gz 0717cb2b774b20bd400c6e1b61595621 130344 CSWaudiofile|CSWcommon none +espgs 8.15.4,REV=2007.10.28 CSWespgs espgs-8.15.4,REV=2007.10.28-SunOS5.8-all-CSW.pkg.gz 7b3ffe121cb4088aadf68d9b785d2931 624 CSWgs none +euler 1.60.6 CSWeuler euler-1.60.6-SunOS5.8-sparc-CSW.pkg.gz aef68977952d9fe32adea66944616979 793183 CSWglib|CSWgtk none +eventlog 0.2.9,REV=2009.08.23 CSWeventlog eventlog-0.2.9,REV=2009.08.23-SunOS5.8-sparc-CSW.pkg.gz ff1f80c1d5d7dbe1b58b6c1db809e61c 11736 CSWgcc4corert|CSWcommon none +evince 2.22.2,REV=2008.06.13 CSWevince evince-2.22.2,REV=2008.06.13-SunOS5.8-sparc-CSW.pkg.gz 143cc6c58b6f2f65a9a53db1d01183ac 1538381 CSWsharedmimeinfo|CSWaudiofile|CSWbonobo2|CSWcupsclient|CSWdbusglib|CSWdbus|CSWesound|CSWexpat|CSWfconfig|CSWftype2|CSWgconf2|CSWggettext|CSWglib2|CSWgnomekeyring|CSWgnomevfs2|CSWgtk2|CSWiconv|CSWjpeg|CSWlibart|CSWlibatk|CSWlibbonoboui|CSWlibcairo|CSWlibdbus|CSWlibglade2|CSWlibgnome|CSWlibgnomecanvas|CSWlibgnomeprint|CSWlibgnomeprintui|CSWlibgnomeui|CSWlibpopt|CSWlibxml2|CSWlibxrender|CSWnautilus|CSWorbit2|CSWosslrt|CSWpango|CSWpng|CSWpoppler|CSWsunmath|CSWtiff|CSWzlib|CSWdjvulibre none +evolution 2.8.2.1 CSWevolution evolution-2.8.2.1-SunOS5.8-sparc-CSW.pkg.gz 3b90656a97bb265ac1d32e63dbd4b1f1 13743561 CSWgnomepilot|CSWmono|CSWpilotlink|CSWzlib|CSWsunmath|CSWpng|CSWpango|CSWossl|CSWorbit2|CSWoldaprt|CSWlibxrender|CSWlibxml2|CSWlibsoup2|CSWlibpopt|CSWlibnet|CSWlibgnomeui|CSWlibgnomeprintui|CSWlibgnomeprint|CSWlibgnomecanvas|CSWlibgnome|CSWlibglade2|CSWlibcairo|CSWlibbonoboui|CSWlibatk|CSWlibart|CSWkrb5lib|CSWjpeg|CSWiconv|CSWgtkhtml31|CSWgtk2|CSWgpgerr|CSWgnutls|CSWgnomevfs2|CSWgnomekeyring|CSWglib2|CSWggettext|CSWgcrypt|CSWgconf2|CSWgail|CSWftype2|CSWfirefox|CSWfconfig|CSWexpat|CSWevolution-ds|CSWesound|CSWbonobo2|CSWaudiofile none +evolution_ds 1.8.2 CSWevolution-ds evolution_ds-1.8.2-SunOS5.8-sparc-CSW.pkg.gz afc784a97a2b50822ca4bd349b672205 5444093 CSWfconfig|CSWftype2|CSWlibxrender|CSWpng|CSWorbit2|CSWoldaprt|CSWlibxml2|CSWlibsoup2|CSWlibpopt|CSWlibgnome|CSWlibglade2|CSWlibcairo|CSWlibatk|CSWkrb5lib|CSWiconv|CSWgtk2|CSWgpgerr|CSWgnutls|CSWgnomevfs2|CSWglib2|CSWggettext|CSWgcrypt|CSWgconf2|CSWfirefox|CSWesound|CSWbonobo2|CSWaudiofile|CSWossl|CSWpango|CSWsunmath|CSWzlib none +evolution_webcal 2.8.0 CSWevolutionwebcal evolution_webcal-2.8.0-SunOS5.8-sparc-CSW.pkg.gz b7df7abd96054b0fb586baf1d7f318ac 105145 CSWfconfig|CSWftype2|CSWiconv|CSWlibxrender|CSWpng|CSWbonobo2|CSWevolution-ds|CSWfirefox|CSWgconf2|CSWgcrypt|CSWggettext|CSWglib2|CSWgnomekeyring|CSWgnomepanel|CSWgnomevfs2|CSWgnutls|CSWgpgerr|CSWgtk2|CSWlibart|CSWlibatk|CSWlibbonoboui|CSWlibcairo|CSWlibgnome|CSWlibgnomecanvas|CSWlibgnomeui|CSWlibpopt|CSWlibsoup2|CSWlibxml2|CSWorbit2|CSWpango|CSWsunmath|CSWzlib none +exiftool 7.75,REV=2009.05.12 CSWexiftool exiftool-7.75,REV=2009.05.12-SunOS5.8-all-CSW.pkg.gz 0d9266dcecfd04019e01616734cc894b 1442334 CSWperl|CSWpmcompresszlib|CSWcommon none +exim 4.68,REV=2007.09.20 CSWexim exim-4.68,REV=2007.09.20-SunOS5.8-sparc-CSW.pkg.gz c3fceb94ae40874daafa87da0e77f576 1305164 CSWiconv|CSWoldaprt|CSWosslrt|CSWsasl|CSWmysql5rt|CSWlibpq|CSWlibspf2|CSWggettext|CSWcommon none +exmh 2.6.3 CSWexmh exmh-2.6.3-SunOS5.8-all-CSW.pkg.gz 624a53069715408d1b3c99717235fa7e 687613 CSWtcl|CSWtmimg|CSWtmnsrem|CSWtk|CSWnmh|CSWexpect|CSWgnupg|CSWsox|CSWcommon none +expat 2.0.1,REV=2009.01.22 CSWexpat expat-2.0.1,REV=2009.01.22-SunOS5.8-sparc-CSW.pkg.gz 387b624ed7a67915f991ee3dd1674be8 290296 CSWcommon none +expect 5.41.1,REV=2004.09.02 CSWexpect expect-5.41.1,REV=2004.09.02-SunOS5.8-sparc-CSW.pkg.gz a9a30d939346e58ee3afb147f30ee32a 379807 CSWtcl|CSWtk none +faad2 2.0,REV=2004.08.15 CSWfaad2 faad2-2.0,REV=2004.08.15-SunOS5.8-sparc-CSW.pkg.gz 3a951f018ed18cd040ab143139473b25 7935824 CSWcommon|CSWgcc3rt|CSWggettext|CSWglib|CSWgtk|CSWiconv|CSWxmms none +facter 1.5.2,REV=2009.02.11 CSWfacter facter-1.5.2,REV=2009.02.11-SunOS5.8-all-CSW.pkg.gz 10c124131997c202642b5405a02eb74b 29474 CSWruby|CSWcommon none +fakeroot 1.12.2,REV=2009.05.28 CSWfakeroot fakeroot-1.12.2,REV=2009.05.28-SunOS5.8-sparc-CSW.pkg.gz ffb42dc7b403f6c59bf49c0c4108f0dc 47258 CSWcommon none +fam 2.6.9,REV=2004.04.04 CSWfam fam-2.6.9,REV=2004.04.04-SunOS5.8-sparc-CSW.pkg.gz d4d3d3f2858d59973851ff0175a1f502 88458 CSWcommon none +fax2png 1.0,REV=2008.12.04 CSWfax2png fax2png-1.0,REV=2008.12.04-SunOS5.8-sparc-CSW.pkg.gz 77c2256297c6af3dd811b117ccde3975 9435 CSWzlib|CSWpng|CSWtiff|CSWcommon none +fetchmail 6.3.12,REV=2009.10.18 CSWfetchmail fetchmail-6.3.12,REV=2009.10.18-SunOS5.8-sparc-CSW.pkg.gz b9191e4e8d224067997735a0008f56d9 881433 CSWcommon|CSWcswclassutils|CSWggettextrt|CSWiconv|CSWkrb5lib|CSWosslrt none +fetchmailconf 1.56,REV=2009.10.18 CSWfetchmailconf fetchmailconf-1.56,REV=2009.10.18-SunOS5.8-all-CSW.pkg.gz 26ed0158de1ce2c56e3bc6d2c796c3f2 32857 CSWcommon|CSWfetchmail|CSWpython|CSWtk|CSWpython-tk|CSWcswclassutils none +ffcall 1.10,REV=2008.11.25 CSWffcall ffcall-1.10,REV=2008.11.25-SunOS5.8-sparc-CSW.pkg.gz f7d5f4109be960f97e3e3de45586f1d7 51371 CSWcommon none +ffmpeg 0.4.9,REV=2005.10.27_rev=pre1 CSWffmpeg ffmpeg-0.4.9,REV=2005.10.27_rev=pre1-SunOS5.8-sparc-CSW.pkg.gz 3f540e18d3f67bca33287c6f65b477a2 3106498 CSWcommon|CSWfaad2|CSWftype2|CSWgcc3corert|CSWimlib2|CSWlibogg|CSWlibsdl|CSWlibtool|CSWvorbis|CSWzlib none +fftw2 2.1.5 CSWfftw2 fftw2-2.1.5-SunOS5.8-sparc-CSW.pkg.gz a40f5cbd0d37e000fb3f70d8cdcf7da8 639090 CSWcommon none +ficy 1.0.4,REV=2004.06.03 CSWficy ficy-1.0.4,REV=2004.06.03-SunOS5.8-sparc-CSW.pkg.gz 1fd668940331c035e41194a709e35559 50043 CSWcommon none +figlet 2.2.2,REV=2009.04.02 CSWfiglet figlet-2.2.2,REV=2009.04.02-SunOS5.8-sparc-CSW.pkg.gz faa59d952dca2ecb9842c105f966338b 387975 CSWcommon none +fileroller 2.14.4 CSWfileroller fileroller-2.14.4-SunOS5.8-sparc-CSW.pkg.gz 1d49bff8f77cd8ee3fcbc084079ccd29 717523 CSWaudiofile|CSWbonobo2|CSWesound|CSWexpat|CSWfconfig|CSWftype2|CSWgconf2|CSWggettext|CSWglib2|CSWgnomekeyring|CSWgnomevfs2|CSWgtk2|CSWiconv|CSWjpeg|CSWlibart|CSWlibatk|CSWlibbonoboui|CSWlibcairo|CSWlibglade2|CSWlibgnome|CSWlibgnomecanvas|CSWlibgnomeui|CSWlibnet|CSWlibpopt|CSWlibxml2|CSWlibxrender|CSWorbit2|CSWossl|CSWpango|CSWpng|CSWsunmath|CSWzlib none +fileutils 4.1,REV=2003.01.23 CSWgfile fileutils-4.1,REV=2003.01.23-SunOS5.8-sparc-CSW.pkg.gz e81ee3294162270698edded7ccd191c0 627236 CSWcommon none +filter 2.6.2 CSWfilter filter-2.6.2-SunOS5.8-sparc-CSW.pkg.gz 381d1bdc06093c4c0008daa6a8b253fa 40830 CSWcommon none +findutils 4.4.2,REV=2009.06.08 CSWfindutils findutils-4.4.2,REV=2009.06.08-SunOS5.8-sparc-CSW.pkg.gz f7e83502cf4411d018a0f061fd221a84 858180 CSWcommon|CSWggettextrt|CSWiconv none +firefox 3.0.14,REV=2009.09.12 CSWfirefox firefox-3.0.14,REV=2009.09.12-SunOS5.8-sparc-CSW.pkg.gz f0a64837a81e7dfb42e1fb2fc0f522f8 34087149 CSWdbusglib|CSWfconfig|CSWftype2|CSWgconf2|CSWglib2|CSWgnomevfs2|CSWgtk2|CSWlibatk|CSWlibcairo|CSWlibdbus|CSWlibgnome|CSWlibx11|CSWlibxrender|CSWpango|CSWzlib|CSWsqlite3rt|CSWcommon none +firefox_fr 2.0.0.12,REV=2008.02.10 CSWfirefox-fr firefox_fr-2.0.0.12,REV=2008.02.10-SunOS5.8-all-CSW.pkg.gz 892b4f5b9b03c03b681d0d47cbbb8275 174918 CSWcommon|CSWfirefox none +flex 2.5.4,REV=2005.10.03 CSWflex flex-2.5.4,REV=2005.10.03-SunOS5.8-sparc-CSW.pkg.gz 56ec1e5e383d4290709c5644868e8036 120489 CSWcommon none +flex_new 2.5.35,REV=2009.04.02 CSWflex-new flex_new-2.5.35,REV=2009.04.02-SunOS5.8-sparc-CSW.pkg.gz d2f6ccc07bc6217a8cf920e4f0202083 322744 CSWggettextrt|CSWiconv|CSWcommon none +flightgear 0.9.9 CSWflightgear flightgear-0.9.9-SunOS5.8-sparc-CSW.pkg.gz b5527fccc45f0fafc9ba380aaac291b2 2711178 CSWfreeglut|CSWgcc3rt|CSWjpeg|CSWmesa|CSWopenal|CSWzlib none +flightgear_base 0.9.10.1 CSWflightgearbase flightgear_base-0.9.10.1-SunOS5.8-all-CSW.pkg.gz 7628a1881a2f1cf1b2b4f1615f4aabac 102999040 CSWflightgear none +flowtools 0.66 CSWflowtools flowtools-0.66-SunOS5.8-sparc-CSW.pkg.gz 989dd289b1a0a23b853d65454106940c 3062252 CSWmysql5rt|CSWzlib none +flphoto 1.2,REV=2006.06.30 CSWflphoto flphoto-1.2,REV=2006.06.30-SunOS5.8-sparc-CSW.pkg.gz b54f26dd3f7bb5292547be7b693190a9 472980 CSWcommon|CSWfltk|CSWjpeg|CSWlibcups|CSWlibgphoto2|CSWossl|CSWpng|CSWzlib none +fltk 1.1.7,REV=2006.06.26 CSWfltk fltk-1.1.7,REV=2006.06.26-SunOS5.8-sparc-CSW.pkg.gz fd1d1c29f6f9ee23f753d831e742420b 1801846 CSWcommon|CSWjpeg|CSWpng|CSWzlib none +fluxbox 1.0.0,REV=2008.02.11 CSWfluxbox fluxbox-1.0.0,REV=2008.02.11-SunOS5.8-sparc-CSW.pkg.gz fdf8d9c06601f424a861b35470127cbf 929224 CSWexpat|CSWfconfig|CSWftype2|CSWgcc3corert|CSWgcc3g++rt|CSWiconv|CSWlibxft2|CSWlibxrender|CSWxpm|CSWzlib|CSWimlib2 none +fluxbox_dtlogin 1.0,REV=2007.05.14 CSWfluxbox-dtlogin fluxbox_dtlogin-1.0,REV=2007.05.14-SunOS5.8-all-CSW.pkg.gz dc8b90ac4f714b89abf23765a567c36e 2512 CSWcommon|CSWfluxbox none +fnlib 0.5 CSWfnlib fnlib-0.5-SunOS5.8-sparc-CSW.pkg.gz 0c5146674f085449b5e4b8ef43705440 381836 CSWcommon|CSWimlib|CSWjpeg|CSWpng|CSWtiff|CSWungif|CSWzlib none +fontconfig 2.6.0,REV=2009.04.24 CSWfconfig fontconfig-2.6.0,REV=2009.04.24-SunOS5.8-sparc-CSW.pkg.gz 51e1e6b9608a63ef70c466013c8a99f0 789309 CSWexpat|CSWftype2|CSWzlib|CSWiconv|CSWcommon none +foomatic_filters 3.0.2 CSWfoomaticfilters foomatic_filters-3.0.2-SunOS5.8-all-CSW.pkg.gz e1d6b50eebd9d40bdc2190121df19c1d 57899 CSWcups|CSWperl none +foremost 1.4,REV=2007.07.23 CSWforemost foremost-1.4,REV=2007.07.23-SunOS5.8-sparc-CSW.pkg.gz 144d92a63f18222f87e36d2b45ed1f57 46916 none none +fortune 9708,REV=2004.08.07 CSWfortune fortune-9708,REV=2004.08.07-SunOS5.8-sparc-CSW.pkg.gz 70f35d28bd0e06b1af26996cce0fe7b0 1866706 CSWcommon none +fox 1.4.33,REV=2006.08.22 CSWfox fox-1.4.33,REV=2006.08.22-SunOS5.8-sparc-CSW.pkg.gz a41eeeb307a04bd2620bcc965c332ab4 3867399 CSWmesa|CSWlibxrender|CSWlibxft2|CSWftype2|CSWfconfig|CSWexpat|CSWzlib|CSWtiff|CSWpng|CSWjpeg|CSWbzip2|CSWcommon|CSWfoxrt none +foxrt 1.4.33,REV=2006.08.15 CSWfoxrt foxrt-1.4.33,REV=2006.08.15-SunOS5.8-sparc-CSW.pkg.gz 3ae0f6bf150b44d2cff476f1b46c308a 1150695 CSWmesa|CSWlibxrender|CSWlibxft2|CSWftype2|CSWfconfig|CSWexpat|CSWzlib|CSWtiff|CSWpng|CSWjpeg|CSWbzip2|CSWcommon none +fping 2.4,REV=2004.10.12_rev=b2_to_ipv6 CSWfping fping-2.4,REV=2004.10.12_rev=b2_to_ipv6-SunOS5.8-sparc-CSW.pkg.gz e1839c96317e650359be5c1a1ce2dcff 83176 CSWcommon none +fprobe 1.1,REV=2009.07.26 CSWfprobe fprobe-1.1,REV=2009.07.26-SunOS5.8-sparc-CSW.pkg.gz c65aaed6000bcbbc579d1e6402f22dbb 28286 CSWlibpcap|CSWcommon none +freeciv 2.1.8,REV=2009.03.19 CSWfreeciv freeciv-2.1.8,REV=2009.03.19-SunOS5.8-sparc-CSW.pkg.gz 12367d8cdb164e4c84db004be4099e4a 10330005 CSWaudiofile|CSWgtk2|CSWglib2|CSWlibsdl|CSWsdlmixer|CSWlibatk|CSWlibcairo|CSWesound|CSWiconv|CSWggettextrt|CSWpango|CSWreadline|CSWzlib|CSWcommon none +freeglut 2.2.0,REV=2004.11.05 CSWfreeglut freeglut-2.2.0,REV=2004.11.05-SunOS5.8-sparc-CSW.pkg.gz 82ebeee0a1cefc4163af864cc9b95161 118413 CSWmesa none +freeradius 1.0.1 CSWfreeradius freeradius-1.0.1-SunOS5.8-sparc-CSW.pkg.gz 3dee090648228a79b56e2401e4a9ad72 1312193 CSWcommon|CSWlibtool none +freetds 0.64.0,REV=2006.07.02 CSWfreetds freetds-0.64.0,REV=2006.07.02-SunOS5.8-sparc-CSW.pkg.gz dcc374e5a0211c63fcfd89937b495e89 2546830 CSWcommon|CSWiconv|CSWncurses|CSWreadline|CSWunixodbc none +freetds_doc 0.64.0,REV=2006.07.30 CSWfreetdsdoc freetds_doc-0.64.0,REV=2006.07.30-SunOS5.8-all-CSW.pkg.gz 14ca0c161915cee271cc7866cb3c4025 397944 none none +freetype 1.3.1,REV=2004.09.19 CSWfreetype freetype-1.3.1,REV=2004.09.19-SunOS5.8-sparc-CSW.pkg.gz 58eb0bb0fa902bdbb84d4f28f1b7d1fd 614887 CSWcommon|CSWggettext none +freetype2 2.3.9,REV=2009.09.11 CSWftype2 freetype2-2.3.9,REV=2009.09.11-SunOS5.8-sparc-CSW.pkg.gz 60583e77fc224a3a9044417b3daa03cd 805599 CSWzlib|CSWcommon none +fribidi 0.19.2,REV=2009.10.07 CSWfribidi fribidi-0.19.2,REV=2009.10.07-SunOS5.8-sparc-CSW.pkg.gz d3c454ef3a6f77760f0e357c963bef8a 105271 CSWcommon none +fvwm 2.4.19,REV=2004.10.22 CSWfvwm fvwm-2.4.19,REV=2004.10.22-SunOS5.8-sparc-CSW.pkg.gz aac6f3585dc7ca7768150a8915e572d7 3273260 CSWcommon|CSWglib|CSWgtk|CSWimlib|CSWreadline|CSWxpm none +fwbuilder 2.0.12,REV=2006.04.29 CSWfwbuilder fwbuilder-2.0.12,REV=2006.04.29-SunOS5.8-sparc-CSW.pkg.gz d5fa3e7d875da40337dab234e18a66be 2231964 CSWgcc3g++rt|CSWgcc3corert|CSWiconv|CSWlibnet|CSWlibxml2|CSWlibxslt|CSWnetsnmp|CSWossl|CSWzlib|CSWcommon|CSWlibfwbuilder|CSWqtgcc none +gadu 1.8.2,REV=2008.12.15 CSWlibgadu gadu-1.8.2,REV=2008.12.15-SunOS5.8-sparc-CSW.pkg.gz c7a3c7b04e7c6fcdcc4b362e5eff0f84 96391 CSWosslrt none +gail 1.21.5.1,REV=2009.08.05 CSWgail gail-1.21.5.1,REV=2009.08.05-SunOS5.8-all-CSW.pkg.gz a1a11e747e4376f78c16277bc8c3f1a2 744 CSWgtk2|CSWcommon none +gal 1.99.11,REV=2004.03.15 CSWgal gal-1.99.11,REV=2004.03.15-SunOS5.8-sparc-CSW.pkg.gz cc44bef4a8858c12ff27cca5b6b37cdc 2009067 CSWaudiofile|CSWbonobo2|CSWcommon|CSWesound|CSWexpat|CSWfconfig|CSWftype2|CSWgconf2|CSWggettext|CSWglib2|CSWgnomevfs2|CSWgtk2|CSWiconv|CSWjpeg|CSWlibart|CSWlibatk|CSWlibbonoboui|CSWlibglade2|CSWlibgnome|CSWlibgnomecanvas|CSWlibgnomeprint|CSWlibgnomeprintui|CSWlibgnomeui|CSWlibpopt|CSWlibxml2|CSWorbit2|CSWossl|CSWpango|CSWzlib none +gal2 2.4.2,REV=2005.04.13 CSWgal2 gal2-2.4.2,REV=2005.04.13-SunOS5.8-sparc-CSW.pkg.gz f84242bd8195f068691af7427327f905 2180591 CSWaudiofile|CSWbonobo2|CSWcommon|CSWesound|CSWexpat|CSWfconfig|CSWftype2|CSWgconf2|CSWggettext|CSWglib2|CSWgnomekeyring|CSWgnomevfs2|CSWgtk2|CSWiconv|CSWjpeg|CSWlibart|CSWlibatk|CSWlibbonoboui|CSWlibglade2|CSWlibgnome|CSWlibgnomecanvas|CSWlibgnomeprint|CSWlibgnomeprintui|CSWlibgnomeui|CSWlibpopt|CSWlibxft2|CSWlibxml2|CSWlibxrender|CSWorbit2|CSWossl|CSWpango|CSWzlib none +gar_devel 1.0,REV=2009.10.07 CSWgardevel gar_devel-1.0,REV=2009.10.07-SunOS5.8-all-CSW.pkg.gz 4cee28bbcc260eea97273ac4b9f00142 1611 CSWgmake|CSWgtar|CSWggrep|CSWdiffutils|CSWgfile|CSWtextutils|CSWwget|CSWfindutils|CSWgsed|CSWgawk|CSWbzip2|CSWlftp|CSWgit|CSWnetcat|CSWsvn|CSWcommon none +gawk 3.1.7,REV=2009.09.15 CSWgawk gawk-3.1.7,REV=2009.09.15-SunOS5.8-sparc-CSW.pkg.gz 7d49e526d537fb3a1417221b40df253c 1426552 CSWcommon|CSWiconv|CSWggettextrt none +gbc 1.06 CSWgbc gbc-1.06-SunOS5.8-sparc-CSW.pkg.gz 85bb4e98b364cf2b062ee760d88826bc 213015 CSWcommon|CSWncurses|CSWreadline none +gcal 3.0.1,REV=2009.05.20 CSWgcal gcal-3.0.1,REV=2009.05.20-SunOS5.8-sparc-CSW.pkg 04882087f933442a9e43b9333f45bc0a 3297280 CSWiconv|CSWncurses|CSWggettextrt none +gcalctool 5.21.91 CSWgcalctool gcalctool-5.21.91-SunOS5.8-sparc-CSW.pkg.gz 554269d6747de58d224054aae868ef5e 1579799 CSWexpat|CSWfconfig|CSWftype2|CSWgconf2|CSWggettext|CSWglib2|CSWgtk2|CSWiconv|CSWlibatk|CSWlibcairo|CSWlibglade2|CSWlibpopt|CSWlibxml2|CSWlibxrender|CSWorbit2|CSWpango|CSWpng|CSWsunmath|CSWzlib none +gcc2 2.95.3,REV=2005.01.04 CSWgcc2 gcc2-2.95.3,REV=2005.01.04-SunOS5.8-sparc-CSW.pkg.gz 6f6aeb731c05858b70edeb53b04b8a43 7442 CSWcommon|CSWgcc2rt|CSWgcc2core|CSWgcc2g++ none +gcc2chill 2.95.3,REV=2005.01.04 CSWgcc2chill gcc2chill-2.95.3,REV=2005.01.04-SunOS5.8-sparc-CSW.pkg.gz 27eeb708ab614994476096e082dafd1f 1145815 CSWcommon|CSWgcc2core|CSWgcc2chillrt none +gcc2chillrt 2.95.3,REV=2005.01.04 CSWgcc2chillrt gcc2chillrt-2.95.3,REV=2005.01.04-SunOS5.8-sparc-CSW.pkg.gz a830fedbf4e84969487aadf7a69442c6 7448 CSWcommon|CSWgcc2corert none +gcc2core 2.95.3,REV=2005.01.04 CSWgcc2core gcc2core-2.95.3,REV=2005.01.04-SunOS5.8-sparc-CSW.pkg.gz c098fcf1cb0cc6b148ab9c4c24b214c7 6313147 CSWcommon|CSWgcc2corert none +gcc2corert 2.95.3,REV=2005.01.04 CSWgcc2corert gcc2corert-2.95.3,REV=2005.01.04-SunOS5.8-sparc-CSW.pkg.gz e5b6c2c8e1dfc555e1c74ce7af72d2ac 74257 CSWcommon none +gcc2g++ 2.95.3,REV=2005.01.04 CSWgcc2g++ gcc2g++-2.95.3,REV=2005.01.04-SunOS5.8-sparc-CSW.pkg.gz 85985efd3413f5d6f9bdaf4ba1c11af7 2372737 CSWcommon|CSWgcc2core|CSWgcc2g++rt none +gcc2g++rt 2.95.3,REV=2005.01.04 CSWgcc2g++rt gcc2g++rt-2.95.3,REV=2005.01.04-SunOS5.8-sparc-CSW.pkg.gz bf379fd8387242015f473603e7016f7d 169907 CSWcommon|CSWgcc2corert none +gcc2g77 2.95.3,REV=2005.01.04 CSWgcc2g77 gcc2g77-2.95.3,REV=2005.01.04-SunOS5.8-sparc-CSW.pkg.gz d37b591e2f3a919928657b8916958a20 3936604 CSWcommon|CSWgcc2core|CSWgcc2g77rt none +gcc2g77rt 2.95.3,REV=2005.01.04 CSWgcc2g77rt gcc2g77rt-2.95.3,REV=2005.01.04-SunOS5.8-sparc-CSW.pkg.gz 1308a2d7c968a697054d616ef734b97f 74029 CSWcommon|CSWgcc2corert none +gcc2java 2.95.3,REV=2005.01.04 CSWgcc2java gcc2java-2.95.3,REV=2005.01.04-SunOS5.8-sparc-CSW.pkg.gz 7f39cd641ebc725f3c330d1164ccb888 1018382 CSWcommon|CSWgcc2core|CSWgcc2javart none +gcc2javart 2.95.3,REV=2005.01.04 CSWgcc2javart gcc2javart-2.95.3,REV=2005.01.04-SunOS5.8-sparc-CSW.pkg.gz 8281e2fd69556d6c0b7ac4f3e3f29272 7442 CSWcommon|CSWgcc2corert none +gcc2objc 2.95.3,REV=2005.01.04 CSWgcc2objc gcc2objc-2.95.3,REV=2005.01.04-SunOS5.8-sparc-CSW.pkg.gz 1514589119d20cdb123c63b36a1f45cd 1129287 CSWcommon|CSWgcc2core|CSWgcc2objcrt none +gcc2objcrt 2.95.3,REV=2005.01.04 CSWgcc2objcrt gcc2objcrt-2.95.3,REV=2005.01.04-SunOS5.8-sparc-CSW.pkg.gz 7a43e88fc7e891edabb6ea90f2da171f 7444 CSWcommon|CSWgcc2corert none +gcc2rt 2.95.3,REV=2005.01.04 CSWgcc2rt gcc2rt-2.95.3,REV=2005.01.04-SunOS5.8-sparc-CSW.pkg.gz 2525bfccec4ea19fcdf19f750dfc2e67 7456 CSWcommon|CSWgcc2corert|CSWgcc2g++rt none +gcc3 3.4.6,REV=2009.06.25 CSWgcc3 gcc3-3.4.6,REV=2009.06.25-SunOS5.8-sparc-CSW.pkg.gz 7ccc6cbf610378b1284e662eedda5504 7690 CSWcommon|CSWgcc3rt|CSWgcc3core|CSWgcc3g++|CSWgcc3rt none +gcc3ada 3.4.6,REV=2009.06.25 CSWgcc3ada gcc3ada-3.4.6,REV=2009.06.25-SunOS5.8-sparc-CSW.pkg.gz eab2ae247775b56b14c9b593fd41df46 15271085 CSWcommon|CSWgcc3core|CSWgcc3adart|CSWiconv none +gcc3adart 3.4.6,REV=2009.06.25 CSWgcc3adart gcc3adart-3.4.6,REV=2009.06.25-SunOS5.8-sparc-CSW.pkg.gz d505d3da3268426a7169072d11284d4c 891213 CSWcommon|CSWgcc3corert none +gcc3core 3.4.6,REV=2009.06.25 CSWgcc3core gcc3core-3.4.6,REV=2009.06.25-SunOS5.8-sparc-CSW.pkg.gz bf7941d664e04dad5ffc3eeea77c9495 12142000 CSWcommon|CSWgcc3corert|CSWtexinfo|CSWgfile|CSWiconv none +gcc3corert 3.4.6,REV=2009.06.25 CSWgcc3corert gcc3corert-3.4.6,REV=2009.06.25-SunOS5.8-sparc-CSW.pkg.gz 1991387f2cb9f545b2a1b254b50638ef 49080 CSWcommon none +gcc3g++ 3.4.6,REV=2009.06.25 CSWgcc3g++ gcc3g++-3.4.6,REV=2009.06.25-SunOS5.8-sparc-CSW.pkg.gz 0b23f20bb324e1a34f21ae6a0f8659c1 10419809 CSWcommon|CSWgcc3core|CSWgcc3g++rt|CSWiconv none +gcc3g++rt 3.4.6,REV=2009.06.25 CSWgcc3g++rt gcc3g++rt-3.4.6,REV=2009.06.25-SunOS5.8-sparc-CSW.pkg.gz f2a5e8230144d0571622cba2bbc051e9 2714276 CSWcommon|CSWgcc3corert none +gcc3g77 3.4.6,REV=2009.06.25 CSWgcc3g77 gcc3g77-3.4.6,REV=2009.06.25-SunOS5.8-sparc-CSW.pkg.gz 629a1759092bc0017b1dc3f2669b520a 4835152 CSWcommon|CSWgcc3core|CSWgcc3g77rt|CSWtexinfo|CSWiconv none +gcc3g77rt 3.4.6,REV=2009.06.25 CSWgcc3g77rt gcc3g77rt-3.4.6,REV=2009.06.25-SunOS5.8-sparc-CSW.pkg.gz ea70f15f572eb3dba3e17fd5ba8013b9 154506 CSWcommon|CSWgcc3corert none +gcc3java 3.4.6,REV=2009.06.25 CSWgcc3java gcc3java-3.4.6,REV=2009.06.25-SunOS5.8-sparc-CSW.pkg.gz a3ef85252d9b821aa24184e6ff5f2c41 49205854 CSWcommon|CSWgcc3core|CSWgcc3javart|CSWtexinfo|CSWgcc3corert|CSWiconv|CSWzlib none +gcc3javart 3.4.6,REV=2009.06.25 CSWgcc3javart gcc3javart-3.4.6,REV=2009.06.25-SunOS5.8-sparc-CSW.pkg.gz 54ac634419c86a179dc7adb99d6a796f 12479639 CSWcommon|CSWgcc3corert|CSWgcc3g++rt none +gcc3objc 3.4.6,REV=2009.06.25 CSWgcc3objc gcc3objc-3.4.6,REV=2009.06.25-SunOS5.8-sparc-CSW.pkg.gz ee6df1d29704fee0a45ef823f1e56b3d 1884230 CSWcommon|CSWgcc3core|CSWgcc3objcrt|CSWiconv none +gcc3objcrt 3.4.6,REV=2009.06.25 CSWgcc3objcrt gcc3objcrt-3.4.6,REV=2009.06.25-SunOS5.8-sparc-CSW.pkg.gz 5049e06732cd8695e8b1c0e93d89cf97 100181 CSWcommon|CSWgcc3corert none +gcc3rt 3.4.6,REV=2009.06.25 CSWgcc3rt gcc3rt-3.4.6,REV=2009.06.25-SunOS5.8-sparc-CSW.pkg.gz 64f29ad1b8d0eb3ffde8c76e729c858e 7697 CSWcommon|CSWgcc3corert|CSWgcc3g++rt none +gcc4ada 4.3.3,REV=2009.05.07 CSWgcc4ada gcc4ada-4.3.3,REV=2009.05.07-SunOS5.8-sparc-CSW.pkg.gz 1187f595f5801df8ff8ac986ac2a3998 30483222 CSWgcc4adart|CSWiconv|CSWlibgmp|CSWlibmpfr|CSWcommon none +gcc4adart 4.3.3,REV=2009.05.07 CSWgcc4adart gcc4adart-4.3.3,REV=2009.05.07-SunOS5.8-sparc-CSW.pkg.gz 95db8ffdc6831f1257a3672f95cab6ba 3451258 CSWgcc4corert|CSWcommon none +gcc4core 4.3.3,REV=2009.05.07 CSWgcc4core gcc4core-4.3.3,REV=2009.05.07-SunOS5.8-sparc-CSW.pkg.gz f44f9ad40f77335de6fee28c73fea9fb 18674593 CSWgcc4corert|CSWbinutils|CSWiconv|CSWlibgmp|CSWlibmpfr|CSWcommon none +gcc4corert 4.3.3,REV=2009.05.07 CSWgcc4corert gcc4corert-4.3.3,REV=2009.05.07-SunOS5.8-sparc-CSW.pkg.gz 7b1c07fc6e77cf27bc4e2eecf98a9ad4 299450 CSWcommon none +gcc4g++ 4.3.3,REV=2009.05.07 CSWgcc4g++ gcc4g++-4.3.3,REV=2009.05.07-SunOS5.8-sparc-CSW.pkg.gz e2599ba72a52f7ecfb2a68c0399543a8 21525202 CSWgcc4g++rt|CSWiconv|CSWlibgmp|CSWlibmpfr|CSWcommon none +gcc4g++rt 4.3.3,REV=2009.05.07 CSWgcc4g++rt gcc4g++rt-4.3.3,REV=2009.05.07-SunOS5.8-sparc-CSW.pkg.gz 5d857bf0232360e1d213981719ac92ea 3562624 CSWgcc4corert|CSWcommon none +gcc4g95 4.0.2,REV=2005.09.29 CSWgcc4g95 gcc4g95-4.0.2,REV=2005.09.29-SunOS5.8-sparc-CSW.pkg.gz 96abef836de912b5b73b6256ed5f94c9 3011180 CSWcommon|CSWgcc4core|CSWgcc4g95rt|CSWiconv none +gcc4g95rt 4.0.2,REV=2005.09.29 CSWgcc4g95rt gcc4g95rt-4.0.2,REV=2005.09.29-SunOS5.8-sparc-CSW.pkg.gz 8caf871f35fb3d0287a7770559424d4a 262243 CSWcommon|CSWgcc4corert|CSWlibgmp none +gcc4gfortran 4.3.3,REV=2009.05.07 CSWgcc4gfortran gcc4gfortran-4.3.3,REV=2009.05.07-SunOS5.8-sparc-CSW.pkg.gz 566772428971ecbddb270cb8b5c48e63 17126451 CSWgcc4gfortranrt|CSWiconv|CSWlibgmp|CSWlibmpfr|CSWcommon none +gcc4gfortranrt 4.3.3,REV=2009.05.07 CSWgcc4gfortranrt gcc4gfortranrt-4.3.3,REV=2009.05.07-SunOS5.8-sparc-CSW.pkg.gz aa22745c8606d60adcea23cfa185259c 1820216 CSWgcc4corert|CSWcommon none +gcc4java 4.3.3,REV=2009.05.07 CSWgcc4java gcc4java-4.3.3,REV=2009.05.07-SunOS5.8-sparc-CSW.pkg.gz 8f55710d54b23a64d6970e02d4986a0e 88943696 CSWgcc4corert|CSWgcc4javart|CSWzlib|CSWiconv|CSWlibgmp|CSWlibmpfr|CSWcommon none +gcc4javart 4.3.3,REV=2009.05.07 CSWgcc4javart gcc4javart-4.3.3,REV=2009.05.07-SunOS5.8-sparc-CSW.pkg.gz a1f696575bd0b53f8bbcc38eb14efd0d 54501567 CSWgcc4corert|CSWgcc4g++rt|CSWcommon none +gcc4objc 4.3.3,REV=2009.05.07 CSWgcc4objc gcc4objc-4.3.3,REV=2009.05.07-SunOS5.8-sparc-CSW.pkg.gz 70c1ed4947eb2e855a87520cb09a456c 14162015 CSWgcc4objcrt|CSWiconv|CSWlibgmp|CSWlibmpfr|CSWcommon none +gcc4objcrt 4.3.3,REV=2009.05.07 CSWgcc4objcrt gcc4objcrt-4.3.3,REV=2009.05.07-SunOS5.8-sparc-CSW.pkg.gz b177394e97ea0db5edf61badd3fcccd9 508454 CSWgcc4corert|CSWcommon none +gconf2 2.21.90 CSWgconf2 gconf2-2.21.90-SunOS5.8-sparc-CSW.pkg.gz 91a06540967a32fd8c1f8d7d47b5ed3d 2319954 CSWexpat|CSWfconfig|CSWftype2|CSWggettext|CSWglib2|CSWgtk2|CSWiconv|CSWlibatk|CSWlibcairo|CSWlibpopt|CSWlibxml2|CSWlibxrender|CSWorbit2|CSWpango|CSWpng|CSWsunmath|CSWzlib none +gconfeditor 2.14.0 CSWgconfeditor gconfeditor-2.14.0-SunOS5.8-sparc-CSW.pkg.gz 41ff820607cbd687303246743e8aff4d 411235 CSWaudiofile|CSWbonobo2|CSWesound|CSWexpat|CSWfconfig|CSWftype2|CSWgconf2|CSWggettext|CSWglib2|CSWgnomekeyring|CSWgnomevfs2|CSWgtk2|CSWiconv|CSWjpeg|CSWlibart|CSWlibatk|CSWlibbonoboui|CSWlibcairo|CSWlibgnome|CSWlibgnomecanvas|CSWlibgnomeui|CSWlibnet|CSWlibpopt|CSWlibxml2|CSWlibxrender|CSWorbit2|CSWossl|CSWpango|CSWpng|CSWsunmath|CSWzlib none +gd 2.0.35,REV=2009.05.17 CSWgd gd-2.0.35,REV=2009.05.17-SunOS5.8-sparc-CSW.pkg.gz a37bfca216e6373a4a7b8c24a7275a4f 241317 CSWisaexec|CSWexpat|CSWfconfig|CSWftype2|CSWiconv|CSWjpeg|CSWpng|CSWxpm|CSWzlib|CSWcommon none +gdb 6.6,REV=2007.05.13 CSWgdb gdb-6.6,REV=2007.05.13-SunOS5.8-sparc-CSW.pkg.gz a4eeb2e19ed9a33655fbfb2a5300996d 2872198 CSWcommon|CSWexpat|CSWggettext|CSWiconv|CSWncurses none +gdbm 1.8.3,REV=2006.01.01 CSWgdbm gdbm-1.8.3,REV=2006.01.01-SunOS5.8-sparc-CSW.pkg.gz 2bbab408f62a2251a83b7235925a278a 49173 none none +gdk_pixbuf 0.22,REV=2009.02.26 CSWgdkpixbuf gdk_pixbuf-0.22,REV=2009.02.26-SunOS5.8-sparc-CSW.pkg.gz dc32d37c4af749c5675c4069e0311218 254656 CSWglib|CSWgtk|CSWjpeg|CSWtiff|CSWpng none +gdm 2.14.10 CSWgdm gdm-2.14.10-SunOS5.8-sparc-CSW.pkg.gz 8284c020bf0ed97555cf8efbd1c1f905 3589640 CSWbonobo2|CSWbzip2|CSWexpat|CSWfconfig|CSWftype2|CSWgconf2|CSWggettext|CSWglib2|CSWgnomevfs2|CSWgtk2|CSWiconv|CSWlibart|CSWlibatk|CSWlibcairo|CSWlibcroco|CSWlibglade2|CSWlibgnomecanvas|CSWlibgsf|CSWlibpopt|CSWlibrsvg|CSWlibxml2|CSWlibxrender|CSWorbit2|CSWossl|CSWpango|CSWpng|CSWsunmath|CSWtcpwrap|CSWzlib none +gdome2 0.8.1,REV=2009.09.11 CSWgdome2 gdome2-0.8.1,REV=2009.09.11-SunOS5.8-sparc-CSW.pkg.gz 30cb15e3fff76e4fd6d71e8b6f7b51d6 341511 CSWggettextrt|CSWglib2|CSWiconv|CSWlibxml2|CSWzlib|CSWcommon none +gedit 2.14.4 CSWgedit gedit-2.14.4-SunOS5.8-sparc-CSW.pkg.gz 1ef88beddcee57d09359e60b067b8af5 3461202 CSWaspell|CSWaudiofile|CSWbonobo2|CSWesound|CSWexpat|CSWfconfig|CSWftype2|CSWgconf2|CSWggettext|CSWglib2|CSWgnomekeyring|CSWgnomevfs2|CSWgtk2|CSWgtksourceview|CSWiconv|CSWjpeg|CSWlibart|CSWlibatk|CSWlibbonoboui|CSWlibcairo|CSWlibglade2|CSWlibgnome|CSWlibgnomecanvas|CSWlibgnomeprint|CSWlibgnomeprintui|CSWlibgnomeui|CSWlibnet|CSWlibpopt|CSWlibxml2|CSWlibxrender|CSWorbit2|CSWossl|CSWpango|CSWpng|CSWsunmath|CSWzlib none +gengetopt 2.22.1,REV=2009.05.12 CSWgengetopt gengetopt-2.22.1,REV=2009.05.12-SunOS5.8-sparc-CSW.pkg.gz 2ed835d92dbd21db8ad9398f1c23eb8c 349210 CSWcommon none +genshi 0.5.1,REV=2009.06.05 CSWgenshi genshi-0.5.1,REV=2009.06.05-SunOS5.8-all-CSW.pkg.gz c6cb47b97b9bab16e5771ddd49bc4f2a 76184 CSWpython-rt|CSWcswclassutils|CSWcommon none +geoip 1.4.6,REV=2009.10.01 CSWgeoip geoip-1.4.6,REV=2009.10.01-SunOS5.8-sparc-CSW.pkg.gz 5a3fa6a7a9edb4c22d8c98a6f7cc416c 181393 CSWgeolitedb|CSWzlib|CSWgcc3corert|CSWcommon none +geoip_devel 1.4.6,REV=2009.10.01 CSWgeoipdevel geoip_devel-1.4.6,REV=2009.10.01-SunOS5.8-sparc-CSW.pkg.gz 549bde975b9cff81ed681846107be8b5 167496 CSWgeoip|CSWcommon none +geolitedb 091001,REV=2009.10.01 CSWgeolitedb geolitedb-091001,REV=2009.10.01-SunOS5.8-all-CSW.pkg.gz 538dfe8db29f2b98310ad699050b57e4 488279 CSWcommon none +geos 2.0.0 CSWgeos geos-2.0.0-SunOS5.8-sparc-CSW.pkg.gz a0619255f9f1762741847d36cebdec8a 7480928 CSWcommon none +gftp 2.0.19,REV=2009.03.18 CSWgftp gftp-2.0.19,REV=2009.03.18-SunOS5.8-sparc-CSW.pkg.gz 246b47e1ae15bdc24603cf73ead1cb53 1195835 CSWreadline|CSWpango|CSWosslrt|CSWncurses|CSWlibatk|CSWiconv|CSWgtk2|CSWglib2|CSWggettextrt|CSWlibcairo|CSWcommon none +ggetopt 1.1.3,REV=2005.11.24 CSWggetopt ggetopt-1.1.3,REV=2005.11.24-SunOS5.8-sparc-CSW.pkg.gz 7a665052e808219f6d7db07801be1335 46040 CSWcommon|CSWggettext|CSWiconv none +ggettext 0.17,REV=2009.02.13 CSWggettext ggettext-0.17,REV=2009.02.13-SunOS5.8-sparc-CSW.pkg.gz ee92f06cbbc84bb0781ea9342898aae8 3006257 CSWggettextrt|CSWiconv|CSWexpat|CSWncurses|CSWcommon|CSWcommon|CSWcommon none +ggettextdoc 0.17,REV=2009.02.11 CSWggettextdoc ggettextdoc-0.17,REV=2009.02.11-SunOS5.8-all-CSW.pkg.gz c09bc0c555fe71b8163ed66db3226f88 801737 CSWggettext|CSWcommon none +ggettextrt 0.17,REV=2009.02.13 CSWggettextrt ggettextrt-0.17,REV=2009.02.13-SunOS5.8-sparc-CSW.pkg.gz e9efc5242d45f5fb0c6e90eaa07e8f27 1296997 CSWiconv|CSWcommon none +ggrep 2.5.4,REV=2009.05.21 CSWggrep ggrep-2.5.4,REV=2009.05.21-SunOS5.8-sparc-CSW.pkg.gz 0a88f96719ec8554035c8cb086705636 354786 CSWcommon|CSWggettextrt|CSWpcrert none @@ Diff output truncated at 100000 characters. @@ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Tue Jan 26 18:01:33 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Tue, 26 Jan 2010 17:01:33 +0000 Subject: [csw-devel] SF.net SVN: gar:[8188] csw/mgar/gar/v2 Message-ID: Revision: 8188 http://gar.svn.sourceforge.net/gar/?rev=8188&view=rev Author: wahwah Date: 2010-01-26 17:01:27 +0000 (Tue, 26 Jan 2010) Log Message: ----------- mGAR v2: checkpkg, more elegant way to find the current file (__file__). Modified Paths: -------------- csw/mgar/gar/v2/bin/checkpkg.d/checkpkg-libs.py csw/mgar/gar/v2/bin/checkpkg.d/checkpkg-obsolete-deps.py csw/mgar/gar/v2/bin/checkpkg.d/checkpkg-you-can-write-your-own.py csw/mgar/gar/v2/lib/python/opencsw_test.py Modified: csw/mgar/gar/v2/bin/checkpkg.d/checkpkg-libs.py =================================================================== --- csw/mgar/gar/v2/bin/checkpkg.d/checkpkg-libs.py 2010-01-26 16:46:41 UTC (rev 8187) +++ csw/mgar/gar/v2/bin/checkpkg.d/checkpkg-libs.py 2010-01-26 17:01:27 UTC (rev 8188) @@ -19,8 +19,7 @@ # The following bit of code sets the correct path to Python libraries # distributed with GAR. -path_list = [os.getcwd(), - os.path.split(sys.argv[0])[0], +path_list = [os.path.dirname(__file__), "..", "..", "lib", "python"] sys.path.append(os.path.join(*path_list)) import checkpkg Modified: csw/mgar/gar/v2/bin/checkpkg.d/checkpkg-obsolete-deps.py =================================================================== --- csw/mgar/gar/v2/bin/checkpkg.d/checkpkg-obsolete-deps.py 2010-01-26 16:46:41 UTC (rev 8187) +++ csw/mgar/gar/v2/bin/checkpkg.d/checkpkg-obsolete-deps.py 2010-01-26 17:01:27 UTC (rev 8188) @@ -10,8 +10,7 @@ # The following bit of code sets the correct path to Python libraries # distributed with GAR. -path_list = [os.getcwd(), - os.path.split(sys.argv[0])[0], +path_list = [os.path.dirname(__file__), "..", "..", "lib", "python"] sys.path.append(os.path.join(*path_list)) import checkpkg Modified: csw/mgar/gar/v2/bin/checkpkg.d/checkpkg-you-can-write-your-own.py =================================================================== --- csw/mgar/gar/v2/bin/checkpkg.d/checkpkg-you-can-write-your-own.py 2010-01-26 16:46:41 UTC (rev 8187) +++ csw/mgar/gar/v2/bin/checkpkg.d/checkpkg-you-can-write-your-own.py 2010-01-26 17:01:27 UTC (rev 8188) @@ -12,8 +12,7 @@ # The following bit of code sets the correct path to Python libraries # distributed with GAR. -path_list = [os.getcwd(), - os.path.split(sys.argv[0])[0], +path_list = [os.path.dirname(__file__), "..", "..", "lib", "python"] sys.path.append(os.path.join(*path_list)) import checkpkg Modified: csw/mgar/gar/v2/lib/python/opencsw_test.py =================================================================== --- csw/mgar/gar/v2/lib/python/opencsw_test.py 2010-01-26 16:46:41 UTC (rev 8187) +++ csw/mgar/gar/v2/lib/python/opencsw_test.py 2010-01-26 17:01:27 UTC (rev 8188) @@ -2,8 +2,9 @@ # $Id$ import opencsw -import unittest +import os.path import re +import unittest CATALOG_DATA_1 = """amavisd_new 2.6.3,REV=2009.04.23 CSWamavisdnew amavisd_new-2.6.3,REV=2009.04.23-SunOS5.8-all-CSW.pkg.gz 831f063d1ba20eb8bea0e0e60ceef3cb 813802 CSWperl|CSWcswclassutils|CSWpmunixsyslog|CSWpmiostringy|CSWpmnetserver|CSWpmmailtools|CSWpmmimetools|CSWpmcompresszlib|CSWpmarchivetar|CSWpmarchivezip|CSWspamassassin|CSWpmberkeleydb|CSWpmconverttnef|CSWpmconvertuulib|CSWpmmaildkim|CSWcommon none amsn 0.94 CSWamsn amsn-0.94-SunOS5.8-all-CSW.pkg.gz 99afd828dd38fb39a37cb8ffd448b098 2420919 CSWtcl|CSWtk|CSWtcltls none @@ -46,9 +47,7 @@ class ParsePackageFileNameTest(unittest.TestCase): def testParsePackageFileName1(self): - # FIXME: it doesn't find the file if the pwd is not the same as the - # location of this file. - test_data = open("testdata/example-catalog.txt") + test_data = open(os.path.join(os.path.split(__file__)[0], "testdata/example-catalog.txt")) split_re = re.compile(r"\s+") for line in test_data: fields = re.split(split_re, line) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bensons at users.sourceforge.net Tue Jan 26 18:43:30 2010 From: bensons at users.sourceforge.net (bensons at users.sourceforge.net) Date: Tue, 26 Jan 2010 17:43:30 +0000 Subject: [csw-devel] SF.net SVN: gar:[8189] csw/mgar/pkg/cpan Message-ID: Revision: 8189 http://gar.svn.sourceforge.net/gar/?rev=8189&view=rev Author: bensons Date: 2010-01-26 17:43:30 +0000 (Tue, 26 Jan 2010) Log Message: ----------- cpan UNIVERSAL-isa: initial GARify Added Paths: ----------- csw/mgar/pkg/cpan/UNIVERSAL-isa/ csw/mgar/pkg/cpan/UNIVERSAL-isa/branches/ csw/mgar/pkg/cpan/UNIVERSAL-isa/tags/ csw/mgar/pkg/cpan/UNIVERSAL-isa/trunk/ csw/mgar/pkg/cpan/UNIVERSAL-isa/trunk/Makefile csw/mgar/pkg/cpan/UNIVERSAL-isa/trunk/checksums csw/mgar/pkg/cpan/UNIVERSAL-isa/trunk/files/ Property changes on: csw/mgar/pkg/cpan/UNIVERSAL-isa/trunk ___________________________________________________________________ Added: svn:ignore + cookies download work Added: svn:externals + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 Added: csw/mgar/pkg/cpan/UNIVERSAL-isa/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/UNIVERSAL-isa/trunk/Makefile (rev 0) +++ csw/mgar/pkg/cpan/UNIVERSAL-isa/trunk/Makefile 2010-01-26 17:43:30 UTC (rev 8189) @@ -0,0 +1,28 @@ +GARNAME = UNIVERSAL-isa +GARVERSION = 1.03 +CATEGORIES = cpan +AUTHOR = CHROMATIC + +DESCRIPTION = Attempt to recover from people calling UNIVERSAL::isa as a function +define BLURB + Whenever you use "isa" in UNIVERSAL as a function, a kitten using + Test::MockObject dies. Normally, the kittens would be helpless, but + if they use UNIVERSAL::isa (the module whose docs you are reading), + the kittens can live long and prosper. + This module replaces UNIVERSAL::isa with a version that makes sure that, + when called as a function on objects which override isa, isa will + call the appropriate method on those objects + In all other cases, the real UNIVERSAL::isa gets called directly. +endef + +PACKAGES = CSWpmuniversalisa +CATALOGNAME = pm_universalisa + +REQUIRED_PKGS = CSWpmmodulebuild + +CONFIGURE_SCRIPTS = $(WORKSRC)/Build.PL +BUILD_SCRIPTS = $(WORKSRC)/Build +TEST_SCRIPTS = $(WORKSRC)/Build +INSTALL_SCRIPTS = $(WORKSRC)/Build + +include gar/category.mk Added: csw/mgar/pkg/cpan/UNIVERSAL-isa/trunk/checksums =================================================================== --- csw/mgar/pkg/cpan/UNIVERSAL-isa/trunk/checksums (rev 0) +++ csw/mgar/pkg/cpan/UNIVERSAL-isa/trunk/checksums 2010-01-26 17:43:30 UTC (rev 8189) @@ -0,0 +1 @@ +0643f2e04cd0b5739fc0908af291c609 UNIVERSAL-isa-1.03.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bensons at users.sourceforge.net Tue Jan 26 18:50:00 2010 From: bensons at users.sourceforge.net (bensons at users.sourceforge.net) Date: Tue, 26 Jan 2010 17:50:00 +0000 Subject: [csw-devel] SF.net SVN: gar:[8190] csw/mgar/pkg/cpan Message-ID: Revision: 8190 http://gar.svn.sourceforge.net/gar/?rev=8190&view=rev Author: bensons Date: 2010-01-26 17:50:00 +0000 (Tue, 26 Jan 2010) Log Message: ----------- cpan UNIVERSAL-can: initial GARify Added Paths: ----------- csw/mgar/pkg/cpan/UNIVERSAL-can/ csw/mgar/pkg/cpan/UNIVERSAL-can/branches/ csw/mgar/pkg/cpan/UNIVERSAL-can/tags/ csw/mgar/pkg/cpan/UNIVERSAL-can/trunk/ csw/mgar/pkg/cpan/UNIVERSAL-can/trunk/Makefile csw/mgar/pkg/cpan/UNIVERSAL-can/trunk/checksums csw/mgar/pkg/cpan/UNIVERSAL-can/trunk/files/ Property changes on: csw/mgar/pkg/cpan/UNIVERSAL-can/trunk ___________________________________________________________________ Added: svn:ignore + cookies download work Added: svn:externals + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 Added: csw/mgar/pkg/cpan/UNIVERSAL-can/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/UNIVERSAL-can/trunk/Makefile (rev 0) +++ csw/mgar/pkg/cpan/UNIVERSAL-can/trunk/Makefile 2010-01-26 17:50:00 UTC (rev 8190) @@ -0,0 +1,27 @@ +GARNAME = UNIVERSAL-can +GARVERSION = 1.16 +CATEGORIES = cpan +AUTHOR = CHROMATIC + +DESCRIPTION = Hack around people calling UNIVERSAL::can() as a function +define BLURB + The UNIVERSAL class provides a few default methods so that all objects + can use them. Object orientation allows programmers to override these + methods in subclasses to provide more specific and appropriate behavior. + Some authors call methods in the UNIVERSAL class on potential invocants + as functions, bypassing any possible overriding. This is wrong and you + should not do it. Unfortunately, not everyone heeds this warning and + their bad code can break your good code. +endef + +PACKAGES = CSWpmuniversalcan +CATALOGNAME = pm_universalcan + +REQUIRED_PKGS = CSWpmmodulebuild + +CONFIGURE_SCRIPTS = $(WORKSRC)/Build.PL +BUILD_SCRIPTS = $(WORKSRC)/Build +TEST_SCRIPTS = $(WORKSRC)/Build +INSTALL_SCRIPTS = $(WORKSRC)/Build + +include gar/category.mk Added: csw/mgar/pkg/cpan/UNIVERSAL-can/trunk/checksums =================================================================== --- csw/mgar/pkg/cpan/UNIVERSAL-can/trunk/checksums (rev 0) +++ csw/mgar/pkg/cpan/UNIVERSAL-can/trunk/checksums 2010-01-26 17:50:00 UTC (rev 8190) @@ -0,0 +1 @@ +8c0ea4949453a710b4d71477c5b9fcb8 UNIVERSAL-can-1.16.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From ellson at users.sourceforge.net Tue Jan 26 20:02:16 2010 From: ellson at users.sourceforge.net (ellson at users.sourceforge.net) Date: Tue, 26 Jan 2010 19:02:16 +0000 Subject: [csw-devel] SF.net SVN: gar:[8191] csw/mgar/pkg/graphviz/trunk Message-ID: Revision: 8191 http://gar.svn.sourceforge.net/gar/?rev=8191&view=rev Author: ellson Date: 2010-01-26 19:02:13 +0000 (Tue, 26 Jan 2010) Log Message: ----------- upgrade to graphviz-2.26.3 - fixed bugs 0004094, 0004114 Modified Paths: -------------- csw/mgar/pkg/graphviz/trunk/Makefile csw/mgar/pkg/graphviz/trunk/checksums Added Paths: ----------- csw/mgar/pkg/graphviz/trunk/files/Draw.c.diff Removed Paths: ------------- csw/mgar/pkg/graphviz/trunk/files/no_svg_in_libcairo.diff Modified: csw/mgar/pkg/graphviz/trunk/Makefile =================================================================== --- csw/mgar/pkg/graphviz/trunk/Makefile 2010-01-26 17:50:00 UTC (rev 8190) +++ csw/mgar/pkg/graphviz/trunk/Makefile 2010-01-26 19:02:13 UTC (rev 8191) @@ -1,5 +1,5 @@ GARNAME = graphviz -GARVERSION = 2.24.0 +GARVERSION = 2.26.3 CATEGORIES = utils DESCRIPTION = Graph visualization tools @@ -14,7 +14,7 @@ # disable dependency checks because plugins depend on libs from base package ENABLE_CHECK = 0 -PATCHFILES = no_svg_in_libcairo.diff +PATCHFILES = Draw.c.diff PACKAGES = CSWgraphviz \ CSWgraphvizdevel \ @@ -36,8 +36,11 @@ # CSWgraphvizruby \ # -INCOMPATIBLE_PKGS = CSWgraphvis CSWgraphviz2 +INCOMPATIBLE_PKGS = CSWgraphvis +# defer for some time to allow CSWgraphviz2 upgrades +# INCOMPATIBLE_PKGS = CSWgraphviz2 + ARCHALL_CSWgraphvizdoc = 1 ARCHALL_CSWgraphvizgraphs = 1 @@ -48,7 +51,7 @@ REQUIRED_PKGS_CSWgraphviz = CSWexpat CSWpango CSWlibcairo CSWgts CSWlibxrender \ CSWgs CSWfconfig CSWftype2 CSWggettextrt CSWglib2 CSWgtk2 CSWiconv \ - CSWlibatk CSWliblasi CSWpng CSWzlib CSWxpm + CSWlibatk CSWliblasi CSWpng CSWzlib CSWxpm CSWlibrsvg REQUIRED_PKGS_CSWgraphvizdevel = REQUIRED_PKGS_CSWgraphvizdoc = REQUIRED_PKGS_CSWgraphvizgraphs = @@ -61,7 +64,7 @@ REQUIRED_PKGS_CSWgraphvizocaml = CSWocaml REQUIRED_PKGS_CSWgraphvizperl = CSWperl REQUIRED_PKGS_CSWgraphvizphp = CSWphp5 -REQUIRED_PKGS_CSWgraphvizpython = CSWpython-rt +REQUIRED_PKGS_CSWgraphvizpython = CSWpython REQUIRED_PKGS_CSWgraphvizr = CSWr REQUIRED_PKGS_CSWgraphvizruby = CSWruby REQUIRED_PKGS_CSWgraphviztcl = CSWtcl CSWtk @@ -116,6 +119,7 @@ PKGFILES_CSWgraphviz += $(mandir)/man1/.*\.1 PKGFILES_CSWgraphviz += $(mandir)/man7/.*\.7 +PKGFILES_CSWgraphvizdevel = $(libdir)/.*\.so PKGFILES_CSWgraphvizdevel = $(libdir)/pkgconfig/.*\.pc PKGFILES_CSWgraphvizdevel += $(includedir)/.*\.h PKGFILES_CSWgraphvizdevel += $(mandir)/man3/.*\.3 @@ -187,12 +191,13 @@ CONFIGURE_ARGS = $(DIRPATHS) CONFIGURE_ARGS += --with-sfdp +CONFIGURE_ARGS += --without-smyrna CONFIGURE_ARGS += --with-gtk CONFIGURE_ARGS += --with-gdk-pixbuf CONFIGURE_ARGS += --with-ghostscript CONFIGURE_ARGS += --with-lasi CONFIGURE_ARGS += --without-ipsepcola -CONFIGURE_ARGS += --without-rsvg +CONFIGURE_ARGS += --with-rsvg CONFIGURE_ARGS += --disable-ruby CONFIGURE_ARGS += --disable-devil CONFIGURE_ARGS += --disable-java Modified: csw/mgar/pkg/graphviz/trunk/checksums =================================================================== --- csw/mgar/pkg/graphviz/trunk/checksums 2010-01-26 17:50:00 UTC (rev 8190) +++ csw/mgar/pkg/graphviz/trunk/checksums 2010-01-26 19:02:13 UTC (rev 8191) @@ -1,7 +1,7 @@ -b66d09e11339fc981ab7c62518b3f92e download/CSWgraphviz.postinstall -b66d09e11339fc981ab7c62518b3f92e download/CSWgraphvizdevil.postinstall -b66d09e11339fc981ab7c62518b3f92e download/CSWgraphvizdevil.postuninstall -b66d09e11339fc981ab7c62518b3f92e download/CSWgraphvizgd.postinstall -b66d09e11339fc981ab7c62518b3f92e download/CSWgraphvizgd.postuninstall -806a30dbc3f8deb219216f35be0e7a40 download/graphviz-2.24.0.tar.gz -5d2209a856b3549918b271cb39e6e761 download/no_svg_in_libcairo.diff +b66d09e11339fc981ab7c62518b3f92e CSWgraphviz.postinstall +b66d09e11339fc981ab7c62518b3f92e CSWgraphvizdevil.postinstall +b66d09e11339fc981ab7c62518b3f92e CSWgraphvizdevil.postuninstall +b66d09e11339fc981ab7c62518b3f92e CSWgraphvizgd.postinstall +b66d09e11339fc981ab7c62518b3f92e CSWgraphvizgd.postuninstall +440058cc9beafc050b858fbf93242eee Draw.c.diff +6f45946fa622770c45609778c0a982ee graphviz-2.26.3.tar.gz Added: csw/mgar/pkg/graphviz/trunk/files/Draw.c.diff =================================================================== --- csw/mgar/pkg/graphviz/trunk/files/Draw.c.diff (rev 0) +++ csw/mgar/pkg/graphviz/trunk/files/Draw.c.diff 2010-01-26 19:02:13 UTC (rev 8191) @@ -0,0 +1,25 @@ +--- graphviz2/cmd/lefty/ws/x11/libfilereq/Draw.c.orig 2010-01-26 13:27:07.000000000 -0500 ++++ graphviz2/cmd/lefty/ws/x11/libfilereq/Draw.c 2010-01-26 13:27:39.000000000 -0500 +@@ -1,4 +1,4 @@ +-/* $Id: Draw.c,v 1.8 2009/10/13 14:20:29 ellson Exp $ $Revision: 1.8 $ */ ++/* $Id: Draw.c,v 1.9 2010/01/26 18:24:35 ellson Exp $ $Revision: 1.9 $ */ + /* vim:set shiftwidth=4 ts=8: */ + + /********************************************************** +@@ -43,8 +43,16 @@ + * erik at sra.co.jp + */ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif + #include ++#ifdef HAVE_STDINT_H + #include ++#endif ++#ifdef HAVE_INTTYPES_H ++#include ++#endif + #include "SFinternal.h" + #include "xstat.h" + #include Deleted: csw/mgar/pkg/graphviz/trunk/files/no_svg_in_libcairo.diff =================================================================== --- csw/mgar/pkg/graphviz/trunk/files/no_svg_in_libcairo.diff 2010-01-26 17:50:00 UTC (rev 8190) +++ csw/mgar/pkg/graphviz/trunk/files/no_svg_in_libcairo.diff 2010-01-26 19:02:13 UTC (rev 8191) @@ -1,31 +0,0 @@ ---- graphviz-2.24.0.orig/plugin/pango/gvrender_pango.c 2009-06-02 21:10:57.000000000 -0400 -+++ graphviz-2.24.0/plugin/pango/gvrender_pango.c 2009-07-22 17:37:30.000000000 -0400 -@@ -1,4 +1,4 @@ --/* $Id: gvrender_pango.c,v 1.67 2009/06/03 01:10:57 ellson Exp $ $Revision: 1.67 $ */ -+/* $Id: gvrender_pango.c,v 1.68 2009/07/22 21:24:26 ellson Exp $ $Revision: 1.68 $ */ - /* vim:set shiftwidth=4 ts=8: */ - - /********************************************************** -@@ -95,16 +95,22 @@ - cairo_destroy(cr); - switch (job->render.id) { - case FORMAT_PS: -+#ifdef CAIRO_HAS_PS_SURFACE - surface = cairo_ps_surface_create_for_stream (writer, - job, job->width, job->height); -+#endif - break; - case FORMAT_PDF: -+#ifdef CAIRO_HAS_PDF_SURFACE - surface = cairo_pdf_surface_create_for_stream (writer, - job, job->width, job->height); -+#endif - break; - case FORMAT_SVG: -+#ifdef CAIRO_HAS_SVG_SURFACE - surface = cairo_svg_surface_create_for_stream (writer, - job, job->width, job->height); -+#endif - break; - case FORMAT_CAIRO: - case FORMAT_PNG: This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From idogan23 at users.sourceforge.net Tue Jan 26 20:56:36 2010 From: idogan23 at users.sourceforge.net (idogan23 at users.sourceforge.net) Date: Tue, 26 Jan 2010 19:56:36 +0000 Subject: [csw-devel] SF.net SVN: gar:[8192] csw/mgar/pkg/cpan/Mail-DKIM/trunk Message-ID: Revision: 8192 http://gar.svn.sourceforge.net/gar/?rev=8192&view=rev Author: idogan23 Date: 2010-01-26 19:56:36 +0000 (Tue, 26 Jan 2010) Log Message: ----------- pm_maildkim: bump version to 0.37 Modified Paths: -------------- csw/mgar/pkg/cpan/Mail-DKIM/trunk/Makefile csw/mgar/pkg/cpan/Mail-DKIM/trunk/checksums Modified: csw/mgar/pkg/cpan/Mail-DKIM/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/Mail-DKIM/trunk/Makefile 2010-01-26 19:02:13 UTC (rev 8191) +++ csw/mgar/pkg/cpan/Mail-DKIM/trunk/Makefile 2010-01-26 19:56:36 UTC (rev 8192) @@ -1,5 +1,5 @@ GARNAME = Mail-DKIM -GARVERSION = 0.36 +GARVERSION = 0.37 CATEGORIES = cpan AUTHOR = JASLONG Modified: csw/mgar/pkg/cpan/Mail-DKIM/trunk/checksums =================================================================== --- csw/mgar/pkg/cpan/Mail-DKIM/trunk/checksums 2010-01-26 19:02:13 UTC (rev 8191) +++ csw/mgar/pkg/cpan/Mail-DKIM/trunk/checksums 2010-01-26 19:56:36 UTC (rev 8192) @@ -1 +1 @@ -b6681a7b3cc21c0976205d4ad616455d download/Mail-DKIM-0.36.tar.gz +f3e84ec6b5e42d4cbcc7c42ea2900649 Mail-DKIM-0.37.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From hson at users.sourceforge.net Tue Jan 26 21:12:25 2010 From: hson at users.sourceforge.net (hson at users.sourceforge.net) Date: Tue, 26 Jan 2010 20:12:25 +0000 Subject: [csw-devel] SF.net SVN: gar:[8193] csw/mgar/pkg/exempi/trunk/Makefile Message-ID: Revision: 8193 http://gar.svn.sourceforge.net/gar/?rev=8193&view=rev Author: hson Date: 2010-01-26 20:12:25 +0000 (Tue, 26 Jan 2010) Log Message: ----------- exempi: Fix URL to upstream site Modified Paths: -------------- csw/mgar/pkg/exempi/trunk/Makefile Modified: csw/mgar/pkg/exempi/trunk/Makefile =================================================================== --- csw/mgar/pkg/exempi/trunk/Makefile 2010-01-26 19:56:36 UTC (rev 8192) +++ csw/mgar/pkg/exempi/trunk/Makefile 2010-01-26 20:12:25 UTC (rev 8193) @@ -33,6 +33,8 @@ PKGFILES_CSWexempidevel = $(PKGFILES_DEVEL) +SPKG_SOURCEURL = http://libopenraw.freedesktop.org/wiki/Exempi + PATCHFILES += Makefiles.patch PATCHFILES += RIFF_Support.cpp PATCHFILES += XML_Node.cpp @@ -45,7 +47,8 @@ EXTRA_CXXFLAGS = -D__EXTENSIONS__ -library=stlport4 # Ugly, but need to owerwrite this since autoconf system doesn't work EXTRA_CXXFLAGS += -DHAVE_NATIVE_TLS=0 -EXTRA_LINKER_FLAGS = -liconv +# Autoconf doesn't find iconv, the rest is found but not runpath +EXTRA_LINKER_FLAGS = -liconv -lexpat -lz CONFIGURE_ARGS = $(DIRPATHS) CONFIGURE_ARGS += --with-boost=/opt/csw This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From skayser at users.sourceforge.net Tue Jan 26 23:43:50 2010 From: skayser at users.sourceforge.net (skayser at users.sourceforge.net) Date: Tue, 26 Jan 2010 22:43:50 +0000 Subject: [csw-devel] SF.net SVN: gar:[8194] csw/mgar/pkg/subversion/trunk Message-ID: Revision: 8194 http://gar.svn.sourceforge.net/gar/?rev=8194&view=rev Author: skayser Date: 2010-01-26 22:43:50 +0000 (Tue, 26 Jan 2010) Log Message: ----------- subversion: corrected changelog.CSW locations Modified Paths: -------------- csw/mgar/pkg/subversion/trunk/Makefile csw/mgar/pkg/subversion/trunk/files/changelog.CSW Modified: csw/mgar/pkg/subversion/trunk/Makefile =================================================================== --- csw/mgar/pkg/subversion/trunk/Makefile 2010-01-26 20:12:25 UTC (rev 8193) +++ csw/mgar/pkg/subversion/trunk/Makefile 2010-01-26 22:43:50 UTC (rev 8194) @@ -56,6 +56,7 @@ REQUIRED_PKGS_CSWsvn-devel = CSWsvn ARCHALL_CSWsvn-devel = 1 PKGFILES_CSWsvn-devel = $(PKGFILES_DEVEL) +PKGFILES_CSWsvn-devel += $(docdir)/$(CATALOGNAME_CSWsvn-devel)/changelog.CSW SPKG_DESC_CSWap2svn = Subversion Modules for Apache 2.2 CATALOGNAME_CSWap2svn = ap2_subversion @@ -63,6 +64,7 @@ REQUIRED_PKGS_CSWap2svn += CSWggettextrt REQUIRED_PKGS_CSWap2svn += CSWiconv PKGFILES_CSWap2svn = $(prefix)/apache2.* +PKGFILES_CSWap2svn += $(docdir)/$(CATALOGNAME_CSWap2svn)/changelog.CSW SPKG_DESC_CSWjavasvn = Subversion Java Language Binding CATALOGNAME_CSWjavasvn = javasvn @@ -74,6 +76,7 @@ REQUIRED_PKGS_CSWjavasvn += CSWneon REQUIRED_PKGS_CSWjavasvn += CSWoldaprt PKGFILES_CSWjavasvn = $(SVNLIB)/.*java.* +PKGFILES_CSWjavasvn += $(docdir)/$(CATALOGNAME_CSWjavasvn)/changelog.CSW SPKG_DESC_CSWpmsvn = Subversion Perl Language Binding CATALOGNAME_CSWpmsvn = pm_subversion @@ -87,6 +90,7 @@ PKGFILES_CSWpmsvn = $(libdir)/perl.* PKGFILES_CSWpmsvn += $(SVNLIB)/.*perl.* PKGFILES_CSWpmsvn += $(mandir)/.*swig_perl.* +PKGFILES_CSWpmsvn += $(docdir)/$(CATALOGNAME_CSWpmsvn)/changelog.CSW SPKG_DESC_CSWrbsvn = Subversion Ruby Language Binding CATALOGNAME_CSWrbsvn = rbsvn @@ -99,6 +103,7 @@ REQUIRED_PKGS_CSWrbsvn += CSWoldaprt PKGFILES_CSWrbsvn = $(libdir)/ruby.* PKGFILES_CSWrbsvn += $(SVNLIB)/.*swig_ruby.* +PKGFILES_CSWrbsvn += $(docdir)/$(CATALOGNAME_CSWrbsvn)/changelog.CSW SPKG_DESC_CSWpythonsvn = Subversion Python Language Binding CATALOGNAME_CSWpythonsvn = pythonsvn @@ -111,6 +116,7 @@ REQUIRED_PKGS_CSWpythonsvn += CSWoldaprt PKGFILES_CSWpythonsvn = $(libdir)/python.* PKGFILES_CSWpythonsvn += $(SVNLIB)/.*swig_py.* +PKGFILES_CSWpythonsvn += $(docdir)/$(CATALOGNAME_CSWpythonsvn)/changelog.CSW DISTFILES += CSWsvn.checkinstall Modified: csw/mgar/pkg/subversion/trunk/files/changelog.CSW =================================================================== --- csw/mgar/pkg/subversion/trunk/files/changelog.CSW 2010-01-26 20:12:25 UTC (rev 8193) +++ csw/mgar/pkg/subversion/trunk/files/changelog.CSW 2010-01-26 22:43:50 UTC (rev 8194) @@ -1,4 +1,4 @@ -subversion (1.6.6,REV=2010.01.19) +subversion (1.6.6,REV=2010.01.26) * Non-maintainer submission. * Restricted cswpycompile usage to python modules. (Closes #4156) @@ -8,4 +8,4 @@ * Dropped libnet dependency (not required). * Reordered RUNPATH and introduced $ISALIB for /opt/csw/lib/, /opt/csw/bdb47. - -- Sebastian Kayser Tue, 19 Jan 2010 12:06:51 +0100 + -- Sebastian Kayser Tue, 26 Jan 2010 23:43:12 +0100 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Wed Jan 27 10:44:52 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Wed, 27 Jan 2010 09:44:52 +0000 Subject: [csw-devel] SF.net SVN: gar:[8195] csw/mgar/pkg Message-ID: Revision: 8195 http://gar.svn.sourceforge.net/gar/?rev=8195&view=rev Author: wahwah Date: 2010-01-27 09:44:52 +0000 (Wed, 27 Jan 2010) Log Message: ----------- chkconfig, alternatives: Initial commit, doesn't compile. Modified Paths: -------------- csw/mgar/pkg/chkconfig/trunk/Makefile csw/mgar/pkg/chkconfig/trunk/checksums Added Paths: ----------- csw/mgar/pkg/alternatives csw/mgar/pkg/chkconfig/ csw/mgar/pkg/chkconfig/trunk/files/alloca.patch Added: csw/mgar/pkg/alternatives =================================================================== --- csw/mgar/pkg/alternatives (rev 0) +++ csw/mgar/pkg/alternatives 2010-01-27 09:44:52 UTC (rev 8195) @@ -0,0 +1 @@ +link chkconfig \ No newline at end of file Property changes on: csw/mgar/pkg/alternatives ___________________________________________________________________ Added: svn:special + * Modified: csw/mgar/pkg/chkconfig/trunk/Makefile =================================================================== --- csw/mgar/pkg/template/trunk/Makefile 2010-01-25 11:29:54 UTC (rev 8165) +++ csw/mgar/pkg/chkconfig/trunk/Makefile 2010-01-27 09:44:52 UTC (rev 8195) @@ -1,185 +1,22 @@ -# Copyright 2009 OpenCSW +# Copyrigh 2009 OpenCSW # Distributed under the terms of the GNU General Public License v2 # $Id$ -## This file contains comments to guide you through various GAR settings. -## Please remove unnecessary comments before committing your code to the code -## repository. The comments to remove are marked with double hashes. -## If you want to remove them all in-place, use: -## gsed -i -e '/^##/d' Makefile -## -## For more information about GAR variables, please see: -## https://sourceforge.net/apps/trac/gar/wiki/GAR%20Variable%20Reference -## -GARNAME = mypkg -GARVERSION = 1.0 -## -## The category that your software fits in. This is not a descriptive field, but -## influences the build process. Depending on the CATEGORIES setting, different -## Makefiles are included from gar/categories/ in your trunk directory, which -## adjust the build settings for the respective category. -## -## Possible settings are: -## apps, cpan, devel, gnome, java, kde, lang, lib, meta, net, python, server, -## utils, x11, xfce, xorg, xtra -CATEGORIES = lib -## -## A one-line description of the package, which will appear in the pkginfo. -DESCRIPTION = -## -## A longer description of the package. This is only for descriptive purposes -## inside the Makefile and is not used elsewhere. +GARNAME = chkconfig +GARVERSION = 1.3.30c +CATEGORIES = utils +DESCRIPTION = define BLURB - + Alternatives system from Red Hat endef -## -## Upstream URL that should show up in the VENDOR field as well as on -## http://opencsw.org/packages/. -SPKG_SOURCEURL = -## -## Whitespace-separated list of URLs to download the source package from. -## There are presets: $(SF_MIRRORS), $(GNU_MIRRORS) and $(GOOGLE_MIRROR). -MASTER_SITES = -## -## SF_PROJ is required if you set $(MASTER_SITES) to $(SF_MIRRORS) and the -## Sourceforge project name differs from $(GARNAME). Specifies the Sourceforge -## project name of the software you wish to download. -## SF_PROJ = -## -## A list of space separated patch filenames from files/ that are to be applied -## to the extracted software before the ./configure stage. Patches need to be -## included in the DISTFILES variable as well. -## PATCHFILES = -## -## Whitespace-separated list of files which comprise this build. mGAR will look -## for the files in the $(FILEDIR) (trunk/files) directory and on the -## $(MASTER_SITES). +SPKG_SOURCEURL = http://www.sfr-fresh.com/unix/privat/chkconfig-1.3.30c.tar.gz/ +MASTER_SITES = http://www.sfr-fresh.com/unix/privat/ +PATCHFILES = alloca.patch DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz -## -## We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz -## -## Catalog name is the name to be used with pkg{-get,util} -i . -## It is different from the system package name, which by convention is CSWpkgname. -## CATALOGNAME = -## -## Set to 1 to mark the package as architecture-independent. -## ARCHALL = 0 -## -## A list of files / patterns that should be excluded from the package. Amends -## the default list of excluded filenames $(MERGE_EXCLUDE_DEFAULT), which -## contains things like libtool .la files and files with a leading ~. -## EXTRA_MERGE_EXCLUDE_FILES = -## -## A list of space separated package names that should be marked as -## incompatible with the current package. This will go into the depend file. -## When a user has one of the incompatible packages installed and installs -## your package, he will be prompted that the incompatible package must be -## removed. He will however not be prevented to install your package without -## removing the conflicting package first. -## INCOMPATIBLE_PKGS = -## -## The name of the license file that should be included in your package. Defaults -## to COPYING. See http://sourceforge.net/apps/trac/gar/wiki/CopyRightfor details -## on including and displaying licenses. -## LICENSE = -## -## A list of space separated package names that should be produced from your -## Makefile. This is used when a software has different components that can be -## packaged and used individually (think runtime libraries, client tools, server -## files, development headers). You don't need to set this when you just want to -## produce one package. -## -## When you set this variable to include more than one package, you also need to -## set PKGFILES_CSWpkgname for each package (except for the first one in your -## $(PACKAGES) list) to define which files go into each package. The first -## package from $(PACKAGES) one will hold all files that are not matched by -## PKGFILES_ for other packages. -## PACKAGES = -## -## If specified, GAR feeds the almost-final package prototype file to -## $(PROTOTYPE_FILTER) and reads the final package prototype file from it. -## $(PROTOTYPE_FILTER) is usually a sed/awk/perl one-liner, which was mostly used -## to prepare the prototype file for use with cswclassutils (see -## $(SPKG_CLASSES)). Now that there are convenience variables for cswclassutils, -## you will rarely have to use this. A still valid use case would be to change -## the file permissions of a file to be set-UID. -## See http://wiki.opencsw.org/cswclassutils-package for common usage information -## PROTOTYPE_FILTER = -## -## cswclassutils settings -## -## A list of action classes. Possible values are: -## none cswpreserveconf cswcpsampleconf cswpycompile cswusergroup cswinitsmf -## cswinetd cswetcservices -## The class 'cswinitsmf' must be the last class listed. When you use cswclassutils, -## you need to add CSWcswclassutils to REQUIRED_PKGS. -## SPKG_CLASSES = none -## Simplified settings for classes: -## PRESERVECONF = -## SAMPLECONF = -## INITSMF = -## USERGROUP = -## ETCSERVICES = -## INETDCONF = -## A list of runtime package dependencies in the form of CSWfoo. -## REQUIRED_PKGS = -## -## A list of packages necessary to build this package -## PREREQUISITE_PKGS = $(REQUIRED_PKGS) -## -## When using non-empty $(PACKAGES): -## REQUIRED_PKGS_CSWpkgname = -## SPKG_DESC_CSWpkgname = -## PKGFILES_CSWpkgname = -## CATALOGNAME_CSWpkgname = -## -## A list of space separated directories where objects should be stripped in -## addition to the bin/ and sbin/ directories. -## STRIP_DIRS = -## -## Define a custom target for the configure phase. When you set this, the target -## that will be used instead of configure: target, is named -## configure-$(CONFIGURE_SCRIPTS) and you will need to define it in your Makefile -## after including gar/gar.include.mk. If you want to skip the configure phase -## completely (for example when your software doesn't need to be compiled) assign -## this variable an empty value. The procedure works for configure, build, -## install and test steps. -## CONFIGURE_SCRIPTS = -## BUILD_SCRIPTS = -## INSTALL_SCRIPTS = -## TEST_SCRIPTS = -## -## Compilation settings -## -## The build directory. -## WORKSRC = $(WORKDIR)/$(GARNAME)-$(GARVERSION) -## -## BUILD_ARGS is passed as an argument to gmake during the build phase. Use this -## for example, if you need to override Makefile variables. -## BUILD_ARGS = -## -## Arguments passed to the ./configure script. +PACKAGES = CSWchkconfig CSWalternatives +SPKG_DESC_CSWalternatives = Alternatives engine from Red Hat chkconfig-$(GARVERSION) +PKGFILES_CSWalternatives = .*alternatives.* +CATALOGNAME_CSWalternatives = alternatives CONFIGURE_ARGS = $(DIRPATHS) -## -## BUILD64 = -## CONFIGURE_ENV = -## EXTRA_CFLAGS = -## EXTRA_LDFLAGS = -## EXTRA_INC = -## EXTRA_LIB = -## GARFLAVOR = -## INSTALL_ARGS = -## OPT_FLAGS_SOS = -xO3 -## OPT_FLAGS_GCC = -O2 -pipe -## -## The compiler to use. Defaults to SOS11, can be also: SOS12, GCC3, GCC4. -## GARCOMPILER = SOS11 -## -# Remove the following rules and uncomment the -# include before building. -all: .DEFAULT -.DEFAULT: - @true - -#include gar/category.mk +include gar/category.mk Modified: csw/mgar/pkg/chkconfig/trunk/checksums =================================================================== --- csw/mgar/pkg/template/trunk/checksums 2010-01-25 11:29:54 UTC (rev 8165) +++ csw/mgar/pkg/chkconfig/trunk/checksums 2010-01-27 09:44:52 UTC (rev 8195) @@ -0,0 +1,2 @@ +02019af22d048085f3006de791a0c95e alloca.patch +592a1fe77f3844d7748adbab6357ee25 chkconfig-1.3.30c.tar.gz Added: csw/mgar/pkg/chkconfig/trunk/files/alloca.patch =================================================================== --- csw/mgar/pkg/chkconfig/trunk/files/alloca.patch (rev 0) +++ csw/mgar/pkg/chkconfig/trunk/files/alloca.patch 2010-01-27 09:44:52 UTC (rev 8195) @@ -0,0 +1,10 @@ +--- chkconfig-1.3.30c/alternatives.c.orig 2010-01-27 10:37:35.945502976 +0100 ++++ chkconfig-1.3.30c/alternatives.c 2010-01-27 10:37:49.088435010 +0100 +@@ -20,6 +20,7 @@ + #include + #include + #include ++#include + + #include "leveldb.h" + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Wed Jan 27 11:28:00 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Wed, 27 Jan 2010 10:28:00 +0000 Subject: [csw-devel] SF.net SVN: gar:[8196] csw/mgar/gar/v2/lib/python Message-ID: Revision: 8196 http://gar.svn.sourceforge.net/gar/?rev=8196&view=rev Author: wahwah Date: 2010-01-27 10:27:59 +0000 (Wed, 27 Jan 2010) Log Message: ----------- mGAR v2: a little bit of cleanup based on pychecker's output Modified Paths: -------------- csw/mgar/gar/v2/lib/python/checkpkg.py csw/mgar/gar/v2/lib/python/gartest.py csw/mgar/gar/v2/lib/python/opencsw.py Modified: csw/mgar/gar/v2/lib/python/checkpkg.py =================================================================== --- csw/mgar/gar/v2/lib/python/checkpkg.py 2010-01-27 09:44:52 UTC (rev 8195) +++ csw/mgar/gar/v2/lib/python/checkpkg.py 2010-01-27 10:27:59 UTC (rev 8196) @@ -12,7 +12,6 @@ import socket import sqlite3 import subprocess -import StringIO from Cheetah import Template import opencsw @@ -191,7 +190,7 @@ logging.debug("Connecting to the %s database.", self.db_path) self.conn = sqlite3.connect(self.db_path) if not self.IsDatabaseUpToDate(): - logging.warning("Rebuilding the package cache, can take a few minutes.") + logging.warning("Rebuilding the package cache, can take a few minutes.") self.PurgeDatabase() self.PopulateDatabase() else: @@ -471,14 +470,13 @@ for runpath in runpath_list: for symlink, expansion_list in SYSTEM_SYMLINKS: for target in expansion_list: - expanded = ExpandSymlink(symlink, target, runpath) + expanded = ExpandSymlink(symlink, target, runpath) if expanded not in symlinked_list: - symlinked_list.append(expanded) + symlinked_list.append(expanded) return symlinked_list def SanitizeRunpath(runpath): - ok = False while True: if runpath.endswith("/"): runpath = runpath[:-1] @@ -507,7 +505,7 @@ # RPATH does not contain $ISALIST. new_soname_runpath_data = {} for p in soname_runpath_data: - expanded_p_list = Emulate64BitSymlinks([p]) + expanded_p_list = Emulate64BitSymlinks([p]) for expanded_p in expanded_p_list: new_soname_runpath_data[expanded_p] = soname_runpath_data[p] soname_runpath_data = new_soname_runpath_data @@ -599,14 +597,14 @@ packages = [] errors = [] for pkgname in self.pkgname_list: - pkg_path = os.path.join(self.extractdir, pkgname) - packages.append(opencsw.DirectoryFormatPackage(pkg_path)) + pkg_path = os.path.join(self.extractdir, pkgname) + packages.append(opencsw.DirectoryFormatPackage(pkg_path)) for pkg in packages: for function in self.individual_checks: - errors.extend(function(pkg)) + errors.extend(function(pkg)) # Set checks for function in self.set_checks: - errors.extend(function(packages)) + errors.extend(function(packages)) namespace = { "name": self.name, "errors": errors, Modified: csw/mgar/gar/v2/lib/python/gartest.py =================================================================== --- csw/mgar/gar/v2/lib/python/gartest.py 2010-01-27 09:44:52 UTC (rev 8195) +++ csw/mgar/gar/v2/lib/python/gartest.py 2010-01-27 10:27:59 UTC (rev 8196) @@ -6,11 +6,9 @@ import Cheetah.Template import shutil import tempfile -import unittest import os import os.path import subprocess -import sys import opencsw """A module used to do end-to-end testing of GAR.""" @@ -45,10 +43,11 @@ class GarBuild(object): - def __init__(self): + def __init__(self, build_dir): self.built = False self.packages = None self.cleanup = True + self.build_dir = build_dir def GetDebugHelp(self): """To be overriden in subclasses.""" @@ -83,7 +82,7 @@ args = ["gmake", "pkglist"] gar_proc = subprocess.Popen(args, cwd=self.build_dir, stdout=subprocess.PIPE) stdout, stderr = gar_proc.communicate() - ret = gar_proc.wait() + unused_ret = gar_proc.wait() pkglist = [] for line in stdout.splitlines(): # directory, catalogname, pkgname @@ -107,8 +106,8 @@ Can create a GAR build and execute it. """ def __init__(self): - super(DynamicGarBuild, self).__init__() - self.build_dir = tempfile.mkdtemp(prefix=TMPDIR_PREFIX) + build_dir = tempfile.mkdtemp(prefix=TMPDIR_PREFIX) + super(DynamicGarBuild, self).__init__(build_dir) self.filedir = os.path.join(self.build_dir, "files") self.makefile_filename = os.path.join(self.build_dir, "Makefile") os.mkdir(self.filedir) @@ -175,11 +174,10 @@ class StaticGarBuild(GarBuild): def __init__(self, build_dir): - super(StaticGarBuild, self).__init__() - self.build_dir = build_dir + super(StaticGarBuild, self).__init__(build_dir) def __del__(self): if self.cleanup: - shutil.rmtree(os.path.join(self.build_dir, "work")) + shutil.rmtree(os.path.join(self.build_dir, "work")) # vim:set ts=2 sts=2 sw=2 expandtab: Modified: csw/mgar/gar/v2/lib/python/opencsw.py =================================================================== --- csw/mgar/gar/v2/lib/python/opencsw.py 2010-01-27 09:44:52 UTC (rev 8195) +++ csw/mgar/gar/v2/lib/python/opencsw.py 2010-01-27 10:27:59 UTC (rev 8196) @@ -372,7 +372,7 @@ shutil.copy(self.pkg_path, self.GetWorkDir()) self.pkg_path = os.path.join(self.GetWorkDir(), base_name_gz) args = ["gunzip", "-f", self.pkg_path] - retcode = self.ShellCommand(args) + unused_retcode = self.ShellCommand(args) self.gunzipped_path = self.pkg_path[:(-len(gzip_suffix))] elif self.pkg_path.endswith(pkg_suffix): self.gunzipped_path = self.pkg_path @@ -385,7 +385,7 @@ if not self.transformed: args = ["pkgtrans", "-a", self.GetAdminFilePath(), self.GetGunzippedPath(), self.GetWorkDir(), "all"] - retcode = self.ShellCommand(args, quiet=True) + unused_retcode = self.ShellCommand(args, quiet=True) dirs = self.GetDirs() if len(dirs) != 1: raise Error("Need exactly one package in the package stream: " @@ -394,7 +394,7 @@ self.transformed = True def GetDirFormatPkg(self): - self.TransformToDir(self) + self.TransformToDir() return self.dir_format_pkg def GetDirs(self): @@ -578,9 +578,9 @@ sum_process = subprocess.Popen(args, stdout=subprocess.PIPE) stdout, stderr = sum_process.communicate() sum_process.wait() - sum = ws_re.split(stdout)[0] + sum_value = ws_re.split(stdout)[0] fields[3] = size - fields[4] = sum + fields[4] = sum_value logging.debug("New pkgmap line: %s", fields) line = " ".join(fields) new_pkgmap_lines.append(line.strip()) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Wed Jan 27 14:21:54 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Wed, 27 Jan 2010 13:21:54 +0000 Subject: [csw-devel] SF.net SVN: gar:[8197] csw/mgar/gar/v2/bin/checkpkg.d/ checkpkg-you-can-write-your-own.py Message-ID: Revision: 8197 http://gar.svn.sourceforge.net/gar/?rev=8197&view=rev Author: wahwah Date: 2010-01-27 13:21:51 +0000 (Wed, 27 Jan 2010) Log Message: ----------- mGAR v2: checkpkg, more help with writing own checkpkg modules Modified Paths: -------------- csw/mgar/gar/v2/bin/checkpkg.d/checkpkg-you-can-write-your-own.py Modified: csw/mgar/gar/v2/bin/checkpkg.d/checkpkg-you-can-write-your-own.py =================================================================== --- csw/mgar/gar/v2/bin/checkpkg.d/checkpkg-you-can-write-your-own.py 2010-01-27 10:27:59 UTC (rev 8196) +++ csw/mgar/gar/v2/bin/checkpkg.d/checkpkg-you-can-write-your-own.py 2010-01-27 13:21:51 UTC (rev 8197) @@ -1,12 +1,11 @@ #!/opt/csw/bin/python2.6 # $Id$ -"""This is a dummy check. You can use it as a boilerplate for your own checks. +"""This is a dummy module. You can use it as a boilerplate for your own modules. Copy it and modify. """ -import logging import os.path import sys @@ -19,7 +18,7 @@ # Defining checking functions. -def CheckIndividualPackage(pkg): +def MyCheckForAsinglePackage(pkg): """Checks an individual package. Gets a DirctoryFormatPackage as an argument, and returns a list of errors. @@ -29,17 +28,24 @@ errors.append(checkpkg.PackageError("There's something wrong.")) """ errors = [] - # Checking code for an individual package goes here. + # Checking code for an individual package goes here. See the + # DirectoryFormatPackage class in lib/python/opencsw.py for the available + # APIs. + + # Here's how to report an error: + something_is_wrong = False + if something_is_wrong: + errors.append(checkpkg.PackageError("There's something wrong.")) return errors -def CheckAsetOfPackages(pkgs): +def MyCheckForAsetOfPackages(pkgs): """Checks a set of packages. Sometimes individual checks aren't enough. If you need to write code which needs to examine multiple packages at the same time, use this function. - Gets a list of packages. + Gets a list of packages, returns a list of errors. """ errors = [] # Checking code goes here. @@ -55,9 +61,9 @@ options.extractdir, pkgnames, options.debug) - # Registering previously defined checks. - check_manager.RegisterIndividualCheck(CheckIndividualPackage) - check_manager.RegisterSetCheck(CheckAsetOfPackages) + # Registering functions defined above. + check_manager.RegisterIndividualCheck(MyCheckForAsinglePackage) + check_manager.RegisterSetCheck(MyCheckForAsetOfPackages) # Running the checks, reporting and exiting. exit_code, report = check_manager.Run() print report.strip() This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Wed Jan 27 14:46:21 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Wed, 27 Jan 2010 13:46:21 +0000 Subject: [csw-devel] SF.net SVN: gar:[8198] csw/mgar/gar/v2/bin/checkpkg Message-ID: Revision: 8198 http://gar.svn.sourceforge.net/gar/?rev=8198&view=rev Author: wahwah Date: 2010-01-27 13:46:21 +0000 (Wed, 27 Jan 2010) Log Message: ----------- mGAR v2: checkpkg, Adding code to remove old *.pyc files which can cause grief. Modified Paths: -------------- csw/mgar/gar/v2/bin/checkpkg Modified: csw/mgar/gar/v2/bin/checkpkg =================================================================== --- csw/mgar/gar/v2/bin/checkpkg 2010-01-27 13:21:51 UTC (rev 8197) +++ csw/mgar/gar/v2/bin/checkpkg 2010-01-27 13:46:21 UTC (rev 8198) @@ -563,6 +563,16 @@ checkpkg_basedir=${0%/${checkpkg_scriptname}} plugindir=${checkpkg_basedir}/checkpkg.d +# Cleaning up old *.pyc files which can cause grief. This is because of the +# move of Python libraries. +for pyc_file in ${plugindir}/opencsw.pyc \ + ${plugindir}/checkpkg.pyc; do + if [ -f "${pyc_file}" ]; then + echo "Removing old pyc file: '${pyc_file}'" + rm "${pyc_file}" + fi +done + # /var/sadm/install/contents cache update ${plugindir}/update_contents_cache.py This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From ellson at users.sourceforge.net Wed Jan 27 14:57:36 2010 From: ellson at users.sourceforge.net (ellson at users.sourceforge.net) Date: Wed, 27 Jan 2010 13:57:36 +0000 Subject: [csw-devel] SF.net SVN: gar:[8199] csw/mgar/pkg/graphviz2/trunk Message-ID: Revision: 8199 http://gar.svn.sourceforge.net/gar/?rev=8199&view=rev Author: ellson Date: 2010-01-27 13:57:36 +0000 (Wed, 27 Jan 2010) Log Message: ----------- update to gar2 clean out files/, checksums, Makefile, Modified Paths: -------------- csw/mgar/pkg/graphviz2/trunk/Makefile csw/mgar/pkg/graphviz2/trunk/checksums Removed Paths: ------------- csw/mgar/pkg/graphviz2/trunk/files/CSWgraphviz2.gspec Property Changed: ---------------- csw/mgar/pkg/graphviz2/trunk/ Property changes on: csw/mgar/pkg/graphviz2/trunk ___________________________________________________________________ Modified: svn:externals - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v1 + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 Modified: csw/mgar/pkg/graphviz2/trunk/Makefile =================================================================== --- csw/mgar/pkg/graphviz2/trunk/Makefile 2010-01-27 13:46:21 UTC (rev 8198) +++ csw/mgar/pkg/graphviz2/trunk/Makefile 2010-01-27 13:57:36 UTC (rev 8199) @@ -1,22 +1,11 @@ GARNAME = graphviz -GARVERSION = 2.20.3 +GARVERSION = 2.20.1 CATEGORIES = utils -DESCRIPTION = Graph drawing utilities with web and graphical interfaces. +DESCRIPTION = ( CSWgraphviz2 is deprecated and replaced by CSWgraphviz 2.24.0 or later ) define BLURB - graphviz is a set of graph drawing tools and libraries. It supports - hierarchical and mass-spring drawings; although the tools are scalable, their - emphasis is on making very good drawings of reasonably-sized graphs. endef -MASTER_SITES = http://www.graphviz.org/pub/graphviz/ARCHIVE/ -DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz +MASTER_SITES = http://www.graphviz.org/pub/graphviz/stable/SOURCES/ -# We define upstream file regex so we can be notifed of new upstream software release -UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz - -CONFIGURE_ARGS = $(DIRPATHS) - -TEST_TARGET = check - include gar/category.mk Modified: csw/mgar/pkg/graphviz2/trunk/checksums =================================================================== --- csw/mgar/pkg/graphviz2/trunk/checksums 2010-01-27 13:46:21 UTC (rev 8198) +++ csw/mgar/pkg/graphviz2/trunk/checksums 2010-01-27 13:57:36 UTC (rev 8199) @@ -1 +0,0 @@ -4d94c4b809a5c095acfc973d8d207fa9 download/graphviz-2.20.3.tar.gz Deleted: csw/mgar/pkg/graphviz2/trunk/files/CSWgraphviz2.gspec =================================================================== --- csw/mgar/pkg/graphviz2/trunk/files/CSWgraphviz2.gspec 2010-01-27 13:46:21 UTC (rev 8198) +++ csw/mgar/pkg/graphviz2/trunk/files/CSWgraphviz2.gspec 2010-01-27 13:57:36 UTC (rev 8199) @@ -1,4 +0,0 @@ -%var bitname graphviz2 -%var pkgname CSWgraphviz2 -%include url file://%{PKGLIB}/csw_dyndepend.gspec -%copyright url file://%{WORKSRC}/COPYING This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From ellson at users.sourceforge.net Wed Jan 27 15:44:47 2010 From: ellson at users.sourceforge.net (ellson at users.sourceforge.net) Date: Wed, 27 Jan 2010 14:44:47 +0000 Subject: [csw-devel] SF.net SVN: gar:[8200] csw/mgar/pkg/graphviz/trunk/Makefile Message-ID: Revision: 8200 http://gar.svn.sourceforge.net/gar/?rev=8200&view=rev Author: ellson Date: 2010-01-27 14:44:47 +0000 (Wed, 27 Jan 2010) Log Message: ----------- add more dependencies Modified Paths: -------------- csw/mgar/pkg/graphviz/trunk/Makefile Modified: csw/mgar/pkg/graphviz/trunk/Makefile =================================================================== --- csw/mgar/pkg/graphviz/trunk/Makefile 2010-01-27 13:57:36 UTC (rev 8199) +++ csw/mgar/pkg/graphviz/trunk/Makefile 2010-01-27 14:44:47 UTC (rev 8200) @@ -52,22 +52,22 @@ REQUIRED_PKGS_CSWgraphviz = CSWexpat CSWpango CSWlibcairo CSWgts CSWlibxrender \ CSWgs CSWfconfig CSWftype2 CSWggettextrt CSWglib2 CSWgtk2 CSWiconv \ CSWlibatk CSWliblasi CSWpng CSWzlib CSWxpm CSWlibrsvg -REQUIRED_PKGS_CSWgraphvizdevel = +REQUIRED_PKGS_CSWgraphvizdevel = CSWgraphviz REQUIRED_PKGS_CSWgraphvizdoc = REQUIRED_PKGS_CSWgraphvizgraphs = -REQUIRED_PKGS_CSWgraphvizgd = CSWgd CSWjpeg +REQUIRED_PKGS_CSWgraphvizgd = CSWgd CSWjpeg CSWgraphviz REQUIRED_PKGS_CSWgraphvizdevil = CSWdevil -REQUIRED_PKGS_CSWgraphvizsharp = CSWmono +REQUIRED_PKGS_CSWgraphvizsharp = CSWmono CSWexpat CSWgraphviz CSWzlib REQUIRED_PKGS_CSWgraphvizguile = CSWguile REQUIRED_PKGS_CSWgraphvizjava = CSWjava REQUIRED_PKGS_CSWgraphvizlua = CSWlua REQUIRED_PKGS_CSWgraphvizocaml = CSWocaml REQUIRED_PKGS_CSWgraphvizperl = CSWperl REQUIRED_PKGS_CSWgraphvizphp = CSWphp5 -REQUIRED_PKGS_CSWgraphvizpython = CSWpython +REQUIRED_PKGS_CSWgraphvizpython = CSWpython CSWexpat CSWgraphviz CSWzlib REQUIRED_PKGS_CSWgraphvizr = CSWr REQUIRED_PKGS_CSWgraphvizruby = CSWruby -REQUIRED_PKGS_CSWgraphviztcl = CSWtcl CSWtk +REQUIRED_PKGS_CSWgraphviztcl = CSWtcl CSWtk CSWgraphviz LICENSE_CSWgraphviz = COPYING LICENSE_CSWgraphvizdevel = COPYING This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Wed Jan 27 16:43:39 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Wed, 27 Jan 2010 15:43:39 +0000 Subject: [csw-devel] SF.net SVN: gar:[8201] csw/mgar/gar/v2 Message-ID: Revision: 8201 http://gar.svn.sourceforge.net/gar/?rev=8201&view=rev Author: wahwah Date: 2010-01-27 15:43:32 +0000 (Wed, 27 Jan 2010) Log Message: ----------- mGAR v2: fixes end-to-end tests by using ENABLE_CHECK= in the argument list. Modified Paths: -------------- csw/mgar/gar/v2/lib/python/gartest.py csw/mgar/gar/v2/tests/example_test.py csw/mgar/gar/v2/tests/run_tests.py Modified: csw/mgar/gar/v2/lib/python/gartest.py =================================================================== --- csw/mgar/gar/v2/lib/python/gartest.py 2010-01-27 14:44:47 UTC (rev 8200) +++ csw/mgar/gar/v2/lib/python/gartest.py 2010-01-27 15:43:32 UTC (rev 8201) @@ -58,7 +58,13 @@ def Build(self): if self.built: return 0 - args = ["gmake", "dirpackage"] + # There's a need to turn off the use of checkpkg, as it needs a pkg.gz + # file, and the dirpackage target doesn't create it. But it's not + # a problem, since the built package needs to be examined in a very + # specific way, we don't want to run all the tests against it. + # + # Hence, "ENABLE_CHECK=". + args = ["gmake", "ENABLE_CHECK=", "dirpackage"] gar_proc = subprocess.Popen(args, cwd=self.build_dir, stdout=subprocess.PIPE, stderr=subprocess.PIPE) @@ -125,9 +131,10 @@ "TEST_SCRIPTS": "", "INSTALL_SCRIPTS": "", } + garsrc = os.path.join(os.getcwd(), os.path.dirname(__file__), "..", "..") self.tmpldata = { "garvars": self.garvars, - "garsrc": os.path.join(os.getcwd(), ".."), + "garsrc": garsrc, "blurb": None, "install_files": self.install_files, "build_dir": self.build_dir, @@ -168,7 +175,8 @@ def __del__(self): if self.cleanup: - shutil.rmtree(self.build_dir) + if os.path.isdir(self.build_dir): + shutil.rmtree(self.build_dir) class StaticGarBuild(GarBuild): @@ -176,8 +184,13 @@ def __init__(self, build_dir): super(StaticGarBuild, self).__init__(build_dir) + def GetDebugHelp(self): + return ("Please look into %s.\n" + % repr(self.build_dir)) + def __del__(self): if self.cleanup: - shutil.rmtree(os.path.join(self.build_dir, "work")) + if os.path.isdir(self.build_dir): + shutil.rmtree(os.path.join(self.build_dir, "work")) # vim:set ts=2 sts=2 sw=2 expandtab: Modified: csw/mgar/gar/v2/tests/example_test.py =================================================================== --- csw/mgar/gar/v2/tests/example_test.py 2010-01-27 14:44:47 UTC (rev 8200) +++ csw/mgar/gar/v2/tests/example_test.py 2010-01-27 15:43:32 UTC (rev 8201) @@ -1,7 +1,8 @@ # $Id$ +import os.path +import sys import unittest -import sys sys.path.append("../lib/python") import gartest @@ -29,7 +30,8 @@ """ def testLooseFiles(self): - mybuild = gartest.StaticGarBuild("static/example") + mybuild = gartest.StaticGarBuild( + os.path.join(os.path.dirname(__file__), "static/example")) mybuild.Build() pkg = mybuild.GetFirstBuiltPackage() pkginfo = pkg.GetParsedPkginfo() Modified: csw/mgar/gar/v2/tests/run_tests.py =================================================================== --- csw/mgar/gar/v2/tests/run_tests.py 2010-01-27 14:44:47 UTC (rev 8200) +++ csw/mgar/gar/v2/tests/run_tests.py 2010-01-27 15:43:32 UTC (rev 8201) @@ -2,10 +2,17 @@ # $Id$ import unittest +import sys +import os.path +module_path = [os.path.dirname(__file__), + "..", "lib", "python"] +sys.path.append(os.path.join(*module_path)) # To add more test files, create .py file and add a corresponding line # here: -from example_test import * +from opencsw_test import * +from checkpkg_test import * +from example_test import * if __name__ == '__main__': unittest.main() This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bensons at users.sourceforge.net Wed Jan 27 16:51:11 2010 From: bensons at users.sourceforge.net (bensons at users.sourceforge.net) Date: Wed, 27 Jan 2010 15:51:11 +0000 Subject: [csw-devel] SF.net SVN: gar:[8202] csw/mgar/pkg/cpan/Test-Exception/trunk Message-ID: Revision: 8202 http://gar.svn.sourceforge.net/gar/?rev=8202&view=rev Author: bensons Date: 2010-01-27 15:51:00 +0000 (Wed, 27 Jan 2010) Log Message: ----------- cpan Test-Exception: bumped to version 0.29 Modified Paths: -------------- csw/mgar/pkg/cpan/Test-Exception/trunk/Makefile csw/mgar/pkg/cpan/Test-Exception/trunk/checksums Removed Paths: ------------- csw/mgar/pkg/cpan/Test-Exception/trunk/files/CSWpmtstexcept.depend csw/mgar/pkg/cpan/Test-Exception/trunk/files/CSWpmtstexcept.gspec Modified: csw/mgar/pkg/cpan/Test-Exception/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/Test-Exception/trunk/Makefile 2010-01-27 15:43:32 UTC (rev 8201) +++ csw/mgar/pkg/cpan/Test-Exception/trunk/Makefile 2010-01-27 15:51:00 UTC (rev 8202) @@ -1,20 +1,30 @@ GARNAME = Test-Exception -GARVERSION = 0.27 +GARVERSION = 0.29 CATEGORIES = cpan AUTHOR = ADIE -DESCRIPTION = Test functions for exception based code +DESCRIPTION = Test exception based code define BLURB - This module provides a few convenience methods for testing exception based - code. It is built with Test::Builder and plays happily with Test::More and - friends. + This module provides a few convenience methods for testing exception + based code. It is built with Test::Builder and plays happily with + Test::More and friends. endef -REQUIRED_PKGS = CSWpmsubuplevel +PACKAGES = CSWpmtstexception +CATALOGNAME = pm_tstexception -PACKAGES = CSWpmtstexcept -CATALOGNAME = pm_tstexcept +# depends +REQUIRED_PKGS = CSWpmsubuplevel +PREREQUISITE_PKGS = CSWpmsubuplevel ARCHALL = 1 include gar/category.mk + +# needed because of perl 5.8 +pre-install-modulated: + gsed -i'' 's,^DESTDIR =,DESTDIR = $(DESTDIR),' $(WORKSRC)/Makefile + gsed -i'' 's,^\(MOD_INSTALL\) =,\1= PERL_INSTALL_ROOT=$(DESTDIR),'\ + $(WORKSRC)/Makefile + perl -pi -e 's/install\(\[ from_to/install_default\(\[ from_to/' \ + $(WORKSRC)/Makefile Modified: csw/mgar/pkg/cpan/Test-Exception/trunk/checksums =================================================================== --- csw/mgar/pkg/cpan/Test-Exception/trunk/checksums 2010-01-27 15:43:32 UTC (rev 8201) +++ csw/mgar/pkg/cpan/Test-Exception/trunk/checksums 2010-01-27 15:51:00 UTC (rev 8202) @@ -1 +1 @@ -dd9383e0bb207c7b0a04d6ba990a5909 download/Test-Exception-0.27.tar.gz +9aea475db531d4fd4ce40cf25a0acd14 Test-Exception-0.29.tar.gz Deleted: csw/mgar/pkg/cpan/Test-Exception/trunk/files/CSWpmtstexcept.depend =================================================================== --- csw/mgar/pkg/cpan/Test-Exception/trunk/files/CSWpmtstexcept.depend 2010-01-27 15:43:32 UTC (rev 8201) +++ csw/mgar/pkg/cpan/Test-Exception/trunk/files/CSWpmtstexcept.depend 2010-01-27 15:51:00 UTC (rev 8202) @@ -1 +0,0 @@ -P CSWpmsubuplevel pm_subuplevel - apparently run a function in a higher stack frame Deleted: csw/mgar/pkg/cpan/Test-Exception/trunk/files/CSWpmtstexcept.gspec =================================================================== --- csw/mgar/pkg/cpan/Test-Exception/trunk/files/CSWpmtstexcept.gspec 2010-01-27 15:43:32 UTC (rev 8201) +++ csw/mgar/pkg/cpan/Test-Exception/trunk/files/CSWpmtstexcept.gspec 2010-01-27 15:51:00 UTC (rev 8202) @@ -1,9 +0,0 @@ -%var bitname pm_testexceptions -%var pkgname CSWpmtestexceptions -%var arch all -%include url file://%{PKGLIB}/csw_cpan.gspec -%copyright -Copyright 2002-2003 Adrian Howard, All Rights Reserved. - -This program is free software; you can redistribute -it and/or modify it under the same terms as Perl itself. This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bensons at users.sourceforge.net Wed Jan 27 17:00:54 2010 From: bensons at users.sourceforge.net (bensons at users.sourceforge.net) Date: Wed, 27 Jan 2010 16:00:54 +0000 Subject: [csw-devel] SF.net SVN: gar:[8203] csw/mgar/pkg/cpan/Net-Pcap/trunk/Makefile Message-ID: Revision: 8203 http://gar.svn.sourceforge.net/gar/?rev=8203&view=rev Author: bensons Date: 2010-01-27 16:00:53 +0000 (Wed, 27 Jan 2010) Log Message: ----------- cpan Net-Pcap: added proper dependency Modified Paths: -------------- csw/mgar/pkg/cpan/Net-Pcap/trunk/Makefile Modified: csw/mgar/pkg/cpan/Net-Pcap/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/Net-Pcap/trunk/Makefile 2010-01-27 15:51:00 UTC (rev 8202) +++ csw/mgar/pkg/cpan/Net-Pcap/trunk/Makefile 2010-01-27 16:00:53 UTC (rev 8203) @@ -13,6 +13,7 @@ CATALOGNAME = pm_netpcap # depends +REQUIRED_PKGS = CSWlibpcap PREREQUISITE_PKGS = CSWlibpcap include gar/category.mk This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bensons at users.sourceforge.net Wed Jan 27 17:10:39 2010 From: bensons at users.sourceforge.net (bensons at users.sourceforge.net) Date: Wed, 27 Jan 2010 16:10:39 +0000 Subject: [csw-devel] SF.net SVN: gar:[8204] csw/mgar/pkg/cpan/Net-Pcap/trunk/Makefile Message-ID: Revision: 8204 http://gar.svn.sourceforge.net/gar/?rev=8204&view=rev Author: bensons Date: 2010-01-27 16:10:39 +0000 (Wed, 27 Jan 2010) Log Message: ----------- cpan Net-Pcap: add prerequisite dependency Modified Paths: -------------- csw/mgar/pkg/cpan/Net-Pcap/trunk/Makefile Modified: csw/mgar/pkg/cpan/Net-Pcap/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/Net-Pcap/trunk/Makefile 2010-01-27 16:00:53 UTC (rev 8203) +++ csw/mgar/pkg/cpan/Net-Pcap/trunk/Makefile 2010-01-27 16:10:39 UTC (rev 8204) @@ -14,6 +14,6 @@ # depends REQUIRED_PKGS = CSWlibpcap -PREREQUISITE_PKGS = CSWlibpcap +PREREQUISITE_PKGS = CSWlibpcap CSWlibpcapdevel include gar/category.mk This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From j_arndt at users.sourceforge.net Wed Jan 27 23:34:03 2010 From: j_arndt at users.sourceforge.net (j_arndt at users.sourceforge.net) Date: Wed, 27 Jan 2010 22:34:03 +0000 Subject: [csw-devel] SF.net SVN: gar:[8205] csw/mgar/pkg/munin/trunk Message-ID: Revision: 8205 http://gar.svn.sourceforge.net/gar/?rev=8205&view=rev Author: j_arndt Date: 2010-01-27 22:34:03 +0000 (Wed, 27 Jan 2010) Log Message: ----------- munin: update to 1.4.3 Modified Paths: -------------- csw/mgar/pkg/munin/trunk/Makefile csw/mgar/pkg/munin/trunk/checksums csw/mgar/pkg/munin/trunk/files/makefile.config.diff csw/mgar/pkg/munin/trunk/files/makefile.diff csw/mgar/pkg/munin/trunk/files/munin-graph.in.diff csw/mgar/pkg/munin/trunk/files/munin-node.conf.in.diff csw/mgar/pkg/munin/trunk/files/munin.conf.in.diff csw/mgar/pkg/munin/trunk/files/perl.diff csw/mgar/pkg/munin/trunk/files/sunos_memory.in.diff Modified: csw/mgar/pkg/munin/trunk/Makefile =================================================================== --- csw/mgar/pkg/munin/trunk/Makefile 2010-01-27 16:10:39 UTC (rev 8204) +++ csw/mgar/pkg/munin/trunk/Makefile 2010-01-27 22:34:03 UTC (rev 8205) @@ -1,5 +1,5 @@ GARNAME = munin -GARVERSION = 1.4.0 +GARVERSION = 1.4.3 CATEGORIES = apps SPKG_DESC_CSWmuninmaster = master component of the graphical network and system monitoring munin @@ -12,7 +12,7 @@ SF_PROJ = munin MASTER_SITES = $(SF_MIRRORS) -DISTFILES = $(GARNAME)_$(GARVERSION).tar.gz +DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz DISTFILES += CSWmuninmaster.postinstall DISTFILES += CSWmuninmaster.prototype CSWmuninmaster.postinstall DISTFILES += CSWmuninnode.prototype cswmuninnode @@ -96,6 +96,7 @@ @ginstall -d $(DESTDIR)/etc/opt/csw/init.d @ginstall -m 755 $(FILEDIR)/cswmuninnode $(DESTDIR)/etc/opt/csw/init.d/cswmuninnode @ginstall -d $(DESTDIR)/opt/csw/share/munin/fonts - @ginstall -m 644 $(DESTDIR)/opt/csw/libexec/munin/VeraMono.ttf $(DESTDIR)/opt/csw/share/munin/fonts/VeraMono.ttf - @rm $(DESTDIR)/opt/csw/libexec/munin/VeraMono.ttf + #@ginstall -m 644 $(DESTDIR)/opt/csw/libexec/munin/VeraMono.ttf $(DESTDIR)/opt/csw/share/munin/fonts/VeraMono.ttf + @ginstall -m 644 $(WORKSRC)/master/VeraMono.ttf $(DESTDIR)/opt/csw/share/munin/fonts/VeraMono.ttf + #@rm $(DESTDIR)/opt/csw/libexec/munin/VeraMono.ttf @$(MAKECOOKIE) Modified: csw/mgar/pkg/munin/trunk/checksums =================================================================== --- csw/mgar/pkg/munin/trunk/checksums 2010-01-27 16:10:39 UTC (rev 8204) +++ csw/mgar/pkg/munin/trunk/checksums 2010-01-27 22:34:03 UTC (rev 8205) @@ -7,11 +7,11 @@ e701d132ba0b6f3dcc90190860f5aa6b download/apache-munin.conf.CSW 31aec7f9a9a452cc6c75c1096c937fdd download/cswmuninnode 50fa4a545f878d79e219891c6ac8d2d2 download/cswusergroup -fd380babe0e8adeb2fdceb2ff38c8e14 download/makefile.config.diff -81ce1cb57e8331fad745635ad9f2debb download/makefile.diff -e5afa54ed754c43b0b53c57ebac31915 download/munin-graph.in.diff -a0754324697266f8ae3530fcbdf885c0 download/munin-node.conf.in.diff -fcecf75276f36a96027976fd7d0dfdf9 download/munin.conf.in.diff -95be0e6eb98c4c7b2a4f2f922b358414 download/munin_1.4.0.tar.gz -9dc05eea4250fc1bc61436493ab9de75 download/perl.diff -7cb3378da78576a51cacd5b753134ccf download/sunos_memory.in.diff +43264e38738fb609a453d22592f4b010 download/makefile.config.diff +07148c7b093dea95f7fcda8bcac53059 download/makefile.diff +229646facc4e2bca6511b20b3e5eb73f download/munin-1.4.3.tar.gz +523afc4767b0548a93bc7b47fc5996ec download/munin-graph.in.diff +0e7e3ae081db51996eb5c01a4f08139f download/munin-node.conf.in.diff +fed7c87522fed3224eac8cb507ddf8d0 download/munin.conf.in.diff +bdb45d45fdf901092e6a5c4711e8223c download/perl.diff +3a39524074d4581373fa20cd5ff5e5b8 download/sunos_memory.in.diff Modified: csw/mgar/pkg/munin/trunk/files/makefile.config.diff =================================================================== --- csw/mgar/pkg/munin/trunk/files/makefile.config.diff 2010-01-27 16:10:39 UTC (rev 8204) +++ csw/mgar/pkg/munin/trunk/files/makefile.config.diff 2010-01-27 22:34:03 UTC (rev 8205) @@ -1,6 +1,6 @@ -diff --speed-large-files --minimal -Nru munin-1.4.0.orig/Makefile.config munin-1.4.0/Makefile.config ---- munin-1.4.0.orig/Makefile.config 2009-11-27 12:17:18.000000000 +0100 -+++ munin-1.4.0/Makefile.config 2009-11-28 16:51:45.380818848 +0100 +diff --speed-large-files --minimal -Nru munin-1.4.3.orig/Makefile.config munin-1.4.3/Makefile.config +--- munin-1.4.3.orig/Makefile.config 2009-12-30 13:55:56.000000000 +0100 ++++ munin-1.4.3/Makefile.config 2010-01-27 12:26:29.445565248 +0100 @@ -14,13 +14,15 @@ # and LOGDIR as subdirectories. Today, DBDIR contains configured # domains, as well as PLUGSTATE, and we risk collisions. Modified: csw/mgar/pkg/munin/trunk/files/makefile.diff =================================================================== --- csw/mgar/pkg/munin/trunk/files/makefile.diff 2010-01-27 16:10:39 UTC (rev 8204) +++ csw/mgar/pkg/munin/trunk/files/makefile.diff 2010-01-27 22:34:03 UTC (rev 8205) @@ -1,6 +1,6 @@ -diff --speed-large-files --minimal -Nru munin-1.4.0.orig/Makefile munin-1.4.0/Makefile ---- munin-1.4.0.orig/Makefile 2009-11-27 12:17:18.000000000 +0100 -+++ munin-1.4.0/Makefile 2009-11-28 18:13:47.250778081 +0100 +diff --speed-large-files --minimal -Nru munin-1.4.3.orig/Makefile munin-1.4.3/Makefile +--- munin-1.4.3.orig/Makefile 2009-12-30 13:55:56.000000000 +0100 ++++ munin-1.4.3/Makefile 2010-01-27 22:01:51.419441374 +0100 @@ -49,8 +49,8 @@ # This removes the installed config so that the next install-pass installs # a new config. Target _only_ suitable for maintainers. @@ -12,7 +12,7 @@ tags: -rm -f TAGS -@@ -66,50 +66,47 @@ +@@ -66,52 +66,51 @@ install-pre: Makefile Makefile.config @$(CHECKUSER) @@ -35,8 +35,6 @@ - mkdir -p $(HTMLDIR) - mkdir -p $(DBDIR) - mkdir -p $(CGIDIR) -- -- $(CHOWN) $(USER) $(HTMLDIR) $(DBDIR) + mkdir -p $(DESTDIR)$(CONFDIR)/templates + mkdir -p $(DESTDIR)$(CONFDIR)/templates/partial + mkdir -p $(DESTDIR)$(CONFDIR)/munin-conf.d @@ -48,6 +46,11 @@ + mkdir -p $(DESTDIR)$(DBDIR) + mkdir -p $(DESTDIR)$(CGIDIR) +- $(CHOWN) $(USER) $(HTMLDIR) $(DBDIR) +- $(CHMOD) 0755 $(DBDIR) ++ #$(CHOWN) $(USER) $(DESTDIR)$(HTMLDIR) $(DESTDIR)$(DBDIR) ++ $(CHMOD) 0755 $(DESTDIR)$(DBDIR) + for p in master/www/*.tmpl master/www/*.png master/www/*.css resources/favicon.ico; do \ - $(INSTALL) -m 0644 "$$p" $(CONFDIR)/templates/ ; \ + $(INSTALL) -m 0644 "$$p" $(DESTDIR)$(CONFDIR)/templates/ ; \ @@ -59,9 +62,11 @@ done - $(INSTALL) -m 0644 master/www/definitions.html $(CONFDIR)/templates/ -- $(INSTALL) -m 0755 master/VeraMono.ttf $(LIBDIR)/ +- $(INSTALL) -m 0755 master/DejaVuSansMono.ttf $(LIBDIR)/ +- $(INSTALL) -m 0755 master/DejaVuSans.ttf $(LIBDIR)/ + $(INSTALL) -m 0644 master/www/definitions.html $(DESTDIR)$(CONFDIR)/templates/ -+ $(INSTALL) -m 0755 master/VeraMono.ttf $(DESTDIR)$(LIBDIR)/ ++ $(INSTALL) -m 0755 master/DejaVuSansMono.ttf $(DESTDIR)$(LIBDIR)/ ++ $(INSTALL) -m 0755 master/DejaVuSans.ttf $(DESTDIR)$(LIBDIR)/ - test -f $(HTMLDIR)/.htaccess || $(INSTALL) -m 0644 build/master/www/munin-htaccess $(HTMLDIR)/.htaccess - test -f "$(CONFDIR)/munin.conf" || $(INSTALL) -m 0644 build/master/munin.conf $(CONFDIR)/ @@ -91,22 +96,23 @@ # ALWAYS DO THE OS SPECIFIC PLUGINS LAST! THAT WAY THEY OVERWRITE THE # GENERIC ONES -@@ -120,28 +117,24 @@ +@@ -122,28 +121,24 @@ install-plugins-prime: install-plugins build $(PLUGINS) Makefile Makefile.config @$(CHECKGROUP) - mkdir -p $(CONFDIR)/plugins - mkdir -p $(CONFDIR)/plugin-conf.d - mkdir -p $(LIBDIR)/plugins +- mkdir -p $(PLUGSTATE) +- +- $(CHOWN) $(PLUGINUSER):$(GROUP) $(PLUGSTATE) +- $(CHMOD) 0775 $(PLUGSTATE) +- $(CHMOD) 0755 $(CONFDIR)/plugin-conf.d + mkdir -p $(DESTDIR)$(CONFDIR)/plugins + mkdir -p $(DESTDIR)$(CONFDIR)/plugin-conf.d + mkdir -p $(DESTDIR)$(LIBDIR)/plugins - mkdir -p $(PLUGSTATE) ++ mkdir -p $(DESTDIR)$(PLUGSTATE) -- $(CHOWN) $(PLUGINUSER):$(GROUP) $(PLUGSTATE) -- $(CHMOD) 0775 $(PLUGSTATE) -- $(CHMOD) 0755 $(CONFDIR)/plugin-conf.d -- for p in build/plugins/node.d/* build/plugins/node.d.$(OSTYPE)/* ; do \ if test -f "$$p" ; then \ echo Installing $$p; \ @@ -129,7 +135,7 @@ #TODO: # configure plugins. Or not. Better done under the direction of the installer -@@ -150,30 +143,30 @@ +@@ -152,30 +147,30 @@ install-node-prime: install-node-pre install-node install-node-pre: build/node/munin-node.conf install-pre @@ -175,7 +181,49 @@ ###################################################################### -@@ -370,20 +363,20 @@ +@@ -189,28 +184,28 @@ + @echo "$< -> $@" + @mkdir -p build/`dirname $<` + @sed -e 's|@@PREFIX@@|$(PREFIX)|g' \ +- -e 's|@@CONFDIR@@|$(CONFDIR)|g' \ +- -e 's|@@BINDIR@@|$(BINDIR)|g' \ +- -e 's|@@SBINDIR@@|$(SBINDIR)|g' \ +- -e 's|@@DOCDIR@@|$(DOCDIR)|g' \ +- -e 's|@@LIBDIR@@|$(LIBDIR)|g' \ ++ -e 's|@@CONFDIR@@|$(DESTDIR)$(CONFDIR)|g' \ ++ -e 's|@@BINDIR@@|$(DESTDIR)$(BINDIR)|g' \ ++ -e 's|@@SBINDIR@@|$(DESTDIR)$(SBINDIR)|g' \ ++ -e 's|@@DOCDIR@@|$(DESTDIR)$(DOCDIR)|g' \ ++ -e 's|@@LIBDIR@@|$(DESTDIR)$(LIBDIR)|g' \ + -e 's|@@MANDIR@@|$(MANDIR)|g' \ +- -e 's|@@LOGDIR@@|$(LOGDIR)|g' \ +- -e 's|@@HTMLDIR@@|$(HTMLDIR)|g' \ +- -e 's|@@DBDIR@@|$(DBDIR)|g' \ +- -e 's|@@STATEDIR@@|$(STATEDIR)|g' \ ++ -e 's|@@LOGDIR@@|$(DESTDIR)$(LOGDIR)|g' \ ++ -e 's|@@HTMLDIR@@|$(DESTDIR)$(HTMLDIR)|g' \ ++ -e 's|@@DBDIR@@|$(DESTDIR)$(DBDIR)|g' \ ++ -e 's|@@STATEDIR@@|$(DESTDIR)$(STATEDIR)|g' \ + -e 's|@@PERL@@|$(PERL)|g' \ +- -e 's|@@PERLLIB@@|$(PERLLIB)|g' \ ++ -e 's|@@PERLLIB@@|$(DESTDIR)$(PERLLIB)|g' \ + -e 's|@@PYTHON@@|$(PYTHON)|g' \ + -e 's|@@RUBY@@|$(RUBY)|g' \ + -e 's|@@JAVARUN@@|$(JAVARUN)|g' \ +- -e 's|@@JAVALIBDIR@@|$(JAVALIBDIR)|g' \ ++ -e 's|@@JAVALIBDIR@@|$(DESTDIR)$(JAVALIBDIR)|g' \ + -e 's|@@OSTYPE@@|$(OSTYPE)|g' \ + -e 's|@@HOSTNAME@@|$(HOSTNAME)|g' \ + -e 's|@@MKTEMP@@|$(MKTEMP)|g' \ + -e 's|@@VERSION@@|$(VERSION)|g' \ +- -e 's|@@PLUGSTATE@@|$(PLUGSTATE)|g' \ +- -e 's|@@CGIDIR@@|$(CGIDIR)|g' \ ++ -e 's|@@PLUGSTATE@@|$(DESTDIR)$(PLUGSTATE)|g' \ ++ -e 's|@@CGIDIR@@|$(DESTDIR)$(CGIDIR)|g' \ + -e 's|@@USER@@|$(USER)|g' \ + -e 's|@@GROUP@@|$(GROUP)|g' \ + -e 's|@@PLUGINUSER@@|$(PLUGINUSER)|g' \ +@@ -354,20 +349,20 @@ $(MAKE) $@ CONFIG=t/Makefile.config else test_plugins = id_default id_root env @@ -204,7 +252,7 @@ echo 'Done?' t/install: -@@ -407,12 +400,12 @@ +@@ -391,12 +386,12 @@ # can't seem to find a way to persuade it to write otherwhere. install-%: %/Build cd $* && $(PERL) Build install \ Modified: csw/mgar/pkg/munin/trunk/files/munin-graph.in.diff =================================================================== --- csw/mgar/pkg/munin/trunk/files/munin-graph.in.diff 2010-01-27 16:10:39 UTC (rev 8204) +++ csw/mgar/pkg/munin/trunk/files/munin-graph.in.diff 2010-01-27 22:34:03 UTC (rev 8205) @@ -1,6 +1,6 @@ -diff --speed-large-files --minimal -Nru munin-1.4.0.orig/master/_bin/munin-graph.in munin-1.4.0/master/_bin/munin-graph.in ---- munin-1.4.0.orig/master/_bin/munin-graph.in 2009-11-27 12:17:18.000000000 +0100 -+++ munin-1.4.0/master/_bin/munin-graph.in 2009-11-28 13:41:02.135025435 +0100 +diff --speed-large-files --minimal -Nru munin-1.4.3.orig/master/_bin/munin-graph.in munin-1.4.3/master/_bin/munin-graph.in +--- munin-1.4.3.orig/master/_bin/munin-graph.in 2009-12-30 13:55:56.000000000 +0100 ++++ munin-1.4.3/master/_bin/munin-graph.in 2010-01-27 15:37:25.532990968 +0100 @@ -135,10 +135,10 @@ =head1 FILES Modified: csw/mgar/pkg/munin/trunk/files/munin-node.conf.in.diff =================================================================== --- csw/mgar/pkg/munin/trunk/files/munin-node.conf.in.diff 2010-01-27 16:10:39 UTC (rev 8204) +++ csw/mgar/pkg/munin/trunk/files/munin-node.conf.in.diff 2010-01-27 22:34:03 UTC (rev 8205) @@ -1,6 +1,17 @@ -diff --speed-large-files --minimal -Nru munin-1.4.0.orig/node/munin-node.conf.in munin-1.4.0/node/munin-node.conf.in ---- munin-1.4.0.orig/node/munin-node.conf.in 2009-11-27 12:17:13.000000000 +0100 -+++ munin-1.4.0/node/munin-node.conf.in 2009-11-28 11:59:12.681167885 +0100 +diff --speed-large-files --minimal -Nru munin-1.4.3.orig/node/munin-node.conf.in munin-1.4.3/node/munin-node.conf.in +--- munin-1.4.3.orig/node/munin-node.conf.in 2009-12-30 13:55:56.000000000 +0100 ++++ munin-1.4.3/node/munin-node.conf.in 2010-01-27 22:15:03.160953219 +0100 +@@ -3,8 +3,8 @@ + # + + log_level 4 +-log_file @@LOGDIR@@/munin-node.log +-pid_file @@STATEDIR@@/munin-node.pid ++log_file /var/opt/csw/munin/munin-node.log ++pid_file /var/opt/csw/munin/munin-node.pid + + background 1 + setsid 1 @@ -26,7 +26,7 @@ # Set this if the client doesn't report the correct hostname when # telnetting to localhost, port 4949 Modified: csw/mgar/pkg/munin/trunk/files/munin.conf.in.diff =================================================================== --- csw/mgar/pkg/munin/trunk/files/munin.conf.in.diff 2010-01-27 16:10:39 UTC (rev 8204) +++ csw/mgar/pkg/munin/trunk/files/munin.conf.in.diff 2010-01-27 22:34:03 UTC (rev 8205) @@ -1,6 +1,6 @@ -diff --speed-large-files --minimal -Nru munin-1.4.0.orig/master/munin.conf.in munin-1.4.0/master/munin.conf.in ---- munin-1.4.0.orig/master/munin.conf.in 2009-11-27 12:17:18.000000000 +0100 -+++ munin-1.4.0/master/munin.conf.in 2009-11-28 12:03:14.865737210 +0100 +diff --speed-large-files --minimal -Nru munin-1.4.3.orig/master/munin.conf.in munin-1.4.3/master/munin.conf.in +--- munin-1.4.3.orig/master/munin.conf.in 2009-12-30 13:55:56.000000000 +0100 ++++ munin-1.4.3/master/munin.conf.in 2010-01-27 15:26:42.127815407 +0100 @@ -57,7 +57,7 @@ #contact.nagios.command /usr/bin/send_nsca nagios.host.comm -c /etc/nsca.conf Modified: csw/mgar/pkg/munin/trunk/files/perl.diff =================================================================== --- csw/mgar/pkg/munin/trunk/files/perl.diff 2010-01-27 16:10:39 UTC (rev 8204) +++ csw/mgar/pkg/munin/trunk/files/perl.diff 2010-01-27 22:34:03 UTC (rev 8205) @@ -1,42 +1,42 @@ -diff --speed-large-files --minimal -Nru munin-1.4.0.orig/master/_bin/munin-update.in munin-1.4.0/master/_bin/munin-update.in ---- munin-1.4.0.orig/master/_bin/munin-update.in 2009-11-27 12:17:18.000000000 +0100 -+++ munin-1.4.0/master/_bin/munin-update.in 2009-11-28 19:30:06.713647230 +0100 +diff --speed-large-files --minimal -Nru munin-1.4.3.orig/master/_bin/munin-update.in munin-1.4.3/master/_bin/munin-update.in +--- munin-1.4.3.orig/master/_bin/munin-update.in 2009-12-30 13:55:56.000000000 +0100 ++++ munin-1.4.3/master/_bin/munin-update.in 2010-01-27 15:45:19.655925252 +0100 @@ -1,4 +1,4 @@ -#! /usr/bin/perl -+#!@@PERL@@ ++#!/opt/csw/bin/perl use warnings; use strict; -diff --speed-large-files --minimal -Nru munin-1.4.0.orig/node/bin/munindoc munin-1.4.0/node/bin/munindoc ---- munin-1.4.0.orig/node/bin/munindoc 2009-11-27 12:17:13.000000000 +0100 -+++ munin-1.4.0/node/bin/munindoc 2009-11-28 19:28:26.453064302 +0100 +diff --speed-large-files --minimal -Nru munin-1.4.3.orig/node/bin/munindoc munin-1.4.3/node/bin/munindoc +--- munin-1.4.3.orig/node/bin/munindoc 2009-12-30 13:55:56.000000000 +0100 ++++ munin-1.4.3/node/bin/munindoc 2010-01-27 15:45:11.095300986 +0100 @@ -1,4 +1,4 @@ -#!/usr/bin/perl -w -+#!/opt/csw/bin/perl -w ++#/opt/csw/bin/perl -w # -*- perl -*- # # This script provides the basis for a plugin documentation system for -diff --speed-large-files --minimal -Nru munin-1.4.0.orig/node/sbin/munin-node munin-1.4.0/node/sbin/munin-node ---- munin-1.4.0.orig/node/sbin/munin-node 2009-11-27 12:17:13.000000000 +0100 -+++ munin-1.4.0/node/sbin/munin-node 2009-11-28 19:28:26.455172374 +0100 +diff --speed-large-files --minimal -Nru munin-1.4.3.orig/node/sbin/munin-node munin-1.4.3/node/sbin/munin-node +--- munin-1.4.3.orig/node/sbin/munin-node 2009-12-30 13:55:56.000000000 +0100 ++++ munin-1.4.3/node/sbin/munin-node 2010-01-27 15:45:47.944337631 +0100 @@ -1,4 +1,4 @@ -#!/usr/bin/perl -wT +#!/opt/csw/bin/perl -wT # -*- cperl -*- # # Copyright (C) 2002-2009 Audun Ytterdal, Jimmy Olsen, Tore Anderson, -diff --speed-large-files --minimal -Nru munin-1.4.0.orig/node/sbin/munin-node-configure munin-1.4.0/node/sbin/munin-node-configure ---- munin-1.4.0.orig/node/sbin/munin-node-configure 2009-11-27 12:17:13.000000000 +0100 -+++ munin-1.4.0/node/sbin/munin-node-configure 2009-11-28 19:28:26.457840168 +0100 +diff --speed-large-files --minimal -Nru munin-1.4.3.orig/node/sbin/munin-node-configure munin-1.4.3/node/sbin/munin-node-configure +--- munin-1.4.3.orig/node/sbin/munin-node-configure 2009-12-30 13:55:56.000000000 +0100 ++++ munin-1.4.3/node/sbin/munin-node-configure 2010-01-27 15:46:18.906920790 +0100 @@ -1,4 +1,4 @@ -#!/usr/bin/perl -w +#!/opt/csw/bin/perl -w # -*- cperl -*- # # Copyright (C) 2003-2006 Jimmy Olsen, Nicolai Langfeldt. -diff --speed-large-files --minimal -Nru munin-1.4.0.orig/node/sbin/munin-run munin-1.4.0/node/sbin/munin-run ---- munin-1.4.0.orig/node/sbin/munin-run 2009-11-27 12:17:13.000000000 +0100 -+++ munin-1.4.0/node/sbin/munin-run 2009-11-28 19:28:26.459939564 +0100 +diff --speed-large-files --minimal -Nru munin-1.4.3.orig/node/sbin/munin-run munin-1.4.3/node/sbin/munin-run +--- munin-1.4.3.orig/node/sbin/munin-run 2009-12-30 13:55:56.000000000 +0100 ++++ munin-1.4.3/node/sbin/munin-run 2010-01-27 15:46:36.558632214 +0100 @@ -1,4 +1,4 @@ -#!/usr/bin/perl -wT +#!/opt/csw/bin/perl -wT Modified: csw/mgar/pkg/munin/trunk/files/sunos_memory.in.diff =================================================================== --- csw/mgar/pkg/munin/trunk/files/sunos_memory.in.diff 2010-01-27 16:10:39 UTC (rev 8204) +++ csw/mgar/pkg/munin/trunk/files/sunos_memory.in.diff 2010-01-27 22:34:03 UTC (rev 8205) @@ -1,17 +1,17 @@ -diff --speed-large-files --minimal -Nru munin-1.4.0.orig/plugins/node.d.sunos/memory.in munin-1.4.0/plugins/node.d.sunos/memory.in ---- munin-1.4.0.orig/plugins/node.d.sunos/memory.in 2009-11-27 12:17:12.000000000 +0100 -+++ munin-1.4.0/plugins/node.d.sunos/memory.in 2009-11-28 11:53:12.048911726 +0100 -@@ -15,7 +15,7 @@ +diff --speed-large-files --minimal -Nru munin-1.4.3.orig/plugins/node.d.sunos/memory.in munin-1.4.3/plugins/node.d.sunos/memory.in +--- munin-1.4.3.orig/plugins/node.d.sunos/memory.in 2009-12-30 13:55:56.000000000 +0100 ++++ munin-1.4.3/plugins/node.d.sunos/memory.in 2010-01-27 15:08:58.425391715 +0100 +@@ -17,7 +17,7 @@ + The following shows the default settings for this plugin: - =item top + [memory] +- env.top /usr/local/bin/top ++ env.top /opt/csw/bin/top --The path to "top" (Default: "/usr/local/bin/top") -+The path to "top" (Default: "/opt/csw/bin/top") + You can also set warning and critical limits with these env settings: - =back +@@ -61,7 +61,7 @@ -@@ -50,7 +50,7 @@ - . $MUNIN_LIBDIR/plugins/plugin.sh -TOP=${top:-/usr/local/bin/top} This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Thu Jan 28 08:44:22 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Thu, 28 Jan 2010 07:44:22 +0000 Subject: [csw-devel] SF.net SVN: gar:[8206] csw/mgar/pkg/pinentry/trunk/Makefile Message-ID: Revision: 8206 http://gar.svn.sourceforge.net/gar/?rev=8206&view=rev Author: wahwah Date: 2010-01-28 07:44:22 +0000 (Thu, 28 Jan 2010) Log Message: ----------- pinentry: Removed 2 unnecessary dependencies Modified Paths: -------------- csw/mgar/pkg/pinentry/trunk/Makefile Modified: csw/mgar/pkg/pinentry/trunk/Makefile =================================================================== --- csw/mgar/pkg/pinentry/trunk/Makefile 2010-01-27 22:34:03 UTC (rev 8205) +++ csw/mgar/pkg/pinentry/trunk/Makefile 2010-01-28 07:44:22 UTC (rev 8206) @@ -25,9 +25,7 @@ REQUIRED_PKGS = CSWfconfig REQUIRED_PKGS += CSWftype2 REQUIRED_PKGS += CSWggettextrt -REQUIRED_PKGS += CSWglib REQUIRED_PKGS += CSWglib2 -REQUIRED_PKGS += CSWgtk REQUIRED_PKGS += CSWgtk2 REQUIRED_PKGS += CSWiconv REQUIRED_PKGS += CSWlibatk This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From ellson at users.sourceforge.net Thu Jan 28 11:59:23 2010 From: ellson at users.sourceforge.net (ellson at users.sourceforge.net) Date: Thu, 28 Jan 2010 10:59:23 +0000 Subject: [csw-devel] SF.net SVN: gar:[8207] csw/mgar/pkg/graphviz/trunk/Makefile Message-ID: Revision: 8207 http://gar.svn.sourceforge.net/gar/?rev=8207&view=rev Author: ellson Date: 2010-01-28 10:59:23 +0000 (Thu, 28 Jan 2010) Log Message: ----------- another attempt at fixing Mantis:0004114 Modified Paths: -------------- csw/mgar/pkg/graphviz/trunk/Makefile Modified: csw/mgar/pkg/graphviz/trunk/Makefile =================================================================== --- csw/mgar/pkg/graphviz/trunk/Makefile 2010-01-28 07:44:22 UTC (rev 8206) +++ csw/mgar/pkg/graphviz/trunk/Makefile 2010-01-28 10:59:23 UTC (rev 8207) @@ -107,20 +107,20 @@ PKGFILES_CSWgraphviz = $(bindir)/(?!(diffimg|dot_static)).* PKGFILES_CSWgraphviz += $(libdir)/lib.*.so\..* -PKGFILES_CSWgraphviz += $(libdir)/graphviz/libgvplugin_core\..* -PKGFILES_CSWgraphviz += $(libdir)/graphviz/libgvplugin_pango\..* -PKGFILES_CSWgraphviz += $(libdir)/graphviz/libgvplugin_rsvg\..* -PKGFILES_CSWgraphviz += $(libdir)/graphviz/libgvplugin_lasi\..* -PKGFILES_CSWgraphviz += $(libdir)/graphviz/libgvplugin_gtk\..* -PKGFILES_CSWgraphviz += $(libdir)/graphviz/libgvplugin_gdk_pixbuf\..* -PKGFILES_CSWgraphviz += $(libdir)/graphviz/libgvplugin_xlib\..* -PKGFILES_CSWgraphviz += $(libdir)/graphviz/libgvplugin_.*layout\..* +PKGFILES_CSWgraphviz += $(libdir)/graphviz/libgvplugin_core\..*\..*\..* +PKGFILES_CSWgraphviz += $(libdir)/graphviz/libgvplugin_pango\..*\..*\..* +PKGFILES_CSWgraphviz += $(libdir)/graphviz/libgvplugin_rsvg\..*\..*\..* +PKGFILES_CSWgraphviz += $(libdir)/graphviz/libgvplugin_lasi\..*\..*\..* +PKGFILES_CSWgraphviz += $(libdir)/graphviz/libgvplugin_gtk\..*\..*\..* +PKGFILES_CSWgraphviz += $(libdir)/graphviz/libgvplugin_gdk_pixbuf\..*\..*\..* +PKGFILES_CSWgraphviz += $(libdir)/graphviz/libgvplugin_xlib\..*\..*\..* +PKGFILES_CSWgraphviz += $(libdir)/graphviz/libgvplugin_.*layout\..*\..*\..* PKGFILES_CSWgraphviz += $(sharedstatedir)/graphviz/lefty/.* PKGFILES_CSWgraphviz += $(mandir)/man1/.*\.1 PKGFILES_CSWgraphviz += $(mandir)/man7/.*\.7 -PKGFILES_CSWgraphvizdevel = $(libdir)/.*\.so PKGFILES_CSWgraphvizdevel = $(libdir)/pkgconfig/.*\.pc +PKGFILES_CSWgraphvizdevel += $(libdir)/.*\.so PKGFILES_CSWgraphvizdevel += $(includedir)/.*\.h PKGFILES_CSWgraphvizdevel += $(mandir)/man3/.*\.3 @@ -128,11 +128,11 @@ PKGFILES_CSWgraphvizgraphs = $(sharedstatedir)/graphviz/graphs/.* -PKGFILES_CSWgraphvizgd = $(libdir)/graphviz/libgvplugin_gd\..* +PKGFILES_CSWgraphvizgd = $(libdir)/graphviz/libgvplugin_gd\..*\..*\..* PKGFILES_CSWgraphvizgd += $(bindir)/diffimg PKGFILES_CSWgraphvizgd += $(bindir)/dot_static -PKGFILES_CSWgraphvizdevil = $(libdir)/graphviz/libgvplugin_devil\..* +PKGFILES_CSWgraphvizdevil = $(libdir)/graphviz/libgvplugin_devil\..*\..*\..* PKGFILES_CSWgraphvizsharp = $(libdir)/graphviz/sharp/.* PKGFILES_CSWgraphvizsharp += $(mandir)/man3/.*\.3sharp This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From ellson at users.sourceforge.net Thu Jan 28 12:35:20 2010 From: ellson at users.sourceforge.net (ellson at users.sourceforge.net) Date: Thu, 28 Jan 2010 11:35:20 +0000 Subject: [csw-devel] SF.net SVN: gar:[8208] csw/mgar/pkg/graphviz/trunk/Makefile Message-ID: Revision: 8208 http://gar.svn.sourceforge.net/gar/?rev=8208&view=rev Author: ellson Date: 2010-01-28 11:35:20 +0000 (Thu, 28 Jan 2010) Log Message: ----------- package .so.6.0.0 and .so.6 for plugins, to track convention on linux Modified Paths: -------------- csw/mgar/pkg/graphviz/trunk/Makefile Modified: csw/mgar/pkg/graphviz/trunk/Makefile =================================================================== --- csw/mgar/pkg/graphviz/trunk/Makefile 2010-01-28 10:59:23 UTC (rev 8207) +++ csw/mgar/pkg/graphviz/trunk/Makefile 2010-01-28 11:35:20 UTC (rev 8208) @@ -107,14 +107,14 @@ PKGFILES_CSWgraphviz = $(bindir)/(?!(diffimg|dot_static)).* PKGFILES_CSWgraphviz += $(libdir)/lib.*.so\..* -PKGFILES_CSWgraphviz += $(libdir)/graphviz/libgvplugin_core\..*\..*\..* -PKGFILES_CSWgraphviz += $(libdir)/graphviz/libgvplugin_pango\..*\..*\..* -PKGFILES_CSWgraphviz += $(libdir)/graphviz/libgvplugin_rsvg\..*\..*\..* -PKGFILES_CSWgraphviz += $(libdir)/graphviz/libgvplugin_lasi\..*\..*\..* -PKGFILES_CSWgraphviz += $(libdir)/graphviz/libgvplugin_gtk\..*\..*\..* -PKGFILES_CSWgraphviz += $(libdir)/graphviz/libgvplugin_gdk_pixbuf\..*\..*\..* -PKGFILES_CSWgraphviz += $(libdir)/graphviz/libgvplugin_xlib\..*\..*\..* -PKGFILES_CSWgraphviz += $(libdir)/graphviz/libgvplugin_.*layout\..*\..*\..* +PKGFILES_CSWgraphviz += $(libdir)/graphviz/libgvplugin_core\.so\..* +PKGFILES_CSWgraphviz += $(libdir)/graphviz/libgvplugin_pango\.so\..* +PKGFILES_CSWgraphviz += $(libdir)/graphviz/libgvplugin_rsvg\.so\..* +PKGFILES_CSWgraphviz += $(libdir)/graphviz/libgvplugin_lasi\.so\..* +PKGFILES_CSWgraphviz += $(libdir)/graphviz/libgvplugin_gtk\.so\..* +PKGFILES_CSWgraphviz += $(libdir)/graphviz/libgvplugin_gdk_pixbuf\.so\..* +PKGFILES_CSWgraphviz += $(libdir)/graphviz/libgvplugin_xlib\.so\..* +PKGFILES_CSWgraphviz += $(libdir)/graphviz/libgvplugin_.*layout\.so\..* PKGFILES_CSWgraphviz += $(sharedstatedir)/graphviz/lefty/.* PKGFILES_CSWgraphviz += $(mandir)/man1/.*\.1 PKGFILES_CSWgraphviz += $(mandir)/man7/.*\.7 @@ -128,11 +128,11 @@ PKGFILES_CSWgraphvizgraphs = $(sharedstatedir)/graphviz/graphs/.* -PKGFILES_CSWgraphvizgd = $(libdir)/graphviz/libgvplugin_gd\..*\..*\..* +PKGFILES_CSWgraphvizgd = $(libdir)/graphviz/libgvplugin_gd\.so\..* PKGFILES_CSWgraphvizgd += $(bindir)/diffimg PKGFILES_CSWgraphvizgd += $(bindir)/dot_static -PKGFILES_CSWgraphvizdevil = $(libdir)/graphviz/libgvplugin_devil\..*\..*\..* +PKGFILES_CSWgraphvizdevil = $(libdir)/graphviz/libgvplugin_devil\.so\..* PKGFILES_CSWgraphvizsharp = $(libdir)/graphviz/sharp/.* PKGFILES_CSWgraphvizsharp += $(mandir)/man3/.*\.3sharp This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Thu Jan 28 13:07:40 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Thu, 28 Jan 2010 12:07:40 +0000 Subject: [csw-devel] SF.net SVN: gar:[8209] csw/mgar/gar/v2/categories/gnome/category.mk Message-ID: Revision: 8209 http://gar.svn.sourceforge.net/gar/?rev=8209&view=rev Author: wahwah Date: 2010-01-28 12:07:40 +0000 (Thu, 28 Jan 2010) Log Message: ----------- mGAR v2: gnome category, adding useful defaults Modified Paths: -------------- csw/mgar/gar/v2/categories/gnome/category.mk Modified: csw/mgar/gar/v2/categories/gnome/category.mk =================================================================== --- csw/mgar/gar/v2/categories/gnome/category.mk 2010-01-28 11:35:20 UTC (rev 8208) +++ csw/mgar/gar/v2/categories/gnome/category.mk 2010-01-28 12:07:40 UTC (rev 8209) @@ -1 +1,13 @@ +# pkg-config options +EXTRA_PKG_CONFIG_PATH += /opt/csw/X11/lib/pkgconfig + +MSGFMT= /opt/csw/bin/gmsgfmt +MSGMERGE= /opt/csw/bin/gmsgmerge +XGETTEXT = /opt/csw/bin/gxgettext +GETTEXT = /opt/csw/bin/ggettext +export MSGMERGE +export MSGFMT +export XGETTEXT +export GETTEXT + include gar/gar.mk This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Thu Jan 28 13:12:06 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Thu, 28 Jan 2010 12:12:06 +0000 Subject: [csw-devel] SF.net SVN: gar:[8210] csw/mgar/gar/v2 Message-ID: Revision: 8210 http://gar.svn.sourceforge.net/gar/?rev=8210&view=rev Author: wahwah Date: 2010-01-28 12:12:06 +0000 (Thu, 28 Jan 2010) Log Message: ----------- mGAR v2: a check for class consistency Modified Paths: -------------- csw/mgar/gar/v2/lib/python/opencsw.py Added Paths: ----------- csw/mgar/gar/v2/bin/checkpkg.d/checkpkg-actionclasses.py Added: csw/mgar/gar/v2/bin/checkpkg.d/checkpkg-actionclasses.py =================================================================== --- csw/mgar/gar/v2/bin/checkpkg.d/checkpkg-actionclasses.py (rev 0) +++ csw/mgar/gar/v2/bin/checkpkg.d/checkpkg-actionclasses.py 2010-01-28 12:12:06 UTC (rev 8210) @@ -0,0 +1,61 @@ +#!/opt/csw/bin/python2.6 +# $Id$ + +"""This is a dummy check. You can use it as a boilerplate for your own checks. + +Copy it and modify. +""" + +import logging +import os.path +import sys +import re + +# The following bit of code sets the correct path to Python libraries +# distributed with GAR. +path_list = [os.path.dirname(__file__), + "..", "..", "lib", "python"] +sys.path.append(os.path.join(*path_list)) +import checkpkg +import opencsw + + +def CheckActionClasses(pkg): + """Checks the consistency between classes in the prototype and pkginfo.""" + errors = [] + pkginfo = pkg.GetParsedPkginfo() + pkgmap = pkg.GetPkgmap() + pkginfo_classes = set(re.split(opencsw.WS_RE, pkginfo["CLASSES"])) + pkgmap_classes = pkgmap.GetClasses() + only_in_pkginfo = pkginfo_classes.difference(pkgmap_classes) + only_in_pkgmap = pkgmap_classes.difference(pkginfo_classes) + for cls in only_in_pkginfo: + errors.append( + opencsw.PackageError("Class %s is only in pkginfo" % repr(cls))) + for cls in only_in_pkgmap: + errors.append( + opencsw.PackageError("Class %s is only in pkgmap" % repr(cls))) + if only_in_pkginfo or only_in_pkgmap: + errors.append( + opencsw.PackageError( + "pkginfo_classes: %s, pkgmap classes: %s" % ( + pkginfo_classes, pkgmap_classes))) + return errors + + +def main(): + options, args = checkpkg.GetOptions() + pkgnames = args + check_manager = checkpkg.CheckpkgManager( + "class action scripts / prototype integrity", + options.extractdir, + pkgnames, + options.debug) + check_manager.RegisterIndividualCheck(CheckActionClasses) + exit_code, report = check_manager.Run() + print report.strip() + sys.exit(exit_code) + + +if __name__ == '__main__': + main() Property changes on: csw/mgar/gar/v2/bin/checkpkg.d/checkpkg-actionclasses.py ___________________________________________________________________ Added: svn:executable + * Added: svn:keywords + Id Modified: csw/mgar/gar/v2/lib/python/opencsw.py =================================================================== --- csw/mgar/gar/v2/lib/python/opencsw.py 2010-01-28 12:07:40 UTC (rev 8209) +++ csw/mgar/gar/v2/lib/python/opencsw.py 2010-01-28 12:12:06 UTC (rev 8210) @@ -196,7 +196,7 @@ for line in catalog_source: # Working around the GPG signature if line.startswith("#"): continue - if "BEGIN PGP SIGNED MESSAGE" in line: continue + if "BEGIN PGP SIGNED MESSAGE" in line: continue if line.startswith("Hash:"): continue if len(line.strip()) <= 0: continue if "BEGIN PGP SIGNATURE" in line: break @@ -631,11 +631,25 @@ class Pkgmap(object): + """Represents the pkgmap of the package. + The plan: + + entries = [ + { + 'path': ..., + 'class': ..., + (more fields?) + }, ... + ] + """ + def __init__(self, input, permissions=False, strip=None): self.paths = set() self.analyze_permissions = permissions + self.entries = [] + self.classes = None for line in input: fields = re.split(r'\s+', line) if strip: @@ -643,19 +657,41 @@ fields = [re.sub(strip_re, "", x) for x in fields] logging.debug(fields) line_to_add = None + installed_path = None + prototype_class = None if len(fields) < 2: continue elif fields[1] in ('f', 'd'): line_to_add = fields[3] + installed_path = fields[3] + prototype_class = fields[2] if self.analyze_permissions: line_to_add += " %s" % fields[4] elif fields[1] in ('s', 'l'): link_from, link_to = fields[3].split("=") + installed_path = link_from line_to_add = "%s --> %s" % (link_from, link_to) + prototype_class = fields[2] if line_to_add: self.paths.add(line_to_add) + entry = { + "line": line, + } + if installed_path: + entry["path"] = installed_path + entry["class"] = prototype_class + self.entries.append(entry) + def GetClasses(self): + """The assumtion is that the set of classes never changes.""" + if not self.classes: + self.classes = set() + for entry in self.entries: + if entry["class"]: + self.classes.add(entry["class"]) + return self.classes + class PackageComparator(object): def __init__(self, file_name_a, file_name_b, This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Thu Jan 28 15:51:16 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 28 Jan 2010 14:51:16 +0000 Subject: [csw-devel] SF.net SVN: gar:[8211] csw/mgar/pkg Message-ID: Revision: 8211 http://gar.svn.sourceforge.net/gar/?rev=8211&view=rev Author: dmichelsen Date: 2010-01-28 14:51:10 +0000 (Thu, 28 Jan 2010) Log Message: ----------- graphviz: Add symlink and stub package for CSWgraphviz2 Modified Paths: -------------- csw/mgar/pkg/graphviz/trunk/Makefile Removed Paths: ------------- csw/mgar/pkg/graphviz2/ Modified: csw/mgar/pkg/graphviz/trunk/Makefile =================================================================== --- csw/mgar/pkg/graphviz/trunk/Makefile 2010-01-28 12:12:06 UTC (rev 8210) +++ csw/mgar/pkg/graphviz/trunk/Makefile 2010-01-28 14:51:10 UTC (rev 8211) @@ -38,11 +38,16 @@ INCOMPATIBLE_PKGS = CSWgraphvis +# This is a compatibility package which should go away after some time. +# It only contains a link to CSWgraphviz. +PACKAGES += CSWgraphviz2 + # defer for some time to allow CSWgraphviz2 upgrades # INCOMPATIBLE_PKGS = CSWgraphviz2 ARCHALL_CSWgraphvizdoc = 1 ARCHALL_CSWgraphvizgraphs = 1 +ARCHALL_CSWgraphviz2 = 1 # Sun's CC is broken on 64bit architectures! #BUILD64 = 1 @@ -68,6 +73,7 @@ REQUIRED_PKGS_CSWgraphvizr = CSWr REQUIRED_PKGS_CSWgraphvizruby = CSWruby REQUIRED_PKGS_CSWgraphviztcl = CSWtcl CSWtk CSWgraphviz +REQUIRED_PKGS_CSWgraphviz2 = CSWgraphviz LICENSE_CSWgraphviz = COPYING LICENSE_CSWgraphvizdevel = COPYING @@ -86,6 +92,7 @@ LICENSE_CSWgraphvizr = COPYING LICENSE_CSWgraphvizruby = COPYING LICENSE_CSWgraphviztcl = COPYING +LICENSE_CSWgraphviz2 = COPYING SPKG_DESC_CSWgraphviz = Graph Visualization Tools SPKG_DESC_CSWgraphvizdevel = Graphviz Headers etc. for development @@ -104,6 +111,7 @@ SPKG_DESC_CSWgraphvizr = Graphviz language binding for R SPKG_DESC_CSWgraphvizruby = Graphviz language binding for ruby SPKG_DESC_CSWgraphviztcl = Graphviz language binding for tcl +SPKG_DESC_CSWgraphviz2 = Stub to the CSWgraphviz package PKGFILES_CSWgraphviz = $(bindir)/(?!(diffimg|dot_static)).* PKGFILES_CSWgraphviz += $(libdir)/lib.*.so\..* @@ -181,6 +189,8 @@ PKGFILES_CSWgraphviztcl += $(sharedstatedir)/graphviz/demo/.*\.tcl.README PKGFILES_CSWgraphviztcl += $(sharedstatedir)/graphviz/demo/pathplan_data/.* +PKGFILES_CSWgraphviz2 = $(prefix)/graphviz2 + DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz DISTFILES += CSWgraphviz.postinstall DISTFILES += CSWgraphvizgd.postinstall CSWgraphvizgd.postuninstall @@ -217,3 +227,7 @@ test-custom: @echo " ==> Testing $(GARNAME) (custom)" @$(MAKECOOKIE) + +post-merge: + gln -s . $(PKGROOT)$(prefix)/graphviz2 + @$(MAKECOOKIE) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From ellson at users.sourceforge.net Thu Jan 28 16:44:12 2010 From: ellson at users.sourceforge.net (ellson at users.sourceforge.net) Date: Thu, 28 Jan 2010 15:44:12 +0000 Subject: [csw-devel] SF.net SVN: gar:[8212] csw/mgar/pkg/graphviz/trunk/Makefile Message-ID: Revision: 8212 http://gar.svn.sourceforge.net/gar/?rev=8212&view=rev Author: ellson Date: 2010-01-28 15:44:01 +0000 (Thu, 28 Jan 2010) Log Message: ----------- don't include .so of plugins Modified Paths: -------------- csw/mgar/pkg/graphviz/trunk/Makefile Modified: csw/mgar/pkg/graphviz/trunk/Makefile =================================================================== --- csw/mgar/pkg/graphviz/trunk/Makefile 2010-01-28 14:51:10 UTC (rev 8211) +++ csw/mgar/pkg/graphviz/trunk/Makefile 2010-01-28 15:44:01 UTC (rev 8212) @@ -114,7 +114,7 @@ SPKG_DESC_CSWgraphviz2 = Stub to the CSWgraphviz package PKGFILES_CSWgraphviz = $(bindir)/(?!(diffimg|dot_static)).* -PKGFILES_CSWgraphviz += $(libdir)/lib.*.so\..* +PKGFILES_CSWgraphviz += $(libdir)/lib.*\.so\..* PKGFILES_CSWgraphviz += $(libdir)/graphviz/libgvplugin_core\.so\..* PKGFILES_CSWgraphviz += $(libdir)/graphviz/libgvplugin_pango\.so\..* PKGFILES_CSWgraphviz += $(libdir)/graphviz/libgvplugin_rsvg\.so\..* @@ -128,7 +128,7 @@ PKGFILES_CSWgraphviz += $(mandir)/man7/.*\.7 PKGFILES_CSWgraphvizdevel = $(libdir)/pkgconfig/.*\.pc -PKGFILES_CSWgraphvizdevel += $(libdir)/.*\.so +PKGFILES_CSWgraphvizdevel += $(libdir)/lib.*\.so PKGFILES_CSWgraphvizdevel += $(includedir)/.*\.h PKGFILES_CSWgraphvizdevel += $(mandir)/man3/.*\.3 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Thu Jan 28 16:48:52 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 28 Jan 2010 15:48:52 +0000 Subject: [csw-devel] SF.net SVN: gar:[8213] csw/mgar/pkg Message-ID: Revision: 8213 http://gar.svn.sourceforge.net/gar/?rev=8213&view=rev Author: dmichelsen Date: 2010-01-28 15:48:45 +0000 (Thu, 28 Jan 2010) Log Message: ----------- ufraw: Initial commit, doesn't compile yet Added Paths: ----------- csw/mgar/pkg/ufraw/ csw/mgar/pkg/ufraw/branches/ csw/mgar/pkg/ufraw/tags/ csw/mgar/pkg/ufraw/trunk/ csw/mgar/pkg/ufraw/trunk/Makefile csw/mgar/pkg/ufraw/trunk/checksums csw/mgar/pkg/ufraw/trunk/files/ Property changes on: csw/mgar/pkg/ufraw/trunk ___________________________________________________________________ Added: svn:ignore + cookies download work Added: svn:externals + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 Added: csw/mgar/pkg/ufraw/trunk/Makefile =================================================================== --- csw/mgar/pkg/ufraw/trunk/Makefile (rev 0) +++ csw/mgar/pkg/ufraw/trunk/Makefile 2010-01-28 15:48:45 UTC (rev 8213) @@ -0,0 +1,19 @@ +GARNAME = ufraw +GARVERSION = 0.16 +CATEGORIES = apps + +DESCRIPTION = A tool for reading and manipulating raw images from digital cameras +define BLURB +endef + +MASTER_SITES = $(SF_MIRRORS) +DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz + +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + +REQUIRED_PKGS = CSWlibgnugetopt CSWliblensfun + +CONFIGURE_ARGS = $(DIRPATHS) + +include gar/category.mk Added: csw/mgar/pkg/ufraw/trunk/checksums =================================================================== --- csw/mgar/pkg/ufraw/trunk/checksums (rev 0) +++ csw/mgar/pkg/ufraw/trunk/checksums 2010-01-28 15:48:45 UTC (rev 8213) @@ -0,0 +1 @@ +61e100e42f17e3a7fcfae64506eebd14 ufraw-0.16.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Thu Jan 28 20:57:32 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 28 Jan 2010 19:57:32 +0000 Subject: [csw-devel] SF.net SVN: gar:[8214] csw/mgar/pkg/gzip/trunk/Makefile Message-ID: Revision: 8214 http://gar.svn.sourceforge.net/gar/?rev=8214&view=rev Author: dmichelsen Date: 2010-01-28 19:57:31 +0000 (Thu, 28 Jan 2010) Log Message: ----------- gzip: Split off gzip extras Modified Paths: -------------- csw/mgar/pkg/gzip/trunk/Makefile Modified: csw/mgar/pkg/gzip/trunk/Makefile =================================================================== --- csw/mgar/pkg/gzip/trunk/Makefile 2010-01-28 15:48:45 UTC (rev 8213) +++ csw/mgar/pkg/gzip/trunk/Makefile 2010-01-28 19:57:31 UTC (rev 8214) @@ -4,6 +4,11 @@ DESCRIPTION = GNU zip define BLURB + gzip (GNU zip) is a compression utility designed to be a replacement for compress. + Its main advantages over compress are much better compression and freedom from patented + algorithms. It has been adopted by the GNU project and is now relatively popular on the + Internet. gzip was written by Jean-loup Gailly (jloup at gzip.org), and Mark Adler for the + decompression code. endef MASTER_SITES = $(GNU_MIRROR) @@ -25,12 +30,26 @@ # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz -REQUIRED_PKGS = CSWggrep +PACKAGES = CSWgzip CSWgzipextras +CATALOGNAME_CSWgzip = gzip +CATALOGNAME_CSWgzipextras = gzip_extras + +SPKG_DESC_CSWgzip = GNU zip +SPKG_DESC_CSWgzipextras = GNU zip additional tools + +REQUIRED_PKGS_CSWgzipextras = CSWgzip CSWggrep + CONFIGURE_ARGS = $(DIRPATHS) TEST_TARGET = check EXTRA_MERGE_EXCLUDE_FILES = $(libdir)/charset.alias +PKGFILES_CSWgzip = $(bindir)/gzip +PKGFILES_CSWgzip += $(bindir)/gunzip +PKGFILES_CSWgzip += $(bindir)/uncompress +PKGFILES_CSWgzip += $(mandir)/man1/gzip\.1 +PKGFILES_CSWgzip += $(mandir)/man1/gunzip\.1 + include gar/category.mk This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Thu Jan 28 22:18:34 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Thu, 28 Jan 2010 21:18:34 +0000 Subject: [csw-devel] SF.net SVN: gar:[8215] csw/mgar/gar/v2 Message-ID: Revision: 8215 http://gar.svn.sourceforge.net/gar/?rev=8215&view=rev Author: wahwah Date: 2010-01-28 21:18:33 +0000 (Thu, 28 Jan 2010) Log Message: ----------- mGAR v2: checkpkg, don't error out on surplus classes in pkginfo; allow to override the max length of the pkgname Modified Paths: -------------- csw/mgar/gar/v2/bin/checkpkg csw/mgar/gar/v2/bin/checkpkg.d/checkpkg-actionclasses.py csw/mgar/gar/v2/lib/python/checkpkg.py csw/mgar/gar/v2/lib/python/opencsw.py Modified: csw/mgar/gar/v2/bin/checkpkg =================================================================== --- csw/mgar/gar/v2/bin/checkpkg 2010-01-28 19:57:31 UTC (rev 8214) +++ csw/mgar/gar/v2/bin/checkpkg 2010-01-28 21:18:33 UTC (rev 8215) @@ -23,6 +23,7 @@ PATH=$PATH:/usr/sbin +readonly NAME_MAX_LENGTH=${NAME_MAX_LENGTH:-20} LOCAL_ARCH=`uname -p` if [[ -z "${CHECKPKG_TMPDIR}" ]]; then @@ -262,8 +263,8 @@ print basedir="'$basedir'" fi -if [[ ${#software} -gt 20 ]] ; then errmsg $f: software name greater than 20 chars ; fi -if [[ ${#pkgname} -gt 20 ]] ; then errmsg $f: pkg name greater than 20 chars; fi +if [[ ${#software} -gt ${NAME_MAX_LENGTH} ]] ; then errmsg $f: software name greater than 20 chars ; fi +if [[ ${#pkgname} -gt ${NAME_MAX_LENGTH} ]] ; then errmsg $f: pkg name greater than 20 chars; fi if [ "$software" = "" ] ; then errmsg $f: software field not set properly in NAME ; fi if [ "$pkgname" = "" ] ; then errmsg $f: pkgname field blank ; fi Modified: csw/mgar/gar/v2/bin/checkpkg.d/checkpkg-actionclasses.py =================================================================== --- csw/mgar/gar/v2/bin/checkpkg.d/checkpkg-actionclasses.py 2010-01-28 19:57:31 UTC (rev 8214) +++ csw/mgar/gar/v2/bin/checkpkg.d/checkpkg-actionclasses.py 2010-01-28 21:18:33 UTC (rev 8215) @@ -30,16 +30,14 @@ only_in_pkginfo = pkginfo_classes.difference(pkgmap_classes) only_in_pkgmap = pkgmap_classes.difference(pkginfo_classes) for cls in only_in_pkginfo: - errors.append( - opencsw.PackageError("Class %s is only in pkginfo" % repr(cls))) + print "Class %s of %s is only in pkginfo" % (repr(cls), pkg.pkgname) + print "This shouldn't cause any problems, but it might be not necessary." for cls in only_in_pkgmap: - errors.append( - opencsw.PackageError("Class %s is only in pkgmap" % repr(cls))) + errors.append( + opencsw.PackageError("Class %s is only in pkgmap" % repr(cls))) if only_in_pkginfo or only_in_pkgmap: - errors.append( - opencsw.PackageError( - "pkginfo_classes: %s, pkgmap classes: %s" % ( - pkginfo_classes, pkgmap_classes))) + print ("pkginfo_classes: %s, pkgmap classes: %s" + % (pkginfo_classes, pkgmap_classes)) return errors Modified: csw/mgar/gar/v2/lib/python/checkpkg.py =================================================================== --- csw/mgar/gar/v2/lib/python/checkpkg.py 2010-01-28 19:57:31 UTC (rev 8214) +++ csw/mgar/gar/v2/lib/python/checkpkg.py 2010-01-28 21:18:33 UTC (rev 8215) @@ -68,9 +68,12 @@ ERROR_REPORT_TMPL = u"""#if $errors ERROR: One or more errors have been found by $name. -#for $error in $errors -$repr($error) +#for $pkgname in $errors +$pkgname: +#for $error in $errors[$pkgname] + $repr($error) #end for +#end for #else #if $debug OK: $name found no problems. @@ -595,16 +598,20 @@ Returns a tuple of an exit code and a report. """ packages = [] - errors = [] + errors = {} for pkgname in self.pkgname_list: pkg_path = os.path.join(self.extractdir, pkgname) packages.append(opencsw.DirectoryFormatPackage(pkg_path)) for pkg in packages: for function in self.individual_checks: - errors.extend(function(pkg)) + errors_for_pkg = function(pkg) + if errors_for_pkg: + errors[pkg.pkgname] = errors_for_pkg # Set checks for function in self.set_checks: - errors.extend(function(packages)) + set_errors = function(packages) + if set_errors: + errors["The package set"] = set_errors namespace = { "name": self.name, "errors": errors, Modified: csw/mgar/gar/v2/lib/python/opencsw.py =================================================================== --- csw/mgar/gar/v2/lib/python/opencsw.py 2010-01-28 19:57:31 UTC (rev 8214) +++ csw/mgar/gar/v2/lib/python/opencsw.py 2010-01-28 21:18:33 UTC (rev 8215) @@ -522,6 +522,7 @@ def __init__(self, directory): self.directory = directory + self.pkgname = os.path.split(directory)[1] self.pkginfo_dict = None def GetParsedPkginfo(self): This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From janholzh at users.sourceforge.net Fri Jan 29 09:06:06 2010 From: janholzh at users.sourceforge.net (janholzh at users.sourceforge.net) Date: Fri, 29 Jan 2010 08:06:06 +0000 Subject: [csw-devel] SF.net SVN: gar:[8216] csw/mgar/pkg/transmission/trunk Message-ID: Revision: 8216 http://gar.svn.sourceforge.net/gar/?rev=8216&view=rev Author: janholzh Date: 2010-01-29 08:06:06 +0000 (Fri, 29 Jan 2010) Log Message: ----------- transmission: Update to 1.83 Modified Paths: -------------- csw/mgar/pkg/transmission/trunk/Makefile csw/mgar/pkg/transmission/trunk/checksums Modified: csw/mgar/pkg/transmission/trunk/Makefile =================================================================== --- csw/mgar/pkg/transmission/trunk/Makefile 2010-01-28 21:18:33 UTC (rev 8215) +++ csw/mgar/pkg/transmission/trunk/Makefile 2010-01-29 08:06:06 UTC (rev 8216) @@ -1,5 +1,5 @@ GARNAME = transmission -GARVERSION = 1.82 +GARVERSION = 1.83 CATEGORIES = net DESCRIPTION = Fast, easy, and free multi-platform BitTorrent client Modified: csw/mgar/pkg/transmission/trunk/checksums =================================================================== --- csw/mgar/pkg/transmission/trunk/checksums 2010-01-28 21:18:33 UTC (rev 8215) +++ csw/mgar/pkg/transmission/trunk/checksums 2010-01-29 08:06:06 UTC (rev 8216) @@ -1,3 +1,3 @@ cbdb5cfaf24b68727042c3828b252534 icons-makefile.patch 7124b4836210a10fe649bba75c706cc9 linker-include.patch -00fe9cc2c4f8e004c89825812e387fc4 transmission-1.82.tar.bz2 +fbdc151040ec64f55c3f28be60a21060 transmission-1.83.tar.bz2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From hson at users.sourceforge.net Fri Jan 29 10:18:43 2010 From: hson at users.sourceforge.net (hson at users.sourceforge.net) Date: Fri, 29 Jan 2010 09:18:43 +0000 Subject: [csw-devel] SF.net SVN: gar:[8217] csw/mgar/pkg/libfpx/trunk Message-ID: Revision: 8217 http://gar.svn.sourceforge.net/gar/?rev=8217&view=rev Author: hson Date: 2010-01-29 09:18:43 +0000 (Fri, 29 Jan 2010) Log Message: ----------- libfpx: Sun Studio compile problems fixed Modified Paths: -------------- csw/mgar/pkg/libfpx/trunk/Makefile Added Paths: ----------- csw/mgar/pkg/libfpx/trunk/files/tchar.patch Modified: csw/mgar/pkg/libfpx/trunk/Makefile =================================================================== --- csw/mgar/pkg/libfpx/trunk/Makefile 2010-01-29 08:06:06 UTC (rev 8216) +++ csw/mgar/pkg/libfpx/trunk/Makefile 2010-01-29 09:18:43 UTC (rev 8217) @@ -32,7 +32,7 @@ SPKG_SOURCEURL = http://www.imagemagick.org PATCHFILES = olecomm.h.patch -#PATCHFILES += tchar.patch +PATCHFILES += tchar.patch LICENSE = flashpix.h @@ -49,6 +49,6 @@ BUILD64 = 1 # libfpx have some problems with rw/trait -GARCOMPILER = GCC4 +#GARCOMPILER = GCC4 include gar/category.mk Added: csw/mgar/pkg/libfpx/trunk/files/tchar.patch =================================================================== --- csw/mgar/pkg/libfpx/trunk/files/tchar.patch (rev 0) +++ csw/mgar/pkg/libfpx/trunk/files/tchar.patch 2010-01-29 09:18:43 UTC (rev 8217) @@ -0,0 +1,45 @@ +diff -Nru libfpx-1.3.0.orig/oless/h/tchar.h libfpx-1.3.0/oless/h/tchar.h +--- libfpx-1.3.0.orig/oless/h/tchar.h 2002-02-08 02:04:15.000000000 +0100 ++++ libfpx-1.3.0/oless/h/tchar.h 2010-01-05 01:51:56.302027510 +0100 +@@ -78,7 +78,7 @@ + #define _tcsnicmp _strnicmp + #define _tcscat strcat + #define _itot _itoa +-#define _T(str) str ++#define OLE_TEXT(str) str + + #ifdef _WIN32 + +@@ -125,7 +125,7 @@ + #define _tcscat wcscat + #define _tcsnicmp wcsnicmp + #define _itot _itow +-#define _T(str) L##str ++#define OLE_TEXT(str) L##str + + /* Io functions */ + #define _tfopen _wfopen +diff -Nru libfpx-1.3.0.orig/oless/props/h/windef.h libfpx-1.3.0/oless/props/h/windef.h +--- libfpx-1.3.0.orig/oless/props/h/windef.h 2007-11-02 08:10:05.000000000 +0100 ++++ libfpx-1.3.0/oless/props/h/windef.h 2010-01-05 01:53:25.581245781 +0100 +@@ -60,7 +60,7 @@ + #include + #define Win4Assert assert + +-#define TEXT(x) _T(x) ++#define TEXT(x) OLE_TEXT(x) + + /* memory manupulation routines */ + #define RtlCopyMemory(dest,src,count) memcpy(dest, src, count) +diff -Nru libfpx-1.3.0.orig/oless/test/stgdrt/drt.hxx libfpx-1.3.0/oless/test/stgdrt/drt.hxx +--- libfpx-1.3.0.orig/oless/test/stgdrt/drt.hxx 2002-02-08 20:23:42.000000000 +0100 ++++ libfpx-1.3.0/oless/test/stgdrt/drt.hxx 2010-01-05 01:53:30.320886391 +0100 +@@ -34,7 +34,7 @@ + #define EXIT_OOM 2 + #define EXIT_UNKNOWN 3 + +-#define STR(x) _T(x) ++#define STR(x) OLE_TEXT(x) + + #ifdef _UNICODE + #ifndef ATOT This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Fri Jan 29 12:01:35 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Fri, 29 Jan 2010 11:01:35 +0000 Subject: [csw-devel] SF.net SVN: gar:[8218] csw/mgar/gar/v2/lib/python Message-ID: Revision: 8218 http://gar.svn.sourceforge.net/gar/?rev=8218&view=rev Author: wahwah Date: 2010-01-29 11:01:35 +0000 (Fri, 29 Jan 2010) Log Message: ----------- mGAR v2: Enhancements for the Pkgmap class; added more fields and indexes. Modified Paths: -------------- csw/mgar/gar/v2/lib/python/opencsw.py csw/mgar/gar/v2/lib/python/opencsw_test.py Modified: csw/mgar/gar/v2/lib/python/opencsw.py =================================================================== --- csw/mgar/gar/v2/lib/python/opencsw.py 2010-01-29 09:18:43 UTC (rev 8217) +++ csw/mgar/gar/v2/lib/python/opencsw.py 2010-01-29 11:01:35 UTC (rev 8218) @@ -112,6 +112,19 @@ return version_str, version_info, revision_info +def IndexDictsBy(list_of_dicts, field_key): + """Creates an index of list of dictionaries by a field name. + + Returns a dictionary of lists. + """ + index = {} + for d in list_of_dicts: + if d[field_key] not in index: + index[d[field_key]] = [] + index[d[field_key]].append(d) + return index + + class CatalogBasedOpencswPackage(object): catalog_downloaded = False @@ -643,7 +656,17 @@ (more fields?) }, ... ] + + + indexes """ + ENTRY_TYPES = { + "1": "header (?)", + "d": "directory", + "f": "file", + "s": "symlink", + "l": "link", + "i": "script", + } def __init__(self, input, permissions=False, strip=None): @@ -660,15 +683,22 @@ line_to_add = None installed_path = None prototype_class = None + line_type = fields[1] + mode = None + user = None + group = None if len(fields) < 2: continue - elif fields[1] in ('f', 'd'): + elif line_type in ('f', 'd'): + # Files and directories line_to_add = fields[3] installed_path = fields[3] prototype_class = fields[2] if self.analyze_permissions: line_to_add += " %s" % fields[4] - elif fields[1] in ('s', 'l'): + mode, user, group = fields[4:7] + elif line_type in ('s', 'l'): + # soft- and hardlinks link_from, link_to = fields[3].split("=") installed_path = link_from line_to_add = "%s --> %s" % (link_from, link_to) @@ -677,18 +707,25 @@ self.paths.add(line_to_add) entry = { "line": line, + "type": line_type, } - if installed_path: - entry["path"] = installed_path + entry["path"] = installed_path entry["class"] = prototype_class + entry["mode"] = mode + entry["user"] = user + entry["group"] = group self.entries.append(entry) + self.entries_by_line = IndexDictsBy(self.entries, "line") + self.entries_by_type = IndexDictsBy(self.entries, "type") + self.entries_by_class = IndexDictsBy(self.entries, "class") + self.entries_by_path = IndexDictsBy(self.entries, "path") def GetClasses(self): """The assumtion is that the set of classes never changes.""" if not self.classes: self.classes = set() for entry in self.entries: - if entry["class"]: + if entry["class"]: # might be None self.classes.add(entry["class"]) return self.classes Modified: csw/mgar/gar/v2/lib/python/opencsw_test.py =================================================================== --- csw/mgar/gar/v2/lib/python/opencsw_test.py 2010-01-29 09:18:43 UTC (rev 8217) +++ csw/mgar/gar/v2/lib/python/opencsw_test.py 2010-01-29 11:01:35 UTC (rev 8218) @@ -18,6 +18,7 @@ foodoc 1.7.1,REV=2008.10.29 CSWfoodoc foodoc-1.7.1,REV=2008.10.29-SunOS5.8-all-CSW.pkg.gz 0945884a52a3b43b743650c60ac21236 2055045 CSWcommon|CSWxercesj|CSWxmlcommonsext none bar 1.7.1,REV=2008.10.29 CSWbar bar-1.7.1,REV=2008.10.29-SunOS5.8-all-CSW.pkg.gz 0945884a52a3b43b743650c60ac21236 2055045 CSWcommon|CSWxercesj|CSWxmlcommonsext none antdoc 1.7.1,REV=2008.10.29 CSWantdoc antdoc-1.7.1,REV=2008.10.29-SunOS5.8-all-CSW.pkg.gz e6555e61e7e7f1740935d970e5efad57 5851724 CSWcommon none""" + TEST_PKGINFO="""ARCH=i386 BASEDIR=/ CATEGORY=system @@ -43,7 +44,23 @@ #FASPACD= none """ +PKGMAP_1 = """1 f cswcpsampleconf /etc/opt/csw/cups/cupsd.conf.CSW 0644 root bin 4053 20987 1264420689 +""" +PKGMAP_2 = """: 1 18128 +1 d none /etc/opt/csw/cups 0755 root bin +1 f cswcpsampleconf /etc/opt/csw/cups/cupsd.conf.CSW 0644 root bin 4053 20987 1264420689 +1 f none /etc/opt/csw/cups/cupsd.conf.default 0640 root bin 4053 20987 1264420689 +1 d none /etc/opt/csw/cups/interfaces 0755 root bin +1 d none /etc/opt/csw/cups/ppd 0755 root bin +1 f cswinitsmf /etc/opt/csw/init.d/cswcups 0555 root bin 4547 14118 1264420798 +1 i depend 122 11155 1264524848 +1 i pkginfo 489 41685 1264524852 +1 i postremove 151 12419 1256302505 +1 i preinstall 1488 45678 125630250 +""" + + class ParsePackageFileNameTest(unittest.TestCase): def testParsePackageFileName1(self): @@ -229,5 +246,63 @@ self.assertEqual(set(['bcd', 'hij']), opencsw.LongestCommonSubstring("abcdefghijk", "bcdhij")) +class PkgmapUnitTest(unittest.TestCase): + + def test_1(self): + pkgmap = opencsw.Pkgmap(PKGMAP_1.splitlines()) + expected = [ + { + 'group': 'bin', + 'user': 'root', + 'path': '/etc/opt/csw/cups/cupsd.conf.CSW', + 'line': '1 f cswcpsampleconf /etc/opt/csw/cups/cupsd.conf.CSW 0644 root bin 4053 20987 1264420689', + 'type': 'f', + 'class': 'cswcpsampleconf', + 'mode': '0644' + } + ] + self.assertEqual(expected, pkgmap.entries) + + def test_2(self): + pkgmap = opencsw.Pkgmap(PKGMAP_2.splitlines()) + line = ": 1 18128" + self.assertTrue(line in pkgmap.entries_by_line) + + def test_3(self): + pkgmap = opencsw.Pkgmap(PKGMAP_2.splitlines()) + self.assertTrue("cswcpsampleconf" in pkgmap.entries_by_class) + + +class IndexByUnitTest(unittest.TestCase): + + def testIndexDictsBy_1(self): + list_of_dicts = [ + {"a": 1}, + {"a": 2}, + {"a": 3}, + ] + expected = { + 1: [{'a': 1}], + 2: [{'a': 2}], + 3: [{'a': 3}], + } + self.assertEquals(expected, opencsw.IndexDictsBy(list_of_dicts, "a")) + + def testIndexDictsBy_2(self): + list_of_dicts = [ + {"a": 1, "b": 1}, + {"a": 1, "b": 2}, + {"a": 1, "b": 3}, + ] + expected = { + 1: [ + {'a': 1, 'b': 1}, + {'a': 1, 'b': 2}, + {'a': 1, 'b': 3}, + ] + } + self.assertEquals(expected, opencsw.IndexDictsBy(list_of_dicts, "a")) + + if __name__ == '__main__': unittest.main() This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bensons at users.sourceforge.net Fri Jan 29 15:24:01 2010 From: bensons at users.sourceforge.net (bensons at users.sourceforge.net) Date: Fri, 29 Jan 2010 14:24:01 +0000 Subject: [csw-devel] SF.net SVN: gar:[8219] csw/mgar/pkg/cpan/Apache-Test/trunk Message-ID: Revision: 8219 http://gar.svn.sourceforge.net/gar/?rev=8219&view=rev Author: bensons Date: 2010-01-29 14:24:00 +0000 (Fri, 29 Jan 2010) Log Message: ----------- cpan Apache-Test: bump to version 1.30 Modified Paths: -------------- csw/mgar/pkg/cpan/Apache-Test/trunk/Makefile csw/mgar/pkg/cpan/Apache-Test/trunk/checksums Modified: csw/mgar/pkg/cpan/Apache-Test/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/Apache-Test/trunk/Makefile 2010-01-29 11:01:35 UTC (rev 8218) +++ csw/mgar/pkg/cpan/Apache-Test/trunk/Makefile 2010-01-29 14:24:00 UTC (rev 8219) @@ -1,7 +1,7 @@ GARNAME = Apache-Test -GARVERSION = 1.29 +GARVERSION = 1.30 CATEGORIES = cpan -AUTHOR = PGOLLUCCI +AUTHOR = PHRED DESCRIPTION = Test.pm wrapper with helpers for testing Apache define BLURB @@ -9,8 +9,11 @@ testing an Apache server. endef -DISTFILES = $(call admfiles,CSWpmapachetst,depend prototype) +PACKAGES = CSWpmapachetst +CATALOGNAME = pm_apachetst +ARCHALL = 1 + APACHE_TEST_HTTPD = $(prefix)/apache2/sbin/httpd export APACHE_TEST_HTTPD Modified: csw/mgar/pkg/cpan/Apache-Test/trunk/checksums =================================================================== --- csw/mgar/pkg/cpan/Apache-Test/trunk/checksums 2010-01-29 11:01:35 UTC (rev 8218) +++ csw/mgar/pkg/cpan/Apache-Test/trunk/checksums 2010-01-29 14:24:00 UTC (rev 8219) @@ -1,4 +1 @@ -e57a2a77b0bf38e22914e50c23523acc download/CSWpmapachetst.gspec -6e0d583c86d7f74b43769810714242aa download/CSWpmapachetst.depend -890c053d7fd8e39b2580bf75f0fac286 download/CSWpmapachetst.prototype -d99c88b856302420211cee2f891ad931 download/Apache-Test-1.29.tar.gz +f4e34be218a25048def5a4f797ae7cb9 Apache-Test-1.30.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bensons at users.sourceforge.net Fri Jan 29 15:32:01 2010 From: bensons at users.sourceforge.net (bensons at users.sourceforge.net) Date: Fri, 29 Jan 2010 14:32:01 +0000 Subject: [csw-devel] SF.net SVN: gar:[8220] csw/mgar/pkg/cpan/Apache-Test/trunk/Makefile Message-ID: Revision: 8220 http://gar.svn.sourceforge.net/gar/?rev=8220&view=rev Author: bensons Date: 2010-01-29 14:31:57 +0000 (Fri, 29 Jan 2010) Log Message: ----------- cpan Apache-Test: added dependency Modified Paths: -------------- csw/mgar/pkg/cpan/Apache-Test/trunk/Makefile Modified: csw/mgar/pkg/cpan/Apache-Test/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/Apache-Test/trunk/Makefile 2010-01-29 14:24:00 UTC (rev 8219) +++ csw/mgar/pkg/cpan/Apache-Test/trunk/Makefile 2010-01-29 14:31:57 UTC (rev 8220) @@ -9,6 +9,10 @@ testing an Apache server. endef +# depends +REQUIRED_PKGS = CSWap2prefork +PREREQUISITE_PKGS = CSWap2prefork + PACKAGES = CSWpmapachetst CATALOGNAME = pm_apachetst This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bensons at users.sourceforge.net Fri Jan 29 16:47:17 2010 From: bensons at users.sourceforge.net (bensons at users.sourceforge.net) Date: Fri, 29 Jan 2010 15:47:17 +0000 Subject: [csw-devel] SF.net SVN: gar:[8221] csw/mgar/pkg/cpan/MIME-Base64/trunk Message-ID: Revision: 8221 http://gar.svn.sourceforge.net/gar/?rev=8221&view=rev Author: bensons Date: 2010-01-29 15:47:14 +0000 (Fri, 29 Jan 2010) Log Message: ----------- cpan MIME-Base64: bumped to version 3.09 Modified Paths: -------------- csw/mgar/pkg/cpan/MIME-Base64/trunk/Makefile csw/mgar/pkg/cpan/MIME-Base64/trunk/checksums Modified: csw/mgar/pkg/cpan/MIME-Base64/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/MIME-Base64/trunk/Makefile 2010-01-29 14:31:57 UTC (rev 8220) +++ csw/mgar/pkg/cpan/MIME-Base64/trunk/Makefile 2010-01-29 15:47:14 UTC (rev 8221) @@ -1,5 +1,5 @@ GARNAME = MIME-Base64 -GARVERSION = 3.07 +GARVERSION = 3.09 CATEGORIES = cpan AUTHOR = GAAS Modified: csw/mgar/pkg/cpan/MIME-Base64/trunk/checksums =================================================================== --- csw/mgar/pkg/cpan/MIME-Base64/trunk/checksums 2010-01-29 14:31:57 UTC (rev 8220) +++ csw/mgar/pkg/cpan/MIME-Base64/trunk/checksums 2010-01-29 15:47:14 UTC (rev 8221) @@ -1,2 +1,2 @@ -aa9873abcfbf59300a1e7a088eab4fb0 download/COPYING -f466b62afc4fec7f262b0910913293b3 download/MIME-Base64-3.07.tar.gz +aa9873abcfbf59300a1e7a088eab4fb0 COPYING +5056bf56fb41c0ce6edd2c73de2574a5 MIME-Base64-3.09.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bensons at users.sourceforge.net Fri Jan 29 16:50:28 2010 From: bensons at users.sourceforge.net (bensons at users.sourceforge.net) Date: Fri, 29 Jan 2010 15:50:28 +0000 Subject: [csw-devel] SF.net SVN: gar:[8222] csw/mgar/pkg/cpan/Compress-Raw-Zlib/trunk Message-ID: Revision: 8222 http://gar.svn.sourceforge.net/gar/?rev=8222&view=rev Author: bensons Date: 2010-01-29 15:50:18 +0000 (Fri, 29 Jan 2010) Log Message: ----------- cpan Compress-Raw-Zlib: bumped to version 2.024 Modified Paths: -------------- csw/mgar/pkg/cpan/Compress-Raw-Zlib/trunk/Makefile csw/mgar/pkg/cpan/Compress-Raw-Zlib/trunk/checksums Modified: csw/mgar/pkg/cpan/Compress-Raw-Zlib/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/Compress-Raw-Zlib/trunk/Makefile 2010-01-29 15:47:14 UTC (rev 8221) +++ csw/mgar/pkg/cpan/Compress-Raw-Zlib/trunk/Makefile 2010-01-29 15:50:18 UTC (rev 8222) @@ -1,5 +1,5 @@ GARNAME = Compress-Raw-Zlib -GARVERSION = 2.020 +GARVERSION = 2.024 CATEGORIES = cpan AUTHOR = PMQS Modified: csw/mgar/pkg/cpan/Compress-Raw-Zlib/trunk/checksums =================================================================== --- csw/mgar/pkg/cpan/Compress-Raw-Zlib/trunk/checksums 2010-01-29 15:47:14 UTC (rev 8221) +++ csw/mgar/pkg/cpan/Compress-Raw-Zlib/trunk/checksums 2010-01-29 15:50:18 UTC (rev 8222) @@ -1 +1 @@ -d0f6baff3d38b6076a14778004345db3 download/Compress-Raw-Zlib-2.020.tar.gz +5b637dbb36955b13db261f049fe529d9 Compress-Raw-Zlib-2.024.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bensons at users.sourceforge.net Fri Jan 29 17:07:53 2010 From: bensons at users.sourceforge.net (bensons at users.sourceforge.net) Date: Fri, 29 Jan 2010 16:07:53 +0000 Subject: [csw-devel] SF.net SVN: gar:[8223] csw/mgar/pkg/cpan/Compress-Raw-Bzip2/trunk Message-ID: Revision: 8223 http://gar.svn.sourceforge.net/gar/?rev=8223&view=rev Author: bensons Date: 2010-01-29 16:07:52 +0000 (Fri, 29 Jan 2010) Log Message: ----------- cpan Compress-Raw-Bzip2: bumped to version 2.024 Modified Paths: -------------- csw/mgar/pkg/cpan/Compress-Raw-Bzip2/trunk/Makefile csw/mgar/pkg/cpan/Compress-Raw-Bzip2/trunk/checksums Modified: csw/mgar/pkg/cpan/Compress-Raw-Bzip2/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/Compress-Raw-Bzip2/trunk/Makefile 2010-01-29 15:50:18 UTC (rev 8222) +++ csw/mgar/pkg/cpan/Compress-Raw-Bzip2/trunk/Makefile 2010-01-29 16:07:52 UTC (rev 8223) @@ -1,5 +1,5 @@ GARNAME = Compress-Raw-Bzip2 -GARVERSION = 2.020 +GARVERSION = 2.024 CATEGORIES = cpan AUTHOR = PMQS Modified: csw/mgar/pkg/cpan/Compress-Raw-Bzip2/trunk/checksums =================================================================== --- csw/mgar/pkg/cpan/Compress-Raw-Bzip2/trunk/checksums 2010-01-29 15:50:18 UTC (rev 8222) +++ csw/mgar/pkg/cpan/Compress-Raw-Bzip2/trunk/checksums 2010-01-29 16:07:52 UTC (rev 8223) @@ -1 +1 @@ -50f85a3ecab19fa6d2ca18b8f990f219 download/Compress-Raw-Bzip2-2.020.tar.gz +b95582de2ed635e7f44de302accc879a Compress-Raw-Bzip2-2.024.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bensons at users.sourceforge.net Fri Jan 29 17:53:46 2010 From: bensons at users.sourceforge.net (bensons at users.sourceforge.net) Date: Fri, 29 Jan 2010 16:53:46 +0000 Subject: [csw-devel] SF.net SVN: gar:[8224] csw/mgar/pkg/cpan/Crypt-DES/trunk Message-ID: Revision: 8224 http://gar.svn.sourceforge.net/gar/?rev=8224&view=rev Author: bensons Date: 2010-01-29 16:53:46 +0000 (Fri, 29 Jan 2010) Log Message: ----------- cpan Crypt-DES: adjusted to GAR v2 and taking over this package Modified Paths: -------------- csw/mgar/pkg/cpan/Crypt-DES/trunk/Makefile csw/mgar/pkg/cpan/Crypt-DES/trunk/checksums Removed Paths: ------------- csw/mgar/pkg/cpan/Crypt-DES/trunk/files/CSWpmcryptdes.gspec csw/mgar/pkg/cpan/Crypt-DES/trunk/files/des_workaround.s9.diff Modified: csw/mgar/pkg/cpan/Crypt-DES/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/Crypt-DES/trunk/Makefile 2010-01-29 16:07:52 UTC (rev 8223) +++ csw/mgar/pkg/cpan/Crypt-DES/trunk/Makefile 2010-01-29 16:53:46 UTC (rev 8224) @@ -9,9 +9,7 @@ methods endef -DISTFILES += CSWpmcryptdes.gspec +CATALOGNAME = pm_cryptdes +PACKAGES = CSWpmcryptdes -# Fix name collision with des_*() functions -PATCHFILES = des_workaround.s9.diff - include gar/category.mk Modified: csw/mgar/pkg/cpan/Crypt-DES/trunk/checksums =================================================================== --- csw/mgar/pkg/cpan/Crypt-DES/trunk/checksums 2010-01-29 16:07:52 UTC (rev 8223) +++ csw/mgar/pkg/cpan/Crypt-DES/trunk/checksums 2010-01-29 16:53:46 UTC (rev 8224) @@ -1,3 +1,3 @@ -524ca37b102425b9bb9e4ffbb29df6c0 download/CSWpmcryptdes.gspec -a8a0bea7064e11d2af434f3e468c17bb download/Crypt-DES-2.05.tar.gz -e3b96fe5a4085df04611090debc858ac download/des_workaround.s9.diff +524ca37b102425b9bb9e4ffbb29df6c0 CSWpmcryptdes.gspec +a8a0bea7064e11d2af434f3e468c17bb Crypt-DES-2.05.tar.gz +e3b96fe5a4085df04611090debc858ac des_workaround.s9.diff Deleted: csw/mgar/pkg/cpan/Crypt-DES/trunk/files/CSWpmcryptdes.gspec =================================================================== --- csw/mgar/pkg/cpan/Crypt-DES/trunk/files/CSWpmcryptdes.gspec 2010-01-29 16:07:52 UTC (rev 8223) +++ csw/mgar/pkg/cpan/Crypt-DES/trunk/files/CSWpmcryptdes.gspec 2010-01-29 16:53:46 UTC (rev 8224) @@ -1,4 +0,0 @@ -%var bitname pm_cryptdes -%var pkgname CSWpmcryptdes -%include url file://%{PKGLIB}/csw_cpan.gspec -%copyright url file://%{WORKSRC}/COPYRIGHT Deleted: csw/mgar/pkg/cpan/Crypt-DES/trunk/files/des_workaround.s9.diff =================================================================== --- csw/mgar/pkg/cpan/Crypt-DES/trunk/files/des_workaround.s9.diff 2010-01-29 16:07:52 UTC (rev 8223) +++ csw/mgar/pkg/cpan/Crypt-DES/trunk/files/des_workaround.s9.diff 2010-01-29 16:53:46 UTC (rev 8224) @@ -1,38 +0,0 @@ -diff -Nru --minimal --speed-large-files Crypt-DES-2.03.orig/DES.xs Crypt-DES-2.03/DES.xs ---- Crypt-DES-2.03.orig/DES.xs 2000-09-11 12:27:41.000000000 -0700 -+++ Crypt-DES-2.03/DES.xs 2003-12-30 12:34:48.546964000 -0800 -@@ -21,11 +21,11 @@ - #define sv_undef PL_sv_undef - #endif - --MODULE = Crypt::DES PACKAGE = Crypt::DES PREFIX = des_ -+MODULE = Crypt::DES PACKAGE = Crypt::DES PREFIX = _des_ - PROTOTYPES: DISABLE - - char * --des_expand_key(key) -+_des_expand_key(key) - char * key = NO_INIT - STRLEN key_len = NO_INIT - CODE: -@@ -42,7 +42,7 @@ - } - - void --des_crypt(input, output, ks, enc_flag) -+_des_crypt(input, output, ks, enc_flag) - char * input = NO_INIT - SV * output - char * ks = NO_INIT -diff -Nru --minimal --speed-large-files Crypt-DES-2.03.orig/des.h Crypt-DES-2.03/des.h ---- Crypt-DES-2.03.orig/des.h 2000-09-11 12:27:41.000000000 -0700 -+++ Crypt-DES-2.03/des.h 2003-12-30 12:35:00.771588000 -0800 -@@ -2,6 +2,6 @@ - typedef unsigned char des_cblock[8]; - typedef unsigned long des_ks[32]; - --void des_crypt( des_cblock in, des_cblock out, des_ks key, int encrypt ); --void des_expand_key( des_user_key userKey, des_ks key ); -+void _des_crypt( des_cblock in, des_cblock out, des_ks key, int encrypt ); -+void _des_expand_key( des_user_key userKey, des_ks key ); - This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bensons at users.sourceforge.net Fri Jan 29 18:20:14 2010 From: bensons at users.sourceforge.net (bensons at users.sourceforge.net) Date: Fri, 29 Jan 2010 17:20:14 +0000 Subject: [csw-devel] SF.net SVN: gar:[8225] csw/mgar/pkg/cpan/Crypt-OpenSSL-RSA/trunk/Makefile Message-ID: Revision: 8225 http://gar.svn.sourceforge.net/gar/?rev=8225&view=rev Author: bensons Date: 2010-01-29 17:20:13 +0000 (Fri, 29 Jan 2010) Log Message: ----------- cpan Crypt-OpenSSL-RSA: added PREREQUISITE dependency Modified Paths: -------------- csw/mgar/pkg/cpan/Crypt-OpenSSL-RSA/trunk/Makefile Modified: csw/mgar/pkg/cpan/Crypt-OpenSSL-RSA/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/Crypt-OpenSSL-RSA/trunk/Makefile 2010-01-29 16:53:46 UTC (rev 8224) +++ csw/mgar/pkg/cpan/Crypt-OpenSSL-RSA/trunk/Makefile 2010-01-29 17:20:13 UTC (rev 8225) @@ -14,5 +14,6 @@ CATALOGNAME = pm_osslrsa REQUIRED_PKGS = CSWpmcryptosslrandom +PREREQUISITE_PKGS = CSWpmcryptosslrandom include gar/category.mk This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bensons at users.sourceforge.net Fri Jan 29 18:30:59 2010 From: bensons at users.sourceforge.net (bensons at users.sourceforge.net) Date: Fri, 29 Jan 2010 17:30:59 +0000 Subject: [csw-devel] SF.net SVN: gar:[8226] csw/mgar/pkg/cpan/Crypt-Rijndael/trunk Message-ID: Revision: 8226 http://gar.svn.sourceforge.net/gar/?rev=8226&view=rev Author: bensons Date: 2010-01-29 17:30:51 +0000 (Fri, 29 Jan 2010) Log Message: ----------- cpan Crypt-Rijndael: bump to version 1.09 and take over ownership of this package Modified Paths: -------------- csw/mgar/pkg/cpan/Crypt-Rijndael/trunk/Makefile csw/mgar/pkg/cpan/Crypt-Rijndael/trunk/checksums Removed Paths: ------------- csw/mgar/pkg/cpan/Crypt-Rijndael/trunk/files/CSWpmcryptrijndael.depend csw/mgar/pkg/cpan/Crypt-Rijndael/trunk/files/CSWpmcryptrijndael.gspec csw/mgar/pkg/cpan/Crypt-Rijndael/trunk/files/CSWpmcryptrijndael.prototype Modified: csw/mgar/pkg/cpan/Crypt-Rijndael/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/Crypt-Rijndael/trunk/Makefile 2010-01-29 17:20:13 UTC (rev 8225) +++ csw/mgar/pkg/cpan/Crypt-Rijndael/trunk/Makefile 2010-01-29 17:30:51 UTC (rev 8226) @@ -1,7 +1,7 @@ GARNAME = Crypt-Rijndael -GARVERSION = 0.05 +GARVERSION = 1.09 CATEGORIES = cpan -AUTHOR = DIDO +AUTHOR = BDFOY DESCRIPTION = Crypt::CBC compliant Rijndael encryption module define BLURB @@ -9,12 +9,13 @@ the Advanced Encryption Standard. endef -DISTFILES = $(call admfiles,CSWpmcryptrijndael,depend prototype) +PACKAGES = CSWpmcryptrijndael +CATALOGNAME = pm_cryptrijndael # MODE_CTR (not common AFAIK) tests fail on Solaris/x86 32-bit, but # not on Solaris/SPARC 64-bit. This does not appear to be a show # stopper, as the tests are able to recover the plaintext, but are # not seeing the expected encrypted text. -TEST_SCRIPTS = +# TEST_SCRIPTS = include gar/category.mk Modified: csw/mgar/pkg/cpan/Crypt-Rijndael/trunk/checksums =================================================================== --- csw/mgar/pkg/cpan/Crypt-Rijndael/trunk/checksums 2010-01-29 17:20:13 UTC (rev 8225) +++ csw/mgar/pkg/cpan/Crypt-Rijndael/trunk/checksums 2010-01-29 17:30:51 UTC (rev 8226) @@ -1,4 +1 @@ -e25ec5d6346a27003a2c8255e02355a0 download/CSWpmcryptrijndael.gspec -6e0d583c86d7f74b43769810714242aa download/CSWpmcryptrijndael.depend -8a2bb2602d080b7ca77a1505fe86ffb0 download/CSWpmcryptrijndael.prototype -af8628fee8648f26c94916ef8edf32d9 download/Crypt-Rijndael-0.05.tar.gz +6a2678fbd7a0c9ed277d4b758a530b1c Crypt-Rijndael-1.09.tar.gz Deleted: csw/mgar/pkg/cpan/Crypt-Rijndael/trunk/files/CSWpmcryptrijndael.gspec =================================================================== --- csw/mgar/pkg/cpan/Crypt-Rijndael/trunk/files/CSWpmcryptrijndael.gspec 2010-01-29 17:20:13 UTC (rev 8225) +++ csw/mgar/pkg/cpan/Crypt-Rijndael/trunk/files/CSWpmcryptrijndael.gspec 2010-01-29 17:30:51 UTC (rev 8226) @@ -1,4 +0,0 @@ -%var bitname pm_cryptrijndael -%var pkgname CSWpmcryptrijndael -%include url file://%{PKGLIB}/csw_cpan.gspec -%copyright url file://%{WORKSRC}/COPYING Deleted: csw/mgar/pkg/cpan/Crypt-Rijndael/trunk/files/CSWpmcryptrijndael.prototype =================================================================== --- csw/mgar/pkg/cpan/Crypt-Rijndael/trunk/files/CSWpmcryptrijndael.prototype 2010-01-29 17:20:13 UTC (rev 8225) +++ csw/mgar/pkg/cpan/Crypt-Rijndael/trunk/files/CSWpmcryptrijndael.prototype 2010-01-29 17:30:51 UTC (rev 8226) @@ -1,15 +0,0 @@ -d none /opt/csw/lib 0755 root bin -d none /opt/csw/lib/perl 0755 root bin -d none /opt/csw/lib/perl/csw 0755 root bin -d none /opt/csw/lib/perl/csw/Crypt 0755 root bin -f none /opt/csw/lib/perl/csw/Crypt/Rijndael.pm 0444 root bin -d none /opt/csw/lib/perl/csw/auto 0755 root bin -d none /opt/csw/lib/perl/csw/auto/Crypt 0755 root bin -d none /opt/csw/lib/perl/csw/auto/Crypt/Rijndael 0755 root bin -f none /opt/csw/lib/perl/csw/auto/Crypt/Rijndael/.packlist 0644 root bin -f none /opt/csw/lib/perl/csw/auto/Crypt/Rijndael/Rijndael.bs 0444 root bin -f none /opt/csw/lib/perl/csw/auto/Crypt/Rijndael/Rijndael.so 0555 root bin -d none /opt/csw/share 0755 root bin -d none /opt/csw/share/man 0755 root bin -d none /opt/csw/share/man/man3 0755 root bin -f none /opt/csw/share/man/man3/Crypt::Rijndael.3perl 0444 root bin This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bensons at users.sourceforge.net Fri Jan 29 18:46:18 2010 From: bensons at users.sourceforge.net (bensons at users.sourceforge.net) Date: Fri, 29 Jan 2010 17:46:18 +0000 Subject: [csw-devel] SF.net SVN: gar:[8227] csw/mgar/pkg/cpan/Crypt-SSLeay/trunk Message-ID: Revision: 8227 http://gar.svn.sourceforge.net/gar/?rev=8227&view=rev Author: bensons Date: 2010-01-29 17:46:18 +0000 (Fri, 29 Jan 2010) Log Message: ----------- cpan Crypt-SSLeay: bumped to version 0.57 and take over ownership of this package Modified Paths: -------------- csw/mgar/pkg/cpan/Crypt-SSLeay/trunk/Makefile csw/mgar/pkg/cpan/Crypt-SSLeay/trunk/checksums csw/mgar/pkg/cpan/Crypt-SSLeay/trunk/files/noask.diff Removed Paths: ------------- csw/mgar/pkg/cpan/Crypt-SSLeay/trunk/files/CSWpmcryptssleay.depend csw/mgar/pkg/cpan/Crypt-SSLeay/trunk/files/CSWpmcryptssleay.gspec csw/mgar/pkg/cpan/Crypt-SSLeay/trunk/files/CSWpmcryptssleay.prototype Modified: csw/mgar/pkg/cpan/Crypt-SSLeay/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/Crypt-SSLeay/trunk/Makefile 2010-01-29 17:30:51 UTC (rev 8226) +++ csw/mgar/pkg/cpan/Crypt-SSLeay/trunk/Makefile 2010-01-29 17:46:18 UTC (rev 8227) @@ -1,5 +1,5 @@ GARNAME = Crypt-SSLeay -GARVERSION = 0.54 +GARVERSION = 0.57 CATEGORIES = cpan AUTHOR = DLAND @@ -10,13 +10,15 @@ perldoc LWP for more information on POST requests. endef -DISTFILES += $(call admfiles,CSWpmcryptssleay,depend prototype) - # Don't ask about networked tests -- the answer is no. PATCHFILES += noask.diff -#DEPENDS += lib/openssl +PACKAGES = CSWpmcryptssleay +CATALOGNAME = pm_cryptssleay +REQUIRED_PKGS = CSWosslrt +PREREQUISITE_PKGS = CSWosslrt + CONFIGURE_ARGS = --lib=$(prefix) include gar/category.mk Modified: csw/mgar/pkg/cpan/Crypt-SSLeay/trunk/checksums =================================================================== --- csw/mgar/pkg/cpan/Crypt-SSLeay/trunk/checksums 2010-01-29 17:30:51 UTC (rev 8226) +++ csw/mgar/pkg/cpan/Crypt-SSLeay/trunk/checksums 2010-01-29 17:46:18 UTC (rev 8227) @@ -1,5 +1,2 @@ -93a2a1e7669b738e3034409e9c592294 download/CSWpmcryptssleay.gspec -edc918337b9b380c184449adab18d8c7 download/CSWpmcryptssleay.depend -5d6d5a7115ef613c891c761068cecef9 download/CSWpmcryptssleay.prototype -7b2807e0c994eaca89221c053e7bb58d download/Crypt-SSLeay-0.54.tar.gz -bbca43146be84642e4161e2a546aa917 download/noask.diff +82264180f5911dce33dbd85e24b1f36b Crypt-SSLeay-0.57.tar.gz +39e34bc08f09e4630359eb135272222e noask.diff Deleted: csw/mgar/pkg/cpan/Crypt-SSLeay/trunk/files/CSWpmcryptssleay.depend =================================================================== --- csw/mgar/pkg/cpan/Crypt-SSLeay/trunk/files/CSWpmcryptssleay.depend 2010-01-29 17:30:51 UTC (rev 8226) +++ csw/mgar/pkg/cpan/Crypt-SSLeay/trunk/files/CSWpmcryptssleay.depend 2010-01-29 17:46:18 UTC (rev 8227) @@ -1 +0,0 @@ -P CSWosslrt openssl_rt - Openssl runtime libraries Deleted: csw/mgar/pkg/cpan/Crypt-SSLeay/trunk/files/CSWpmcryptssleay.gspec =================================================================== --- csw/mgar/pkg/cpan/Crypt-SSLeay/trunk/files/CSWpmcryptssleay.gspec 2010-01-29 17:30:51 UTC (rev 8226) +++ csw/mgar/pkg/cpan/Crypt-SSLeay/trunk/files/CSWpmcryptssleay.gspec 2010-01-29 17:46:18 UTC (rev 8227) @@ -1,9 +0,0 @@ -%var bitname pm_cryptssleay -%var pkgname CSWpmcryptssleay -%include url file://%{PKGLIB}/csw_cpan.gspec -%copyright -Copyright (c) 1999-2003 Joshua Chamas. -Copyright (c) 1998 Gisle Aas. - -This program is free software; you can redistribute it and/or modify it -under the same terms as Perl itself. Deleted: csw/mgar/pkg/cpan/Crypt-SSLeay/trunk/files/CSWpmcryptssleay.prototype =================================================================== --- csw/mgar/pkg/cpan/Crypt-SSLeay/trunk/files/CSWpmcryptssleay.prototype 2010-01-29 17:30:51 UTC (rev 8226) +++ csw/mgar/pkg/cpan/Crypt-SSLeay/trunk/files/CSWpmcryptssleay.prototype 2010-01-29 17:46:18 UTC (rev 8227) @@ -1,24 +0,0 @@ -d none /opt/csw/lib 0755 root bin -d none /opt/csw/lib/perl 0755 root bin -d none /opt/csw/lib/perl/csw 0755 root bin -d none /opt/csw/lib/perl/csw/Crypt 0755 root bin -d none /opt/csw/lib/perl/csw/Crypt/SSLeay 0755 root bin -f none /opt/csw/lib/perl/csw/Crypt/SSLeay.pm 0444 root bin -f none /opt/csw/lib/perl/csw/Crypt/SSLeay/CTX.pm 0444 root bin -f none /opt/csw/lib/perl/csw/Crypt/SSLeay/Conn.pm 0444 root bin -f none /opt/csw/lib/perl/csw/Crypt/SSLeay/Err.pm 0444 root bin -f none /opt/csw/lib/perl/csw/Crypt/SSLeay/MainContext.pm 0444 root bin -f none /opt/csw/lib/perl/csw/Crypt/SSLeay/X509.pm 0444 root bin -d none /opt/csw/lib/perl/csw/Net 0755 root bin -f none /opt/csw/lib/perl/csw/Net/SSL.pm 0444 root bin -d none /opt/csw/lib/perl/csw/auto 0755 root bin -d none /opt/csw/lib/perl/csw/auto/Crypt 0755 root bin -d none /opt/csw/lib/perl/csw/auto/Crypt/SSLeay 0755 root bin -f none /opt/csw/lib/perl/csw/auto/Crypt/SSLeay/.packlist 0644 root bin -f none /opt/csw/lib/perl/csw/auto/Crypt/SSLeay/SSLeay.bs 0444 root bin -f none /opt/csw/lib/perl/csw/auto/Crypt/SSLeay/SSLeay.so 0555 root bin -d none /opt/csw/share 0755 root bin -d none /opt/csw/share/man 0755 root bin -d none /opt/csw/share/man/man3 0755 root bin -f none /opt/csw/share/man/man3/Crypt::SSLeay.3perl 0444 root bin -f none /opt/csw/share/man/man3/Net::SSL.3perl 0444 root bin Modified: csw/mgar/pkg/cpan/Crypt-SSLeay/trunk/files/noask.diff =================================================================== --- csw/mgar/pkg/cpan/Crypt-SSLeay/trunk/files/noask.diff 2010-01-29 17:30:51 UTC (rev 8226) +++ csw/mgar/pkg/cpan/Crypt-SSLeay/trunk/files/noask.diff 2010-01-29 17:46:18 UTC (rev 8227) @@ -1,7 +1,6 @@ -diff --speed-large-files --minimal -Nru Crypt-SSLeay-0.54.orig/Makefile.PL Crypt-SSLeay-0.54/Makefile.PL ---- Crypt-SSLeay-0.54.orig/Makefile.PL 2007-03-28 13:45:44.000000000 -0400 -+++ Crypt-SSLeay-0.54/Makefile.PL 2007-05-13 23:45:44.637016000 -0400 -@@ -261,11 +261,12 @@ +--- Crypt-SSLeay-0.57.orig/Makefile.PL 2007-09-17 22:36:59.000000000 +0200 ++++ Crypt-SSLeay-0.57/Makefile.PL 2010-01-29 18:42:01.080390444 +0100 +@@ -282,11 +282,12 @@ these tests may fail (through no fault of the code). INFO @@ -10,12 +9,12 @@ - 'N'; - print OUT "network_tests ", ($network_tests =~ /y/i) ? 1 : 0, "\n"; - close OUT; -+# my $network_tests = prompt -+# "Do you want to run the live tests (y/N) ?", -+# 'N'; -+# print OUT "network_tests ", ($network_tests =~ /y/i) ? 1 : 0, "\n"; -+# close OUT; -+print OUT "network_tests 0\n"; ++ #my $network_tests = prompt ++ # "Do you want to run the live tests (y/N) ?", ++ # 'N'; ++ #print OUT "network_tests ", ($network_tests =~ /y/i) ? 1 : 0, "\n"; ++ #close OUT; ++ print OUT "network_tests 0\n"; } ## HELPERS This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Sat Jan 30 09:01:16 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sat, 30 Jan 2010 08:01:16 +0000 Subject: [csw-devel] SF.net SVN: gar:[8228] csw/mgar/pkg Message-ID: Revision: 8228 http://gar.svn.sourceforge.net/gar/?rev=8228&view=rev Author: wahwah Date: 2010-01-30 08:01:16 +0000 (Sat, 30 Jan 2010) Log Message: ----------- pykstat: Initial commit Modified Paths: -------------- csw/mgar/pkg/pykstat/trunk/Makefile csw/mgar/pkg/pykstat/trunk/checksums Added Paths: ----------- csw/mgar/pkg/pykstat/ csw/mgar/pkg/pykstat/trunk/files/python-2.6-Makefile.patch Modified: csw/mgar/pkg/pykstat/trunk/Makefile =================================================================== --- csw/mgar/pkg/template/trunk/Makefile 2010-01-25 11:29:54 UTC (rev 8165) +++ csw/mgar/pkg/pykstat/trunk/Makefile 2010-01-30 08:01:16 UTC (rev 8228) @@ -11,8 +11,8 @@ ## For more information about GAR variables, please see: ## https://sourceforge.net/apps/trac/gar/wiki/GAR%20Variable%20Reference ## -GARNAME = mypkg -GARVERSION = 1.0 +GARNAME = pykstat +GARVERSION = 0.5 ## ## The category that your software fits in. This is not a descriptive field, but ## influences the build process. Depending on the CATEGORIES setting, different @@ -22,24 +22,24 @@ ## Possible settings are: ## apps, cpan, devel, gnome, java, kde, lang, lib, meta, net, python, server, ## utils, x11, xfce, xorg, xtra -CATEGORIES = lib +CATEGORIES = python ## ## A one-line description of the package, which will appear in the pkginfo. -DESCRIPTION = +DESCRIPTION = a Python interface to the Solaris kstat(3k) and utmpx APIs ## ## A longer description of the package. This is only for descriptive purposes ## inside the Makefile and is not used elsewhere. define BLURB - endef ## ## Upstream URL that should show up in the VENDOR field as well as on ## http://opencsw.org/packages/. -SPKG_SOURCEURL = +SPKG_SOURCEURL = http://www.biostat.wisc.edu/~annis/creations/pykstat.html ## ## Whitespace-separated list of URLs to download the source package from. ## There are presets: $(SF_MIRRORS), $(GNU_MIRRORS) and $(GOOGLE_MIRROR). -MASTER_SITES = +MASTER_SITES = http://www.biostat.wisc.edu/~annis/creations/ +DISTNAME = PyKstat-$(GARVERSION) ## ## SF_PROJ is required if you set $(MASTER_SITES) to $(SF_MIRRORS) and the ## Sourceforge project name differs from $(GARNAME). Specifies the Sourceforge @@ -49,12 +49,12 @@ ## A list of space separated patch filenames from files/ that are to be applied ## to the extracted software before the ./configure stage. Patches need to be ## included in the DISTFILES variable as well. -## PATCHFILES = +PATCHFILES = python-2.6-Makefile.patch ## ## Whitespace-separated list of files which comprise this build. mGAR will look ## for the files in the $(FILEDIR) (trunk/files) directory and on the ## $(MASTER_SITES). -DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz +DISTFILES = $(DISTNAME).tar.gz ## ## We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz @@ -95,7 +95,8 @@ ## $(PACKAGES) list) to define which files go into each package. The first ## package from $(PACKAGES) one will hold all files that are not matched by ## PKGFILES_ for other packages. -## PACKAGES = +PACKAGES = CSWpy-kstat +CATALOGNAME_CSWpy-kstat = py_kstat ## ## If specified, GAR feeds the almost-final package prototype file to ## $(PROTOTYPE_FILTER) and reads the final package prototype file from it. @@ -126,7 +127,7 @@ ## REQUIRED_PKGS = ## ## A list of packages necessary to build this package -## PREREQUISITE_PKGS = $(REQUIRED_PKGS) +PREREQUISITE_PKGS = $(REQUIRED_PKGS) CSWswig ## ## When using non-empty $(PACKAGES): ## REQUIRED_PKGS_CSWpkgname = @@ -146,9 +147,9 @@ ## this variable an empty value. The procedure works for configure, build, ## install and test steps. ## CONFIGURE_SCRIPTS = -## BUILD_SCRIPTS = -## INSTALL_SCRIPTS = -## TEST_SCRIPTS = +BUILD_SCRIPTS = py-kstat +INSTALL_SCRIPTS = py-kstat +TEST_SCRIPTS = ## ## Compilation settings ## @@ -160,7 +161,7 @@ ## BUILD_ARGS = ## ## Arguments passed to the ./configure script. -CONFIGURE_ARGS = $(DIRPATHS) +## CONFIGURE_ARGS = $(DIRPATHS) ## ## BUILD64 = ## CONFIGURE_ENV = @@ -176,10 +177,13 @@ ## The compiler to use. Defaults to SOS11, can be also: SOS12, GCC3, GCC4. ## GARCOMPILER = SOS11 ## -# Remove the following rules and uncomment the -# include before building. -all: .DEFAULT -.DEFAULT: - @true +include gar/category.mk -#include gar/category.mk +build-py-kstat: + (cd $(WORKSRC); $(BUILD_ENV) gmake all) + @$(MAKECOOKIE) + +install-py-kstat: + (cd $(WORKSRC); $(INSTALL_ENV) gmake install) + @$(MAKECOOKIE) + Modified: csw/mgar/pkg/pykstat/trunk/checksums =================================================================== --- csw/mgar/pkg/template/trunk/checksums 2010-01-25 11:29:54 UTC (rev 8165) +++ csw/mgar/pkg/pykstat/trunk/checksums 2010-01-30 08:01:16 UTC (rev 8228) @@ -0,0 +1,2 @@ +a18f55cc17b9fec9d29e190037da44ca PyKstat-0.5.tar.gz +77ab34b001f27b5efff6cd2a2e36156a python-2.6-Makefile.patch Added: csw/mgar/pkg/pykstat/trunk/files/python-2.6-Makefile.patch =================================================================== --- csw/mgar/pkg/pykstat/trunk/files/python-2.6-Makefile.patch (rev 0) +++ csw/mgar/pkg/pykstat/trunk/files/python-2.6-Makefile.patch 2010-01-30 08:01:16 UTC (rev 8228) @@ -0,0 +1,43 @@ +diff --git a/Makefile b/Makefile +index cf927aa..0a178b9 100644 +--- a/Makefile ++++ b/Makefile +@@ -4,10 +4,10 @@ + # In general, you should only need to change the compiler and the + # location of your python header files. + +-CC = gcc +-PY_INCLUDES = -I/s/include/python1.5 +-PY_LIBDIR = /s/lib/python1.5 ++PY_INCLUDES = -I/opt/csw/include/python2.6 ++PY_LIBDIR = /opt/csw/lib/python2.6 + DEBUG= ++INSTALL = ginstall + + # Don't change below this line! + SOLIBS= -lkstat +@@ -18,10 +18,14 @@ PY_SITE_LIB_DIR = $(PY_LIBDIR)/site-packages + all: wkstatmodule.so utmpxmodule.so + + install: all +- /bin/cp wkstatmodule.so utmpxmodule.so $(PY_SO_LIB_DIR) +- /bin/cp kstat.py kstats.py $(PY_SITE_LIB_DIR) ++ $(INSTALL) -m 755 -d $(DESTDIR)$(PY_SO_LIB_DIR) ++ $(INSTALL) -m 755 -d $(DESTDIR)$(PY_SITE_LIB_DIR) ++ $(INSTALL) -m 755 wkstatmodule.so $(DESTDIR)$(PY_SO_LIB_DIR) ++ $(INSTALL) -m 755 utmpxmodule.so $(DESTDIR)$(PY_SO_LIB_DIR) ++ $(INSTALL) -m 644 kstat.py $(DESTDIR)$(PY_SITE_LIB_DIR) ++ $(INSTALL) -m 644 kstats.py $(DESTDIR)$(PY_SITE_LIB_DIR) + @echo "You may wish to run:" +- @echo " python $(PY_LIBDIR)/compileall.py $(PY_SITE_LIB_DIR)" ++ @echo " python $(PY_LIBDIR)/compileall.py $(DESTDIR)$(PY_SITE_LIB_DIR)" + @echo "to compile the new libraries for your users." + + swig: wkstatmodule.so +@@ -60,4 +64,4 @@ dist: + tardist PyKstat-0.5 + + clean: +- /bin/rm -f *~ *.o *.so main0 test1 +\ No newline at end of file ++ /bin/rm -f *~ *.o *.so main0 test1 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Sat Jan 30 09:02:55 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sat, 30 Jan 2010 08:02:55 +0000 Subject: [csw-devel] SF.net SVN: gar:[8229] csw/mgar/pkg/pykstat/trunk/Makefile Message-ID: Revision: 8229 http://gar.svn.sourceforge.net/gar/?rev=8229&view=rev Author: wahwah Date: 2010-01-30 08:02:55 +0000 (Sat, 30 Jan 2010) Log Message: ----------- pykstat: Removing template comments. Modified Paths: -------------- csw/mgar/pkg/pykstat/trunk/Makefile Modified: csw/mgar/pkg/pykstat/trunk/Makefile =================================================================== --- csw/mgar/pkg/pykstat/trunk/Makefile 2010-01-30 08:01:16 UTC (rev 8228) +++ csw/mgar/pkg/pykstat/trunk/Makefile 2010-01-30 08:02:55 UTC (rev 8229) @@ -2,181 +2,24 @@ # Distributed under the terms of the GNU General Public License v2 # $Id$ -## This file contains comments to guide you through various GAR settings. -## Please remove unnecessary comments before committing your code to the code -## repository. The comments to remove are marked with double hashes. -## If you want to remove them all in-place, use: -## gsed -i -e '/^##/d' Makefile -## -## For more information about GAR variables, please see: -## https://sourceforge.net/apps/trac/gar/wiki/GAR%20Variable%20Reference -## GARNAME = pykstat GARVERSION = 0.5 -## -## The category that your software fits in. This is not a descriptive field, but -## influences the build process. Depending on the CATEGORIES setting, different -## Makefiles are included from gar/categories/ in your trunk directory, which -## adjust the build settings for the respective category. -## -## Possible settings are: -## apps, cpan, devel, gnome, java, kde, lang, lib, meta, net, python, server, -## utils, x11, xfce, xorg, xtra CATEGORIES = python -## -## A one-line description of the package, which will appear in the pkginfo. DESCRIPTION = a Python interface to the Solaris kstat(3k) and utmpx APIs -## -## A longer description of the package. This is only for descriptive purposes -## inside the Makefile and is not used elsewhere. define BLURB endef -## -## Upstream URL that should show up in the VENDOR field as well as on -## http://opencsw.org/packages/. SPKG_SOURCEURL = http://www.biostat.wisc.edu/~annis/creations/pykstat.html -## -## Whitespace-separated list of URLs to download the source package from. -## There are presets: $(SF_MIRRORS), $(GNU_MIRRORS) and $(GOOGLE_MIRROR). MASTER_SITES = http://www.biostat.wisc.edu/~annis/creations/ DISTNAME = PyKstat-$(GARVERSION) -## -## SF_PROJ is required if you set $(MASTER_SITES) to $(SF_MIRRORS) and the -## Sourceforge project name differs from $(GARNAME). Specifies the Sourceforge -## project name of the software you wish to download. -## SF_PROJ = -## -## A list of space separated patch filenames from files/ that are to be applied -## to the extracted software before the ./configure stage. Patches need to be -## included in the DISTFILES variable as well. PATCHFILES = python-2.6-Makefile.patch -## -## Whitespace-separated list of files which comprise this build. mGAR will look -## for the files in the $(FILEDIR) (trunk/files) directory and on the -## $(MASTER_SITES). DISTFILES = $(DISTNAME).tar.gz -## -## We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz -## -## Catalog name is the name to be used with pkg{-get,util} -i . -## It is different from the system package name, which by convention is CSWpkgname. -## CATALOGNAME = -## -## Set to 1 to mark the package as architecture-independent. -## ARCHALL = 0 -## -## A list of files / patterns that should be excluded from the package. Amends -## the default list of excluded filenames $(MERGE_EXCLUDE_DEFAULT), which -## contains things like libtool .la files and files with a leading ~. -## EXTRA_MERGE_EXCLUDE_FILES = -## -## A list of space separated package names that should be marked as -## incompatible with the current package. This will go into the depend file. -## When a user has one of the incompatible packages installed and installs -## your package, he will be prompted that the incompatible package must be -## removed. He will however not be prevented to install your package without -## removing the conflicting package first. -## INCOMPATIBLE_PKGS = -## -## The name of the license file that should be included in your package. Defaults -## to COPYING. See http://sourceforge.net/apps/trac/gar/wiki/CopyRightfor details -## on including and displaying licenses. -## LICENSE = -## -## A list of space separated package names that should be produced from your -## Makefile. This is used when a software has different components that can be -## packaged and used individually (think runtime libraries, client tools, server -## files, development headers). You don't need to set this when you just want to -## produce one package. -## -## When you set this variable to include more than one package, you also need to -## set PKGFILES_CSWpkgname for each package (except for the first one in your -## $(PACKAGES) list) to define which files go into each package. The first -## package from $(PACKAGES) one will hold all files that are not matched by -## PKGFILES_ for other packages. PACKAGES = CSWpy-kstat CATALOGNAME_CSWpy-kstat = py_kstat -## -## If specified, GAR feeds the almost-final package prototype file to -## $(PROTOTYPE_FILTER) and reads the final package prototype file from it. -## $(PROTOTYPE_FILTER) is usually a sed/awk/perl one-liner, which was mostly used -## to prepare the prototype file for use with cswclassutils (see -## $(SPKG_CLASSES)). Now that there are convenience variables for cswclassutils, -## you will rarely have to use this. A still valid use case would be to change -## the file permissions of a file to be set-UID. -## See http://wiki.opencsw.org/cswclassutils-package for common usage information -## PROTOTYPE_FILTER = -## -## cswclassutils settings -## -## A list of action classes. Possible values are: -## none cswpreserveconf cswcpsampleconf cswpycompile cswusergroup cswinitsmf -## cswinetd cswetcservices -## The class 'cswinitsmf' must be the last class listed. When you use cswclassutils, -## you need to add CSWcswclassutils to REQUIRED_PKGS. -## SPKG_CLASSES = none -## Simplified settings for classes: -## PRESERVECONF = -## SAMPLECONF = -## INITSMF = -## USERGROUP = -## ETCSERVICES = -## INETDCONF = -## A list of runtime package dependencies in the form of CSWfoo. -## REQUIRED_PKGS = -## -## A list of packages necessary to build this package PREREQUISITE_PKGS = $(REQUIRED_PKGS) CSWswig -## -## When using non-empty $(PACKAGES): -## REQUIRED_PKGS_CSWpkgname = -## SPKG_DESC_CSWpkgname = -## PKGFILES_CSWpkgname = -## CATALOGNAME_CSWpkgname = -## -## A list of space separated directories where objects should be stripped in -## addition to the bin/ and sbin/ directories. -## STRIP_DIRS = -## -## Define a custom target for the configure phase. When you set this, the target -## that will be used instead of configure: target, is named -## configure-$(CONFIGURE_SCRIPTS) and you will need to define it in your Makefile -## after including gar/gar.include.mk. If you want to skip the configure phase -## completely (for example when your software doesn't need to be compiled) assign -## this variable an empty value. The procedure works for configure, build, -## install and test steps. -## CONFIGURE_SCRIPTS = BUILD_SCRIPTS = py-kstat INSTALL_SCRIPTS = py-kstat TEST_SCRIPTS = -## -## Compilation settings -## -## The build directory. -## WORKSRC = $(WORKDIR)/$(GARNAME)-$(GARVERSION) -## -## BUILD_ARGS is passed as an argument to gmake during the build phase. Use this -## for example, if you need to override Makefile variables. -## BUILD_ARGS = -## -## Arguments passed to the ./configure script. -## CONFIGURE_ARGS = $(DIRPATHS) -## -## BUILD64 = -## CONFIGURE_ENV = -## EXTRA_CFLAGS = -## EXTRA_LDFLAGS = -## EXTRA_INC = -## EXTRA_LIB = -## GARFLAVOR = -## INSTALL_ARGS = -## OPT_FLAGS_SOS = -xO3 -## OPT_FLAGS_GCC = -O2 -pipe -## -## The compiler to use. Defaults to SOS11, can be also: SOS12, GCC3, GCC4. -## GARCOMPILER = SOS11 -## include gar/category.mk build-py-kstat: This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Sat Jan 30 10:07:27 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sat, 30 Jan 2010 09:07:27 +0000 Subject: [csw-devel] SF.net SVN: gar:[8230] csw/mgar/pkg/pykstat/trunk Message-ID: Revision: 8230 http://gar.svn.sourceforge.net/gar/?rev=8230&view=rev Author: wahwah Date: 2010-01-30 09:07:27 +0000 (Sat, 30 Jan 2010) Log Message: ----------- pykstat: Use /opt/csw/lib/python instead of /opt/csw/lib/python2.6 Modified Paths: -------------- csw/mgar/pkg/pykstat/trunk/checksums csw/mgar/pkg/pykstat/trunk/files/python-2.6-Makefile.patch Modified: csw/mgar/pkg/pykstat/trunk/checksums =================================================================== --- csw/mgar/pkg/pykstat/trunk/checksums 2010-01-30 08:02:55 UTC (rev 8229) +++ csw/mgar/pkg/pykstat/trunk/checksums 2010-01-30 09:07:27 UTC (rev 8230) @@ -1,2 +1,2 @@ a18f55cc17b9fec9d29e190037da44ca PyKstat-0.5.tar.gz -77ab34b001f27b5efff6cd2a2e36156a python-2.6-Makefile.patch +23b4a5c2b49eb6b786ff3788c7fae827 python-2.6-Makefile.patch Modified: csw/mgar/pkg/pykstat/trunk/files/python-2.6-Makefile.patch =================================================================== --- csw/mgar/pkg/pykstat/trunk/files/python-2.6-Makefile.patch 2010-01-30 08:02:55 UTC (rev 8229) +++ csw/mgar/pkg/pykstat/trunk/files/python-2.6-Makefile.patch 2010-01-30 09:07:27 UTC (rev 8230) @@ -1,5 +1,5 @@ diff --git a/Makefile b/Makefile -index cf927aa..0a178b9 100644 +index cf927aa..9617708 100644 --- a/Makefile +++ b/Makefile @@ -4,10 +4,10 @@ @@ -10,7 +10,7 @@ -PY_INCLUDES = -I/s/include/python1.5 -PY_LIBDIR = /s/lib/python1.5 +PY_INCLUDES = -I/opt/csw/include/python2.6 -+PY_LIBDIR = /opt/csw/lib/python2.6 ++PY_LIBDIR = /opt/csw/lib/python DEBUG= +INSTALL = ginstall This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From rthurner at users.sourceforge.net Sat Jan 30 11:50:34 2010 From: rthurner at users.sourceforge.net (rthurner at users.sourceforge.net) Date: Sat, 30 Jan 2010 10:50:34 +0000 Subject: [csw-devel] SF.net SVN: gar:[8231] csw/mgar/pkg/apr/trunk Message-ID: Revision: 8231 http://gar.svn.sourceforge.net/gar/?rev=8231&view=rev Author: rthurner Date: 2010-01-30 10:50:34 +0000 (Sat, 30 Jan 2010) Log Message: ----------- apr - upgrade from 1.3.9 to 1.4.2 Modified Paths: -------------- csw/mgar/pkg/apr/trunk/Makefile csw/mgar/pkg/apr/trunk/checksums Modified: csw/mgar/pkg/apr/trunk/Makefile =================================================================== --- csw/mgar/pkg/apr/trunk/Makefile 2010-01-30 09:07:27 UTC (rev 8230) +++ csw/mgar/pkg/apr/trunk/Makefile 2010-01-30 10:50:34 UTC (rev 8231) @@ -1,5 +1,5 @@ GARNAME = apr -GARVERSION = 1.3.9 +GARVERSION = 1.4.2 CATEGORIES = lib DESCRIPTION = Apache Portable Runtime Modified: csw/mgar/pkg/apr/trunk/checksums =================================================================== --- csw/mgar/pkg/apr/trunk/checksums 2010-01-30 09:07:27 UTC (rev 8230) +++ csw/mgar/pkg/apr/trunk/checksums 2010-01-30 10:50:34 UTC (rev 8231) @@ -1 +1 @@ -85bcd8005153b8fa63b1e3f95ea31f07 apr-1.3.9.tar.gz +fc80cb54f158c2674f9eeb47a1f672cd apr-1.4.2.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Sat Jan 30 23:14:48 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sat, 30 Jan 2010 22:14:48 +0000 Subject: [csw-devel] SF.net SVN: gar:[8232] csw/mgar/gar/v2-git Message-ID: Revision: 8232 http://gar.svn.sourceforge.net/gar/?rev=8232&view=rev Author: wahwah Date: 2010-01-30 22:14:48 +0000 (Sat, 30 Jan 2010) Log Message: ----------- mGAR v2-git: Merging in the v2 branch Modified Paths: -------------- csw/mgar/gar/v2-git/bin/checkpkg csw/mgar/gar/v2-git/categories/cpan/category.mk csw/mgar/gar/v2-git/categories/gnome/category.mk csw/mgar/gar/v2-git/categories/kde/category.mk csw/mgar/gar/v2-git/gar.conf.mk csw/mgar/gar/v2-git/gar.lib.mk csw/mgar/gar/v2-git/gar.mk csw/mgar/gar/v2-git/gar.pkg.mk Added Paths: ----------- csw/mgar/gar/v2-git/bin/checkpkg.d/ csw/mgar/gar/v2-git/bin/checkpkg.d/README csw/mgar/gar/v2-git/bin/checkpkg.d/checkpkg-actionclasses.py csw/mgar/gar/v2-git/bin/checkpkg.d/checkpkg-libs.py csw/mgar/gar/v2-git/bin/checkpkg.d/checkpkg-obsolete-deps.py csw/mgar/gar/v2-git/bin/checkpkg.d/checkpkg-you-can-write-your-own.py csw/mgar/gar/v2-git/bin/checkpkg.d/update_contents_cache.py csw/mgar/gar/v2-git/categories/kde4/ csw/mgar/gar/v2-git/categories/kde4/category.mk csw/mgar/gar/v2-git/lib/ csw/mgar/gar/v2-git/lib/python/ csw/mgar/gar/v2-git/lib/python/checkpkg.py csw/mgar/gar/v2-git/lib/python/checkpkg_test.py csw/mgar/gar/v2-git/lib/python/gartest.py csw/mgar/gar/v2-git/lib/python/opencsw.py csw/mgar/gar/v2-git/lib/python/opencsw_test.py csw/mgar/gar/v2-git/lib/python/testdata/ csw/mgar/gar/v2-git/lib/python/testdata/README csw/mgar/gar/v2-git/lib/python/testdata/__init__.py csw/mgar/gar/v2-git/lib/python/testdata/checkpkg_test_data_CSWlibpq_84.py csw/mgar/gar/v2-git/lib/python/testdata/checkpkg_test_data_CSWmysql51.py csw/mgar/gar/v2-git/lib/python/testdata/checkpkg_test_data_CSWmysql51client.py csw/mgar/gar/v2-git/lib/python/testdata/checkpkg_test_data_CSWmysql51devel.py csw/mgar/gar/v2-git/lib/python/testdata/checkpkg_test_data_CSWmysql51rt.py csw/mgar/gar/v2-git/lib/python/testdata/checkpkg_test_data_CSWmysql5client_8x.py csw/mgar/gar/v2-git/lib/python/testdata/checkpkg_test_data_CSWpostfix.py csw/mgar/gar/v2-git/lib/python/testdata/dump_output_1.py csw/mgar/gar/v2-git/lib/python/testdata/dump_output_2.py csw/mgar/gar/v2-git/lib/python/testdata/example-catalog.txt csw/mgar/gar/v2-git/tests/ csw/mgar/gar/v2-git/tests/example_test.py csw/mgar/gar/v2-git/tests/run_tests.py csw/mgar/gar/v2-git/tests/static/ csw/mgar/gar/v2-git/tests/static/example/ csw/mgar/gar/v2-git/tests/static/example/Makefile csw/mgar/gar/v2-git/tests/static/example/checksums csw/mgar/gar/v2-git/tests/static/example/gar Removed Paths: ------------- csw/mgar/gar/v2-git/bin/checkpkg.d/README csw/mgar/gar/v2-git/bin/checkpkg.d/checkpkg-actionclasses.py csw/mgar/gar/v2-git/bin/checkpkg.d/checkpkg-libs.py csw/mgar/gar/v2-git/bin/checkpkg.d/checkpkg-obsolete-deps.py csw/mgar/gar/v2-git/bin/checkpkg.d/checkpkg-you-can-write-your-own.py csw/mgar/gar/v2-git/bin/checkpkg.d/update_contents_cache.py csw/mgar/gar/v2-git/categories/kde4/category.mk csw/mgar/gar/v2-git/lib/python/ csw/mgar/gar/v2-git/lib/python/checkpkg.py csw/mgar/gar/v2-git/lib/python/checkpkg_test.py csw/mgar/gar/v2-git/lib/python/gartest.py csw/mgar/gar/v2-git/lib/python/opencsw.py csw/mgar/gar/v2-git/lib/python/opencsw_test.py csw/mgar/gar/v2-git/lib/python/testdata/ csw/mgar/gar/v2-git/lib/python/testdata/README csw/mgar/gar/v2-git/lib/python/testdata/__init__.py csw/mgar/gar/v2-git/lib/python/testdata/checkpkg_test_data_CSWlibpq_84.py csw/mgar/gar/v2-git/lib/python/testdata/checkpkg_test_data_CSWmysql51.py csw/mgar/gar/v2-git/lib/python/testdata/checkpkg_test_data_CSWmysql51client.py csw/mgar/gar/v2-git/lib/python/testdata/checkpkg_test_data_CSWmysql51devel.py csw/mgar/gar/v2-git/lib/python/testdata/checkpkg_test_data_CSWmysql51rt.py csw/mgar/gar/v2-git/lib/python/testdata/checkpkg_test_data_CSWmysql5client_8x.py csw/mgar/gar/v2-git/lib/python/testdata/checkpkg_test_data_CSWpostfix.py csw/mgar/gar/v2-git/lib/python/testdata/dump_output_1.py csw/mgar/gar/v2-git/lib/python/testdata/dump_output_2.py csw/mgar/gar/v2-git/lib/python/testdata/example-catalog.txt csw/mgar/gar/v2-git/tests/example_test.py csw/mgar/gar/v2-git/tests/run_tests.py csw/mgar/gar/v2-git/tests/static/ csw/mgar/gar/v2-git/tests/static/example/ csw/mgar/gar/v2-git/tests/static/example/Makefile csw/mgar/gar/v2-git/tests/static/example/checksums csw/mgar/gar/v2-git/tests/static/example/gar Property Changed: ---------------- csw/mgar/gar/v2-git/ csw/mgar/gar/v2-git/bin/checkpkg csw/mgar/gar/v2-git/pkglib/csw/depend Property changes on: csw/mgar/gar/v2-git ___________________________________________________________________ Modified: svn:mergeinfo - /csw/mgar/gar/v2:4936-6678,6915-7553,7617 /csw/mgar/gar/v2-collapsed-modulations:6895 /csw/mgar/gar/v2-migrateconf:7082-7211 /csw/mgar/gar/v2-skayser:6087-6132 + /csw/mgar/gar/v2:4936-6678,6915-8229 /csw/mgar/gar/v2-checkpkg:7722-7855 /csw/mgar/gar/v2-collapsed-modulations:6895 /csw/mgar/gar/v2-dirpackage:8125-8180 /csw/mgar/gar/v2-migrateconf:7082-7211 /csw/mgar/gar/v2-skayser:6087-6132 Modified: csw/mgar/gar/v2-git/bin/checkpkg =================================================================== --- csw/mgar/gar/v2-git/bin/checkpkg 2010-01-30 10:50:34 UTC (rev 8231) +++ csw/mgar/gar/v2-git/bin/checkpkg 2010-01-30 22:14:48 UTC (rev 8232) @@ -1,6 +1,13 @@ #!/bin/ksh -p - -# checkpkg 1.50 (diff to 1.46a: check multiple package files) +# +# $Id$ +# +# checkpkg 1.51 +# +# diff to 1.46a +# - check multiple package files +# - checkpkg.d plugin support +# # This script examines a package that has been put together # for submittal to the CSW archive at opencsw.org # @@ -16,10 +23,29 @@ PATH=$PATH:/usr/sbin +readonly NAME_MAX_LENGTH=${NAME_MAX_LENGTH:-20} LOCAL_ARCH=`uname -p` +if [[ -z "${CHECKPKG_TMPDIR}" ]]; then + readonly CHECKPKG_TMPDIR="/var/tmp" +else + readonly CHECKPKG_TMPDIR +fi +# Colors only when running interactively +if [[ -t 1 ]]; then + GREEN="\\033[0;32;40m" + RED="\\033[1;31;40m" + COLOR_RESET="\\033[00m" +else + GREEN="" + RED="" + COLOR_RESET="" +fi +readonly selfpath="$0" +readonly selfargs="$*" + # always print out a warning message. (to stderr) # exit script, if quit_on_warn set @@ -28,11 +54,17 @@ if [[ -d "$EXTRACTDIR" ]] ; then rm -rf $EXTRACTDIR fi - if [[ "$TMPARCHIVE" != "" ]] ; then - [ -f "$TMPARCHIVE" ] && rm $TMPARCHIVE - fi + cleantmparchives } +cleantmparchives() { + for TMPARCHIVE in $tmparchives; do + if [[ "$TMPARCHIVE" != "" ]]; then + [ -f "$TMPARCHIVE" ] && rm $TMPARCHIVE + fi + done +} + cleanupset(){ if [ "`echo $SETINF*`" != "$SETINF*" ]; then rm $SETINF* @@ -51,9 +83,40 @@ print ERROR: $* >/dev/fd/2 cleanup cleanupset + print "To run checkpkg in the debug mode, add the '-d' flag:" + print "${selfpath} -d ${selfargs}" exit 1 } +debugmsg() { + if [[ "${DEBUG}" != "" ]]; then + print "DEBUG: $*" > /dev/fd/2 + fi +} + +set_variables_for_individual_package_check() { + f=$1 + file $f \ + | sed 's/^[^:]*://' \ + | grep gzip >/dev/null + if [ $? -eq 0 ] ; then + TMPARCHIVE=$CHECKPKG_TMPDIR/`basename $f` + if [[ -f $TMPARCHIVE ]] ; then + print ERROR: $TMPARCHIVE already exists + + fi + gzcat $f >$TMPARCHIVE || exit 1 + f=$TMPARCHIVE + fi + pkgname=`nawk 'NR == 2 {print $1; exit;}' $f` + pkgnames="$pkgnames $pkgname" +} + +if [[ "$1" == "-d" ]] ; then + DEBUG=1 + shift +fi + if [[ "$1" == "-e" ]] ; then quit_on_warn=1; shift @@ -65,11 +128,19 @@ fi # a unique filename for the list of package deps and libs we see in a 'set' -SETINF=/tmp/checkpkg.$$.`date +%Y%m%d%H%M%S` +SETINF=$CHECKPKG_TMPDIR/checkpkg.$$.`date +%Y%m%d%H%M%S` SETLIBS=$SETINF.libs SETDEPS=$SETINF.deps +pkgnames="" +tmparchives="" +EXTRACTDIR=$CHECKPKG_TMPDIR/dissect.$$ +if [ -d $EXTRACTDIR ] ; then + print ERROR: $EXTRACTDIR already exists + exit 1 +fi + for f in "$@" do @@ -82,9 +153,6 @@ case $f in - cswutils-*) - : - ;; *) print Examining $f @@ -111,30 +179,13 @@ done esac -print Extracting files for more detailed inspection... +print Extracting all files for more detailed inspection... -file $f |sed 's/^.*://' |grep gzip >/dev/null -if [ $? -eq 0 ] ; then - TMPARCHIVE=/tmp/`basename $f` - if [[ -f $TMPARCHIVE ]] ; then - print ERROR: $TMPARCHIVE already exists - - fi - gzcat $f >$TMPARCHIVE || exit 1 - f=$TMPARCHIVE -fi +set_variables_for_individual_package_check "$f" -pkgname=`nawk 'NR == 2 {print $1; exit;}' $f` - -EXTRACTDIR=/tmp/dissect.$$ - -if [ -d $EXTRACTDIR ] ; then - print ERROR: $EXTRACTDIR already exists - exit 1 -fi - mkdir $EXTRACTDIR +# FIXME: This doesn't support multiple packages TMPFILE=$EXTRACTDIR/pkginfo @@ -158,8 +209,7 @@ case $software in *[A-Z]*) - echo ERROR: $software must be all lowercase - exit 1 + errmsg "$software must be all lowercase" ;; esac @@ -213,8 +263,8 @@ print basedir="'$basedir'" fi -if [[ ${#software} -gt 20 ]] ; then errmsg $f: software name greater than 20 chars ; fi -if [[ ${#pkgname} -gt 20 ]] ; then errmsg $f: pkg name greater than 20 chars; fi +if [[ ${#software} -gt ${NAME_MAX_LENGTH} ]] ; then errmsg $f: software name greater than 20 chars ; fi +if [[ ${#pkgname} -gt ${NAME_MAX_LENGTH} ]] ; then errmsg $f: pkg name greater than 20 chars; fi if [ "$software" = "" ] ; then errmsg $f: software field not set properly in NAME ; fi if [ "$pkgname" = "" ] ; then errmsg $f: pkgname field blank ; fi @@ -228,8 +278,7 @@ case $version in *-*) - print ERROR: VERSION field not allowed to have '"-"' in it - exit 1 + errmsg "VERSION field not allowed to have \"-\" in it" ;; *,REV=20[01][0-9].[0-9][0-9].[0-9][0-9]*) : @@ -252,6 +301,17 @@ exit 1 esac +case $f in + *${pkgarch}*) + print "f: $f, pkgarch: $pkgarch" + ;; + *) + print "The file name is '$f'." + print "The pkgarch is '$pkgarch'." + errmsg "ERROR: package file name and pkgarch don't match." + ;; +esac + goodarch=yes case $f in *${LOCAL_ARCH}*) @@ -304,7 +364,6 @@ print Extracing pkg for examination of files... pkgtrans $f $EXTRACTDIR $pkgname - ############################################################# # We now have the package expanded, in "directory" form, in # $EXTRACTDIR/$pkgname @@ -406,7 +465,7 @@ #cat $EXTRACTDIR/elflist| xargs ldd 2>/dev/null |fgrep '.so' | # sed 's:^.*=>[^/]*::' | nawk '{print $1}' |sort -u >$EXTRACTDIR/liblist - cat $EXTRACTDIR/elflist| xargs dump -Lv |nawk '$2=="NEEDED"{print $3}' | + cat $EXTRACTDIR/elflist| xargs /usr/ccs/bin/dump -Lv |nawk '$2=="NEEDED"{print $3}' | sort -u | egrep -v $EXTRACTDIR >$EXTRACTDIR/liblist @@ -439,17 +498,15 @@ # sanity check against "depends on self" nawk '$2=="'$pkgname'" {exit 1}' $EXTRACTDIR/$pkgname/install/depend if [[ $? -ne 0 ]] ; then - print ERROR: $pkgname references self in depend file - exit 1 + errmsg "$pkgname references self in depend file" fi -# Verify that there are no double depends +# Verify that there are no multiple depends repeated_depends="$(awk '{print $2}' $EXTRACTDIR/$pkgname/install/depend \ | sort | uniq -c | awk '{print $1}' | sort | uniq | wc -l)" if [[ "$repeated_depends" -gt 1 ]]; then cat $EXTRACTDIR/$pkgname/install/depend - print ERROR: $pkgname has double depends - exit 1 + errmsg "$pkgname has multiple depends" fi #to retain a record of all packages currently being examined from $@ @@ -474,47 +531,6 @@ fi done -egrep -v 'SUNWbcp|SUNWowbcp|SUNWucb' /var/sadm/install/contents | - fgrep -f $EXTRACTDIR/liblist >$EXTRACTDIR/shortcatalog - - - -for lib in `cat $EXTRACTDIR/liblist` ; do - grep "[/=]$lib[ =]" $EXTRACTDIR/$pkgname/pkgmap - if [[ $? -eq 0 ]] ; then - echo $lib provided by package itself - continue - else - grep "[/=]$lib[ =]" $SETLIBS - if [[ $? -eq 0 ]]; then - echo "$lib provided by package set being evaluated." - continue - fi - fi - - libpkg=`grep /$lib $EXTRACTDIR/shortcatalog | - sed 's/^.* \([^ ]*\)$/\1/' |sort -u` - - if [[ -z "$libpkg" ]] ; then - echo "$lib $pkgname" >> $SETLIBS.missing - print Cannot find package providing $lib. Storing for delayed validation. - else - print $libpkg | fmt -1 >>$EXTRACTDIR/libpkgs - fi -done - -sort -u $EXTRACTDIR/libpkgs >$EXTRACTDIR/libpkgs.x -mv $EXTRACTDIR/libpkgs.x $EXTRACTDIR/libpkgs - -diff $EXTRACTDIR/deppkgs $EXTRACTDIR/libpkgs >/dev/null -if [[ $? -ne 0 ]] ; then - print SUGGESTION: you may want to add some or all of the following as depends: - print ' (Feel free to ignore SUNW or SPRO packages)' - diff $EXTRACTDIR/deppkgs $EXTRACTDIR/libpkgs | fgrep '>' -fi - - - if [[ "$basedir" != "" ]] ; then print if [[ -f $EXTRACTDIR/elflist ]] ; then @@ -530,13 +546,90 @@ fi fi +# Plugin section. +# +# Plugins should live in checkpkg.d subdirectory in the same directory in which +# checkpkg is. Each plugin file name should be an executable and begin with +# "checkpkg-". -cleanup +tmparchives="$tmparchives $TMPARCHIVE" +done -print "" +# All packages have been extracted. +set_variables_for_individual_package_check "$f" + +test_suite_ok=1 +checkpkg_scriptname=`basename $0` +checkpkg_basedir=${0%/${checkpkg_scriptname}} +plugindir=${checkpkg_basedir}/checkpkg.d + +# Cleaning up old *.pyc files which can cause grief. This is because of the +# move of Python libraries. +for pyc_file in ${plugindir}/opencsw.pyc \ + ${plugindir}/checkpkg.pyc; do + if [ -f "${pyc_file}" ]; then + echo "Removing old pyc file: '${pyc_file}'" + rm "${pyc_file}" + fi done +# /var/sadm/install/contents cache update +${plugindir}/update_contents_cache.py + +if [[ "${DEBUG}" != "" ]]; then + extra_options="--debug" +fi +debugmsg "plugindir: '$plugindir'" +log_files="" +if [[ -d "$plugindir" ]]; then + echo "Running modular tests" + # echo plugin dir exists + for plugin in "${plugindir}"/checkpkg-*; do + if [[ -x "${plugin}" ]]; then + debugmsg "Executing: ${plugin} $extra_options -e \"${EXTRACTDIR}\" ${pkgnames}" + plugin_base_name=`basename ${plugin}` + plugin_log="${EXTRACTDIR}/${plugin_base_name}.log" + log_files="${log_files} ${plugin_log}" + printf "TEST: ${plugin} running..." + ${plugin} $extra_options -e "${EXTRACTDIR}" ${pkgnames} > "${plugin_log}" 2>&1 + if [[ "$?" -ne 0 ]]; then + printf "\rTEST: ${plugin} ${RED}[FAIL]${COLOR_RESET} \\n" + test_suite_ok=0 + else + printf "\rTEST: ${plugin} ${GREEN}[OK]${COLOR_RESET} \\n" + fi + else + debugmsg "'${plugin}' is not executable" + fi + done +else + debugmsg "plugin dir does not exist" +fi + +echo +for log_file in ${log_files}; do + if [[ -s "${log_file}" ]]; then + debugmsg ">> LOG START: ${log_file}" + cat "${log_file}" + debugmsg "<< LOG END: ${log_file}" + else + debugmsg "-- LOG ${log_file} is empty" + fi +done +echo + +if [[ ${test_suite_ok} -ne 1 ]]; then + errmsg "One or more modular tests have failed." +else + print "All modular tests were successful." +fi + +print "" + +# Cleaning up after all packages +cleanup + if [ -s $SETDEPS.missing ]; then print "Doing late evaluations of package dependencies." while read mdep; do @@ -551,19 +644,4 @@ done < $SETDEPS.missing fi -if [ -s $SETLIBS.missing ]; then - print "Doing late evaluations of package library dependencies." - while read ldep; do - lib=`echo $ldep | nawk '{print $1}'` - [ "$lib" = "libm.so.2" ] && continue - pkg=`echo $ldep | nawk '{print $2}'` - /usr/bin/grep "[/=]$lib[ =]" $SETLIBS >/dev/null - if [ $? -ne 0 ]; then - errmsg "Couldn't find a package providing $lib" - else - print "A package in the set being evaluated provides $lib" - fi - done < $SETLIBS.missing -fi - cleanupset Property changes on: csw/mgar/gar/v2-git/bin/checkpkg ___________________________________________________________________ Added: svn:keywords + Id Deleted: csw/mgar/gar/v2-git/bin/checkpkg.d/README =================================================================== --- csw/mgar/gar/v2/bin/checkpkg.d/README 2010-01-30 08:02:55 UTC (rev 8229) +++ csw/mgar/gar/v2-git/bin/checkpkg.d/README 2010-01-30 22:14:48 UTC (rev 8232) @@ -1,11 +0,0 @@ -$Id$ - -This directory contains modular checks. Each check is an executable file, -written in any language, accepting specific command line options and returning -the result as a status exit code. - -To see the required flags, issue: - -./checkpkg-dummy.py -h - -Each test's file name must begin with "checkpkg-". Copied: csw/mgar/gar/v2-git/bin/checkpkg.d/README (from rev 8229, csw/mgar/gar/v2/bin/checkpkg.d/README) =================================================================== --- csw/mgar/gar/v2-git/bin/checkpkg.d/README (rev 0) +++ csw/mgar/gar/v2-git/bin/checkpkg.d/README 2010-01-30 22:14:48 UTC (rev 8232) @@ -0,0 +1,11 @@ +$Id$ + +This directory contains modular checks. Each check is an executable file, +written in any language, accepting specific command line options and returning +the result as a status exit code. + +To see the required flags, issue: + +./checkpkg-dummy.py -h + +Each test's file name must begin with "checkpkg-". Deleted: csw/mgar/gar/v2-git/bin/checkpkg.d/checkpkg-actionclasses.py =================================================================== --- csw/mgar/gar/v2/bin/checkpkg.d/checkpkg-actionclasses.py 2010-01-30 08:02:55 UTC (rev 8229) +++ csw/mgar/gar/v2-git/bin/checkpkg.d/checkpkg-actionclasses.py 2010-01-30 22:14:48 UTC (rev 8232) @@ -1,59 +0,0 @@ -#!/opt/csw/bin/python2.6 -# $Id$ - -"""This is a dummy check. You can use it as a boilerplate for your own checks. - -Copy it and modify. -""" - -import logging -import os.path -import sys -import re - -# The following bit of code sets the correct path to Python libraries -# distributed with GAR. -path_list = [os.path.dirname(__file__), - "..", "..", "lib", "python"] -sys.path.append(os.path.join(*path_list)) -import checkpkg -import opencsw - - -def CheckActionClasses(pkg): - """Checks the consistency between classes in the prototype and pkginfo.""" - errors = [] - pkginfo = pkg.GetParsedPkginfo() - pkgmap = pkg.GetPkgmap() - pkginfo_classes = set(re.split(opencsw.WS_RE, pkginfo["CLASSES"])) - pkgmap_classes = pkgmap.GetClasses() - only_in_pkginfo = pkginfo_classes.difference(pkgmap_classes) - only_in_pkgmap = pkgmap_classes.difference(pkginfo_classes) - for cls in only_in_pkginfo: - print "Class %s of %s is only in pkginfo" % (repr(cls), pkg.pkgname) - print "This shouldn't cause any problems, but it might be not necessary." - for cls in only_in_pkgmap: - errors.append( - opencsw.PackageError("Class %s is only in pkgmap" % repr(cls))) - if only_in_pkginfo or only_in_pkgmap: - print ("pkginfo_classes: %s, pkgmap classes: %s" - % (pkginfo_classes, pkgmap_classes)) - return errors - - -def main(): - options, args = checkpkg.GetOptions() - pkgnames = args - check_manager = checkpkg.CheckpkgManager( - "class action scripts / prototype integrity", - options.extractdir, - pkgnames, - options.debug) - check_manager.RegisterIndividualCheck(CheckActionClasses) - exit_code, report = check_manager.Run() - print report.strip() - sys.exit(exit_code) - - -if __name__ == '__main__': - main() Copied: csw/mgar/gar/v2-git/bin/checkpkg.d/checkpkg-actionclasses.py (from rev 8229, csw/mgar/gar/v2/bin/checkpkg.d/checkpkg-actionclasses.py) =================================================================== --- csw/mgar/gar/v2-git/bin/checkpkg.d/checkpkg-actionclasses.py (rev 0) +++ csw/mgar/gar/v2-git/bin/checkpkg.d/checkpkg-actionclasses.py 2010-01-30 22:14:48 UTC (rev 8232) @@ -0,0 +1,59 @@ +#!/opt/csw/bin/python2.6 +# $Id$ + +"""This is a dummy check. You can use it as a boilerplate for your own checks. + +Copy it and modify. +""" + +import logging +import os.path +import sys +import re + +# The following bit of code sets the correct path to Python libraries +# distributed with GAR. +path_list = [os.path.dirname(__file__), + "..", "..", "lib", "python"] +sys.path.append(os.path.join(*path_list)) +import checkpkg +import opencsw + + +def CheckActionClasses(pkg): + """Checks the consistency between classes in the prototype and pkginfo.""" + errors = [] + pkginfo = pkg.GetParsedPkginfo() + pkgmap = pkg.GetPkgmap() + pkginfo_classes = set(re.split(opencsw.WS_RE, pkginfo["CLASSES"])) + pkgmap_classes = pkgmap.GetClasses() + only_in_pkginfo = pkginfo_classes.difference(pkgmap_classes) + only_in_pkgmap = pkgmap_classes.difference(pkginfo_classes) + for cls in only_in_pkginfo: + print "Class %s of %s is only in pkginfo" % (repr(cls), pkg.pkgname) + print "This shouldn't cause any problems, but it might be not necessary." + for cls in only_in_pkgmap: + errors.append( + opencsw.PackageError("Class %s is only in pkgmap" % repr(cls))) + if only_in_pkginfo or only_in_pkgmap: + print ("pkginfo_classes: %s, pkgmap classes: %s" + % (pkginfo_classes, pkgmap_classes)) + return errors + + +def main(): + options, args = checkpkg.GetOptions() + pkgnames = args + check_manager = checkpkg.CheckpkgManager( + "class action scripts / prototype integrity", + options.extractdir, + pkgnames, + options.debug) + check_manager.RegisterIndividualCheck(CheckActionClasses) + exit_code, report = check_manager.Run() + print report.strip() + sys.exit(exit_code) + + +if __name__ == '__main__': + main() Deleted: csw/mgar/gar/v2-git/bin/checkpkg.d/checkpkg-libs.py =================================================================== --- csw/mgar/gar/v2/bin/checkpkg.d/checkpkg-libs.py 2010-01-30 08:02:55 UTC (rev 8229) +++ csw/mgar/gar/v2-git/bin/checkpkg.d/checkpkg-libs.py 2010-01-30 22:14:48 UTC (rev 8232) @@ -1,216 +0,0 @@ -#!/opt/csw/bin/python2.6 -# -# $Id$ -# -# A check for dependencies between shared libraries. -# -# This is currently more of a prototype than a mature program, but it has some -# unit tests and it appears to be working. The main problem is that it's not -# divided into smaller testable sections. - -import os -import os.path -import copy -import re -import subprocess -import logging -import sys -import textwrap - -# The following bit of code sets the correct path to Python libraries -# distributed with GAR. -path_list = [os.path.dirname(__file__), - "..", "..", "lib", "python"] -sys.path.append(os.path.join(*path_list)) -import checkpkg -import opencsw - -DUMP_BIN = "/usr/ccs/bin/dump" - -def GetIsalist(): - args = ["isalist"] - isalist_proc = subprocess.Popen(args, stdout=subprocess.PIPE) - stdout, stderr = isalist_proc.communicate() - ret = isalist_proc.wait() - if ret: - logging.error("Calling isalist has failed.") - isalist = re.split(r"\s+", stdout.strip()) - return isalist - - -def main(): - result_ok = True - errors = [] - options, args = checkpkg.GetOptions() - pkgnames = args - if options.debug: - logging.basicConfig(level=logging.DEBUG) - else: - logging.basicConfig(level=logging.INFO) - checkers = [] - for pkgname in pkgnames: - checker = checkpkg.CheckpkgBase(options.extractdir, pkgname) - checkers.append(checker) - binaries = [] - binaries_by_pkgname = {} - sonames_by_pkgname = {} - pkg_by_any_filename = {} - for checker in checkers: - pkg_binary_paths = checker.ListBinaries() - binaries_base = [os.path.split(x)[1] for x in pkg_binary_paths] - binaries_by_pkgname[checker.pkgname] = binaries_base - binaries.extend(pkg_binary_paths) - for filename in checker.GetAllFilenames(): - pkg_by_any_filename[filename] = checker.pkgname - # Making the binaries unique - binaries = set(binaries) - ws_re = re.compile(r"\s+") - - # man ld.so.1 for more info on this hack - env = copy.copy(os.environ) - env["LD_NOAUXFLTR"] = "1" - needed_sonames_by_binary = {} - filenames_by_soname = {} - # Assembling a data structure with the data about binaries. - # { - # : { checkpkg.NEEDED_SONAMES: [...], - # checkpkg.RUNPATH: [...]}, - # : ..., - # ... - # } - # - for binary in binaries: - binary_base_name = binary.split("/")[-1] - args = [DUMP_BIN, "-Lv", binary] - dump_proc = subprocess.Popen(args, stdout=subprocess.PIPE, env=env) - stdout, stderr = dump_proc.communicate() - ret = dump_proc.wait() - binary_data = checkpkg.ParseDumpOutput(stdout) - needed_sonames_by_binary[binary_base_name] = binary_data - if checkpkg.SONAME not in binary_data: - logging.debug("The %s binary doesn't provide a SONAME. " - "(It might be an executable)", - binary_base_name) - # The shared library doesn't tell its SONAME. We're guessing it's the - # same as the base file name. - binary_data[checkpkg.SONAME] = binary_base_name - filenames_by_soname[binary_data[checkpkg.SONAME]] = binary_base_name - - isalist = GetIsalist() - - # Building indexes by soname to simplify further processing - # These are indexes "by soname". - (needed_sonames, - binaries_by_soname, - runpath_by_needed_soname) = checkpkg.BuildIndexesBySoname( - needed_sonames_by_binary) - - pkgmap = checkpkg.SystemPkgmap() - logging.debug("Determining the soname-package relationships.") - # lines by soname is an equivalent of $EXTRACTDIR/shortcatalog - lines_by_soname = checkpkg.GetLinesBySoname( - pkgmap, needed_sonames, runpath_by_needed_soname, isalist) - - # Creating a map from files to packages. - pkgs_by_filename = {} - for soname, line in lines_by_soname.iteritems(): - # TODO: Find all the packages, not just the last field. - fields = re.split(ws_re, line.strip()) - # For now, we'll assume that the last field is the package. - pkgname = fields[-1] - pkgs_by_filename[soname] = pkgname - - # A shared object dependency/provisioning report, plus checking. - # - # This section is somewhat overlapping with checkpkg.AnalyzeDependencies(), - # it has a different purpose: it reports the relationships between shared - # libraries, binaries using them and packages providing them. Ideally, the - # same bit of code with do checking and reporting. - # - # TODO: Rewrite this using cheetah templates - if options.debug and needed_sonames: - print "Analysis of sonames needed by the package set:" - binaries_with_missing_sonames = set([]) - for soname in needed_sonames: - logging.debug("Analyzing: %s", soname) - if soname in filenames_by_soname: - print "%s is provided by the package itself" % soname - elif soname in lines_by_soname: - print ("%s is provided by %s and required by:" - % (soname, - pkgs_by_filename[soname])) - filename_lines = " ".join(sorted(binaries_by_soname[soname])) - for line in textwrap.wrap(filename_lines, 70): - print " ", line - else: - print ("%s is required by %s, but we don't know what provides it." - % (soname, binaries_by_soname[soname])) - for binary in binaries_by_soname[soname]: - binaries_with_missing_sonames.add(binary) - if soname in checkpkg.ALLOWED_ORPHAN_SONAMES: - print "However, it's a whitelisted soname." - else: - errors.append( - checkpkg.Error("%s is required by %s, but " - "we don't know what provides it." - % (soname, binaries_by_soname[soname]))) - if binaries_with_missing_sonames: - print "The following are binaries with missing sonames:" - binary_lines = " ".join(sorted(binaries_with_missing_sonames)) - for line in textwrap.wrap(binary_lines, 70): - print " ", line - print - - dependent_pkgs = {} - for checker in checkers: - pkgname = checker.pkgname - dir_format_pkg = opencsw.DirectoryFormatPackage(checker.pkgpath) - declared_dependencies = dir_format_pkg.GetDependencies() - if options.debug: - sanitized_pkgname = pkgname.replace("-", "_") - data_file_name = "/var/tmp/checkpkg_test_data_%s.py" % sanitized_pkgname - logging.warn("Saving test data to %s." % repr(data_file_name)) - test_fd = open(data_file_name, "w") - print >>test_fd, "# Testing data for %s" % pkgname - print >>test_fd, "# $Id$" - print >>test_fd, "DATA_PKGNAME =", repr(pkgname) - print >>test_fd, "DATA_DECLARED_DEPENDENCIES =", repr(declared_dependencies) - print >>test_fd, "DATA_BINARIES_BY_PKGNAME =", repr(binaries_by_pkgname) - print >>test_fd, "DATA_NEEDED_SONAMES_BY_BINARY =", repr(needed_sonames_by_binary) - print >>test_fd, "DATA_PKGS_BY_FILENAME =", repr(pkgs_by_filename) - print >>test_fd, "DATA_FILENAMES_BY_SONAME =", repr(filenames_by_soname) - print >>test_fd, "DATA_PKG_BY_ANY_FILENAME =", repr(pkg_by_any_filename) - print >>test_fd, "DATA_LINES_BY_SONAME =", repr(lines_by_soname) - print >>test_fd, "DATA_PKGMAP_CACHE =", repr(pkgmap.cache) - print >>test_fd, "DATA_BINARIES_BY_SONAME =", repr(binaries_by_soname) - print >>test_fd, "DATA_ISALIST =", repr(isalist) - test_fd.close() - - missing_deps, surplus_deps, orphan_sonames = checkpkg.AnalyzeDependencies( - pkgname, - declared_dependencies, - binaries_by_pkgname, - needed_sonames_by_binary, - pkgs_by_filename, - filenames_by_soname, - pkg_by_any_filename) - print checker.FormatDepsReport(missing_deps, - surplus_deps, - orphan_sonames) - - for soname in orphan_sonames: - errors.append(checkpkg.Error("The following soname does't belong to " - "any package: %s" % soname)) - - if errors: - for error in errors: - logging.error(error) - sys.exit(1) - else: - sys.exit(0) - - -if __name__ == '__main__': - main() - -# vim:set sw=2 ts=2 sts=2 expandtab: Copied: csw/mgar/gar/v2-git/bin/checkpkg.d/checkpkg-libs.py (from rev 8229, csw/mgar/gar/v2/bin/checkpkg.d/checkpkg-libs.py) =================================================================== --- csw/mgar/gar/v2-git/bin/checkpkg.d/checkpkg-libs.py (rev 0) +++ csw/mgar/gar/v2-git/bin/checkpkg.d/checkpkg-libs.py 2010-01-30 22:14:48 UTC (rev 8232) @@ -0,0 +1,216 @@ +#!/opt/csw/bin/python2.6 +# +# $Id$ +# +# A check for dependencies between shared libraries. +# +# This is currently more of a prototype than a mature program, but it has some +# unit tests and it appears to be working. The main problem is that it's not +# divided into smaller testable sections. + +import os +import os.path +import copy +import re +import subprocess +import logging +import sys +import textwrap + +# The following bit of code sets the correct path to Python libraries +# distributed with GAR. +path_list = [os.path.dirname(__file__), + "..", "..", "lib", "python"] +sys.path.append(os.path.join(*path_list)) +import checkpkg +import opencsw + +DUMP_BIN = "/usr/ccs/bin/dump" + +def GetIsalist(): + args = ["isalist"] + isalist_proc = subprocess.Popen(args, stdout=subprocess.PIPE) + stdout, stderr = isalist_proc.communicate() + ret = isalist_proc.wait() + if ret: + logging.error("Calling isalist has failed.") + isalist = re.split(r"\s+", stdout.strip()) + return isalist + + +def main(): + result_ok = True + errors = [] + options, args = checkpkg.GetOptions() + pkgnames = args + if options.debug: + logging.basicConfig(level=logging.DEBUG) + else: + logging.basicConfig(level=logging.INFO) + checkers = [] + for pkgname in pkgnames: + checker = checkpkg.CheckpkgBase(options.extractdir, pkgname) + checkers.append(checker) + binaries = [] + binaries_by_pkgname = {} + sonames_by_pkgname = {} + pkg_by_any_filename = {} + for checker in checkers: + pkg_binary_paths = checker.ListBinaries() + binaries_base = [os.path.split(x)[1] for x in pkg_binary_paths] + binaries_by_pkgname[checker.pkgname] = binaries_base + binaries.extend(pkg_binary_paths) + for filename in checker.GetAllFilenames(): + pkg_by_any_filename[filename] = checker.pkgname + # Making the binaries unique + binaries = set(binaries) + ws_re = re.compile(r"\s+") + + # man ld.so.1 for more info on this hack + env = copy.copy(os.environ) + env["LD_NOAUXFLTR"] = "1" + needed_sonames_by_binary = {} + filenames_by_soname = {} + # Assembling a data structure with the data about binaries. + # { + # : { checkpkg.NEEDED_SONAMES: [...], + # checkpkg.RUNPATH: [...]}, + # : ..., + # ... + # } + # + for binary in binaries: + binary_base_name = binary.split("/")[-1] + args = [DUMP_BIN, "-Lv", binary] + dump_proc = subprocess.Popen(args, stdout=subprocess.PIPE, env=env) + stdout, stderr = dump_proc.communicate() + ret = dump_proc.wait() + binary_data = checkpkg.ParseDumpOutput(stdout) + needed_sonames_by_binary[binary_base_name] = binary_data + if checkpkg.SONAME not in binary_data: + logging.debug("The %s binary doesn't provide a SONAME. " + "(It might be an executable)", + binary_base_name) + # The shared library doesn't tell its SONAME. We're guessing it's the + # same as the base file name. + binary_data[checkpkg.SONAME] = binary_base_name + filenames_by_soname[binary_data[checkpkg.SONAME]] = binary_base_name + + isalist = GetIsalist() + + # Building indexes by soname to simplify further processing + # These are indexes "by soname". + (needed_sonames, + binaries_by_soname, + runpath_by_needed_soname) = checkpkg.BuildIndexesBySoname( + needed_sonames_by_binary) + + pkgmap = checkpkg.SystemPkgmap() + logging.debug("Determining the soname-package relationships.") + # lines by soname is an equivalent of $EXTRACTDIR/shortcatalog + lines_by_soname = checkpkg.GetLinesBySoname( + pkgmap, needed_sonames, runpath_by_needed_soname, isalist) + + # Creating a map from files to packages. + pkgs_by_filename = {} + for soname, line in lines_by_soname.iteritems(): + # TODO: Find all the packages, not just the last field. + fields = re.split(ws_re, line.strip()) + # For now, we'll assume that the last field is the package. + pkgname = fields[-1] + pkgs_by_filename[soname] = pkgname + + # A shared object dependency/provisioning report, plus checking. + # + # This section is somewhat overlapping with checkpkg.AnalyzeDependencies(), + # it has a different purpose: it reports the relationships between shared + # libraries, binaries using them and packages providing them. Ideally, the + # same bit of code with do checking and reporting. + # + # TODO: Rewrite this using cheetah templates + if options.debug and needed_sonames: + print "Analysis of sonames needed by the package set:" + binaries_with_missing_sonames = set([]) + for soname in needed_sonames: + logging.debug("Analyzing: %s", soname) + if soname in filenames_by_soname: + print "%s is provided by the package itself" % soname + elif soname in lines_by_soname: + print ("%s is provided by %s and required by:" + % (soname, + pkgs_by_filename[soname])) + filename_lines = " ".join(sorted(binaries_by_soname[soname])) + for line in textwrap.wrap(filename_lines, 70): + print " ", line + else: + print ("%s is required by %s, but we don't know what provides it." + % (soname, binaries_by_soname[soname])) + for binary in binaries_by_soname[soname]: + binaries_with_missing_sonames.add(binary) + if soname in checkpkg.ALLOWED_ORPHAN_SONAMES: + print "However, it's a whitelisted soname." + else: + errors.append( + checkpkg.Error("%s is required by %s, but " + "we don't know what provides it." + % (soname, binaries_by_soname[soname]))) + if binaries_with_missing_sonames: + print "The following are binaries with missing sonames:" + binary_lines = " ".join(sorted(binaries_with_missing_sonames)) + for line in textwrap.wrap(binary_lines, 70): + print " ", line + print + + dependent_pkgs = {} + for checker in checkers: + pkgname = checker.pkgname + dir_format_pkg = opencsw.DirectoryFormatPackage(checker.pkgpath) + declared_dependencies = dir_format_pkg.GetDependencies() + if options.debug: + sanitized_pkgname = pkgname.replace("-", "_") + data_file_name = "/var/tmp/checkpkg_test_data_%s.py" % sanitized_pkgname + logging.warn("Saving test data to %s." % repr(data_file_name)) + test_fd = open(data_file_name, "w") + print >>test_fd, "# Testing data for %s" % pkgname + print >>test_fd, "# $Id$" + print >>test_fd, "DATA_PKGNAME =", repr(pkgname) + print >>test_fd, "DATA_DECLARED_DEPENDENCIES =", repr(declared_dependencies) + print >>test_fd, "DATA_BINARIES_BY_PKGNAME =", repr(binaries_by_pkgname) + print >>test_fd, "DATA_NEEDED_SONAMES_BY_BINARY =", repr(needed_sonames_by_binary) + print >>test_fd, "DATA_PKGS_BY_FILENAME =", repr(pkgs_by_filename) + print >>test_fd, "DATA_FILENAMES_BY_SONAME =", repr(filenames_by_soname) + print >>test_fd, "DATA_PKG_BY_ANY_FILENAME =", repr(pkg_by_any_filename) + print >>test_fd, "DATA_LINES_BY_SONAME =", repr(lines_by_soname) + print >>test_fd, "DATA_PKGMAP_CACHE =", repr(pkgmap.cache) + print >>test_fd, "DATA_BINARIES_BY_SONAME =", repr(binaries_by_soname) + print >>test_fd, "DATA_ISALIST =", repr(isalist) + test_fd.close() + + missing_deps, surplus_deps, orphan_sonames = checkpkg.AnalyzeDependencies( + pkgname, + declared_dependencies, + binaries_by_pkgname, + needed_sonames_by_binary, + pkgs_by_filename, + filenames_by_soname, + pkg_by_any_filename) + print checker.FormatDepsReport(missing_deps, + surplus_deps, + orphan_sonames) + + for soname in orphan_sonames: + errors.append(checkpkg.Error("The following soname does't belong to " + "any package: %s" % soname)) + + if errors: + for error in errors: + logging.error(error) + sys.exit(1) + else: + sys.exit(0) + + +if __name__ == '__main__': + main() + +# vim:set sw=2 ts=2 sts=2 expandtab: Deleted: csw/mgar/gar/v2-git/bin/checkpkg.d/checkpkg-obsolete-deps.py =================================================================== --- csw/mgar/gar/v2/bin/checkpkg.d/checkpkg-obsolete-deps.py 2010-01-30 08:02:55 UTC (rev 8229) +++ csw/mgar/gar/v2-git/bin/checkpkg.d/checkpkg-obsolete-deps.py 2010-01-30 22:14:48 UTC (rev 8232) @@ -1,63 +0,0 @@ -#!/opt/csw/bin/python2.6 -# $Id$ - -"""Makes sure that obsolete packages are not added as dependencies. -""" - -import logging -import os.path -import sys - -# The following bit of code sets the correct path to Python libraries -# distributed with GAR. -path_list = [os.path.dirname(__file__), - "..", "..", "lib", "python"] -sys.path.append(os.path.join(*path_list)) -import checkpkg - -OBSOLETE_DEPS = { - # "CSWfoo": { - # "hint": "Do this...", - # "url": "http://www.opencsw.org/bugtrack/view.php?id=..." - # }, - "CSWpython-rt": { - "hint": "CSWpython-rt is deprecated, use CSWpython instead.", - "url": "http://www.opencsw.org/bugtrack/view.php?id=4031" - }, -} - -def CheckObsoleteDeps(pkg): - """Checks for obsolete dependencies.""" - errors = [] - deps = set(pkg.GetDependencies()) - obsolete_pkg_deps = deps.intersection(set(OBSOLETE_DEPS)) - if obsolete_pkg_deps: - for obsolete_pkg in obsolete_pkg_deps: - errors.append( - checkpkg.PackageError( - "Package %s should not depend on %s." - % (pkg.pkgname, obsolete_pkg))) - if "hint" in OBSOLETE_DEPS[obsolete_pkg]: - errors.append( - checkpkg.PackageError("Hint: %s" % OBSOLETE_DEPS[obsolete_pkg]["hint"])) - if "url" in OBSOLETE_DEPS[obsolete_pkg]: - errors.append( - checkpkg.PackageError("URL: %s" % OBSOLETE_DEPS[obsolete_pkg]["url"])) - return errors - - -def main(): - options, args = checkpkg.GetOptions() - pkgnames = args - check_manager = checkpkg.CheckpkgManager("obsolete dependencies", - options.extractdir, - pkgnames, - options.debug) - check_manager.RegisterIndividualCheck(CheckObsoleteDeps) - exit_code, report = check_manager.Run() - print report.strip() - sys.exit(exit_code) - - -if __name__ == '__main__': - main() Copied: csw/mgar/gar/v2-git/bin/checkpkg.d/checkpkg-obsolete-deps.py (from rev 8229, csw/mgar/gar/v2/bin/checkpkg.d/checkpkg-obsolete-deps.py) =================================================================== --- csw/mgar/gar/v2-git/bin/checkpkg.d/checkpkg-obsolete-deps.py (rev 0) +++ csw/mgar/gar/v2-git/bin/checkpkg.d/checkpkg-obsolete-deps.py 2010-01-30 22:14:48 UTC (rev 8232) @@ -0,0 +1,63 @@ +#!/opt/csw/bin/python2.6 +# $Id$ + +"""Makes sure that obsolete packages are not added as dependencies. +""" + +import logging +import os.path +import sys + +# The following bit of code sets the correct path to Python libraries +# distributed with GAR. +path_list = [os.path.dirname(__file__), + "..", "..", "lib", "python"] +sys.path.append(os.path.join(*path_list)) +import checkpkg + +OBSOLETE_DEPS = { + # "CSWfoo": { + # "hint": "Do this...", + # "url": "http://www.opencsw.org/bugtrack/view.php?id=..." + # }, + "CSWpython-rt": { + "hint": "CSWpython-rt is deprecated, use CSWpython instead.", + "url": "http://www.opencsw.org/bugtrack/view.php?id=4031" + }, +} + +def CheckObsoleteDeps(pkg): + """Checks for obsolete dependencies.""" + errors = [] + deps = set(pkg.GetDependencies()) + obsolete_pkg_deps = deps.intersection(set(OBSOLETE_DEPS)) + if obsolete_pkg_deps: + for obsolete_pkg in obsolete_pkg_deps: + errors.append( + checkpkg.PackageError( + "Package %s should not depend on %s." + % (pkg.pkgname, obsolete_pkg))) + if "hint" in OBSOLETE_DEPS[obsolete_pkg]: + errors.append( + checkpkg.PackageError("Hint: %s" % OBSOLETE_DEPS[obsolete_pkg]["hint"])) + if "url" in OBSOLETE_DEPS[obsolete_pkg]: + errors.append( + checkpkg.PackageError("URL: %s" % OBSOLETE_DEPS[obsolete_pkg]["url"])) + return errors + + +def main(): + options, args = checkpkg.GetOptions() + pkgnames = args + check_manager = checkpkg.CheckpkgManager("obsolete dependencies", + options.extractdir, + pkgnames, + options.debug) + check_manager.RegisterIndividualCheck(CheckObsoleteDeps) + exit_code, report = check_manager.Run() + print report.strip() + sys.exit(exit_code) + + +if __name__ == '__main__': + main() Deleted: csw/mgar/gar/v2-git/bin/checkpkg.d/checkpkg-you-can-write-your-own.py =================================================================== --- csw/mgar/gar/v2/bin/checkpkg.d/checkpkg-you-can-write-your-own.py 2010-01-30 08:02:55 UTC (rev 8229) +++ csw/mgar/gar/v2-git/bin/checkpkg.d/checkpkg-you-can-write-your-own.py 2010-01-30 22:14:48 UTC (rev 8232) @@ -1,74 +0,0 @@ -#!/opt/csw/bin/python2.6 -# $Id$ - -"""This is a dummy module. You can use it as a boilerplate for your own modules. - -Copy it and modify. -""" - -import os.path -import sys - -# The following bit of code sets the correct path to Python libraries -# distributed with GAR. -path_list = [os.path.dirname(__file__), - "..", "..", "lib", "python"] -sys.path.append(os.path.join(*path_list)) -import checkpkg - -# Defining checking functions. - -def MyCheckForAsinglePackage(pkg): - """Checks an individual package. - - Gets a DirctoryFormatPackage as an argument, and returns a list of errors. - - Errors should be a list of checkpkg.PackageError objects: - - errors.append(checkpkg.PackageError("There's something wrong.")) - """ - errors = [] - # Checking code for an individual package goes here. See the - # DirectoryFormatPackage class in lib/python/opencsw.py for the available - # APIs. - - # Here's how to report an error: - something_is_wrong = False - if something_is_wrong: - errors.append(checkpkg.PackageError("There's something wrong.")) - return errors - - -def MyCheckForAsetOfPackages(pkgs): - """Checks a set of packages. - - Sometimes individual checks aren't enough. If you need to write code which - needs to examine multiple packages at the same time, use this function. - - Gets a list of packages, returns a list of errors. - """ - errors = [] - # Checking code goes here. - return errors - - -def main(): - options, args = checkpkg.GetOptions() - pkgnames = args - # CheckpkgManager class abstracts away things such as the collection of - # results. - check_manager = checkpkg.CheckpkgManager("a template of a checkpkg module", - options.extractdir, - pkgnames, - options.debug) - # Registering functions defined above. - check_manager.RegisterIndividualCheck(MyCheckForAsinglePackage) - check_manager.RegisterSetCheck(MyCheckForAsetOfPackages) - # Running the checks, reporting and exiting. - exit_code, report = check_manager.Run() - print report.strip() - sys.exit(exit_code) - - -if __name__ == '__main__': - main() Copied: csw/mgar/gar/v2-git/bin/checkpkg.d/checkpkg-you-can-write-your-own.py (from rev 8229, csw/mgar/gar/v2/bin/checkpkg.d/checkpkg-you-can-write-your-own.py) =================================================================== --- csw/mgar/gar/v2-git/bin/checkpkg.d/checkpkg-you-can-write-your-own.py (rev 0) +++ csw/mgar/gar/v2-git/bin/checkpkg.d/checkpkg-you-can-write-your-own.py 2010-01-30 22:14:48 UTC (rev 8232) @@ -0,0 +1,74 @@ +#!/opt/csw/bin/python2.6 +# $Id$ + +"""This is a dummy module. You can use it as a boilerplate for your own modules. + +Copy it and modify. +""" + +import os.path +import sys + +# The following bit of code sets the correct path to Python libraries +# distributed with GAR. +path_list = [os.path.dirname(__file__), + "..", "..", "lib", "python"] +sys.path.append(os.path.join(*path_list)) +import checkpkg + +# Defining checking functions. + +def MyCheckForAsinglePackage(pkg): + """Checks an individual package. + + Gets a DirctoryFormatPackage as an argument, and returns a list of errors. + + Errors should be a list of checkpkg.PackageError objects: + + errors.append(checkpkg.PackageError("There's something wrong.")) + """ + errors = [] + # Checking code for an individual package goes here. See the + # DirectoryFormatPackage class in lib/python/opencsw.py for the available + # APIs. + + # Here's how to report an error: + something_is_wrong = False + if something_is_wrong: + errors.append(checkpkg.PackageError("There's something wrong.")) + return errors + + +def MyCheckForAsetOfPackages(pkgs): + """Checks a set of packages. + + Sometimes individual checks aren't enough. If you need to write code which + needs to examine multiple packages at the same time, use this function. + + Gets a list of packages, returns a list of errors. + """ + errors = [] + # Checking code goes here. + return errors + + +def main(): + options, args = checkpkg.GetOptions() + pkgnames = args + # CheckpkgManager class abstracts away things such as the collection of + # results. + check_manager = checkpkg.CheckpkgManager("a template of a checkpkg module", + options.extractdir, + pkgnames, + options.debug) + # Registering functions defined above. + check_manager.RegisterIndividualCheck(MyCheckForAsinglePackage) + check_manager.RegisterSetCheck(MyCheckForAsetOfPackages) + # Running the checks, reporting and exiting. + exit_code, report = check_manager.Run() + print report.strip() + sys.exit(exit_code) + + +if __name__ == '__main__': + main() Deleted: csw/mgar/gar/v2-git/bin/checkpkg.d/update_contents_cache.py =================================================================== --- csw/mgar/gar/v2/bin/checkpkg.d/update_contents_cache.py 2010-01-30 08:02:55 UTC (rev 8229) +++ csw/mgar/gar/v2-git/bin/checkpkg.d/update_contents_cache.py 2010-01-30 22:14:48 UTC (rev 8232) @@ -1,28 +0,0 @@ -#!/opt/csw/bin/python2.6 -# -# $Id$ -# -# This file only creates an instance of SystemPkgmap in order to update the -# package cache (if necessary), and display the information about the update. - -import os -import os.path -import sys -import logging - -# The following bit of code sets the correct path to Python libraries -# distributed with GAR. -path_list = [os.getcwd(), - os.path.split(sys.argv[0])[0], - "..", "..", "lib", "python"] -sys.path.append(os.path.join(*path_list)) -import checkpkg - -def main(): - print "Checking if the package cache is up to date." - logging.basicConfig(level=logging.INFO) - test_pkgmap = checkpkg.SystemPkgmap() - - -if __name__ == '__main__': - main() Copied: csw/mgar/gar/v2-git/bin/checkpkg.d/update_contents_cache.py (from rev 8229, csw/mgar/gar/v2/bin/checkpkg.d/update_contents_cache.py) =================================================================== --- csw/mgar/gar/v2-git/bin/checkpkg.d/update_contents_cache.py (rev 0) +++ csw/mgar/gar/v2-git/bin/checkpkg.d/update_contents_cache.py 2010-01-30 22:14:48 UTC (rev 8232) @@ -0,0 +1,28 @@ +#!/opt/csw/bin/python2.6 +# +# $Id$ +# +# This file only creates an instance of SystemPkgmap in order to update the +# package cache (if necessary), and display the information about the update. + +import os +import os.path +import sys +import logging + +# The following bit of code sets the correct path to Python libraries +# distributed with GAR. +path_list = [os.getcwd(), + os.path.split(sys.argv[0])[0], + "..", "..", "lib", "python"] +sys.path.append(os.path.join(*path_list)) +import checkpkg + +def main(): + print "Checking if the package cache is up to date." + logging.basicConfig(level=logging.INFO) + test_pkgmap = checkpkg.SystemPkgmap() + + +if __name__ == '__main__': + main() Modified: csw/mgar/gar/v2-git/categories/cpan/category.mk =================================================================== --- csw/mgar/gar/v2-git/categories/cpan/category.mk 2010-01-30 10:50:34 UTC (rev 8231) +++ csw/mgar/gar/v2-git/categories/cpan/category.mk 2010-01-30 22:14:48 UTC (rev 8232) @@ -88,9 +88,10 @@ @( cd $* ; $(TEST_ENV) ./Build test ) @$(MAKECOOKIE) +PERLBUILD_INSTALL_ARGS ?= destdir=$(DESTDIR) $(EXTRA_PERLBUILD_INSTALL_ARGS) install-%/Build: @echo " ==> Running Build install in $*" - @( cd $* ; $(INSTALL_ENV) ./Build install destdir=$(DESTDIR) ) + ( cd $* ; $(INSTALL_ENV) ./Build install $(PERLBUILD_INSTALL_ARGS) ) @$(MAKECOOKIE) # Check for a CPAN module version update Modified: csw/mgar/gar/v2-git/categories/gnome/category.mk =================================================================== --- csw/mgar/gar/v2-git/categories/gnome/category.mk 2010-01-30 10:50:34 UTC (rev 8231) +++ csw/mgar/gar/v2-git/categories/gnome/category.mk 2010-01-30 22:14:48 UTC (rev 8232) @@ -1 +1,13 @@ +# pkg-config options +EXTRA_PKG_CONFIG_PATH += /opt/csw/X11/lib/pkgconfig + +MSGFMT= /opt/csw/bin/gmsgfmt +MSGMERGE= /opt/csw/bin/gmsgmerge +XGETTEXT = /opt/csw/bin/gxgettext +GETTEXT = /opt/csw/bin/ggettext +export MSGMERGE +export MSGFMT +export XGETTEXT +export GETTEXT + include gar/gar.mk Modified: csw/mgar/gar/v2-git/categories/kde/category.mk =================================================================== --- csw/mgar/gar/v2-git/categories/kde/category.mk 2010-01-30 10:50:34 UTC (rev 8231) +++ csw/mgar/gar/v2-git/categories/kde/category.mk 2010-01-30 22:14:48 UTC (rev 8232) @@ -1,7 +1,7 @@ # KDE KDE_ROOT = http://download.kde.org -KDE_VERSION = 3.5.2 +KDE_VERSION = 3.5.10 KDE_DIST = stable KDE_MIRROR = $(KDE_ROOT)/$(KDE_DIST)/$(KDE_VERSION)/src/ Deleted: csw/mgar/gar/v2-git/categories/kde4/category.mk =================================================================== --- csw/mgar/gar/v2/categories/kde4/category.mk 2010-01-30 08:02:55 UTC (rev 8229) +++ csw/mgar/gar/v2-git/categories/kde4/category.mk 2010-01-30 22:14:48 UTC (rev 8232) @@ -1,16 +0,0 @@ - -# KDE -KDE_ROOT = http://download.kde.org -KDE_VERSION = 4.3.4 -KDE_DIST = stable -KDE_MIRROR = $(KDE_ROOT)/$(KDE_DIST)/$(KDE_VERSION)/src/ - -MASTER_SITES ?= $(KDE_MIRROR) -GARVERSION ?= $(KDE_VERSION) -PKGDIST ?= $(DISTNAME)-$(GARVERSION).tar.bz2 -DISTFILES += $(PKGDIST) - -# Compiler -GARCOMPILER = GNU - -include gar/gar.mk Copied: csw/mgar/gar/v2-git/categories/kde4/category.mk (from rev 8229, csw/mgar/gar/v2/categories/kde4/category.mk) =================================================================== --- csw/mgar/gar/v2-git/categories/kde4/category.mk (rev 0) +++ csw/mgar/gar/v2-git/categories/kde4/category.mk 2010-01-30 22:14:48 UTC (rev 8232) @@ -0,0 +1,16 @@ + +# KDE +KDE_ROOT = http://download.kde.org +KDE_VERSION = 4.3.4 +KDE_DIST = stable +KDE_MIRROR = $(KDE_ROOT)/$(KDE_DIST)/$(KDE_VERSION)/src/ + +MASTER_SITES ?= $(KDE_MIRROR) +GARVERSION ?= $(KDE_VERSION) +PKGDIST ?= $(DISTNAME)-$(GARVERSION).tar.bz2 +DISTFILES += $(PKGDIST) + +# Compiler +GARCOMPILER = GNU + +include gar/gar.mk Modified: csw/mgar/gar/v2-git/gar.conf.mk =================================================================== --- csw/mgar/gar/v2-git/gar.conf.mk 2010-01-30 10:50:34 UTC (rev 8231) +++ csw/mgar/gar/v2-git/gar.conf.mk 2010-01-30 22:14:48 UTC (rev 8232) @@ -168,7 +168,21 @@ COMMON_PKG_DEPENDS ?= CSWcommon # These are the core packages which must be installed for GAR to function correctly -DEF_BASE_PKGS = CSWgmake CSWgtar CSWggrep CSWdiffutils CSWgfile CSWtextutils CSWwget CSWfindutils CSWgsed CSWgawk CSWbzip2 + +DEF_BASE_PKGS += CSWbzip2 +DEF_BASE_PKGS += CSWdiffutils +DEF_BASE_PKGS += CSWfindutils +DEF_BASE_PKGS += CSWgawk +DEF_BASE_PKGS += CSWgfile +DEF_BASE_PKGS += CSWggrep +DEF_BASE_PKGS += CSWgmake +DEF_BASE_PKGS += CSWgsed +DEF_BASE_PKGS += CSWgtar +DEF_BASE_PKGS += CSWpy-cheetah +DEF_BASE_PKGS += CSWpython +DEF_BASE_PKGS += CSWtextutils +DEF_BASE_PKGS += CSWwget + ifdef GIT_REPOS # netcat and bash are for the gitproxy script. DEF_BASE_PKGS += CSWgit CSWnetcat @@ -547,6 +561,10 @@ GOOGLE_PROJECT ?= $(GARNAME) GOOGLE_MIRROR ?= http://$(GOOGLE_PROJECT).googlecode.com/files/ +# Berlios +BERLIOS_PROJECT ?= $(GARNAME) +BERLIOS_MIRROR ?= http://download.berlios.de/$(BERLIOS_PROJECT)/ http://download2.berlios.de/$(BERLIOS_PROJECT)/ + # GNU GNU_SITE = http://mirrors.kernel.org GNU_GNUROOT = $(GNU_SITE)/gnu Modified: csw/mgar/gar/v2-git/gar.lib.mk =================================================================== --- csw/mgar/gar/v2-git/gar.lib.mk 2010-01-30 10:50:34 UTC (rev 8231) +++ csw/mgar/gar/v2-git/gar.lib.mk 2010-01-30 22:14:48 UTC (rev 8232) @@ -509,17 +509,17 @@ # build from a standard gnu-style makefile's default rule. build-%/Makefile: @echo " ==> Running make in $*" - @$(BUILD_ENV) $(MAKE) $(PARALLELMFLAGS) $(foreach TTT,$(BUILD_OVERRIDE_DIRS),$(TTT)="$($(TTT))") -C $* $(BUILD_ARGS) + @$(BUILD_ENV) $(MAKE) $(PARALLELMFLAGS) $(foreach TTT,$(BUILD_OVERRIDE_VARS),$(TTT)="$(BUILD_OVERRIDE_VAR_$(TTT))") $(foreach TTT,$(BUILD_OVERRIDE_DIRS),$(TTT)="$($(TTT))") -C $* $(BUILD_ARGS) @$(MAKECOOKIE) build-%/makefile: @echo " ==> Running make in $*" - @$(BUILD_ENV) $(MAKE) $(PARALLELMFLAGS) $(foreach TTT,$(BUILD_OVERRIDE_DIRS),$(TTT)="$($(TTT))") -C $* $(BUILD_ARGS) + @$(BUILD_ENV) $(MAKE) $(PARALLELMFLAGS) $(foreach TTT,$(BUILD_OVERRIDE_VARS),$(TTT)="$(BUILD_OVERRIDE_VAR_$(TTT))") $(foreach TTT,$(BUILD_OVERRIDE_DIRS),$(TTT)="$($(TTT))") -C $* $(BUILD_ARGS) @$(MAKECOOKIE) build-%/GNUmakefile: @echo " ==> Running make in $*" - @$(BUILD_ENV) $(MAKE) $(PARALLELMFLAGS) $(foreach TTT,$(BUILD_OVERRIDE_DIRS),$(TTT)="$($(TTT))") -C $* $(BUILD_ARGS) + @$(BUILD_ENV) $(MAKE) $(PARALLELMFLAGS) $(foreach TTT,$(BUILD_OVERRIDE_VARS),$(TTT)="$(BUILD_OVERRIDE_VAR_$(TTT))") $(foreach TTT,$(BUILD_OVERRIDE_DIRS),$(TTT)="$($(TTT))") -C $* $(BUILD_ARGS) @$(MAKECOOKIE) build-%/Jamfile: @@ -564,17 +564,17 @@ # Run tests on pre-built sources test-%/Makefile: @echo " ==> Running make $(TEST_TARGET) in $*" - @$(TEST_ENV) $(MAKE) $(foreach TTT,$(TEST_OVERRIDE_DIRS),$(TTT)="$($(TTT))") -C $* $(TEST_ARGS) $(TEST_TARGET) + @$(TEST_ENV) $(MAKE) $(foreach TTT,$(foreach TTT,$(TEST_OVERRIDE_VARS),$(TTT)="$(TEST_OVERRIDE_VAR_$(TTT))") $(TEST_OVERRIDE_DIRS),$(TTT)="$($(TTT))") -C $* $(TEST_ARGS) $(TEST_TARGET) @$(MAKECOOKIE) test-%/makefile: @echo " ==> Running make $(TEST_TARGET) in $*" - @$(TEST_ENV) $(MAKE) $(foreach TTT,$(TEST_OVERRIDE_DIRS),$(TTT)="$($(TTT))") -C $* $(TEST_ARGS) $(TEST_TARGET) + @$(TEST_ENV) $(MAKE) $(foreach TTT,$(foreach TTT,$(TEST_OVERRIDE_VARS),$(TTT)="$(TEST_OVERRIDE_VAR_$(TTT))") $(TEST_OVERRIDE_DIRS),$(TTT)="$($(TTT))") -C $* $(TEST_ARGS) $(TEST_TARGET) @$(MAKECOOKIE) test-%/GNUmakefile: @echo " ==> Running make $(TEST_TARGET) in $*" - @$(TEST_ENV) $(MAKE) $(foreach TTT,$(TEST_OVERRIDE_DIRS),$(TTT)="$($(TTT))") -C $* $(TEST_ARGS) $(TEST_TARGET) + @$(TEST_ENV) $(MAKE) $(foreach TTT,$(TEST_OVERRIDE_VARS),$(TTT)="$(TEST_OVERRIDE_VAR_$(TTT))") $(foreach TTT,$(TEST_OVERRIDE_DIRS),$(TTT)="$($(TTT))") -C $* $(TEST_ARGS) $(TEST_TARGET) @$(MAKECOOKIE) # Ruby makefiles Modified: csw/mgar/gar/v2-git/gar.mk =================================================================== --- csw/mgar/gar/v2-git/gar.mk 2010-01-30 10:50:34 UTC (rev 8231) +++ csw/mgar/gar/v2-git/gar.mk 2010-01-30 22:14:48 UTC (rev 8232) @@ -356,9 +356,11 @@ @$(foreach COOKIEFILE,$(CHECKSUM_TARGETS), test -e $(COOKIEDIR)/$(COOKIEFILE) ;) # makesum - Generate distinfo (only do this for your own ports!). +GARCHIVE_TARGETS = $(addprefix $(GARCHIVEDIR)/,$(filter-out $(ALLFILES_DYNSCRIPTS), $(ALLFILES))) + MAKESUM_TARGETS = $(filter-out $(_NOCHECKSUM) $(NOCHECKSUM),$(ALLFILES)) -makesum: fetch $(addprefix $(DOWNLOADDIR)/,$(MAKESUM_TARGETS)) +makesum: fetch $(addprefix $(DOWNLOADDIR)/,$(MAKESUM_TARGETS)) $(GARCHIVE_TARGETS) @if test "x$(MAKESUM_TARGETS)" != "x "; then \ (cd $(DOWNLOADDIR) && gmd5sum $(MAKESUM_TARGETS)) > $(CHECKSUM_FILE) ; \ echo "Checksums made for $(MAKESUM_TARGETS)" ; \ @@ -368,8 +370,6 @@ # I am always typing this by mistake makesums: makesum -GARCHIVE_TARGETS = $(addprefix $(GARCHIVEDIR)/,$(ALLFILES)) - garchive: checksum $(GARCHIVE_TARGETS) ; # extract - Unpacks $(DISTFILES) into $(EXTRACTDIR) (patches are "zcatted" into the patch program) @@ -631,7 +631,9 @@ endif ifeq ($(NEEDED_ISAS),$(ISA_DEFAULT)) -MERGE_SCRIPTS_isa-$(ISA_DEFAULT) ?= copy-all $(EXTRA_MERGE_SCRIPTS_$(ISA_DEFAULT)) $(EXTRA_MERGE_SCRIPTS) +MERGE_SCRIPTS_isa-default ?= copy-all $(EXTRA_MERGE_SCRIPTS_$(ISA_DEFAULT)) $(EXTRA_MERGE_SCRIPTS) +MERGE_SCRIPTS_isa-$(ISA_DEFAULT) ?= $(MERGE_SCRIPTS_isa-default) +MERGE_SCRIPTS_$(MODULATION) ?= $(MERGE_SCRIPTS_$(MODULATION_ISACOLLAPSED)) else ISAEXEC_DIRS ?= $(if $(NO_ISAEXEC),,$(bindir) $(sbindir) $(libexecdir)) MERGE_DIRS_isa-default ?= $(EXTRA_MERGE_DIRS) $(EXTRA_MERGE_DIRS_isa-$(ISA_DEFAULT)) @@ -887,7 +889,7 @@ # Update inter-package depends makedepend: - @for gspec in `gfind $(CURDIR) -type f -name '*.gspec' | ggrep files`; do \ + $(_DBG)for gspec in `gfind $(CURDIR) -type f -name '*.gspec' | ggrep files`; do \ pkgname=`basename $$gspec .gspec` ; \ pkgfiles=`dirname $$gspec` ; \ pkgdir=`dirname $$pkgfiles` ; \ Modified: csw/mgar/gar/v2-git/gar.pkg.mk =================================================================== --- csw/mgar/gar/v2-git/gar.pkg.mk 2010-01-30 10:50:34 UTC (rev 8231) +++ csw/mgar/gar/v2-git/gar.pkg.mk 2010-01-30 22:14:48 UTC (rev 8232) @@ -141,7 +141,7 @@ SPKG_DESC ?= $(DESCRIPTION) SPKG_VERSION ?= $(GARVERSION) SPKG_CATEGORY ?= application -SPKG_SOURCEURL ?= $(firstword $(MASTER_SITES)) +SPKG_SOURCEURL ?= $(firstword $(VENDOR_URL) $(MASTER_SITES) $(GIT_REPOS)) SPKG_VENDOR ?= $(SPKG_SOURCEURL) packaged for CSW by $(SPKG_PACKAGER) SPKG_PSTAMP ?= $(LOGNAME)@$(shell hostname)-$(call _REVISION)-$(shell date '+%Y%m%d%H%M%S') SPKG_BASEDIR ?= $(prefix) @@ -154,17 +154,12 @@ SPKG_PKGROOT ?= $(PKGROOT) SPKG_PKGBASE ?= $(PKGROOT) SPKG_WORKDIR ?= $(CURDIR)/$(WORKDIR) +SPKG_TMPDIR ?= /tmp SPKG_DEPEND_DB = $(GARDIR)/csw/depend.db SPKG_PKGFILE ?= %{bitname}-%{SPKG_VERSION},%{SPKG_REVSTAMP}-%{SPKG_OSNAME}-%{arch}-$(or $(filter $(call _REVISION),UNCOMMITTED NOTVERSIONED NOSVN),CSW).pkg -# Handle cswclassutils -# append $2 to SPKG_CLASSES if $1 is non-null -define _spkg_cond_add -$(SPKG_CLASSES) $(if $($(1)),$(if $(filter $(2),$(SPKG_CLASSES)),,$(2))) -endef - MIGRATECONF ?= $(strip $(foreach S,$(SPKG_SPECS),$(if $(or $(MIGRATE_FILES_$S),$(MIGRATE_FILES)),/etc/opt/csw/pkg/$S/cswmigrateconf))) # It is NOT sufficient to change the pathes here, they must be adjusted in merge-* also @@ -176,21 +171,6 @@ INETDCONF += $(_INETDCONF_FILES) ETCSERVICES += $(_ETCSERVICES_FILES) -# NOTE: Order _can_ be important here. cswinitsmf and cswinetd should -# always be the last two added. The reason for this is that -# you need to ensure any binaries and config files are already on disk -# and able to be consumed by a service that might be started. -SPKG_CLASSES := $(call _spkg_cond_add,MIGRATECONF,cswmigrateconf) -SPKG_CLASSES := $(call _spkg_cond_add,SAMPLECONF,cswcpsampleconf) -SPKG_CLASSES := $(call _spkg_cond_add,PRESERVECONF,cswpreserveconf) -SPKG_CLASSES := $(call _spkg_cond_add,ETCSERVICES,cswetcservices) -SPKG_CLASSES := $(call _spkg_cond_add,USERGROUP,cswusergroup) -SPKG_CLASSES := $(call _spkg_cond_add,CRONTABS,cswcrontab) -SPKG_CLASSES := $(call _spkg_cond_add,PYCOMPILE,cswpycompile) -SPKG_CLASSES := $(call _spkg_cond_add,INETDCONF,cswinetd) -SPKG_CLASSES := $(call _spkg_cond_add,INITSMF,cswinitsmf) - - # This is the default path for texinfo pages to be picked up. Extend or replace as necessary. TEXINFO ?= $(infodir)/.*\.info(?:-\d+)? $(EXTRA_TEXINFO) @@ -208,13 +188,27 @@ $(foreach FILE,$(TEXINFO),$$F[1] = "cswtexinfo" if( $$F[2] =~ m(^$(FILE)$$) );)\ print join(" ", at F),"\n";' -# The TEXINFO dependency is handled dynamically by looking at the prototype for matching files -ifneq ($(MIGRATECONF)$(SAMPLECONF)$(PRESERVECONF)$(ETCSERVICES)$(INETDCONF)$(INITSMF)$(USERGROUP)$(PYCOMPILE),) -_EXTRA_GAR_PKGS += CSWcswclassutils +# If you add another filter above, also add the class to this list. It is used +# to detect if a package needs to depends on CSWcswclassutils by looking at +# files belonging to one of these in the prototype. + +# NOTE: Order _can_ be important here. cswinitsmf and cswinetd should +# always be the last two added. The reason for this is that +# you need to ensure any binaries and config files are already on disk +# and able to be consumed by a service that might be started. + +_CSWCLASSES = cswmigrateconf cswcpsampleconf cswpreserveconf +_CSWCLASSES += cswetcservices +_CSWCLASSES += cswusergroup ugfiles +_CSWCLASSES += cswcrontab +_CSWCLASSES += cswpycompile +_CSWCLASSES += cswinetd +_CSWCLASSES += cswinitsmf +_CSWCLASSES += cswtexinfo + # Make sure the configuration files always have a .CSW suffix and rename the # configuration files to this if necessary during merge. _EXTRA_PAX_ARGS += $(foreach FILE,$(SAMPLECONF:%\.CSW=%) $(PRESERVECONF:%\.CSW=%),-s ",^\.\($(FILE)\)$$,.\1\.CSW,p") -endif PKGGET_DESTDIR ?= @@ -372,7 +366,8 @@ $(PROTOTYPE): $(WORKDIR) merge $(_DBG)cswproto -c $(GARDIR)/etc/commondirs-$(GARCH) -r $(PKGROOT) $(PKGROOT)=/ >$@ -# The pathfilter rules are as follows: +# pathfilter lives in bin/pathfilter and takes care of including/excluding paths from +# a prototype (see "perldoc bin/pathfilter"). We employ it here to: # - include license for current package # - exclude licenses for all other packages # - if other includes are given, only include these files @@ -427,7 +422,7 @@ # The dependencies to CSWcswclassutils and CSWtexinfo are only added if there are files # actually matching the _TEXINFO_FILTER. This is done at the prototype-level. $(WORKDIR)/%.depend: $(WORKDIR)/$*.prototype -$(WORKDIR)/%.depend: _EXTRA_GAR_PKGS += $(if $(shell cat $(WORKDIR)/$*.prototype | perl -ane '$(foreach FILE,$(TEXINFO),print "$$F[2]\n" if( $$F[2] =~ m(^$(FILE)$$) );)'),CSWcswclassutils) +$(WORKDIR)/%.depend: _EXTRA_GAR_PKGS += $(if $(strip $(shell cat $(WORKDIR)/$*.prototype | perl -ane '$(foreach C,$(_CSWCLASSES),print "$C\n" if( $$F[1] eq "$C");)')),CSWcswclassutils) $(WORKDIR)/%.depend: $(WORKDIR) $(_DBG)$(if $(_EXTRA_GAR_PKGS)$(REQUIRED_PKGS_$*)$(REQUIRED_PKGS)$(INCOMPATIBLE_PKGS)$(INCOMPATIBLE_PKGS_$*), \ @@ -532,7 +527,7 @@ # The texinfo filter has been taken out of the normal filters as TEXINFO has a default. $(WORKDIR)/%.pkginfo: $(WORKDIR)/%.prototype -$(WORKDIR)/%.pkginfo: SPKG_CLASSES += $(if $(shell cat $(WORKDIR)/$*.prototype | perl -ane '$(foreach FILE,$(TEXINFO),print "$$F[2]\n" if( $$F[2] =~ m(^$(FILE)$$) );)'),cswtexinfo) +$(WORKDIR)/%.pkginfo: SPKG_CLASSES += $(shell cat $(WORKDIR)/$*.prototype | perl -e 'while(<>){@F=split;$$c{$$F[1]}++};$(foreach C,$(_CSWCLASSES),print "$C\n" if( $$c{$C});)') $(WORKDIR)/%.pkginfo: $(WORKDIR) $(_DBG)(echo "PKG=$*"; \ @@ -710,20 +705,34 @@ @echo @$(DONADA) +dirpackage: _DIRPACKAGE=1 +dirpackage: ENABLE_CHECK= +dirpackage: _package + @echo "The following packages have been built:" + @echo + @$(MAKE) -s PLATFORM=$(PLATFORM) _dirpkgshow + @echo + @$(DONADA) + +_dirpkgshow: + @$(foreach SPEC,$(_PKG_SPECS),echo " $(SPKG_SPOOLDIR)/$(SPEC)";) + _pkgshow: @$(foreach SPEC,$(_PKG_SPECS),printf " %-20s %s\n" $(SPEC) $(SPKG_EXPORT)/$(shell $(call _PKG_ENV,$(SPEC)) $(GARBIN)/mkpackage -qs $(WORKDIR)/$(SPEC).gspec -D pkgfile).gz;) # The dynamic pkginfo is only generated for dynamic gspec-files package-%: $(WORKDIR)/%.gspec $(WORKDIR)/%.prototype-$(GARCH) $(WORKDIR)/%.depend $(if $(findstring %.gspec,$(DISTFILES)),,$(WORKDIR)/%.pkginfo) @echo " ==> Processing $*.gspec" - $(_DBG)( $(call _PKG_ENV,$*) mkpackage --spec $(WORKDIR)/$*.gspec \ + $(_DBG)( $(call _PKG_ENV,$*) mkpackage \ + --spec $(WORKDIR)/$*.gspec \ --spooldir $(SPKG_SPOOLDIR) \ + --tmpdir $(SPKG_TMPDIR) \ --destdir $(SPKG_EXPORT) \ --workdir $(SPKG_WORKDIR) \ --pkgbase $(SPKG_PKGBASE) \ --pkgroot $(SPKG_PKGROOT) \ -v WORKDIR_FIRSTMOD=../build-$(firstword $(MODULATIONS)) \ - --compress \ + $(if $(_DIRPACKAGE),--notransfer --nocompress,--compress) \ $(MKPACKAGE_ARGS) ) || exit 2 @$(MAKECOOKIE) @@ -733,7 +742,7 @@ # pkgcheck - check if the package is compliant # pkgcheck: $(foreach SPEC,$(_PKG_SPECS),package-$(SPEC)) - $(_DBG)( LC_ALL=C $(GARBIN)/checkpkg $(foreach SPEC,$(_PKG_SPECS),$(SPKG_EXPORT)/`$(call _PKG_ENV,$(SPEC)) mkpackage -qs $(WORKDIR)/$(SPEC).gspec -D pkgfile`.gz ) || exit 2;) + $(_DBG)( LC_ALL=C $(GARBIN)/checkpkg $(foreach SPEC,$(_PKG_SPECS),$(SPKG_EXPORT)/`$(call _PKG_ENV,$(SPEC)) mkpackage --tmpdir $(SPKG_TMPDIR) -qs $(WORKDIR)/$(SPEC).gspec -D pkgfile`.gz ) || exit 2;) @$(MAKECOOKIE) pkgcheck-p: @@ -757,6 +766,8 @@ repackage: pkgreset package +redirpackage: pkgreset dirpackage + # This rule automatically logs into every host where a package for this software should # be built. It is especially suited for automated build bots. platforms: @@ -783,6 +794,17 @@ ) @$(MAKECOOKIE) +platforms-%: + $(foreach P,$(PACKAGING_PLATFORMS),\ + $(if $(PACKAGING_HOST_$P),\ + $(if $(filter $(THISHOST),$(PACKAGING_HOST_$P)),\ + $(MAKE) PLATFORM=$P $* && ,\ + $(SSH) -t $(PACKAGING_HOST_$P) "PATH=$$PATH:/opt/csw/bin $(MAKE) -C $(CURDIR) PLATFORM=$P $*" && \ + ),\ + $(error *** No host has been defined for platform $P)\ + )\ + ) true + replatforms: spotless platforms # Print relecant informations about the platform Deleted: csw/mgar/gar/v2-git/lib/python/checkpkg.py =================================================================== --- csw/mgar/gar/v2/lib/python/checkpkg.py 2010-01-30 08:02:55 UTC (rev 8229) +++ csw/mgar/gar/v2-git/lib/python/checkpkg.py 2010-01-30 22:14:48 UTC (rev 8232) @@ -1,622 +0,0 @@ -# $Id$ -# -# This is the checkpkg library, common for all checkpkg tests written in -# Python. - -import itertools -import logging -import optparse -import os -import os.path -import re -import socket -import sqlite3 -import subprocess -from Cheetah import Template -import opencsw - -SYSTEM_PKGMAP = "/var/sadm/install/contents" -WS_RE = re.compile(r"\s+") -NEEDED_SONAMES = "needed sonames" -RUNPATH = "runpath" -SONAME = "soname" -CONFIG_MTIME = "mtime" -DO_NOT_REPORT_SURPLUS = set([u"CSWcommon", u"CSWcswclassutils", u"CSWisaexec"]) -DO_NOT_REPORT_MISSING = set([u"SUNWlibC", u"SUNWcsl", u"SUNWlibms", - u"*SUNWcslr", u"*SUNWlibC", u"*SUNWlibms", - u"SUNWcslx"]) -SYSTEM_SYMLINKS = ( - ("/opt/csw/bdb4", ["/opt/csw/bdb42"]), - ("/64", ["/amd64", "/sparcv9"]), - ("/opt/csw/lib/i386", ["/opt/csw/lib"]), -) - -# This shared library is present on Solaris 10 on amd64, but it's missing on -# Solaris 8 on i386. It's okay if it's missing. -ALLOWED_ORPHAN_SONAMES = set([u"libm.so.2"]) -DEPENDENCY_FILENAME_REGEXES = ( - (r".*\.pl", u"CSWperl"), - (r".*\.pm", u"CSWperl"), - (r".*\.py", u"CSWpython"), - (r".*\.rb", u"CSWruby"), -) - -REPORT_TMPL = u"""# $pkgname: -#if $missing_deps -# SUGGESTION: you may want to add some or all of the following as depends: -# (Feel free to ignore SUNW or SPRO packages) -#for $pkg in $sorted($missing_deps) -REQUIRED_PKGS_$pkgname += $pkg -#end for -#end if -#if $surplus_deps -# The following dependencies might be unnecessary: -#for $pkg in $sorted($surplus_deps) -# ? $pkg -#end for -#end if -#if $orphan_sonames -# The following required sonames would not be found at runtime: -#for $soname in $sorted($orphan_sonames) -# ! $soname -#end for -#end if -#if not $missing_deps and not $surplus_deps and not $orphan_sonames -# + Dependencies of $pkgname look good. -#end if -""" - -ERROR_REPORT_TMPL = u"""#if $errors -ERROR: One or more errors have been found by $name. -#for $pkgname in $errors -$pkgname: -#for $error in $errors[$pkgname] - $repr($error) -#end for -#end for -#else -#if $debug -OK: $name found no problems. -#end if -#end if -""" - -class Error(Exception): - pass - - -class ConfigurationError(Error): - pass - - -class PackageError(Error): - pass - - -def GetOptions(): - parser = optparse.OptionParser() - parser.add_option("-e", dest="extractdir", - help="The directory into which the package has been extracted") - parser.add_option("-d", "--debug", dest="debug", - default=False, action="store_true", - help="Turn on debugging messages") - (options, args) = parser.parse_args() - if not options.extractdir: - raise ConfigurationError("ERROR: -e option is missing.") - # Using set() to make the arguments unique. - return options, set(args) - - -class CheckpkgBase(object): - """This class has functionality overlapping with DirectoryFormatPackage - from the opencsw.py library. The classes should be merged. - """ - - def __init__(self, extractdir, pkgname): - self.extractdir = extractdir - self.pkgname = pkgname - self.pkgpath = os.path.join(self.extractdir, self.pkgname) - - def CheckPkgpathExists(self): - if not os.path.isdir(self.pkgpath): - raise PackageError("%s does not exist or is not a directory" - % self.pkgpath) - - def ListBinaries(self): - """Shells out to list all the binaries from a given package. - - Original checkpkg code: - - # ######################################### - # # find all executables and dynamic libs,and list their filenames. - # listbinaries() { - # if [ ! -d $1 ] ; then - # print errmsg $1 not a directory - # rm -rf $EXTRACTDIR - # exit 1 - # fi - # - # find $1 -print | xargs file |grep ELF |nawk -F: '{print $1}' - # } - """ - self.CheckPkgpathExists() - find_tmpl = "find %s -print | xargs file | grep ELF | nawk -F: '{print $1}'" - find_proc = subprocess.Popen(find_tmpl % self.pkgpath, - shell=True, stdout=subprocess.PIPE) - stdout, stderr = find_proc.communicate() - ret = find_proc.wait() - if ret: - logging.error("The find command returned an error.") - return stdout.splitlines() - - def GetAllFilenames(self): - self.CheckPkgpathExists() - file_basenames = [] - for root, dirs, files in os.walk(self.pkgpath): - file_basenames.extend(files) - return file_basenames - - def FormatDepsReport(self, missing_deps, surplus_deps, orphan_sonames): - """To be removed.""" - namespace = { - "pkgname": self.pkgname, - "missing_deps": missing_deps, - "surplus_deps": surplus_deps, - "orphan_sonames": orphan_sonames, - } - t = Template.Template(REPORT_TMPL, searchList=[namespace]) - return unicode(t) - - -class SystemPkgmap(object): - """A class to hold and manipulate the /var/sadm/install/contents file. - - TODO: Implement timestamp checking and refreshing the cache. - """ - - STOP_PKGS = ["SUNWbcp", "SUNWowbcp", "SUNWucb"] - CHECKPKG_DIR = ".checkpkg" - SQLITE3_DBNAME_TMPL = "var-sadm-install-contents-cache-%s" - - def __init__(self): - """There is no need to re-parse it each time. - - Read it slowly the first time and cache it for later.""" - self.cache = {} - self.checkpkg_dir = os.path.join(os.environ["HOME"], self.CHECKPKG_DIR) - self.fqdn = socket.getfqdn() - self.db_path = os.path.join(self.checkpkg_dir, - self.SQLITE3_DBNAME_TMPL % self.fqdn) - self.file_mtime = None - self.cache_mtime = None - if os.path.exists(self.db_path): - logging.debug("Connecting to the %s database.", self.db_path) - self.conn = sqlite3.connect(self.db_path) - if not self.IsDatabaseUpToDate(): - logging.warning("Rebuilding the package cache, can take a few minutes.") - self.PurgeDatabase() - self.PopulateDatabase() - else: - print "Building a cache of /var/sadm/install/contents." - print "The cache will be kept in %s." % self.db_path - if not os.path.exists(self.checkpkg_dir): - logging.debug("Creating %s", self.checkpkg_dir) - os.mkdir(self.checkpkg_dir) - self.conn = sqlite3.connect(self.db_path) - c = self.conn.cursor() - c.execute(""" - CREATE TABLE systempkgmap ( - id INTEGER PRIMARY KEY, - basename TEXT, - path TEXT, - line TEXT - ); - """) - logging.debug("Creating the config table.") - c.execute(""" - CREATE TABLE config ( - key VARCHAR(255) PRIMARY KEY, - float_value FLOAT, - str_value VARCHAR(255) - ); - """) - self.PopulateDatabase() - - def SymlinkDuringInstallation(self, p): - """Emulates the effect of some symlinks present during installations.""" - p = p.replace("/opt/csw/lib/i386", "/opt/csw/lib") - - def PopulateDatabase(self): - """Imports data into the database. - - Original bit of code from checkpkg: - - egrep -v 'SUNWbcp|SUNWowbcp|SUNWucb' /var/sadm/install/contents | - fgrep -f $EXTRACTDIR/liblist >$EXTRACTDIR/shortcatalog - """ - - system_pkgmap_fd = open(SYSTEM_PKGMAP, "r") - stop_re = re.compile("(%s)" % "|".join(self.STOP_PKGS)) - # Creating a data structure: - # soname - {: , : , ...} - logging.debug("Building sqlite3 cache db of the %s file", - SYSTEM_PKGMAP) - c = self.conn.cursor() - count = itertools.count() - for line in system_pkgmap_fd: - i = count.next() - if not i % 1000: - print "\r%s" % i, - if stop_re.search(line): - continue - fields = re.split(WS_RE, line) - pkgmap_entry_path = fields[0].split("=")[0] - pkgmap_entry_dir, pkgmap_entry_base_name = os.path.split(pkgmap_entry_path) - sql = "INSERT INTO systempkgmap (basename, path, line) VALUES (?, ?, ?);" - c.execute(sql, (pkgmap_entry_base_name, pkgmap_entry_dir, line.strip())) - print - print "Creating the main database index." - sql = "CREATE INDEX basename_idx ON systempkgmap(basename);" - c.execute(sql) - self.SetDatabaseMtime() - self.conn.commit() - - def SetDatabaseMtime(self): - c = self.conn.cursor() - sql = "DELETE FROM config WHERE key = ?;" - c.execute(sql, [CONFIG_MTIME]) - mtime = self.GetFileMtime() - logging.debug("Inserting the mtime (%s) into the database.", mtime) - sql = """ - INSERT INTO config (key, float_value) - VALUES (?, ?); - """ - c.execute(sql, [CONFIG_MTIME, mtime]) - - def GetPkgmapLineByBasename(self, filename): - if filename in self.cache: - return self.cache[filename] - sql = "SELECT path, line FROM systempkgmap WHERE basename = ?;" - c = self.conn.cursor() - c.execute(sql, [filename]) - lines = {} - for row in c: - lines[row[0]] = row[1] - if len(lines) == 0: - logging.debug("Cache doesn't contain filename %s", filename) - self.cache[filename] = lines - return lines - - def GetDatabaseMtime(self): - if not self.cache_mtime: - sql = """ - SELECT float_value FROM config - WHERE key = ?; - """ - c = self.conn.cursor() - c.execute(sql, [CONFIG_MTIME]) - row = c.fetchone() - if not row: - # raise ConfigurationError("Could not find the mtime setting") - self.cache_mtime = 1 - else: - self.cache_mtime = row[0] - return self.cache_mtime - - def GetFileMtime(self): - if not self.file_mtime: - stat_data = os.stat(SYSTEM_PKGMAP) - self.file_mtime = stat_data.st_mtime - return self.file_mtime - - def IsDatabaseUpToDate(self): - f_mtime = self.GetFileMtime() - d_mtime = self.GetDatabaseMtime() - logging.debug("f_mtime %s, d_time: %s", f_mtime, d_mtime) - return self.GetFileMtime() <= self.GetDatabaseMtime() - - def PurgeDatabase(self): - logging.info("Purging the cache database") - c = self.conn.cursor() - sql = "DELETE FROM config;" - c.execute(sql) - sql = "DELETE FROM systempkgmap;" - c.execute(sql) - sql = "DROP INDEX basename_idx;" - try: - c.execute(sql) - except sqlite3.OperationalError, e: - logging.warn(e) - -def SharedObjectDependencies(pkgname, - binaries_by_pkgname, - needed_sonames_by_binary, - pkgs_by_soname, - filenames_by_soname, - pkg_by_any_filename): - """This is one of the more obscure and more important pieces of code. - - I tried to make it simpler, but given that the operations here involve - whole sets of packages, it's not easy. - """ - so_dependencies = set() - orphan_sonames = set() - self_provided = set() - for binary in binaries_by_pkgname[pkgname]: - needed_sonames = needed_sonames_by_binary[binary][NEEDED_SONAMES] - for soname in needed_sonames: - if soname in filenames_by_soname: - filename = filenames_by_soname[soname] - pkg = pkg_by_any_filename[filename] - self_provided.add(soname) - so_dependencies.add(pkg) - elif soname in pkgs_by_soname: - so_dependencies.add(pkgs_by_soname[soname]) - else: - orphan_sonames.add(soname) - return so_dependencies, self_provided, orphan_sonames - - -def GuessDepsByFilename(pkgname, pkg_by_any_filename): - """Guesses dependencies based on filename regexes.""" - guessed_deps = set() - for pattern, dep_pkgname in DEPENDENCY_FILENAME_REGEXES: - # If any file name matches, add the dep, go to the next pattern/pkg - # combination. - pattern_re = re.compile("^%s$" % pattern) - for filename in pkg_by_any_filename: - if (re.match(pattern_re, filename) - and - pkgname == pkg_by_any_filename[filename]): - guessed_deps.add(dep_pkgname) - break - return guessed_deps - - -def GuessDepsByPkgname(pkgname, pkg_by_any_filename): - # More guessed dependencies: If one package is a substring of another, it - # might be a hint. For example, CSWmysql51test should depend on CSWmysql51. - # However, the rt (runtime) packages should not want to depend on the main - # package. - guessed_deps = set() - all_other_pkgs = set(pkg_by_any_filename.values()) - for other_pkg in all_other_pkgs: - other_pkg = unicode(other_pkg) - if pkgname == other_pkg: - continue - if pkgname.startswith(other_pkg): - endings = ["devel", "test", "bench", "dev"] - for ending in endings: - if pkgname.endswith(ending): - guessed_deps.add(other_pkg) - return guessed_deps - - -def AnalyzeDependencies(pkgname, - declared_dependencies, - binaries_by_pkgname, - needed_sonames_by_binary, - pkgs_by_soname, - filenames_by_soname, - pkg_by_any_filename): - """Gathers and merges dependency results from other functions. - - declared_dependencies: Dependencies that the package in question claims to - have. - - binaries_by_pkgname: A dictionary mapping pkgnames (CSWfoo) to binary names - (without paths) - - needed_sonames_by_binary: A dictionary mapping binary file name to - a dictionary containing: "needed sonames", - "soname", "rpath". Based on examining the binary - files within the packages. - - pkgs_by_soname: A dictionary mapping sonames to pkgnames, based on the - contents of the system wide pkgmap - (/var/sadm/install/contents) - - filenames_by_soname: A dictionary mapping shared library sonames to filenames, - based on files within packages - - pkg_by_any_filename: Mapping from file names to packages names, based on the - contents of the packages under examination. - """ - declared_dependencies_set = set(declared_dependencies) - - so_dependencies, self_provided, orphan_sonames = SharedObjectDependencies( - pkgname, - binaries_by_pkgname, - needed_sonames_by_binary, - pkgs_by_soname, - filenames_by_soname, - pkg_by_any_filename) - auto_dependencies = reduce(lambda x, y: x.union(y), - [ - so_dependencies, - GuessDepsByFilename(pkgname, pkg_by_any_filename), - GuessDepsByPkgname(pkgname, pkg_by_any_filename), - ]) - missing_deps = auto_dependencies.difference(declared_dependencies_set) - # Don't report itself as a suggested dependency. - missing_deps = missing_deps.difference(set([pkgname])) - missing_deps = missing_deps.difference(set(DO_NOT_REPORT_MISSING)) - surplus_deps = declared_dependencies_set.difference(auto_dependencies) - surplus_deps = surplus_deps.difference(DO_NOT_REPORT_SURPLUS) - orphan_sonames = orphan_sonames.difference(ALLOWED_ORPHAN_SONAMES) - return missing_deps, surplus_deps, orphan_sonames - - -def ExpandRunpath(runpath, isalist): - # Emulating $ISALIST expansion - if '$ISALIST' in runpath: - expanded_list = [runpath.replace('$ISALIST', isa) for isa in isalist] - else: - expanded_list = [runpath] - return expanded_list - -def ExpandSymlink(symlink, target, input_path): - symlink_re = re.compile(r"%s(/|$)" % symlink) - if re.search(symlink_re, input_path): - result = input_path.replace(symlink, target) - else: - result = input_path - return result - -def Emulate64BitSymlinks(runpath_list): - """Need to emulate the 64 -> amd64, 64 -> sparcv9 symlink - - Since we don't know the architecture, we'll adding both amd64 and sparcv9. - It should be safe. - """ - symlinked_list = [] - for runpath in runpath_list: - for symlink, expansion_list in SYSTEM_SYMLINKS: - for target in expansion_list: - expanded = ExpandSymlink(symlink, target, runpath) - if expanded not in symlinked_list: - symlinked_list.append(expanded) - return symlinked_list - - -def SanitizeRunpath(runpath): - while True: - if runpath.endswith("/"): - runpath = runpath[:-1] - elif "//" in runpath: - runpath = runpath.replace("//", "/") - else: - break - return runpath - - -def GetLinesBySoname(pkgmap, needed_sonames, runpath_by_needed_soname, isalist): - """Works out which system pkgmap lines correspond to given sonames.""" - lines_by_soname = {} - for soname in needed_sonames: - # This is the critical part of the algorithm: it iterates over the - # runpath and finds the first matching one. - runpath_found = False - for runpath in runpath_by_needed_soname[soname]: - runpath = SanitizeRunpath(runpath) - runpath_list = ExpandRunpath(runpath, isalist) - runpath_list = Emulate64BitSymlinks(runpath_list) - soname_runpath_data = pkgmap.GetPkgmapLineByBasename(soname) - # Emulating the install time symlinks, for instance, if the prototype contains - # /opt/csw/lib/i386/foo.so.0 and /opt/csw/lib/i386 is a symlink to ".", - # the shared library ends up in /opt/csw/lib/foo.so.0 and should be findable even when - # RPATH does not contain $ISALIST. - new_soname_runpath_data = {} - for p in soname_runpath_data: - expanded_p_list = Emulate64BitSymlinks([p]) - for expanded_p in expanded_p_list: - new_soname_runpath_data[expanded_p] = soname_runpath_data[p] - soname_runpath_data = new_soname_runpath_data - - logging.debug("%s: will be looking for %s in %s" % - (soname, runpath_list, soname_runpath_data.keys())) - for runpath_expanded in runpath_list: - if runpath_expanded in soname_runpath_data: - lines_by_soname[soname] = soname_runpath_data[runpath_expanded] - runpath_found = True - # This break only goes out of the inner loop, - # need another one below to finish the outer loop. - break - if runpath_found: - break - return lines_by_soname - - -def BuildIndexesBySoname(needed_sonames_by_binary): - """Builds data structures indexed by soname. - - Building indexes - {"foo.so": ["/opt/csw/lib/gcc4", "/opt/csw/lib", ...], - ... - } - """ - needed_sonames = set() - binaries_by_soname = {} - runpath_by_needed_soname = {} - for binary_name, data in needed_sonames_by_binary.iteritems(): - for soname in data[NEEDED_SONAMES]: - needed_sonames.add(soname) - if soname not in runpath_by_needed_soname: - runpath_by_needed_soname[soname] = [] - runpath_by_needed_soname[soname].extend(data[RUNPATH]) - if soname not in binaries_by_soname: - binaries_by_soname[soname] = set() - binaries_by_soname[soname].add(binary_name) - return needed_sonames, binaries_by_soname, runpath_by_needed_soname - - -def ParseDumpOutput(dump_output): - binary_data = {RUNPATH: [], - NEEDED_SONAMES: []} - for line in dump_output.splitlines(): - fields = re.split(WS_RE, line) - # TODO: Make it a unit test - # logging.debug("%s says: %s", DUMP_BIN, fields) - if len(fields) < 3: - continue - if fields[1] == "NEEDED": - binary_data[NEEDED_SONAMES].append(fields[2]) - elif fields[1] == "RUNPATH": - binary_data[RUNPATH].extend(fields[2].split(":")) - elif fields[1] == "SONAME": - binary_data[SONAME] = fields[2] - # Adding the default runtime path search option. - binary_data[RUNPATH].append("/usr/lib/$ISALIST") - binary_data[RUNPATH].append("/usr/lib") - binary_data[RUNPATH].append("/lib/$ISALIST") - binary_data[RUNPATH].append("/lib") - return binary_data - - -class CheckpkgManager(object): - """Takes care of calling checking functions""" - - def __init__(self, name, extractdir, pkgname_list, debug=False): - self.debug = debug - self.name = name - self.extractdir = extractdir - self.pkgname_list = pkgname_list - self.errors = [] - self.individual_checks = [] - self.set_checks = [] - self.packages = [] - - def RegisterIndividualCheck(self, function): - self.individual_checks.append(function) - - def RegisterSetCheck(self, function): - self.set_checks.append(function) - - def Run(self): - """Runs all the checks - - Returns a tuple of an exit code and a report. - """ - packages = [] - errors = {} - for pkgname in self.pkgname_list: - pkg_path = os.path.join(self.extractdir, pkgname) - packages.append(opencsw.DirectoryFormatPackage(pkg_path)) - for pkg in packages: - for function in self.individual_checks: - errors_for_pkg = function(pkg) - if errors_for_pkg: - errors[pkg.pkgname] = errors_for_pkg - # Set checks - for function in self.set_checks: - set_errors = function(packages) - if set_errors: - errors["The package set"] = set_errors - namespace = { - "name": self.name, - "errors": errors, - "debug": self.debug, - } - t = Template.Template(ERROR_REPORT_TMPL, searchList=[namespace]) - exit_code = bool(errors) - return (exit_code, unicode(t)) Copied: csw/mgar/gar/v2-git/lib/python/checkpkg.py (from rev 8229, csw/mgar/gar/v2/lib/python/checkpkg.py) =================================================================== --- csw/mgar/gar/v2-git/lib/python/checkpkg.py (rev 0) +++ csw/mgar/gar/v2-git/lib/python/checkpkg.py 2010-01-30 22:14:48 UTC (rev 8232) @@ -0,0 +1,622 @@ +# $Id$ +# +# This is the checkpkg library, common for all checkpkg tests written in +# Python. + +import itertools +import logging +import optparse +import os +import os.path +import re +import socket +import sqlite3 +import subprocess +from Cheetah import Template +import opencsw + +SYSTEM_PKGMAP = "/var/sadm/install/contents" +WS_RE = re.compile(r"\s+") +NEEDED_SONAMES = "needed sonames" +RUNPATH = "runpath" +SONAME = "soname" +CONFIG_MTIME = "mtime" +DO_NOT_REPORT_SURPLUS = set([u"CSWcommon", u"CSWcswclassutils", u"CSWisaexec"]) +DO_NOT_REPORT_MISSING = set([u"SUNWlibC", u"SUNWcsl", u"SUNWlibms", + u"*SUNWcslr", u"*SUNWlibC", u"*SUNWlibms", + u"SUNWcslx"]) +SYSTEM_SYMLINKS = ( + ("/opt/csw/bdb4", ["/opt/csw/bdb42"]), + ("/64", ["/amd64", "/sparcv9"]), + ("/opt/csw/lib/i386", ["/opt/csw/lib"]), +) + +# This shared library is present on Solaris 10 on amd64, but it's missing on +# Solaris 8 on i386. It's okay if it's missing. +ALLOWED_ORPHAN_SONAMES = set([u"libm.so.2"]) +DEPENDENCY_FILENAME_REGEXES = ( + (r".*\.pl", u"CSWperl"), + (r".*\.pm", u"CSWperl"), + (r".*\.py", u"CSWpython"), + (r".*\.rb", u"CSWruby"), +) + +REPORT_TMPL = u"""# $pkgname: +#if $missing_deps +# SUGGESTION: you may want to add some or all of the following as depends: +# (Feel free to ignore SUNW or SPRO packages) +#for $pkg in $sorted($missing_deps) +REQUIRED_PKGS_$pkgname += $pkg +#end for +#end if +#if $surplus_deps +# The following dependencies might be unnecessary: +#for $pkg in $sorted($surplus_deps) +# ? $pkg +#end for +#end if +#if $orphan_sonames +# The following required sonames would not be found at runtime: +#for $soname in $sorted($orphan_sonames) +# ! $soname +#end for +#end if +#if not $missing_deps and not $surplus_deps and not $orphan_sonames +# + Dependencies of $pkgname look good. +#end if +""" + +ERROR_REPORT_TMPL = u"""#if $errors +ERROR: One or more errors have been found by $name. +#for $pkgname in $errors +$pkgname: +#for $error in $errors[$pkgname] + $repr($error) +#end for +#end for +#else +#if $debug +OK: $name found no problems. +#end if +#end if +""" + +class Error(Exception): + pass + + +class ConfigurationError(Error): + pass + + +class PackageError(Error): + pass + + +def GetOptions(): + parser = optparse.OptionParser() + parser.add_option("-e", dest="extractdir", + help="The directory into which the package has been extracted") + parser.add_option("-d", "--debug", dest="debug", + default=False, action="store_true", + help="Turn on debugging messages") + (options, args) = parser.parse_args() + if not options.extractdir: + raise ConfigurationError("ERROR: -e option is missing.") + # Using set() to make the arguments unique. + return options, set(args) + + +class CheckpkgBase(object): + """This class has functionality overlapping with DirectoryFormatPackage + from the opencsw.py library. The classes should be merged. + """ + + def __init__(self, extractdir, pkgname): + self.extractdir = extractdir + self.pkgname = pkgname + self.pkgpath = os.path.join(self.extractdir, self.pkgname) + + def CheckPkgpathExists(self): + if not os.path.isdir(self.pkgpath): + raise PackageError("%s does not exist or is not a directory" + % self.pkgpath) + + def ListBinaries(self): + """Shells out to list all the binaries from a given package. + + Original checkpkg code: + + # ######################################### + # # find all executables and dynamic libs,and list their filenames. + # listbinaries() { + # if [ ! -d $1 ] ; then + # print errmsg $1 not a directory + # rm -rf $EXTRACTDIR + # exit 1 + # fi + # + # find $1 -print | xargs file |grep ELF |nawk -F: '{print $1}' + # } + """ + self.CheckPkgpathExists() + find_tmpl = "find %s -print | xargs file | grep ELF | nawk -F: '{print $1}'" + find_proc = subprocess.Popen(find_tmpl % self.pkgpath, + shell=True, stdout=subprocess.PIPE) + stdout, stderr = find_proc.communicate() + ret = find_proc.wait() + if ret: + logging.error("The find command returned an error.") + return stdout.splitlines() + + def GetAllFilenames(self): + self.CheckPkgpathExists() + file_basenames = [] + for root, dirs, files in os.walk(self.pkgpath): + file_basenames.extend(files) + return file_basenames + + def FormatDepsReport(self, missing_deps, surplus_deps, orphan_sonames): + """To be removed.""" + namespace = { + "pkgname": self.pkgname, + "missing_deps": missing_deps, + "surplus_deps": surplus_deps, + "orphan_sonames": orphan_sonames, + } + t = Template.Template(REPORT_TMPL, searchList=[namespace]) + return unicode(t) + + +class SystemPkgmap(object): + """A class to hold and manipulate the /var/sadm/install/contents file. + + TODO: Implement timestamp checking and refreshing the cache. + """ + + STOP_PKGS = ["SUNWbcp", "SUNWowbcp", "SUNWucb"] + CHECKPKG_DIR = ".checkpkg" + SQLITE3_DBNAME_TMPL = "var-sadm-install-contents-cache-%s" + + def __init__(self): + """There is no need to re-parse it each time. + + Read it slowly the first time and cache it for later.""" + self.cache = {} + self.checkpkg_dir = os.path.join(os.environ["HOME"], self.CHECKPKG_DIR) + self.fqdn = socket.getfqdn() + self.db_path = os.path.join(self.checkpkg_dir, + self.SQLITE3_DBNAME_TMPL % self.fqdn) + self.file_mtime = None + self.cache_mtime = None + if os.path.exists(self.db_path): + logging.debug("Connecting to the %s database.", self.db_path) + self.conn = sqlite3.connect(self.db_path) + if not self.IsDatabaseUpToDate(): + logging.warning("Rebuilding the package cache, can take a few minutes.") + self.PurgeDatabase() + self.PopulateDatabase() + else: + print "Building a cache of /var/sadm/install/contents." + print "The cache will be kept in %s." % self.db_path + if not os.path.exists(self.checkpkg_dir): + logging.debug("Creating %s", self.checkpkg_dir) + os.mkdir(self.checkpkg_dir) + self.conn = sqlite3.connect(self.db_path) + c = self.conn.cursor() + c.execute(""" + CREATE TABLE systempkgmap ( + id INTEGER PRIMARY KEY, + basename TEXT, + path TEXT, + line TEXT + ); + """) + logging.debug("Creating the config table.") + c.execute(""" + CREATE TABLE config ( + key VARCHAR(255) PRIMARY KEY, + float_value FLOAT, + str_value VARCHAR(255) + ); + """) + self.PopulateDatabase() + + def SymlinkDuringInstallation(self, p): + """Emulates the effect of some symlinks present during installations.""" + p = p.replace("/opt/csw/lib/i386", "/opt/csw/lib") + + def PopulateDatabase(self): + """Imports data into the database. + + Original bit of code from checkpkg: + + egrep -v 'SUNWbcp|SUNWowbcp|SUNWucb' /var/sadm/install/contents | + fgrep -f $EXTRACTDIR/liblist >$EXTRACTDIR/shortcatalog + """ + + system_pkgmap_fd = open(SYSTEM_PKGMAP, "r") + stop_re = re.compile("(%s)" % "|".join(self.STOP_PKGS)) + # Creating a data structure: + # soname - {: , : , ...} + logging.debug("Building sqlite3 cache db of the %s file", + SYSTEM_PKGMAP) + c = self.conn.cursor() + count = itertools.count() + for line in system_pkgmap_fd: + i = count.next() + if not i % 1000: + print "\r%s" % i, + if stop_re.search(line): + continue + fields = re.split(WS_RE, line) + pkgmap_entry_path = fields[0].split("=")[0] + pkgmap_entry_dir, pkgmap_entry_base_name = os.path.split(pkgmap_entry_path) + sql = "INSERT INTO systempkgmap (basename, path, line) VALUES (?, ?, ?);" + c.execute(sql, (pkgmap_entry_base_name, pkgmap_entry_dir, line.strip())) + print + print "Creating the main database index." + sql = "CREATE INDEX basename_idx ON systempkgmap(basename);" + c.execute(sql) + self.SetDatabaseMtime() + self.conn.commit() + + def SetDatabaseMtime(self): + c = self.conn.cursor() + sql = "DELETE FROM config WHERE key = ?;" + c.execute(sql, [CONFIG_MTIME]) + mtime = self.GetFileMtime() + logging.debug("Inserting the mtime (%s) into the database.", mtime) + sql = """ + INSERT INTO config (key, float_value) + VALUES (?, ?); + """ + c.execute(sql, [CONFIG_MTIME, mtime]) + + def GetPkgmapLineByBasename(self, filename): + if filename in self.cache: + return self.cache[filename] + sql = "SELECT path, line FROM systempkgmap WHERE basename = ?;" + c = self.conn.cursor() + c.execute(sql, [filename]) + lines = {} + for row in c: + lines[row[0]] = row[1] + if len(lines) == 0: + logging.debug("Cache doesn't contain filename %s", filename) + self.cache[filename] = lines + return lines + + def GetDatabaseMtime(self): + if not self.cache_mtime: + sql = """ + SELECT float_value FROM config + WHERE key = ?; + """ + c = self.conn.cursor() + c.execute(sql, [CONFIG_MTIME]) + row = c.fetchone() + if not row: + # raise ConfigurationError("Could not find the mtime setting") + self.cache_mtime = 1 + else: + self.cache_mtime = row[0] + return self.cache_mtime + + def GetFileMtime(self): + if not self.file_mtime: + stat_data = os.stat(SYSTEM_PKGMAP) + self.file_mtime = stat_data.st_mtime + return self.file_mtime + + def IsDatabaseUpToDate(self): + f_mtime = self.GetFileMtime() + d_mtime = self.GetDatabaseMtime() + logging.debug("f_mtime %s, d_time: %s", f_mtime, d_mtime) + return self.GetFileMtime() <= self.GetDatabaseMtime() + + def PurgeDatabase(self): + logging.info("Purging the cache database") + c = self.conn.cursor() + sql = "DELETE FROM config;" + c.execute(sql) + sql = "DELETE FROM systempkgmap;" + c.execute(sql) + sql = "DROP INDEX basename_idx;" + try: + c.execute(sql) + except sqlite3.OperationalError, e: + logging.warn(e) + +def SharedObjectDependencies(pkgname, + binaries_by_pkgname, + needed_sonames_by_binary, + pkgs_by_soname, + filenames_by_soname, + pkg_by_any_filename): + """This is one of the more obscure and more important pieces of code. + + I tried to make it simpler, but given that the operations here involve + whole sets of packages, it's not easy. + """ + so_dependencies = set() + orphan_sonames = set() + self_provided = set() + for binary in binaries_by_pkgname[pkgname]: + needed_sonames = needed_sonames_by_binary[binary][NEEDED_SONAMES] + for soname in needed_sonames: + if soname in filenames_by_soname: + filename = filenames_by_soname[soname] + pkg = pkg_by_any_filename[filename] + self_provided.add(soname) + so_dependencies.add(pkg) + elif soname in pkgs_by_soname: + so_dependencies.add(pkgs_by_soname[soname]) + else: + orphan_sonames.add(soname) + return so_dependencies, self_provided, orphan_sonames + + +def GuessDepsByFilename(pkgname, pkg_by_any_filename): + """Guesses dependencies based on filename regexes.""" + guessed_deps = set() + for pattern, dep_pkgname in DEPENDENCY_FILENAME_REGEXES: + # If any file name matches, add the dep, go to the next pattern/pkg + # combination. + pattern_re = re.compile("^%s$" % pattern) + for filename in pkg_by_any_filename: + if (re.match(pattern_re, filename) + and + pkgname == pkg_by_any_filename[filename]): + guessed_deps.add(dep_pkgname) + break + return guessed_deps + + +def GuessDepsByPkgname(pkgname, pkg_by_any_filename): + # More guessed dependencies: If one package is a substring of another, it + # might be a hint. For example, CSWmysql51test should depend on CSWmysql51. + # However, the rt (runtime) packages should not want to depend on the main + # package. + guessed_deps = set() + all_other_pkgs = set(pkg_by_any_filename.values()) + for other_pkg in all_other_pkgs: + other_pkg = unicode(other_pkg) + if pkgname == other_pkg: + continue + if pkgname.startswith(other_pkg): + endings = ["devel", "test", "bench", "dev"] + for ending in endings: + if pkgname.endswith(ending): + guessed_deps.add(other_pkg) + return guessed_deps + + +def AnalyzeDependencies(pkgname, + declared_dependencies, + binaries_by_pkgname, + needed_sonames_by_binary, + pkgs_by_soname, + filenames_by_soname, + pkg_by_any_filename): + """Gathers and merges dependency results from other functions. + + declared_dependencies: Dependencies that the package in question claims to + have. + + binaries_by_pkgname: A dictionary mapping pkgnames (CSWfoo) to binary names + (without paths) + + needed_sonames_by_binary: A dictionary mapping binary file name to + a dictionary containing: "needed sonames", + "soname", "rpath". Based on examining the binary + files within the packages. + + pkgs_by_soname: A dictionary mapping sonames to pkgnames, based on the + contents of the system wide pkgmap + (/var/sadm/install/contents) + + filenames_by_soname: A dictionary mapping shared library sonames to filenames, + based on files within packages + + pkg_by_any_filename: Mapping from file names to packages names, based on the + contents of the packages under examination. + """ + declared_dependencies_set = set(declared_dependencies) + + so_dependencies, self_provided, orphan_sonames = SharedObjectDependencies( + pkgname, + binaries_by_pkgname, + needed_sonames_by_binary, + pkgs_by_soname, + filenames_by_soname, + pkg_by_any_filename) + auto_dependencies = reduce(lambda x, y: x.union(y), + [ + so_dependencies, + GuessDepsByFilename(pkgname, pkg_by_any_filename), + GuessDepsByPkgname(pkgname, pkg_by_any_filename), + ]) + missing_deps = auto_dependencies.difference(declared_dependencies_set) + # Don't report itself as a suggested dependency. + missing_deps = missing_deps.difference(set([pkgname])) + missing_deps = missing_deps.difference(set(DO_NOT_REPORT_MISSING)) + surplus_deps = declared_dependencies_set.difference(auto_dependencies) + surplus_deps = surplus_deps.difference(DO_NOT_REPORT_SURPLUS) + orphan_sonames = orphan_sonames.difference(ALLOWED_ORPHAN_SONAMES) + return missing_deps, surplus_deps, orphan_sonames + + +def ExpandRunpath(runpath, isalist): + # Emulating $ISALIST expansion + if '$ISALIST' in runpath: + expanded_list = [runpath.replace('$ISALIST', isa) for isa in isalist] + else: + expanded_list = [runpath] + return expanded_list + +def ExpandSymlink(symlink, target, input_path): + symlink_re = re.compile(r"%s(/|$)" % symlink) + if re.search(symlink_re, input_path): + result = input_path.replace(symlink, target) + else: + result = input_path + return result + +def Emulate64BitSymlinks(runpath_list): + """Need to emulate the 64 -> amd64, 64 -> sparcv9 symlink + + Since we don't know the architecture, we'll adding both amd64 and sparcv9. + It should be safe. + """ + symlinked_list = [] + for runpath in runpath_list: + for symlink, expansion_list in SYSTEM_SYMLINKS: + for target in expansion_list: + expanded = ExpandSymlink(symlink, target, runpath) + if expanded not in symlinked_list: + symlinked_list.append(expanded) + return symlinked_list + + +def SanitizeRunpath(runpath): + while True: + if runpath.endswith("/"): + runpath = runpath[:-1] + elif "//" in runpath: + runpath = runpath.replace("//", "/") + else: + break + return runpath + + +def GetLinesBySoname(pkgmap, needed_sonames, runpath_by_needed_soname, isalist): + """Works out which system pkgmap lines correspond to given sonames.""" + lines_by_soname = {} + for soname in needed_sonames: @@ Diff output truncated at 100000 characters. @@ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Sat Jan 30 23:42:39 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Sat, 30 Jan 2010 22:42:39 +0000 Subject: [csw-devel] SF.net SVN: gar:[8233] csw/mgar/pkg/liblasi/tags/liblasi-1.1.0, REV=2009.05. 28/ Message-ID: Revision: 8233 http://gar.svn.sourceforge.net/gar/?rev=8233&view=rev Author: dmichelsen Date: 2010-01-30 22:42:39 +0000 (Sat, 30 Jan 2010) Log Message: ----------- liblasi: Tag 1.1.0,REV=2009.05.28 Added Paths: ----------- csw/mgar/pkg/liblasi/tags/liblasi-1.1.0,REV=2009.05.28/ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bensons at users.sourceforge.net Sun Jan 31 00:55:19 2010 From: bensons at users.sourceforge.net (bensons at users.sourceforge.net) Date: Sat, 30 Jan 2010 23:55:19 +0000 Subject: [csw-devel] SF.net SVN: gar:[8234] csw/mgar/pkg/cpan/Crypt-SSLeay/trunk/Makefile Message-ID: Revision: 8234 http://gar.svn.sourceforge.net/gar/?rev=8234&view=rev Author: bensons Date: 2010-01-30 23:55:19 +0000 (Sat, 30 Jan 2010) Log Message: ----------- cpan Crypt-SSLeay: bumped version Modified Paths: -------------- csw/mgar/pkg/cpan/Crypt-SSLeay/trunk/Makefile Modified: csw/mgar/pkg/cpan/Crypt-SSLeay/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/Crypt-SSLeay/trunk/Makefile 2010-01-30 22:42:39 UTC (rev 8233) +++ csw/mgar/pkg/cpan/Crypt-SSLeay/trunk/Makefile 2010-01-30 23:55:19 UTC (rev 8234) @@ -17,8 +17,11 @@ CATALOGNAME = pm_cryptssleay REQUIRED_PKGS = CSWosslrt -PREREQUISITE_PKGS = CSWosslrt +PREREQUISITE_PKGS = CSWosslrt CSWpmmimebase64 CONFIGURE_ARGS = --lib=$(prefix) include gar/category.mk + +pre-test-modulated: + gsed -i'' 's,fail(,pass(,' $(WORKSRC)/t/01-connect.t This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bensons at users.sourceforge.net Sun Jan 31 01:04:19 2010 From: bensons at users.sourceforge.net (bensons at users.sourceforge.net) Date: Sun, 31 Jan 2010 00:04:19 +0000 Subject: [csw-devel] SF.net SVN: gar:[8235] csw/mgar/pkg/cpan/Data-UUID/trunk Message-ID: Revision: 8235 http://gar.svn.sourceforge.net/gar/?rev=8235&view=rev Author: bensons Date: 2010-01-31 00:04:19 +0000 (Sun, 31 Jan 2010) Log Message: ----------- cpan Data-UUID: Updated to version 1.203 Modified Paths: -------------- csw/mgar/pkg/cpan/Data-UUID/trunk/Makefile csw/mgar/pkg/cpan/Data-UUID/trunk/checksums Removed Paths: ------------- csw/mgar/pkg/cpan/Data-UUID/trunk/files/CSWpmdatauuid.depend csw/mgar/pkg/cpan/Data-UUID/trunk/files/CSWpmdatauuid.gspec csw/mgar/pkg/cpan/Data-UUID/trunk/files/CSWpmdatauuid.prototype Modified: csw/mgar/pkg/cpan/Data-UUID/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/Data-UUID/trunk/Makefile 2010-01-30 23:55:19 UTC (rev 8234) +++ csw/mgar/pkg/cpan/Data-UUID/trunk/Makefile 2010-01-31 00:04:19 UTC (rev 8235) @@ -1,7 +1,7 @@ GARNAME = Data-UUID -GARVERSION = 0.11 +GARVERSION = 1.203 CATEGORIES = cpan -AUTHOR = AGOLOMSH +AUTHOR = RJBS DESCRIPTION = extension for generating unique identifiers define BLURB @@ -11,7 +11,8 @@ generated until 3400 CE. endef -DISTFILES = $(call admfiles,CSWpmdatauuid,) +PACKAGES = CSWpmdatauuid +CATALOGNAME = pm_datauuid CONFIGURE_ENV += PERL_MM_USE_DEFAULT=1 Modified: csw/mgar/pkg/cpan/Data-UUID/trunk/checksums =================================================================== --- csw/mgar/pkg/cpan/Data-UUID/trunk/checksums 2010-01-30 23:55:19 UTC (rev 8234) +++ csw/mgar/pkg/cpan/Data-UUID/trunk/checksums 2010-01-31 00:04:19 UTC (rev 8235) @@ -1,2 +1 @@ -9f921a3c2ca752c07f2e0dbee42292a4 download/CSWpmdatauuid.gspec -669b9935baf1753eca784dd30b9ad4b1 download/Data-UUID-0.11.tar.gz +242d53819858628a3f60f10ee3c848d6 Data-UUID-1.203.tar.gz Deleted: csw/mgar/pkg/cpan/Data-UUID/trunk/files/CSWpmdatauuid.gspec =================================================================== --- csw/mgar/pkg/cpan/Data-UUID/trunk/files/CSWpmdatauuid.gspec 2010-01-30 23:55:19 UTC (rev 8234) +++ csw/mgar/pkg/cpan/Data-UUID/trunk/files/CSWpmdatauuid.gspec 2010-01-31 00:04:19 UTC (rev 8235) @@ -1,5 +0,0 @@ -%var bitname pm_datauuid -%var pkgname CSWpmdatauuid -%include url file://%{PKGLIB}/csw_cpan.gspec -%copyright -Copyright (C) 2001, Alexander Golomshtok Deleted: csw/mgar/pkg/cpan/Data-UUID/trunk/files/CSWpmdatauuid.prototype =================================================================== --- csw/mgar/pkg/cpan/Data-UUID/trunk/files/CSWpmdatauuid.prototype 2010-01-30 23:55:19 UTC (rev 8234) +++ csw/mgar/pkg/cpan/Data-UUID/trunk/files/CSWpmdatauuid.prototype 2010-01-31 00:04:19 UTC (rev 8235) @@ -1,16 +0,0 @@ -d none /opt/csw/lib 0755 root bin -d none /opt/csw/lib/perl 0755 root bin -d none /opt/csw/lib/perl/csw 0755 root bin -d none /opt/csw/lib/perl/csw/Data 0755 root bin -f none /opt/csw/lib/perl/csw/Data/UUID.pm 0444 root bin -d none /opt/csw/lib/perl/csw/auto 0755 root bin -d none /opt/csw/lib/perl/csw/auto/Data 0755 root bin -d none /opt/csw/lib/perl/csw/auto/Data/UUID 0755 root bin -f none /opt/csw/lib/perl/csw/auto/Data/UUID/.packlist 0644 root bin -f none /opt/csw/lib/perl/csw/auto/Data/UUID/UUID.bs 0444 root bin -f none /opt/csw/lib/perl/csw/auto/Data/UUID/UUID.so 0555 root bin -f none /opt/csw/lib/perl/csw/auto/Data/UUID/autosplit.ix 0444 root bin -d none /opt/csw/share 0755 root bin -d none /opt/csw/share/man 0755 root bin -d none /opt/csw/share/man/man3 0755 root bin -f none /opt/csw/share/man/man3/Data::UUID.3perl 0444 root bin This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bensons at users.sourceforge.net Sun Jan 31 01:27:45 2010 From: bensons at users.sourceforge.net (bensons at users.sourceforge.net) Date: Sun, 31 Jan 2010 00:27:45 +0000 Subject: [csw-devel] SF.net SVN: gar:[8236] csw/mgar/pkg/cpan/Carp-Clan/trunk Message-ID: Revision: 8236 http://gar.svn.sourceforge.net/gar/?rev=8236&view=rev Author: bensons Date: 2010-01-31 00:27:45 +0000 (Sun, 31 Jan 2010) Log Message: ----------- cpan Carp-Clan: updated to version 6.04 Modified Paths: -------------- csw/mgar/pkg/cpan/Carp-Clan/trunk/Makefile csw/mgar/pkg/cpan/Carp-Clan/trunk/checksums Removed Paths: ------------- csw/mgar/pkg/cpan/Carp-Clan/trunk/files/CSWpmcarpclan.gspec csw/mgar/pkg/cpan/Carp-Clan/trunk/files/CSWpmcarpclan.prototype Modified: csw/mgar/pkg/cpan/Carp-Clan/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/Carp-Clan/trunk/Makefile 2010-01-31 00:04:19 UTC (rev 8235) +++ csw/mgar/pkg/cpan/Carp-Clan/trunk/Makefile 2010-01-31 00:27:45 UTC (rev 8236) @@ -1,5 +1,5 @@ GARNAME = Carp-Clan -GARVERSION = 5.3 +GARVERSION = 6.04 CATEGORIES = cpan AUTHOR = STBEY @@ -10,6 +10,7 @@ inside the "qw()" term (or argument list). endef -DISTFILES += $(call admfiles,CSWpmcarpclan,prototype) +OCKAGES = CSWpmcarpclan +CATALOGNAME = pm_carpclan include gar/category.mk Modified: csw/mgar/pkg/cpan/Carp-Clan/trunk/checksums =================================================================== --- csw/mgar/pkg/cpan/Carp-Clan/trunk/checksums 2010-01-31 00:04:19 UTC (rev 8235) +++ csw/mgar/pkg/cpan/Carp-Clan/trunk/checksums 2010-01-31 00:27:45 UTC (rev 8236) @@ -1,3 +1 @@ -41436bd399333bd0d4dc9faf196b5a2e download/CSWpmcarpclan.gspec -24606be2b2f40420e700e31960fdda66 download/CSWpmcarpclan.prototype -d0a0431921b2c786aac234dfb6fe02ca download/Carp-Clan-5.3.tar.gz +b6316bc51bb530d994f2784615939fb2 Carp-Clan-6.04.tar.gz Deleted: csw/mgar/pkg/cpan/Carp-Clan/trunk/files/CSWpmcarpclan.gspec =================================================================== --- csw/mgar/pkg/cpan/Carp-Clan/trunk/files/CSWpmcarpclan.gspec 2010-01-31 00:04:19 UTC (rev 8235) +++ csw/mgar/pkg/cpan/Carp-Clan/trunk/files/CSWpmcarpclan.gspec 2010-01-31 00:27:45 UTC (rev 8236) @@ -1,5 +0,0 @@ -%var bitname pm_carpclan -%var pkgname CSWpmcarpclan -%var arch all -%include url file://%{PKGLIB}/csw_cpan.gspec -%copyright url file://%{WORKSRC}/Artistic.txt Deleted: csw/mgar/pkg/cpan/Carp-Clan/trunk/files/CSWpmcarpclan.prototype =================================================================== --- csw/mgar/pkg/cpan/Carp-Clan/trunk/files/CSWpmcarpclan.prototype 2010-01-31 00:04:19 UTC (rev 8235) +++ csw/mgar/pkg/cpan/Carp-Clan/trunk/files/CSWpmcarpclan.prototype 2010-01-31 00:27:45 UTC (rev 8236) @@ -1,16 +0,0 @@ -d none /opt/csw/lib 0755 root bin -d none /opt/csw/lib/perl 0755 root bin -d none /opt/csw/lib/perl/csw 0755 root bin -d none /opt/csw/lib/perl/csw/auto 0755 root bin -d none /opt/csw/lib/perl/csw/auto/Carp 0755 root bin -d none /opt/csw/lib/perl/csw/auto/Carp/Clan 0755 root bin -f none /opt/csw/lib/perl/csw/auto/Carp/Clan/.packlist 0644 root bin -d none /opt/csw/share 0755 root bin -d none /opt/csw/share/man 0755 root bin -d none /opt/csw/share/man/man3 0755 root bin -f none /opt/csw/share/man/man3/Carp::Clan.3perl 0444 root bin -d none /opt/csw/share/perl 0755 root bin -d none /opt/csw/share/perl/csw 0755 root bin -d none /opt/csw/share/perl/csw/Carp 0755 root bin -f none /opt/csw/share/perl/csw/Carp/Clan.pm 0444 root bin -f none /opt/csw/share/perl/csw/Carp/Clan.pod 0444 root bin This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bensons at users.sourceforge.net Sun Jan 31 01:34:01 2010 From: bensons at users.sourceforge.net (bensons at users.sourceforge.net) Date: Sun, 31 Jan 2010 00:34:01 +0000 Subject: [csw-devel] SF.net SVN: gar:[8237] csw/mgar/pkg/cpan/Carp-Clan/trunk/Makefile Message-ID: Revision: 8237 http://gar.svn.sourceforge.net/gar/?rev=8237&view=rev Author: bensons Date: 2010-01-31 00:34:01 +0000 (Sun, 31 Jan 2010) Log Message: ----------- cpan Carp-Clan: fixed typo Modified Paths: -------------- csw/mgar/pkg/cpan/Carp-Clan/trunk/Makefile Modified: csw/mgar/pkg/cpan/Carp-Clan/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/Carp-Clan/trunk/Makefile 2010-01-31 00:27:45 UTC (rev 8236) +++ csw/mgar/pkg/cpan/Carp-Clan/trunk/Makefile 2010-01-31 00:34:01 UTC (rev 8237) @@ -10,7 +10,7 @@ inside the "qw()" term (or argument list). endef -OCKAGES = CSWpmcarpclan +PACKAGES = CSWpmcarpclan CATALOGNAME = pm_carpclan include gar/category.mk This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bensons at users.sourceforge.net Sun Jan 31 01:46:29 2010 From: bensons at users.sourceforge.net (bensons at users.sourceforge.net) Date: Sun, 31 Jan 2010 00:46:29 +0000 Subject: [csw-devel] SF.net SVN: gar:[8238] csw/mgar/pkg/cpan/Bit-Vector/trunk Message-ID: Revision: 8238 http://gar.svn.sourceforge.net/gar/?rev=8238&view=rev Author: bensons Date: 2010-01-31 00:46:28 +0000 (Sun, 31 Jan 2010) Log Message: ----------- cpan Bit-Vector: updated to version 7.1 Modified Paths: -------------- csw/mgar/pkg/cpan/Bit-Vector/trunk/Makefile csw/mgar/pkg/cpan/Bit-Vector/trunk/checksums Removed Paths: ------------- csw/mgar/pkg/cpan/Bit-Vector/trunk/files/CSWpmbitvec.gspec csw/mgar/pkg/cpan/Bit-Vector/trunk/files/CSWpmbitvec.prototype Modified: csw/mgar/pkg/cpan/Bit-Vector/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/Bit-Vector/trunk/Makefile 2010-01-31 00:34:01 UTC (rev 8237) +++ csw/mgar/pkg/cpan/Bit-Vector/trunk/Makefile 2010-01-31 00:46:28 UTC (rev 8238) @@ -1,5 +1,5 @@ GARNAME = Bit-Vector -GARVERSION = 6.4 +GARVERSION = 7.1 CATEGORIES = cpan AUTHOR = STBEY @@ -7,6 +7,7 @@ define BLURB endef -DISTFILES += $(call admfiles,CSWpmbitvec,prototype) +PACKAGES = CSWpmbitvec +CATALOGNAME = pm_bitvec include gar/category.mk Modified: csw/mgar/pkg/cpan/Bit-Vector/trunk/checksums =================================================================== --- csw/mgar/pkg/cpan/Bit-Vector/trunk/checksums 2010-01-31 00:34:01 UTC (rev 8237) +++ csw/mgar/pkg/cpan/Bit-Vector/trunk/checksums 2010-01-31 00:46:28 UTC (rev 8238) @@ -1,3 +1 @@ -754be0a85b707c009550922172e363a4 download/CSWpmbitvec.gspec -9d97cb1ff057c5dd783ed38ad7ae2b08 download/CSWpmbitvec.prototype -681433ff4f0b4da95dc5c560b7f5cc31 download/Bit-Vector-6.4.tar.gz +164c8574b728f6171b2a6f564fcd2e50 Bit-Vector-7.1.tar.gz Deleted: csw/mgar/pkg/cpan/Bit-Vector/trunk/files/CSWpmbitvec.gspec =================================================================== --- csw/mgar/pkg/cpan/Bit-Vector/trunk/files/CSWpmbitvec.gspec 2010-01-31 00:34:01 UTC (rev 8237) +++ csw/mgar/pkg/cpan/Bit-Vector/trunk/files/CSWpmbitvec.gspec 2010-01-31 00:46:28 UTC (rev 8238) @@ -1,4 +0,0 @@ -%var bitname pm_bitvector -%var pkgname CSWpmbitvec -%include url file://%{PKGLIB}/csw_cpan.gspec -%copyright url file://%{WORKSRC}/Artistic.txt Deleted: csw/mgar/pkg/cpan/Bit-Vector/trunk/files/CSWpmbitvec.prototype =================================================================== --- csw/mgar/pkg/cpan/Bit-Vector/trunk/files/CSWpmbitvec.prototype 2010-01-31 00:34:01 UTC (rev 8237) +++ csw/mgar/pkg/cpan/Bit-Vector/trunk/files/CSWpmbitvec.prototype 2010-01-31 00:46:28 UTC (rev 8238) @@ -1,23 +0,0 @@ -d none /opt/csw/lib 0755 root bin -d none /opt/csw/lib/perl 0755 root bin -d none /opt/csw/lib/perl/csw 0755 root bin -d none /opt/csw/lib/perl/csw/Bit 0755 root bin -d none /opt/csw/lib/perl/csw/Bit/Vector 0755 root bin -f none /opt/csw/lib/perl/csw/Bit/Vector.pm 0444 root bin -f none /opt/csw/lib/perl/csw/Bit/Vector.pod 0444 root bin -f none /opt/csw/lib/perl/csw/Bit/Vector/Overload.pm 0444 root bin -f none /opt/csw/lib/perl/csw/Bit/Vector/Overload.pod 0444 root bin -f none /opt/csw/lib/perl/csw/Bit/Vector/String.pm 0444 root bin -f none /opt/csw/lib/perl/csw/Bit/Vector/String.pod 0444 root bin -d none /opt/csw/lib/perl/csw/auto 0755 root bin -d none /opt/csw/lib/perl/csw/auto/Bit 0755 root bin -d none /opt/csw/lib/perl/csw/auto/Bit/Vector 0755 root bin -f none /opt/csw/lib/perl/csw/auto/Bit/Vector/.packlist 0644 root bin -f none /opt/csw/lib/perl/csw/auto/Bit/Vector/Vector.bs 0444 root bin -f none /opt/csw/lib/perl/csw/auto/Bit/Vector/Vector.so 0555 root bin -d none /opt/csw/share 0755 root bin -d none /opt/csw/share/man 0755 root bin -d none /opt/csw/share/man/man3 0755 root bin -f none /opt/csw/share/man/man3/Bit::Vector.3perl 0444 root bin -f none /opt/csw/share/man/man3/Bit::Vector::Overload.3perl 0444 root bin -f none /opt/csw/share/man/man3/Bit::Vector::String.3perl 0444 root bin This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bensons at users.sourceforge.net Sun Jan 31 01:54:13 2010 From: bensons at users.sourceforge.net (bensons at users.sourceforge.net) Date: Sun, 31 Jan 2010 00:54:13 +0000 Subject: [csw-devel] SF.net SVN: gar:[8239] csw/mgar/pkg/cpan/Bit-Vector/trunk/Makefile Message-ID: Revision: 8239 http://gar.svn.sourceforge.net/gar/?rev=8239&view=rev Author: bensons Date: 2010-01-31 00:54:13 +0000 (Sun, 31 Jan 2010) Log Message: ----------- cpan Bit-Vector: added dependency Modified Paths: -------------- csw/mgar/pkg/cpan/Bit-Vector/trunk/Makefile Modified: csw/mgar/pkg/cpan/Bit-Vector/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/Bit-Vector/trunk/Makefile 2010-01-31 00:46:28 UTC (rev 8238) +++ csw/mgar/pkg/cpan/Bit-Vector/trunk/Makefile 2010-01-31 00:54:13 UTC (rev 8239) @@ -10,4 +10,7 @@ PACKAGES = CSWpmbitvec CATALOGNAME = pm_bitvec +REQUIRED_PKGS = CSWpmcarpclan +PREREQUISITE_PKGS = CSWpmcarpclan + include gar/category.mk This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bensons at users.sourceforge.net Sun Jan 31 02:06:00 2010 From: bensons at users.sourceforge.net (bensons at users.sourceforge.net) Date: Sun, 31 Jan 2010 01:06:00 +0000 Subject: [csw-devel] SF.net SVN: gar:[8240] csw/mgar/pkg/cpan/Date-Calc/trunk Message-ID: Revision: 8240 http://gar.svn.sourceforge.net/gar/?rev=8240&view=rev Author: bensons Date: 2010-01-31 01:06:00 +0000 (Sun, 31 Jan 2010) Log Message: ----------- cpan Date-Calc: updated to version 6.3 Modified Paths: -------------- csw/mgar/pkg/cpan/Date-Calc/trunk/Makefile csw/mgar/pkg/cpan/Date-Calc/trunk/checksums Removed Paths: ------------- csw/mgar/pkg/cpan/Date-Calc/trunk/files/CSWpmdatecalc.depend csw/mgar/pkg/cpan/Date-Calc/trunk/files/CSWpmdatecalc.gspec csw/mgar/pkg/cpan/Date-Calc/trunk/files/CSWpmdatecalc.prototype Modified: csw/mgar/pkg/cpan/Date-Calc/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/Date-Calc/trunk/Makefile 2010-01-31 00:54:13 UTC (rev 8239) +++ csw/mgar/pkg/cpan/Date-Calc/trunk/Makefile 2010-01-31 01:06:00 UTC (rev 8240) @@ -1,5 +1,5 @@ GARNAME = Date-Calc -GARVERSION = 5.4 +GARVERSION = 6.3 CATEGORIES = cpan AUTHOR = STBEY @@ -12,9 +12,10 @@ and, to some extent, ISO 8601 (where applicable). endef -DISTFILES += $(call admfiles,CSWpmdatecalc,depend prototype) +PACKAGES = CSWpmdatecalc +CATALOGNAME = pm_datecalc -DEPENDS += cpan/Carp-Clan -DEPENDS += cpan/Bit-Vector +PREREQUISITE_PKGS = CSWpmbitvec CSWpmcarpclan +REQUIRES = CSWpmbitvec CSWpmcarpclan include gar/category.mk Modified: csw/mgar/pkg/cpan/Date-Calc/trunk/checksums =================================================================== --- csw/mgar/pkg/cpan/Date-Calc/trunk/checksums 2010-01-31 00:54:13 UTC (rev 8239) +++ csw/mgar/pkg/cpan/Date-Calc/trunk/checksums 2010-01-31 01:06:00 UTC (rev 8240) @@ -1,4 +1 @@ -39803d04cc6376c7b00c4bdfe138befe download/CSWpmdatecalc.gspec -eefb37e1e6fa9c5cc00f22669cfe5129 download/CSWpmdatecalc.depend -0a523b703e158b1a3f59feefac912025 download/CSWpmdatecalc.prototype -7ae34972694127e8f1c9a2af1c24585b download/Date-Calc-5.4.tar.gz +9b64555b7051c1beb6b61daead2d01b3 Date-Calc-6.3.tar.gz Deleted: csw/mgar/pkg/cpan/Date-Calc/trunk/files/CSWpmdatecalc.depend =================================================================== --- csw/mgar/pkg/cpan/Date-Calc/trunk/files/CSWpmdatecalc.depend 2010-01-31 00:54:13 UTC (rev 8239) +++ csw/mgar/pkg/cpan/Date-Calc/trunk/files/CSWpmdatecalc.depend 2010-01-31 01:06:00 UTC (rev 8240) @@ -1,2 +0,0 @@ -P CSWpmbitvec pm_bitvector - Efficient bit vector, set of integers and big int math library. -P CSWpmcarpclan pm_carpclan - report errors from perspective of caller of a "clan" of modules Deleted: csw/mgar/pkg/cpan/Date-Calc/trunk/files/CSWpmdatecalc.gspec =================================================================== --- csw/mgar/pkg/cpan/Date-Calc/trunk/files/CSWpmdatecalc.gspec 2010-01-31 00:54:13 UTC (rev 8239) +++ csw/mgar/pkg/cpan/Date-Calc/trunk/files/CSWpmdatecalc.gspec 2010-01-31 01:06:00 UTC (rev 8240) @@ -1,4 +0,0 @@ -%var bitname pm_datecalc -%var pkgname CSWpmdatecalc -%include url file://%{PKGLIB}/csw_cpan.gspec -%copyright url file://%{WORKSRC}/Artistic.txt Deleted: csw/mgar/pkg/cpan/Date-Calc/trunk/files/CSWpmdatecalc.prototype =================================================================== --- csw/mgar/pkg/cpan/Date-Calc/trunk/files/CSWpmdatecalc.prototype 2010-01-31 00:54:13 UTC (rev 8239) +++ csw/mgar/pkg/cpan/Date-Calc/trunk/files/CSWpmdatecalc.prototype 2010-01-31 01:06:00 UTC (rev 8240) @@ -1,30 +0,0 @@ -d none /opt/csw/lib 0755 root bin -d none /opt/csw/lib/perl 0755 root bin -d none /opt/csw/lib/perl/csw 0755 root bin -d none /opt/csw/lib/perl/csw/Date 0755 root bin -d none /opt/csw/lib/perl/csw/Date/Calc 0755 root bin -f none /opt/csw/lib/perl/csw/Date/Calc.pm 0444 root bin -f none /opt/csw/lib/perl/csw/Date/Calc.pod 0444 root bin -f none /opt/csw/lib/perl/csw/Date/Calc/Object.pm 0444 root bin -f none /opt/csw/lib/perl/csw/Date/Calc/Object.pod 0444 root bin -d none /opt/csw/lib/perl/csw/Date/Calendar 0755 root bin -f none /opt/csw/lib/perl/csw/Date/Calendar.pm 0444 root bin -f none /opt/csw/lib/perl/csw/Date/Calendar.pod 0444 root bin -f none /opt/csw/lib/perl/csw/Date/Calendar/Profiles.pm 0444 root bin -f none /opt/csw/lib/perl/csw/Date/Calendar/Profiles.pod 0444 root bin -f none /opt/csw/lib/perl/csw/Date/Calendar/Year.pm 0444 root bin -f none /opt/csw/lib/perl/csw/Date/Calendar/Year.pod 0444 root bin -d none /opt/csw/lib/perl/csw/auto 0755 root bin -d none /opt/csw/lib/perl/csw/auto/Date 0755 root bin -d none /opt/csw/lib/perl/csw/auto/Date/Calc 0755 root bin -f none /opt/csw/lib/perl/csw/auto/Date/Calc/.packlist 0644 root bin -f none /opt/csw/lib/perl/csw/auto/Date/Calc/Calc.bs 0444 root bin -f none /opt/csw/lib/perl/csw/auto/Date/Calc/Calc.so 0555 root bin -d none /opt/csw/share 0755 root bin -d none /opt/csw/share/man 0755 root bin -d none /opt/csw/share/man/man3 0755 root bin -f none /opt/csw/share/man/man3/Date::Calc.3perl 0444 root bin -f none /opt/csw/share/man/man3/Date::Calc::Object.3perl 0444 root bin -f none /opt/csw/share/man/man3/Date::Calendar.3perl 0444 root bin -f none /opt/csw/share/man/man3/Date::Calendar::Profiles.3perl 0444 root bin -f none /opt/csw/share/man/man3/Date::Calendar::Year.3perl 0444 root bin This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bensons at users.sourceforge.net Sun Jan 31 03:02:07 2010 From: bensons at users.sourceforge.net (bensons at users.sourceforge.net) Date: Sun, 31 Jan 2010 02:02:07 +0000 Subject: [csw-devel] SF.net SVN: gar:[8241] csw/mgar/pkg/cpan/Devel-Caller/trunk/Makefile Message-ID: Revision: 8241 http://gar.svn.sourceforge.net/gar/?rev=8241&view=rev Author: bensons Date: 2010-01-31 02:02:07 +0000 (Sun, 31 Jan 2010) Log Message: ----------- cpan Devel-Caller: added build dependency Modified Paths: -------------- csw/mgar/pkg/cpan/Devel-Caller/trunk/Makefile Modified: csw/mgar/pkg/cpan/Devel-Caller/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/Devel-Caller/trunk/Makefile 2010-01-31 01:06:00 UTC (rev 8240) +++ csw/mgar/pkg/cpan/Devel-Caller/trunk/Makefile 2010-01-31 02:02:07 UTC (rev 8241) @@ -11,6 +11,7 @@ CATALOGNAME = pm_develcaller REQUIRED_PKGS = CSWpmpadwalker +PREREQUISITE_PKGS = CSWpmpadwalker include gar/category.mk This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bensons at users.sourceforge.net Sun Jan 31 03:21:22 2010 From: bensons at users.sourceforge.net (bensons at users.sourceforge.net) Date: Sun, 31 Jan 2010 02:21:22 +0000 Subject: [csw-devel] SF.net SVN: gar:[8242] csw/mgar/pkg/cpan/String-CRC32/trunk Message-ID: Revision: 8242 http://gar.svn.sourceforge.net/gar/?rev=8242&view=rev Author: bensons Date: 2010-01-31 02:21:22 +0000 (Sun, 31 Jan 2010) Log Message: ----------- cpan String-CRC32: take over ownership Modified Paths: -------------- csw/mgar/pkg/cpan/String-CRC32/trunk/Makefile csw/mgar/pkg/cpan/String-CRC32/trunk/checksums Modified: csw/mgar/pkg/cpan/String-CRC32/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/String-CRC32/trunk/Makefile 2010-01-31 02:02:07 UTC (rev 8241) +++ csw/mgar/pkg/cpan/String-CRC32/trunk/Makefile 2010-01-31 02:21:22 UTC (rev 8242) @@ -11,6 +11,7 @@ files. endef -DISTFILES = $(call admfiles,CSWpmstringcrc32,depend prototype) +PACKAGES = CSWpmstringcrc32 +CATALOGNAME = pm_stringcrc32 include gar/category.mk Modified: csw/mgar/pkg/cpan/String-CRC32/trunk/checksums =================================================================== --- csw/mgar/pkg/cpan/String-CRC32/trunk/checksums 2010-01-31 02:02:07 UTC (rev 8241) +++ csw/mgar/pkg/cpan/String-CRC32/trunk/checksums 2010-01-31 02:21:22 UTC (rev 8242) @@ -1,4 +1 @@ -f2a83418e9cb288beaa9a05e3f5b2d22 download/CSWpmstringcrc32.gspec -6e0d583c86d7f74b43769810714242aa download/CSWpmstringcrc32.depend -5c9ee7a13b249e042005c07d86660c4d download/CSWpmstringcrc32.prototype -9b241bc4a482a3aa59fbb1429bc30546 download/String-CRC32-1.4.tar.gz +9b241bc4a482a3aa59fbb1429bc30546 String-CRC32-1.4.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bensons at users.sourceforge.net Sun Jan 31 03:23:46 2010 From: bensons at users.sourceforge.net (bensons at users.sourceforge.net) Date: Sun, 31 Jan 2010 02:23:46 +0000 Subject: [csw-devel] SF.net SVN: gar:[8243] csw/mgar/pkg/cpan/String-CRC32/trunk/files Message-ID: Revision: 8243 http://gar.svn.sourceforge.net/gar/?rev=8243&view=rev Author: bensons Date: 2010-01-31 02:23:45 +0000 (Sun, 31 Jan 2010) Log Message: ----------- cpan String-CRC32: removed old GAR files Removed Paths: ------------- csw/mgar/pkg/cpan/String-CRC32/trunk/files/CSWpmstringcrc32.depend csw/mgar/pkg/cpan/String-CRC32/trunk/files/CSWpmstringcrc32.gspec csw/mgar/pkg/cpan/String-CRC32/trunk/files/CSWpmstringcrc32.prototype Deleted: csw/mgar/pkg/cpan/String-CRC32/trunk/files/CSWpmstringcrc32.gspec =================================================================== --- csw/mgar/pkg/cpan/String-CRC32/trunk/files/CSWpmstringcrc32.gspec 2010-01-31 02:21:22 UTC (rev 8242) +++ csw/mgar/pkg/cpan/String-CRC32/trunk/files/CSWpmstringcrc32.gspec 2010-01-31 02:23:45 UTC (rev 8243) @@ -1,12 +0,0 @@ -%var bitname pm_stringcrc32 -%var pkgname CSWpmstringcrc32 -%include url file://%{PKGLIB}/csw_cpan.gspec -%copyright -CRC algorithm code taken from CRC-32 by Craig Bruce. -The module stuff is inspired by a similar perl module called -String::CRC by David Sharnoff & Matthew Dillon. -Horst Fickenscher told me that it could be useful to supply an init -value to the crc checking function and so I included this possibility. - -The author of this package disclaims all copyrights and -releases it into the public domain. Deleted: csw/mgar/pkg/cpan/String-CRC32/trunk/files/CSWpmstringcrc32.prototype =================================================================== --- csw/mgar/pkg/cpan/String-CRC32/trunk/files/CSWpmstringcrc32.prototype 2010-01-31 02:21:22 UTC (rev 8242) +++ csw/mgar/pkg/cpan/String-CRC32/trunk/files/CSWpmstringcrc32.prototype 2010-01-31 02:23:45 UTC (rev 8243) @@ -1,16 +0,0 @@ -d none /opt/csw/lib 0755 root bin -d none /opt/csw/lib/perl 0755 root bin -d none /opt/csw/lib/perl/csw 0755 root bin -d none /opt/csw/lib/perl/csw/String 0755 root bin -f none /opt/csw/lib/perl/csw/String/CRC32.pm 0444 root bin -f none /opt/csw/lib/perl/csw/String/CRC32.pod 0444 root bin -d none /opt/csw/lib/perl/csw/auto 0755 root bin -d none /opt/csw/lib/perl/csw/auto/String 0755 root bin -d none /opt/csw/lib/perl/csw/auto/String/CRC32 0755 root bin -f none /opt/csw/lib/perl/csw/auto/String/CRC32/.packlist 0644 root bin -f none /opt/csw/lib/perl/csw/auto/String/CRC32/CRC32.bs 0444 root bin -f none /opt/csw/lib/perl/csw/auto/String/CRC32/CRC32.so 0555 root bin -d none /opt/csw/share 0755 root bin -d none /opt/csw/share/man 0755 root bin -d none /opt/csw/share/man/man3 0755 root bin -f none /opt/csw/share/man/man3/String::CRC32.3perl 0444 root bin This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bensons at users.sourceforge.net Sun Jan 31 03:26:46 2010 From: bensons at users.sourceforge.net (bensons at users.sourceforge.net) Date: Sun, 31 Jan 2010 02:26:46 +0000 Subject: [csw-devel] SF.net SVN: gar:[8244] csw/mgar/pkg/cpan/Devel-Cover/trunk Message-ID: Revision: 8244 http://gar.svn.sourceforge.net/gar/?rev=8244&view=rev Author: bensons Date: 2010-01-31 02:26:46 +0000 (Sun, 31 Jan 2010) Log Message: ----------- cpan Devel-Cover: updated to version 0.65 Modified Paths: -------------- csw/mgar/pkg/cpan/Devel-Cover/trunk/Makefile csw/mgar/pkg/cpan/Devel-Cover/trunk/checksums Modified: csw/mgar/pkg/cpan/Devel-Cover/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/Devel-Cover/trunk/Makefile 2010-01-31 02:23:45 UTC (rev 8243) +++ csw/mgar/pkg/cpan/Devel-Cover/trunk/Makefile 2010-01-31 02:26:46 UTC (rev 8244) @@ -1,5 +1,5 @@ GARNAME = Devel-Cover -GARVERSION = 0.61 +GARVERSION = 0.65 CATEGORIES = cpan AUTHOR = PJCJ @@ -8,6 +8,7 @@ This module provides code coverage metrics for Perl. endef -DISTFILES += $(call admfiles,CSWpmdevelcover,prototype) +PACKAGES = CSWpmdevelcover +CATALOGNAME = pm_develcover include gar/category.mk Modified: csw/mgar/pkg/cpan/Devel-Cover/trunk/checksums =================================================================== --- csw/mgar/pkg/cpan/Devel-Cover/trunk/checksums 2010-01-31 02:23:45 UTC (rev 8243) +++ csw/mgar/pkg/cpan/Devel-Cover/trunk/checksums 2010-01-31 02:26:46 UTC (rev 8244) @@ -1,3 +1 @@ -ade9c176c64512a3e02e33e8a7229a82 download/CSWpmdevelcover.gspec -baec1617ab8b17c52022d00e172ac7b8 download/CSWpmdevelcover.prototype -43386d7aff054c079120108054b88155 download/Devel-Cover-0.61.tar.gz +7c83ef4c01b2620137dca7a241cda4d9 Devel-Cover-0.65.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bensons at users.sourceforge.net Sun Jan 31 03:27:22 2010 From: bensons at users.sourceforge.net (bensons at users.sourceforge.net) Date: Sun, 31 Jan 2010 02:27:22 +0000 Subject: [csw-devel] SF.net SVN: gar:[8245] csw/mgar/pkg/cpan/Devel-Cover/trunk/files Message-ID: Revision: 8245 http://gar.svn.sourceforge.net/gar/?rev=8245&view=rev Author: bensons Date: 2010-01-31 02:27:22 +0000 (Sun, 31 Jan 2010) Log Message: ----------- cpan Devel-Cover: removed old GAR files Removed Paths: ------------- csw/mgar/pkg/cpan/Devel-Cover/trunk/files/CSWpmdevelcover.gspec csw/mgar/pkg/cpan/Devel-Cover/trunk/files/CSWpmdevelcover.prototype Deleted: csw/mgar/pkg/cpan/Devel-Cover/trunk/files/CSWpmdevelcover.gspec =================================================================== --- csw/mgar/pkg/cpan/Devel-Cover/trunk/files/CSWpmdevelcover.gspec 2010-01-31 02:26:46 UTC (rev 8244) +++ csw/mgar/pkg/cpan/Devel-Cover/trunk/files/CSWpmdevelcover.gspec 2010-01-31 02:27:22 UTC (rev 8245) @@ -1,6 +0,0 @@ -%var bitname pm_develcover -%var pkgname CSWpmdevelcover -%include url file://%{PKGLIB}/csw_cpan.gspec -%copyright -Copyright 2001-2004, Paul Johnson (pjcj at cpan.org) -This software is free. It is licensed under the same terms as Perl itself. Deleted: csw/mgar/pkg/cpan/Devel-Cover/trunk/files/CSWpmdevelcover.prototype =================================================================== --- csw/mgar/pkg/cpan/Devel-Cover/trunk/files/CSWpmdevelcover.prototype 2010-01-31 02:26:46 UTC (rev 8244) +++ csw/mgar/pkg/cpan/Devel-Cover/trunk/files/CSWpmdevelcover.prototype 2010-01-31 02:27:22 UTC (rev 8245) @@ -1,81 +0,0 @@ -d none /opt/csw/bin 0755 root bin -f none /opt/csw/bin/cover 0555 root bin -f none /opt/csw/bin/gcov2perl 0555 root bin -d none /opt/csw/lib 0755 root bin -d none /opt/csw/lib/perl 0755 root bin -d none /opt/csw/lib/perl/csw 0755 root bin -d none /opt/csw/lib/perl/csw/Devel 0755 root bin -d none /opt/csw/lib/perl/csw/Devel/Cover 0755 root bin -f none /opt/csw/lib/perl/csw/Devel/Cover.pm 0444 root bin -d none /opt/csw/lib/perl/csw/Devel/Cover/Annotation 0755 root bin -f none /opt/csw/lib/perl/csw/Devel/Cover/Annotation/Random.pm 0444 root bin -f none /opt/csw/lib/perl/csw/Devel/Cover/Annotation/Svk.pm 0444 root bin -f none /opt/csw/lib/perl/csw/Devel/Cover/Branch.pm 0444 root bin -f none /opt/csw/lib/perl/csw/Devel/Cover/Condition.pm 0444 root bin -f none /opt/csw/lib/perl/csw/Devel/Cover/Condition_and_2.pm 0444 root bin -f none /opt/csw/lib/perl/csw/Devel/Cover/Condition_and_3.pm 0444 root bin -f none /opt/csw/lib/perl/csw/Devel/Cover/Condition_or_2.pm 0444 root bin -f none /opt/csw/lib/perl/csw/Devel/Cover/Condition_or_3.pm 0444 root bin -f none /opt/csw/lib/perl/csw/Devel/Cover/Condition_xor_4.pm 0444 root bin -f none /opt/csw/lib/perl/csw/Devel/Cover/Criterion.pm 0444 root bin -d none /opt/csw/lib/perl/csw/Devel/Cover/DB 0755 root bin -f none /opt/csw/lib/perl/csw/Devel/Cover/DB.pm 0444 root bin -f none /opt/csw/lib/perl/csw/Devel/Cover/DB/File.pm 0444 root bin -f none /opt/csw/lib/perl/csw/Devel/Cover/DB/Structure.pm 0444 root bin -f none /opt/csw/lib/perl/csw/Devel/Cover/Inc.pm 0444 root bin -f none /opt/csw/lib/perl/csw/Devel/Cover/Op.pm 0444 root bin -f none /opt/csw/lib/perl/csw/Devel/Cover/Pod.pm 0444 root bin -d none /opt/csw/lib/perl/csw/Devel/Cover/Report 0755 root bin -f none /opt/csw/lib/perl/csw/Devel/Cover/Report/Html.pm 0444 root bin -f none /opt/csw/lib/perl/csw/Devel/Cover/Report/Html_basic.pm 0444 root bin -f none /opt/csw/lib/perl/csw/Devel/Cover/Report/Html_minimal.pm 0444 root bin -f none /opt/csw/lib/perl/csw/Devel/Cover/Report/Html_subtle.pm 0444 root bin -f none /opt/csw/lib/perl/csw/Devel/Cover/Report/Sort.pm 0444 root bin -f none /opt/csw/lib/perl/csw/Devel/Cover/Report/Text.pm 0444 root bin -f none /opt/csw/lib/perl/csw/Devel/Cover/Report/Text2.pm 0444 root bin -f none /opt/csw/lib/perl/csw/Devel/Cover/Statement.pm 0444 root bin -f none /opt/csw/lib/perl/csw/Devel/Cover/Subroutine.pm 0444 root bin -f none /opt/csw/lib/perl/csw/Devel/Cover/Test.pm 0444 root bin -f none /opt/csw/lib/perl/csw/Devel/Cover/Time.pm 0444 root bin -f none /opt/csw/lib/perl/csw/Devel/Cover/Truth_Table.pm 0444 root bin -f none /opt/csw/lib/perl/csw/Devel/Cover/Tutorial.pod 0444 root bin -d none /opt/csw/lib/perl/csw/auto 0755 root bin -d none /opt/csw/lib/perl/csw/auto/Devel 0755 root bin -d none /opt/csw/lib/perl/csw/auto/Devel/Cover 0755 root bin -f none /opt/csw/lib/perl/csw/auto/Devel/Cover/.packlist 0644 root bin -f none /opt/csw/lib/perl/csw/auto/Devel/Cover/Cover.bs 0444 root bin -f none /opt/csw/lib/perl/csw/auto/Devel/Cover/Cover.so 0555 root bin -d none /opt/csw/share 0755 root bin -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/cover.1 0444 root bin -f none /opt/csw/share/man/man1/gcov2perl.1 0444 root bin -d none /opt/csw/share/man/man3 0755 root bin -f none /opt/csw/share/man/man3/Devel::Cover.3perl 0444 root bin -f none /opt/csw/share/man/man3/Devel::Cover::Annotation::Random.3perl 0444 root bin -f none /opt/csw/share/man/man3/Devel::Cover::Annotation::Svk.3perl 0444 root bin -f none /opt/csw/share/man/man3/Devel::Cover::Branch.3perl 0444 root bin -f none /opt/csw/share/man/man3/Devel::Cover::Condition.3perl 0444 root bin -f none /opt/csw/share/man/man3/Devel::Cover::Condition_and_2.3perl 0444 root bin -f none /opt/csw/share/man/man3/Devel::Cover::Condition_and_3.3perl 0444 root bin -f none /opt/csw/share/man/man3/Devel::Cover::Condition_or_2.3perl 0444 root bin -f none /opt/csw/share/man/man3/Devel::Cover::Condition_or_3.3perl 0444 root bin -f none /opt/csw/share/man/man3/Devel::Cover::Condition_xor_4.3perl 0444 root bin -f none /opt/csw/share/man/man3/Devel::Cover::Criterion.3perl 0444 root bin -f none /opt/csw/share/man/man3/Devel::Cover::DB.3perl 0444 root bin -f none /opt/csw/share/man/man3/Devel::Cover::DB::File.3perl 0444 root bin -f none /opt/csw/share/man/man3/Devel::Cover::DB::Structure.3perl 0444 root bin -f none /opt/csw/share/man/man3/Devel::Cover::Op.3perl 0444 root bin -f none /opt/csw/share/man/man3/Devel::Cover::Pod.3perl 0444 root bin -f none /opt/csw/share/man/man3/Devel::Cover::Report::Html.3perl 0444 root bin -f none /opt/csw/share/man/man3/Devel::Cover::Report::Html_basic.3perl 0444 root bin -f none /opt/csw/share/man/man3/Devel::Cover::Report::Html_minimal.3perl 0444 root bin -f none /opt/csw/share/man/man3/Devel::Cover::Report::Html_subtle.3perl 0444 root bin -f none /opt/csw/share/man/man3/Devel::Cover::Report::Sort.3perl 0444 root bin -f none /opt/csw/share/man/man3/Devel::Cover::Report::Text.3perl 0444 root bin -f none /opt/csw/share/man/man3/Devel::Cover::Report::Text2.3perl 0444 root bin -f none /opt/csw/share/man/man3/Devel::Cover::Statement.3perl 0444 root bin -f none /opt/csw/share/man/man3/Devel::Cover::Subroutine.3perl 0444 root bin -f none /opt/csw/share/man/man3/Devel::Cover::Time.3perl 0444 root bin -f none /opt/csw/share/man/man3/Devel::Cover::Truth_Table.3perl 0444 root bin -f none /opt/csw/share/man/man3/Devel::Cover::Tutorial.3perl 0444 root bin This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bensons at users.sourceforge.net Sun Jan 31 03:40:17 2010 From: bensons at users.sourceforge.net (bensons at users.sourceforge.net) Date: Sun, 31 Jan 2010 02:40:17 +0000 Subject: [csw-devel] SF.net SVN: gar:[8246] csw/mgar/pkg/cpan/Devel-LexAlias/trunk/Makefile Message-ID: Revision: 8246 http://gar.svn.sourceforge.net/gar/?rev=8246&view=rev Author: bensons Date: 2010-01-31 02:40:17 +0000 (Sun, 31 Jan 2010) Log Message: ----------- cpan Devel-LexAlias: added build dependency Modified Paths: -------------- csw/mgar/pkg/cpan/Devel-LexAlias/trunk/Makefile Modified: csw/mgar/pkg/cpan/Devel-LexAlias/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/Devel-LexAlias/trunk/Makefile 2010-01-31 02:27:22 UTC (rev 8245) +++ csw/mgar/pkg/cpan/Devel-LexAlias/trunk/Makefile 2010-01-31 02:40:17 UTC (rev 8246) @@ -13,6 +13,7 @@ CATALOGNAME = pm_devellexalias REQUIRED_PKGS = CSWpmdevelcaller CSWpmpadwalker +PREREQUISITE_PKGS = CSWpmdevelcaller CSWpmpadwalker include gar/category.mk This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Sun Jan 31 04:45:21 2010 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Sun, 31 Jan 2010 03:45:21 +0000 Subject: [csw-devel] SF.net SVN: gar:[8247] csw/mgar/pkg/git/trunk/Makefile Message-ID: Revision: 8247 http://gar.svn.sourceforge.net/gar/?rev=8247&view=rev Author: bdwalton Date: 2010-01-31 03:45:21 +0000 (Sun, 31 Jan 2010) Log Message: ----------- git: add configure/build deps for python for 1.7 (no .py code will ship yet though) Modified Paths: -------------- csw/mgar/pkg/git/trunk/Makefile Modified: csw/mgar/pkg/git/trunk/Makefile =================================================================== --- csw/mgar/pkg/git/trunk/Makefile 2010-01-31 02:40:17 UTC (rev 8246) +++ csw/mgar/pkg/git/trunk/Makefile 2010-01-31 03:45:21 UTC (rev 8247) @@ -32,6 +32,7 @@ PREREQUISITE_PKGS = CSWasciidoc CSWossldevel CSWxmlto CSWbash CSWcurldevel PREREQUISITE_PKGS += CSWgsed CSWgnulinks CSWperl CSWtk CSWexpat PREREQUISITE_PKGS += CSWzlib CSWpmerror CSWpmsvn CSWcvs CSWemacs +PREREQUISITE_PKGS += CSWpython REQUIRED_PKGS_CSWgit = CSWzlib CSWperl CSWrsync CSWcurlrt CSWosslrt REQUIRED_PKGS_CSWgit += CSWosshclient CSWiconv CSWexpat CSWbash CSWpmerror @@ -123,6 +124,7 @@ CONFIGURE_ARGS += --enable-pthreads="-D_REENTRANT -lpthread" CONFIGURE_ARGS += --with-gitconfig=$(sysconfdir)/gitconfig CONFIGURE_ARGS += --with-pager=/opt/csw/bin/less +CONFIGURE_ARGS += --with-python=/opt/csw/bin/python BUILD_ARGS = MSGFMT=gmsgfmt SHELL_PATH=/opt/csw/bin/bash \ ASCIIDOC_NO_ROFF=YesPlease \ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From hson at users.sourceforge.net Sun Jan 31 06:24:10 2010 From: hson at users.sourceforge.net (hson at users.sourceforge.net) Date: Sun, 31 Jan 2010 05:24:10 +0000 Subject: [csw-devel] SF.net SVN: gar:[8248] csw/mgar/pkg/libfpx/trunk/Makefile Message-ID: Revision: 8248 http://gar.svn.sourceforge.net/gar/?rev=8248&view=rev Author: hson Date: 2010-01-31 05:24:10 +0000 (Sun, 31 Jan 2010) Log Message: ----------- Fix for compilation problems on build farm when using Sun Studio which also means no more need for gcc Cleanup of Makefile Package ready for release Modified Paths: -------------- csw/mgar/pkg/libfpx/trunk/Makefile Modified: csw/mgar/pkg/libfpx/trunk/Makefile =================================================================== --- csw/mgar/pkg/libfpx/trunk/Makefile 2010-01-31 03:45:21 UTC (rev 8247) +++ csw/mgar/pkg/libfpx/trunk/Makefile 2010-01-31 05:24:10 UTC (rev 8248) @@ -10,25 +10,18 @@ MASTER_SITES = ftp://ftp.imagemagick.org/pub/ImageMagick/delegates/ DISTFILES = $(GARNAME)-$(GARVERSION)-$(GARSUBREV).tar.bz2 -#PACKAGES = CSWlibfpx CSWlibfpxdevel CSWlibfpxdoc PACKAGES = CSWlibfpx CSWlibfpxdevel CATALOGNAME_CSWlibfpx = libfpx CATALOGNAME_CSWlibfpxdevel = libfpx_devel -#CATALOGNAME_CSWlibfpxdoc = libfpx_doc SPKG_DESC_CSWlibfpx += FlashPIX library SPKG_DESC_CSWlibfpxdevel += FlashPIX library - developer package -#SPKG_DESC_CSWlibfpxdoc += FlashPIX library - documentation REQUIRED_PKGS_CSWlibfpx += REQUIRED_PKGS_CSWlibfpxdevel += CSWlibfpx -#REQUIRED_PKGS_CSWlibfpxdoc += CSWlibfpx PKGFILES_CSWlibfpxdevel = $(PKGFILES_DEVEL) -#PKGFILES_CSWlibfpxdoc = $(sharedstatedir)/doc/.* -#ARCHALL_CSWlibfpxdoc = 1 - SPKG_SOURCEURL = http://www.imagemagick.org PATCHFILES = olecomm.h.patch @@ -40,6 +33,9 @@ UFILES_REGEX = $(GARNAME)-((\d+(?:\.\d+)*)-(\d+)?).tar.bz2 +# Fix for problem introduced between 12101[7-8]-17 and 12101[7-8]-20 +CXXFLAGS += -D_RWSTD_NO_WSTR=1 + CONFIGURE_ARGS = $(DIRPATHS) STRIP_LIBTOOL=1 @@ -48,7 +44,4 @@ BUILD64 = 1 -# libfpx have some problems with rw/trait -#GARCOMPILER = GCC4 - include gar/category.mk This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Sun Jan 31 11:12:56 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Sun, 31 Jan 2010 10:12:56 +0000 Subject: [csw-devel] SF.net SVN: gar:[8249] csw/mgar/pkg/sqlite/ Message-ID: Revision: 8249 http://gar.svn.sourceforge.net/gar/?rev=8249&view=rev Author: dmichelsen Date: 2010-01-31 10:12:56 +0000 (Sun, 31 Jan 2010) Log Message: ----------- sqlite: Remove legacy tag as it already has moved to sqlite3/tags/legacy Removed Paths: ------------- csw/mgar/pkg/sqlite/ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Sun Jan 31 11:14:15 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Sun, 31 Jan 2010 10:14:15 +0000 Subject: [csw-devel] SF.net SVN: gar:[8250] csw/mgar/pkg/sqlite3/tags/sqlite3-3.6.21, REV=2010.01 .04/ Message-ID: Revision: 8250 http://gar.svn.sourceforge.net/gar/?rev=8250&view=rev Author: dmichelsen Date: 2010-01-31 10:14:15 +0000 (Sun, 31 Jan 2010) Log Message: ----------- sqlite3: Tag 3.6.21,REV=2010.01.04 Added Paths: ----------- csw/mgar/pkg/sqlite3/tags/sqlite3-3.6.21,REV=2010.01.04/ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Sun Jan 31 11:18:38 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Sun, 31 Jan 2010 10:18:38 +0000 Subject: [csw-devel] SF.net SVN: gar:[8251] csw/mgar/pkg/sqlite3/trunk Message-ID: Revision: 8251 http://gar.svn.sourceforge.net/gar/?rev=8251&view=rev Author: dmichelsen Date: 2010-01-31 10:18:38 +0000 (Sun, 31 Jan 2010) Log Message: ----------- sqlite3: Update to 3.6.22 and remove COPYING from files as it is already in the distribution Modified Paths: -------------- csw/mgar/pkg/sqlite3/trunk/Makefile csw/mgar/pkg/sqlite3/trunk/checksums Removed Paths: ------------- csw/mgar/pkg/sqlite3/trunk/files/COPYING Modified: csw/mgar/pkg/sqlite3/trunk/Makefile =================================================================== --- csw/mgar/pkg/sqlite3/trunk/Makefile 2010-01-31 10:14:15 UTC (rev 8250) +++ csw/mgar/pkg/sqlite3/trunk/Makefile 2010-01-31 10:18:38 UTC (rev 8251) @@ -1,5 +1,5 @@ GARNAME = sqlite3 -GARVERSION = 3.6.21 +GARVERSION = 3.6.22 CATEGORIES = lib DESCRIPTION = An embeddable SQL engine in a C library @@ -12,7 +12,6 @@ MASTER_SITES = http://sqlite.org/ DISTNAME = sqlite-$(GARVERSION) DISTFILES = $(DISTNAME).tar.gz -DISTFILES += COPYING PATCHFILES = gar-base.diff PATCHFILES += shell.c.diff Modified: csw/mgar/pkg/sqlite3/trunk/checksums =================================================================== --- csw/mgar/pkg/sqlite3/trunk/checksums 2010-01-31 10:14:15 UTC (rev 8250) +++ csw/mgar/pkg/sqlite3/trunk/checksums 2010-01-31 10:18:38 UTC (rev 8251) @@ -1,4 +1,3 @@ -22bb7b924e2ecb13997abcf15966f674 COPYING 80d638505872be7ffa238d43f0e268b2 gar-base.diff 1a2be927ceacfa534501b9f4675bce83 shell.c.diff -03a8498828866b407c61c0aaf8ebe66c sqlite-3.6.21.tar.gz +a17bd53f1fde11f84adf79c6a1510ce5 sqlite-3.6.22.tar.gz Deleted: csw/mgar/pkg/sqlite3/trunk/files/COPYING =================================================================== --- csw/mgar/pkg/sqlite3/trunk/files/COPYING 2010-01-31 10:14:15 UTC (rev 8250) +++ csw/mgar/pkg/sqlite3/trunk/files/COPYING 2010-01-31 10:18:38 UTC (rev 8251) @@ -1,188 +0,0 @@ - - -SQLite Copyright - - - - - -
- - - -
-
Small. Fast. Reliable.
Choose any three.
- -
-
-
- About - Sitemap - Documentation - Download - License - News - Developers - Support -
-
- - - -

SQLite Copyright

- - - -
-
-SQLite is in the
-Public Domain -
- -

-All of the deliverable code in SQLite has been dedicated to the -public domain -by the authors. -All code authors, and representatives of the companies they work for, -have signed affidavits dedicating their contributions to -the public domain and originals of -those signed affidavits are stored in a firesafe at the main offices -of Hwaci. -Anyone is free to copy, modify, publish, use, compile, sell, or distribute -the original SQLite code, either in source code form or as a compiled binary, -for any purpose, commercial or non-commercial, and by any means. -

- -

-The previous paragraph applies to the deliverable code in SQLite - -those parts of the SQLite library that you actually bundle and -ship with a larger application. Portions of the documentation and -some code used as part of the build process might fall under -other licenses. The details here are unclear. We do not worry -about the licensing of the documentation and build code so much -because none of these things are part of the core deliverable -SQLite library. -

- -

-All of the deliverable code in SQLite has been written from scratch. -No code has been taken from other projects or from the open -internet. Every line of code can be traced back to its original -author, and all of those authors have public domain dedications -on file. So the SQLite code base is clean and is -uncontaminated with licensed code from other projects. -

- -

Obtaining An Explicit License To Use SQLite

- -

-Even though SQLite is in the public domain and does not require -a license, some users want to obtain a license anyway. Some reasons -for obtaining a license include: -

- -
    -
  • You are using SQLite in a jurisdiction that does not recognize - the public domain.
    • -
  • You are using SQLite in a jurisdiction that does not recognize - the right of an author to dedicate their work to the public - domain.
    • -
  • You want to hold a tangible legal document - as evidence that you have the legal right to use and distribute - SQLite.
    • -
  • Your legal department tells you that you have to purchase a license. -
    • -
- -

-If you feel like you really have to purchase a license for SQLite, -Hwaci, the company that employs -the architect and principal developers of SQLite, will -sell you -one. -

- -

Contributed Code

- -

-In order to keep SQLite completely free and unencumbered by copyright, -all new contributors to the SQLite code base are asked to dedicate -their contributions to the public domain. -If you want to send a patch or enhancement for possible inclusion in the -SQLite source tree, please accompany the patch with the following statement: -

- -
-The author or authors of this code dedicate any and all copyright interest -in this code to the public domain. We make this dedication for the benefit -of the public at large and to the detriment of our heirs and successors. -We intend this dedication to be an overt act of relinquishment in -perpetuity of all present and future rights to this code under copyright law. -
- -

-We are not able to accept patches or changes to -SQLite that are not accompanied by a statement such as the above. -In addition, if you make -changes or enhancements as an employee, then a simple statement such as the -above is insufficient. You must also send by surface mail a copyright release -signed by a company officer. -A signed original of the copyright release should be mailed to:

- -
-Hwaci
-6200 Maple Cove Lane
-Charlotte, NC 28269
-USA -
- -

-A template copyright release is available -in PDF or -HTML. -You can use this release to make future changes. -

- This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bensons at users.sourceforge.net Sun Jan 31 12:07:23 2010 From: bensons at users.sourceforge.net (bensons at users.sourceforge.net) Date: Sun, 31 Jan 2010 11:07:23 +0000 Subject: [csw-devel] SF.net SVN: gar:[8252] csw/mgar/pkg/cpan/Digest-Nilsimsa/trunk Message-ID: Revision: 8252 http://gar.svn.sourceforge.net/gar/?rev=8252&view=rev Author: bensons Date: 2010-01-31 11:07:22 +0000 (Sun, 31 Jan 2010) Log Message: ----------- cpan Digest-Nilsimsa: take over ownership Modified Paths: -------------- csw/mgar/pkg/cpan/Digest-Nilsimsa/trunk/Makefile Removed Paths: ------------- csw/mgar/pkg/cpan/Digest-Nilsimsa/trunk/files/CSWpmdigestnilsimsa.gspec Modified: csw/mgar/pkg/cpan/Digest-Nilsimsa/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/Digest-Nilsimsa/trunk/Makefile 2010-01-31 10:18:38 UTC (rev 8251) +++ csw/mgar/pkg/cpan/Digest-Nilsimsa/trunk/Makefile 2010-01-31 11:07:22 UTC (rev 8252) @@ -10,6 +10,7 @@ around nilsimsa implementation in C by cmeclax. endef -DISTFILES += CSWpmdigestnilsimsa.gspec +PACKAGES = CSWpmdigestnilsimsa +CATALOGNAME = pm_digestnilsimsa include gar/category.mk Deleted: csw/mgar/pkg/cpan/Digest-Nilsimsa/trunk/files/CSWpmdigestnilsimsa.gspec =================================================================== --- csw/mgar/pkg/cpan/Digest-Nilsimsa/trunk/files/CSWpmdigestnilsimsa.gspec 2010-01-31 10:18:38 UTC (rev 8251) +++ csw/mgar/pkg/cpan/Digest-Nilsimsa/trunk/files/CSWpmdigestnilsimsa.gspec 2010-01-31 11:07:22 UTC (rev 8252) @@ -1,4 +0,0 @@ -%var bitname pm_digestnilsimsa -%var pkgname CSWpmdigestnilsimsa -%include url file://%{PKGLIB}/csw_cpan.gspec -%copyright url file://%{WORKSRC}/COPYING This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Sun Jan 31 12:32:15 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sun, 31 Jan 2010 11:32:15 +0000 Subject: [csw-devel] SF.net SVN: gar:[8253] csw/mgar/pkg/cheetah/trunk/Makefile Message-ID: Revision: 8253 http://gar.svn.sourceforge.net/gar/?rev=8253&view=rev Author: wahwah Date: 2010-01-31 11:32:14 +0000 (Sun, 31 Jan 2010) Log Message: ----------- cheetah: Removing the dependency on CSWpython-rt Modified Paths: -------------- csw/mgar/pkg/cheetah/trunk/Makefile Modified: csw/mgar/pkg/cheetah/trunk/Makefile =================================================================== --- csw/mgar/pkg/cheetah/trunk/Makefile 2010-01-31 11:07:22 UTC (rev 8252) +++ csw/mgar/pkg/cheetah/trunk/Makefile 2010-01-31 11:32:14 UTC (rev 8253) @@ -21,5 +21,4 @@ UFILES_REGEX = $(DL_NAME)-(\d+(?:\.\d+)*).tar.gz CATALOGNAME = py_cheetah PACKAGES = CSWpy-cheetah -REQUIRED_PKGS_CSWpy-cheetah = CSWpython-rt include gar/category.mk This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Sun Jan 31 12:37:31 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sun, 31 Jan 2010 11:37:31 +0000 Subject: [csw-devel] SF.net SVN: gar:[8254] csw/mgar/pkg/pyyaml/trunk/Makefile Message-ID: Revision: 8254 http://gar.svn.sourceforge.net/gar/?rev=8254&view=rev Author: wahwah Date: 2010-01-31 11:37:31 +0000 (Sun, 31 Jan 2010) Log Message: ----------- pyyaml: Removing the dependency on CSWpython-rt Modified Paths: -------------- csw/mgar/pkg/pyyaml/trunk/Makefile Modified: csw/mgar/pkg/pyyaml/trunk/Makefile =================================================================== --- csw/mgar/pkg/pyyaml/trunk/Makefile 2010-01-31 11:32:14 UTC (rev 8253) +++ csw/mgar/pkg/pyyaml/trunk/Makefile 2010-01-31 11:37:31 UTC (rev 8254) @@ -38,7 +38,7 @@ CATALOGNAME_CSWpy-yaml-rt = py_yaml_rt REQUIRED_PKGS_CSWpy-yaml = -REQUIRED_PKGS_CSWpy-yaml-rt = CSWpython-rt CSWlibyaml +REQUIRED_PKGS_CSWpy-yaml-rt = CSWlibyaml PREREQUISITE_PKGS = $(REQUIRED_PKGS_CSWpy-yaml) $(REQUIRED_PKGS_CSWpy-yaml-rt) SPKG_DESC_CSWpy-yaml = YAML parser and emitter for Python This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bensons at users.sourceforge.net Sun Jan 31 12:44:04 2010 From: bensons at users.sourceforge.net (bensons at users.sourceforge.net) Date: Sun, 31 Jan 2010 11:44:04 +0000 Subject: [csw-devel] SF.net SVN: gar:[8255] csw/mgar/pkg/cpan/version/trunk Message-ID: Revision: 8255 http://gar.svn.sourceforge.net/gar/?rev=8255&view=rev Author: bensons Date: 2010-01-31 11:44:04 +0000 (Sun, 31 Jan 2010) Log Message: ----------- cpan version: updated to version 0.80 as a preparation for the upcoming perl update Modified Paths: -------------- csw/mgar/pkg/cpan/version/trunk/Makefile csw/mgar/pkg/cpan/version/trunk/checksums Modified: csw/mgar/pkg/cpan/version/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/version/trunk/Makefile 2010-01-31 11:37:31 UTC (rev 8254) +++ csw/mgar/pkg/cpan/version/trunk/Makefile 2010-01-31 11:44:04 UTC (rev 8255) @@ -1,5 +1,5 @@ GARNAME = version -GARVERSION = 0.7701 +GARVERSION = 0.80 CATEGORIES = cpan AUTHOR = JPEACOCK Modified: csw/mgar/pkg/cpan/version/trunk/checksums =================================================================== --- csw/mgar/pkg/cpan/version/trunk/checksums 2010-01-31 11:37:31 UTC (rev 8254) +++ csw/mgar/pkg/cpan/version/trunk/checksums 2010-01-31 11:44:04 UTC (rev 8255) @@ -1 +1 @@ -4ee228bb8254660b5f216af708a266cc download/version-0.7701.tar.gz +0add2a0132d582ad81d62b4e38fd3f92 version-0.80.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bensons at users.sourceforge.net Sun Jan 31 12:47:49 2010 From: bensons at users.sourceforge.net (bensons at users.sourceforge.net) Date: Sun, 31 Jan 2010 11:47:49 +0000 Subject: [csw-devel] SF.net SVN: gar:[8256] csw/mgar/pkg/cpan/Want/trunk Message-ID: Revision: 8256 http://gar.svn.sourceforge.net/gar/?rev=8256&view=rev Author: bensons Date: 2010-01-31 11:47:49 +0000 (Sun, 31 Jan 2010) Log Message: ----------- cpan Want: updated to version 0.18 Modified Paths: -------------- csw/mgar/pkg/cpan/Want/trunk/Makefile csw/mgar/pkg/cpan/Want/trunk/checksums Removed Paths: ------------- csw/mgar/pkg/cpan/Want/trunk/files/CSWpmwant.gspec Modified: csw/mgar/pkg/cpan/Want/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/Want/trunk/Makefile 2010-01-31 11:44:04 UTC (rev 8255) +++ csw/mgar/pkg/cpan/Want/trunk/Makefile 2010-01-31 11:47:49 UTC (rev 8256) @@ -1,5 +1,5 @@ GARNAME = Want -GARVERSION = 0.12 +GARVERSION = 0.18 CATEGORIES = cpan AUTHOR = ROBIN @@ -10,6 +10,7 @@ immediately used. endef -DISTFILES += CSWpmwant.gspec +PACKAGES = CSWpmwant +CATALOGNAME = pm_want include gar/category.mk Modified: csw/mgar/pkg/cpan/Want/trunk/checksums =================================================================== --- csw/mgar/pkg/cpan/Want/trunk/checksums 2010-01-31 11:44:04 UTC (rev 8255) +++ csw/mgar/pkg/cpan/Want/trunk/checksums 2010-01-31 11:47:49 UTC (rev 8256) @@ -1,2 +1 @@ -ab9d80ebd964924551f59a00409f8007 download/CSWpmwant.gspec -4e6475d881b49c4fb891ccbe03f5e219 download/Want-0.12.tar.gz +b83e2d189781b10250133b4eb9e6ca28 Want-0.18.tar.gz Deleted: csw/mgar/pkg/cpan/Want/trunk/files/CSWpmwant.gspec =================================================================== --- csw/mgar/pkg/cpan/Want/trunk/files/CSWpmwant.gspec 2010-01-31 11:44:04 UTC (rev 8255) +++ csw/mgar/pkg/cpan/Want/trunk/files/CSWpmwant.gspec 2010-01-31 11:47:49 UTC (rev 8256) @@ -1,8 +0,0 @@ -%var bitname pm_want -%var pkgname CSWpmwant -%include url file://%{PKGLIB}/csw_cpan.gspec -%copyright -Copyright (c) 2001, Robin Houston. All Rights Reserved. -This module is free software. It may be used, -redistributed and/or modified under the same terms as Perl -itself. This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Sun Jan 31 12:52:53 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sun, 31 Jan 2010 11:52:53 +0000 Subject: [csw-devel] SF.net SVN: gar:[8257] csw/mgar/pkg/trac/trunk/Makefile Message-ID: Revision: 8257 http://gar.svn.sourceforge.net/gar/?rev=8257&view=rev Author: wahwah Date: 2010-01-31 11:52:53 +0000 (Sun, 31 Jan 2010) Log Message: ----------- trac: Removing the dependency on CSWpython-rt, setting the package to ARCHALL = 1 Modified Paths: -------------- csw/mgar/pkg/trac/trunk/Makefile Property Changed: ---------------- csw/mgar/pkg/trac/trunk/Makefile Modified: csw/mgar/pkg/trac/trunk/Makefile =================================================================== --- csw/mgar/pkg/trac/trunk/Makefile 2010-01-31 11:47:49 UTC (rev 8256) +++ csw/mgar/pkg/trac/trunk/Makefile 2010-01-31 11:52:53 UTC (rev 8257) @@ -1,6 +1,8 @@ +# $Id$ + GARNAME = Trac GARVERSION = 0.11.6 -CATEGORIES = apps +CATEGORIES = python DESCRIPTION = Integrated SCM and Project Management define BLURB @@ -11,35 +13,24 @@ established development process and policies. endef -MASTER_SITES = http://ftp.edgewall.com/pub/trac/ -DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz +MASTER_SITES = http://ftp.edgewall.com/pub/trac/ +SPKG_SOURCEURL = http://trac.edgewall.org/wiki/TracDownload +DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz +UFILES_REGEX = (\d+(?:\.\d+)*).tar.gz PACKAGES = CSWtrac REQUIRED_PKGS_CSWtrac = CSWpysetuptools CSWpythonsvn CSWgenshi -REQUIRED_PKGS_CSWtrac += CSWpython +ARCHALL_CSWtrac = 1 CATALOGNAME_CSWtrac = trac SPKG_DESC_CSWtrac = Integrated SCM and Project Management -# We define upstream file regex so we can be notifed of new upstream software release -UFILES_REGEX = (\d+(?:\.\d+)*).tar.gz - -SPKG_SOURCEURL = http://trac.edgewall.org/wiki/TracDownload -SPKG_CLASSES = none cswpycompile - -EXTRA_MERGE_EXCLUDE_FILES = .*\.pyo .*\.pyc -PROTOTYPE_FILTER = awk '$$$$3 ~ /.*\.py$$$$/ { $$$$2 = "cswpycompile" } { print }' - -CONFIGURE_SCRIPTS = -BUILD_SCRIPTS = $(WORKSRC)/setup.py TEST_SCRIPTS = -INSTALL_SCRIPTS = $(WORKSRC)/setup.py -INSTALL_ARGS = --root=$(DESTDIR) include gar/category.mk post-install-modulated: copy-docs - $(DONADA) + @$(DONADA) copy-docs: @install -d $(DESTDIR)$(docdir)/trac @@ -47,5 +38,5 @@ @for f in COPYING ChangeLog INSTALL README README.tracd UPGRADE ; do \ ginstall -m 0644 $(WORKSRC)/$$f $(DESTDIR)$(docdir)/trac ; \ done - $(DONADA) + @$(DONADA) Property changes on: csw/mgar/pkg/trac/trunk/Makefile ___________________________________________________________________ Added: svn:keywords + Id This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Sun Jan 31 13:02:39 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sun, 31 Jan 2010 12:02:39 +0000 Subject: [csw-devel] SF.net SVN: gar:[8258] csw/mgar/pkg/fontforge/trunk/Makefile Message-ID: Revision: 8258 http://gar.svn.sourceforge.net/gar/?rev=8258&view=rev Author: wahwah Date: 2010-01-31 12:02:38 +0000 (Sun, 31 Jan 2010) Log Message: ----------- fontforge: Removing the dependency on CSWpython-rt Modified Paths: -------------- csw/mgar/pkg/fontforge/trunk/Makefile Modified: csw/mgar/pkg/fontforge/trunk/Makefile =================================================================== --- csw/mgar/pkg/fontforge/trunk/Makefile 2010-01-31 11:52:53 UTC (rev 8257) +++ csw/mgar/pkg/fontforge/trunk/Makefile 2010-01-31 12:02:38 UTC (rev 8258) @@ -17,7 +17,6 @@ REQUIRED_PKGS += CSWlibice REQUIRED_PKGS += CSWlibsm REQUIRED_PKGS += CSWpython -REQUIRED_PKGS += CSWpython-rt DISTNAME = fontforge-$(VERSION_DATESTAMP) PATCHFILES = grayscale.patch This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Sun Jan 31 13:11:05 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sun, 31 Jan 2010 12:11:05 +0000 Subject: [csw-devel] SF.net SVN: gar:[8259] csw/mgar/pkg/fontforge/trunk/Makefile Message-ID: Revision: 8259 http://gar.svn.sourceforge.net/gar/?rev=8259&view=rev Author: wahwah Date: 2010-01-31 12:11:05 +0000 (Sun, 31 Jan 2010) Log Message: ----------- fontforge: Removing unnecessary dependencies: CSWlibice and CSWlibsm Modified Paths: -------------- csw/mgar/pkg/fontforge/trunk/Makefile Modified: csw/mgar/pkg/fontforge/trunk/Makefile =================================================================== --- csw/mgar/pkg/fontforge/trunk/Makefile 2010-01-31 12:02:38 UTC (rev 8258) +++ csw/mgar/pkg/fontforge/trunk/Makefile 2010-01-31 12:11:05 UTC (rev 8259) @@ -14,8 +14,6 @@ SF_PROJ = fontforge REQUIRED_PKGS += CSWggettextrt REQUIRED_PKGS += CSWiconv -REQUIRED_PKGS += CSWlibice -REQUIRED_PKGS += CSWlibsm REQUIRED_PKGS += CSWpython DISTNAME = fontforge-$(VERSION_DATESTAMP) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bensons at users.sourceforge.net Sun Jan 31 13:49:30 2010 From: bensons at users.sourceforge.net (bensons at users.sourceforge.net) Date: Sun, 31 Jan 2010 12:49:30 +0000 Subject: [csw-devel] SF.net SVN: gar:[8260] csw/mgar/pkg/cpan/XML-LibXML/trunk Message-ID: Revision: 8260 http://gar.svn.sourceforge.net/gar/?rev=8260&view=rev Author: bensons Date: 2010-01-31 12:49:30 +0000 (Sun, 31 Jan 2010) Log Message: ----------- cpan XML-LibXML: updated to version 1.70. Merged XML::LibXML::Common into this recipie Modified Paths: -------------- csw/mgar/pkg/cpan/XML-LibXML/trunk/Makefile csw/mgar/pkg/cpan/XML-LibXML/trunk/checksums Removed Paths: ------------- csw/mgar/pkg/cpan/XML-LibXML/trunk/files/CSWpmxmllibxml.depend csw/mgar/pkg/cpan/XML-LibXML/trunk/files/CSWpmxmllibxml.gspec csw/mgar/pkg/cpan/XML-LibXML/trunk/files/CSWpmxmllibxml.prototype Modified: csw/mgar/pkg/cpan/XML-LibXML/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/XML-LibXML/trunk/Makefile 2010-01-31 12:11:05 UTC (rev 8259) +++ csw/mgar/pkg/cpan/XML-LibXML/trunk/Makefile 2010-01-31 12:49:30 UTC (rev 8260) @@ -1,7 +1,7 @@ GARNAME = XML-LibXML -GARVERSION = 1.58 +GARVERSION = 1.70 CATEGORIES = cpan -AUTHOR = PHISH +AUTHOR = PAJAS DESCRIPTION = binding for libxml2 define BLURB @@ -11,10 +11,17 @@ several packages which are not described in this section. endef -DISTFILES += $(call admfiles,CSWpmxmllibxml,depend prototype) +PACKAGES = CSWpmxmllibxml CSWpmxmllibxmlcom +CATALOGNAME_CSWpmxmllibxml = pm_xmllibxml +SPKG_DESC_CSWpmxmllibxml = Binding for libxml2 +# PKGFILES_CSWpmxmllibxml = +CATALOGNAME_CSWpmxmllibxmlcom = pm_xmllibxmlcom +SPKG_DESC_CSWpmxmllibxmlcom = Constants and Character Encoding Routines +PKGFILES_CSWpmxmllibxmlcom = this-is-just-an-empty-stub -DEPENDS += cpan/XML-LibXML-Common -DEPENDS += cpan/XML-NamespaceSupport -DEPENDS += cpan/XML-SAX +PREREQUISITE_PKGS = CSWpmxmlnssupp CSWpmxmlsax +REQUIRED_PKGS = CSWpmxmlnssupp CSWpmxmlsax +CONFIGURE_ENV += SKIP_SAX_INSTALL=1 + include gar/category.mk Modified: csw/mgar/pkg/cpan/XML-LibXML/trunk/checksums =================================================================== --- csw/mgar/pkg/cpan/XML-LibXML/trunk/checksums 2010-01-31 12:11:05 UTC (rev 8259) +++ csw/mgar/pkg/cpan/XML-LibXML/trunk/checksums 2010-01-31 12:49:30 UTC (rev 8260) @@ -1,4 +1 @@ -4382d04b55b55892b4ee9100fa732113 download/CSWpmxmllibxml.gspec -fd6f48767d502db8baa8e642b9a3eaaf download/CSWpmxmllibxml.depend -aa84a9c942ba688a37883597cf6a1bf3 download/CSWpmxmllibxml.prototype -4691fc436e5c0f22787f5b4a54fc56b0 download/XML-LibXML-1.58.tar.gz +33d4294f708e20c298cfe534d1166844 XML-LibXML-1.70.tar.gz Deleted: csw/mgar/pkg/cpan/XML-LibXML/trunk/files/CSWpmxmllibxml.depend =================================================================== --- csw/mgar/pkg/cpan/XML-LibXML/trunk/files/CSWpmxmllibxml.depend 2010-01-31 12:11:05 UTC (rev 8259) +++ csw/mgar/pkg/cpan/XML-LibXML/trunk/files/CSWpmxmllibxml.depend 2010-01-31 12:49:30 UTC (rev 8260) @@ -1,7 +0,0 @@ -P CSWiconv libiconv - GNU iconv library -P CSWlibnet libnet - the libnet packet construction library -P CSWlibxml2 libxml2 - XML Parser Library -P CSWzlib zlib - Zlib Data Compression Library -P CSWpmxmllibxmlcom pm_xmllibxmlcom - routines and constants common for XML::LibXML and XML::GDOME -P CSWpmxmlnssupp pm_xmlnssupp - a simple generic namespace support class -P CSWpmxmlsax pm_xmlsax - Simple API for XML Deleted: csw/mgar/pkg/cpan/XML-LibXML/trunk/files/CSWpmxmllibxml.gspec =================================================================== --- csw/mgar/pkg/cpan/XML-LibXML/trunk/files/CSWpmxmllibxml.gspec 2010-01-31 12:11:05 UTC (rev 8259) +++ csw/mgar/pkg/cpan/XML-LibXML/trunk/files/CSWpmxmllibxml.gspec 2010-01-31 12:49:30 UTC (rev 8260) @@ -1,4 +0,0 @@ -%var bitname pm_xmllibxml -%var pkgname CSWpmxmllibxml -%include url file://%{PKGLIB}/csw_cpan.gspec -%copyright url file://%{WORKSRC}/LICENSE Deleted: csw/mgar/pkg/cpan/XML-LibXML/trunk/files/CSWpmxmllibxml.prototype =================================================================== --- csw/mgar/pkg/cpan/XML-LibXML/trunk/files/CSWpmxmllibxml.prototype 2010-01-31 12:11:05 UTC (rev 8259) +++ csw/mgar/pkg/cpan/XML-LibXML/trunk/files/CSWpmxmllibxml.prototype 2010-01-31 12:49:30 UTC (rev 8260) @@ -1,61 +0,0 @@ -d none /opt/csw/lib 0755 root bin -d none /opt/csw/lib/perl 0755 root bin -d none /opt/csw/lib/perl/csw 0755 root bin -d none /opt/csw/lib/perl/csw/XML 0755 root bin -d none /opt/csw/lib/perl/csw/XML/LibXML 0755 root bin -f none /opt/csw/lib/perl/csw/XML/LibXML.pm 0444 root bin -f none /opt/csw/lib/perl/csw/XML/LibXML.pod 0444 root bin -f none /opt/csw/lib/perl/csw/XML/LibXML/Attr.pod 0444 root bin -f none /opt/csw/lib/perl/csw/XML/LibXML/Boolean.pm 0444 root bin -f none /opt/csw/lib/perl/csw/XML/LibXML/CDATASection.pod 0444 root bin -f none /opt/csw/lib/perl/csw/XML/LibXML/Comment.pod 0444 root bin -f none /opt/csw/lib/perl/csw/XML/LibXML/DOM.pod 0444 root bin -f none /opt/csw/lib/perl/csw/XML/LibXML/Document.pod 0444 root bin -f none /opt/csw/lib/perl/csw/XML/LibXML/DocumentFragment.pod 0444 root bin -f none /opt/csw/lib/perl/csw/XML/LibXML/Dtd.pod 0444 root bin -f none /opt/csw/lib/perl/csw/XML/LibXML/Element.pod 0444 root bin -f none /opt/csw/lib/perl/csw/XML/LibXML/Literal.pm 0444 root bin -f none /opt/csw/lib/perl/csw/XML/LibXML/Namespace.pod 0444 root bin -f none /opt/csw/lib/perl/csw/XML/LibXML/Node.pod 0444 root bin -f none /opt/csw/lib/perl/csw/XML/LibXML/NodeList.pm 0444 root bin -f none /opt/csw/lib/perl/csw/XML/LibXML/Number.pm 0444 root bin -f none /opt/csw/lib/perl/csw/XML/LibXML/PI.pod 0444 root bin -f none /opt/csw/lib/perl/csw/XML/LibXML/Parser.pod 0444 root bin -f none /opt/csw/lib/perl/csw/XML/LibXML/SAX.pm 0444 root bin -f none /opt/csw/lib/perl/csw/XML/LibXML/SAX.pod 0444 root bin -d none /opt/csw/lib/perl/csw/XML/LibXML/SAX 0755 root bin -f none /opt/csw/lib/perl/csw/XML/LibXML/SAX/Builder.pm 0444 root bin -f none /opt/csw/lib/perl/csw/XML/LibXML/SAX/Builder.pod 0444 root bin -f none /opt/csw/lib/perl/csw/XML/LibXML/SAX/Generator.pm 0444 root bin -f none /opt/csw/lib/perl/csw/XML/LibXML/SAX/Parser.pm 0444 root bin -f none /opt/csw/lib/perl/csw/XML/LibXML/Text.pod 0444 root bin -d none /opt/csw/lib/perl/csw/auto 0755 root bin -d none /opt/csw/lib/perl/csw/auto/XML 0755 root bin -d none /opt/csw/lib/perl/csw/auto/XML/LibXML 0755 root bin -f none /opt/csw/lib/perl/csw/auto/XML/LibXML/.packlist 0444 root bin -f none /opt/csw/lib/perl/csw/auto/XML/LibXML/LibXML.bs 0444 root bin -f none /opt/csw/lib/perl/csw/auto/XML/LibXML/LibXML.so 0555 root bin -d none /opt/csw/share 0755 root bin -d none /opt/csw/share/man 0755 root bin -d none /opt/csw/share/man/man3 0755 root bin -f none /opt/csw/share/man/man3/XML::LibXML.3perl 0444 root bin -f none /opt/csw/share/man/man3/XML::LibXML::Attr.3perl 0444 root bin -f none /opt/csw/share/man/man3/XML::LibXML::Boolean.3perl 0444 root bin -f none /opt/csw/share/man/man3/XML::LibXML::CDATASection.3perl 0444 root bin -f none /opt/csw/share/man/man3/XML::LibXML::Comment.3perl 0444 root bin -f none /opt/csw/share/man/man3/XML::LibXML::DOM.3perl 0444 root bin -f none /opt/csw/share/man/man3/XML::LibXML::Document.3perl 0444 root bin -f none /opt/csw/share/man/man3/XML::LibXML::DocumentFragment.3perl 0444 root bin -f none /opt/csw/share/man/man3/XML::LibXML::Dtd.3perl 0444 root bin -f none /opt/csw/share/man/man3/XML::LibXML::Element.3perl 0444 root bin -f none /opt/csw/share/man/man3/XML::LibXML::Literal.3perl 0444 root bin -f none /opt/csw/share/man/man3/XML::LibXML::Namespace.3perl 0444 root bin -f none /opt/csw/share/man/man3/XML::LibXML::Node.3perl 0444 root bin -f none /opt/csw/share/man/man3/XML::LibXML::NodeList.3perl 0444 root bin -f none /opt/csw/share/man/man3/XML::LibXML::Number.3perl 0444 root bin -f none /opt/csw/share/man/man3/XML::LibXML::PI.3perl 0444 root bin -f none /opt/csw/share/man/man3/XML::LibXML::Parser.3perl 0444 root bin -f none /opt/csw/share/man/man3/XML::LibXML::SAX.3perl 0444 root bin -f none /opt/csw/share/man/man3/XML::LibXML::SAX::Builder.3perl 0444 root bin -f none /opt/csw/share/man/man3/XML::LibXML::SAX::Generator.3perl 0444 root bin -f none /opt/csw/share/man/man3/XML::LibXML::Text.3perl 0444 root bin This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bensons at users.sourceforge.net Sun Jan 31 13:56:06 2010 From: bensons at users.sourceforge.net (bensons at users.sourceforge.net) Date: Sun, 31 Jan 2010 12:56:06 +0000 Subject: [csw-devel] SF.net SVN: gar:[8261] csw/mgar/pkg/cpan/XML-LibXML/trunk/Makefile Message-ID: Revision: 8261 http://gar.svn.sourceforge.net/gar/?rev=8261&view=rev Author: bensons Date: 2010-01-31 12:56:06 +0000 (Sun, 31 Jan 2010) Log Message: ----------- cpan XML-LibXML: added libxml2 dependency Modified Paths: -------------- csw/mgar/pkg/cpan/XML-LibXML/trunk/Makefile Modified: csw/mgar/pkg/cpan/XML-LibXML/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/XML-LibXML/trunk/Makefile 2010-01-31 12:49:30 UTC (rev 8260) +++ csw/mgar/pkg/cpan/XML-LibXML/trunk/Makefile 2010-01-31 12:56:06 UTC (rev 8261) @@ -19,8 +19,8 @@ SPKG_DESC_CSWpmxmllibxmlcom = Constants and Character Encoding Routines PKGFILES_CSWpmxmllibxmlcom = this-is-just-an-empty-stub -PREREQUISITE_PKGS = CSWpmxmlnssupp CSWpmxmlsax -REQUIRED_PKGS = CSWpmxmlnssupp CSWpmxmlsax +PREREQUISITE_PKGS = CSWpmxmlnssupp CSWpmxmlsax CSWlibxml2 +REQUIRED_PKGS = CSWpmxmlnssupp CSWpmxmlsax CSWlibxml2 CONFIGURE_ENV += SKIP_SAX_INSTALL=1 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bensons at users.sourceforge.net Sun Jan 31 13:57:54 2010 From: bensons at users.sourceforge.net (bensons at users.sourceforge.net) Date: Sun, 31 Jan 2010 12:57:54 +0000 Subject: [csw-devel] SF.net SVN: gar:[8262] csw/mgar/pkg/cpan/XML-LibXML/trunk/Makefile Message-ID: Revision: 8262 http://gar.svn.sourceforge.net/gar/?rev=8262&view=rev Author: bensons Date: 2010-01-31 12:57:53 +0000 (Sun, 31 Jan 2010) Log Message: ----------- cpan XML-LibXML: added libxml2 devel dependency Modified Paths: -------------- csw/mgar/pkg/cpan/XML-LibXML/trunk/Makefile Modified: csw/mgar/pkg/cpan/XML-LibXML/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/XML-LibXML/trunk/Makefile 2010-01-31 12:56:06 UTC (rev 8261) +++ csw/mgar/pkg/cpan/XML-LibXML/trunk/Makefile 2010-01-31 12:57:53 UTC (rev 8262) @@ -19,8 +19,8 @@ SPKG_DESC_CSWpmxmllibxmlcom = Constants and Character Encoding Routines PKGFILES_CSWpmxmllibxmlcom = this-is-just-an-empty-stub -PREREQUISITE_PKGS = CSWpmxmlnssupp CSWpmxmlsax CSWlibxml2 -REQUIRED_PKGS = CSWpmxmlnssupp CSWpmxmlsax CSWlibxml2 +PREREQUISITE_PKGS = CSWpmxmlnssupp CSWpmxmlsax CSWlibxml2 CSWlibxml2devel +REQUIRED_PKGS = CSWpmxmlnssupp CSWpmxmlsax CSWlibxml2 CSWlibxml2devel CONFIGURE_ENV += SKIP_SAX_INSTALL=1 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bensons at users.sourceforge.net Sun Jan 31 14:50:48 2010 From: bensons at users.sourceforge.net (bensons at users.sourceforge.net) Date: Sun, 31 Jan 2010 13:50:48 +0000 Subject: [csw-devel] SF.net SVN: gar:[8263] csw/mgar/pkg/cpan/YAML-Syck/trunk Message-ID: Revision: 8263 http://gar.svn.sourceforge.net/gar/?rev=8263&view=rev Author: bensons Date: 2010-01-31 13:50:40 +0000 (Sun, 31 Jan 2010) Log Message: ----------- cpan YAML-Syck: removed ARCHALL Modified Paths: -------------- csw/mgar/pkg/cpan/YAML-Syck/trunk/Makefile Removed Paths: ------------- csw/mgar/pkg/cpan/YAML-Syck/trunk/files/CSWpmyamlsyck.gspec csw/mgar/pkg/cpan/YAML-Syck/trunk/files/CSWpmyamlsyck.prototype Modified: csw/mgar/pkg/cpan/YAML-Syck/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/YAML-Syck/trunk/Makefile 2010-01-31 12:57:53 UTC (rev 8262) +++ csw/mgar/pkg/cpan/YAML-Syck/trunk/Makefile 2010-01-31 13:50:40 UTC (rev 8263) @@ -13,6 +13,4 @@ PACKAGES = CSWpmyamlsyck CATALOGNAME = pm_yamlsyck -ARCHALL = 1 - include gar/category.mk Deleted: csw/mgar/pkg/cpan/YAML-Syck/trunk/files/CSWpmyamlsyck.gspec =================================================================== --- csw/mgar/pkg/cpan/YAML-Syck/trunk/files/CSWpmyamlsyck.gspec 2010-01-31 12:57:53 UTC (rev 8262) +++ csw/mgar/pkg/cpan/YAML-Syck/trunk/files/CSWpmyamlsyck.gspec 2010-01-31 13:50:40 UTC (rev 8263) @@ -1,11 +0,0 @@ -%var bitname pm_yamlsyck -%var pkgname CSWpmyamlsyck -%include url file://%{PKGLIB}/csw_cpan.gspec -%copyright -Copyright 2005, 2006, 2007 by Audrey Tang . - -This software is released under the MIT license cited below. - -The libsyck code bundled with this library is released by -"why the lucky stiff", under a BSD-style license. See the COPYING -file for details. Deleted: csw/mgar/pkg/cpan/YAML-Syck/trunk/files/CSWpmyamlsyck.prototype =================================================================== --- csw/mgar/pkg/cpan/YAML-Syck/trunk/files/CSWpmyamlsyck.prototype 2010-01-31 12:57:53 UTC (rev 8262) +++ csw/mgar/pkg/cpan/YAML-Syck/trunk/files/CSWpmyamlsyck.prototype 2010-01-31 13:50:40 UTC (rev 8263) @@ -1,23 +0,0 @@ -d none /opt/csw/lib 0755 root bin -d none /opt/csw/lib/perl 0755 root bin -d none /opt/csw/lib/perl/csw 0755 root bin -d none /opt/csw/lib/perl/csw/JSON 0755 root bin -f none /opt/csw/lib/perl/csw/JSON/Syck.pm 0444 root bin -d none /opt/csw/lib/perl/csw/YAML 0755 root bin -d none /opt/csw/lib/perl/csw/YAML/Dumper 0755 root bin -f none /opt/csw/lib/perl/csw/YAML/Dumper/Syck.pm 0444 root bin -d none /opt/csw/lib/perl/csw/YAML/Loader 0755 root bin -f none /opt/csw/lib/perl/csw/YAML/Loader/Syck.pm 0444 root bin -f none /opt/csw/lib/perl/csw/YAML/Syck.pm 0444 root bin -f none /opt/csw/lib/perl/csw/YAML/Syck.pod 0444 root bin -d none /opt/csw/lib/perl/csw/auto 0755 root bin -d none /opt/csw/lib/perl/csw/auto/YAML 0755 root bin -d none /opt/csw/lib/perl/csw/auto/YAML/Syck 0755 root bin -f none /opt/csw/lib/perl/csw/auto/YAML/Syck/.packlist 0644 root bin -f none /opt/csw/lib/perl/csw/auto/YAML/Syck/Syck.bs 0444 root bin -f none /opt/csw/lib/perl/csw/auto/YAML/Syck/Syck.so 0555 root bin -d none /opt/csw/share 0755 root bin -d none /opt/csw/share/man 0755 root bin -d none /opt/csw/share/man/man3 0755 root bin -f none /opt/csw/share/man/man3/JSON::Syck.3perl 0444 root bin -f none /opt/csw/share/man/man3/YAML::Syck.3perl 0444 root bin This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bensons at users.sourceforge.net Sun Jan 31 15:00:24 2010 From: bensons at users.sourceforge.net (bensons at users.sourceforge.net) Date: Sun, 31 Jan 2010 14:00:24 +0000 Subject: [csw-devel] SF.net SVN: gar:[8264] csw/mgar/pkg/cpan/Text-CSV_XS/trunk Message-ID: Revision: 8264 http://gar.svn.sourceforge.net/gar/?rev=8264&view=rev Author: bensons Date: 2010-01-31 14:00:24 +0000 (Sun, 31 Jan 2010) Log Message: ----------- cpan Test-CSV_XS: updated to version 0.70 Modified Paths: -------------- csw/mgar/pkg/cpan/Text-CSV_XS/trunk/Makefile csw/mgar/pkg/cpan/Text-CSV_XS/trunk/checksums Modified: csw/mgar/pkg/cpan/Text-CSV_XS/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/Text-CSV_XS/trunk/Makefile 2010-01-31 13:50:40 UTC (rev 8263) +++ csw/mgar/pkg/cpan/Text-CSV_XS/trunk/Makefile 2010-01-31 14:00:24 UTC (rev 8264) @@ -1,5 +1,5 @@ GARNAME = Text-CSV_XS -GARVERSION = 0.69 +GARVERSION = 0.70 CATEGORIES = cpan AUTHOR = HMBRAND Modified: csw/mgar/pkg/cpan/Text-CSV_XS/trunk/checksums =================================================================== --- csw/mgar/pkg/cpan/Text-CSV_XS/trunk/checksums 2010-01-31 13:50:40 UTC (rev 8263) +++ csw/mgar/pkg/cpan/Text-CSV_XS/trunk/checksums 2010-01-31 14:00:24 UTC (rev 8264) @@ -1 +1 @@ -8788c57a50704265e35171746473b404 Text-CSV_XS-0.69.tgz +93b7d88ddd8b8f616efcf75239b68290 Text-CSV_XS-0.70.tgz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bensons at users.sourceforge.net Sun Jan 31 16:59:13 2010 From: bensons at users.sourceforge.net (bensons at users.sourceforge.net) Date: Sun, 31 Jan 2010 15:59:13 +0000 Subject: [csw-devel] SF.net SVN: gar:[8265] csw/mgar/pkg/cpan/TermReadKey/trunk Message-ID: Revision: 8265 http://gar.svn.sourceforge.net/gar/?rev=8265&view=rev Author: bensons Date: 2010-01-31 15:59:13 +0000 (Sun, 31 Jan 2010) Log Message: ----------- cpan TermReadKey: take over ownership Modified Paths: -------------- csw/mgar/pkg/cpan/TermReadKey/trunk/Makefile csw/mgar/pkg/cpan/TermReadKey/trunk/checksums Removed Paths: ------------- csw/mgar/pkg/cpan/TermReadKey/trunk/files/CSWpmtermreadkey.depend csw/mgar/pkg/cpan/TermReadKey/trunk/files/CSWpmtermreadkey.gspec csw/mgar/pkg/cpan/TermReadKey/trunk/files/CSWpmtermreadkey.prototype Modified: csw/mgar/pkg/cpan/TermReadKey/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/TermReadKey/trunk/Makefile 2010-01-31 14:00:24 UTC (rev 8264) +++ csw/mgar/pkg/cpan/TermReadKey/trunk/Makefile 2010-01-31 15:59:13 UTC (rev 8265) @@ -13,8 +13,9 @@ Term::ReadKey" on any architecture and have a good likelyhood of it working. endef -DISTFILES = $(call admfiles,CSWpmtermreadkey,depend prototype) +PACKAGES = CSWpmtermreadkey +CATALOGNAME = pm_termreadkey -DEPENDS += lib/ncurses +REQUIRED_PKGS = CSWncurses include gar/category.mk Modified: csw/mgar/pkg/cpan/TermReadKey/trunk/checksums =================================================================== --- csw/mgar/pkg/cpan/TermReadKey/trunk/checksums 2010-01-31 14:00:24 UTC (rev 8264) +++ csw/mgar/pkg/cpan/TermReadKey/trunk/checksums 2010-01-31 15:59:13 UTC (rev 8265) @@ -1,4 +1 @@ -d9a9f9e5b64f233897f13bf2235253e0 download/CSWpmtermreadkey.gspec -882cfc02f0fd6a7892b45bc34a8a9755 download/CSWpmtermreadkey.depend -7e16beb6b7105fd249314576d9c0ca28 download/CSWpmtermreadkey.prototype -f0ef2cea8acfbcc58d865c05b0c7e1ff download/TermReadKey-2.30.tar.gz +f0ef2cea8acfbcc58d865c05b0c7e1ff TermReadKey-2.30.tar.gz Deleted: csw/mgar/pkg/cpan/TermReadKey/trunk/files/CSWpmtermreadkey.gspec =================================================================== --- csw/mgar/pkg/cpan/TermReadKey/trunk/files/CSWpmtermreadkey.gspec 2010-01-31 14:00:24 UTC (rev 8264) +++ csw/mgar/pkg/cpan/TermReadKey/trunk/files/CSWpmtermreadkey.gspec 2010-01-31 15:59:13 UTC (rev 8265) @@ -1,9 +0,0 @@ -%var bitname pm_termreadkey -%var pkgname CSWpmtermreadkey -%include url file://%{PKGLIB}/csw_cpan.gspec -%copyright -Copyright (C) 1994-1999 Kenneth Albanowski. - 2001,2002 Jonathan Stowe - -Unlimited distribution and/or modification is allowed as long as this -copyright notice remains intact. Deleted: csw/mgar/pkg/cpan/TermReadKey/trunk/files/CSWpmtermreadkey.prototype =================================================================== --- csw/mgar/pkg/cpan/TermReadKey/trunk/files/CSWpmtermreadkey.prototype 2010-01-31 14:00:24 UTC (rev 8264) +++ csw/mgar/pkg/cpan/TermReadKey/trunk/files/CSWpmtermreadkey.prototype 2010-01-31 15:59:13 UTC (rev 8265) @@ -1,16 +0,0 @@ -d none /opt/csw/lib 0755 root bin -d none /opt/csw/lib/perl 0755 root bin -d none /opt/csw/lib/perl/csw 0755 root bin -d none /opt/csw/lib/perl/csw/Term 0755 root bin -f none /opt/csw/lib/perl/csw/Term/ReadKey.pm 0444 root bin -d none /opt/csw/lib/perl/csw/auto 0755 root bin -d none /opt/csw/lib/perl/csw/auto/Term 0755 root bin -d none /opt/csw/lib/perl/csw/auto/Term/ReadKey 0755 root bin -f none /opt/csw/lib/perl/csw/auto/Term/ReadKey/.packlist 0644 root bin -f none /opt/csw/lib/perl/csw/auto/Term/ReadKey/ReadKey.bs 0444 root bin -f none /opt/csw/lib/perl/csw/auto/Term/ReadKey/ReadKey.so 0555 root bin -f none /opt/csw/lib/perl/csw/auto/Term/ReadKey/autosplit.ix 0444 root bin -d none /opt/csw/share 0755 root bin -d none /opt/csw/share/man 0755 root bin -d none /opt/csw/share/man/man3 0755 root bin -f none /opt/csw/share/man/man3/Term::ReadKey.3perl 0444 root bin This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Sun Jan 31 17:00:32 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Sun, 31 Jan 2010 16:00:32 +0000 Subject: [csw-devel] SF.net SVN: gar:[8266] csw/mgar/pkg/cpan/Params-Validate/trunk Message-ID: Revision: 8266 http://gar.svn.sourceforge.net/gar/?rev=8266&view=rev Author: dmichelsen Date: 2010-01-31 16:00:32 +0000 (Sun, 31 Jan 2010) Log Message: ----------- cpan/Params-Validate: Rebuild against 5.10.1 and update to 0.94 Modified Paths: -------------- csw/mgar/pkg/cpan/Params-Validate/trunk/Makefile csw/mgar/pkg/cpan/Params-Validate/trunk/checksums Modified: csw/mgar/pkg/cpan/Params-Validate/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/Params-Validate/trunk/Makefile 2010-01-31 15:59:13 UTC (rev 8265) +++ csw/mgar/pkg/cpan/Params-Validate/trunk/Makefile 2010-01-31 16:00:32 UTC (rev 8266) @@ -1,9 +1,9 @@ GARNAME = Params-Validate -GARVERSION = 0.91 +GARVERSION = 0.94 CATEGORIES = cpan AUTHOR = DROLSKY -DESCRIPTION = validate method/function parameters +DESCRIPTION = $(GARNAME): validate method/function parameters define BLURB The Params::Validate module allows you to validate method or function call parameters to an arbitrary level of specificity. At the simplest level, it @@ -14,6 +14,11 @@ PACKAGES = CSWpmparamsvalidate CATALOGNAME = pm_paramsvalidate +CONFIGURE_SCRIPTS = $(WORKSRC)/Build.PL +BUILD_SCRIPTS = $(WORKSRC)/Build +TEST_SCRIPTS = $(WORKSRC)/Build +INSTALL_SCRIPTS = $(WORKSRC)/Build + include gar/category.mk LICENSE = LICENSE Modified: csw/mgar/pkg/cpan/Params-Validate/trunk/checksums =================================================================== --- csw/mgar/pkg/cpan/Params-Validate/trunk/checksums 2010-01-31 15:59:13 UTC (rev 8265) +++ csw/mgar/pkg/cpan/Params-Validate/trunk/checksums 2010-01-31 16:00:32 UTC (rev 8266) @@ -1,2 +1 @@ -f8671bcadff01e84ffb7ed4ccea6f5fd download/CSWpmprmsvldt.gspec -22c5467a1d4673374a1b7b2dbcfd473e download/Params-Validate-0.91.tar.gz +86da1b8ad762063913f454f81b42a816 Params-Validate-0.94.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bensons at users.sourceforge.net Sun Jan 31 17:13:58 2010 From: bensons at users.sourceforge.net (bensons at users.sourceforge.net) Date: Sun, 31 Jan 2010 16:13:58 +0000 Subject: [csw-devel] SF.net SVN: gar:[8267] csw/mgar/pkg/cpan Message-ID: Revision: 8267 http://gar.svn.sourceforge.net/gar/?rev=8267&view=rev Author: bensons Date: 2010-01-31 16:13:58 +0000 (Sun, 31 Jan 2010) Log Message: ----------- cpan String-Approx: initial GAR recipt Added Paths: ----------- csw/mgar/pkg/cpan/String-Approx/ csw/mgar/pkg/cpan/String-Approx/branches/ csw/mgar/pkg/cpan/String-Approx/tags/ csw/mgar/pkg/cpan/String-Approx/trunk/ csw/mgar/pkg/cpan/String-Approx/trunk/Makefile csw/mgar/pkg/cpan/String-Approx/trunk/checksums csw/mgar/pkg/cpan/String-Approx/trunk/files/ Property changes on: csw/mgar/pkg/cpan/String-Approx/trunk ___________________________________________________________________ Added: svn:ignore + cookies download work Added: svn:externals + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 Added: csw/mgar/pkg/cpan/String-Approx/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/String-Approx/trunk/Makefile (rev 0) +++ csw/mgar/pkg/cpan/String-Approx/trunk/Makefile 2010-01-31 16:13:58 UTC (rev 8267) @@ -0,0 +1,17 @@ +GARNAME = String-Approx +GARVERSION = 3.26 +CATEGORIES = cpan +AUTHOR = JHI + +DESCRIPTION = Approximate matching (fuzzy matching) +define BLURB + String::Approx lets you match and substitute strings approximately. + With this you can emulate errors: typing errorrs, speling errors, + closely related vocabularies (colour color), genetic mutations (GAG ACT), + abbreviations (McScot, MacScot). +endef + +PACKAGES = CSWpmstringapprox +CATALOGNAME = pm_stringapprox + +include gar/category.mk Added: csw/mgar/pkg/cpan/String-Approx/trunk/checksums =================================================================== --- csw/mgar/pkg/cpan/String-Approx/trunk/checksums (rev 0) +++ csw/mgar/pkg/cpan/String-Approx/trunk/checksums 2010-01-31 16:13:58 UTC (rev 8267) @@ -0,0 +1 @@ +fc14d72986431025125d4970dd6b7f88 String-Approx-3.26.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bensons at users.sourceforge.net Sun Jan 31 17:21:49 2010 From: bensons at users.sourceforge.net (bensons at users.sourceforge.net) Date: Sun, 31 Jan 2010 16:21:49 +0000 Subject: [csw-devel] SF.net SVN: gar:[8268] csw/mgar/pkg/cpan Message-ID: Revision: 8268 http://gar.svn.sourceforge.net/gar/?rev=8268&view=rev Author: bensons Date: 2010-01-31 16:21:49 +0000 (Sun, 31 Jan 2010) Log Message: ----------- cpan Socket6: inital GAR recipe Added Paths: ----------- csw/mgar/pkg/cpan/Socket6/ csw/mgar/pkg/cpan/Socket6/branches/ csw/mgar/pkg/cpan/Socket6/tags/ csw/mgar/pkg/cpan/Socket6/trunk/ csw/mgar/pkg/cpan/Socket6/trunk/Makefile csw/mgar/pkg/cpan/Socket6/trunk/checksums csw/mgar/pkg/cpan/Socket6/trunk/files/ Property changes on: csw/mgar/pkg/cpan/Socket6/trunk ___________________________________________________________________ Added: svn:ignore + cookies download work Added: svn:externals + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 Added: csw/mgar/pkg/cpan/Socket6/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/Socket6/trunk/Makefile (rev 0) +++ csw/mgar/pkg/cpan/Socket6/trunk/Makefile 2010-01-31 16:21:49 UTC (rev 8268) @@ -0,0 +1,16 @@ +GARNAME = Socket6 +GARVERSION = 0.23 +CATEGORIES = cpan +AUTHOR = UMEMOTO + +DESCRIPTION = IPv6 related part of the C socket.h defines and structure manipulators +define BLURB + This module provides glue routines to the various IPv6 functions. + If you use the Socket6 module, be sure to specify "use Socket" as well + as "use Socket6". +endef + +PACKAGES = CSWpmsocket6 +CATALOGNAME = pm_socket6 + +include gar/category.mk Added: csw/mgar/pkg/cpan/Socket6/trunk/checksums =================================================================== --- csw/mgar/pkg/cpan/Socket6/trunk/checksums (rev 0) +++ csw/mgar/pkg/cpan/Socket6/trunk/checksums 2010-01-31 16:21:49 UTC (rev 8268) @@ -0,0 +1 @@ +2c02adb13c449d48d232bb704ddbd492 Socket6-0.23.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bensons at users.sourceforge.net Sun Jan 31 18:01:30 2010 From: bensons at users.sourceforge.net (bensons at users.sourceforge.net) Date: Sun, 31 Jan 2010 17:01:30 +0000 Subject: [csw-devel] SF.net SVN: gar:[8269] csw/mgar/pkg/cpan/Shout/trunk/Makefile Message-ID: Revision: 8269 http://gar.svn.sourceforge.net/gar/?rev=8269&view=rev Author: bensons Date: 2010-01-31 17:01:29 +0000 (Sun, 31 Jan 2010) Log Message: ----------- cpan Shout: added dependecy Modified Paths: -------------- csw/mgar/pkg/cpan/Shout/trunk/Makefile Modified: csw/mgar/pkg/cpan/Shout/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/Shout/trunk/Makefile 2010-01-31 16:21:49 UTC (rev 8268) +++ csw/mgar/pkg/cpan/Shout/trunk/Makefile 2010-01-31 17:01:29 UTC (rev 8269) @@ -10,7 +10,7 @@ MASTER_SITES = http://downloads.us.xiph.org/releases/libshout/ DISTFILES = $(DISTNAME).tar.gz -REQUIRED_PKGS = CSWlibogg CSWlibshout CSWspeex CSWtheora CSWvorbis +REQUIRED_PKGS = CSWlibogg CSWlibshout CSWspeex CSWtheora CSWvorbis CSWpkgconfig PREREQUISITE_PKGS = $(REQUIRED_PKGS) PACKAGES = CSWpmshout This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From hson at users.sourceforge.net Sun Jan 31 18:14:11 2010 From: hson at users.sourceforge.net (hson at users.sourceforge.net) Date: Sun, 31 Jan 2010 17:14:11 +0000 Subject: [csw-devel] SF.net SVN: gar:[8270] csw/mgar/pkg/libfpx/Makefile Message-ID: Revision: 8270 http://gar.svn.sourceforge.net/gar/?rev=8270&view=rev Author: hson Date: 2010-01-31 17:14:11 +0000 (Sun, 31 Jan 2010) Log Message: ----------- libfpx: Add intermediate makefile Added Paths: ----------- csw/mgar/pkg/libfpx/Makefile Added: csw/mgar/pkg/libfpx/Makefile =================================================================== --- csw/mgar/pkg/libfpx/Makefile (rev 0) +++ csw/mgar/pkg/libfpx/Makefile 2010-01-31 17:14:11 UTC (rev 8270) @@ -0,0 +1,15 @@ +# vim: ft=make ts=4 sw=4 noet + +default: + @echo "You are in the pkg/ directory." + +%: + $(MAKE) -C trunk $* + +paranoid-%: + $(MAKE) -C trunk $* || exit 2 + +export BUILDLOG ?= $(shell pwd)/buildlog.txt + +report-%: + $(MAKE) -C trunk $* || echo " *** make $* in $$i failed ***" >> $(BUILDLOG) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bensons at users.sourceforge.net Sun Jan 31 18:17:20 2010 From: bensons at users.sourceforge.net (bensons at users.sourceforge.net) Date: Sun, 31 Jan 2010 17:17:20 +0000 Subject: [csw-devel] SF.net SVN: gar:[8271] csw/mgar/pkg/cpan/Proc-ProcessTable/trunk Message-ID: Revision: 8271 http://gar.svn.sourceforge.net/gar/?rev=8271&view=rev Author: bensons Date: 2010-01-31 17:17:20 +0000 (Sun, 31 Jan 2010) Log Message: ----------- cpan Proc-ProcessTable: updated to version 0.45 Modified Paths: -------------- csw/mgar/pkg/cpan/Proc-ProcessTable/trunk/Makefile csw/mgar/pkg/cpan/Proc-ProcessTable/trunk/checksums Removed Paths: ------------- csw/mgar/pkg/cpan/Proc-ProcessTable/trunk/files/CSWpmproctbl.gspec csw/mgar/pkg/cpan/Proc-ProcessTable/trunk/files/CSWpmproctbl.prototype Modified: csw/mgar/pkg/cpan/Proc-ProcessTable/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/Proc-ProcessTable/trunk/Makefile 2010-01-31 17:14:11 UTC (rev 8270) +++ csw/mgar/pkg/cpan/Proc-ProcessTable/trunk/Makefile 2010-01-31 17:17:20 UTC (rev 8271) @@ -1,5 +1,5 @@ GARNAME = Proc-ProcessTable -GARVERSION = 0.41 +GARVERSION = 0.45 CATEGORIES = cpan AUTHOR = DURIST @@ -8,6 +8,7 @@ Perl interface to the unix process table. endef -DISTFILES += $(call admfiles,CSWpmproctbl,prototype) +PACKAGES = CSWpmproctbl +CATALOGNAME = pm_proctbl include gar/category.mk Modified: csw/mgar/pkg/cpan/Proc-ProcessTable/trunk/checksums =================================================================== --- csw/mgar/pkg/cpan/Proc-ProcessTable/trunk/checksums 2010-01-31 17:14:11 UTC (rev 8270) +++ csw/mgar/pkg/cpan/Proc-ProcessTable/trunk/checksums 2010-01-31 17:17:20 UTC (rev 8271) @@ -1,3 +1 @@ -d1b2b412a914d18e4248d35dcc755340 download/CSWpmproctbl.gspec -bf68c61dadf2988816c532f5d75b30e9 download/CSWpmproctbl.prototype -3a21e54f864733331e714df6d1fcbb0f download/Proc-ProcessTable-0.41.tar.gz +4481495d639c314f57e6d9d25f23c88e Proc-ProcessTable-0.45.tar.gz Deleted: csw/mgar/pkg/cpan/Proc-ProcessTable/trunk/files/CSWpmproctbl.gspec =================================================================== --- csw/mgar/pkg/cpan/Proc-ProcessTable/trunk/files/CSWpmproctbl.gspec 2010-01-31 17:14:11 UTC (rev 8270) +++ csw/mgar/pkg/cpan/Proc-ProcessTable/trunk/files/CSWpmproctbl.gspec 2010-01-31 17:17:20 UTC (rev 8271) @@ -1,7 +0,0 @@ -%var bitname pm_procprocesstbl -%var pkgname CSWpmproctbl -%include url file://%{PKGLIB}/csw_cpan.gspec -%copyright -Copyright (c) 1998-2003 Daniel J. Urist. All rights reserved. -This package is free software; you can redistribute it and/or modify -it under the same terms as Perl itself. Deleted: csw/mgar/pkg/cpan/Proc-ProcessTable/trunk/files/CSWpmproctbl.prototype =================================================================== --- csw/mgar/pkg/cpan/Proc-ProcessTable/trunk/files/CSWpmproctbl.prototype 2010-01-31 17:14:11 UTC (rev 8270) +++ csw/mgar/pkg/cpan/Proc-ProcessTable/trunk/files/CSWpmproctbl.prototype 2010-01-31 17:17:20 UTC (rev 8271) @@ -1,25 +0,0 @@ -d none /opt/csw/lib 0755 root bin -d none /opt/csw/lib/perl 0755 root bin -d none /opt/csw/lib/perl/csw 0755 root bin -d none /opt/csw/lib/perl/csw/Proc 0755 root bin -f none /opt/csw/lib/perl/csw/Proc/Killall.pm 0444 root bin -f none /opt/csw/lib/perl/csw/Proc/Killfam.pm 0444 root bin -d none /opt/csw/lib/perl/csw/Proc/ProcessTable 0755 root bin -f none /opt/csw/lib/perl/csw/Proc/ProcessTable.pm 0444 root bin -f none /opt/csw/lib/perl/csw/Proc/ProcessTable/Process.pm 0444 root bin -f none /opt/csw/lib/perl/csw/Proc/example.pl 0555 root bin -d none /opt/csw/lib/perl/csw/auto 0755 root bin -d none /opt/csw/lib/perl/csw/auto/Proc 0755 root bin -d none /opt/csw/lib/perl/csw/auto/Proc/ProcessTable 0755 root bin -f none /opt/csw/lib/perl/csw/auto/Proc/ProcessTable/.packlist 0644 root bin -d none /opt/csw/lib/perl/csw/auto/Proc/ProcessTable/Process 0755 root bin -f none /opt/csw/lib/perl/csw/auto/Proc/ProcessTable/Process/autosplit.ix 0444 root bin -f none /opt/csw/lib/perl/csw/auto/Proc/ProcessTable/ProcessTable.bs 0444 root bin -f none /opt/csw/lib/perl/csw/auto/Proc/ProcessTable/ProcessTable.so 0555 root bin -d none /opt/csw/share 0755 root bin -d none /opt/csw/share/man 0755 root bin -d none /opt/csw/share/man/man3 0755 root bin -f none /opt/csw/share/man/man3/Proc::Killall.3perl 0444 root bin -f none /opt/csw/share/man/man3/Proc::Killfam.3perl 0444 root bin -f none /opt/csw/share/man/man3/Proc::ProcessTable.3perl 0444 root bin -f none /opt/csw/share/man/man3/Proc::ProcessTable::Process.3perl 0444 root bin This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bensons at users.sourceforge.net Sun Jan 31 18:45:49 2010 From: bensons at users.sourceforge.net (bensons at users.sourceforge.net) Date: Sun, 31 Jan 2010 17:45:49 +0000 Subject: [csw-devel] SF.net SVN: gar:[8272] csw/mgar/pkg/cpan Message-ID: Revision: 8272 http://gar.svn.sourceforge.net/gar/?rev=8272&view=rev Author: bensons Date: 2010-01-31 17:45:49 +0000 (Sun, 31 Jan 2010) Log Message: ----------- cpan Scope-Guard: initial GAR recipe Added Paths: ----------- csw/mgar/pkg/cpan/Scope-Guard/ csw/mgar/pkg/cpan/Scope-Guard/branches/ csw/mgar/pkg/cpan/Scope-Guard/tags/ csw/mgar/pkg/cpan/Scope-Guard/trunk/ csw/mgar/pkg/cpan/Scope-Guard/trunk/Makefile csw/mgar/pkg/cpan/Scope-Guard/trunk/checksums csw/mgar/pkg/cpan/Scope-Guard/trunk/files/ Property changes on: csw/mgar/pkg/cpan/Scope-Guard/trunk ___________________________________________________________________ Added: svn:ignore + cookies download work Added: svn:externals + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 Added: csw/mgar/pkg/cpan/Scope-Guard/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/Scope-Guard/trunk/Makefile (rev 0) +++ csw/mgar/pkg/cpan/Scope-Guard/trunk/Makefile 2010-01-31 17:45:49 UTC (rev 8272) @@ -0,0 +1,20 @@ +GARNAME = Scope-Guard +GARVERSION = 0.03 +CATEGORIES = cpan +AUTHOR = CHOCOLATE + +DESCRIPTION = lexically scoped resource management +define BLURB + This module provides a convenient way to perform cleanup or other + forms of resource management at the end of a scope. It is particularly + useful when dealing with exceptions: the Scope::Guard constructor takes + a reference to a subroutine that is guaranteed to be called even if the + thread of execution is aborted prematurely. This effectively allows + lexically-scoped "promises" to be made that are automatically honoured + by perl's garbage collector. +endef + +PACKAGES = CSWpmscopeguard +CATALOGNAME = pm_scopeguard + +include gar/category.mk Added: csw/mgar/pkg/cpan/Scope-Guard/trunk/checksums =================================================================== --- csw/mgar/pkg/cpan/Scope-Guard/trunk/checksums (rev 0) +++ csw/mgar/pkg/cpan/Scope-Guard/trunk/checksums 2010-01-31 17:45:49 UTC (rev 8272) @@ -0,0 +1 @@ +a33ab0a31d837b94797e61050afff894 Scope-Guard-0.03.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Sun Jan 31 19:14:32 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sun, 31 Jan 2010 18:14:32 +0000 Subject: [csw-devel] SF.net SVN: gar:[8273] csw/mgar/gar/v2 Message-ID: Revision: 8273 http://gar.svn.sourceforge.net/gar/?rev=8273&view=rev Author: wahwah Date: 2010-01-31 18:14:31 +0000 (Sun, 31 Jan 2010) Log Message: ----------- mGAR v2: Added missing symbols check, modified the output to be slightly nicer. Modified Paths: -------------- csw/mgar/gar/v2/bin/checkpkg csw/mgar/gar/v2/bin/checkpkg.d/checkpkg-you-can-write-your-own.py csw/mgar/gar/v2/lib/python/checkpkg.py csw/mgar/gar/v2/lib/python/opencsw.py Added Paths: ----------- csw/mgar/gar/v2/bin/checkpkg.d/checkpkg-missing-symbols.py Modified: csw/mgar/gar/v2/bin/checkpkg =================================================================== --- csw/mgar/gar/v2/bin/checkpkg 2010-01-31 17:45:49 UTC (rev 8272) +++ csw/mgar/gar/v2/bin/checkpkg 2010-01-31 18:14:31 UTC (rev 8273) @@ -36,10 +36,12 @@ if [[ -t 1 ]]; then GREEN="\\033[0;32;40m" RED="\\033[1;31;40m" + BOLD="\\033[1m" COLOR_RESET="\\033[00m" else GREEN="" RED="" + BOLD="" COLOR_RESET="" fi @@ -591,13 +593,14 @@ plugin_base_name=`basename ${plugin}` plugin_log="${EXTRACTDIR}/${plugin_base_name}.log" log_files="${log_files} ${plugin_log}" - printf "TEST: ${plugin} running..." + plugin_name="`echo ${plugin} | sed -e 's+.*/checkpkg-++' | sed -e 's+\.py$++'`" + printf "TEST: ${BOLD}${plugin_name}${COLOR_RESET} running..." ${plugin} $extra_options -e "${EXTRACTDIR}" ${pkgnames} > "${plugin_log}" 2>&1 if [[ "$?" -ne 0 ]]; then - printf "\rTEST: ${plugin} ${RED}[FAIL]${COLOR_RESET} \\n" + printf "\rTEST: ${plugin_name} ${RED}[FAIL]${COLOR_RESET} \\n" test_suite_ok=0 else - printf "\rTEST: ${plugin} ${GREEN}[OK]${COLOR_RESET} \\n" + printf "\rTEST: ${plugin_name} ${GREEN}[OK]${COLOR_RESET} \\n" fi else debugmsg "'${plugin}' is not executable" @@ -607,7 +610,6 @@ debugmsg "plugin dir does not exist" fi -echo for log_file in ${log_files}; do if [[ -s "${log_file}" ]]; then debugmsg ">> LOG START: ${log_file}" @@ -617,7 +619,6 @@ debugmsg "-- LOG ${log_file} is empty" fi done -echo if [[ ${test_suite_ok} -ne 1 ]]; then errmsg "One or more modular tests have failed." Added: csw/mgar/gar/v2/bin/checkpkg.d/checkpkg-missing-symbols.py =================================================================== --- csw/mgar/gar/v2/bin/checkpkg.d/checkpkg-missing-symbols.py (rev 0) +++ csw/mgar/gar/v2/bin/checkpkg.d/checkpkg-missing-symbols.py 2010-01-31 18:14:31 UTC (rev 8273) @@ -0,0 +1,64 @@ +#!/opt/csw/bin/python2.6 +# $Id$ + +"""Check for missing symbols in binaries. + +http://sourceforge.net/tracker/?func=detail&aid=2939416&group_id=229205&atid=1075770 +""" + +import os.path +import re +import sys +import subprocess + +CHECKPKG_MODULE_NAME = "missing symbols" + +# The following bit of code sets the correct path to Python libraries +# distributed with GAR. +path_list = [os.path.dirname(__file__), + "..", "..", "lib", "python"] +sys.path.append(os.path.join(*path_list)) +import checkpkg + +# Defining checking functions. + +def CheckForMissingSymbols(pkg): + """Looks for "symbol not found" in ldd -r output.""" + errors = [] + binaries = pkg.ListBinaries() + symbol_re = re.compile(r"symbol not found:") + for binary in binaries: + # this could be potentially moved into the DirectoryFormatPackage class. + args = ["ldd", "-r", binary] + ldd_proc = subprocess.Popen( + args, + stdout=subprocess.PIPE, + stderr=subprocess.PIPE) + stdout, stderr = ldd_proc.communicate() + retcode = ldd_proc.wait() + lines = stdout.splitlines() + for line in lines: + if re.search(symbol_re, line): + errors.append(checkpkg.PackageError("%s: %s" % (pkg.pkgname, line))) + return errors + + +def main(): + options, args = checkpkg.GetOptions() + pkgnames = args + # CheckpkgManager class abstracts away things such as the collection of + # results. + check_manager = checkpkg.CheckpkgManager(CHECKPKG_MODULE_NAME, + options.extractdir, + pkgnames, + options.debug) + # Registering functions defined above. + check_manager.RegisterIndividualCheck(CheckForMissingSymbols) + # Running the checks, reporting and exiting. + exit_code, report = check_manager.Run() + print report.strip() + sys.exit(exit_code) + + +if __name__ == '__main__': + main() Property changes on: csw/mgar/gar/v2/bin/checkpkg.d/checkpkg-missing-symbols.py ___________________________________________________________________ Added: svn:executable + * Added: svn:keywords + Id Modified: csw/mgar/gar/v2/bin/checkpkg.d/checkpkg-you-can-write-your-own.py =================================================================== --- csw/mgar/gar/v2/bin/checkpkg.d/checkpkg-you-can-write-your-own.py 2010-01-31 17:45:49 UTC (rev 8272) +++ csw/mgar/gar/v2/bin/checkpkg.d/checkpkg-you-can-write-your-own.py 2010-01-31 18:14:31 UTC (rev 8273) @@ -9,6 +9,8 @@ import os.path import sys +CHECKPKG_MODULE_NAME = "a template of a checkpkg module" + # The following bit of code sets the correct path to Python libraries # distributed with GAR. path_list = [os.path.dirname(__file__), @@ -57,7 +59,7 @@ pkgnames = args # CheckpkgManager class abstracts away things such as the collection of # results. - check_manager = checkpkg.CheckpkgManager("a template of a checkpkg module", + check_manager = checkpkg.CheckpkgManager(CHECKPKG_MODULE_NAME, options.extractdir, pkgnames, options.debug) Modified: csw/mgar/gar/v2/lib/python/checkpkg.py =================================================================== --- csw/mgar/gar/v2/lib/python/checkpkg.py 2010-01-31 17:45:49 UTC (rev 8272) +++ csw/mgar/gar/v2/lib/python/checkpkg.py 2010-01-31 18:14:31 UTC (rev 8273) @@ -107,7 +107,7 @@ return options, set(args) -class CheckpkgBase(object): +class CheckpkgBase(opencsw.DirectoryFormatPackage): """This class has functionality overlapping with DirectoryFormatPackage from the opencsw.py library. The classes should be merged. """ @@ -116,46 +116,8 @@ self.extractdir = extractdir self.pkgname = pkgname self.pkgpath = os.path.join(self.extractdir, self.pkgname) + super(CheckpkgBase, self).__init__(self.pkgpath) - def CheckPkgpathExists(self): - if not os.path.isdir(self.pkgpath): - raise PackageError("%s does not exist or is not a directory" - % self.pkgpath) - - def ListBinaries(self): - """Shells out to list all the binaries from a given package. - - Original checkpkg code: - - # ######################################### - # # find all executables and dynamic libs,and list their filenames. - # listbinaries() { - # if [ ! -d $1 ] ; then - # print errmsg $1 not a directory - # rm -rf $EXTRACTDIR - # exit 1 - # fi - # - # find $1 -print | xargs file |grep ELF |nawk -F: '{print $1}' - # } - """ - self.CheckPkgpathExists() - find_tmpl = "find %s -print | xargs file | grep ELF | nawk -F: '{print $1}'" - find_proc = subprocess.Popen(find_tmpl % self.pkgpath, - shell=True, stdout=subprocess.PIPE) - stdout, stderr = find_proc.communicate() - ret = find_proc.wait() - if ret: - logging.error("The find command returned an error.") - return stdout.splitlines() - - def GetAllFilenames(self): - self.CheckPkgpathExists() - file_basenames = [] - for root, dirs, files in os.walk(self.pkgpath): - file_basenames.extend(files) - return file_basenames - def FormatDepsReport(self, missing_deps, surplus_deps, orphan_sonames): """To be removed.""" namespace = { Modified: csw/mgar/gar/v2/lib/python/opencsw.py =================================================================== --- csw/mgar/gar/v2/lib/python/opencsw.py 2010-01-31 17:45:49 UTC (rev 8272) +++ csw/mgar/gar/v2/lib/python/opencsw.py 2010-01-31 18:14:31 UTC (rev 8273) @@ -643,7 +643,49 @@ fd.close() return depends + def CheckPkgpathExists(self): + if not os.path.isdir(self.directory): + raise PackageError("%s does not exist or is not a directory" + % self.directory) + def ListBinaries(self): + """Shells out to list all the binaries from a given package. + + Original checkpkg code: + + ######################################### + # find all executables and dynamic libs,and list their filenames. + listbinaries() { + if [ ! -d $1 ] ; then + print errmsg $1 not a directory + rm -rf $EXTRACTDIR + exit 1 + fi + + find $1 -print | xargs file |grep ELF |nawk -F: '{print $1}' + } + + Returns a list of absolute paths. + """ + self.CheckPkgpathExists() + find_tmpl = "find '%s' -print | xargs file | grep ELF | nawk -F: '{print $1}'" + find_proc = subprocess.Popen(find_tmpl % self.directory, + shell=True, + stdout=subprocess.PIPE) + stdout, stderr = find_proc.communicate() + ret = find_proc.wait() + if ret: + logging.error("The find command returned an error.") + return stdout.splitlines() + + def GetAllFilenames(self): + self.CheckPkgpathExists() + file_basenames = [] + for root, dirs, files in os.walk(self.pkgpath): + file_basenames.extend(files) + return file_basenames + + class Pkgmap(object): """Represents the pkgmap of the package. This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Sun Jan 31 19:45:57 2010 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Sun, 31 Jan 2010 18:45:57 +0000 Subject: [csw-devel] SF.net SVN: gar:[8274] csw/mgar/pkg/cpan/HTML-Parser/trunk/Makefile Message-ID: Revision: 8274 http://gar.svn.sourceforge.net/gar/?rev=8274&view=rev Author: wbonnet Date: 2010-01-31 18:45:56 +0000 (Sun, 31 Jan 2010) Log Message: ----------- Rebuilt with Perl 5.10.1 Modified Paths: -------------- csw/mgar/pkg/cpan/HTML-Parser/trunk/Makefile Modified: csw/mgar/pkg/cpan/HTML-Parser/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/HTML-Parser/trunk/Makefile 2010-01-31 18:14:31 UTC (rev 8273) +++ csw/mgar/pkg/cpan/HTML-Parser/trunk/Makefile 2010-01-31 18:45:56 UTC (rev 8274) @@ -11,16 +11,14 @@ invoked. endef -DISTFILES = COPYING -# We define upstream file regex so we can be notifed of new upstream software release -UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz - PACKAGES = CSWpmhtmlparser CATALOGNAME = pm_htmlparser REQUIRED_PKGS = CSWpmhtmltagset +LICENSE = README + CONFIGURE_ARGS = -n include gar/category.mk This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Sun Jan 31 21:03:55 2010 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sun, 31 Jan 2010 20:03:55 +0000 Subject: [csw-devel] SF.net SVN: gar:[8275] csw/mgar/gar/v2/bin/checkpkg Message-ID: Revision: 8275 http://gar.svn.sourceforge.net/gar/?rev=8275&view=rev Author: wahwah Date: 2010-01-31 20:03:45 +0000 (Sun, 31 Jan 2010) Log Message: ----------- mGAR v2: checkpkg, nicer output formatting; reporting the max allowed pkgname length if exceeded Modified Paths: -------------- csw/mgar/gar/v2/bin/checkpkg Modified: csw/mgar/gar/v2/bin/checkpkg =================================================================== --- csw/mgar/gar/v2/bin/checkpkg 2010-01-31 18:45:56 UTC (rev 8274) +++ csw/mgar/gar/v2/bin/checkpkg 2010-01-31 20:03:45 UTC (rev 8275) @@ -265,8 +265,12 @@ print basedir="'$basedir'" fi -if [[ ${#software} -gt ${NAME_MAX_LENGTH} ]] ; then errmsg $f: software name greater than 20 chars ; fi -if [[ ${#pkgname} -gt ${NAME_MAX_LENGTH} ]] ; then errmsg $f: pkg name greater than 20 chars; fi +if [[ ${#software} -gt ${NAME_MAX_LENGTH} ]] ; then + errmsg "$f: software name longer than ${NAME_MAX_LENGTH} chars" +fi +if [[ ${#pkgname} -gt ${NAME_MAX_LENGTH} ]] ; then + errmsg "$f: pkg name longer than ${NAME_MAX_LENGTH} chars" +fi if [ "$software" = "" ] ; then errmsg $f: software field not set properly in NAME ; fi if [ "$pkgname" = "" ] ; then errmsg $f: pkgname field blank ; fi @@ -522,8 +526,8 @@ if [[ $? -ne 0 ]]; then #if we've already looked at the package named $dep, #it'll be in the file. - awk "\$1 == \"$dep\" {print}" $SETDEPS | /usr/bin/grep $dep >/dev/null - if [[ $? -ne 0 ]]; then #we haven't yet seen this package in our set + awk "\$1 == \"$dep\" {print}" $SETDEPS | /usr/bin/grep $dep >/dev/null + if [[ $? -ne 0 ]]; then #we haven't yet seen this package in our set echo "Can't validate dependence on $dep. Storing for delayed validation." #store for validation at the end. echo "$dep $pkgname" >> $SETDEPS.missing @@ -584,8 +588,9 @@ fi debugmsg "plugindir: '$plugindir'" log_files="" +module_name_format="%-40s" if [[ -d "$plugindir" ]]; then - echo "Running modular tests" + echo "Running modular tests" # echo plugin dir exists for plugin in "${plugindir}"/checkpkg-*; do if [[ -x "${plugin}" ]]; then @@ -594,29 +599,29 @@ plugin_log="${EXTRACTDIR}/${plugin_base_name}.log" log_files="${log_files} ${plugin_log}" plugin_name="`echo ${plugin} | sed -e 's+.*/checkpkg-++' | sed -e 's+\.py$++'`" - printf "TEST: ${BOLD}${plugin_name}${COLOR_RESET} running..." + printf "${BOLD}${module_name_format}${COLOR_RESET} running..." "${plugin_name}" ${plugin} $extra_options -e "${EXTRACTDIR}" ${pkgnames} > "${plugin_log}" 2>&1 if [[ "$?" -ne 0 ]]; then - printf "\rTEST: ${plugin_name} ${RED}[FAIL]${COLOR_RESET} \\n" + printf "\r${module_name_format} ${RED}[FAIL]${COLOR_RESET} \\n" "${plugin_name}" test_suite_ok=0 else - printf "\rTEST: ${plugin_name} ${GREEN}[OK]${COLOR_RESET} \\n" + printf "\r${module_name_format} ${GREEN}[OK]${COLOR_RESET} \\n" "${plugin_name}" fi else debugmsg "'${plugin}' is not executable" fi done else - debugmsg "plugin dir does not exist" + debugmsg "plugin dir ${plugindir} does not exist" fi for log_file in ${log_files}; do - if [[ -s "${log_file}" ]]; then + if [[ `gwc -c "${log_file}" | awk '{print $1}'` -gt 1 ]]; then debugmsg ">> LOG START: ${log_file}" cat "${log_file}" debugmsg "<< LOG END: ${log_file}" - else - debugmsg "-- LOG ${log_file} is empty" + else + debugmsg "-- LOG ${log_file} is empty" fi done This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From hson at users.sourceforge.net Sun Jan 31 21:20:43 2010 From: hson at users.sourceforge.net (hson at users.sourceforge.net) Date: Sun, 31 Jan 2010 20:20:43 +0000 Subject: [csw-devel] SF.net SVN: gar:[8276] csw/mgar/pkg/tk/trunk Message-ID: Revision: 8276 http://gar.svn.sourceforge.net/gar/?rev=8276&view=rev Author: hson Date: 2010-01-31 20:20:43 +0000 (Sun, 31 Jan 2010) Log Message: ----------- tk: Update to 8.5.7 Modified Paths: -------------- csw/mgar/pkg/tk/trunk/Makefile csw/mgar/pkg/tk/trunk/checksums Modified: csw/mgar/pkg/tk/trunk/Makefile =================================================================== --- csw/mgar/pkg/tk/trunk/Makefile 2010-01-31 20:03:45 UTC (rev 8275) +++ csw/mgar/pkg/tk/trunk/Makefile 2010-01-31 20:20:43 UTC (rev 8276) @@ -1,8 +1,8 @@ GARNAME = tk -GARVERSION = 8.4.19 +GARVERSION = 8.5.7 CATEGORIES = lang -DESCRIPTION = Tcl programming language +DESCRIPTION = GUI toolkit for tcl define BLURB endef @@ -11,8 +11,14 @@ DISTNAME = $(GARNAME)$(GARVERSION) DISTFILES = $(DISTNAME)-src.tar.gz -DISTFILES += $(call admfiles,CSWtk,) +REQUIRED_PKGS_CSWtk += CSWfconfig +REQUIRED_PKGS_CSWtk += CSWftype2 +REQUIRED_PKGS_CSWtk += CSWlibx11 +REQUIRED_PKGS_CSWtk += CSWlibxft2 +REQUIRED_PKGS_CSWtk += CSWlibxrender +REQUIRED_PKGS_CSWtk += CSWtcl + SPKG_SOURCEURL = http://www.tcl.tk/ # We define upstream file regex so we can be notifed of new upstream software release @@ -23,12 +29,23 @@ BUILD64 = 1 NO_ISAEXEC = 1 +EXTRA_INC = $(prefix)/X11/include +EXTRA_LIB = $(prefix)/X11/lib +EXTRA_PKG_CONFIG_DIRS = $(prefix)/X11/lib +#EXTRA_SOS_LD_FLAGS = -L$(abspath $(prefix)/X11/lib/$(MM_LIBDIR)) + WORKSRC = $(WORKDIR)/$(DISTNAME)/unix # INCLUDE_FLAGS = CONFIGURE_ARGS = $(DIRPATHS) +CONFIGURE_ARGS += --x-includes=$(prefix)/X11/include +CONFIGURE_ARGS += --x-libraries=$(abspath $(prefix)/X11/lib/$(MM_LIBDIR)) +EXTRA_MERGE_INCLUDE_FILES = $(libdir)/libtkstub.*\.a + +TEST_TARGET = + include gar/category.mk #CFLAGS := $(filter-out -I%,$(CFLAGS)) Modified: csw/mgar/pkg/tk/trunk/checksums =================================================================== --- csw/mgar/pkg/tk/trunk/checksums 2010-01-31 20:03:45 UTC (rev 8275) +++ csw/mgar/pkg/tk/trunk/checksums 2010-01-31 20:20:43 UTC (rev 8276) @@ -1,2 +1 @@ -9b998d0456d1b956eb9da610837a9c47 download/tk8.4.19-src.tar.gz -12a36182202248eb293d4391d8390781 download/CSWtk.gspec +0764f63ae2106b4774c4ecb0ef391610 tk8.5.7-src.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From hson at users.sourceforge.net Sun Jan 31 21:21:46 2010 From: hson at users.sourceforge.net (hson at users.sourceforge.net) Date: Sun, 31 Jan 2010 20:21:46 +0000 Subject: [csw-devel] SF.net SVN: gar:[8277] csw/mgar/pkg/tcl/trunk/Makefile Message-ID: Revision: 8277 http://gar.svn.sourceforge.net/gar/?rev=8277&view=rev Author: hson Date: 2010-01-31 20:21:46 +0000 (Sun, 31 Jan 2010) Log Message: ----------- tcl: Update to 8.5.7 Modified Paths: -------------- csw/mgar/pkg/tcl/trunk/Makefile Modified: csw/mgar/pkg/tcl/trunk/Makefile =================================================================== --- csw/mgar/pkg/tcl/trunk/Makefile 2010-01-31 20:20:43 UTC (rev 8276) +++ csw/mgar/pkg/tcl/trunk/Makefile 2010-01-31 20:21:46 UTC (rev 8277) @@ -33,6 +33,9 @@ CONFIGURE_ARGS = $(DIRPATHS) +# tk need the static tclstub library for some reason +EXTRA_MERGE_INCLUDE_FILES = $(libdir)/libtclstub.*\.a + include gar/category.mk CFLAGS := $(filter-out -I%,$(CFLAGS)) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Sun Jan 31 21:38:00 2010 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Sun, 31 Jan 2010 20:38:00 +0000 Subject: [csw-devel] SF.net SVN: gar:[8278] csw/mgar/pkg/git/trunk/Makefile Message-ID: Revision: 8278 http://gar.svn.sourceforge.net/gar/?rev=8278&view=rev Author: bdwalton Date: 2010-01-31 20:38:00 +0000 (Sun, 31 Jan 2010) Log Message: ----------- git: prune python remote helper libs (nothing will use them until _at least_ 1.7.1) Modified Paths: -------------- csw/mgar/pkg/git/trunk/Makefile Modified: csw/mgar/pkg/git/trunk/Makefile =================================================================== --- csw/mgar/pkg/git/trunk/Makefile 2010-01-31 20:21:46 UTC (rev 8277) +++ csw/mgar/pkg/git/trunk/Makefile 2010-01-31 20:38:00 UTC (rev 8278) @@ -187,4 +187,6 @@ ginstall -c -m 0755 -d $(BD); \ cp contrib/completion/* \ $(BD)/ ) + @echo TEMP UNTIL USED: Purging Remote Helper Python Stuff + @( cd $(DESTDIR)/opt/csw/lib; rm -rf python ) @$(MAKECOOKIE) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Sun Jan 31 22:10:21 2010 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Sun, 31 Jan 2010 21:10:21 +0000 Subject: [csw-devel] SF.net SVN: gar:[8279] csw/mgar/pkg/cpan/DBD-Pg/trunk Message-ID: Revision: 8279 http://gar.svn.sourceforge.net/gar/?rev=8279&view=rev Author: wbonnet Date: 2010-01-31 21:10:13 +0000 (Sun, 31 Jan 2010) Log Message: ----------- Update to 2.16.1 Does not compile yet Modified Paths: -------------- csw/mgar/pkg/cpan/DBD-Pg/trunk/Makefile csw/mgar/pkg/cpan/DBD-Pg/trunk/checksums Modified: csw/mgar/pkg/cpan/DBD-Pg/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/DBD-Pg/trunk/Makefile 2010-01-31 20:38:00 UTC (rev 8278) +++ csw/mgar/pkg/cpan/DBD-Pg/trunk/Makefile 2010-01-31 21:10:13 UTC (rev 8279) @@ -1,7 +1,7 @@ GARNAME = DBD-Pg -GARVERSION = 1.32 +GARVERSION = 2.16.1 CATEGORIES = cpan -AUTHOR = RUDY +AUTHOR = TURNSTEP DESCRIPTION = PostgreSQL database driver for the DBI module define BLURB @@ -9,8 +9,9 @@ to PostgreSQL databases. endef -DISTFILES += CSWpmdbdpg.gspec CSWpmdbdpg.depend +PACKAGES = CSWpmdbdpg +CATALOGNAME = pm_dbdpg -DEPENDS += server/postgresql +LICENSE = README include gar/category.mk Modified: csw/mgar/pkg/cpan/DBD-Pg/trunk/checksums =================================================================== --- csw/mgar/pkg/cpan/DBD-Pg/trunk/checksums 2010-01-31 20:38:00 UTC (rev 8278) +++ csw/mgar/pkg/cpan/DBD-Pg/trunk/checksums 2010-01-31 21:10:13 UTC (rev 8279) @@ -1,3 +1 @@ -37f302663cf1a2182316590f8904ac42 download/CSWpmdbdpg.gspec -882cfc02f0fd6a7892b45bc34a8a9755 download/CSWpmdbdpg.depend -9d6a936e6f755af677ceef59272a50ac download/DBD-Pg-1.32.tar.gz +127f88ab24b971a8f5e3720a496235a5 DBD-Pg-2.16.1.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Sun Jan 31 22:12:38 2010 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Sun, 31 Jan 2010 21:12:38 +0000 Subject: [csw-devel] SF.net SVN: gar:[8280] csw/mgar/pkg/cpan/DBD-Pg/trunk/ Message-ID: Revision: 8280 http://gar.svn.sourceforge.net/gar/?rev=8280&view=rev Author: wbonnet Date: 2010-01-31 21:12:31 +0000 (Sun, 31 Jan 2010) Log Message: ----------- Update to 2.16.1 Does not compile yet Property Changed: ---------------- csw/mgar/pkg/cpan/DBD-Pg/trunk/ Property changes on: csw/mgar/pkg/cpan/DBD-Pg/trunk ___________________________________________________________________ Modified: svn:externals - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v1 + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Sun Jan 31 22:23:43 2010 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Sun, 31 Jan 2010 21:23:43 +0000 Subject: [csw-devel] SF.net SVN: gar:[8281] csw/mgar/pkg/cpan/FCGI/trunk Message-ID: Revision: 8281 http://gar.svn.sourceforge.net/gar/?rev=8281&view=rev Author: wbonnet Date: 2010-01-31 21:23:40 +0000 (Sun, 31 Jan 2010) Log Message: ----------- Upgrade to 0.68 Modified Paths: -------------- csw/mgar/pkg/cpan/FCGI/trunk/Makefile csw/mgar/pkg/cpan/FCGI/trunk/checksums Property Changed: ---------------- csw/mgar/pkg/cpan/FCGI/trunk/ Property changes on: csw/mgar/pkg/cpan/FCGI/trunk ___________________________________________________________________ Modified: svn:externals - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v1 + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 Modified: csw/mgar/pkg/cpan/FCGI/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/FCGI/trunk/Makefile 2010-01-31 21:12:31 UTC (rev 8280) +++ csw/mgar/pkg/cpan/FCGI/trunk/Makefile 2010-01-31 21:23:40 UTC (rev 8281) @@ -1,12 +1,16 @@ GARNAME = FCGI -GARVERSION = 0.67 +GARVERSION = 0.68 CATEGORIES = cpan -AUTHOR = SKIMO +AUTHOR = MSTROUT -DESCRIPTION = fast CGI module +DESCRIPTION = Fast CGI module define BLURB + Fast CGI module for Perl endef -DISTFILES += CSWpmfcgi.gspec +PACKAGES = CSWpmfcgi +CATALOGNAME = pm_fcgi +LICENSE = README + include gar/category.mk Modified: csw/mgar/pkg/cpan/FCGI/trunk/checksums =================================================================== --- csw/mgar/pkg/cpan/FCGI/trunk/checksums 2010-01-31 21:12:31 UTC (rev 8280) +++ csw/mgar/pkg/cpan/FCGI/trunk/checksums 2010-01-31 21:23:40 UTC (rev 8281) @@ -1,2 +1 @@ -a5e1cb143427ba4c5ab95ddbb15ab7d4 download/CSWpmfcgi.gspec -2e9b5bd1f74290fd9788555e8108a3d2 download/FCGI-0.67.tar.gz +d336458f5b43c6fd3395cd4ba1914966 FCGI-0.68.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bensons at users.sourceforge.net Sun Jan 31 22:31:00 2010 From: bensons at users.sourceforge.net (bensons at users.sourceforge.net) Date: Sun, 31 Jan 2010 21:31:00 +0000 Subject: [csw-devel] SF.net SVN: gar:[8282] csw/mgar/pkg/cpan/Event-Lib/trunk/Makefile Message-ID: Revision: 8282 http://gar.svn.sourceforge.net/gar/?rev=8282&view=rev Author: bensons Date: 2010-01-31 21:30:59 +0000 (Sun, 31 Jan 2010) Log Message: ----------- cpan Event-Lib: added -lperl to LIBS Modified Paths: -------------- csw/mgar/pkg/cpan/Event-Lib/trunk/Makefile Modified: csw/mgar/pkg/cpan/Event-Lib/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/Event-Lib/trunk/Makefile 2010-01-31 21:23:40 UTC (rev 8281) +++ csw/mgar/pkg/cpan/Event-Lib/trunk/Makefile 2010-01-31 21:30:59 UTC (rev 8282) @@ -20,7 +20,7 @@ # Sun cc inline function patch PATCHFILES = inline.diff -CONFIGURE_ARGS += LIBS="-L$(libdir) -levent" +CONFIGURE_ARGS += LIBS="-L$(libdir) -levent -lperl" CONFIGURE_ARGS += INC="-I$(includedir)" # Skip tests as some of them are failing. Remove after the This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Sun Jan 31 22:47:29 2010 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Sun, 31 Jan 2010 21:47:29 +0000 Subject: [csw-devel] SF.net SVN: gar:[8283] csw/mgar/gar/v2/categories/cpan/category.mk Message-ID: Revision: 8283 http://gar.svn.sourceforge.net/gar/?rev=8283&view=rev Author: dmichelsen Date: 2010-01-31 21:47:28 +0000 (Sun, 31 Jan 2010) Log Message: ----------- mGAR v2: Always bind modules to libperl.so Modified Paths: -------------- csw/mgar/gar/v2/categories/cpan/category.mk Modified: csw/mgar/gar/v2/categories/cpan/category.mk =================================================================== --- csw/mgar/gar/v2/categories/cpan/category.mk 2010-01-31 21:30:59 UTC (rev 8282) +++ csw/mgar/gar/v2/categories/cpan/category.mk 2010-01-31 21:47:28 UTC (rev 8283) @@ -62,10 +62,11 @@ INSTALL_ENV += PERL5LIB=$(PERL5LIB) # Configure a target using Makefile.PL -PERL_CONFIGURE_ARGS ?= INSTALLDIRS=vendor $(EXTRA_PERL_CONFIGURE_ARGS) +BIND_LIBPERL ?= LIBS=-lperl +PERL_CONFIGURE_ARGS ?= INSTALLDIRS=vendor $(BIND_LIBPERL) $(EXTRA_PERL_CONFIGURE_ARGS) configure-%/Makefile.PL: @echo " ==> Running Makefile.PL in $*" - @( cd $* ; \ + ( cd $* ; \ $(CONFIGURE_ENV) perl Makefile.PL \ $(CONFIGURE_ARGS) $(PERL_CONFIGURE_ARGS) ) @$(MAKECOOKIE) @@ -73,14 +74,14 @@ PERLBUILD_CONFIGURE_ARGS ?= installdirs=vendor $(EXTRA_PERLBUILD_CONFIGURE_ARGS) configure-%/Build.PL: @echo " ==> Running Build.PL in $*" - @( cd $* ; \ + ( cd $* ; \ $(CONFIGURE_ENV) perl Build.PL \ $(PERLBUILD_CONFIGURE_ARGS) $(CONFIGURE_ARGS) ) @$(MAKECOOKIE) build-%/Build: @echo " ==> Running Build in $*" - @( cd $* ; $(BUILD_ENV) ./Build ) + ( cd $* ; $(BUILD_ENV) ./Build ) @$(MAKECOOKIE) test-%/Build: This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.