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" % check