From bdwalton at users.sourceforge.net Fri Jul 1 02:48:43 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Fri, 01 Jul 2011 00:48:43 +0000 Subject: [csw-devel] SF.net SVN: gar:[14949] csw/mgar/pkg/php5/trunk/Makefile Message-ID: Revision: 14949 http://gar.svn.sourceforge.net/gar/?rev=14949&view=rev Author: bdwalton Date: 2011-07-01 00:48:43 +0000 (Fri, 01 Jul 2011) Log Message: ----------- php5/trunk: depend on libncurses_dev at build time (package was split) Modified Paths: -------------- csw/mgar/pkg/php5/trunk/Makefile Modified: csw/mgar/pkg/php5/trunk/Makefile =================================================================== --- csw/mgar/pkg/php5/trunk/Makefile 2011-06-30 18:12:46 UTC (rev 14948) +++ csw/mgar/pkg/php5/trunk/Makefile 2011-07-01 00:48:43 UTC (rev 14949) @@ -61,7 +61,7 @@ BUILD_DEP_PKGS += CSWlibcares-dev CSWftype2 CSWiconv CSWimap-devel BUILD_DEP_PKGS += CSWoldapdevel CSWkrb5libdev CSWsasl CSWlibltdl7 BUILD_DEP_PKGS += CSWlibmcrypt CSWfreetds CSWmysql5devel CSWunixodbc -BUILD_DEP_PKGS += CSWlibpq CSWreadline CSWncurses CSWnetsnmp +BUILD_DEP_PKGS += CSWlibpq CSWreadline CSWlibncurses-dev CSWnetsnmp BUILD_DEP_PKGS += CSWsqlite3devel CSWaspell CSWhtmltidy CSWpostgresql # NOTE: I think this is a leftover bug. we shouldn't depend on two versions # of sqlite... This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Fri Jul 1 07:30:49 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Fri, 01 Jul 2011 05:30:49 +0000 Subject: [csw-devel] SF.net SVN: gar:[14950] csw/mgar/pkg/php5/trunk/Makefile Message-ID: Revision: 14950 http://gar.svn.sourceforge.net/gar/?rev=14950&view=rev Author: bdwalton Date: 2011-07-01 05:30:48 +0000 (Fri, 01 Jul 2011) Log Message: ----------- php5/trunk: update ncurses dependency for the readline subpackage Modified Paths: -------------- csw/mgar/pkg/php5/trunk/Makefile Modified: csw/mgar/pkg/php5/trunk/Makefile =================================================================== --- csw/mgar/pkg/php5/trunk/Makefile 2011-07-01 00:48:43 UTC (rev 14949) +++ csw/mgar/pkg/php5/trunk/Makefile 2011-07-01 05:30:48 UTC (rev 14950) @@ -193,7 +193,7 @@ $(eval $(call php5_subpackage,pgsql,CSWlibpq)) $(eval $(call php5_subpackage,posix)) $(eval $(call php5_subpackage,pspell,CSWaspell)) -$(eval $(call php5_subpackage,readline,CSWreadline CSWncurses)) +$(eval $(call php5_subpackage,readline,CSWreadline CSWlibncurses5)) $(eval $(call php5_subpackage,session,CSWlibmm)) PKGFILES_CSWphp5-session += .*/include/php/ext/session.* $(eval $(call php5_subpackage,shmop)) 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 Jul 1 19:56:25 2011 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 01 Jul 2011 17:56:25 +0000 Subject: [csw-devel] SF.net SVN: gar:[14951] csw/mgar/pkg/speex/trunk Message-ID: Revision: 14951 http://gar.svn.sourceforge.net/gar/?rev=14951&view=rev Author: dmichelsen Date: 2011-07-01 17:56:25 +0000 (Fri, 01 Jul 2011) Log Message: ----------- speex: Split package and general cleanup Modified Paths: -------------- csw/mgar/pkg/speex/trunk/Makefile csw/mgar/pkg/speex/trunk/checksums Modified: csw/mgar/pkg/speex/trunk/Makefile =================================================================== --- csw/mgar/pkg/speex/trunk/Makefile 2011-07-01 05:30:48 UTC (rev 14950) +++ csw/mgar/pkg/speex/trunk/Makefile 2011-07-01 17:56:25 UTC (rev 14951) @@ -3,8 +3,7 @@ # $Id$ NAME = speex -VERSION = 1.2 -REV = rc1 +VERSION = 1.2rc1 CATEGORIES = lib DESCRIPTION = Speex audio codec support library @@ -12,7 +11,7 @@ endef MASTER_SITES = http://downloads.xiph.org/releases/speex/ -DISTFILES = $(NAME)-$(VERSION)$(REV).tar.gz +DISTFILES = $(DISTNAME).tar.gz # The important lines are these: # @@ -34,27 +33,43 @@ # All the other stuff is generated (and the newlines on getopt*.c were stripped of ^M) PATCHFILES = speex-getopt.patch.bz2 +VENDOR_URL = http://www.speex.org/ + +BUILD_DEP_PKGS += CSWlibogg-dev + PACKAGES = CSWspeex -CATALOGNAME = libspeex -RUNTIME_DEP_PKGS = CSWlibogg -BUILD_DEP_PKGS = $(RUNTIME_DEP_PKGS) +SPKG_DESC_CSWspeex = Speex audio codec tools +# PKGFILES is catchall +RUNTIME_DEP_PKGS_CSWspeex += CSWlibspeex1 +RUNTIME_DEP_PKGS_CSWspeex += CSWlibspeexdsp1 +RUNTIME_DEP_PKGS_CSWspeex += CSWlibogg0 -SPKG_SOURCEURL = http://www.speex.org/ +PACKAGES += CSWlibspeex-dev +SPKG_DESC_CSWlibspeex-dev = Development files for libspeex.so.1 +PKGFILES_CSWlibspeex-dev += $(PKGFILES_DEVEL) +PKGFILES_CSWlibspeex-dev += $(docdir)/libspeex/manual.pdf +RUNTIME_DEP_PKGS_CSWlibspeex-dev += CSWlibspeex1 +RUNTIME_DEP_PKGS_CSWlibspeex-dev += CSWlibspeexdsp1 -# We define upstream file regex so we can be notifed of new upstream software release -UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz +PACKAGES += CSWlibspeex1 +SPKG_DESC_CSWlibspeex1 = Speex audio codec library, libspeex.so.1 +PKGFILES_CSWlibspeex1 += $(call pkgfiles_lib,libspeex.so.1) -WORKSRC = $(WORKDIR)/$(NAME)-$(VERSION)$(REV) +PACKAGES += CSWlibspeexdsp1 +SPKG_DESC_CSWlibspeexdsp1 = Speex audio codec support library, libspeexdsp.so.1 +PKGFILES_CSWlibspeexdsp1 += $(call pkgfiles_lib,libspeexdsp.so.1) # 64-bit doesn't build on x86. BUILD64 = 1 -CONFIGURE_ARGS = $(DIRPATHS) -TEST_SCRIPTS = +# TEST_SCRIPTS = +CONFIGURE_ARGS += $(DIRPATHS) +# Otherwise we must unnecessarily link to CSW provided libgnugetopt +CONFIGURE_ARGS += ac_cv_func_getopt_long=no +CONFIGURE_ARGS += ac_cv_lib_gnugetopt_getopt_long=no + INSTALL_OVERRIDE_VARS = PACKAGE INSTALL_OVERRIDE_VAR_PACKAGE = libspeex include gar/category.mk -SPKG_VERSION := $(SPKG_VERSION)_rev=$(REV) - Modified: csw/mgar/pkg/speex/trunk/checksums =================================================================== --- csw/mgar/pkg/speex/trunk/checksums 2011-07-01 05:30:48 UTC (rev 14950) +++ csw/mgar/pkg/speex/trunk/checksums 2011-07-01 17:56:25 UTC (rev 14951) @@ -1,2 +1 @@ -c4438b22c08e5811ff10e2b06ee9b9ae download/speex-1.2rc1.tar.gz -fe24237dc5e9cea5d5896dffa10c6c06 download/speex-getopt.patch.bz2 +c4438b22c08e5811ff10e2b06ee9b9ae speex-1.2rc1.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 Jul 1 20:22:00 2011 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 01 Jul 2011 18:22:00 +0000 Subject: [csw-devel] SF.net SVN: gar:[14952] csw/mgar/pkg/vorbistools/trunk/Makefile Message-ID: Revision: 14952 http://gar.svn.sourceforge.net/gar/?rev=14952&view=rev Author: dmichelsen Date: 2011-07-01 18:22:00 +0000 (Fri, 01 Jul 2011) Log Message: ----------- vorbistools: Rework dependencies and update to new defaults Modified Paths: -------------- csw/mgar/pkg/vorbistools/trunk/Makefile Modified: csw/mgar/pkg/vorbistools/trunk/Makefile =================================================================== --- csw/mgar/pkg/vorbistools/trunk/Makefile 2011-07-01 17:56:25 UTC (rev 14951) +++ csw/mgar/pkg/vorbistools/trunk/Makefile 2011-07-01 18:22:00 UTC (rev 14952) @@ -16,31 +16,36 @@ VENDOR_URL = http://www.vorbis.com -PACKAGES = CSWvtools -CATALOGNAME = vorbistools +PACKAGES = CSWvorbistools +SPKG_DESC_CSWvorbistools = Vorbis audio tools +OBSOLETED_BY_CSWvorbistools = CSWvtools +CATALOGNAME_CSWvtools = vorbistools_stub -BUILD_DEP_PKGS = CSWcurldevel +BUILD_DEP_PKGS += CSWlibcurl-dev +BUILD_DEP_PKGS += CSWlibkate-dev +BUILD_DEP_PKGS += CSWlibogg-dev +BUILD_DEP_PKGS += CSWlibvorbis-dev +BUILD_DEP_PKGS += CSWlibflac-dev +BUILD_DEP_PKGS += CSWlibao-dev +BUILD_DEP_PKGS += CSWlibspeex-dev +BUILD_DEP_PKGS += CSWggettext-dev -RUNTIME_DEP_PKGS += CSWcurlrt -RUNTIME_DEP_PKGS += CSWflac -RUNTIME_DEP_PKGS += CSWggettextrt -RUNTIME_DEP_PKGS += CSWiconv -RUNTIME_DEP_PKGS += CSWlibao -RUNTIME_DEP_PKGS += CSWlibogg -RUNTIME_DEP_PKGS += CSWspeex -RUNTIME_DEP_PKGS += CSWsunmath -RUNTIME_DEP_PKGS += CSWvorbis +RUNTIME_DEP_PKGS_CSWvorbistools += CSWlibcurl4 +RUNTIME_DEP_PKGS_CSWvorbistools += CSWlibkate1 +RUNTIME_DEP_PKGS_CSWvorbistools += CSWlibogg0 +RUNTIME_DEP_PKGS_CSWvorbistools += CSWliboggkate1 +RUNTIME_DEP_PKGS_CSWvorbistools += CSWlibvorbis0 +RUNTIME_DEP_PKGS_CSWvorbistools += CSWlibvorbisfile3 +RUNTIME_DEP_PKGS_CSWvorbistools += CSWlibvorbisenc2 +RUNTIME_DEP_PKGS_CSWvorbistools += CSWlibflac8 +RUNTIME_DEP_PKGS_CSWvorbistools += CSWlibao4 +RUNTIME_DEP_PKGS_CSWvorbistools += CSWlibspeex1 +RUNTIME_DEP_PKGS_CSWvorbistools += CSWlibintl8 +RUNTIME_DEP_PKGS_CSWvorbistools += CSWiconv -# We define upstream file regex so we can be notifed of new upstream software release -UFILES_REGEX = (\d+(?:\.\d+)*) - EXTRA_LINKER_FLAGS += -lrt BUILD64 = 1 EXTRA_BUILD_ISAS = sparcv8plus+vis pentium_pro -CONFIGURE_ARGS = $(DIRPATHS) - -TEST_TARGET = check - include gar/category.mk This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Fri Jul 1 21:10:56 2011 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 01 Jul 2011 19:10:56 +0000 Subject: [csw-devel] SF.net SVN: gar:[14953] csw/mgar/pkg/vorbistools/trunk/Makefile Message-ID: Revision: 14953 http://gar.svn.sourceforge.net/gar/?rev=14953&view=rev Author: dmichelsen Date: 2011-07-01 19:10:56 +0000 (Fri, 01 Jul 2011) Log Message: ----------- vorbistools: Reenable isaexec Modified Paths: -------------- csw/mgar/pkg/vorbistools/trunk/Makefile Modified: csw/mgar/pkg/vorbistools/trunk/Makefile =================================================================== --- csw/mgar/pkg/vorbistools/trunk/Makefile 2011-07-01 18:22:00 UTC (rev 14952) +++ csw/mgar/pkg/vorbistools/trunk/Makefile 2011-07-01 19:10:56 UTC (rev 14953) @@ -46,6 +46,7 @@ EXTRA_LINKER_FLAGS += -lrt BUILD64 = 1 +ISAEXEC = 1 EXTRA_BUILD_ISAS = sparcv8plus+vis pentium_pro include gar/category.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 Jul 1 21:47:50 2011 From: rthurner at users.sourceforge.net (rthurner at users.sourceforge.net) Date: Fri, 01 Jul 2011 19:47:50 +0000 Subject: [csw-devel] SF.net SVN: gar:[14954] csw/mgar/pkg/mercurial/trunk Message-ID: Revision: 14954 http://gar.svn.sourceforge.net/gar/?rev=14954&view=rev Author: rthurner Date: 2011-07-01 19:47:49 +0000 (Fri, 01 Jul 2011) Log Message: ----------- mercurial: upgrade to hg-1.9 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 2011-07-01 19:10:56 UTC (rev 14953) +++ csw/mgar/pkg/mercurial/trunk/Makefile 2011-07-01 19:47:49 UTC (rev 14954) @@ -1,5 +1,5 @@ NAME = mercurial -VERSION = 1.8.4 +VERSION = 1.9 CATEGORIES = python DESCRIPTION = Fast, lightweight Source Control Management system Modified: csw/mgar/pkg/mercurial/trunk/checksums =================================================================== --- csw/mgar/pkg/mercurial/trunk/checksums 2011-07-01 19:10:56 UTC (rev 14953) +++ csw/mgar/pkg/mercurial/trunk/checksums 2011-07-01 19:47:49 UTC (rev 14954) @@ -1 +1 @@ -b3dcc3de473e003dd1cc0500dcd9de47 mercurial-1.8.4.tar.gz +d4842129fa2732eb6ed1180467bc32e2 mercurial-1.9.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 Jul 1 22:50:27 2011 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 01 Jul 2011 20:50:27 +0000 Subject: [csw-devel] SF.net SVN: gar:[14955] csw/mgar/pkg/mysql5/branches/mysql-5.0.x/Makefile Message-ID: Revision: 14955 http://gar.svn.sourceforge.net/gar/?rev=14955&view=rev Author: dmichelsen Date: 2011-07-01 20:50:27 +0000 (Fri, 01 Jul 2011) Log Message: ----------- mysql5/branches/mysql-5.0.x: Add Alternatives 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 2011-07-01 19:47:49 UTC (rev 14954) +++ csw/mgar/pkg/mysql5/branches/mysql-5.0.x/Makefile 2011-07-01 20:50:27 UTC (rev 14955) @@ -177,6 +177,10 @@ # TODO: Make the tests pass. They don't at the moment. TEST_SCRIPTS = +ALTERNATIVES_CSW$(NAME)client = mysql$(BASE_VERSION) +ALTERNATIVE_mysql$(BASE_VERSION) = $(global_bindir)/$(firstword $(CSW$(NAME)client_programs)) mysql $(bindir)/$(firstword $(CSW$(NAME)client_programs)) 50 +ALTERNATIVE_mysql$(BASE_VERSION) += $(foreach C,$(wordlist 2,$(words $(CSW$(NAME)client_programs)),$(CSW$(NAME)client_programs)),\ + $(global_bindir)/$C $C $(bindir)/$C) USERGROUP = /etc/opt/csw/pkg/CSW$(NAME)/cswusergroup @@ -250,12 +254,12 @@ $(PKGROOT)$(global_sysconfdir)/pkg/CSW$(NAME) # Create symlinks to binaries ginstall -m 755 -d $(PKGROOT)$(global_bindir) - for f in $(PKGROOT)$(bindir)/*; do \ - if echo $$f | grep amd64$$; then continue; fi; \ - if echo $$f | grep sparcv9$$; then continue; fi; \ - ln -s ../$(NAME)/bin/`basename $$f` \ - $(PKGROOT)$(global_bindir)/`basename $$f`; \ - done + #for f in $(PKGROOT)$(bindir)/*; do \ + # if echo $$f | grep amd64$$; then continue; fi; \ + # if echo $$f | grep sparcv9$$; then continue; fi; \ + # ln -s ../$(NAME)/bin/`basename $$f` \ + # $(PKGROOT)$(global_bindir)/`basename $$f`; \ + #done # http://www.opencsw.org/bugtrack/view.php?id=4149 ginstall -m 755 -d $(PKGROOT)$(sysconfdir) @$(MAKECOOKIE) 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 Jul 2 02:49:47 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Sat, 02 Jul 2011 00:49:47 +0000 Subject: [csw-devel] SF.net SVN: gar:[14956] csw/mgar/gar/v2/lib/python Message-ID: Revision: 14956 http://gar.svn.sourceforge.net/gar/?rev=14956&view=rev Author: bdwalton Date: 2011-07-02 00:49:46 +0000 (Sat, 02 Jul 2011) Log Message: ----------- checkpkg: detect gzipped manpages in pkgmap and provide a suggested correction Modified Paths: -------------- csw/mgar/gar/v2/lib/python/package_checks.py csw/mgar/gar/v2/lib/python/package_checks_test.py Modified: csw/mgar/gar/v2/lib/python/package_checks.py =================================================================== --- csw/mgar/gar/v2/lib/python/package_checks.py 2011-07-01 20:50:27 UTC (rev 14955) +++ csw/mgar/gar/v2/lib/python/package_checks.py 2011-07-02 00:49:46 UTC (rev 14956) @@ -220,6 +220,15 @@ if re.search(perllocal_re, entry["path"]): error_mgr.ReportError("perllocal-pod-in-pkgmap", entry["path"]) +def CheckGzippedManpages(pkg_data, error_mgr, logger, messenger): + gzipman_re = re.compile(r'share/man/man.*/.*\.gz$') + for entry in pkg_data["pkgmap"]: + if entry["path"]: + if re.search(gzipman_re, entry["path"]): + error_mgr.ReportError( + 'gzipped-manpage-in-pkgmap', entry["path"], + "Solaris' man cannot automatically inflate man pages. " + "Solution: man page should be gunzipped.") def CheckMultipleDepends(pkg_data, error_mgr, logger, messenger): new_depends = set() Modified: csw/mgar/gar/v2/lib/python/package_checks_test.py =================================================================== --- csw/mgar/gar/v2/lib/python/package_checks_test.py 2011-07-01 20:50:27 UTC (rev 14955) +++ csw/mgar/gar/v2/lib/python/package_checks_test.py 2011-07-02 00:49:46 UTC (rev 14956) @@ -950,6 +950,55 @@ 'This path is already provided by CSWcommon ' 'or is not allowed for other reasons.') + +class TestCheckGzippedManpages(CheckpkgUnitTestHelper, unittest.TestCase): + FUNCTION_NAME = "CheckGzippedManpages" + def CheckpkgTest(self): + self.pkg_data["pkgmap"].append({ + "class": "none", + "group": "bin", + "line": "", + "mode": '0755', + "path": "/opt/csw/share/man/man5/puppet.conf.5.gz", + "type": "f", + "user": "root" + }) + self.error_mgr_mock.ReportError( + 'gzipped-manpage-in-pkgmap', '/opt/csw/share/man/man5/puppet.conf.5.gz', + "Solaris' man cannot automatically inflate man pages. " + "Solution: man page should be gunzipped.") + + +class TestCheckGzippedManpages_good(CheckpkgUnitTestHelper, unittest.TestCase): + FUNCTION_NAME = "CheckGzippedManpages" + def CheckpkgTest(self): + self.pkg_data["pkgmap"].append({ + "class": "none", + "group": "bin", + "line": "", + "mode": '0755', + "path": "/opt/csw/share/man/man5/puppet.conf.5", + "type": "f", + "user": "root" + }) + + +# Although this is a gzipped manpage, it is not in a directory associated with +# manpages, so we should not trigger an error here. +class TestCheckGzippedManpages_misplaced(CheckpkgUnitTestHelper, unittest.TestCase): + FUNCTION_NAME = "CheckGzippedManpages" + def CheckpkgTest(self): + self.pkg_data["pkgmap"].append({ + "class": "none", + "group": "bin", + "line": "", + "mode": '0755', + "path": "/etc/opt/csw/puppet/puppet.conf.5.gz", + "type": "f", + "user": "root" + }) + + class TestCheckArchitecture_sparcv8plus(CheckpkgUnitTestHelper, unittest.TestCase): FUNCTION_NAME = "CheckArchitecture" 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 Jul 2 03:23:45 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Sat, 02 Jul 2011 01:23:45 +0000 Subject: [csw-devel] SF.net SVN: gar:[14957] csw/mgar/pkg/coreutils/trunk Message-ID: Revision: 14957 http://gar.svn.sourceforge.net/gar/?rev=14957&view=rev Author: bdwalton Date: 2011-07-02 01:23:45 +0000 (Sat, 02 Jul 2011) Log Message: ----------- coreutils/trunk: version bump 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 2011-07-02 00:49:46 UTC (rev 14956) +++ csw/mgar/pkg/coreutils/trunk/Makefile 2011-07-02 01:23:45 UTC (rev 14957) @@ -1,5 +1,5 @@ NAME = coreutils -VERSION = 8.10 +VERSION = 8.12 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 2011-07-02 00:49:46 UTC (rev 14956) +++ csw/mgar/pkg/coreutils/trunk/checksums 2011-07-02 01:23:45 UTC (rev 14957) @@ -1 +1 @@ -74d54d09fc5c1bd3337127f49c88b1c5 coreutils-8.10.tar.gz +fce7999953a67243d00d75cc86dbcaa6 coreutils-8.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 Sat Jul 2 10:05:49 2011 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Sat, 02 Jul 2011 08:05:49 +0000 Subject: [csw-devel] SF.net SVN: gar:[14958] csw/mgar/pkg/gawk Message-ID: Revision: 14958 http://gar.svn.sourceforge.net/gar/?rev=14958&view=rev Author: dmichelsen Date: 2011-07-02 08:05:49 +0000 (Sat, 02 Jul 2011) Log Message: ----------- gawk: Move current build recipe to legacy Added Paths: ----------- csw/mgar/pkg/gawk/legacy/ Removed Paths: ------------- csw/mgar/pkg/gawk/trunk/ 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 Jul 2 10:51:00 2011 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Sat, 02 Jul 2011 08:51:00 +0000 Subject: [csw-devel] SF.net SVN: gar:[14959] csw/mgar/pkg/readline43/trunk/Makefile Message-ID: Revision: 14959 http://gar.svn.sourceforge.net/gar/?rev=14959&view=rev Author: dmichelsen Date: 2011-07-02 08:50:59 +0000 (Sat, 02 Jul 2011) Log Message: ----------- readline43: Update to new defaults Modified Paths: -------------- csw/mgar/pkg/readline43/trunk/Makefile Modified: csw/mgar/pkg/readline43/trunk/Makefile =================================================================== --- csw/mgar/pkg/readline43/trunk/Makefile 2011-07-02 08:05:49 UTC (rev 14958) +++ csw/mgar/pkg/readline43/trunk/Makefile 2011-07-02 08:50:59 UTC (rev 14959) @@ -33,8 +33,4 @@ CONFIGURE_ARGS = $(DIRPATHS) CONFIGURE_ARGS += --with-curses -TEST_TARGET = check - -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 Sat Jul 2 10:52:01 2011 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Sat, 02 Jul 2011 08:52:01 +0000 Subject: [csw-devel] SF.net SVN: gar:[14960] csw/mgar/pkg/readline52/trunk/Makefile Message-ID: Revision: 14960 http://gar.svn.sourceforge.net/gar/?rev=14960&view=rev Author: dmichelsen Date: 2011-07-02 08:52:01 +0000 (Sat, 02 Jul 2011) Log Message: ----------- readline52: Update to new defaults Modified Paths: -------------- csw/mgar/pkg/readline52/trunk/Makefile Modified: csw/mgar/pkg/readline52/trunk/Makefile =================================================================== --- csw/mgar/pkg/readline52/trunk/Makefile 2011-07-02 08:50:59 UTC (rev 14959) +++ csw/mgar/pkg/readline52/trunk/Makefile 2011-07-02 08:52:01 UTC (rev 14960) @@ -23,13 +23,13 @@ PKGFILES_CSWlibhistory5 = $(call pkgfiles_lib,libhistory.so.5) # This dependency is not really necessary, just because we unconditionally add # "-lncurses" to LDFLAGS as this does not happen automatically. -RUNTIME_DEP_PKGS_CSWlibhistory5 += CSWncurses +RUNTIME_DEP_PKGS_CSWlibhistory5 += CSWlibncurses5 PACKAGES += CSWlibreadline5 CATALOGNAME_CSWlibreadline5 = libreadline5 SPKG_DESC_CSWlibreadline5 = GNU readline library, libreadline.so.5 PKGFILES_CSWlibreadline5 = $(call pkgfiles_lib,libreadline.so.5) -RUNTIME_DEP_PKGS_CSWlibreadline5 += CSWncurses +RUNTIME_DEP_PKGS_CSWlibreadline5 += CSWlibncurses5 BUILD64 = 1 NORUNPATH = 1 @@ -37,10 +37,6 @@ CONFIGURE_ARGS = $(DIRPATHS) CONFIGURE_ARGS += --with-curses -TEST_TARGET = check - -MERGE_DIRS_isa-extra = $(libdir) - include gar/category.mk LDFLAGS := $(filter-out -xarch=%,$(filter-out -m%,$(LDFLAGS))) -R$(libdir) -lncurses 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 Jul 2 10:52:41 2011 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Sat, 02 Jul 2011 08:52:41 +0000 Subject: [csw-devel] SF.net SVN: gar:[14961] csw/mgar/pkg/readline/trunk Message-ID: Revision: 14961 http://gar.svn.sourceforge.net/gar/?rev=14961&view=rev Author: dmichelsen Date: 2011-07-02 08:52:40 +0000 (Sat, 02 Jul 2011) Log Message: ----------- readline: Fix typo and update to new defaults Modified Paths: -------------- csw/mgar/pkg/readline/trunk/Makefile csw/mgar/pkg/readline/trunk/files/patch-history.3.diff Modified: csw/mgar/pkg/readline/trunk/Makefile =================================================================== --- csw/mgar/pkg/readline/trunk/Makefile 2011-07-02 08:52:01 UTC (rev 14960) +++ csw/mgar/pkg/readline/trunk/Makefile 2011-07-02 08:52:40 UTC (rev 14961) @@ -36,14 +36,14 @@ PKGFILES_CSWlibhistory6 = $(call pkgfiles_lib,libhistory.so.6) # This dependency is not really necessary, just because we unconditionally add # "-lncurses" to LDFLAGS as this does not happen automatically. -RUNTIME_DEP_PKGS_CSWlibhistory6 += CSWncurses +RUNTIME_DEP_PKGS_CSWlibhistory6 += CSWlibncurses5 OBSOLETED_BY_CSWlibhistory6 = CSWreadline PACKAGES += CSWlibreadline6 CATALOGNAME_CSWlibreadline6 = libreadline6 SPKG_DESC_CSWlibreadline6 = GNU readline library, libreadline.so.6 PKGFILES_CSWlibreadline6 = $(call pkgfiles_lib,libreadline.so.6) -RUNTIME_DEP_PKGS_CSWlibreadline6 += CSWncurses +RUNTIME_DEP_PKGS_CSWlibreadline6 += CSWlibncurses5 OBSOLETED_BY_CSWlibreadline6 = CSWreadline PACKAGES += CSWlibreadline-dev @@ -59,8 +59,6 @@ CONFIGURE_ARGS = $(DIRPATHS) CONFIGURE_ARGS += --with-curses -TEST_TARGET = check - include gar/category.mk post-install-modulated: Modified: csw/mgar/pkg/readline/trunk/files/patch-history.3.diff =================================================================== --- csw/mgar/pkg/readline/trunk/files/patch-history.3.diff 2011-07-02 08:52:01 UTC (rev 14960) +++ csw/mgar/pkg/readline/trunk/files/patch-history.3.diff 2011-07-02 08:52:40 UTC (rev 14961) @@ -1,15 +1,6 @@ diff -Naur readline-6.0.orig/doc/history.3 readline-6.0.patched/doc/history.3 --- readline-6.0.orig/doc/history.3 2008-08-12 22:40:59.000000000 +0200 +++ readline-6.0.patched/doc/history.3 2009-03-30 18:28:59.014167720 +0200 -@@ -8,7 +8,7 @@ - .\" - .\" Last Change: Thu Jul 31 08:46:08 EDT 2003 - .\" --.TH HISTORY 3 "2003 July 31" "GNU History 6.0" -+.TH HISTORY 3 "2003 July 31" "GNU History 5.0" - .\" - .\" File Name macro. This used to be `.PN', for Path Name, - .\" but Sun doesn't seem to like that very much. @@ -18,17 +18,17 @@ .. .ds lp \fR\|(\fP 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 Jul 2 12:35:57 2011 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Sat, 02 Jul 2011 10:35:57 +0000 Subject: [csw-devel] SF.net SVN: gar:[14962] csw/mgar/pkg/gawk Message-ID: Revision: 14962 http://gar.svn.sourceforge.net/gar/?rev=14962&view=rev Author: dmichelsen Date: 2011-07-02 10:35:56 +0000 (Sat, 02 Jul 2011) Log Message: ----------- gawk: First GAR version Added Paths: ----------- csw/mgar/pkg/gawk/trunk/ csw/mgar/pkg/gawk/trunk/Makefile csw/mgar/pkg/gawk/trunk/checksums csw/mgar/pkg/gawk/trunk/files/ Removed Paths: ------------- csw/mgar/pkg/gawk/trunk/Makefile csw/mgar/pkg/gawk/trunk/checksums csw/mgar/pkg/gawk/trunk/files/ Deleted: csw/mgar/pkg/gawk/trunk/Makefile =================================================================== --- csw/mgar/pkg/grep/trunk/Makefile 2011-07-02 01:23:45 UTC (rev 14957) +++ csw/mgar/pkg/gawk/trunk/Makefile 2011-07-02 10:35:56 UTC (rev 14962) @@ -1,42 +0,0 @@ -NAME = grep -VERSION = 2.9 -CATEGORIES = utils - -DESCRIPTION = GNU grep -define BLURB - The GNU family of grep utilities may be the "fastest grep in the west". - GNU grep is based on a fast lazy-state deterministic matcher (about - twice as fast as stock Unix egrep) hybridized with a Boyer-Moore-Gosper - search for a fixed string that eliminates impossible text from being - considered by the full regexp matcher without necessarily having to - look at every character. The result is typically many times faster - than Unix grep or egrep. (Regular expressions containing backreferencing - will run more slowly, however.) -endef - -MASTER_SITES = $(GNU_MIRROR) -DISTFILES = $(DISTNAME).tar.xz - -PACKAGES = CSWggrep -CATALOGNAME = ggrep -RUNTIME_DEP_PKGS_CSWggrep += CSWlibintl8 -RUNTIME_DEP_PKGS_CSWggrep += CSWlibpcre0 -RUNTIME_DEP_PKGS_CSWggrep += CSWiconv - -EXTRA_LINKER_FLAGS = -liconv - -CONFIGURE_ARGS = $(DIRPATHS) -CONFIGURE_ARGS += --program-prefix=g - -# Skip tests as they fail only in gnulib and are probably harmless: -# https://savannah.gnu.org/bugs/?29380 -SKIPTEST ?= 1 - -EXTRA_MERGE_EXCLUDE_FILES = $(libdir)/charset.alias - -include gar/category.mk - -post-install-modulated: - ginstall -d $(DESTDIR)$(prefix)/gnu - $(foreach G,$(notdir $(wildcard $(DESTDIR)$(bindir)/*)),ln -s ../bin/$G $(DESTDIR)$(prefix)/gnu/$(patsubst g%,%,$G);) - @$(MAKECOOKIE) Copied: csw/mgar/pkg/gawk/trunk/Makefile (from rev 14916, csw/mgar/pkg/grep/trunk/Makefile) =================================================================== --- csw/mgar/pkg/gawk/trunk/Makefile (rev 0) +++ csw/mgar/pkg/gawk/trunk/Makefile 2011-07-02 10:35:56 UTC (rev 14962) @@ -0,0 +1,46 @@ +NAME = gawk +VERSION = 4.0.0 +CATEGORIES = utils + +DESCRIPTION = GNU grep +define BLURB + The GNU family of grep utilities may be the "fastest grep in the west". + GNU grep is based on a fast lazy-state deterministic matcher (about + twice as fast as stock Unix egrep) hybridized with a Boyer-Moore-Gosper + search for a fixed string that eliminates impossible text from being + considered by the full regexp matcher without necessarily having to + look at every character. The result is typically many times faster + than Unix grep or egrep. (Regular expressions containing backreferencing + will run more slowly, however.) +endef + +MASTER_SITES = $(GNU_MIRROR) +DISTFILES = $(DISTNAME).tar.xz + +RUNTIME_DEP_PKGS_CSWgawk += CSWlibintl8 +RUNTIME_DEP_PKGS_CSWgawk += CSWlibsigsegv2 +RUNTIME_DEP_PKGS_CSWgawk += CSWlibreadline6 + +# Coompilation requires setting of __STDC__ to at least 1 +EXTRA_CFLAGS = -Xc + +# These are install instructions for other platforms (os/2... 'nuff said.) +CHECKPKG_OVERRIDES_CSWgawk += file-with-bad-content|/usr/share|root/opt/csw/share/info/gawk.info + +# These are instruction for awk, possible adjust them later +CHECKPKG_OVERRIDES_CSWgawk += file-with-bad-content|/usr/local|root/opt/csw/share/info/gawk.info + +# This is an example path (YMMV in the docs) +CHECKPKG_OVERRIDES_CSWgawk += file-with-bad-content|/usr/local|root/opt/csw/share/man/man1/gawk.1 +CHECKPKG_OVERRIDES_CSWgawk += file-with-bad-content|/usr/local|root/opt/csw/share/man/man1/pgawk.1 + +# This is a detection problem, reported upstream. +CHECKPKG_OVERRIDES_CSWgawk-i386 += surplus-dependency|CSWlibsigsegv2 +CHECKPKG_OVERRIDES_CSWgawk += $(CHECKPKG_OVERRIDES_CSWgawk-$(GARCH)) + +include gar/category.mk + +post-install-modulated: + ginstall -d $(DESTDIR)$(prefix)/gnu + $(foreach G,$(notdir $(wildcard $(DESTDIR)$(bindir)/g*)),ln -s ../bin/$G $(DESTDIR)$(prefix)/gnu/$(patsubst g%,%,$G);) + @$(MAKECOOKIE) Deleted: csw/mgar/pkg/gawk/trunk/checksums =================================================================== --- csw/mgar/pkg/grep/trunk/checksums 2011-07-02 01:23:45 UTC (rev 14957) +++ csw/mgar/pkg/gawk/trunk/checksums 2011-07-02 10:35:56 UTC (rev 14962) @@ -1 +0,0 @@ -25e41b2aa201104354740961ef36005a grep-2.9.tar.xz Copied: csw/mgar/pkg/gawk/trunk/checksums (from rev 14916, csw/mgar/pkg/grep/trunk/checksums) =================================================================== --- csw/mgar/pkg/gawk/trunk/checksums (rev 0) +++ csw/mgar/pkg/gawk/trunk/checksums 2011-07-02 10:35:56 UTC (rev 14962) @@ -0,0 +1 @@ +a42be7536a62d0bcb99ca92467d61660 gawk-4.0.0.tar.xz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From maciej at opencsw.org Sat Jul 2 12:39:33 2011 From: maciej at opencsw.org (=?UTF-8?Q?Maciej_Blizi=C5=84ski?=) Date: Sat, 2 Jul 2011 11:39:33 +0100 Subject: [csw-devel] SF.net SVN: gar:[14962] csw/mgar/pkg/gawk In-Reply-To: References: Message-ID: 2011/7/2 : > +RUNTIME_DEP_PKGS_CSWgawk += CSWlibintl8 > +RUNTIME_DEP_PKGS_CSWgawk += CSWlibsigsegv2 > +RUNTIME_DEP_PKGS_CSWgawk += CSWlibreadline6 Good to see that more and more packages start depending on the new style shared libraries! From wahwah at users.sourceforge.net Sat Jul 2 15:21:27 2011 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sat, 02 Jul 2011 13:21:27 +0000 Subject: [csw-devel] SF.net SVN: gar:[14963] csw/mgar/gar/v2/lib/python/package_checks_test.py Message-ID: Revision: 14963 http://gar.svn.sourceforge.net/gar/?rev=14963&view=rev Author: wahwah Date: 2011-07-02 13:21:27 +0000 (Sat, 02 Jul 2011) Log Message: ----------- checkpkg: An additional unit test Modified Paths: -------------- csw/mgar/gar/v2/lib/python/package_checks_test.py Modified: csw/mgar/gar/v2/lib/python/package_checks_test.py =================================================================== --- csw/mgar/gar/v2/lib/python/package_checks_test.py 2011-07-02 10:35:56 UTC (rev 14962) +++ csw/mgar/gar/v2/lib/python/package_checks_test.py 2011-07-02 13:21:27 UTC (rev 14963) @@ -1113,7 +1113,22 @@ 'CSWfoo', 'file-collision', '/opt/csw/share/foo CSWbar CSWfoo') self.pkg_data = [self.CSWbar_DATA, self.CSWfoo_DATA] + def CheckpkgTest2(self): + # What if these two packages are not currently in the catalog? + self.error_mgr_mock.GetPkgByPath('/opt/csw/share/foo').AndReturn( + frozenset([])) + self.error_mgr_mock.GetPkgByPath('/opt/csw/share/foo').AndReturn( + frozenset([])) + self.error_mgr_mock.ReportError( + 'CSWbar', 'file-collision', '/opt/csw/share/foo CSWbar CSWfoo') + self.error_mgr_mock.ReportError( + 'CSWfoo', 'file-collision', '/opt/csw/share/foo CSWbar CSWfoo') + self.pkg_data = [self.CSWbar_DATA, self.CSWfoo_DATA] + def testTwo(self): + self.RunCheckpkgTest(self.CheckpkgTest2) + + class TestSetCheckSharedLibraryConsistencyIvtools(CheckpkgUnitTestHelper, unittest.TestCase): """This tests for a case in which the SONAME that we're looking for doesn't 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 Jul 2 15:22:05 2011 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sat, 02 Jul 2011 13:22:05 +0000 Subject: [csw-devel] SF.net SVN: gar:[14964] csw/mgar/gar/v2/lib/python Message-ID: Revision: 14964 http://gar.svn.sourceforge.net/gar/?rev=14964&view=rev Author: wahwah Date: 2011-07-02 13:22:05 +0000 (Sat, 02 Jul 2011) Log Message: ----------- checkpkg: Use /opt/csw/share/opencsw/gar for data Modified Paths: -------------- csw/mgar/gar/v2/lib/python/checkpkg_lib.py csw/mgar/gar/v2/lib/python/common_constants.py Modified: csw/mgar/gar/v2/lib/python/checkpkg_lib.py =================================================================== --- csw/mgar/gar/v2/lib/python/checkpkg_lib.py 2011-07-02 13:21:27 UTC (rev 14963) +++ csw/mgar/gar/v2/lib/python/checkpkg_lib.py 2011-07-02 13:22:05 UTC (rev 14964) @@ -36,6 +36,10 @@ pass +class DataError(Error): + """A problem with reading required data.""" + + REPORT_TMPL = u"""#if $missing_deps or $surplus_deps or $orphan_sonames Dependency issues of $pkgname: #end if @@ -377,12 +381,23 @@ def _GetPathsForArch(self, arch): if not arch in self.lines_dict: - file_name = os.path.join( - os.path.dirname(__file__), "..", "..", "etc", "commondirs-%s" % arch) - logging.debug("opening %s", file_name) - f = open(file_name, "r") - self.lines_dict[arch] = f.read().splitlines() - f.close() + base_name = "commondirs-%s" % arch + paths = [ + os.path.join(os.path.dirname(__file__), "..", "..", "etc", base_name), + os.path.join(common_constants.OPENCSW_SHARE, "gar", base_name) + ] + path_found = False + for file_name in paths: + if not os.path.exists(file_name): + continue + # There is a race condition here, but we don't worry about it. + path_found = True + logging.debug("opening %s", file_name) + with open(file_name, "r") as f: + self.lines_dict[arch] = f.read().splitlines() + break + if not path_found: + raise DataError("Could not find the %s file." % base_name) return self.lines_dict[arch] def GetCommonPaths(self, arch): Modified: csw/mgar/gar/v2/lib/python/common_constants.py =================================================================== --- csw/mgar/gar/v2/lib/python/common_constants.py 2011-07-02 13:21:27 UTC (rev 14963) +++ csw/mgar/gar/v2/lib/python/common_constants.py 2011-07-02 13:22:05 UTC (rev 14964) @@ -69,3 +69,6 @@ DO_NOT_REPORT_MISSING_RE = [r"\*?SUNW.*"] PSTAMP_RE = r"(?P\w+)@(?P[\w\.-]+)-(?P\d+)" + +# The directory with shared, architecture independent data files. +OPENCSW_SHARE = "/opt/csw/share/opencsw" 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 Jul 2 16:17:17 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Sat, 02 Jul 2011 14:17:17 +0000 Subject: [csw-devel] SF.net SVN: gar:[14965] csw/mgar/pkg/cswutils/trunk/Makefile Message-ID: Revision: 14965 http://gar.svn.sourceforge.net/gar/?rev=14965&view=rev Author: bdwalton Date: 2011-07-02 14:17:17 +0000 (Sat, 02 Jul 2011) Log Message: ----------- cswutils/trunk: install commondirs- files for use by checkpkg Modified Paths: -------------- csw/mgar/pkg/cswutils/trunk/Makefile Modified: csw/mgar/pkg/cswutils/trunk/Makefile =================================================================== --- csw/mgar/pkg/cswutils/trunk/Makefile 2011-07-02 13:22:05 UTC (rev 14964) +++ csw/mgar/pkg/cswutils/trunk/Makefile 2011-07-02 14:17:17 UTC (rev 14965) @@ -83,6 +83,8 @@ @ginstall $(WORKSRC)/createpkg.8 $(DESTDIR)$(mandir)/man8/ @ginstall $(WORKSRC)/stagepkg.8 $(DESTDIR)$(mandir)/man8/ @ginstall -d $(DESTDIR)$(libdir)/python/csw + @ginstall -d $(DESTDIR)$(datadir)/opencsw/gar + @ginstall -m 0644 $(GARDIR)/etc/commondirs* $(DESTDIR)/$(datadir)/opencsw/gar/ @rsync -av --exclude=.svn/ --exclude='*.pyc' $(GARDIR)/lib/python/ \ $(DESTDIR)/$(libdir)/python/csw/ @ln -s ../lib/python/csw/compare_pkgs.py \ 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 Jul 2 16:23:42 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Sat, 02 Jul 2011 14:23:42 +0000 Subject: [csw-devel] SF.net SVN: gar:[14966] csw/mgar/pkg/cswutils/trunk/Makefile Message-ID: Revision: 14966 http://gar.svn.sourceforge.net/gar/?rev=14966&view=rev Author: bdwalton Date: 2011-07-02 14:23:42 +0000 (Sat, 02 Jul 2011) Log Message: ----------- cswutils/trunk: override checkpkg on the archall issue. the data files could be consumed on either platform Modified Paths: -------------- csw/mgar/pkg/cswutils/trunk/Makefile Modified: csw/mgar/pkg/cswutils/trunk/Makefile =================================================================== --- csw/mgar/pkg/cswutils/trunk/Makefile 2011-07-02 14:17:17 UTC (rev 14965) +++ csw/mgar/pkg/cswutils/trunk/Makefile 2011-07-02 14:23:42 UTC (rev 14966) @@ -54,6 +54,8 @@ CHECKPKG_OVERRIDES_CSWcswutils += surplus-dependency CHECKPKG_OVERRIDES_CSWcswutils += pkgname-does-not-start-with-CSWpy- CHECKPKG_OVERRIDES_CSWcswutils += catalogname-does-not-start-with-py_ +CHECKPKG_OVERRIDES_CSWcswutils += archall-with-arch-paths|/opt/csw/share/opencsw/gar/commondirs-i386 +CHECKPKG_OVERRIDES_CSWcswutils += archall-with-arch-paths|/opt/csw/share/opencsw/gar/commondirs-sparc # possibly remove these and omit the *test* files from distribution entirely CHECKPKG_OVERRIDES_CSWcswutils += file-with-bad-content|/export/home|root/opt/csw/lib/python/csw/testdata/rpaths.py 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 Jul 2 16:24:10 2011 From: rthurner at users.sourceforge.net (rthurner at users.sourceforge.net) Date: Sat, 02 Jul 2011 14:24:10 +0000 Subject: [csw-devel] SF.net SVN: gar:[14967] csw/mgar/pkg/subversion/trunk Message-ID: Revision: 14967 http://gar.svn.sourceforge.net/gar/?rev=14967&view=rev Author: rthurner Date: 2011-07-02 14:24:10 +0000 (Sat, 02 Jul 2011) Log Message: ----------- subversion: upgrade to 1.7.0-alpha2 for testing Modified Paths: -------------- csw/mgar/pkg/subversion/trunk/Makefile csw/mgar/pkg/subversion/trunk/checksums Modified: csw/mgar/pkg/subversion/trunk/Makefile =================================================================== --- csw/mgar/pkg/subversion/trunk/Makefile 2011-07-02 14:23:42 UTC (rev 14966) +++ csw/mgar/pkg/subversion/trunk/Makefile 2011-07-02 14:24:10 UTC (rev 14967) @@ -22,7 +22,7 @@ # http://subversion.apache.org/mailing-lists.html NAME = subversion -VERSION = 1.6.17 +VERSION = 1.7.0-alpha2 CATEGORIES = utils DESCRIPTION = Version control rethought @@ -32,7 +32,7 @@ endef VENDOR_URL = http://subversion.apache.org/ -MASTER_SITES = http://subversion.tigris.org/downloads/ +MASTER_SITES = http://archive.apache.org/dist/subversion/ #MASTER_SITES = http://orac.ece.utexas.edu/pub/svn/1.6.7/yuletide-eggnog/ DISTFILES = $(NAME)-$(VERSION).tar.bz2 UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.bz2 Modified: csw/mgar/pkg/subversion/trunk/checksums =================================================================== --- csw/mgar/pkg/subversion/trunk/checksums 2011-07-02 14:23:42 UTC (rev 14966) +++ csw/mgar/pkg/subversion/trunk/checksums 2011-07-02 14:24:10 UTC (rev 14967) @@ -1 +1 @@ -81e5dc5beee4b3fc025ac70c0b6caa14 subversion-1.6.17.tar.bz2 +237341332d0790e5798cc9a5043f00bf subversion-1.7.0-alpha2.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 Sat Jul 2 16:31:14 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Sat, 02 Jul 2011 14:31:14 +0000 Subject: [csw-devel] SF.net SVN: gar:[14968] csw/mgar/pkg/cswutils/trunk/Makefile Message-ID: Revision: 14968 http://gar.svn.sourceforge.net/gar/?rev=14968&view=rev Author: bdwalton Date: 2011-07-02 14:31:14 +0000 (Sat, 02 Jul 2011) Log Message: ----------- cswutils/trunk: version bump to denote bugfix change Modified Paths: -------------- csw/mgar/pkg/cswutils/trunk/Makefile Modified: csw/mgar/pkg/cswutils/trunk/Makefile =================================================================== --- csw/mgar/pkg/cswutils/trunk/Makefile 2011-07-02 14:24:10 UTC (rev 14967) +++ csw/mgar/pkg/cswutils/trunk/Makefile 2011-07-02 14:31:14 UTC (rev 14968) @@ -1,7 +1,7 @@ # $Id$ NAME = cswutils -VERSION = 1.20 +VERSION = 1.21 CATEGORIES = utils DESCRIPTION = Utilities for CSW maintainers 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 Jul 2 16:46:18 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Sat, 02 Jul 2011 14:46:18 +0000 Subject: [csw-devel] SF.net SVN: gar:[14969] csw/mgar/pkg/coreutils/trunk/Makefile Message-ID: Revision: 14969 http://gar.svn.sourceforge.net/gar/?rev=14969&view=rev Author: bdwalton Date: 2011-07-02 14:46:17 +0000 (Sat, 02 Jul 2011) Log Message: ----------- coreutils/trunk: drop patch that is now included upstream, turn off patched flag Modified Paths: -------------- csw/mgar/pkg/coreutils/trunk/Makefile Modified: csw/mgar/pkg/coreutils/trunk/Makefile =================================================================== --- csw/mgar/pkg/coreutils/trunk/Makefile 2011-07-02 14:31:14 UTC (rev 14968) +++ csw/mgar/pkg/coreutils/trunk/Makefile 2011-07-02 14:46:17 UTC (rev 14969) @@ -28,11 +28,7 @@ MASTER_SITES = $(GNU_MIRROR) DISTFILES = $(NAME)-$(VERSION).tar.gz -PATCHFILES += 0001-Apply-proposed-upstream-patch-to-fix-a-utimens-gnuli.patch -# patch ...apply proposed upstream... is a deviation from stock 8.10 -VERSION_FLAG_PATCH = 1 - # We define upstream file regex so we can be notifed of new upstream # software release UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).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 Sat Jul 2 19:06:33 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Sat, 02 Jul 2011 17:06:33 +0000 Subject: [csw-devel] SF.net SVN: gar:[14970] csw/mgar/pkg/cswclassutils/trunk/files Message-ID: Revision: 14970 http://gar.svn.sourceforge.net/gar/?rev=14970&view=rev Author: bdwalton Date: 2011-07-02 17:06:32 +0000 (Sat, 02 Jul 2011) Log Message: ----------- cswclassutils/trunk: add etcshells CAS (newly written) Added Paths: ----------- csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.i.cswetcshells csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.r.cswetcshells Added: csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.i.cswetcshells =================================================================== --- csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.i.cswetcshells (rev 0) +++ csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.i.cswetcshells 2011-07-02 17:06:32 UTC (rev 14970) @@ -0,0 +1,59 @@ +#!/bin/sh +# +# i.cswetcshells - Class action script for CSW /etc/shells registrations +# +# Written and maintained by Ben Walton +# +# 2011-07-02 Initial release + +echo "Installing class ..." + +PIR=${PKG_INSTALL_ROOT:-/} + +shellfile=$PIR/etc/shells + +while read src dest; do + echo $dest + /usr/bin/cp $src $dest || exit 2 + + shell=$dest + + if [ ! -f "$shellfile" ]; then + echo "Creating /etc/shells with default set of shells (see: man shells)" + cat <$shellfile +/bin/bash +/bin/csh +/bin/jsh +/bin/ksh +/bin/pfcsh +/bin/pfksh +/bin/pfsh +/bin/sh +/bin/tcsh +/bin/zsh +/sbin/jsh +/sbin/sh +/usr/bin/bash +/usr/bin/csh +/usr/bin/jsh +/usr/bin/ksh +/usr/bin/pfcsh +/usr/bin/pfksh +/usr/bin/pfsh +/usr/bin/sh +/usr/bin/tcsh +/usr/bin/zsh +EOF + fi + + exists=`awk "\\\$1 == \"$shell\" { print \"found\" }" $shellfile` + + if [ "$exists" != "found" ]; then + echo "Registering $shell in $shellfile." + echo "$shell # $PKGINST" >> $shellfile + else + echo "Not registering $shell in $shellfile. It is already registered." + fi +done + +exit 0 Added: csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.r.cswetcshells =================================================================== --- csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.r.cswetcshells (rev 0) +++ csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.r.cswetcshells 2011-07-02 17:06:32 UTC (rev 14970) @@ -0,0 +1,13 @@ +#!/bin/sh +# +# r.cswetcshells - Class action script for CSW /etc/shells registrations +# +# Written and maintained by Ben Walton +# +# 2011-07-02 Initial release + +while read dest; do + echo $dest + perl -ani.csw -e "print \"@F\n\" unless \$F[0] eq \"$dest\"" /etc/shells + rm -f $dest +done 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 Jul 2 19:07:18 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Sat, 02 Jul 2011 17:07:18 +0000 Subject: [csw-devel] SF.net SVN: gar:[14971] csw/mgar/pkg/cswclassutils/trunk/Makefile Message-ID: Revision: 14971 http://gar.svn.sourceforge.net/gar/?rev=14971&view=rev Author: bdwalton Date: 2011-07-02 17:07:18 +0000 (Sat, 02 Jul 2011) Log Message: ----------- cswclassutils/trunk: version bump for new cas Modified Paths: -------------- csw/mgar/pkg/cswclassutils/trunk/Makefile Modified: csw/mgar/pkg/cswclassutils/trunk/Makefile =================================================================== --- csw/mgar/pkg/cswclassutils/trunk/Makefile 2011-07-02 17:06:32 UTC (rev 14970) +++ csw/mgar/pkg/cswclassutils/trunk/Makefile 2011-07-02 17:07:18 UTC (rev 14971) @@ -1,7 +1,7 @@ # $HeadURL$ NAME = cswclassutils -VERSION = 1.44 +VERSION = 1.45 CATEGORIES = utils # a few handy functions for defining 'generic' things dynamically This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Sun Jul 3 03:44:31 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Sun, 03 Jul 2011 01:44:31 +0000 Subject: [csw-devel] SF.net SVN: gar:[14972] csw/mgar/pkg/findutils/trunk/Makefile Message-ID: Revision: 14972 http://gar.svn.sourceforge.net/gar/?rev=14972&view=rev Author: bdwalton Date: 2011-07-03 01:44:31 +0000 (Sun, 03 Jul 2011) Log Message: ----------- findutils/trunk: depend on CSWmktemp; mantis id 1101 Modified Paths: -------------- csw/mgar/pkg/findutils/trunk/Makefile Modified: csw/mgar/pkg/findutils/trunk/Makefile =================================================================== --- csw/mgar/pkg/findutils/trunk/Makefile 2011-07-02 17:07:18 UTC (rev 14971) +++ csw/mgar/pkg/findutils/trunk/Makefile 2011-07-03 01:44:31 UTC (rev 14972) @@ -26,7 +26,7 @@ DISTFILES += CSWfindutils.postinstall DISTFILES += CSWfindutils.cswreleasenotes -RUNTIME_DEP_PKGS = CSWlibintl8 +RUNTIME_DEP_PKGS = CSWlibintl8 CSWmktemp # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz @@ -37,7 +37,11 @@ CONFIGURE_ARGS = $(DIRPATHS) CONFIGURE_ARGS += --program-prefix=g CONFIGURE_ARGS += --localstatedir=/var/opt/csw +# consider adding these once other bugs sorted out. +# CONFIGURE_ARGS += --enable-leaf-optimisation +# CONFIGURE_ARGS += --enable-d_type-optimization + # Use OPT_FLAGS_SOS instead instead of CFLAGS_EXTRA, because we want -fast # to be first, and to have portions of it overridden by the ISA specific # items per modulation. Otherwise, we end up with everything being 'native', @@ -46,8 +50,8 @@ # Test target requires GNU diff -TEST_TARGET = check TEST_ARGS = "PATH=/opt/csw/gnu:$$PATH" +TEST_SCRIPTS = # 12 of the tests fail: # iregex1.old-O0 @@ -66,7 +70,7 @@ # Skip tests until the following is resolved, or we can backport the fixes as patches # https://savannah.gnu.org/bugs/?30883 -SKIPTEST ?= 1 +# SKIPTEST ?= 1 include gar/category.mk This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Sun Jul 3 03:55:41 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Sun, 03 Jul 2011 01:55:41 +0000 Subject: [csw-devel] SF.net SVN: gar:[14973] csw/mgar/pkg/findutils/trunk/Makefile Message-ID: Revision: 14973 http://gar.svn.sourceforge.net/gar/?rev=14973&view=rev Author: bdwalton Date: 2011-07-03 01:55:41 +0000 (Sun, 03 Jul 2011) Log Message: ----------- findutils/trunk: drop overrides after having released updated gnulinks Modified Paths: -------------- csw/mgar/pkg/findutils/trunk/Makefile Modified: csw/mgar/pkg/findutils/trunk/Makefile =================================================================== --- csw/mgar/pkg/findutils/trunk/Makefile 2011-07-03 01:44:31 UTC (rev 14972) +++ csw/mgar/pkg/findutils/trunk/Makefile 2011-07-03 01:55:41 UTC (rev 14973) @@ -14,13 +14,7 @@ endef CHECKPKG_OVERRIDES_CSWfindutils += file-with-bad-content|/usr/local|root/opt/csw/share/info/find.info -CHECKPKG_OVERRIDES_CSWfindutils += file-collision|/opt/csw/gnu/oldfind|CSWfindutils|CSWgnulinks -CHECKPKG_OVERRIDES_CSWfindutils += file-collision|/opt/csw/gnu/xargs|CSWfindutils|CSWgnulinks -CHECKPKG_OVERRIDES_CSWfindutils += file-collision|/opt/csw/gnu/find|CSWfindutils|CSWgnulinks -CHECKPKG_OVERRIDES_CSWfindutils += file-collision|/opt/csw/gnu/locate|CSWfindutils|CSWgnulinks -CHECKPKG_OVERRIDES_CSWfindutils += file-collision|/opt/csw/gnu/updatedb|CSWfindutils|CSWgnulinks - MASTER_SITES = $(GNU_MIRROR) DISTFILES = $(NAME)-$(VERSION).tar.gz DISTFILES += CSWfindutils.postinstall This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Sun Jul 3 23:17:56 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Sun, 03 Jul 2011 21:17:56 +0000 Subject: [csw-devel] SF.net SVN: gar:[14974] csw/mgar/pkg/apache2/trunk/Makefile Message-ID: Revision: 14974 http://gar.svn.sourceforge.net/gar/?rev=14974&view=rev Author: bdwalton Date: 2011-07-03 21:17:56 +0000 (Sun, 03 Jul 2011) Log Message: ----------- apache2/trunk: split out CSWapache2-utils; mantis id 4320 Modified Paths: -------------- csw/mgar/pkg/apache2/trunk/Makefile Modified: csw/mgar/pkg/apache2/trunk/Makefile =================================================================== --- csw/mgar/pkg/apache2/trunk/Makefile 2011-07-03 01:55:41 UTC (rev 14973) +++ csw/mgar/pkg/apache2/trunk/Makefile 2011-07-03 21:17:56 UTC (rev 14974) @@ -56,7 +56,7 @@ # The PACKAGES variable tell GAR which packages to build PACKAGES = CSWapache2 CSWapache2-dev CSWapache2-manual CSWap2suexec -PACKAGES += CSWap2worker +PACKAGES += CSWap2worker CSWapache2-utils # These packages are dummy versions to make dependencies nicer # as various things depend on them currently PACKAGES += CSWap2prefork CSWapache2rt CSWapache2c @@ -71,6 +71,7 @@ CATALOGNAME_CSWapache2 = apache2 CATALOGNAME_CSWapache2-dev = apache2_dev CATALOGNAME_CSWapache2-manual = apache2_manual +CATALOGNAME_CSWapache2-utils = apache2_utils CATALOGNAME_CSWap2suexec = ap2_suexec CATALOGNAME_CSWap2prefork = ap2_prefork CATALOGNAME_CSWap2worker = ap2_worker @@ -79,16 +80,18 @@ SPKG_DESC_CSWapache2 = A high performance Unix-based HTTP server. SPKG_DESC_CSWapache2-dev = The development files for Apache2. SPKG_DESC_CSWapache2-manual = The Apache2 manual files. +SPKG_DESC_CSWapache2-utils = Utility programs for Apache2. SPKG_DESC_CSWap2suexec = The standard suEXEC binary for Apache2. SPKG_DESC_CSWap2worker = The apache worker mpm. SPKG_DESC_CSWap2prefork = A stub for the old prefork mpm package. SPKG_DESC_CSWapache2rt = A stub for the old apache2rt package. SPKG_DESC_CSWapache2c = A stub for the old apache2c package. + RUNTIME_DEP_PKGS_CSWapache2 += CSWexpat CSWiconv CSWosslutils RUNTIME_DEP_PKGS_CSWapache2 += CSWoldaprt CSWosslrt CSWzlib RUNTIME_DEP_PKGS_CSWapache2 += CSWapr CSWapr-util CSWbdb48 -RUNTIME_DEP_PKGS_CSWapache2 += CSWapache2c CSWperl +RUNTIME_DEP_PKGS_CSWapache2 += CSWapache2c CSWperl CSWapache2-utils RUNTIME_DEP_PKGS_CSWapache2-manual = CSWapache2 RUNTIME_DEP_PKGS_CSWapache2-dev = CSWapache2 RUNTIME_DEP_PKGS_CSWap2suexec = CSWapache2 @@ -215,6 +218,12 @@ LIBTOOL_LADIR = $(APACHE_ROOT)/lib STRIP_DIRS = $(APACHE_ROOT)/sbin $(APACHE_ROOT)/libexec +PKGFILES_CSWapache2-utils = .*sbin/ab .*sbin/dbmmanage .*sbin/htdbm +PKGFILES_CSWapache2-utils += .*sbin/htdigest .*sbin/htpasswd .*sbin/logresolve +PKGFILES_CSWapache2-utils += .*sbin/htcacheclean .*sbin/rotatelogs +PKGFILES_CSWapache2-utils = .*man8/ab .*man1/dbmmanage .*man1/htdbm +PKGFILES_CSWapache2-utils += .*man1/htdigest .*man1/htpasswd .*man8/logresolve +PKGFILES_CSWapache2-utils += .*man8/htcacheclean .*man8/rotatelogs PKGFILES_CSWap2suexec = .*sbin/suexec .*libexec/.*suexec.* .*/man/.*suexec.* PKGFILES_CSWap2suexec += .*ap2mod/suexec PKGFILES_CSWapache2-dev = .*include/.* .*\.(a|la) 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 Jul 4 02:16:31 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Mon, 04 Jul 2011 00:16:31 +0000 Subject: [csw-devel] SF.net SVN: gar:[14975] csw/mgar/pkg/apache2/trunk/Makefile Message-ID: Revision: 14975 http://gar.svn.sourceforge.net/gar/?rev=14975&view=rev Author: bdwalton Date: 2011-07-04 00:16:31 +0000 (Mon, 04 Jul 2011) Log Message: ----------- apache2/trunk: correct pkgfiles for utils split Modified Paths: -------------- csw/mgar/pkg/apache2/trunk/Makefile Modified: csw/mgar/pkg/apache2/trunk/Makefile =================================================================== --- csw/mgar/pkg/apache2/trunk/Makefile 2011-07-03 21:17:56 UTC (rev 14974) +++ csw/mgar/pkg/apache2/trunk/Makefile 2011-07-04 00:16:31 UTC (rev 14975) @@ -221,8 +221,9 @@ PKGFILES_CSWapache2-utils = .*sbin/ab .*sbin/dbmmanage .*sbin/htdbm PKGFILES_CSWapache2-utils += .*sbin/htdigest .*sbin/htpasswd .*sbin/logresolve PKGFILES_CSWapache2-utils += .*sbin/htcacheclean .*sbin/rotatelogs -PKGFILES_CSWapache2-utils = .*man8/ab .*man1/dbmmanage .*man1/htdbm -PKGFILES_CSWapache2-utils += .*man1/htdigest .*man1/htpasswd .*man8/logresolve +PKGFILES_CSWapache2-utils += .*man8/ab.8 .*man1/dbmmanage.1 .*man1/htdbm.1 +PKGFILES_CSWapache2-utils += .*man1/htdigest.1 .*man1/htpasswd.1 +PKGFILES_CSWapache2-utils += .*man8/logresolve.8 PKGFILES_CSWapache2-utils += .*man8/htcacheclean .*man8/rotatelogs PKGFILES_CSWap2suexec = .*sbin/suexec .*libexec/.*suexec.* .*/man/.*suexec.* PKGFILES_CSWap2suexec += .*ap2mod/suexec 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 Jul 4 02:17:29 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Mon, 04 Jul 2011 00:17:29 +0000 Subject: [csw-devel] SF.net SVN: gar:[14976] csw/mgar/pkg/apache2/trunk/Makefile Message-ID: Revision: 14976 http://gar.svn.sourceforge.net/gar/?rev=14976&view=rev Author: bdwalton Date: 2011-07-04 00:17:29 +0000 (Mon, 04 Jul 2011) Log Message: ----------- apache2/trunk: add runtime deps for utils split, override apache2 dep on utils package Modified Paths: -------------- csw/mgar/pkg/apache2/trunk/Makefile Modified: csw/mgar/pkg/apache2/trunk/Makefile =================================================================== --- csw/mgar/pkg/apache2/trunk/Makefile 2011-07-04 00:16:31 UTC (rev 14975) +++ csw/mgar/pkg/apache2/trunk/Makefile 2011-07-04 00:17:29 UTC (rev 14976) @@ -94,6 +94,13 @@ RUNTIME_DEP_PKGS_CSWapache2 += CSWapache2c CSWperl CSWapache2-utils RUNTIME_DEP_PKGS_CSWapache2-manual = CSWapache2 RUNTIME_DEP_PKGS_CSWapache2-dev = CSWapache2 +RUNTIME_DEP_PKGS_CSWapache2-utils += CSWapr +RUNTIME_DEP_PKGS_CSWapache2-utils += CSWiconv +RUNTIME_DEP_PKGS_CSWapache2-utils += CSWexpat +RUNTIME_DEP_PKGS_CSWapache2-utils += CSWapr-util +RUNTIME_DEP_PKGS_CSWapache2-utils += CSWbdb48 +RUNTIME_DEP_PKGS_CSWapache2-utils += CSWapache2 +RUNTIME_DEP_PKGS_CSWapache2-utils += CSWosslrt RUNTIME_DEP_PKGS_CSWap2suexec = CSWapache2 RUNTIME_DEP_PKGS_CSWap2prefork = CSWapache2 CSWapache2c RUNTIME_DEP_PKGS_CSWap2worker = CSWapache2 CSWapr CSWexpat CSWap2prefork @@ -104,6 +111,7 @@ CHECKPKG_OVERRIDES_CSWapache2 += surplus-dependency|CSWosslutils CHECKPKG_OVERRIDES_CSWapache2 += surplus-dependency|CSWapache2c CHECKPKG_OVERRIDES_CSWapache2 += surplus-dependency|CSWperl +CHECKPKG_OVERRIDES_CSWapache2 += surplus-dependency|CSWapache2-utils CHECKPKG_OVERRIDES_CSWap2prefork += surplus-dependency|CSWapache2 CHECKPKG_OVERRIDES_CSWap2prefork += surplus-dependency|CSWapache2c CHECKPKG_OVERRIDES_CSWap2worker += surplus-dependency|CSWap2prefork 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 Jul 4 02:26:14 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Mon, 04 Jul 2011 00:26:14 +0000 Subject: [csw-devel] SF.net SVN: gar:[14977] csw/mgar/pkg/apache2/trunk/Makefile Message-ID: Revision: 14977 http://gar.svn.sourceforge.net/gar/?rev=14977&view=rev Author: bdwalton Date: 2011-07-04 00:26:14 +0000 (Mon, 04 Jul 2011) Log Message: ----------- apache2/trunk: drop unused overrides Modified Paths: -------------- csw/mgar/pkg/apache2/trunk/Makefile Modified: csw/mgar/pkg/apache2/trunk/Makefile =================================================================== --- csw/mgar/pkg/apache2/trunk/Makefile 2011-07-04 00:17:29 UTC (rev 14976) +++ csw/mgar/pkg/apache2/trunk/Makefile 2011-07-04 00:26:14 UTC (rev 14977) @@ -107,7 +107,6 @@ RUNTIME_DEP_PKGS_CSWap2worker += CSWbdb48 CSWapr-util CSWiconv CSWapache2c RUNTIME_DEP_PKGS_CSWapache2rt = CSWapache2 -CHECKPKG_OVERRIDES_CSWapache2 += surplus-dependency|CSWalternatives CHECKPKG_OVERRIDES_CSWapache2 += surplus-dependency|CSWosslutils CHECKPKG_OVERRIDES_CSWapache2 += surplus-dependency|CSWapache2c CHECKPKG_OVERRIDES_CSWapache2 += surplus-dependency|CSWperl @@ -115,7 +114,6 @@ CHECKPKG_OVERRIDES_CSWap2prefork += surplus-dependency|CSWapache2 CHECKPKG_OVERRIDES_CSWap2prefork += surplus-dependency|CSWapache2c CHECKPKG_OVERRIDES_CSWap2worker += surplus-dependency|CSWap2prefork -CHECKPKG_OVERRIDES_CSWap2worker += surplus-dependency|CSWalternatives CHECKPKG_OVERRIDES_CSWap2worker += surplus-dependency|CSWapache2c CHECKPKG_OVERRIDES_CSWapache2rt += surplus-dependency|CSWapache2 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 Jul 4 02:45:14 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Mon, 04 Jul 2011 00:45:14 +0000 Subject: [csw-devel] SF.net SVN: gar:[14978] csw/mgar/pkg/apache2/trunk/Makefile Message-ID: Revision: 14978 http://gar.svn.sourceforge.net/gar/?rev=14978&view=rev Author: bdwalton Date: 2011-07-04 00:45:14 +0000 (Mon, 04 Jul 2011) Log Message: ----------- apache2/trunk: put the checkgid utility in the utils subpackage Modified Paths: -------------- csw/mgar/pkg/apache2/trunk/Makefile Modified: csw/mgar/pkg/apache2/trunk/Makefile =================================================================== --- csw/mgar/pkg/apache2/trunk/Makefile 2011-07-04 00:26:14 UTC (rev 14977) +++ csw/mgar/pkg/apache2/trunk/Makefile 2011-07-04 00:45:14 UTC (rev 14978) @@ -227,6 +227,7 @@ PKGFILES_CSWapache2-utils = .*sbin/ab .*sbin/dbmmanage .*sbin/htdbm PKGFILES_CSWapache2-utils += .*sbin/htdigest .*sbin/htpasswd .*sbin/logresolve PKGFILES_CSWapache2-utils += .*sbin/htcacheclean .*sbin/rotatelogs +PKGFILES_CSWapache2-utils += .*sbin/checkgid PKGFILES_CSWapache2-utils += .*man8/ab.8 .*man1/dbmmanage.1 .*man1/htdbm.1 PKGFILES_CSWapache2-utils += .*man1/htdigest.1 .*man1/htpasswd.1 PKGFILES_CSWapache2-utils += .*man8/logresolve.8 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 Jul 4 03:10:24 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Mon, 04 Jul 2011 01:10:24 +0000 Subject: [csw-devel] SF.net SVN: gar:[14979] csw/mgar/pkg/apache2/trunk/Makefile Message-ID: Revision: 14979 http://gar.svn.sourceforge.net/gar/?rev=14979&view=rev Author: bdwalton Date: 2011-07-04 01:10:24 +0000 (Mon, 04 Jul 2011) Log Message: ----------- apache2/trunk: utils package needs perl for dbmmanage Modified Paths: -------------- csw/mgar/pkg/apache2/trunk/Makefile Modified: csw/mgar/pkg/apache2/trunk/Makefile =================================================================== --- csw/mgar/pkg/apache2/trunk/Makefile 2011-07-04 00:45:14 UTC (rev 14978) +++ csw/mgar/pkg/apache2/trunk/Makefile 2011-07-04 01:10:24 UTC (rev 14979) @@ -101,6 +101,7 @@ RUNTIME_DEP_PKGS_CSWapache2-utils += CSWbdb48 RUNTIME_DEP_PKGS_CSWapache2-utils += CSWapache2 RUNTIME_DEP_PKGS_CSWapache2-utils += CSWosslrt +RUNTIME_DEP_PKGS_CSWapache2-utils += CSWperl RUNTIME_DEP_PKGS_CSWap2suexec = CSWapache2 RUNTIME_DEP_PKGS_CSWap2prefork = CSWapache2 CSWapache2c RUNTIME_DEP_PKGS_CSWap2worker = CSWapache2 CSWapr CSWexpat CSWap2prefork 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 Jul 4 03:15:13 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Mon, 04 Jul 2011 01:15:13 +0000 Subject: [csw-devel] SF.net SVN: gar:[14980] csw/mgar/pkg/apache2/trunk/Makefile Message-ID: Revision: 14980 http://gar.svn.sourceforge.net/gar/?rev=14980&view=rev Author: bdwalton Date: 2011-07-04 01:15:13 +0000 (Mon, 04 Jul 2011) Log Message: ----------- apache2/trunk: override perl dep for utils subpackage Modified Paths: -------------- csw/mgar/pkg/apache2/trunk/Makefile Modified: csw/mgar/pkg/apache2/trunk/Makefile =================================================================== --- csw/mgar/pkg/apache2/trunk/Makefile 2011-07-04 01:10:24 UTC (rev 14979) +++ csw/mgar/pkg/apache2/trunk/Makefile 2011-07-04 01:15:13 UTC (rev 14980) @@ -112,6 +112,7 @@ CHECKPKG_OVERRIDES_CSWapache2 += surplus-dependency|CSWapache2c CHECKPKG_OVERRIDES_CSWapache2 += surplus-dependency|CSWperl CHECKPKG_OVERRIDES_CSWapache2 += surplus-dependency|CSWapache2-utils +CHECKPKG_OVERRIDES_CSWapache2-utils += surplus-dependency|CSWperl CHECKPKG_OVERRIDES_CSWap2prefork += surplus-dependency|CSWapache2 CHECKPKG_OVERRIDES_CSWap2prefork += surplus-dependency|CSWapache2c CHECKPKG_OVERRIDES_CSWap2worker += surplus-dependency|CSWap2prefork 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 Jul 4 04:41:32 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Mon, 04 Jul 2011 02:41:32 +0000 Subject: [csw-devel] SF.net SVN: gar:[14981] csw/mgar/pkg/php5/trunk/Makefile Message-ID: Revision: 14981 http://gar.svn.sourceforge.net/gar/?rev=14981&view=rev Author: bdwalton Date: 2011-07-04 02:41:32 +0000 (Mon, 04 Jul 2011) Log Message: ----------- php5/trunk: enable scan dir as it does not seem to affect default operation or config installation Modified Paths: -------------- csw/mgar/pkg/php5/trunk/Makefile Modified: csw/mgar/pkg/php5/trunk/Makefile =================================================================== --- csw/mgar/pkg/php5/trunk/Makefile 2011-07-04 01:15:13 UTC (rev 14980) +++ csw/mgar/pkg/php5/trunk/Makefile 2011-07-04 02:41:32 UTC (rev 14981) @@ -231,8 +231,7 @@ CONFIGURE_ARGS += --enable-xml CONFIGURE_ARGS += --with-libxml-dir=$(prefix) CONFIGURE_ARGS += --with-config-file-path=$(sysconfdir) -# enable this for the next release... -#CONFIGURE_ARGS += --with-config-file-scan-dir=$(sysconfdir)/conf.d +CONFIGURE_ARGS += --with-config-file-scan-dir=$(sysconfdir)/conf.d ifeq ($(SAPI),ap2) CONFIGURE_ARGS += --enable-bcmath=shared 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 Jul 4 15:11:33 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Mon, 04 Jul 2011 13:11:33 +0000 Subject: [csw-devel] SF.net SVN: gar:[14982] csw/mgar/pkg/php5/trunk/Makefile Message-ID: Revision: 14982 http://gar.svn.sourceforge.net/gar/?rev=14982&view=rev Author: bdwalton Date: 2011-07-04 13:11:33 +0000 (Mon, 04 Jul 2011) Log Message: ----------- php5/trunk: update readline dependencies Modified Paths: -------------- csw/mgar/pkg/php5/trunk/Makefile Modified: csw/mgar/pkg/php5/trunk/Makefile =================================================================== --- csw/mgar/pkg/php5/trunk/Makefile 2011-07-04 02:41:32 UTC (rev 14981) +++ csw/mgar/pkg/php5/trunk/Makefile 2011-07-04 13:11:33 UTC (rev 14982) @@ -61,7 +61,7 @@ BUILD_DEP_PKGS += CSWlibcares-dev CSWftype2 CSWiconv CSWimap-devel BUILD_DEP_PKGS += CSWoldapdevel CSWkrb5libdev CSWsasl CSWlibltdl7 BUILD_DEP_PKGS += CSWlibmcrypt CSWfreetds CSWmysql5devel CSWunixodbc -BUILD_DEP_PKGS += CSWlibpq CSWreadline CSWlibncurses-dev CSWnetsnmp +BUILD_DEP_PKGS += CSWlibpq CSWlibreadline-dev CSWlibncurses-dev CSWnetsnmp BUILD_DEP_PKGS += CSWsqlite3devel CSWaspell CSWhtmltidy CSWpostgresql # NOTE: I think this is a leftover bug. we shouldn't depend on two versions # of sqlite... @@ -193,7 +193,7 @@ $(eval $(call php5_subpackage,pgsql,CSWlibpq)) $(eval $(call php5_subpackage,posix)) $(eval $(call php5_subpackage,pspell,CSWaspell)) -$(eval $(call php5_subpackage,readline,CSWreadline CSWlibncurses5)) +$(eval $(call php5_subpackage,readline,CSWlibreadline6 CSWlibncurses5)) $(eval $(call php5_subpackage,session,CSWlibmm)) PKGFILES_CSWphp5-session += .*/include/php/ext/session.* $(eval $(call php5_subpackage,shmop)) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From opk at users.sourceforge.net Tue Jul 5 09:47:19 2011 From: opk at users.sourceforge.net (opk at users.sourceforge.net) Date: Tue, 05 Jul 2011 07:47:19 +0000 Subject: [csw-devel] SF.net SVN: gar:[14983] csw/mgar/pkg/zsh/trunk/Makefile Message-ID: Revision: 14983 http://gar.svn.sourceforge.net/gar/?rev=14983&view=rev Author: opk Date: 2011-07-05 07:47:19 +0000 (Tue, 05 Jul 2011) Log Message: ----------- update dependencies Modified Paths: -------------- csw/mgar/pkg/zsh/trunk/Makefile Modified: csw/mgar/pkg/zsh/trunk/Makefile =================================================================== --- csw/mgar/pkg/zsh/trunk/Makefile 2011-07-04 13:11:33 UTC (rev 14982) +++ csw/mgar/pkg/zsh/trunk/Makefile 2011-07-05 07:47:19 UTC (rev 14983) @@ -19,7 +19,7 @@ LICENSE = LICENCE -RUNTIME_DEP_PKGS = CSWiconv CSWncurses CSWpcrert CSWgdbm +RUNTIME_DEP_PKGS = CSWiconv CSWlibncursesw5 CSWlibpcre0 CSWlibgdbm3 BUILD_DEP_PKGS = CSWpcre SPKG_SOURCEURL = http://www.zsh.org @@ -34,6 +34,31 @@ CONFIGURE_ARGS += --enable-fndir=$(sharedstatedir)/$(NAME)/functions CONFIGURE_ARGS += --enable-pcre +CHECKPKG_OVERRIDES_CSWzsh += file-with-bad-content|/usr/share|root/opt/csw/share/zsh/functions/_units +CHECKPKG_OVERRIDES_CSWzsh += file-with-bad-content|/usr/share|root/opt/csw/share/zsh/functions/_hg +CHECKPKG_OVERRIDES_CSWzsh += file-with-bad-content|/usr/share|root/opt/csw/share/zsh/functions/_loadkeys +CHECKPKG_OVERRIDES_CSWzsh += file-with-bad-content|/usr/share|root/opt/csw/share/zsh/functions/_ecasound +CHECKPKG_OVERRIDES_CSWzsh += file-with-bad-content|/usr/share|root/opt/csw/share/zsh/functions/_path_commands +CHECKPKG_OVERRIDES_CSWzsh += file-with-bad-content|/usr/share|root/opt/csw/share/zsh/functions/_lintian +CHECKPKG_OVERRIDES_CSWzsh += file-with-bad-content|/usr/share|root/opt/csw/share/zsh/functions/_lsusb +CHECKPKG_OVERRIDES_CSWzsh += file-with-bad-content|/usr/share|root/opt/csw/share/zsh/functions/run-help +CHECKPKG_OVERRIDES_CSWzsh += file-with-bad-content|/usr/share|root/opt/csw/share/zsh/functions/_cdrdao +CHECKPKG_OVERRIDES_CSWzsh += file-with-bad-content|/usr/share|root/opt/csw/share/zsh/functions/_setxkbmap +CHECKPKG_OVERRIDES_CSWzsh += file-with-bad-content|/usr/local|root/opt/csw/share/zsh/functions/_units +CHECKPKG_OVERRIDES_CSWzsh += file-with-bad-content|/usr/local|root/opt/csw/bin/zsh-4.3.12 +CHECKPKG_OVERRIDES_CSWzsh += file-with-bad-content|/usr/share|root/opt/csw/share/man/man1/zshcontrib.1 +CHECKPKG_OVERRIDES_CSWzsh += file-with-bad-content|/usr/local|root/opt/csw/share/zsh/functions/_gcc +CHECKPKG_OVERRIDES_CSWzsh += file-with-bad-content|/usr/local|root/opt/csw/share/zsh/functions/_urls +CHECKPKG_OVERRIDES_CSWzsh += file-with-bad-content|/usr/local|root/opt/csw/share/zsh/functions/_path_files +CHECKPKG_OVERRIDES_CSWzsh += file-with-bad-content|/usr/local|root/opt/csw/share/man/man1/zshmisc.1 +CHECKPKG_OVERRIDES_CSWzsh += file-with-bad-content|/usr/local|root/opt/csw/share/man/man1/zshmodules.1 +CHECKPKG_OVERRIDES_CSWzsh += file-with-bad-content|/usr/local|root/opt/csw/share/man/man1/zshoptions.1 +CHECKPKG_OVERRIDES_CSWzsh += file-with-bad-content|/usr/local|root/opt/csw/share/man/man1/zshcontrib.1 +CHECKPKG_OVERRIDES_CSWzsh += file-with-bad-content|/usr/local|root/opt/csw/share/man/man1/zshparam.1 +CHECKPKG_OVERRIDES_CSWzsh += file-with-bad-content|/usr/local|root/opt/csw/share/zsh/functions/_complete_tag +CHECKPKG_OVERRIDES_CSWzsh += file-with-bad-content|/usr/local|root/opt/csw/share/zsh/functions/_twisted +CHECKPKG_OVERRIDES_CSWzsh += file-with-bad-content|/usr/local|root/opt/csw/share/zsh/functions/compaudit + include gar/category.mk # Use term.h from ncurses or we get compile errors 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 Jul 5 10:33:08 2011 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 05 Jul 2011 08:33:08 +0000 Subject: [csw-devel] SF.net SVN: gar:[14984] csw/mgar/pkg/libflac8/trunk/Makefile Message-ID: Revision: 14984 http://gar.svn.sourceforge.net/gar/?rev=14984&view=rev Author: dmichelsen Date: 2011-07-05 08:33:08 +0000 (Tue, 05 Jul 2011) Log Message: ----------- libflac8: Add legacy dependencies from CSWflac to libflac4 and libflac7 as reported in #4800 Modified Paths: -------------- csw/mgar/pkg/libflac8/trunk/Makefile Modified: csw/mgar/pkg/libflac8/trunk/Makefile =================================================================== --- csw/mgar/pkg/libflac8/trunk/Makefile 2011-07-05 07:47:19 UTC (rev 14983) +++ csw/mgar/pkg/libflac8/trunk/Makefile 2011-07-05 08:33:08 UTC (rev 14984) @@ -54,6 +54,11 @@ RUNTIME_DEP_PKGS_CSWflac += CSWlibogg0 RUNTIME_DEP_PKGS_CSWflac += CSWiconv RUNTIME_DEP_PKGS_CSWflac += CSWlibflac8 +# Dependencies for legacy packages needing old libs but depending on CSWflac +RUNTIME_DEP_PKGS_CSWflac += CSWlibflac4 +CHECKPKG_OVERRIDES_CSWflac += surplus-dependency|CSWlibflac4 +RUNTIME_DEP_PKGS_CSWflac += CSWlibflac7 +CHECKPKG_OVERRIDES_CSWflac += surplus-dependency|CSWlibflac7 PACKAGES += CSWxmms-flac PKGFILES_CSWxmms-flac = $(libdir)/xmms/.* This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From opk at users.sourceforge.net Tue Jul 5 10:35:34 2011 From: opk at users.sourceforge.net (opk at users.sourceforge.net) Date: Tue, 05 Jul 2011 08:35:34 +0000 Subject: [csw-devel] SF.net SVN: gar:[14985] csw/mgar/pkg/zsh/trunk/Makefile Message-ID: Revision: 14985 http://gar.svn.sourceforge.net/gar/?rev=14985&view=rev Author: opk Date: 2011-07-05 08:35:34 +0000 (Tue, 05 Jul 2011) Log Message: ----------- further override Modified Paths: -------------- csw/mgar/pkg/zsh/trunk/Makefile Modified: csw/mgar/pkg/zsh/trunk/Makefile =================================================================== --- csw/mgar/pkg/zsh/trunk/Makefile 2011-07-05 08:33:08 UTC (rev 14984) +++ csw/mgar/pkg/zsh/trunk/Makefile 2011-07-05 08:35:34 UTC (rev 14985) @@ -58,6 +58,7 @@ CHECKPKG_OVERRIDES_CSWzsh += file-with-bad-content|/usr/local|root/opt/csw/share/zsh/functions/_complete_tag CHECKPKG_OVERRIDES_CSWzsh += file-with-bad-content|/usr/local|root/opt/csw/share/zsh/functions/_twisted CHECKPKG_OVERRIDES_CSWzsh += file-with-bad-content|/usr/local|root/opt/csw/share/zsh/functions/compaudit +CHECKPKG_OVERRIDES_CSWzsh += file-with-bad-content|/usr/share|root/opt/csw/share/zsh/functions/mere include gar/category.mk This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dam at opencsw.org Tue Jul 5 10:48:54 2011 From: dam at opencsw.org (Dagobert Michelsen) Date: Tue, 5 Jul 2011 10:48:54 +0200 Subject: [csw-devel] Fwd: SF.net SVN: gar:[14985] csw/mgar/pkg/zsh/trunk/Makefile References: Message-ID: Hi Oliver, could you please prefix your commit messages with the package like "zsh: Further override" This makes it easier to follow the commit log. Best regards -- Dago Anfang der weitergeleiteten E-Mail: > Von: opk at users.sourceforge.net > Datum: 5. Juli 2011 10:35:34 MESZ > An: devel at lists.opencsw.org > Betreff: [csw-devel] SF.net SVN: gar:[14985] csw/mgar/pkg/zsh/trunk/Makefile > Antwort an: Broadcasts commit logs for build descriptions and GAR > > Revision: 14985 > http://gar.svn.sourceforge.net/gar/?rev=14985&view=rev > Author: opk > Date: 2011-07-05 08:35:34 +0000 (Tue, 05 Jul 2011) > > Log Message: > ----------- > further override > > Modified Paths: > -------------- > csw/mgar/pkg/zsh/trunk/Makefile > > Modified: csw/mgar/pkg/zsh/trunk/Makefile > =================================================================== > --- csw/mgar/pkg/zsh/trunk/Makefile 2011-07-05 08:33:08 UTC (rev 14984) > +++ csw/mgar/pkg/zsh/trunk/Makefile 2011-07-05 08:35:34 UTC (rev 14985) > @@ -58,6 +58,7 @@ > CHECKPKG_OVERRIDES_CSWzsh += file-with-bad-content|/usr/local|root/opt/csw/share/zsh/functions/_complete_tag > CHECKPKG_OVERRIDES_CSWzsh += file-with-bad-content|/usr/local|root/opt/csw/share/zsh/functions/_twisted > CHECKPKG_OVERRIDES_CSWzsh += file-with-bad-content|/usr/local|root/opt/csw/share/zsh/functions/compaudit > +CHECKPKG_OVERRIDES_CSWzsh += file-with-bad-content|/usr/share|root/opt/csw/share/zsh/functions/mere > > include gar/category.mk > > > > This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. > _______________________________________________ > devel mailing list > devel at lists.opencsw.org > https://lists.opencsw.org/mailman/listinfo/devel -- "You don't become great by trying to be great, you become great by wanting to do something, and then doing it so hard that you become great in the process." - xkcd #896 From dmichelsen at users.sourceforge.net Tue Jul 5 11:44:48 2011 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 05 Jul 2011 09:44:48 +0000 Subject: [csw-devel] SF.net SVN: gar:[14986] csw/mgar/pkg/easytag/trunk Message-ID: Revision: 14986 http://gar.svn.sourceforge.net/gar/?rev=14986&view=rev Author: dmichelsen Date: 2011-07-05 09:44:48 +0000 (Tue, 05 Jul 2011) Log Message: ----------- easytag: Move to mGAR v2, general rework Modified Paths: -------------- csw/mgar/pkg/easytag/trunk/Makefile csw/mgar/pkg/easytag/trunk/checksums Removed Paths: ------------- csw/mgar/pkg/easytag/trunk/files/CSWeasytag.depend csw/mgar/pkg/easytag/trunk/files/CSWeasytag.gspec Property Changed: ---------------- csw/mgar/pkg/easytag/trunk/ Property changes on: csw/mgar/pkg/easytag/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/easytag/trunk/Makefile =================================================================== --- csw/mgar/pkg/easytag/trunk/Makefile 2011-07-05 08:35:34 UTC (rev 14985) +++ csw/mgar/pkg/easytag/trunk/Makefile 2011-07-05 09:44:48 UTC (rev 14986) @@ -1,25 +1,42 @@ NAME = easytag -VERSION = 2.1.5 +VERSION = 2.1.6 CATEGORIES = apps DESCRIPTION = Tag editor for MP3, Ogg Vorbis files and more define BLURB -EasyTAG is a utility for viewing and editing tags for MP3, MP2, MP4/AAC, FLAC, Ogg Vorbis, MusePack, Monkey's Audio and WavPack files. Its simple and nice GTK+ interface makes tagging easier under GNU/Linux or Windows. + EasyTAG is a utility for viewing and editing tags for MP3, MP2, MP4/AAC, FLAC, + Ogg Vorbis, MusePack, Monkey's Audio and WavPack files. Its simple and nice GTK+ + interface makes tagging easier under GNU/Linux or Windows. endef MASTER_SITES = $(SF_MIRRORS) DISTFILES = $(NAME)-$(VERSION).tar.bz2 -DISTFILES += $(call admfiles,CSWeasytag,depend) +PATCHFILES += patch_easytag_216_cddb_manual_search_fix.diff -# We define upstream file regex so we can be notifed of new upstream software release -UPSTREAM_MASTER_SITES = $(SF_PROJECT_SHOWFILE)=5216 -UPSTREAM_USE_SF = 1 -UFILES_REGEX = (\d+(?:\.\d+)*) +BUILD_DEP_PKGS += CSWlibogg-dev +BUILD_DEP_PKGS += CSWlibvorbis-dev +BUILD_DEP_PKGS += CSWlibflac-dev +BUILD_DEP_PKGS += CSWlibspeex-dev -GARCOMPILER = GNU +RUNTIME_DEP_PKGS_CSWeasytag += CSWlibintl8 +RUNTIME_DEP_PKGS_CSWeasytag += CSWlibogg0 +RUNTIME_DEP_PKGS_CSWeasytag += CSWlibvorbis0 +RUNTIME_DEP_PKGS_CSWeasytag += CSWlibflac8 +RUNTIME_DEP_PKGS_CSWeasytag += CSWfconfig +RUNTIME_DEP_PKGS_CSWeasytag += CSWpango +RUNTIME_DEP_PKGS_CSWeasytag += CSWftype2 +RUNTIME_DEP_PKGS_CSWeasytag += CSWlibid3tag +RUNTIME_DEP_PKGS_CSWeasytag += CSWzlib +RUNTIME_DEP_PKGS_CSWeasytag += CSWgtk2 +RUNTIME_DEP_PKGS_CSWeasytag += CSWlibatk +RUNTIME_DEP_PKGS_CSWeasytag += CSWlibwavpack1 +RUNTIME_DEP_PKGS_CSWeasytag += CSWlibcairo2 +RUNTIME_DEP_PKGS_CSWeasytag += CSWlibvorbisfile3 +RUNTIME_DEP_PKGS_CSWeasytag += CSWglib2 -CONFIGURE_ARGS = --prefix=$(prefix) -CONFIGURE_ARGS += --mandir=/opt/csw/share/man +RUNTIME_DEP_PKGS_CSWeasytag += CSWgcc3g++rt -TEST_SCRIPTS = +# Needed for gethostbyname +EXTRA_LINKER_FLAGS = -lnsl + include gar/category.mk Modified: csw/mgar/pkg/easytag/trunk/checksums =================================================================== --- csw/mgar/pkg/easytag/trunk/checksums 2011-07-05 08:35:34 UTC (rev 14985) +++ csw/mgar/pkg/easytag/trunk/checksums 2011-07-05 09:44:48 UTC (rev 14986) @@ -1,3 +1,2 @@ -f80ceb61da7335fbbdaeef365d65d3be download/easytag-2.1.5.tar.bz2 -24b756241f31a99b4d8e7eb27292dda8 download/CSWeasytag.gspec -cec0520b0283c5afb5d4683dae6c1d8e download/CSWeasytag.depend +6c5b9dc2bf1f3b0a11bd4efc81aaa9ee easytag-2.1.6.tar.bz2 +3e968c6c990e931c1d6002437c8be5c5 patch_easytag_216_cddb_manual_search_fix.diff Deleted: csw/mgar/pkg/easytag/trunk/files/CSWeasytag.depend =================================================================== --- csw/mgar/pkg/easytag/trunk/files/CSWeasytag.depend 2011-07-05 08:35:34 UTC (rev 14985) +++ csw/mgar/pkg/easytag/trunk/files/CSWeasytag.depend 2011-07-05 09:44:48 UTC (rev 14986) @@ -1,22 +0,0 @@ -P CSWexpat expat - XML Parser Toolkit -P CSWfconfig fontconfig - A library for configuring and customizing font access. -P CSWflac libflac - FLAC audio codec support library -P CSWftype2 freetype2 - The free and portable high quality font engine -P CSWgcc4corert gcc4corert - GNU C Compiler Run Time -P CSWgcc4g++rt gcc4g++rt - GNU C++ Compiler Run Time -P CSWggettext ggettext - GNU gettext -P CSWglib2 glib2 - the low-level core library for GTK+ and GNOME -P CSWgtk2 gtk2 - GTK+, The multi-platform toolkit for GUI development -P CSWiconv libiconv - GNU iconv library -P CSWid3lib id3lib - library for manipulating ID3v1/v1.1 and ID3v2 tags -P CSWlibatk libatk - Accessibility toolkit for GNOME -P CSWlibcairo libcairo - The Cairo 2D Graphics Library -P CSWlibid3tag libid3tag - a library for reading and (eventually) writing ID3 tags -P CSWlibogg libogg - Ogg bitstream format support library -P CSWlibxrender libxrender - fontconfig.org Xrender library -P CSWpango libpango - library for laying out and rendering international text -P CSWpng png - library for Portable Network Graphics format (PNG) -P CSWspeex libspeex - Speex audio codec support library -P CSWsunmath libsunmath - Sun maths library -P CSWvorbis libvorbis - Vorbis audio codec support library -P CSWzlib zlib - Zlib Data Compression Library Deleted: csw/mgar/pkg/easytag/trunk/files/CSWeasytag.gspec =================================================================== --- csw/mgar/pkg/easytag/trunk/files/CSWeasytag.gspec 2011-07-05 08:35:34 UTC (rev 14985) +++ csw/mgar/pkg/easytag/trunk/files/CSWeasytag.gspec 2011-07-05 09:44:48 UTC (rev 14986) @@ -1,4 +0,0 @@ -%var bitname easytag -%var pkgname CSWeasytag -%include url file://%{GARDIR}/pkglib/csw_standard.gspec -%copyright url file://%{WORKSRC}/COPYING This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Tue Jul 5 12:06:00 2011 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 05 Jul 2011 10:06:00 +0000 Subject: [csw-devel] SF.net SVN: gar:[14987] csw/mgar/pkg/id3lib/trunk/Makefile Message-ID: Revision: 14987 http://gar.svn.sourceforge.net/gar/?rev=14987&view=rev Author: dmichelsen Date: 2011-07-05 10:06:00 +0000 (Tue, 05 Jul 2011) Log Message: ----------- id3lib: Update to new standards Modified Paths: -------------- csw/mgar/pkg/id3lib/trunk/Makefile Modified: csw/mgar/pkg/id3lib/trunk/Makefile =================================================================== --- csw/mgar/pkg/id3lib/trunk/Makefile 2011-07-05 09:44:48 UTC (rev 14986) +++ csw/mgar/pkg/id3lib/trunk/Makefile 2011-07-05 10:06:00 UTC (rev 14987) @@ -17,7 +17,7 @@ PACKAGES += CSWlibid3-3-8-3 CATALOGNAME_CSWlibid3-3-8-3 = libid3_3_8_3 SPKG_DESC_CSWlibid3-3-8-3 = Library for manipulating ID3v1/v1.1 and ID3v2 tags, libid3-3.8.so.3 -PKGFILES_CSWlibid3-3-8-3 = $(call baseisadirs,$(libdir),libid3-3\.8\.so\.3(\.\d+)*) +PKGFILES_CSWlibid3-3-8-3 = $(call pkgfiles_lib,libid3-3.8.so.3) RUNTIME_DEP_PKGS_CSWlibid3-3-8-3 += CSWzlib PACKAGES += CSWlibid3-dev @@ -47,11 +47,5 @@ EXTRA_LINKER_FLAGS = -L$($(GARCOMPILER)_CC_HOME)/lib/$(SUBDIR$(MEMORYMODEL)-$(GARCH)) -lCstd -lz BUILD64 = 1 -NOISAEXEC = 1 -CONFIGURE_ARGS = $(DIRPATHS) -TEST_TARGET = check - -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 skayser at opencsw.org Tue Jul 5 17:46:06 2011 From: skayser at opencsw.org (Sebastian Kayser) Date: Tue, 5 Jul 2011 17:46:06 +0200 Subject: [csw-devel] Fwd: SF.net SVN: gar:[14985] csw/mgar/pkg/zsh/trunk/Makefile In-Reply-To: References: Message-ID: <20110705154606.GT25705@sebastiankayser.de> * Dagobert Michelsen wrote: > could you please prefix your commit messages with the package like > "zsh: Further override" > This makes it easier to follow the commit log. Oliver, as you've started using mgar. With mgar mgar commit -m 'msg' will automatically do this for you and prefix msg with the current directory (relative to the base of the package recipe tree checkout). Sebastian From bonivart at users.sourceforge.net Tue Jul 5 20:17:37 2011 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Tue, 05 Jul 2011 18:17:37 +0000 Subject: [csw-devel] SF.net SVN: gar:[14988] csw/mgar/pkg/bind/trunk Message-ID: Revision: 14988 http://gar.svn.sourceforge.net/gar/?rev=14988&view=rev Author: bonivart Date: 2011-07-05 18:17:37 +0000 (Tue, 05 Jul 2011) Log Message: ----------- bind/trunk: update to 9.8.0-P4 Modified Paths: -------------- csw/mgar/pkg/bind/trunk/Makefile csw/mgar/pkg/bind/trunk/checksums Modified: csw/mgar/pkg/bind/trunk/Makefile =================================================================== --- csw/mgar/pkg/bind/trunk/Makefile 2011-07-05 10:06:00 UTC (rev 14987) +++ csw/mgar/pkg/bind/trunk/Makefile 2011-07-05 18:17:37 UTC (rev 14988) @@ -6,7 +6,7 @@ CATEGORIES = net # Enable these for Px-releases -RELEASE = P2 +RELEASE = P4 DISTVERSION = $(VERSION)-$(RELEASE) SPKG_VERSION = $(VERSION)$(RELEASE) DISTNAME = $(NAME)-$(VERSION)-$(RELEASE) Modified: csw/mgar/pkg/bind/trunk/checksums =================================================================== --- csw/mgar/pkg/bind/trunk/checksums 2011-07-05 10:06:00 UTC (rev 14987) +++ csw/mgar/pkg/bind/trunk/checksums 2011-07-05 18:17:37 UTC (rev 14988) @@ -1 +1 @@ -5f90dcf1730631feacdad3257c465c54 bind-9.8.0-P2.tar.gz +13e36e3f28dc1ce7675b45a4192e8389 bind-9.8.0-P4.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From skayser at users.sourceforge.net Tue Jul 5 22:31:35 2011 From: skayser at users.sourceforge.net (skayser at users.sourceforge.net) Date: Tue, 05 Jul 2011 20:31:35 +0000 Subject: [csw-devel] SF.net SVN: opencsw:[375] gar-wrapper/mgar Message-ID: Revision: 375 http://opencsw.svn.sourceforge.net/opencsw/?rev=375&view=rev Author: skayser Date: 2011-07-05 20:31:35 +0000 (Tue, 05 Jul 2011) Log Message: ----------- mgar: fix newpkg skeleton generation logic Modified Paths: -------------- gar-wrapper/mgar Modified: gar-wrapper/mgar =================================================================== --- gar-wrapper/mgar 2011-06-26 21:35:22 UTC (rev 374) +++ gar-wrapper/mgar 2011-07-05 20:31:35 UTC (rev 375) @@ -32,12 +32,14 @@ # ---------------------------------------------------------------------------- # # Todos: +# * Enable checkout of a specific revision for build recipe + GAR +# (~/opencsw/.buildsys/vX at YYYY, ~/opencsw/foo/trunk at YYYY) # * Add template for ~/.garrc (think new users) # * When packaging mgar, shield mgar up --self so that it won't override # the package binary, but place it somewhere else. -# * In commit mode, if (pwd.endswith('trunk') and svn.rev -eq 0) commit .. # * Recipes: Move from svn:externals to GARTYPE -# * Improve errors messages when buildsys can't be found +# * Improve error messages when buildsys can't be found +# * Improve error messages when pwd != build dir (refer to miss./wrong Makefile) # * In commit mode: verify that checksums is up to date (DISTFILES listed?) # # Bugs: @@ -423,10 +425,12 @@ echo "Creating package skeleton for ${__pkgname} ${__version}." svn mkdir --parents ${__pkgname}/trunk/files ${__pkgname}/{branches,tags} touch ${__pkgname}/trunk/checksums - perl -p -e "\ - s,%NAME%,${__pkgname},; \ - s,%VERSION%,${__version},; \ - " ${__template} > ${__pkgname}/trunk/Makefile + echo -e '%:\n\t$(MAKE) -C trunk $*' > ${__pkgname}/Makefile + python -c "from mako.template import Template; \ + v = { 'name': \"${__pkgname}\", 'version': \"${__version}\" }; \ + t = Template(filename=\"${__template}\"); \ + print t.render(**v)" > ${__pkgname}/trunk/Makefile + svn add ${__pkgname}/Makefile svn add ${__pkgname}/trunk/Makefile svn add ${__pkgname}/trunk/checksums 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 Jul 5 22:41:12 2011 From: skayser at users.sourceforge.net (skayser at users.sourceforge.net) Date: Tue, 05 Jul 2011 20:41:12 +0000 Subject: [csw-devel] SF.net SVN: opencsw:[376] gar-wrapper/CHANGES Message-ID: Revision: 376 http://opencsw.svn.sourceforge.net/opencsw/?rev=376&view=rev Author: skayser Date: 2011-07-05 20:41:12 +0000 (Tue, 05 Jul 2011) Log Message: ----------- mgar: add CHANGES to keep track of changes Added Paths: ----------- gar-wrapper/CHANGES Added: gar-wrapper/CHANGES =================================================================== --- gar-wrapper/CHANGES (rev 0) +++ gar-wrapper/CHANGES 2011-07-05 20:41:12 UTC (rev 376) @@ -0,0 +1,11 @@ +Changes since 0.91 (r360): +* mgar will now warn and exit on legacy gar/ directories or symlinks +* add new command "list-categories" to list the supported CATEGORIES +* add new command "newpkg " to create package recipe skeletons +* commit: will now only work from within package directories +* commit: automatically commits parent directory when needed (new packages) +* find-file: exclude .git directories +* find-file: default to list all files if no argument given +* show-buildsys: fall back to "unknown" when GAR is not in subversion +* ~/.garrc: add variable OVERRIDE_BUILDSYS to globally override the + path to GAR. Can be used to test new GAR branches 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 Jul 5 23:29:13 2011 From: skayser at users.sourceforge.net (skayser at users.sourceforge.net) Date: Tue, 05 Jul 2011 21:29:13 +0000 Subject: [csw-devel] SF.net SVN: opencsw:[377] gar-wrapper Message-ID: Revision: 377 http://opencsw.svn.sourceforge.net/opencsw/?rev=377&view=rev Author: skayser Date: 2011-07-05 21:29:13 +0000 (Tue, 05 Jul 2011) Log Message: ----------- mgar: make init deal with relative paths Modified Paths: -------------- gar-wrapper/CHANGES gar-wrapper/mgar Modified: gar-wrapper/CHANGES =================================================================== --- gar-wrapper/CHANGES 2011-07-05 20:41:12 UTC (rev 376) +++ gar-wrapper/CHANGES 2011-07-05 21:29:13 UTC (rev 377) @@ -6,6 +6,7 @@ * commit: automatically commits parent directory when needed (new packages) * find-file: exclude .git directories * find-file: default to list all files if no argument given +* init: fix bug when calling with a relative path (Oliver Kiddle) * show-buildsys: fall back to "unknown" when GAR is not in subversion * ~/.garrc: add variable OVERRIDE_BUILDSYS to globally override the path to GAR. Can be used to test new GAR branches Modified: gar-wrapper/mgar =================================================================== --- gar-wrapper/mgar 2011-07-05 20:41:12 UTC (rev 376) +++ gar-wrapper/mgar 2011-07-05 21:29:13 UTC (rev 377) @@ -190,6 +190,19 @@ return 0 } +function get_absolute_dirname { + ( cd `dirname "$1"` && pwd -P ) +} + +function register_buildtree { + local __buildtree="$1" + + # Make sure to register an absolute path in ~/.garrc + # Make sure to prepend a newline in case ~/.garrc doesn't end with \n + local __buildtree_absolute=`get_absolute_dirname "$__buildtree"` + echo -e "\nBUILDTREE=$__buildtree_absolute" >> ~/.garrc +} + # Undocumented function to ease the migration of existing local build trees # for existing GAR (non-mgar) users. Not intended to stay here forever. function convert_existing_buildtree { @@ -211,8 +224,8 @@ -name work -prune -o -name cookies -prune -o \ -type s -name gar | grep /gar$ | gxargs -r rm - echo "Registering $__buildtree/.buildsys in ~/.garrc" - echo -e "\nBUILDTREE=$__buildtree" >> ~/.garrc + echo "Registering $__buildtree in ~/.garrc" + register_buildtree "$__buildtree" echo echo 'All set. Basically, use mgar instead of gmake now (see mgar --help).' @@ -234,9 +247,7 @@ echo echo "Initialized the package build tree at $__buildtree." echo "Registering the package build tree location in ~/.garrc" - # this is just in case .garrc doesn't end with a newline. - echo >> ~/.garrc - echo BUILDTREE="$__buildtree" >> ~/.garrc + register_buildtree "$__buildtree" echo echo 'Now you can fetch the package build descriptions via: "mgar up --all"' echo 'Please be advised that this will take some time. So grab yourself a cup' 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 Jul 5 23:33:52 2011 From: skayser at users.sourceforge.net (skayser at users.sourceforge.net) Date: Tue, 05 Jul 2011 21:33:52 +0000 Subject: [csw-devel] SF.net SVN: opencsw:[378] gar-wrapper/bash_completion.mgar Message-ID: Revision: 378 http://opencsw.svn.sourceforge.net/opencsw/?rev=378&view=rev Author: skayser Date: 2011-07-05 21:33:52 +0000 (Tue, 05 Jul 2011) Log Message: ----------- mgar: include list-categories and newpkg in bash auto-completion Modified Paths: -------------- gar-wrapper/bash_completion.mgar Modified: gar-wrapper/bash_completion.mgar =================================================================== --- gar-wrapper/bash_completion.mgar 2011-07-05 21:29:13 UTC (rev 377) +++ gar-wrapper/bash_completion.mgar 2011-07-05 21:33:52 UTC (rev 378) @@ -23,6 +23,7 @@ misctgts="modenv ccenv" mgarcmds="help init index locate up commit show-srcdir show-stagedir" mgarcmds="${mgarcmds} find-file edit-file show-buildsys show-pkgtree version" + mgarcmds="${mgarcmds} list-categories newpkg" ustreamcmds="check-upstream get-uwatch-configuration" opts="${buildtgts} ${misctgts} ${mgarcmds} ${ustreamcmds}" 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 Jul 6 03:04:18 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Wed, 06 Jul 2011 01:04:18 +0000 Subject: [csw-devel] SF.net SVN: gar:[14989] csw/mgar/gar/v2/gar.pkg.mk Message-ID: Revision: 14989 http://gar.svn.sourceforge.net/gar/?rev=14989&view=rev Author: bdwalton Date: 2011-07-06 01:04:18 +0000 (Wed, 06 Jul 2011) Log Message: ----------- gar/v2: add support for cswetcshells CAS Modified Paths: -------------- csw/mgar/gar/v2/gar.pkg.mk Modified: csw/mgar/gar/v2/gar.pkg.mk =================================================================== --- csw/mgar/gar/v2/gar.pkg.mk 2011-07-05 18:17:37 UTC (rev 14988) +++ csw/mgar/gar/v2/gar.pkg.mk 2011-07-06 01:04:18 UTC (rev 14989) @@ -241,6 +241,7 @@ $(foreach FILE,$(ETCSERVICES),$$F[1] = "cswetcservices" if( $$F[2] =~ m(^$(FILE)$$) );)\ $(foreach FILE,$(INETDCONF),$$F[1] = "cswinetd" if( $$F[2] =~ m(^$(FILE)$$) );)\ $(foreach FILE,$(INITSMF),$$F[1] = "cswinitsmf" if( $$F[2] =~ m(^$(FILE)$$) );)\ + $(foreach FILE,$(ETCSHELLS),$$F[1] = "cswetcshells" if( $$F[2] =~ m(^$(FILE)$$) );)\ $(foreach FILE,$(USERGROUP),$$F[1] = "cswusergroup" if( $$F[2] =~ m(^$(FILE)$$) );)\ $(foreach FILE,$(CRONTABS),$$F[1] = "cswcrontab" if( $$F[2] =~ m(^$(FILE)$$) );)\ $(if $(PYCOMPILE),$(foreach FILE,$(_PYCOMPILE_FILES),$$F[1] = "cswpycompile" if( $$F[2] =~ m(^$(FILE)$$) );))\ @@ -269,6 +270,7 @@ _CSWCLASSES = cswusergroup ugfiles _CSWCLASSES += cswmigrateconf cswcpsampleconf cswpreserveconf cswcptemplates _CSWCLASSES += cswetcservices +_CSWCLASSES += cswetcshells _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 opk at users.sourceforge.net Wed Jul 6 13:49:38 2011 From: opk at users.sourceforge.net (opk at users.sourceforge.net) Date: Wed, 06 Jul 2011 11:49:38 +0000 Subject: [csw-devel] SF.net SVN: gar:[14990] csw/mgar/pkg/zsh/trunk Message-ID: Revision: 14990 http://gar.svn.sourceforge.net/gar/?rev=14990&view=rev Author: opk Date: 2011-07-06 11:49:38 +0000 (Wed, 06 Jul 2011) Log Message: ----------- zsh/trunk: add mgar shell completion function Modified Paths: -------------- csw/mgar/pkg/zsh/trunk/Makefile Added Paths: ----------- csw/mgar/pkg/zsh/trunk/files/_mgar Modified: csw/mgar/pkg/zsh/trunk/Makefile =================================================================== --- csw/mgar/pkg/zsh/trunk/Makefile 2011-07-06 01:04:18 UTC (rev 14989) +++ csw/mgar/pkg/zsh/trunk/Makefile 2011-07-06 11:49:38 UTC (rev 14990) @@ -11,7 +11,7 @@ MASTER_SITES = $(SF_MIRRORS) DISTFILES = $(NAME)-$(VERSION).tar.bz2 -DISTFILES += _pkgutil +DISTFILES += _pkgutil _mgar DISTFILES += CSWzsh.postinstall CSWzsh.postremove PACKAGES = CSWzsh @@ -67,4 +67,4 @@ CPPFLAGS := -I$(includedir)/ncursesw $(CPPFLAGS) post-install: - cp -p $(WORKDIR)/_pkgutil $(DESTDIR)$(sharedstatedir)/$(NAME)/functions + cp -p $(WORKDIR)/_pkgutil $(WORKDIR)/_mgar $(DESTDIR)$(sharedstatedir)/$(NAME)/functions Added: csw/mgar/pkg/zsh/trunk/files/_mgar =================================================================== --- csw/mgar/pkg/zsh/trunk/files/_mgar (rev 0) +++ csw/mgar/pkg/zsh/trunk/files/_mgar 2011-07-06 11:49:38 UTC (rev 14990) @@ -0,0 +1,39 @@ +#compdef mgar + +local curcontext="$curcontext" ret=1 +local subcmd +local -a cmds + +if (( CURRENT == 2 )); then + cmds=( + help:list\ available\ commands + ${${(M)${(f)"$(_call_program commands ${words[1]} help)"}:# *}// (#b)([a-z-]##)[^A-Z]##(?)/$match[1]:${match[2]:l}} + ) + + _describe 'mgar command' cmds && ret=0 +else + shift words + (( CURRENT-- )) + subcmd="$words[1]" + curcontext="${curcontext%:*}-${subcmd}:" + case $subcmd in + commit) + _arguments '-m:commit message' && ret=0 + ;; + scm) + service=svn + _subversion && ret=0 + ;; + init) + _directories && ret=0 + ;; + up) + _arguments '--all' && ret=0 + ;; + *) + _default && ret=0 + ;; + esac +fi + +return ret 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 Jul 6 14:56:00 2011 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 06 Jul 2011 12:56:00 +0000 Subject: [csw-devel] SF.net SVN: gar:[14991] csw/mgar/pkg/getopt/trunk Message-ID: Revision: 14991 http://gar.svn.sourceforge.net/gar/?rev=14991&view=rev Author: dmichelsen Date: 2011-07-06 12:56:00 +0000 (Wed, 06 Jul 2011) Log Message: ----------- getopt: Add patches and sanitizing Modified Paths: -------------- csw/mgar/pkg/getopt/trunk/Makefile Added Paths: ----------- csw/mgar/pkg/getopt/trunk/files/0004-Sanitize-getopt.h.patch Modified: csw/mgar/pkg/getopt/trunk/Makefile =================================================================== --- csw/mgar/pkg/getopt/trunk/Makefile 2011-07-06 11:49:38 UTC (rev 14990) +++ csw/mgar/pkg/getopt/trunk/Makefile 2011-07-06 12:56:00 UTC (rev 14991) @@ -18,14 +18,16 @@ PATCHFILES += 0002-Do-not-make-standalone-version.patch PATCHFILES += 0003-Makefile-settings.patch -# File name regex to get notifications about upstream software releases -UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz +# Patch from http://lists.gnu.org/archive/html/bug-bison/2010-04/msg00046.html +PATCHFILES += 0004-Sanitize-getopt.h.patch PACKAGES = CSWggetopt CATALOGNAME = ggetopt VENDOR_URL = http://software.frodo.looijaard.name/getopt/ +EXTRA_CFLAGS += -Xc + # No scipt there... CONFIGURE_SCRIPTS = @@ -49,3 +51,8 @@ # Use correct version of 'install' PATH := /opt/csw/gnu:$(PATH) + +post-install-modulated: + perl -pi -e 's,/usr/local/lib,$(libdir),' \ + $(DESTDIR)$(mandir)/man1/getopt.1 + Added: csw/mgar/pkg/getopt/trunk/files/0004-Sanitize-getopt.h.patch =================================================================== --- csw/mgar/pkg/getopt/trunk/files/0004-Sanitize-getopt.h.patch (rev 0) +++ csw/mgar/pkg/getopt/trunk/files/0004-Sanitize-getopt.h.patch 2011-07-06 12:56:00 UTC (rev 14991) @@ -0,0 +1,47 @@ +From 7766515552cdbb601d17dadbdac393590a793783 Mon Sep 17 00:00:00 2001 +From: Dagobert Michelsen +Date: Wed, 6 Jul 2011 10:40:28 +0200 +Subject: [PATCH] Sanitize getopt.h + +--- + gnu/getopt.h | 13 +++++++------ + 1 files changed, 7 insertions(+), 6 deletions(-) + +diff --git a/gnu/getopt.h b/gnu/getopt.h +index d6ceb0e..135bade 100644 +--- a/gnu/getopt.h ++++ b/gnu/getopt.h +@@ -78,7 +78,7 @@ extern int optopt; + + struct option + { +-#if defined (__STDC__) && __STDC__ ++#if defined (__STDC__) && (__STDC__ || defined __sun) + const char *name; + #else + char *name; +@@ -96,15 +96,16 @@ struct option + #define required_argument 1 + #define optional_argument 2 + +-#if defined (__STDC__) && __STDC__ +-#ifdef __GNU_LIBRARY__ ++ ++#if defined (__STDC__) && (__STDC__ || defined __sun) ++#if defined __GNU_LIBRARY__ || defined __sun + /* Many other libraries have conflicting prototypes for getopt, with + differences in the consts, in stdlib.h. To avoid compilation +- errors, only prototype getopt for the GNU C library. */ ++ errors, only prototype getopt for the GNU C library and for Solaris. */ + extern int getopt (int argc, char *const *argv, const char *shortopts); +-#else /* not __GNU_LIBRARY__ */ ++#else /* not __GNU_LIBRARY__ || __sun */ + extern int getopt (); +-#endif /* __GNU_LIBRARY__ */ ++#endif /* __GNU_LIBRARY__ || __sun */ + extern int getopt_long (int argc, char *const *argv, const char *shortopts, + const struct option *longopts, int *longind); + extern int getopt_long_only (int argc, char *const *argv, +-- +1.7.6 + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Wed Jul 6 15:21:01 2011 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 06 Jul 2011 13:21:01 +0000 Subject: [csw-devel] SF.net SVN: gar:[14992] csw/mgar/pkg/libmp4v2/trunk Message-ID: Revision: 14992 http://gar.svn.sourceforge.net/gar/?rev=14992&view=rev Author: dmichelsen Date: 2011-07-06 13:21:00 +0000 (Wed, 06 Jul 2011) Log Message: ----------- libmp4v2: Update to mGAR v2, add patches, general rework Modified Paths: -------------- csw/mgar/pkg/libmp4v2/trunk/Makefile csw/mgar/pkg/libmp4v2/trunk/checksums Added Paths: ----------- csw/mgar/pkg/libmp4v2/trunk/files/0001-Use-const-char-where-necessary.patch csw/mgar/pkg/libmp4v2/trunk/files/0002-Add-headers-and-libs-as-required-to-testsuite.patch csw/mgar/pkg/libmp4v2/trunk/files/0003-Keep-norunpath-for-C-linkage.patch csw/mgar/pkg/libmp4v2/trunk/files/0004-Add-libgnugetopt.so-to-executables.patch Removed Paths: ------------- csw/mgar/pkg/libmp4v2/trunk/files/CSWlibmp4v2.gspec Property Changed: ---------------- csw/mgar/pkg/libmp4v2/trunk/ Property changes on: csw/mgar/pkg/libmp4v2/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/libmp4v2/trunk/Makefile =================================================================== --- csw/mgar/pkg/libmp4v2/trunk/Makefile 2011-07-06 12:56:00 UTC (rev 14991) +++ csw/mgar/pkg/libmp4v2/trunk/Makefile 2011-07-06 13:21:00 UTC (rev 14992) @@ -4,25 +4,43 @@ DESCRIPTION = A free library to read and manipulate the mp4 container format define BLURB -The mpeg4ip package, available from http://mpeg4ip.net/ contains a very useful piece of software, the libmp4v2 package. Unfortunately the mpeg4ip package also contains software that are covered by patents in some juridistictions and therefore the policy of several different free software distributions stops it's inclusion. - -Therefore the author of this software has prepared this redistribution of the libmp4v2 package. It cotains only code to read and manipulate the mp4 container format, and is free from patent issues to the best of his knowledge. + The mpeg4ip package, available from http://mpeg4ip.net/ contains a very useful piece of software, + the libmp4v2 package. Unfortunately the mpeg4ip package also contains software that are covered by + patents in some juridistictions and therefore the policy of several different free software + distributions stops it's inclusion. + Therefore the author of this software has prepared this redistribution of the libmp4v2 package. + It cotains only code to read and manipulate the mp4 container format, and is free from patent + issues to the best of his knowledge. endef -MASTER_SITES = http://resare.com/libmp4v2/dist/ -DISTFILES = $(NAME)-$(VERSION).tar.bz2 -DISTFILES += $(call admfiles,CSWlibmp4v2) +SF_PROJ = easytag +MASTER_SITES = $(SF_MIRROR) +DISTFILES = $(DISTNAME).tar.bz2 + PATCHFILES = use-inttypes.h.diff PATCHFILES += mp4util.diff PATCHFILES += include-limits.h.diff -PATCHFILES += stdint-to-inttypes.h.diff +PATCHFILES += linux-stdints.diff +PATCHFILES += 0001-Use-const-char-where-necessary.patch +PATCHFILES += 0002-Add-headers-and-libs-as-required-to-testsuite.patch +PATCHFILES += 0003-Keep-norunpath-for-C-linkage.patch +PATCHFILES += 0004-Add-libgnugetopt.so-to-executables.patch -# We define upstream file regex so we can be notifed of new upstream software release -UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.bz2 +PACKAGES += CSWlibmp4v2-0 +SPKG_DESC_CSWlibmp4v2-0 = A free library to read and manipulate the mp4 container format, libmp4v2.so.0 +PKGFILES_CSWlibmp4v2-0 += $(call pkgfiles_lib,libmp4v2.so.0) -GARCOMPILER = GNU +PACKAGES += CSWlibmp4v2-dev +SPKG_DESC_CSWlibmp4v2-dev = Development files for libmp4v2.so.0 +PKGFILES_CSWlibmp4v2-dev += $(PKGFILES_DEVEL) +RUNTIME_DEP_PKGS_CSWlibmp4v2-dev += CSWlibmp4v2-0 -CONFIGURE_ARGS = $(DIRPATHS) -GNU_CC_HOME = /opt/csw/gcc3 +PACKAGES += CSWlibmp4v2-utils +SPKG_DESC_CSWlibmp4v2-utils = Utility programs for mp4 file manipulation +# PKGFILES is catchall +RUNTIME_DEP_PKGS_CSWlibmp4v2-utils += CSWlibgnugetopt +RUNTIME_DEP_PKGS_CSWlibmp4v2-utils += CSWlibmp4v2-0 +EXTRA_LINKER_FLAGS += -norunpath + include gar/category.mk Modified: csw/mgar/pkg/libmp4v2/trunk/checksums =================================================================== --- csw/mgar/pkg/libmp4v2/trunk/checksums 2011-07-06 12:56:00 UTC (rev 14991) +++ csw/mgar/pkg/libmp4v2/trunk/checksums 2011-07-06 13:21:00 UTC (rev 14992) @@ -1,5 +1 @@ -90eb2b0940ebe02ef81b7a60530beaee download/libmp4v2-1.5.0.1.tar.bz2 -0cf8210f00723eb29f40edc2d75b96b6 download/CSWlibmp4v2.gspec -cab745cefe4239d58af6a068125a2830 download/use-inttypes.h.diff -4109306447d4ccec029ee5aac8f50d4a download/mp4util.diff -a9b7b14b47d7e7830368cb51082a925b download/include-limits.h.diff +90eb2b0940ebe02ef81b7a60530beaee libmp4v2-1.5.0.1.tar.bz2 Added: csw/mgar/pkg/libmp4v2/trunk/files/0001-Use-const-char-where-necessary.patch =================================================================== --- csw/mgar/pkg/libmp4v2/trunk/files/0001-Use-const-char-where-necessary.patch (rev 0) +++ csw/mgar/pkg/libmp4v2/trunk/files/0001-Use-const-char-where-necessary.patch 2011-07-06 13:21:00 UTC (rev 14992) @@ -0,0 +1,25 @@ +From 191a900264f5b85de5533fd9f341a36d250c8c41 Mon Sep 17 00:00:00 2001 +From: Dagobert Michelsen +Date: Wed, 6 Jul 2011 10:29:34 +0200 +Subject: [PATCH] Use const char where necessary + +--- + rtphint.cpp | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/rtphint.cpp b/rtphint.cpp +index 6a193ac..def6998 100644 +--- a/rtphint.cpp ++++ b/rtphint.cpp +@@ -314,7 +314,7 @@ void MP4RtpHintTrack::GetPayload( + char **ppEncodingParams) + { + const char* pRtpMap; +- char* pSlash; ++ const char* pSlash; + u_int32_t length; + InitPayload(); + +-- +1.7.5.4 + Added: csw/mgar/pkg/libmp4v2/trunk/files/0002-Add-headers-and-libs-as-required-to-testsuite.patch =================================================================== --- csw/mgar/pkg/libmp4v2/trunk/files/0002-Add-headers-and-libs-as-required-to-testsuite.patch (rev 0) +++ csw/mgar/pkg/libmp4v2/trunk/files/0002-Add-headers-and-libs-as-required-to-testsuite.patch 2011-07-06 13:21:00 UTC (rev 14992) @@ -0,0 +1,220 @@ +From 0e4f7bfaa59526be55156b3fae29fc1f46c6caae Mon Sep 17 00:00:00 2001 +From: Dagobert Michelsen +Date: Wed, 6 Jul 2011 10:48:32 +0200 +Subject: [PATCH] Add headers and libs as required to testsuite + +--- + test/Makefile.am | 2 +- + test/Makefile.in | 14 +++++-- + test/mp4broadcaster | 99 +++++++++++++++++++++++++++++++++++++++++++++++ + test/mp4broadcaster.cpp | 2 + + 4 files changed, 112 insertions(+), 5 deletions(-) + create mode 100755 test/mp4broadcaster + +diff --git a/test/Makefile.am b/test/Makefile.am +index 14e1604..86ece8e 100644 +--- a/test/Makefile.am ++++ b/test/Makefile.am +@@ -7,7 +7,7 @@ c_api_SOURCES = c_api.c + c_api_LDADD = $(top_builddir)/libmp4v2.la -lstdc++ + + mp4broadcaster_SOURCES = mp4broadcaster.cpp +-mp4broadcaster_LDADD = $(top_builddir)/libmp4v2.la ++mp4broadcaster_LDADD = $(top_builddir)/libmp4v2.la -lsocket -lnsl -lresolv + + nullcreate_SOURCES = nullcreate.cpp + nullcreate_LDADD = $(top_builddir)/libmp4v2.la +diff --git a/test/Makefile.in b/test/Makefile.in +index 1d553c6..e2bde38 100644 +--- a/test/Makefile.in ++++ b/test/Makefile.in +@@ -122,6 +122,7 @@ EGREP = @EGREP@ + EXEEXT = @EXEEXT@ + F77 = @F77@ + FFLAGS = @FFLAGS@ ++GREP = @GREP@ + INSTALL_DATA = @INSTALL_DATA@ + INSTALL_PROGRAM = @INSTALL_PROGRAM@ + INSTALL_SCRIPT = @INSTALL_SCRIPT@ +@@ -139,6 +140,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ + PACKAGE_NAME = @PACKAGE_NAME@ + PACKAGE_STRING = @PACKAGE_STRING@ + PACKAGE_TARNAME = @PACKAGE_TARNAME@ ++PACKAGE_URL = @PACKAGE_URL@ + PACKAGE_VERSION = @PACKAGE_VERSION@ + PATH_SEPARATOR = @PATH_SEPARATOR@ + RANLIB = @RANLIB@ +@@ -146,12 +148,9 @@ SET_MAKE = @SET_MAKE@ + SHELL = @SHELL@ + STRIP = @STRIP@ + VERSION = @VERSION@ +-ac_ct_AR = @ac_ct_AR@ + ac_ct_CC = @ac_ct_CC@ + ac_ct_CXX = @ac_ct_CXX@ + ac_ct_F77 = @ac_ct_F77@ +-ac_ct_RANLIB = @ac_ct_RANLIB@ +-ac_ct_STRIP = @ac_ct_STRIP@ + am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ + am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ + am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ +@@ -168,23 +167,30 @@ build_cpu = @build_cpu@ + build_os = @build_os@ + build_vendor = @build_vendor@ + datadir = @datadir@ ++datarootdir = @datarootdir@ ++docdir = @docdir@ ++dvidir = @dvidir@ + exec_prefix = @exec_prefix@ + host = @host@ + host_alias = @host_alias@ + host_cpu = @host_cpu@ + host_os = @host_os@ + host_vendor = @host_vendor@ ++htmldir = @htmldir@ + includedir = @includedir@ + infodir = @infodir@ + install_sh = @install_sh@ + libdir = @libdir@ + libexecdir = @libexecdir@ ++localedir = @localedir@ + localstatedir = @localstatedir@ + mandir = @mandir@ + mkdir_p = @mkdir_p@ + oldincludedir = @oldincludedir@ ++pdfdir = @pdfdir@ + prefix = @prefix@ + program_transform_name = @program_transform_name@ ++psdir = @psdir@ + sbindir = @sbindir@ + sharedstatedir = @sharedstatedir@ + sysconfdir = @sysconfdir@ +@@ -193,7 +199,7 @@ INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/util + c_api_SOURCES = c_api.c + c_api_LDADD = $(top_builddir)/libmp4v2.la -lstdc++ + mp4broadcaster_SOURCES = mp4broadcaster.cpp +-mp4broadcaster_LDADD = $(top_builddir)/libmp4v2.la ++mp4broadcaster_LDADD = $(top_builddir)/libmp4v2.la -lsocket -lnsl -lresolv + nullcreate_SOURCES = nullcreate.cpp + nullcreate_LDADD = $(top_builddir)/libmp4v2.la + nullvplayer_SOURCES = nullvplayer.cpp +diff --git a/test/mp4broadcaster b/test/mp4broadcaster +new file mode 100755 +index 0000000..df62aa1 +--- /dev/null ++++ b/test/mp4broadcaster +@@ -0,0 +1,99 @@ ++#! /bin/bash ++ ++# mp4broadcaster - temporary wrapper script for .libs/mp4broadcaster ++# Generated by ltmain.sh - GNU libtool 1.5.22 (1.1220.2.365 2005/12/18 22:14:06) ++# ++# The mp4broadcaster program cannot be directly executed until all the libtool ++# libraries that it depends on are installed. ++# ++# This wrapper script should never be moved out of the build directory. ++# If it is, it will not operate correctly. ++ ++# Sed substitution that helps us do robust quoting. It backslashifies ++# metacharacters that are still active within double-quoted strings. ++Xsed='/opt/csw/bin/gsed -e 1s/^X//' ++sed_quote_subst='s/\([\\`\\"$\\\\]\)/\\\1/g' ++ ++# The HP-UX ksh and POSIX shell print the target directory to stdout ++# if CDPATH is set. ++(unset CDPATH) >/dev/null 2>&1 && unset CDPATH ++ ++relink_command="" ++ ++# This environment variable determines our operation mode. ++if test "$libtool_install_magic" = "%%%MAGIC variable%%%"; then ++ # install mode needs the following variable: ++ notinst_deplibs=' ../libmp4v2.la' ++else ++ # When we are sourced in execute mode, $file and $echo are already set. ++ if test "$libtool_execute_magic" != "%%%MAGIC variable%%%"; then ++ echo="echo" ++ file="$0" ++ # Make sure echo works. ++ if test "X$1" = X--no-reexec; then ++ # Discard the --no-reexec flag, and continue. ++ shift ++ elif test "X`($echo '\t') 2>/dev/null`" = 'X\t'; then ++ # Yippee, $echo works! ++ : ++ else ++ # Restart under the correct shell, and then maybe $echo will work. ++ exec /bin/bash "$0" --no-reexec ${1+"$@"} ++ fi ++ fi ++ ++ # Find the directory that this script lives in. ++ thisdir=`$echo "X$file" | $Xsed -e 's%/[^/]*$%%'` ++ test "x$thisdir" = "x$file" && thisdir=. ++ ++ # Follow symbolic links until we get to the real thisdir. ++ file=`ls -ld "$file" | /opt/csw/bin/gsed -n 's/.*-> //p'` ++ while test -n "$file"; do ++ destdir=`$echo "X$file" | $Xsed -e 's%/[^/]*$%%'` ++ ++ # If there was a directory component, then change thisdir. ++ if test "x$destdir" != "x$file"; then ++ case "$destdir" in ++ [\\/]* | [A-Za-z]:[\\/]*) thisdir="$destdir" ;; ++ *) thisdir="$thisdir/$destdir" ;; ++ esac ++ fi ++ ++ file=`$echo "X$file" | $Xsed -e 's%^.*/%%'` ++ file=`ls -ld "$thisdir/$file" | /opt/csw/bin/gsed -n 's/.*-> //p'` ++ done ++ ++ # Try to get the absolute directory name. ++ absdir=`cd "$thisdir" && pwd` ++ test -n "$absdir" && thisdir="$absdir" ++ ++ program='mp4broadcaster' ++ progdir="$thisdir/.libs" ++ ++ ++ if test -f "$progdir/$program"; then ++ # Add our own library path to LD_LIBRARY_PATH ++ LD_LIBRARY_PATH="/home/dam/mgar/pkg/libmp4v2/trunk/work/solaris9-sparc/build-isa-sparcv8/libmp4v2-1.5.0.1/.libs:$LD_LIBRARY_PATH" ++ ++ # Some systems cannot cope with colon-terminated LD_LIBRARY_PATH ++ # The second colon is a workaround for a bug in BeOS R4 sed ++ LD_LIBRARY_PATH=`$echo "X$LD_LIBRARY_PATH" | $Xsed -e 's/::*$//'` ++ ++ export LD_LIBRARY_PATH ++ ++ if test "$libtool_execute_magic" != "%%%MAGIC variable%%%"; then ++ # Run the actual program with our arguments. ++ ++ exec "$progdir/$program" ${1+"$@"} ++ ++ $echo "$0: cannot exec $program ${1+"$@"}" ++ exit 1 ++ fi ++ else ++ # The program doesn't exist. ++ $echo "$0: error: \`$progdir/$program' does not exist" 1>&2 ++ $echo "This script is just a wrapper for $program." 1>&2 ++ echo "See the libtool documentation for more information." 1>&2 ++ exit 1 ++ fi ++fi +diff --git a/test/mp4broadcaster.cpp b/test/mp4broadcaster.cpp +index 38b4c9c..8a8cee9 100644 +--- a/test/mp4broadcaster.cpp ++++ b/test/mp4broadcaster.cpp +@@ -21,6 +21,8 @@ + + #include "mpeg4ip.h" + #include ++#include ++#include + #include "mp4.h" + + // forward declarations +-- +1.7.5.4 + Added: csw/mgar/pkg/libmp4v2/trunk/files/0003-Keep-norunpath-for-C-linkage.patch =================================================================== --- csw/mgar/pkg/libmp4v2/trunk/files/0003-Keep-norunpath-for-C-linkage.patch (rev 0) +++ csw/mgar/pkg/libmp4v2/trunk/files/0003-Keep-norunpath-for-C-linkage.patch 2011-07-06 13:21:00 UTC (rev 14992) @@ -0,0 +1,25 @@ +From d47639eb2005c28aaaeed453189b8e1e9f4e30b1 Mon Sep 17 00:00:00 2001 +From: Dagobert Michelsen +Date: Wed, 6 Jul 2011 11:16:04 +0200 +Subject: [PATCH] Keep -norunpath for C++ linkage + +--- + ltmain.sh | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/ltmain.sh b/ltmain.sh +index 06823e0..80f9e41 100644 +--- a/ltmain.sh ++++ b/ltmain.sh +@@ -1623,7 +1623,7 @@ EOF + # -pg pass through profiling flag for GCC + # @file GCC response files + -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*|-pg| \ +- -t[45]*|-txscale*|@*) ++ -t[45]*|-txscale*|@*|-norunpath) + + # Unknown arguments in both finalize_command and compile_command need + # to be aesthetically quoted because they are evaled later. +-- +1.7.5.4 + Added: csw/mgar/pkg/libmp4v2/trunk/files/0004-Add-libgnugetopt.so-to-executables.patch =================================================================== --- csw/mgar/pkg/libmp4v2/trunk/files/0004-Add-libgnugetopt.so-to-executables.patch (rev 0) +++ csw/mgar/pkg/libmp4v2/trunk/files/0004-Add-libgnugetopt.so-to-executables.patch 2011-07-06 13:21:00 UTC (rev 14992) @@ -0,0 +1,135 @@ +From 0dec5ae5d46a3708ff6ad6f6338e4f9db4984ec6 Mon Sep 17 00:00:00 2001 +From: Dagobert Michelsen +Date: Wed, 6 Jul 2011 14:53:50 +0200 +Subject: [PATCH] Add libgnugetopt.so to executables + +--- + test/Makefile.am | 10 +++++----- + test/Makefile.in | 10 +++++----- + util/Makefile.am | 14 +++++++------- + util/Makefile.in | 14 +++++++------- + 4 files changed, 24 insertions(+), 24 deletions(-) + +diff --git a/test/Makefile.am b/test/Makefile.am +index 86ece8e..758ae6f 100644 +--- a/test/Makefile.am ++++ b/test/Makefile.am +@@ -7,17 +7,17 @@ c_api_SOURCES = c_api.c + c_api_LDADD = $(top_builddir)/libmp4v2.la -lstdc++ + + mp4broadcaster_SOURCES = mp4broadcaster.cpp +-mp4broadcaster_LDADD = $(top_builddir)/libmp4v2.la -lsocket -lnsl -lresolv ++mp4broadcaster_LDADD = $(top_builddir)/libmp4v2.la -lsocket -lnsl -lresolv -lgnugetopt + + nullcreate_SOURCES = nullcreate.cpp +-nullcreate_LDADD = $(top_builddir)/libmp4v2.la ++nullcreate_LDADD = $(top_builddir)/libmp4v2.la -lgnugetopt + + nullvplayer_SOURCES = nullvplayer.cpp +-nullvplayer_LDADD = $(top_builddir)/libmp4v2.la ++nullvplayer_LDADD = $(top_builddir)/libmp4v2.la -lgnugetopt + + urltrack_SOURCES = urltrack.cpp +-urltrack_LDADD = $(top_builddir)/libmp4v2.la ++urltrack_LDADD = $(top_builddir)/libmp4v2.la -lgnugetopt + + mp4clip_SOURCES = mp4clip.cpp +-mp4clip_LDADD = $(top_builddir)/libmp4v2.la ++mp4clip_LDADD = $(top_builddir)/libmp4v2.la -lgnugetopt + +diff --git a/test/Makefile.in b/test/Makefile.in +index e2bde38..e72699f 100644 +--- a/test/Makefile.in ++++ b/test/Makefile.in +@@ -199,15 +199,15 @@ INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/util + c_api_SOURCES = c_api.c + c_api_LDADD = $(top_builddir)/libmp4v2.la -lstdc++ + mp4broadcaster_SOURCES = mp4broadcaster.cpp +-mp4broadcaster_LDADD = $(top_builddir)/libmp4v2.la -lsocket -lnsl -lresolv ++mp4broadcaster_LDADD = $(top_builddir)/libmp4v2.la -lsocket -lnsl -lresolv -lgnugetopt + nullcreate_SOURCES = nullcreate.cpp +-nullcreate_LDADD = $(top_builddir)/libmp4v2.la ++nullcreate_LDADD = $(top_builddir)/libmp4v2.la -lgnugetopt + nullvplayer_SOURCES = nullvplayer.cpp +-nullvplayer_LDADD = $(top_builddir)/libmp4v2.la ++nullvplayer_LDADD = $(top_builddir)/libmp4v2.la -lgnugetopt + urltrack_SOURCES = urltrack.cpp +-urltrack_LDADD = $(top_builddir)/libmp4v2.la ++urltrack_LDADD = $(top_builddir)/libmp4v2.la -lgnugetopt + mp4clip_SOURCES = mp4clip.cpp +-mp4clip_LDADD = $(top_builddir)/libmp4v2.la ++mp4clip_LDADD = $(top_builddir)/libmp4v2.la -lgnugetopt + all: all-am + + .SUFFIXES: +diff --git a/util/Makefile.am b/util/Makefile.am +index 0ea0af3..de43e64 100644 +--- a/util/Makefile.am ++++ b/util/Makefile.am +@@ -6,25 +6,25 @@ bin_PROGRAMS = mp4dump mp4extract mp4info mp4trackdump mp4tags mp4art + check_PROGRAMS = mp4syncfiles + + mp4dump_SOURCES = mp4dump.cpp mpeg4ip_getopt.h +-mp4dump_LDADD = $(top_builddir)/libmp4v2.la ++mp4dump_LDADD = $(top_builddir)/libmp4v2.la -lgnugetopt + + mp4extract_SOURCES = mp4extract.cpp mpeg4ip_getopt.h +-mp4extract_LDADD = $(top_builddir)/libmp4v2.la ++mp4extract_LDADD = $(top_builddir)/libmp4v2.la -lgnugetopt + + mp4info_SOURCES = mp4info.cpp mpeg4ip_getopt.h +-mp4info_LDADD = $(top_builddir)/libmp4v2.la ++mp4info_LDADD = $(top_builddir)/libmp4v2.la -lgnugetopt + + mp4trackdump_SOURCES = mp4trackdump.cpp mpeg4ip_getopt.h +-mp4trackdump_LDADD = $(top_builddir)/libmp4v2.la ++mp4trackdump_LDADD = $(top_builddir)/libmp4v2.la -lgnugetopt + + mp4tags_SOURCES = mp4tags.cpp mpeg4ip_getopt.h +-mp4tags_LDADD = $(top_builddir)/libmp4v2.la ++mp4tags_LDADD = $(top_builddir)/libmp4v2.la -lgnugetopt + + mp4art_SOURCES = mp4art.cpp mpeg4ip_getopt.h +-mp4art_LDADD = $(top_builddir)/libmp4v2.la ++mp4art_LDADD = $(top_builddir)/libmp4v2.la -lgnugetopt + + mp4syncfiles_SOURCES = mp4syncfiles.cpp +-mp4syncfiles_LDADD = $(top_builddir)/libmp4v2.la ++mp4syncfiles_LDADD = $(top_builddir)/libmp4v2.la -lgnugetopt + + EXTRA_DIST = mp4dump60.dsp \ + mp4info.dsp mp4tags.dsp +diff --git a/util/Makefile.in b/util/Makefile.in +index b52ce56..67973bf 100644 +--- a/util/Makefile.in ++++ b/util/Makefile.in +@@ -199,19 +199,19 @@ sysconfdir = @sysconfdir@ + target_alias = @target_alias@ + INCLUDES = -I$(top_srcdir) + mp4dump_SOURCES = mp4dump.cpp mpeg4ip_getopt.h +-mp4dump_LDADD = $(top_builddir)/libmp4v2.la ++mp4dump_LDADD = $(top_builddir)/libmp4v2.la -lgnugetopt + mp4extract_SOURCES = mp4extract.cpp mpeg4ip_getopt.h +-mp4extract_LDADD = $(top_builddir)/libmp4v2.la ++mp4extract_LDADD = $(top_builddir)/libmp4v2.la -lgnugetopt + mp4info_SOURCES = mp4info.cpp mpeg4ip_getopt.h +-mp4info_LDADD = $(top_builddir)/libmp4v2.la ++mp4info_LDADD = $(top_builddir)/libmp4v2.la -lgnugetopt + mp4trackdump_SOURCES = mp4trackdump.cpp mpeg4ip_getopt.h +-mp4trackdump_LDADD = $(top_builddir)/libmp4v2.la ++mp4trackdump_LDADD = $(top_builddir)/libmp4v2.la -lgnugetopt + mp4tags_SOURCES = mp4tags.cpp mpeg4ip_getopt.h +-mp4tags_LDADD = $(top_builddir)/libmp4v2.la ++mp4tags_LDADD = $(top_builddir)/libmp4v2.la -lgnugetopt + mp4art_SOURCES = mp4art.cpp mpeg4ip_getopt.h +-mp4art_LDADD = $(top_builddir)/libmp4v2.la ++mp4art_LDADD = $(top_builddir)/libmp4v2.la -lgnugetopt + mp4syncfiles_SOURCES = mp4syncfiles.cpp +-mp4syncfiles_LDADD = $(top_builddir)/libmp4v2.la ++mp4syncfiles_LDADD = $(top_builddir)/libmp4v2.la -lgnugetopt + EXTRA_DIST = mp4dump60.dsp \ + mp4info.dsp mp4tags.dsp + +-- +1.7.5.4 + Deleted: csw/mgar/pkg/libmp4v2/trunk/files/CSWlibmp4v2.gspec =================================================================== --- csw/mgar/pkg/libmp4v2/trunk/files/CSWlibmp4v2.gspec 2011-07-06 12:56:00 UTC (rev 14991) +++ csw/mgar/pkg/libmp4v2/trunk/files/CSWlibmp4v2.gspec 2011-07-06 13:21:00 UTC (rev 14992) @@ -1,4 +0,0 @@ -%var bitname libmp4v2 -%var pkgname CSWlibmp4v2 -%include url file://%{PKGLIB}/csw_dyndepend.gspec -%copyright url file://%{WORKSRC}/COPYING This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Wed Jul 6 15:25:34 2011 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 06 Jul 2011 13:25:34 +0000 Subject: [csw-devel] SF.net SVN: gar:[14993] csw/mgar/pkg/tcsh/trunk/Makefile Message-ID: Revision: 14993 http://gar.svn.sourceforge.net/gar/?rev=14993&view=rev Author: dmichelsen Date: 2011-07-06 13:25:33 +0000 (Wed, 06 Jul 2011) Log Message: ----------- tcsh: Update to new CAS etcshells Modified Paths: -------------- csw/mgar/pkg/tcsh/trunk/Makefile Modified: csw/mgar/pkg/tcsh/trunk/Makefile =================================================================== --- csw/mgar/pkg/tcsh/trunk/Makefile 2011-07-06 13:21:00 UTC (rev 14992) +++ csw/mgar/pkg/tcsh/trunk/Makefile 2011-07-06 13:25:33 UTC (rev 14993) @@ -11,29 +11,32 @@ endef MASTER_SITES = ftp://ftp.astron.com/pub/tcsh/ -DISTFILES = $(NAME)-$(VERSION).tar.gz -DISTFILES += CSWtcsh.postinstall -DISTFILES += CSWtcsh.postremove +DISTFILES = $(DISTNAME).tar.gz -# We define upstream file regex so we can be notifed of new upstream software release -UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz - LICENSE = Copyright RUNTIME_DEP_PKGS = CSWiconv VENDOR_URL = http://www.tcsh.org/ -EXTRA_CFLAGS = -D_FILE_OFFSET_BITS=64 +EXTRA_CPPFLAGS += -D_FILE_OFFSET_BITS=64 +# As documented in README, this overrides the setting in pathnames.h +EXTRA_CPPFLAGS += -D_PATH_LOCAL=\'\"$(bindir)\"\' +# EXTRA_CPPFLAGS += -D_PATH_TCSHELL=\"$(bindir)/tcsh\" -CONFIGURE_ARGS = $(DIRPATHS) - -TEST_TARGET = check - # Skip tests until this one is fixed: # http://bugs.gw.com/view.php?id=87 SKIPTEST = 1 INSTALL_ARGS = install.man +ETCSHELLS = /opt/csw/bin/tcsh + +# These are examples only +CHECKPKG_OVERRIDES_CSWtcsh += file-with-bad-content|/usr/local|root/opt/csw/share/man/man1/tcsh.1 + +# This is from tw.h, possibly harmless. +# #define DEFAULTLIST ":/usr/man/cat1:/usr/man/cat8:/usr/man/cat6:/usr/local/man/cat1:/usr/local/man/cat8:/usr/local/man/cat6" /* if no HPATH */ +CHECKPKG_OVERRIDES_CSWtcsh += file-with-bad-content|/usr/local|root/opt/csw/bin/tcsh + 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 Jul 6 15:27:49 2011 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 06 Jul 2011 13:27:49 +0000 Subject: [csw-devel] SF.net SVN: gar:[14994] csw/mgar/pkg/libfaad2/trunk/Makefile Message-ID: Revision: 14994 http://gar.svn.sourceforge.net/gar/?rev=14994&view=rev Author: dmichelsen Date: 2011-07-06 13:27:49 +0000 (Wed, 06 Jul 2011) Log Message: ----------- libfaad2: Package split Modified Paths: -------------- csw/mgar/pkg/libfaad2/trunk/Makefile Modified: csw/mgar/pkg/libfaad2/trunk/Makefile =================================================================== --- csw/mgar/pkg/libfaad2/trunk/Makefile 2011-07-06 13:25:33 UTC (rev 14993) +++ csw/mgar/pkg/libfaad2/trunk/Makefile 2011-07-06 13:27:49 UTC (rev 14994) @@ -16,43 +16,48 @@ PATCHFILES += 0003-Use-inttypes-instead-of-stdint.patch PATCHFILES += 0004-Remove-Wall-from-xmms-plugin.patch -# We define upstream file regex so we can be notifed of new upstream software release -UFILES_REGEX = $(SF_PROJ)-(\d+(?:\.\d+)*).tar.bz2 +VENDOR_URL = http://www.audiocoding.com/faad2.html -PACKAGES = CSWfaad2 CSWxmmsfaad2 +BUILD_DEP_PKGS += CSWlibxmms-dev + +PACKAGES += CSWfaad2 CATALOGNAME_CSWfaad2 = faad2 -CATALOGNAME_CSWxmmsfaad2 = xmms_faad2 +SPKG_DESC_CSWfaad2 = AAC utility program +# PKGFILES is catchall +RUNTIME_DEP_PKGS_CSWfaad2 += CSWlibfaad2 -SPKG_DESC_CSWfaad2 = $(DESCRIPTION) -SPKG_DESC_CSWxmmsfaad2 = AAC plugin for XMMS +PACKAGES += CSWlibfaad2 +SPKG_DESC_CSWlibfaad2 = Freeware Advanced Audio (AAC) Decoder including SBR decoding, libfaad.so.2 +PKGFILES_CSWlibfaad2 += $(call pkgfiles_lib,libfaad.so.2) -BUILD_DEP_PKGS = CSWxmms -RUNTIME_DEP_PKGS_CSWfaad2 = -RUNTIME_DEP_PKGS_CSWxmmsfaad2 = CSWxmms CSWglib CSWgtk +PACKAGES += CSWlibfaad-dev +SPKG_DESC_CSWlibfaad-dev = Development files for libfaad.so.2 +PKGFILES_CSWlibfaad-dev += $(PKGFILES_DEVEL) +RUNTIME_DEP_PKGS_CSWlibfaad-dev += CSWlibfaad2 -VENDOR_URL = http://www.audiocoding.com/faad2.html +PACKAGES += CSWxmms-faad2 +SPKG_DESC_CSWxmms-faad2 = XMMS plugin for the AAC audio file format +PKGFILES_CSWxmms-faad2 += $(libdir)/xmms/.* +RUNTIME_DEP_PKGS_CSWxmms-faad2 += CSWglib +RUNTIME_DEP_PKGS_CSWxmms-faad2 += CSWgtk +RUNTIME_DEP_PKGS_CSWxmms-faad2 += CSWlibxmms1 +OBSOLETED_BY_CSWxmms-faad2 += CSWxmmsfaad2 +CATALOGNAME_CSWxmmsfaad2 = xmms_faad2_stub STRIP_LIBTOOL = 1 BUILD64 = 1 -NOISAEXEC = 1 +CONFIGURE_ARGS = $(DIRPATHS) +CONFIGURE_ARGS += --with-drm + CONFIGURE_ARGS-32 = --with-xmms CONFIGURE_ARGS-64 = - -CONFIGURE_ARGS = $(DIRPATHS) -CONFIGURE_ARGS += --with-drm CONFIGURE_ARGS += $(CONFIGURE_ARGS-$(MEMORYMODEL)) # This is a hard package... add when ready. # CONFIGURE_ARGS += --with-mpeg4ip -TEST_TARGET = check +CHECKPKG_OVERRIDES_CSWxmms-faad2 += soname-not-found|libfaad.so.0|is|needed|by|opt/csw/lib/xmms/Input/libmp4.so -MERGE_DIRS_isa-extra = $(libdir) - -PKGFILES_CSWxmmsfaad2 = $(libdir)/xmms/.* - -CHECKPKG_OVERRIDES_CSWxmmsfaad2 += soname-not-found|libfaad.so.0|is|needed|by|opt/csw/lib/xmms/Input/libmp4.so - 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 Jul 6 15:37:18 2011 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 06 Jul 2011 13:37:18 +0000 Subject: [csw-devel] SF.net SVN: gar:[14995] csw/mgar/pkg/libgnugetopt/trunk Message-ID: Revision: 14995 http://gar.svn.sourceforge.net/gar/?rev=14995&view=rev Author: dmichelsen Date: 2011-07-06 13:37:18 +0000 (Wed, 06 Jul 2011) Log Message: ----------- liibgnugetopt: Split packages, add patch to getopt.h Modified Paths: -------------- csw/mgar/pkg/libgnugetopt/trunk/Makefile Added Paths: ----------- csw/mgar/pkg/libgnugetopt/trunk/files/0001-Sanitize-getopt.h.patch Modified: csw/mgar/pkg/libgnugetopt/trunk/Makefile =================================================================== --- csw/mgar/pkg/libgnugetopt/trunk/Makefile 2011-07-06 13:27:49 UTC (rev 14994) +++ csw/mgar/pkg/libgnugetopt/trunk/Makefile 2011-07-06 13:37:18 UTC (rev 14995) @@ -9,12 +9,23 @@ MASTER_SITES = http://distfiles.macports.org/libgnugetopt/ DISTFILES = $(NAME)-$(VERSION).tar.bz2 -# We define upstream file regex so we can be notifed of new upstream software release -UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.bz2 +# Patch from http://lists.gnu.org/archive/html/bug-bison/2010-04/msg00046.html +PATCHFILES += 0001-Sanitize-getopt.h.patch +LICENSE = README + +PACKAGES += CSWlibgnugetopt0 +SPKG_DESC_CSWlibgnugetopt0 = Library containing getopt_long, libgnugetopt.so.0 +PKGFILES_CSWlibgnugetopt0 += $(call pkgfiles_lib,libgnugetopt.so.0) +OBSOLETED_BY_CSWlibgnugetopt0 += CSWlibgnugetopt + +PACKAGES += CSWlibgnugetopt-dev +SPKG_DESC_CSWlibgnugetopt-dev = Development files for libgnugetopt.so.0 +# PKGFILES is catchall +RUNTIME_DEP_PKGS_CSWlibgnugetopt-dev += CSWlibgnugetopt0 + +EXTRA_CFLAGS += -Xc + BUILD64 = 1 -CONFIGURE_ARGS = $(DIRPATHS) -TEST_TARGET = check - include gar/category.mk Copied: csw/mgar/pkg/libgnugetopt/trunk/files/0001-Sanitize-getopt.h.patch (from rev 14991, csw/mgar/pkg/getopt/trunk/files/0004-Sanitize-getopt.h.patch) =================================================================== --- csw/mgar/pkg/libgnugetopt/trunk/files/0001-Sanitize-getopt.h.patch (rev 0) +++ csw/mgar/pkg/libgnugetopt/trunk/files/0001-Sanitize-getopt.h.patch 2011-07-06 13:37:18 UTC (rev 14995) @@ -0,0 +1,47 @@ +From 0aebf343c11fd9e5f568a1040e54715ee4ed4dc5 Mon Sep 17 00:00:00 2001 +From: Dagobert Michelsen +Date: Wed, 6 Jul 2011 15:20:26 +0200 +Subject: [PATCH] Sanitize getopt.h + +--- + getopt.h | 13 +++++++------ + 1 files changed, 7 insertions(+), 6 deletions(-) + +diff --git a/getopt.h b/getopt.h +index fb30719..f5ef8dc 100644 +--- a/getopt.h ++++ b/getopt.h +@@ -80,7 +80,7 @@ extern int optopt; + + struct option + { +-#if defined (__STDC__) && __STDC__ ++#if defined (__STDC__) && (__STDC__ || defined __sun) + const char *name; + #else + char *name; +@@ -98,15 +98,16 @@ struct option + #define required_argument 1 + #define optional_argument 2 + +-#if defined (__STDC__) && __STDC__ +-#ifdef __GNU_LIBRARY__ ++ ++#if defined (__STDC__) && (__STDC__ || defined __sun) ++#if defined __GNU_LIBRARY__ || defined __sun + /* Many other libraries have conflicting prototypes for getopt, with + differences in the consts, in stdlib.h. To avoid compilation +- errors, only prototype getopt for the GNU C library. */ ++ errors, only prototype getopt for the GNU C library and for Solaris. */ + extern int getopt (int argc, char *const *argv, const char *shortopts); +-#else /* not __GNU_LIBRARY__ */ ++#else /* not __GNU_LIBRARY__ || __sun */ + extern int getopt (); +-#endif /* __GNU_LIBRARY__ */ ++#endif /* __GNU_LIBRARY__ || __sun */ + extern int getopt_long (int argc, char *const *argv, const char *shortopts, + const struct option *longopts, int *longind); + extern int getopt_long_only (int argc, char *const *argv, +-- +1.7.6 + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Wed Jul 6 15:53:23 2011 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 06 Jul 2011 13:53:23 +0000 Subject: [csw-devel] SF.net SVN: gar:[14996] csw/mgar/pkg/easytag/trunk/Makefile Message-ID: Revision: 14996 http://gar.svn.sourceforge.net/gar/?rev=14996&view=rev Author: dmichelsen Date: 2011-07-06 13:53:23 +0000 (Wed, 06 Jul 2011) Log Message: ----------- easytag: Enhance dependencies Modified Paths: -------------- csw/mgar/pkg/easytag/trunk/Makefile Modified: csw/mgar/pkg/easytag/trunk/Makefile =================================================================== --- csw/mgar/pkg/easytag/trunk/Makefile 2011-07-06 13:37:18 UTC (rev 14995) +++ csw/mgar/pkg/easytag/trunk/Makefile 2011-07-06 13:53:23 UTC (rev 14996) @@ -17,11 +17,14 @@ BUILD_DEP_PKGS += CSWlibvorbis-dev BUILD_DEP_PKGS += CSWlibflac-dev BUILD_DEP_PKGS += CSWlibspeex-dev +BUILD_DEP_PKGS += CSWlibwavpack-dev RUNTIME_DEP_PKGS_CSWeasytag += CSWlibintl8 RUNTIME_DEP_PKGS_CSWeasytag += CSWlibogg0 RUNTIME_DEP_PKGS_CSWeasytag += CSWlibvorbis0 RUNTIME_DEP_PKGS_CSWeasytag += CSWlibflac8 +RUNTIME_DEP_PKGS_CSWeasytag += CSWlibspeex1 +RUNTIME_DEP_PKGS_CSWeasytag += CSWlibwavpack1 RUNTIME_DEP_PKGS_CSWeasytag += CSWfconfig RUNTIME_DEP_PKGS_CSWeasytag += CSWpango RUNTIME_DEP_PKGS_CSWeasytag += CSWftype2 @@ -29,7 +32,6 @@ RUNTIME_DEP_PKGS_CSWeasytag += CSWzlib RUNTIME_DEP_PKGS_CSWeasytag += CSWgtk2 RUNTIME_DEP_PKGS_CSWeasytag += CSWlibatk -RUNTIME_DEP_PKGS_CSWeasytag += CSWlibwavpack1 RUNTIME_DEP_PKGS_CSWeasytag += CSWlibcairo2 RUNTIME_DEP_PKGS_CSWeasytag += CSWlibvorbisfile3 RUNTIME_DEP_PKGS_CSWeasytag += CSWglib2 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 Jul 6 15:58:54 2011 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 06 Jul 2011 13:58:54 +0000 Subject: [csw-devel] SF.net SVN: gar:[14997] csw/mgar/pkg/libmp4v2/trunk/Makefile Message-ID: Revision: 14997 http://gar.svn.sourceforge.net/gar/?rev=14997&view=rev Author: dmichelsen Date: 2011-07-06 13:58:54 +0000 (Wed, 06 Jul 2011) Log Message: ----------- libmp4v2: Update deps and comment Modified Paths: -------------- csw/mgar/pkg/libmp4v2/trunk/Makefile Modified: csw/mgar/pkg/libmp4v2/trunk/Makefile =================================================================== --- csw/mgar/pkg/libmp4v2/trunk/Makefile 2011-07-06 13:53:23 UTC (rev 14996) +++ csw/mgar/pkg/libmp4v2/trunk/Makefile 2011-07-06 13:58:54 UTC (rev 14997) @@ -1,3 +1,9 @@ +# TBD: +# - Collision with CSWfaad2: +# /csw/lib/libmp4v2.so +# /opt/csw/include/mp4.h +# - How does ths library relate to mpeg4ip, both released 1.5.0.1 and unreleased 1.6.1 ? + NAME = libmp4v2 VERSION = 1.5.0.1 CATEGORIES = lib @@ -38,7 +44,7 @@ PACKAGES += CSWlibmp4v2-utils SPKG_DESC_CSWlibmp4v2-utils = Utility programs for mp4 file manipulation # PKGFILES is catchall -RUNTIME_DEP_PKGS_CSWlibmp4v2-utils += CSWlibgnugetopt +RUNTIME_DEP_PKGS_CSWlibmp4v2-utils += CSWlibgnugetopt1 RUNTIME_DEP_PKGS_CSWlibmp4v2-utils += CSWlibmp4v2-0 EXTRA_LINKER_FLAGS += -norunpath 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 Jul 6 16:08:02 2011 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 06 Jul 2011 14:08:02 +0000 Subject: [csw-devel] SF.net SVN: gar:[14998] csw/mgar/pkg/libmp4v2/trunk/Makefile Message-ID: Revision: 14998 http://gar.svn.sourceforge.net/gar/?rev=14998&view=rev Author: dmichelsen Date: 2011-07-06 14:08:02 +0000 (Wed, 06 Jul 2011) Log Message: ----------- libmp4v2: Fix typo Modified Paths: -------------- csw/mgar/pkg/libmp4v2/trunk/Makefile Modified: csw/mgar/pkg/libmp4v2/trunk/Makefile =================================================================== --- csw/mgar/pkg/libmp4v2/trunk/Makefile 2011-07-06 13:58:54 UTC (rev 14997) +++ csw/mgar/pkg/libmp4v2/trunk/Makefile 2011-07-06 14:08:02 UTC (rev 14998) @@ -44,7 +44,7 @@ PACKAGES += CSWlibmp4v2-utils SPKG_DESC_CSWlibmp4v2-utils = Utility programs for mp4 file manipulation # PKGFILES is catchall -RUNTIME_DEP_PKGS_CSWlibmp4v2-utils += CSWlibgnugetopt1 +RUNTIME_DEP_PKGS_CSWlibmp4v2-utils += CSWlibgnugetopt0 RUNTIME_DEP_PKGS_CSWlibmp4v2-utils += CSWlibmp4v2-0 EXTRA_LINKER_FLAGS += -norunpath 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 Jul 6 16:58:17 2011 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 06 Jul 2011 14:58:17 +0000 Subject: [csw-devel] SF.net SVN: gar:[14999] csw/mgar/pkg/mpeg4ip/trunk/Makefile Message-ID: Revision: 14999 http://gar.svn.sourceforge.net/gar/?rev=14999&view=rev Author: dmichelsen Date: 2011-07-06 14:58:17 +0000 (Wed, 06 Jul 2011) Log Message: ----------- mpeg4ip: Add comment Modified Paths: -------------- csw/mgar/pkg/mpeg4ip/trunk/Makefile Modified: csw/mgar/pkg/mpeg4ip/trunk/Makefile =================================================================== --- csw/mgar/pkg/mpeg4ip/trunk/Makefile 2011-07-06 14:08:02 UTC (rev 14998) +++ csw/mgar/pkg/mpeg4ip/trunk/Makefile 2011-07-06 14:58:17 UTC (rev 14999) @@ -1,3 +1,7 @@ +# This is pretty hard to build and outdated: +# https://trac.macports.org/ticket/17141 +# Use libmp4v2 instead. + NAME = mpeg4ip VERSION = 1.6.1 CATEGORIES = lib @@ -27,9 +31,6 @@ PATCHFILES += 0003-Change-type-from-Void-to-void.patch PATCHFILES += 0004-Add-one-more-scratch-channel-or-compilation-fails.patch -# We define upstream file regex so we can be notifed of new upstream software release -UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz - GARCOMPILER = GNU BUILD64 = 1 @@ -38,9 +39,11 @@ CONFIGURE_SCRIPTS = $(WORKSRC)/cvs_bootstrap +# The player needs ffmpeg which needs faad which needs mpeg4ip. +# Build the player in a separate recipe after we have the lib to break the circle. CONFIGURE_ARGS = $(DIRPATHS) CONFIGURE_ARGS += --enable-shared --disable-static -CONFIGURE_ARGS += --enable-server --enable-player +CONFIGURE_ARGS += --enable-server --disable-player CONFIGURE_ARGS += --enable-mp4live CONFIGURE_ARGS += --enable-ipv6 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From opk at users.sourceforge.net Thu Jul 7 10:06:40 2011 From: opk at users.sourceforge.net (opk at users.sourceforge.net) Date: Thu, 07 Jul 2011 08:06:40 +0000 Subject: [csw-devel] SF.net SVN: gar:[15000] csw/mgar/pkg/zsh/trunk Message-ID: Revision: 15000 http://gar.svn.sourceforge.net/gar/?rev=15000&view=rev Author: opk Date: 2011-07-07 08:06:39 +0000 (Thu, 07 Jul 2011) Log Message: ----------- Update to new CAS etcshells Modified Paths: -------------- csw/mgar/pkg/zsh/trunk/Makefile Removed Paths: ------------- csw/mgar/pkg/zsh/trunk/files/CSWzsh.postinstall csw/mgar/pkg/zsh/trunk/files/CSWzsh.postremove Modified: csw/mgar/pkg/zsh/trunk/Makefile =================================================================== --- csw/mgar/pkg/zsh/trunk/Makefile 2011-07-06 14:58:17 UTC (rev 14999) +++ csw/mgar/pkg/zsh/trunk/Makefile 2011-07-07 08:06:39 UTC (rev 15000) @@ -12,14 +12,13 @@ MASTER_SITES = $(SF_MIRRORS) DISTFILES = $(NAME)-$(VERSION).tar.bz2 DISTFILES += _pkgutil _mgar -DISTFILES += CSWzsh.postinstall CSWzsh.postremove PACKAGES = CSWzsh CATALOGNAME_CSWzsh = zsh LICENSE = LICENCE -RUNTIME_DEP_PKGS = CSWiconv CSWlibncursesw5 CSWlibpcre0 CSWlibgdbm3 +RUNTIME_DEP_PKGS = CSWiconv CSWlibncursesw5 CSWlibpcre0 CSWlibgdbm3 CSWcas-etcshells BUILD_DEP_PKGS = CSWpcre SPKG_SOURCEURL = http://www.zsh.org @@ -60,6 +59,9 @@ CHECKPKG_OVERRIDES_CSWzsh += file-with-bad-content|/usr/local|root/opt/csw/share/zsh/functions/compaudit CHECKPKG_OVERRIDES_CSWzsh += file-with-bad-content|/usr/share|root/opt/csw/share/zsh/functions/mere +SPKG_CLASSES = none cswetcshells +ETCSHELLS = /opt/csw/bin/zsh + include gar/category.mk # Use term.h from ncurses or we get compile errors Deleted: csw/mgar/pkg/zsh/trunk/files/CSWzsh.postinstall =================================================================== --- csw/mgar/pkg/zsh/trunk/files/CSWzsh.postinstall 2011-07-06 14:58:17 UTC (rev 14999) +++ csw/mgar/pkg/zsh/trunk/files/CSWzsh.postinstall 2011-07-07 08:06:39 UTC (rev 15000) @@ -1,41 +0,0 @@ -#!/bin/sh -PATH=/usr/bin -export PATH - -# $BASEDIR ignored because the package isn't relocatable - -if [ -f ${PKG_INSTALL_ROOT}/etc/shells ]; then - echo "${PKG_INSTALL_ROOT}/etc/shells already exists." -else - cat > ${PKG_INSTALL_ROOT}/etc/shells < /dev/null > /dev/null; then - echo "${PKG_INSTALL_ROOT}/etc/shells is UNCHANGED because entry /opt/csw/bin/zsh already exists." -else - echo "/opt/csw/bin/zsh" >> ${PKG_INSTALL_ROOT}/etc/shells - echo "ADDED /opt/csw/bin/zsh to ${PKG_INSTALL_ROOT}/etc/shells." -fi Deleted: csw/mgar/pkg/zsh/trunk/files/CSWzsh.postremove =================================================================== --- csw/mgar/pkg/zsh/trunk/files/CSWzsh.postremove 2011-07-06 14:58:17 UTC (rev 14999) +++ csw/mgar/pkg/zsh/trunk/files/CSWzsh.postremove 2011-07-07 08:06:39 UTC (rev 15000) @@ -1,10 +0,0 @@ -#!/bin/sh -PATH=/usr/bin -export PATH - -if /usr/bin/grep "^/opt/csw/bin/zsh$" ${PKG_INSTALL_ROOT}/etc/shells >/dev/null 2>&1; then - /usr/bin/perl -i -pwe '$_ = "" if /\/opt\/csw\/bin\/zsh$/' ${PKG_INSTALL_ROOT}/etc/shells - echo "REMOVED /opt/csw/bin/zsh from ${PKG_INSTALL_ROOT}/etc/shells." -else - echo "${PKG_INSTALL_ROOT}/etc/shells is UNCHANGED because no entry for /opt/csw/bin/zsh was found." -fi This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From phipsy at users.sourceforge.net Thu Jul 7 13:33:28 2011 From: phipsy at users.sourceforge.net (phipsy at users.sourceforge.net) Date: Thu, 07 Jul 2011 11:33:28 +0000 Subject: [csw-devel] SF.net SVN: gar:[15001] csw/mgar/pkg/facter/trunk Message-ID: Revision: 15001 http://gar.svn.sourceforge.net/gar/?rev=15001&view=rev Author: phipsy Date: 2011-07-07 11:33:28 +0000 (Thu, 07 Jul 2011) Log Message: ----------- facter 1.6.0 - still has Solaris prtdiag bug. DO NOT USE Modified Paths: -------------- csw/mgar/pkg/facter/trunk/Makefile csw/mgar/pkg/facter/trunk/checksums Modified: csw/mgar/pkg/facter/trunk/Makefile =================================================================== --- csw/mgar/pkg/facter/trunk/Makefile 2011-07-07 08:06:39 UTC (rev 15000) +++ csw/mgar/pkg/facter/trunk/Makefile 2011-07-07 11:33:28 UTC (rev 15001) @@ -3,7 +3,7 @@ # $Id$ NAME = facter -VERSION = 1.5.9 +VERSION = 1.6.0 CATEGORIES = apps DESCRIPTION = A system fact gatherer @@ -18,14 +18,15 @@ additional mechanisms for retrieving facts. endef -MASTER_SITES = http://puppetlabs.com/downloads/facter/ -DISTFILES = $(NAME)-$(VERSION).tar.gz +MASTER_SITES = http://puppetlabs.com/downloads/facter/ +DISTFILES = $(NAME)-$(VERSION).tar.gz SPKG_SOURCEURL = http://puppetlabs.com/ +LICENSE = LICENSE RUNTIME_DEP_PKGS = CSWruby18 BUILD_DEP_PKGS = $(RUNTIME_DEP_PKGS) -PATCHFILES += 0001-Patch-to-prtconf-run-in-memory.rb.patch +#PATCHFILES += 0001-Patch-to-prtconf-run-in-memory.rb.patch ARCHALL = 1 CONFIGURE_SCRIPTS = @@ -36,7 +37,6 @@ CHECKPKG_OVERRIDES_CSWfacter += file-with-bad-content|/usr/local|root/opt/csw/lib/ruby/site_ruby/1.8/facter/ssh.rb CHECKPKG_OVERRIDES_CSWfacter += file-with-bad-content|/usr/local|root/opt/csw/lib/ruby/site_ruby/1.8/facter/Cfkey.rb CHECKPKG_OVERRIDES_CSWfacter += file-with-bad-content|/usr/local|root/opt/csw/lib/ruby/site_ruby/1.8/facter/util/manufacturer.rb -CHECKPKG_OVERRIDES_CSWfacter += pkginfo-opencsw-repository-uncommitted include gar/category.mk Modified: csw/mgar/pkg/facter/trunk/checksums =================================================================== --- csw/mgar/pkg/facter/trunk/checksums 2011-07-07 08:06:39 UTC (rev 15000) +++ csw/mgar/pkg/facter/trunk/checksums 2011-07-07 11:33:28 UTC (rev 15001) @@ -1,3 +1,4 @@ 21db7b613fe14a54e72ef062f3d5e190 facter-1.5.7.tar.gz 4dd4daebc59fa985b8aa7eb247ac4030 facter-1.5.8.tar.gz 435553aace9781ecff5dae593abc15fa facter-1.5.9.tar.gz +bf7e384bf247935e973cfd7bf5592dfe facter-1.6.0.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bwalton at opencsw.org Thu Jul 7 15:45:12 2011 From: bwalton at opencsw.org (Ben Walton) Date: Thu, 07 Jul 2011 09:45:12 -0400 Subject: [csw-devel] SF.net SVN: gar:[15000] csw/mgar/pkg/zsh/trunk In-Reply-To: References: Message-ID: <1310046234-sup-9747@pinkfloyd.chass.utoronto.ca> Excerpts from opk's message of Thu Jul 07 04:06:40 -0400 2011: Hi Oliver, > -RUNTIME_DEP_PKGS = CSWiconv CSWlibncursesw5 CSWlibpcre0 CSWlibgdbm3 > +RUNTIME_DEP_PKGS = CSWiconv CSWlibncursesw5 CSWlibpcre0 CSWlibgdbm3 > CSWcas-etcshells This dep is added by GAR for you when you make use of cswetcshells. > +SPKG_CLASSES = none cswetcshells This is done automatically too. (For this CAS and all the rest.) > +ETCSHELLS = /opt/csw/bin/zsh This is the only change you need other than dropping the manual scripts. Thanks -Ben -- Ben Walton Systems Programmer - CHASS University of Toronto C:416.407.5610 | W:416.978.4302 From dmichelsen at users.sourceforge.net Thu Jul 7 17:22:15 2011 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 07 Jul 2011 15:22:15 +0000 Subject: [csw-devel] SF.net SVN: gar:[15002] csw/mgar/pkg/gawk/trunk Message-ID: Revision: 15002 http://gar.svn.sourceforge.net/gar/?rev=15002&view=rev Author: dmichelsen Date: 2011-07-07 15:22:15 +0000 (Thu, 07 Jul 2011) Log Message: ----------- gawk: Remove libsigsegv oddity Modified Paths: -------------- csw/mgar/pkg/gawk/trunk/Makefile Added Paths: ----------- csw/mgar/pkg/gawk/trunk/files/0001-Be-not-that-strict-on-standard.patch Modified: csw/mgar/pkg/gawk/trunk/Makefile =================================================================== --- csw/mgar/pkg/gawk/trunk/Makefile 2011-07-07 11:33:28 UTC (rev 15001) +++ csw/mgar/pkg/gawk/trunk/Makefile 2011-07-07 15:22:15 UTC (rev 15002) @@ -17,12 +17,16 @@ MASTER_SITES = $(GNU_MIRROR) DISTFILES = $(DISTNAME).tar.xz +PATCHFILES += 0001-Be-not-that-strict-on-standard.patch + RUNTIME_DEP_PKGS_CSWgawk += CSWlibintl8 RUNTIME_DEP_PKGS_CSWgawk += CSWlibsigsegv2 RUNTIME_DEP_PKGS_CSWgawk += CSWlibreadline6 -# Coompilation requires setting of __STDC__ to at least 1 -EXTRA_CFLAGS = -Xc +# Otherwise libsigsegv is not detected properly on Solaris 9 i386 as reported in +# http://lists.gnu.org/archive/html/bug-gnulib/2011-07/msg00008.html +# Also needs the above patch. +EXTRA_CFLAGS = -features=extensions # These are install instructions for other platforms (os/2... 'nuff said.) CHECKPKG_OVERRIDES_CSWgawk += file-with-bad-content|/usr/share|root/opt/csw/share/info/gawk.info @@ -34,10 +38,6 @@ CHECKPKG_OVERRIDES_CSWgawk += file-with-bad-content|/usr/local|root/opt/csw/share/man/man1/gawk.1 CHECKPKG_OVERRIDES_CSWgawk += file-with-bad-content|/usr/local|root/opt/csw/share/man/man1/pgawk.1 -# This is a detection problem, reported upstream. -CHECKPKG_OVERRIDES_CSWgawk-i386 += surplus-dependency|CSWlibsigsegv2 -CHECKPKG_OVERRIDES_CSWgawk += $(CHECKPKG_OVERRIDES_CSWgawk-$(GARCH)) - include gar/category.mk post-install-modulated: Added: csw/mgar/pkg/gawk/trunk/files/0001-Be-not-that-strict-on-standard.patch =================================================================== --- csw/mgar/pkg/gawk/trunk/files/0001-Be-not-that-strict-on-standard.patch (rev 0) +++ csw/mgar/pkg/gawk/trunk/files/0001-Be-not-that-strict-on-standard.patch 2011-07-07 15:22:15 UTC (rev 15002) @@ -0,0 +1,25 @@ +From 024f67d496160ea6fe8b60b67f4832fed04fd199 Mon Sep 17 00:00:00 2001 +From: Dagobert Michelsen +Date: Thu, 7 Jul 2011 17:14:06 +0200 +Subject: [PATCH] Be not that strict on standard + +--- + awk.h | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/awk.h b/awk.h +index 25abf41..5034a46 100644 +--- a/awk.h ++++ b/awk.h +@@ -60,7 +60,7 @@ + #endif /* LOCALEDIR */ + #endif + +-#if !defined(__STDC__) || __STDC__ < 1 ++#if (!defined(__STDC__) || __STDC__ < 1) && !defined(__EXTENSIONS__) + #error "gawk no longer supports non-C89 environments (no __STDC__ or __STDC__ < 1)" + #endif + +-- +1.7.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 Thu Jul 7 23:02:51 2011 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 07 Jul 2011 21:02:51 +0000 Subject: [csw-devel] SF.net SVN: gar:[15003] csw/mgar/pkg/gawk/trunk Message-ID: Revision: 15003 http://gar.svn.sourceforge.net/gar/?rev=15003&view=rev Author: dmichelsen Date: 2011-07-07 21:02:50 +0000 (Thu, 07 Jul 2011) Log Message: ----------- gawk: More compile fixing Modified Paths: -------------- csw/mgar/pkg/gawk/trunk/Makefile Removed Paths: ------------- csw/mgar/pkg/gawk/trunk/files/0001-Be-not-that-strict-on-standard.patch Modified: csw/mgar/pkg/gawk/trunk/Makefile =================================================================== --- csw/mgar/pkg/gawk/trunk/Makefile 2011-07-07 15:22:15 UTC (rev 15002) +++ csw/mgar/pkg/gawk/trunk/Makefile 2011-07-07 21:02:50 UTC (rev 15003) @@ -17,16 +17,15 @@ MASTER_SITES = $(GNU_MIRROR) DISTFILES = $(DISTNAME).tar.xz -PATCHFILES += 0001-Be-not-that-strict-on-standard.patch - RUNTIME_DEP_PKGS_CSWgawk += CSWlibintl8 RUNTIME_DEP_PKGS_CSWgawk += CSWlibsigsegv2 RUNTIME_DEP_PKGS_CSWgawk += CSWlibreadline6 # Otherwise libsigsegv is not detected properly on Solaris 9 i386 as reported in # http://lists.gnu.org/archive/html/bug-gnulib/2011-07/msg00008.html -# Also needs the above patch. -EXTRA_CFLAGS = -features=extensions +# Additionally, there is probably a bug in /usr/include/ia32/sys/reg.h which requires +# the replacement of uint64_t by upad64_t. +EXTRA_CFLAGS = -Xc -D_XPG4_2 -Duint64_t=upad64_t # These are install instructions for other platforms (os/2... 'nuff said.) CHECKPKG_OVERRIDES_CSWgawk += file-with-bad-content|/usr/share|root/opt/csw/share/info/gawk.info @@ -35,7 +34,6 @@ CHECKPKG_OVERRIDES_CSWgawk += file-with-bad-content|/usr/local|root/opt/csw/share/info/gawk.info # This is an example path (YMMV in the docs) -CHECKPKG_OVERRIDES_CSWgawk += file-with-bad-content|/usr/local|root/opt/csw/share/man/man1/gawk.1 CHECKPKG_OVERRIDES_CSWgawk += file-with-bad-content|/usr/local|root/opt/csw/share/man/man1/pgawk.1 include gar/category.mk Deleted: csw/mgar/pkg/gawk/trunk/files/0001-Be-not-that-strict-on-standard.patch =================================================================== --- csw/mgar/pkg/gawk/trunk/files/0001-Be-not-that-strict-on-standard.patch 2011-07-07 15:22:15 UTC (rev 15002) +++ csw/mgar/pkg/gawk/trunk/files/0001-Be-not-that-strict-on-standard.patch 2011-07-07 21:02:50 UTC (rev 15003) @@ -1,25 +0,0 @@ -From 024f67d496160ea6fe8b60b67f4832fed04fd199 Mon Sep 17 00:00:00 2001 -From: Dagobert Michelsen -Date: Thu, 7 Jul 2011 17:14:06 +0200 -Subject: [PATCH] Be not that strict on standard - ---- - awk.h | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -diff --git a/awk.h b/awk.h -index 25abf41..5034a46 100644 ---- a/awk.h -+++ b/awk.h -@@ -60,7 +60,7 @@ - #endif /* LOCALEDIR */ - #endif - --#if !defined(__STDC__) || __STDC__ < 1 -+#if (!defined(__STDC__) || __STDC__ < 1) && !defined(__EXTENSIONS__) - #error "gawk no longer supports non-C89 environments (no __STDC__ or __STDC__ < 1)" - #endif - --- -1.7.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 Fri Jul 8 11:07:34 2011 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 08 Jul 2011 09:07:34 +0000 Subject: [csw-devel] SF.net SVN: gar:[15004] csw/mgar/pkg/xmlstarlet/trunk Message-ID: Revision: 15004 http://gar.svn.sourceforge.net/gar/?rev=15004&view=rev Author: dmichelsen Date: 2011-07-08 09:07:34 +0000 (Fri, 08 Jul 2011) Log Message: ----------- xmlstarlet: Update to 1.2.1 Modified Paths: -------------- csw/mgar/pkg/xmlstarlet/trunk/Makefile csw/mgar/pkg/xmlstarlet/trunk/checksums Removed Paths: ------------- csw/mgar/pkg/xmlstarlet/trunk/files/0001-Do-not-use-Wall.patch Modified: csw/mgar/pkg/xmlstarlet/trunk/Makefile =================================================================== --- csw/mgar/pkg/xmlstarlet/trunk/Makefile 2011-07-07 21:02:50 UTC (rev 15003) +++ csw/mgar/pkg/xmlstarlet/trunk/Makefile 2011-07-08 09:07:34 UTC (rev 15004) @@ -1,5 +1,5 @@ NAME = xmlstarlet -VERSION = 1.2.0 +VERSION = 1.2.1 CATEGORIES = utils DESCRIPTION = XML transformation utility @@ -13,11 +13,13 @@ SF_PROJ = xmlstar MASTER_SITES = $(SF_MIRRORS) -MASTER_SITES += http://xmlstar.sourceforge.net/downloads/ -DISTFILES = $(NAME)-$(VERSION).tar.gz +DISTFILES = $(DISTNAME).tar.gz VENDOR_URL = http://xmlstar.sourceforge.net/ +BUILD_DEP_PKGS += CSWlibxml2-dev +BUILD_DEP_PKGS += CSWlibxsltdevel + RUNTIME_DEP_PKGS_CSWxmlstarlet += CSWlibxml2-2 RUNTIME_DEP_PKGS_CSWxmlstarlet += CSWlibxslt Modified: csw/mgar/pkg/xmlstarlet/trunk/checksums =================================================================== --- csw/mgar/pkg/xmlstarlet/trunk/checksums 2011-07-07 21:02:50 UTC (rev 15003) +++ csw/mgar/pkg/xmlstarlet/trunk/checksums 2011-07-08 09:07:34 UTC (rev 15004) @@ -1 +1 @@ -53541d8b1222b722a9292703d61f924b xmlstarlet-1.2.0.tar.gz +575d2b0fc97450c97f4029817a8a787a xmlstarlet-1.2.1.tar.gz Deleted: csw/mgar/pkg/xmlstarlet/trunk/files/0001-Do-not-use-Wall.patch =================================================================== --- csw/mgar/pkg/xmlstarlet/trunk/files/0001-Do-not-use-Wall.patch 2011-07-07 21:02:50 UTC (rev 15003) +++ csw/mgar/pkg/xmlstarlet/trunk/files/0001-Do-not-use-Wall.patch 2011-07-08 09:07:34 UTC (rev 15004) @@ -1,25 +0,0 @@ -From 722db871d1a24c3ceb7cc6a297dc2a3278534699 Mon Sep 17 00:00:00 2001 -From: Dagobert Michelsen -Date: Mon, 17 Jan 2011 20:32:12 +0100 -Subject: [PATCH] Do not use -Wall - ---- - Makefile.in | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -diff --git a/Makefile.in b/Makefile.in -index 33bdd06..272a5b1 100644 ---- a/Makefile.in -+++ b/Makefile.in -@@ -232,7 +232,7 @@ top_srcdir = @top_srcdir@ - EXTRA_DIST = README TODO Copyright COPYING doc/xmlstarlet.txt - WIN32_DIST = $(EXTRA_DIST) AUTHORS ChangeLog INSTALL NEWS xml.exe doc - ACLOCAL_AMFLAGS = -I m4 --AM_CFLAGS = -Wall -+AM_CFLAGS = - - # testing - egdir = $(srcdir)/examples --- -1.7.3.2 - This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From phipsy at users.sourceforge.net Fri Jul 8 13:16:16 2011 From: phipsy at users.sourceforge.net (phipsy at users.sourceforge.net) Date: Fri, 08 Jul 2011 11:16:16 +0000 Subject: [csw-devel] SF.net SVN: gar:[15005] csw/mgar/pkg/augeas/trunk Message-ID: Revision: 15005 http://gar.svn.sourceforge.net/gar/?rev=15005&view=rev Author: phipsy Date: 2011-07-08 11:16:16 +0000 (Fri, 08 Jul 2011) Log Message: ----------- Updates to augeas to cater for sudoers on csw path Modified Paths: -------------- csw/mgar/pkg/augeas/trunk/Makefile Added Paths: ----------- csw/mgar/pkg/augeas/trunk/files/0001-add-csw-paths-for-sudoers.patch Removed Paths: ------------- csw/mgar/pkg/augeas/trunk/files/0001-Do-not-use-_N-already-taken-on-Solaris.patch csw/mgar/pkg/augeas/trunk/files/0002-Hack-in-isblank-as-gnutools-dont-seem-to-be-used.patch Modified: csw/mgar/pkg/augeas/trunk/Makefile =================================================================== --- csw/mgar/pkg/augeas/trunk/Makefile 2011-07-08 09:07:34 UTC (rev 15004) +++ csw/mgar/pkg/augeas/trunk/Makefile 2011-07-08 11:16:16 UTC (rev 15005) @@ -6,18 +6,18 @@ define BLURB Augeas is a configuration editing tool. It parses configuration files in their native formats and transforms them into a tree. Configuration changes - are made by manipulating this tree and saving it back into native config files. + are made by manipulating this tree and saving it back into native config + files. endef MASTER_SITES = http://augeas.net/download/ DISTFILES = $(NAME)-$(VERSION).tar.gz -#PATCHFILES = 0001-Do-not-use-_N-already-taken-on-Solaris.patch -#PATCHFILES += 0002-Hack-in-isblank-as-gnutools-dont-seem-to-be-used.patch VENDOR_URL = http://augeas.net RUNTIME_DEP_PKGS = CSWgcc4corert CSWlibgnugetopt CSWreadline GARCOMPILER = GCC4 EXTRA_LDFLAGS = -lgnugetopt +PATCHFILES += 0001-add-csw-paths-for-sudoers.patch # Building on Solaris 10 doesn't work as it support C99 and the above fixes are # not necessary there. @@ -28,11 +28,10 @@ TEST_TARGET = check -CHECKPKG_OVERRIDES_CSWaugeas += file-with-bad-content +CHECKPKG_OVERRIDES_CSWaugeas += file-with-bad-content CHECKPKG_OVERRIDES_CSWaugeas += non-uniform-lib-versions-in-package|sonames=libaugeas.so.0,libfa.so.1 CHECKPKG_OVERRIDES_CSWaugeas += shared-lib-package-contains-so-symlink - EXTRA_MERGE_EXCLUDE_FILES = .*/charset.alias MERGE_DIRS_isa-extra = $(libdir) Deleted: csw/mgar/pkg/augeas/trunk/files/0001-Do-not-use-_N-already-taken-on-Solaris.patch =================================================================== --- csw/mgar/pkg/augeas/trunk/files/0001-Do-not-use-_N-already-taken-on-Solaris.patch 2011-07-08 09:07:34 UTC (rev 15004) +++ csw/mgar/pkg/augeas/trunk/files/0001-Do-not-use-_N-already-taken-on-Solaris.patch 2011-07-08 11:16:16 UTC (rev 15005) @@ -1,43 +0,0 @@ -From 7f2da212368aa6eb7d4e63afaa7e8a4ab3325214 Mon Sep 17 00:00:00 2001 -From: Dagobert Michelsen -Date: Mon, 1 Mar 2010 11:55:44 +0100 -Subject: [PATCH] Do not use _N already taken on Solaris - ---- - src/fa.c | 6 +++--- - 1 files changed, 3 insertions(+), 3 deletions(-) - -diff --git a/src/fa.c b/src/fa.c -index b3f56d0..0c6f8b8 100644 ---- a/src/fa.c -+++ b/src/fa.c -@@ -46,7 +46,7 @@ typedef unsigned char uchar; - - #define _E(cond) if (cond) goto error - #define _F(expr) if ((expr) < 0) goto error --#define _N(expr) if ((expr) == NULL) goto error -+#define _NULL(expr) if ((expr) == NULL) goto error - - /* Which algorithm to use in FA_MINIMIZE */ - int fa_minimization_algorithm = FA_MIN_HOPCROFT; -@@ -2241,7 +2241,7 @@ struct fa *fa_intersect(struct fa *fa1, struct fa *fa2) { - t1[n1].to, t2[n2].to); - if (r == NULL) { - r = add_state(fa, 0); -- _N(r); -+ _NULL(r); - _F(state_set_push(worklist, t1[n1].to)); - _F(state_set_push(worklist, t2[n2].to)); - _F(state_set_push(worklist, r)); -@@ -2601,7 +2601,7 @@ int fa_example(struct fa *fa, char **example, size_t *example_len) { - int toind = state_set_index(path, t->to); - if (toind == -1) { - struct re_str *w = string_extend(NULL, ps, c); -- _N(w); -+ _NULL(w); - _F(state_set_push(worklist, t->to)); - _F(state_set_push_data(path, t->to, w)); - } else { --- -1.6.6 - Added: csw/mgar/pkg/augeas/trunk/files/0001-add-csw-paths-for-sudoers.patch =================================================================== --- csw/mgar/pkg/augeas/trunk/files/0001-add-csw-paths-for-sudoers.patch (rev 0) +++ csw/mgar/pkg/augeas/trunk/files/0001-add-csw-paths-for-sudoers.patch 2011-07-08 11:16:16 UTC (rev 15005) @@ -0,0 +1,25 @@ +From 4f44644052f34452a6a5be402b964ad0da55be54 Mon Sep 17 00:00:00 2001 +From: Mark Phillips +Date: Fri, 8 Jul 2011 13:13:11 +0200 +Subject: [PATCH] add csw paths for sudoers + +--- + lenses/sudoers.aug | 2 ++ + 1 files changed, 2 insertions(+), 0 deletions(-) + +diff --git a/lenses/sudoers.aug b/lenses/sudoers.aug +index a108ee2..ec3764a 100644 +--- a/lenses/sudoers.aug ++++ b/lenses/sudoers.aug +@@ -493,6 +493,8 @@ let filter = (incl "/etc/sudoers") + . (incl "/usr/local/etc/sudoers") + . (incl "/etc/sudoers.d/*") + . (incl "/usr/local/etc/sudoers.d/*") ++ . (incl "/opt/csw/etc/sudoers") ++ . (incl "/etc/opt/csw/sudoers") + . Util.stdexcl + + let xfm = transform lns filter +-- +1.7.6 + Deleted: csw/mgar/pkg/augeas/trunk/files/0002-Hack-in-isblank-as-gnutools-dont-seem-to-be-used.patch =================================================================== --- csw/mgar/pkg/augeas/trunk/files/0002-Hack-in-isblank-as-gnutools-dont-seem-to-be-used.patch 2011-07-08 09:07:34 UTC (rev 15004) +++ csw/mgar/pkg/augeas/trunk/files/0002-Hack-in-isblank-as-gnutools-dont-seem-to-be-used.patch 2011-07-08 11:16:16 UTC (rev 15005) @@ -1,24 +0,0 @@ -From 3c294e2e73c600d888329188b41adb7ed02577e7 Mon Sep 17 00:00:00 2001 -From: Dagobert Michelsen -Date: Mon, 1 Mar 2010 12:12:02 +0100 -Subject: [PATCH] Hack in isblank as gnutools dont seem to be used - ---- - src/augtool.c | 1 + - 1 files changed, 1 insertions(+), 0 deletions(-) - -diff --git a/src/augtool.c b/src/augtool.c -index ab412fd..0539b64 100644 ---- a/src/augtool.c -+++ b/src/augtool.c -@@ -21,6 +21,7 @@ - */ - - #include -+# define isblank(ch) ((ch) == ' ' || (ch) == '\t') - #include "augeas.h" - #include "internal.h" - #include "safe-alloc.h" --- -1.6.6 - This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From phipsy at users.sourceforge.net Fri Jul 8 13:46:56 2011 From: phipsy at users.sourceforge.net (phipsy at users.sourceforge.net) Date: Fri, 08 Jul 2011 11:46:56 +0000 Subject: [csw-devel] SF.net SVN: gar:[15006] csw/mgar/pkg/facter/trunk Message-ID: Revision: 15006 http://gar.svn.sourceforge.net/gar/?rev=15006&view=rev Author: phipsy Date: 2011-07-08 11:46:56 +0000 (Fri, 08 Jul 2011) Log Message: ----------- Applying puppetlabs 7038 patch to facter 1.6.0 Modified Paths: -------------- csw/mgar/pkg/facter/trunk/Makefile Added Paths: ----------- csw/mgar/pkg/facter/trunk/files/0001-puppetlabs-ticket-7038-prtdiag-fixes.patch Removed Paths: ------------- csw/mgar/pkg/facter/trunk/files/0001-Patch-to-prtconf-run-in-memory.rb.patch Modified: csw/mgar/pkg/facter/trunk/Makefile =================================================================== --- csw/mgar/pkg/facter/trunk/Makefile 2011-07-08 11:16:16 UTC (rev 15005) +++ csw/mgar/pkg/facter/trunk/Makefile 2011-07-08 11:46:56 UTC (rev 15006) @@ -26,7 +26,7 @@ RUNTIME_DEP_PKGS = CSWruby18 BUILD_DEP_PKGS = $(RUNTIME_DEP_PKGS) -#PATCHFILES += 0001-Patch-to-prtconf-run-in-memory.rb.patch +PATCHFILES += 0001-puppetlabs-ticket-7038-prtdiag-fixes.patch ARCHALL = 1 CONFIGURE_SCRIPTS = Deleted: csw/mgar/pkg/facter/trunk/files/0001-Patch-to-prtconf-run-in-memory.rb.patch =================================================================== --- csw/mgar/pkg/facter/trunk/files/0001-Patch-to-prtconf-run-in-memory.rb.patch 2011-07-08 11:16:16 UTC (rev 15005) +++ csw/mgar/pkg/facter/trunk/files/0001-Patch-to-prtconf-run-in-memory.rb.patch 2011-07-08 11:46:56 UTC (rev 15006) @@ -1,25 +0,0 @@ -From a99e009edb9c5b948947466a9247a820ea907cb4 Mon Sep 17 00:00:00 2001 -From: Mark Phillips -Date: Tue, 31 May 2011 19:35:05 +0200 -Subject: [PATCH] Patch to prtconf run in memory.rb - ---- - lib/facter/memory.rb | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -diff --git a/lib/facter/memory.rb b/lib/facter/memory.rb -index 9dd2e29..fdb3099 100644 ---- a/lib/facter/memory.rb -+++ b/lib/facter/memory.rb -@@ -172,7 +172,7 @@ if Facter.value(:kernel) == "SunOS" - end - - # Total memory size available from prtconf -- pconf = Facter::Util::Resolution.exec('/usr/sbin/prtconf') -+ pconf = Facter::Util::Resolution.exec('/usr/sbin/prtconf 2>/dev/null') - phymem = "" - pconf.each do |line| - if line =~ /^Memory size:\s+(\d+) Megabytes/ --- -1.7.3.2 - Added: csw/mgar/pkg/facter/trunk/files/0001-puppetlabs-ticket-7038-prtdiag-fixes.patch =================================================================== --- csw/mgar/pkg/facter/trunk/files/0001-puppetlabs-ticket-7038-prtdiag-fixes.patch (rev 0) +++ csw/mgar/pkg/facter/trunk/files/0001-puppetlabs-ticket-7038-prtdiag-fixes.patch 2011-07-08 11:46:56 UTC (rev 15006) @@ -0,0 +1,1017 @@ +From bcdc9d013a4f680500d702d3232feaed1a53942b Mon Sep 17 00:00:00 2001 +From: Mark Phillips +Date: Fri, 8 Jul 2011 13:43:48 +0200 +Subject: [PATCH] puppetlabs ticket 7038 prtdiag fixes + +--- + CHANGELOG | 39 ------ + ...ratingsystem_detection_after_clear_on_ubuntu.rb | 18 +++ + .../ticket_7039_facter_multiple_facts_one_file.rb | 31 +++++ + autotest/discover.rb | 9 ++ + autotest/facter_rspec.rb | 45 +++++++ + autotest/rspec.rb | 74 +++++++++++ + conf/redhat/facter.spec | 5 +- + conf/solaris/pkginfo | 2 +- + documentation/custom.page | 22 +++ + documentation/index.page | 19 +++ + ext/facter-diff | 74 +++++++++++ + lib/facter.rb | 2 +- + lib/facter/util/manufacturer.rb | 7 +- + lib/facter/util/prtdiag.rb | 29 ++++ + man/man8/facter.8 | 54 ++++++++ + .../manufacturer/solaris_sunfire_v120_prtdiag | 33 +++++ + spec/fixtures/manufacturer/solaris_t5220_prtdiag | 136 ++++++++++++++++++++ + spec/unit/util/manufacturer_spec.rb | 7 - + spec/unit/util/prtdiag_spec.rb | 56 ++++++++ + tasks/rake/changlog.rake | 15 ++ + tasks/rake/ci.rake | 16 +++ + tasks/rake/dailybuild.rake | 9 ++ + tasks/rake/mail_patches.rake | 48 +++++++ + tasks/rake/metrics.rake | 6 + + tasks/rake/sign.rake | 14 ++ + 25 files changed, 715 insertions(+), 55 deletions(-) + create mode 100644 acceptance/tests/operatingsystem_detection_after_clear_on_ubuntu.rb + create mode 100644 acceptance/tests/ticket_7039_facter_multiple_facts_one_file.rb + create mode 100644 autotest/discover.rb + create mode 100644 autotest/facter_rspec.rb + create mode 100644 autotest/rspec.rb + create mode 100644 documentation/custom.page + create mode 100644 documentation/index.page + create mode 100755 ext/facter-diff + create mode 100644 lib/facter/util/prtdiag.rb + create mode 100644 man/man8/facter.8 + create mode 100644 spec/fixtures/manufacturer/solaris_sunfire_v120_prtdiag + create mode 100644 spec/fixtures/manufacturer/solaris_t5220_prtdiag + create mode 100755 spec/unit/util/prtdiag_spec.rb + create mode 100644 tasks/rake/changlog.rake + create mode 100644 tasks/rake/ci.rake + create mode 100644 tasks/rake/dailybuild.rake + create mode 100644 tasks/rake/mail_patches.rake + create mode 100644 tasks/rake/metrics.rake + create mode 100644 tasks/rake/sign.rake + +diff --git a/CHANGELOG b/CHANGELOG +index d43323e..cbb40bc 100644 +--- a/CHANGELOG ++++ b/CHANGELOG +@@ -1,42 +1,3 @@ +-1.6.0 +-=== +-9404a7a (#7670) Add an acceptance test +-0c23845 maint: Fix spelling of acceptance directory +-926e912 (#7670) Stop preloading all facts in the application +-2255abe (#7670) Never fail to find a fact that is present +-8002c24 (#7507) Fix 1.9.2 test failure +-0635822 Removed inappropriately uncredited Ohai method from ec2 fact +-6b1cd16 (#6614) Update ipaddress6 fact to work with Ruby 1.9 +-21fe217 (#6612) Changed uptime spec to be endian agnostic +-19f96b5 (#6728) Facter improperly detects openvzve on CloudLinux systems +-5b10173 (#5135) Fix faulty logic in physicalprocessorcount +-53cd946 Ensures that ARP facts are returned only on EC2 hosts +-bfa038d Fixed #6974 - Moved to Apache 2.0 license +-d56bca8 refactor the mechanism for allowing for resolution ordering to be influenced +-9f4c5c6 (#6740) facter doesn't always respect facts in environment variables +-7441b32 Partial fix for #6971 - Fix for virtual tests +-7f3e89d (#2714) Fixed faulty test +-bfc16f6 (#2714) Added timeout to prtdiag resulution +-c2ff833 (#5135) Refactored physicalprocessorcount +-0c4a98b Re-factor. Do not use pure-Ruby file reading against "/proc/cpuinfo" and possibly any entry under "/sys" from the sysfs file system. +-cb52b06 Fix. Using sysfs file system entries to count the number of physical CPUs. Fall-back to "/proc/cpuinfo" included for backward-compatibility with legacy systems. +-3efa9d7 (#3856) Add virtualbox detection via lspci (graphics card), dmidecode, and prtdiag for Solaris and corresponding tests. Darwin case is not handled yet. +-7c80172 (#6883) Update Facter install.rb to be slightly more informative. +-d31e3f9 (#5394) Document each Facter fact. +-af4947c (#6862) Add a default subject for the mail_patches rake task +-d6967a0 (#6613) Switch solaris macaddress fact to netstat +-e056218 (#6817) Fix for Ruby 1.9 by calling .each_line on a string +-861c2b2 maint: cleanup whitespace +-f6c9927 (#6719) Corrected faulty logic in bugfix +-e42e57c (#3856) Add virtualbox detection via lspci (graphics card), dmidecode, and prtdiag for Solaris and corresponding tests. Darwin case is not handled yet. +-0b5b546 (#6883) Update Facter install.rb to be slightly more informative. +-7c08270 (#5394) Document each Facter fact. +-06eb3f5 (#6883) Update Facter install.rb to be slightly more informative. +-1063753 (#6862) Add a default subject for the mail_patches rake task +-56b5f10 (#6613) Switch solaris macaddress fact to netstat +-fd4f31c (#6817) Fix for Ruby 1.9 by calling .each_line on a string +-72996ff maint: cleanup whitespace +- + 1.5.9 + ===== + 4de8b20 Updated CHANGELOG for 1.5.9rc6 +diff --git a/acceptance/tests/operatingsystem_detection_after_clear_on_ubuntu.rb b/acceptance/tests/operatingsystem_detection_after_clear_on_ubuntu.rb +new file mode 100644 +index 0000000..3c7c4d9 +--- /dev/null ++++ b/acceptance/tests/operatingsystem_detection_after_clear_on_ubuntu.rb +@@ -0,0 +1,18 @@ ++test_name "#7670: Facter should properly detect operatingsystem on Ubuntu after a clear" ++ ++script_contents = <<-OS_DETECT ++ require 'facter' ++ Facter['operatingsystem'].value ++ Facter.clear ++ exit Facter['operatingsystem'].value == 'Ubuntu' ++OS_DETECT ++ ++script_name = "/tmp/facter_os_detection_test_#{$$}" ++ ++agents.each do |agent| ++ next unless agent['platform'].include? 'ubuntu' ++ ++ create_remote_file(agent, script_name, script_contents) ++ ++ on(agent, "ruby #{script_name}") ++end +diff --git a/acceptance/tests/ticket_7039_facter_multiple_facts_one_file.rb b/acceptance/tests/ticket_7039_facter_multiple_facts_one_file.rb +new file mode 100644 +index 0000000..fb78628 +--- /dev/null ++++ b/acceptance/tests/ticket_7039_facter_multiple_facts_one_file.rb +@@ -0,0 +1,31 @@ ++test_name "#7039: Facter having issue handling multiple facts in a single file" ++ ++fact_file= %q{ ++Facter.add(:test_fact1) do ++ setcode do ++ "test fact 1" ++ end ++end ++ ++Facter.add(:test_fact2) do ++ setcode do ++ "test fact 2" ++ end ++end ++} ++ ++agent1=agents.first ++step "Agent: Create fact file with multiple facts" ++create_remote_file(agent1, '/tmp/test_facts.rb', fact_file ) ++ ++step "Agent: Verify test_fact1 from /tmp/test_facts.rb" ++on(agent1, "export FACTERLIB=/tmp && facter --puppet test_fact1") do ++ fail_test "Fact 1 not returned by facter --puppet test_fact1" unless ++ stdout.include? 'test fact 1' ++end ++ ++step "Agent: Verify test_fact2 from /tmp/test_facts.rb" ++on(agent1, "export FACTERLIB=/tmp && facter --puppet test_fact2") do ++ fail_test "Fact 1 not returned by facter --puppet test_fact2" unless ++ stdout.include? 'test fact 2' ++end +diff --git a/autotest/discover.rb b/autotest/discover.rb +new file mode 100644 +index 0000000..030d07f +--- /dev/null ++++ b/autotest/discover.rb +@@ -0,0 +1,9 @@ ++require 'autotest' ++ ++Autotest.add_discovery do ++ "rspec" ++end ++ ++Autotest.add_discovery do ++ "facter" ++end +diff --git a/autotest/facter_rspec.rb b/autotest/facter_rspec.rb +new file mode 100644 +index 0000000..90e646d +--- /dev/null ++++ b/autotest/facter_rspec.rb +@@ -0,0 +1,45 @@ ++require 'autotest' ++require 'autotest/rspec' ++ ++Autotest.add_hook :initialize do |at| ++ at.clear_mappings ++ ++ # the libraries under lib/facter ++ at.add_mapping(%r%^lib/facter/(.*)\.rb$%) { |filename, m| ++ at.files_matching %r!spec/(unit|integration)/#{m[1]}.rb! ++ } ++ ++ # the actual spec files themselves ++ at.add_mapping(%r%^spec/(unit|integration)/.*\.rb$%) { |filename, _| ++ filename ++ } ++ ++ # force a complete re-run for all of these: ++ ++ # main facter lib ++ at.add_mapping(%r!^lib/facter\.rb$!) { |filename, _| ++ at.files_matching %r!spec/(unit|integration)/.*\.rb! ++ } ++ ++ # the spec_helper ++ at.add_mapping(%r!^spec/spec_helper\.rb$!) { |filename, _| ++ at.files_matching %r!spec/(unit|integration)/.*\.rb! ++ } ++ ++ # the facter spec libraries ++ at.add_mapping(%r!^spec/lib/spec.*!) { |filename, _| ++ at.files_matching %r!spec/(unit|integration)/.*\.rb! ++ } ++ ++ # the monkey patches for rspec ++ at.add_mapping(%r!^spec/lib/monkey_patches/.*!) { |filename, _| ++ at.files_matching %r!spec/(unit|integration)/.*\.rb! ++ } ++end ++ ++class Autotest::FacterRspec < Autotest::Rspec ++ def spec_commands ++ ENV["AUTOTEST"] = "true" ++ ENV["PATH"].split(File::PATH_SEPARATOR).collect { |dir| File.join(dir, "spec") } ++ end ++end +diff --git a/autotest/rspec.rb b/autotest/rspec.rb +new file mode 100644 +index 0000000..e395dfe +--- /dev/null ++++ b/autotest/rspec.rb +@@ -0,0 +1,74 @@ ++require 'autotest' ++ ++Autotest.add_hook :initialize do |at| ++ at.clear_mappings ++ # watch out: Ruby bug (1.8.6): ++ # %r(/) != /\// ++ at.add_mapping(%r%^spec/.*\.rb$%) { |filename, _| ++ filename ++ } ++ at.add_mapping(%r%^lib/(.*)\.rb$%) { |_, m| ++ ["spec/#{m[1]}_spec.rb"] ++ } ++ at.add_mapping(%r%^spec/(spec_helper|shared/.*)\.rb$%) { ++ at.files_matching %r{^spec/.*_spec\.rb$} ++ } ++end ++ ++class RspecCommandError < StandardError; end ++ ++class Autotest::Rspec < Autotest ++ ++ def initialize ++ super ++ ++ self.failed_results_re = /^\d+\)\n(?:\e\[\d*m)?(?:.*?Error in )?'([^\n]*)'(?: FAILED)?(?:\e\[\d*m)?\n(.*?)\n\n/m ++ self.completed_re = /\Z/ # FIX: some sort of summary line at the end? ++ end ++ ++ def consolidate_failures(failed) ++ filters = Hash.new { |h,k| h[k] = [] } ++ failed.each do |spec, failed_trace| ++ if f = test_files_for(failed).find { |f| failed_trace =~ Regexp.new(f) } then ++ filters[f] << spec ++ break ++ end ++ end ++ return filters ++ end ++ ++ def make_test_cmd(files_to_test) ++ return "#{ruby} -S #{spec_command} #{add_options_if_present} #{files_to_test.keys.flatten.join(' ')}" ++ end ++ ++ def add_options_if_present ++ File.exist?("spec/spec.opts") ? "-O spec/spec.opts " : "" ++ end ++ ++ # Finds the proper spec command to use. Precendence is set in the ++ # lazily-evaluated method spec_commands. Alias + Override that in ++ # ~/.autotest to provide a different spec command then the default ++ # paths provided. ++ def spec_command(separator=File::ALT_SEPARATOR) ++ unless defined? @spec_command then ++ @spec_command = spec_commands.find { |cmd| File.exists? cmd } ++ ++ raise RspecCommandError, "No spec command could be found!" unless @spec_command ++ ++ @spec_command.gsub! File::SEPARATOR, separator if separator ++ end ++ @spec_command ++ end ++ ++ # Autotest will look for spec commands in the following ++ # locations, in this order: ++ # ++ # * bin/spec ++ # * default spec bin/loader installed in Rubygems ++ def spec_commands ++ [ ++ File.expand_path(File.join(File.dirname(__FILE__), '..', '..', 'bin', 'spec')), ++ File.join(Config::CONFIG['bindir'], 'spec') ++ ] ++ end ++end +diff --git a/conf/redhat/facter.spec b/conf/redhat/facter.spec +index e78b655..99a6505 100644 +--- a/conf/redhat/facter.spec ++++ b/conf/redhat/facter.spec +@@ -5,7 +5,7 @@ + + Summary: Ruby module for collecting simple facts about a host operating system + Name: facter +-Version: 1.6.0 ++Version: 1.5.8 + Release: 1%{?dist} + License: Apache 2.0 + Group: System Environment/Base +@@ -52,9 +52,6 @@ rm -rf %{buildroot} + + + %changelog +-* Thu Jun 23 2011 Michael Stahnke - 1.6.0-1 +-- Update to 1.6.0 +- + * Sat Aug 28 2010 Todd Zullinger - 1.5.8-1 + - Update to 1.5.8 + +diff --git a/conf/solaris/pkginfo b/conf/solaris/pkginfo +index 262a436..968a459 100644 +--- a/conf/solaris/pkginfo ++++ b/conf/solaris/pkginfo +@@ -1,6 +1,6 @@ + PKG=CSWfacter + NAME=facter - System Fact Gatherer +-VERSION=1.6.0 ++VERSION=1.3.5 + CATEGORY=application + VENDOR=http://www.puppetlabs.com/puppet/related-projects/facter + HOTLINE=http://puppetlabs.com/cgi-bin/facter.cgi +diff --git a/documentation/custom.page b/documentation/custom.page +new file mode 100644 +index 0000000..0708a70 +--- /dev/null ++++ b/documentation/custom.page +@@ -0,0 +1,22 @@ ++--- ++inMenu: true ++directoryName: Custom Facts ++--- ++ ++Facter does everything it can to make adding custom facts easy. It will ++autoload any files it finds in a ``facter/`` directory in its search ++path, so you don't need to modify the package files. Also, Facter will ++search through your environment for any variables whose names start with ++'FACTER_' (case insensitive) and automatically add those facts. ++ ++As a simple example, here is how I publish my home directory to Puppet: ++ ++ Facter.add("home") do ++ setcode do ++ ENV['HOME'] ++ end ++ end ++ ++I have ~/lib/ruby in my $RUBYLIB environment variable, so I just created ++~/lib/ruby/facter and dropped the above code into a ``home.rb`` file ++within that directory. +diff --git a/documentation/index.page b/documentation/index.page +new file mode 100644 +index 0000000..c64938a +--- /dev/null ++++ b/documentation/index.page +@@ -0,0 +1,19 @@ ++--- ++inMenu: false ++directoryName: Facter ++--- ++ ++A cross-platform Ruby library for retrieving facts from operating systems. ++Supports multiple resolution mechanisms, any of which can be restricted to ++working only on certain operating systems or environments. Facter is especially ++useful for retrieving things like operating system names, IP addresses, MAC ++addresses, and SSH keys. ++ ++It is easy to extend Facter to include your own [custom facts](custom.html) or ++to include additional mechanisms for retrieving facts. ++ ++* [Downloads](/downloads/facter/) ++* [Bug Tracking](/cgi-bin/facter.cgi) ++* [API Documentation](/downloads/facter/apidocs/) ++ ++*$Id$* +diff --git a/ext/facter-diff b/ext/facter-diff +new file mode 100755 +index 0000000..6616318 +--- /dev/null ++++ b/ext/facter-diff +@@ -0,0 +1,74 @@ ++ ++#!/usr/bin/env sh ++# ++# Output the difference between a facter command run on two different versions ++# of facter. Uses unified diff format. ++ ++OPTIONS_SPEC="\ ++facter-diff [options] [fact]... ++ ++Example: ++ ++ ./ext/facter-diff 1.5.7 1.0.2 ++ ++-- ++h,help Display this help" ++ ++. "$(git --exec-path)/git-sh-setup" ++eval "$(echo "$OPTIONS_SPEC" | git rev-parse --parseopt -- "$@" || echo exit $?)" ++trap 'err=$?; cleanup; exit $err' 0 ++ ++cleanup() { ++ test $origin && git checkout -q "$origin" ++} ++ ++facter() { ++ ruby -Ilib bin/facter "$@" ++} ++ ++log_facter_run() { ++ local ref=$1 && shift ++ local tmpfile=$1 && shift ++ ++ git checkout -qf "$ref" || ++ die "fatal: unable to checkout $ref" ++ facter "$@" > $tmpfile ++} ++ ++verify_revision() { ++ git rev-parse --verify --quiet "$1" > /dev/null || ++ die "fatal: '$1' is not a valid revision" ++} ++ ++test $1 = "--" && shift # git rev-parse seems to leave the -- in ++test $# -eq 0 && usage ++ ++test $# -gt 1 || ++ die "fatal: must specify two revisions" ++ ++status=$(git status -s) ++test -z "$status" || ++ die "fatal: $0 cannot be used with a dirty working copy" ++ ++origin=$(git rev-parse --symbolic-full-name HEAD) ++test "$origin" = "HEAD" && ++ origin=$(git rev-parse HEAD) ++ ++test -x "bin/facter" || ++ die "fatal: $0 must be run from the project root" ++ ++ref1="$1" && shift ++ref2="$1" && shift ++ ++verify_revision $ref1 ++verify_revision $ref2 ++ ++tmpfile1="/tmp/$(basename $0).$$.1.tmp" ++tmpfile2="/tmp/$(basename $0).$$.2.tmp" ++ ++log_facter_run $ref1 $tmpfile1 $@ ++log_facter_run $ref2 $tmpfile2 $@ ++ ++git checkout -f "$origin" > /dev/null 2>&1 ++ ++diff --label "$ref1" --label "$ref2" -u $tmpfile1 $tmpfile2 +diff --git a/lib/facter.rb b/lib/facter.rb +index eed32f8..2073b84 100644 +--- a/lib/facter.rb ++++ b/lib/facter.rb +@@ -24,7 +24,7 @@ module Facter + include Comparable + include Enumerable + +- FACTERVERSION = '1.6.0' ++ FACTERVERSION = '1.5.9' + # = Facter + # Functions as a hash of 'facts' you might care about about your + # system, such as mac address, IP address, Video card, etc. +diff --git a/lib/facter/util/manufacturer.rb b/lib/facter/util/manufacturer.rb +index 8e9bde2..33389c9 100644 +--- a/lib/facter/util/manufacturer.rb ++++ b/lib/facter/util/manufacturer.rb +@@ -1,6 +1,8 @@ + # mamufacturer.rb + # Support methods for manufacturer specific facts + ++require 'facter/util/prtdiag' ++ + module Facter::Manufacturer + + def self.get_dmi_table() +@@ -62,11 +64,10 @@ module Facter::Manufacturer + end + + def self.prtdiag_sparc_find_system_info() +- # Parses prtdiag for a SPARC architecture string, won't work with Solaris x86 +- output = Facter::Util::Resolution.exec('/usr/sbin/prtdiag') + ++ # Parses prtdiag for a SPARC architecture string, won't work with Solaris x86 + # System Configuration: Sun Microsystems sun4u Sun SPARC Enterprise M3000 Server +- sysconfig = output.split("\n")[0] ++ sysconfig = Facter::Util::Prtdiag.system_configuration + if sysconfig =~ /^System Configuration:\s+(.+?)\s+(sun\d+\S+)\s+(.+)/ then + Facter.add('manufacturer') do + setcode do +diff --git a/lib/facter/util/prtdiag.rb b/lib/facter/util/prtdiag.rb +new file mode 100644 +index 0000000..5edce5b +--- /dev/null ++++ b/lib/facter/util/prtdiag.rb +@@ -0,0 +1,29 @@ ++# Module to safely query prtdiag ++# ++# prtdiag will fail if it is called on a non-solaris host, or if it is in a ++# zone, and it will hang if a service that prtdiag relies on is crashed. ++# This should abstract safely retrieving information from prtdiag ++ ++require 'timeout' ++ ++module Facter::Util::Prtdiag ++ ++ def self.system_configuration ++ begin ++ Timeout.timeout(6) do ++ output = Facter::Util::Resolution.exec('/usr/sbin/prtdiag') ++ if output ++ output.each_line do |pd| ++ return pd if pd =~ /System Configuration/ ++ end ++ end ++ end ++ rescue Timeout::Error => detail ++ warn "Timed out while calling prtdiag" ++ # This call avoids zombies -- basically, create a thread that will ++ # dezombify all of the child processes that we're ignoring because ++ # of the timeout. ++ Thread.new { Process.waitall } ++ end ++ end ++end +diff --git a/man/man8/facter.8 b/man/man8/facter.8 +new file mode 100644 +index 0000000..ff24b89 +--- /dev/null ++++ b/man/man8/facter.8 +@@ -0,0 +1,54 @@ ++.TH "" "" "" ++.SH NAME ++ \- ++.\" Man page generated from reStructeredText. ++. ++.SH SYNOPSIS ++.sp ++Collect and display facts about the system. ++.SH USAGE ++.INDENT 0.0 ++.INDENT 3.5 ++.sp ++facter [\-d|\-\-debug] [\-h|\-\-help] [\-p|\-\-puppet] [\-v|\-\-version] [\-y|\-\-yaml] [fact] [fact] [...] ++.UNINDENT ++.UNINDENT ++.SH DESCRIPTION ++.sp ++Collect and display facts about the current system. The library behind ++Facter is easy to expand, making Facter an easy way to collect ++information about a system from within the shell or within Ruby. ++.sp ++If no facts are specifically asked for, then all facts will be returned. ++.SH OPTIONS ++.sp ++debug: Enable debugging. ++.sp ++help: Print this help message ++.INDENT 0.0 ++.TP ++.B puppet: Load the Puppet libraries, thus allowing Facter to load ++. ++Puppet\-specific facts. ++.UNINDENT ++.sp ++version: Print the version and exit. ++.sp ++yaml: Emit facts in YAML format. ++.SH EXAMPLE ++.INDENT 0.0 ++.INDENT 3.5 ++.sp ++facter kernel ++.UNINDENT ++.UNINDENT ++.SH AUTHOR ++.sp ++Luke Kanies ++.SH COPYRIGHT ++.sp ++Copyright (c) 2006 Reductive Labs, LLC Licensed under the GNU Public ++License ++.\" Generated by docutils manpage writer. ++.\" ++. +diff --git a/spec/fixtures/manufacturer/solaris_sunfire_v120_prtdiag b/spec/fixtures/manufacturer/solaris_sunfire_v120_prtdiag +new file mode 100644 +index 0000000..e9949b5 +--- /dev/null ++++ b/spec/fixtures/manufacturer/solaris_sunfire_v120_prtdiag +@@ -0,0 +1,33 @@ ++System Configuration: Sun Microsystems sun4u Sun Fire V120 (UltraSPARC-IIe 648MHz) ++System clock frequency: 100 MHz ++Memory size: 2048 Megabytes ++ ++========================= CPUs ========================= ++ ++ Run Ecache CPU CPU ++Brd CPU Module MHz MB Impl. Mask ++--- --- ------- ----- ------ ------ ---- ++ 0 0 0 648 0.5 13 3.3 ++ ++ ++========================= IO Cards ========================= ++ ++ Bus# Freq ++Brd Type MHz Slot Name Model ++--- ---- ---- ---- -------------------------------- ---------------------- ++ 0 PCI-1 33 12 ebus ++ 0 PCI-1 33 3 pmu-pci10b9,7101 ++ 0 PCI-1 33 3 lomp ++ 0 PCI-1 33 7 isa ++ 0 PCI-1 33 12 network-pci108e,1101 SUNW,pci-eri ++ 0 PCI-1 33 12 usb-pci108e,1103.1 ++ 0 PCI-1 33 13 ide-pci10b9,5229 ++ 0 PCI-1 33 5 network-pci108e,1101 SUNW,pci-eri ++ 0 PCI-1 33 5 usb-pci108e,1103.1 ++ 0 PCI-2 33 8 scsi-glm Symbios,53C896 ++ 0 PCI-2 33 8 scsi-glm Symbios,53C896 ++ 0 PCI-2 33 5 network-pci108e,2bad SUNW,pci-gem ++ ++ ++No failures found in System ++=========================== +diff --git a/spec/fixtures/manufacturer/solaris_t5220_prtdiag b/spec/fixtures/manufacturer/solaris_t5220_prtdiag +new file mode 100644 +index 0000000..91a428d +--- /dev/null ++++ b/spec/fixtures/manufacturer/solaris_t5220_prtdiag +@@ -0,0 +1,136 @@ ++System Configuration: Sun Microsystems sun4v SPARC Enterprise T5220 ++Memory size: 32640 Megabytes ++ ++================================ Virtual CPUs ================================ ++ ++ ++CPU ID Frequency Implementation Status ++------ --------- ---------------------- ------- ++0 1165 MHz SUNW,UltraSPARC-T2 on-line ++1 1165 MHz SUNW,UltraSPARC-T2 on-line ++2 1165 MHz SUNW,UltraSPARC-T2 on-line ++3 1165 MHz SUNW,UltraSPARC-T2 on-line ++4 1165 MHz SUNW,UltraSPARC-T2 on-line ++5 1165 MHz SUNW,UltraSPARC-T2 on-line ++6 1165 MHz SUNW,UltraSPARC-T2 on-line ++7 1165 MHz SUNW,UltraSPARC-T2 on-line ++8 1165 MHz SUNW,UltraSPARC-T2 on-line ++9 1165 MHz SUNW,UltraSPARC-T2 on-line ++10 1165 MHz SUNW,UltraSPARC-T2 on-line ++11 1165 MHz SUNW,UltraSPARC-T2 on-line ++12 1165 MHz SUNW,UltraSPARC-T2 on-line ++13 1165 MHz SUNW,UltraSPARC-T2 on-line ++14 1165 MHz SUNW,UltraSPARC-T2 on-line ++15 1165 MHz SUNW,UltraSPARC-T2 on-line ++16 1165 MHz SUNW,UltraSPARC-T2 on-line ++17 1165 MHz SUNW,UltraSPARC-T2 on-line ++18 1165 MHz SUNW,UltraSPARC-T2 on-line ++19 1165 MHz SUNW,UltraSPARC-T2 on-line ++20 1165 MHz SUNW,UltraSPARC-T2 on-line ++21 1165 MHz SUNW,UltraSPARC-T2 on-line ++22 1165 MHz SUNW,UltraSPARC-T2 on-line ++23 1165 MHz SUNW,UltraSPARC-T2 on-line ++24 1165 MHz SUNW,UltraSPARC-T2 on-line ++25 1165 MHz SUNW,UltraSPARC-T2 on-line ++26 1165 MHz SUNW,UltraSPARC-T2 on-line ++27 1165 MHz SUNW,UltraSPARC-T2 on-line ++28 1165 MHz SUNW,UltraSPARC-T2 on-line ++29 1165 MHz SUNW,UltraSPARC-T2 on-line ++30 1165 MHz SUNW,UltraSPARC-T2 on-line ++31 1165 MHz SUNW,UltraSPARC-T2 on-line ++32 1165 MHz SUNW,UltraSPARC-T2 on-line ++33 1165 MHz SUNW,UltraSPARC-T2 on-line ++34 1165 MHz SUNW,UltraSPARC-T2 on-line ++35 1165 MHz SUNW,UltraSPARC-T2 on-line ++36 1165 MHz SUNW,UltraSPARC-T2 on-line ++37 1165 MHz SUNW,UltraSPARC-T2 on-line ++38 1165 MHz SUNW,UltraSPARC-T2 on-line ++39 1165 MHz SUNW,UltraSPARC-T2 on-line ++40 1165 MHz SUNW,UltraSPARC-T2 on-line ++41 1165 MHz SUNW,UltraSPARC-T2 on-line ++42 1165 MHz SUNW,UltraSPARC-T2 on-line ++43 1165 MHz SUNW,UltraSPARC-T2 on-line ++44 1165 MHz SUNW,UltraSPARC-T2 on-line ++45 1165 MHz SUNW,UltraSPARC-T2 on-line ++46 1165 MHz SUNW,UltraSPARC-T2 on-line ++47 1165 MHz SUNW,UltraSPARC-T2 on-line ++48 1165 MHz SUNW,UltraSPARC-T2 on-line ++49 1165 MHz SUNW,UltraSPARC-T2 on-line ++50 1165 MHz SUNW,UltraSPARC-T2 on-line ++51 1165 MHz SUNW,UltraSPARC-T2 on-line ++52 1165 MHz SUNW,UltraSPARC-T2 on-line ++53 1165 MHz SUNW,UltraSPARC-T2 on-line ++54 1165 MHz SUNW,UltraSPARC-T2 on-line ++55 1165 MHz SUNW,UltraSPARC-T2 on-line ++56 1165 MHz SUNW,UltraSPARC-T2 on-line ++57 1165 MHz SUNW,UltraSPARC-T2 on-line ++58 1165 MHz SUNW,UltraSPARC-T2 on-line ++59 1165 MHz SUNW,UltraSPARC-T2 on-line ++60 1165 MHz SUNW,UltraSPARC-T2 on-line ++61 1165 MHz SUNW,UltraSPARC-T2 on-line ++62 1165 MHz SUNW,UltraSPARC-T2 on-line ++63 1165 MHz SUNW,UltraSPARC-T2 on-line ++ ++======================= Physical Memory Configuration ======================== ++Segment Table: ++-------------------------------------------------------------- ++Base Segment Interleave Bank Contains ++Address Size Factor Size Modules ++-------------------------------------------------------------- ++0x0 32 GB 8 4 GB MB/CMP0/BR0/CH0/D0 ++ MB/CMP0/BR0/CH1/D0 ++ 4 GB MB/CMP0/BR0/CH0/D1 ++ MB/CMP0/BR0/CH1/D1 ++ 4 GB MB/CMP0/BR1/CH0/D0 ++ MB/CMP0/BR1/CH1/D0 ++ 4 GB MB/CMP0/BR1/CH0/D1 ++ MB/CMP0/BR1/CH1/D1 ++ 4 GB MB/CMP0/BR2/CH0/D0 ++ MB/CMP0/BR2/CH1/D0 ++ 4 GB MB/CMP0/BR2/CH0/D1 ++ MB/CMP0/BR2/CH1/D1 ++ 4 GB MB/CMP0/BR3/CH0/D0 ++ MB/CMP0/BR3/CH1/D0 ++ 4 GB MB/CMP0/BR3/CH0/D1 ++ MB/CMP0/BR3/CH1/D1 ++ ++ ++================================ IO Devices ================================ ++Slot + Bus Name + Model ++Status Type Path ++---------------------------------------------------------------------------- ++MB/NET0 PCIE network-pciex8086,105e ++ /pci at 0/pci at 0/pci at 1/pci at 0/pci at 2/network at 0 ++MB/NET1 PCIE network-pciex8086,105e ++ /pci at 0/pci at 0/pci at 1/pci at 0/pci at 2/network at 0,1 ++MB/NET2 PCIE network-pciex8086,105e ++ /pci at 0/pci at 0/pci at 1/pci at 0/pci at 3/network at 0 ++MB/NET3 PCIE network-pciex8086,105e ++ /pci at 0/pci at 0/pci at 1/pci at 0/pci at 3/network at 0,1 ++MB/SASHBA PCIE scsi-pciex1000,58 LSI,1068E ++ /pci at 0/pci at 0/pci at 2/scsi at 0 ++MB PCIX usb-pciclass,0c0310 ++ /pci at 0/pci at 0/pci at 1/pci at 0/pci at 1/pci at 0/usb at 0 ++MB PCIX usb-pciclass,0c0310 ++ /pci at 0/pci at 0/pci at 1/pci at 0/pci at 1/pci at 0/usb at 0,1 ++MB PCIX usb-pciclass,0c0320 ++ /pci at 0/pci at 0/pci at 1/pci at 0/pci at 1/pci at 0/usb at 0,2 ++ ++============================ Environmental Status ============================ ++Fan sensors: ++All fan sensors are OK. ++ ++Temperature sensors: ++All temperature sensors are OK. ++ ++Current sensors: ++All current sensors are OK. ++ ++Voltage sensors: ++All voltage sensors are OK. ++ ++Voltage indicators: ++All voltage indicators are OK. ++ ++============================ FRU Status ============================ ++All FRUs are enabled. +diff --git a/spec/unit/util/manufacturer_spec.rb b/spec/unit/util/manufacturer_spec.rb +index c3b372e..77644af 100644 +--- a/spec/unit/util/manufacturer_spec.rb ++++ b/spec/unit/util/manufacturer_spec.rb +@@ -16,13 +16,6 @@ describe Facter::Manufacturer do + Facter::Manufacturer.get_dmi_table().should be_nil + end + +- it "should parse prtdiag output" do +- Facter::Util::Resolution.stubs(:exec).returns("System Configuration: Sun Microsystems sun4u Sun SPARC Enterprise M3000 Server") +- Facter::Manufacturer.prtdiag_sparc_find_system_info() +- Facter.value(:manufacturer).should == "Sun Microsystems" +- Facter.value(:productname).should == "Sun SPARC Enterprise M3000 Server" +- end +- + it "should strip white space on dmi output with spaces" do + sample_output_file = File.dirname(__FILE__) + "/../data/linux_dmidecode_with_spaces" + dmidecode_output = File.new(sample_output_file).read() +diff --git a/spec/unit/util/prtdiag_spec.rb b/spec/unit/util/prtdiag_spec.rb +new file mode 100755 +index 0000000..3301c04 +--- /dev/null ++++ b/spec/unit/util/prtdiag_spec.rb +@@ -0,0 +1,56 @@ ++#!/usr/bin/env ruby ++require File.expand_path(File.dirname(__FILE__) + '/../../spec_helper') ++ ++require 'facter/util/prtdiag' ++ ++def fixture_data(fixture_name) ++ fixture_path = File.join(SPECDIR, 'fixtures', 'manufacturer') ++ File.read(File.join(fixture_path, fixture_name)) ++end ++ ++describe Facter::Util::Prtdiag, 'prtdiag' do ++ describe 'on a solaris sunfire v120' do ++ before do ++ Facter::Util::Prtdiag.expects("system_configuration").returns(fixture_data('solaris_sunfire_v120_prtdiag')) ++ Facter::Manufacturer.prtdiag_sparc_find_system_info() ++ end ++ ++ it 'sets the correct manufacturer fact' do ++ Facter.value(:manufacturer).should == "Sun Microsystems" ++ end ++ ++ it 'sets the correct productname fact' do ++ Facter.value(:productname).should == "Sun Fire V120 (UltraSPARC-IIe 648MHz)" ++ end ++ end ++ ++ describe 'on a solaris t5520' do ++ before do ++ Facter::Util::Prtdiag.expects("system_configuration").returns(fixture_data('solaris_t5220_prtdiag')) ++ Facter::Manufacturer.prtdiag_sparc_find_system_info() ++ end ++ ++ it 'sets the correct manufacturer fact' do ++ Facter.value(:manufacturer).should == "Sun Microsystems" ++ end ++ ++ it 'sets the correct productname fact' do ++ Facter.value(:productname).should == "SPARC Enterprise T5220" ++ end ++ end ++ ++ describe 'on an unknown SunOS sparc system' do ++ before do ++ Facter::Util::Prtdiag.expects("system_configuration").returns(nil) ++ Facter::Manufacturer.prtdiag_sparc_find_system_info() ++ end ++ ++ it 'clears the manufacturer fact' do ++ Facter.value(:manufacturer).should be_nil ++ end ++ ++ it 'clears the productname fact' do ++ Facter.value(:productname).should be_nil ++ end ++ end ++end +diff --git a/tasks/rake/changlog.rake b/tasks/rake/changlog.rake +new file mode 100644 +index 0000000..0c2f1d2 +--- /dev/null ++++ b/tasks/rake/changlog.rake +@@ -0,0 +1,15 @@ ++desc "Create a ChangeLog based on git commits." ++task :changelog do ++ begin ++ gitc = %x{which git-changelog} ++ rescue ++ puts "This task needs the git-changelog binary - http://github.com/ReinH/git-changelog" ++ end ++ ++ CHANGELOG_DIR = "#{Dir.pwd}" ++ mkdir(CHANGELOG_DIR) unless File.directory?(CHANGELOG_DIR) ++ change_body = `git-changelog --limit=99999` ++ File.open(File.join(CHANGELOG_DIR, "CHANGELOG"), 'w') do |f| ++ f << change_body ++ end ++end +diff --git a/tasks/rake/ci.rake b/tasks/rake/ci.rake +new file mode 100644 +index 0000000..e0e5aed +--- /dev/null ++++ b/tasks/rake/ci.rake +@@ -0,0 +1,16 @@ ++desc "Prep CI RSpec tests" ++task :ci_prep do ++ require 'rubygems' ++ begin ++ gem 'ci_reporter' ++ require 'ci/reporter/rake/rspec' ++ require 'ci/reporter/rake/test_unit' ++ ENV['CI_REPORTS'] = 'results' ++ rescue LoadError ++ puts 'Missing ci_reporter gem. You must have the ci_reporter gem installed to run the CI spec tests' ++ end ++end ++ ++desc "Run the CI RSpec tests" ++task :ci_spec => [:ci_prep, 'ci:setup:rspec', :spec] do ++end +diff --git a/tasks/rake/dailybuild.rake b/tasks/rake/dailybuild.rake +new file mode 100644 +index 0000000..709bd48 +--- /dev/null ++++ b/tasks/rake/dailybuild.rake +@@ -0,0 +1,9 @@ ++desc "Create a Facter daily build" ++task :daily => :changelog do ++ version = "facter" + "-" + Time.now.localtime.strftime("%Y%m%d") ++ sh "git archive --format=tar --prefix=#{version}/ HEAD^{tree} >#{version}.tar" ++ sh "pax -waf #{version}.tar -s ':^:#{version}/:' ChangeLog" ++ sh "rm ChangeLog" ++ sh "gzip -f -9 #{version}.tar" ++end ++ +diff --git a/tasks/rake/mail_patches.rake b/tasks/rake/mail_patches.rake +new file mode 100644 +index 0000000..1346faa +--- /dev/null ++++ b/tasks/rake/mail_patches.rake +@@ -0,0 +1,48 @@ ++desc "Send patch information to the puppet-dev list" ++task :mail_patches do ++ if Dir.glob("00*.patch").length > 0 ++ raise "Patches already exist matching '00*.patch'; clean up first" ++ end ++ ++ unless %x{git status} =~ /On branch (.+)/ ++ raise "Could not get branch from 'git status'" ++ end ++ branch = $1 ++ ++ unless branch =~ %r{^([^\/]+)/([^\/]+)/([^\/]+)$} ++ raise "Branch name does not follow // model; cannot autodetect parent branch" ++ end ++ ++ type, parent, name = $1, $2, $3 ++ ++ # Create all of the patches ++ sh "git format-patch -C -M -s -n --subject-prefix='PATCH/facter' #{parent}..HEAD" ++ ++ # Add info to the patches ++ additional_info = "Local-branch: #{branch}\n" ++ files = Dir.glob("00*.patch") ++ files.each do |file| ++ contents = File.read(file) ++ contents.sub!(/^---\n/, "---\n#{additional_info}") ++ File.open(file, 'w') do |file_handle| ++ file_handle.print contents ++ end ++ end ++ ++ # And then mail them out. ++ ++ # If we've got more than one patch, add --compose ++ if files.length > 1 ++ compose = "--compose" ++ subject = %Q{--subject "#{type} #{name} against #{parent}"} ++ else ++ compose = "" ++ subject = "" ++ end ++ ++ # Now send the mail. ++ sh "git send-email #{compose} #{subject} --no-signed-off-by-cc --suppress-from --to puppet-dev at googlegroups.com 00*.patch" ++ ++ # Finally, clean up the patches ++ sh "rm 00*.patch" ++end +diff --git a/tasks/rake/metrics.rake b/tasks/rake/metrics.rake +new file mode 100644 +index 0000000..63af552 +--- /dev/null ++++ b/tasks/rake/metrics.rake +@@ -0,0 +1,6 @@ ++begin ++ require 'metric_fu' ++rescue LoadError ++ # Metric-fu not installed ++ # http://metric-fu.rubyforge.org/ ++end +diff --git a/tasks/rake/sign.rake b/tasks/rake/sign.rake +new file mode 100644 +index 0000000..f0e9d83 +--- /dev/null ++++ b/tasks/rake/sign.rake +@@ -0,0 +1,14 @@ ++desc "Sign the package with the Puppet Labs release key" ++task :sign_packages do ++ ++version = Facter::FACTERVERSION ++ ++# Sign package ++ ++sh "gpg --homedir $HOME/pl_release_key --detach-sign --output pkg/facter-#{version}.tar.gz.sign --armor pkg/facter-#{version}.tar.gz" ++ ++# Sign gem ++ ++sh "gpg --homedir $HOME/pl_release_key --detach-sign --output pkg/facter-#{version}.gem.sign --armor pkg/facter-#{version}.gem" ++ ++end +-- +1.7.6 + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From phipsy at users.sourceforge.net Fri Jul 8 14:32:04 2011 From: phipsy at users.sourceforge.net (phipsy at users.sourceforge.net) Date: Fri, 08 Jul 2011 12:32:04 +0000 Subject: [csw-devel] SF.net SVN: gar:[15007] csw/mgar/pkg/augeas/trunk/Makefile Message-ID: Revision: 15007 http://gar.svn.sourceforge.net/gar/?rev=15007&view=rev Author: phipsy Date: 2011-07-08 12:32:03 +0000 (Fri, 08 Jul 2011) Log Message: ----------- Changed DEPs for augeas Modified Paths: -------------- csw/mgar/pkg/augeas/trunk/Makefile Modified: csw/mgar/pkg/augeas/trunk/Makefile =================================================================== --- csw/mgar/pkg/augeas/trunk/Makefile 2011-07-08 11:46:56 UTC (rev 15006) +++ csw/mgar/pkg/augeas/trunk/Makefile 2011-07-08 12:32:03 UTC (rev 15007) @@ -14,7 +14,8 @@ DISTFILES = $(NAME)-$(VERSION).tar.gz VENDOR_URL = http://augeas.net -RUNTIME_DEP_PKGS = CSWgcc4corert CSWlibgnugetopt CSWreadline +RUNTIME_DEP_PKGS = CSWgcc4corert CSWlibgnugetopt +RUNTIME_DEP_PKGS += CSWlibreadline6 GARCOMPILER = GCC4 EXTRA_LDFLAGS = -lgnugetopt PATCHFILES += 0001-add-csw-paths-for-sudoers.patch This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From phipsy at users.sourceforge.net Fri Jul 8 14:45:47 2011 From: phipsy at users.sourceforge.net (phipsy at users.sourceforge.net) Date: Fri, 08 Jul 2011 12:45:47 +0000 Subject: [csw-devel] SF.net SVN: gar:[15008] csw/mgar/pkg/facter/trunk Message-ID: Revision: 15008 http://gar.svn.sourceforge.net/gar/?rev=15008&view=rev Author: phipsy Date: 2011-07-08 12:45:47 +0000 (Fri, 08 Jul 2011) Log Message: ----------- Determined to get facter 1.6 build right Modified Paths: -------------- csw/mgar/pkg/facter/trunk/Makefile Added Paths: ----------- csw/mgar/pkg/facter/trunk/files/0001-puppetlabs-ticket-7038-to-fix-prtdiag.patch Removed Paths: ------------- csw/mgar/pkg/facter/trunk/files/0001-puppetlabs-ticket-7038-prtdiag-fixes.patch Modified: csw/mgar/pkg/facter/trunk/Makefile =================================================================== --- csw/mgar/pkg/facter/trunk/Makefile 2011-07-08 12:32:03 UTC (rev 15007) +++ csw/mgar/pkg/facter/trunk/Makefile 2011-07-08 12:45:47 UTC (rev 15008) @@ -24,9 +24,9 @@ LICENSE = LICENSE RUNTIME_DEP_PKGS = CSWruby18 -BUILD_DEP_PKGS = $(RUNTIME_DEP_PKGS) +BUILD_DEP_PKGS = $(RUNTIME_DEP_PKGS) -PATCHFILES += 0001-puppetlabs-ticket-7038-prtdiag-fixes.patch +PATCHFILES += 0001-puppetlabs-ticket-7038-to-fix-prtdiag.patch ARCHALL = 1 CONFIGURE_SCRIPTS = Deleted: csw/mgar/pkg/facter/trunk/files/0001-puppetlabs-ticket-7038-prtdiag-fixes.patch =================================================================== --- csw/mgar/pkg/facter/trunk/files/0001-puppetlabs-ticket-7038-prtdiag-fixes.patch 2011-07-08 12:32:03 UTC (rev 15007) +++ csw/mgar/pkg/facter/trunk/files/0001-puppetlabs-ticket-7038-prtdiag-fixes.patch 2011-07-08 12:45:47 UTC (rev 15008) @@ -1,1017 +0,0 @@ -From bcdc9d013a4f680500d702d3232feaed1a53942b Mon Sep 17 00:00:00 2001 -From: Mark Phillips -Date: Fri, 8 Jul 2011 13:43:48 +0200 -Subject: [PATCH] puppetlabs ticket 7038 prtdiag fixes - ---- - CHANGELOG | 39 ------ - ...ratingsystem_detection_after_clear_on_ubuntu.rb | 18 +++ - .../ticket_7039_facter_multiple_facts_one_file.rb | 31 +++++ - autotest/discover.rb | 9 ++ - autotest/facter_rspec.rb | 45 +++++++ - autotest/rspec.rb | 74 +++++++++++ - conf/redhat/facter.spec | 5 +- - conf/solaris/pkginfo | 2 +- - documentation/custom.page | 22 +++ - documentation/index.page | 19 +++ - ext/facter-diff | 74 +++++++++++ - lib/facter.rb | 2 +- - lib/facter/util/manufacturer.rb | 7 +- - lib/facter/util/prtdiag.rb | 29 ++++ - man/man8/facter.8 | 54 ++++++++ - .../manufacturer/solaris_sunfire_v120_prtdiag | 33 +++++ - spec/fixtures/manufacturer/solaris_t5220_prtdiag | 136 ++++++++++++++++++++ - spec/unit/util/manufacturer_spec.rb | 7 - - spec/unit/util/prtdiag_spec.rb | 56 ++++++++ - tasks/rake/changlog.rake | 15 ++ - tasks/rake/ci.rake | 16 +++ - tasks/rake/dailybuild.rake | 9 ++ - tasks/rake/mail_patches.rake | 48 +++++++ - tasks/rake/metrics.rake | 6 + - tasks/rake/sign.rake | 14 ++ - 25 files changed, 715 insertions(+), 55 deletions(-) - create mode 100644 acceptance/tests/operatingsystem_detection_after_clear_on_ubuntu.rb - create mode 100644 acceptance/tests/ticket_7039_facter_multiple_facts_one_file.rb - create mode 100644 autotest/discover.rb - create mode 100644 autotest/facter_rspec.rb - create mode 100644 autotest/rspec.rb - create mode 100644 documentation/custom.page - create mode 100644 documentation/index.page - create mode 100755 ext/facter-diff - create mode 100644 lib/facter/util/prtdiag.rb - create mode 100644 man/man8/facter.8 - create mode 100644 spec/fixtures/manufacturer/solaris_sunfire_v120_prtdiag - create mode 100644 spec/fixtures/manufacturer/solaris_t5220_prtdiag - create mode 100755 spec/unit/util/prtdiag_spec.rb - create mode 100644 tasks/rake/changlog.rake - create mode 100644 tasks/rake/ci.rake - create mode 100644 tasks/rake/dailybuild.rake - create mode 100644 tasks/rake/mail_patches.rake - create mode 100644 tasks/rake/metrics.rake - create mode 100644 tasks/rake/sign.rake - -diff --git a/CHANGELOG b/CHANGELOG -index d43323e..cbb40bc 100644 ---- a/CHANGELOG -+++ b/CHANGELOG -@@ -1,42 +1,3 @@ --1.6.0 --=== --9404a7a (#7670) Add an acceptance test --0c23845 maint: Fix spelling of acceptance directory --926e912 (#7670) Stop preloading all facts in the application --2255abe (#7670) Never fail to find a fact that is present --8002c24 (#7507) Fix 1.9.2 test failure --0635822 Removed inappropriately uncredited Ohai method from ec2 fact --6b1cd16 (#6614) Update ipaddress6 fact to work with Ruby 1.9 --21fe217 (#6612) Changed uptime spec to be endian agnostic --19f96b5 (#6728) Facter improperly detects openvzve on CloudLinux systems --5b10173 (#5135) Fix faulty logic in physicalprocessorcount --53cd946 Ensures that ARP facts are returned only on EC2 hosts --bfa038d Fixed #6974 - Moved to Apache 2.0 license --d56bca8 refactor the mechanism for allowing for resolution ordering to be influenced --9f4c5c6 (#6740) facter doesn't always respect facts in environment variables --7441b32 Partial fix for #6971 - Fix for virtual tests --7f3e89d (#2714) Fixed faulty test --bfc16f6 (#2714) Added timeout to prtdiag resulution --c2ff833 (#5135) Refactored physicalprocessorcount --0c4a98b Re-factor. Do not use pure-Ruby file reading against "/proc/cpuinfo" and possibly any entry under "/sys" from the sysfs file system. --cb52b06 Fix. Using sysfs file system entries to count the number of physical CPUs. Fall-back to "/proc/cpuinfo" included for backward-compatibility with legacy systems. --3efa9d7 (#3856) Add virtualbox detection via lspci (graphics card), dmidecode, and prtdiag for Solaris and corresponding tests. Darwin case is not handled yet. --7c80172 (#6883) Update Facter install.rb to be slightly more informative. --d31e3f9 (#5394) Document each Facter fact. --af4947c (#6862) Add a default subject for the mail_patches rake task --d6967a0 (#6613) Switch solaris macaddress fact to netstat --e056218 (#6817) Fix for Ruby 1.9 by calling .each_line on a string --861c2b2 maint: cleanup whitespace --f6c9927 (#6719) Corrected faulty logic in bugfix --e42e57c (#3856) Add virtualbox detection via lspci (graphics card), dmidecode, and prtdiag for Solaris and corresponding tests. Darwin case is not handled yet. --0b5b546 (#6883) Update Facter install.rb to be slightly more informative. --7c08270 (#5394) Document each Facter fact. --06eb3f5 (#6883) Update Facter install.rb to be slightly more informative. --1063753 (#6862) Add a default subject for the mail_patches rake task --56b5f10 (#6613) Switch solaris macaddress fact to netstat --fd4f31c (#6817) Fix for Ruby 1.9 by calling .each_line on a string --72996ff maint: cleanup whitespace -- - 1.5.9 - ===== - 4de8b20 Updated CHANGELOG for 1.5.9rc6 -diff --git a/acceptance/tests/operatingsystem_detection_after_clear_on_ubuntu.rb b/acceptance/tests/operatingsystem_detection_after_clear_on_ubuntu.rb -new file mode 100644 -index 0000000..3c7c4d9 ---- /dev/null -+++ b/acceptance/tests/operatingsystem_detection_after_clear_on_ubuntu.rb -@@ -0,0 +1,18 @@ -+test_name "#7670: Facter should properly detect operatingsystem on Ubuntu after a clear" -+ -+script_contents = <<-OS_DETECT -+ require 'facter' -+ Facter['operatingsystem'].value -+ Facter.clear -+ exit Facter['operatingsystem'].value == 'Ubuntu' -+OS_DETECT -+ -+script_name = "/tmp/facter_os_detection_test_#{$$}" -+ -+agents.each do |agent| -+ next unless agent['platform'].include? 'ubuntu' -+ -+ create_remote_file(agent, script_name, script_contents) -+ -+ on(agent, "ruby #{script_name}") -+end -diff --git a/acceptance/tests/ticket_7039_facter_multiple_facts_one_file.rb b/acceptance/tests/ticket_7039_facter_multiple_facts_one_file.rb -new file mode 100644 -index 0000000..fb78628 ---- /dev/null -+++ b/acceptance/tests/ticket_7039_facter_multiple_facts_one_file.rb -@@ -0,0 +1,31 @@ -+test_name "#7039: Facter having issue handling multiple facts in a single file" -+ -+fact_file= %q{ -+Facter.add(:test_fact1) do -+ setcode do -+ "test fact 1" -+ end -+end -+ -+Facter.add(:test_fact2) do -+ setcode do -+ "test fact 2" -+ end -+end -+} -+ -+agent1=agents.first -+step "Agent: Create fact file with multiple facts" -+create_remote_file(agent1, '/tmp/test_facts.rb', fact_file ) -+ -+step "Agent: Verify test_fact1 from /tmp/test_facts.rb" -+on(agent1, "export FACTERLIB=/tmp && facter --puppet test_fact1") do -+ fail_test "Fact 1 not returned by facter --puppet test_fact1" unless -+ stdout.include? 'test fact 1' -+end -+ -+step "Agent: Verify test_fact2 from /tmp/test_facts.rb" -+on(agent1, "export FACTERLIB=/tmp && facter --puppet test_fact2") do -+ fail_test "Fact 1 not returned by facter --puppet test_fact2" unless -+ stdout.include? 'test fact 2' -+end -diff --git a/autotest/discover.rb b/autotest/discover.rb -new file mode 100644 -index 0000000..030d07f ---- /dev/null -+++ b/autotest/discover.rb -@@ -0,0 +1,9 @@ -+require 'autotest' -+ -+Autotest.add_discovery do -+ "rspec" -+end -+ -+Autotest.add_discovery do -+ "facter" -+end -diff --git a/autotest/facter_rspec.rb b/autotest/facter_rspec.rb -new file mode 100644 -index 0000000..90e646d ---- /dev/null -+++ b/autotest/facter_rspec.rb -@@ -0,0 +1,45 @@ -+require 'autotest' -+require 'autotest/rspec' -+ -+Autotest.add_hook :initialize do |at| -+ at.clear_mappings -+ -+ # the libraries under lib/facter -+ at.add_mapping(%r%^lib/facter/(.*)\.rb$%) { |filename, m| -+ at.files_matching %r!spec/(unit|integration)/#{m[1]}.rb! -+ } -+ -+ # the actual spec files themselves -+ at.add_mapping(%r%^spec/(unit|integration)/.*\.rb$%) { |filename, _| -+ filename -+ } -+ -+ # force a complete re-run for all of these: -+ -+ # main facter lib -+ at.add_mapping(%r!^lib/facter\.rb$!) { |filename, _| -+ at.files_matching %r!spec/(unit|integration)/.*\.rb! -+ } -+ -+ # the spec_helper -+ at.add_mapping(%r!^spec/spec_helper\.rb$!) { |filename, _| -+ at.files_matching %r!spec/(unit|integration)/.*\.rb! -+ } -+ -+ # the facter spec libraries -+ at.add_mapping(%r!^spec/lib/spec.*!) { |filename, _| -+ at.files_matching %r!spec/(unit|integration)/.*\.rb! -+ } -+ -+ # the monkey patches for rspec -+ at.add_mapping(%r!^spec/lib/monkey_patches/.*!) { |filename, _| -+ at.files_matching %r!spec/(unit|integration)/.*\.rb! -+ } -+end -+ -+class Autotest::FacterRspec < Autotest::Rspec -+ def spec_commands -+ ENV["AUTOTEST"] = "true" -+ ENV["PATH"].split(File::PATH_SEPARATOR).collect { |dir| File.join(dir, "spec") } -+ end -+end -diff --git a/autotest/rspec.rb b/autotest/rspec.rb -new file mode 100644 -index 0000000..e395dfe ---- /dev/null -+++ b/autotest/rspec.rb -@@ -0,0 +1,74 @@ -+require 'autotest' -+ -+Autotest.add_hook :initialize do |at| -+ at.clear_mappings -+ # watch out: Ruby bug (1.8.6): -+ # %r(/) != /\// -+ at.add_mapping(%r%^spec/.*\.rb$%) { |filename, _| -+ filename -+ } -+ at.add_mapping(%r%^lib/(.*)\.rb$%) { |_, m| -+ ["spec/#{m[1]}_spec.rb"] -+ } -+ at.add_mapping(%r%^spec/(spec_helper|shared/.*)\.rb$%) { -+ at.files_matching %r{^spec/.*_spec\.rb$} -+ } -+end -+ -+class RspecCommandError < StandardError; end -+ -+class Autotest::Rspec < Autotest -+ -+ def initialize -+ super -+ -+ self.failed_results_re = /^\d+\)\n(?:\e\[\d*m)?(?:.*?Error in )?'([^\n]*)'(?: FAILED)?(?:\e\[\d*m)?\n(.*?)\n\n/m -+ self.completed_re = /\Z/ # FIX: some sort of summary line at the end? -+ end -+ -+ def consolidate_failures(failed) -+ filters = Hash.new { |h,k| h[k] = [] } -+ failed.each do |spec, failed_trace| -+ if f = test_files_for(failed).find { |f| failed_trace =~ Regexp.new(f) } then -+ filters[f] << spec -+ break -+ end -+ end -+ return filters -+ end -+ -+ def make_test_cmd(files_to_test) -+ return "#{ruby} -S #{spec_command} #{add_options_if_present} #{files_to_test.keys.flatten.join(' ')}" -+ end -+ -+ def add_options_if_present -+ File.exist?("spec/spec.opts") ? "-O spec/spec.opts " : "" -+ end -+ -+ # Finds the proper spec command to use. Precendence is set in the -+ # lazily-evaluated method spec_commands. Alias + Override that in -+ # ~/.autotest to provide a different spec command then the default -+ # paths provided. -+ def spec_command(separator=File::ALT_SEPARATOR) -+ unless defined? @spec_command then -+ @spec_command = spec_commands.find { |cmd| File.exists? cmd } -+ -+ raise RspecCommandError, "No spec command could be found!" unless @spec_command -+ -+ @spec_command.gsub! File::SEPARATOR, separator if separator -+ end -+ @spec_command -+ end -+ -+ # Autotest will look for spec commands in the following -+ # locations, in this order: -+ # -+ # * bin/spec -+ # * default spec bin/loader installed in Rubygems -+ def spec_commands -+ [ -+ File.expand_path(File.join(File.dirname(__FILE__), '..', '..', 'bin', 'spec')), -+ File.join(Config::CONFIG['bindir'], 'spec') -+ ] -+ end -+end -diff --git a/conf/redhat/facter.spec b/conf/redhat/facter.spec -index e78b655..99a6505 100644 ---- a/conf/redhat/facter.spec -+++ b/conf/redhat/facter.spec -@@ -5,7 +5,7 @@ - - Summary: Ruby module for collecting simple facts about a host operating system - Name: facter --Version: 1.6.0 -+Version: 1.5.8 - Release: 1%{?dist} - License: Apache 2.0 - Group: System Environment/Base -@@ -52,9 +52,6 @@ rm -rf %{buildroot} - - - %changelog --* Thu Jun 23 2011 Michael Stahnke - 1.6.0-1 --- Update to 1.6.0 -- - * Sat Aug 28 2010 Todd Zullinger - 1.5.8-1 - - Update to 1.5.8 - -diff --git a/conf/solaris/pkginfo b/conf/solaris/pkginfo -index 262a436..968a459 100644 ---- a/conf/solaris/pkginfo -+++ b/conf/solaris/pkginfo -@@ -1,6 +1,6 @@ - PKG=CSWfacter - NAME=facter - System Fact Gatherer --VERSION=1.6.0 -+VERSION=1.3.5 - CATEGORY=application - VENDOR=http://www.puppetlabs.com/puppet/related-projects/facter - HOTLINE=http://puppetlabs.com/cgi-bin/facter.cgi -diff --git a/documentation/custom.page b/documentation/custom.page -new file mode 100644 -index 0000000..0708a70 ---- /dev/null -+++ b/documentation/custom.page -@@ -0,0 +1,22 @@ -+--- -+inMenu: true -+directoryName: Custom Facts -+--- -+ -+Facter does everything it can to make adding custom facts easy. It will -+autoload any files it finds in a ``facter/`` directory in its search -+path, so you don't need to modify the package files. Also, Facter will -+search through your environment for any variables whose names start with -+'FACTER_' (case insensitive) and automatically add those facts. -+ -+As a simple example, here is how I publish my home directory to Puppet: -+ -+ Facter.add("home") do -+ setcode do -+ ENV['HOME'] -+ end -+ end -+ -+I have ~/lib/ruby in my $RUBYLIB environment variable, so I just created -+~/lib/ruby/facter and dropped the above code into a ``home.rb`` file -+within that directory. -diff --git a/documentation/index.page b/documentation/index.page -new file mode 100644 -index 0000000..c64938a ---- /dev/null -+++ b/documentation/index.page -@@ -0,0 +1,19 @@ -+--- -+inMenu: false -+directoryName: Facter -+--- -+ -+A cross-platform Ruby library for retrieving facts from operating systems. -+Supports multiple resolution mechanisms, any of which can be restricted to -+working only on certain operating systems or environments. Facter is especially -+useful for retrieving things like operating system names, IP addresses, MAC -+addresses, and SSH keys. -+ -+It is easy to extend Facter to include your own [custom facts](custom.html) or -+to include additional mechanisms for retrieving facts. -+ -+* [Downloads](/downloads/facter/) -+* [Bug Tracking](/cgi-bin/facter.cgi) -+* [API Documentation](/downloads/facter/apidocs/) -+ -+*$Id$* -diff --git a/ext/facter-diff b/ext/facter-diff -new file mode 100755 -index 0000000..6616318 ---- /dev/null -+++ b/ext/facter-diff -@@ -0,0 +1,74 @@ -+ -+#!/usr/bin/env sh -+# -+# Output the difference between a facter command run on two different versions -+# of facter. Uses unified diff format. -+ -+OPTIONS_SPEC="\ -+facter-diff [options] [fact]... -+ -+Example: -+ -+ ./ext/facter-diff 1.5.7 1.0.2 -+ -+-- -+h,help Display this help" -+ -+. "$(git --exec-path)/git-sh-setup" -+eval "$(echo "$OPTIONS_SPEC" | git rev-parse --parseopt -- "$@" || echo exit $?)" -+trap 'err=$?; cleanup; exit $err' 0 -+ -+cleanup() { -+ test $origin && git checkout -q "$origin" -+} -+ -+facter() { -+ ruby -Ilib bin/facter "$@" -+} -+ -+log_facter_run() { -+ local ref=$1 && shift -+ local tmpfile=$1 && shift -+ -+ git checkout -qf "$ref" || -+ die "fatal: unable to checkout $ref" -+ facter "$@" > $tmpfile -+} -+ -+verify_revision() { -+ git rev-parse --verify --quiet "$1" > /dev/null || -+ die "fatal: '$1' is not a valid revision" -+} -+ -+test $1 = "--" && shift # git rev-parse seems to leave the -- in -+test $# -eq 0 && usage -+ -+test $# -gt 1 || -+ die "fatal: must specify two revisions" -+ -+status=$(git status -s) -+test -z "$status" || -+ die "fatal: $0 cannot be used with a dirty working copy" -+ -+origin=$(git rev-parse --symbolic-full-name HEAD) -+test "$origin" = "HEAD" && -+ origin=$(git rev-parse HEAD) -+ -+test -x "bin/facter" || -+ die "fatal: $0 must be run from the project root" -+ -+ref1="$1" && shift -+ref2="$1" && shift -+ -+verify_revision $ref1 -+verify_revision $ref2 -+ -+tmpfile1="/tmp/$(basename $0).$$.1.tmp" -+tmpfile2="/tmp/$(basename $0).$$.2.tmp" -+ -+log_facter_run $ref1 $tmpfile1 $@ -+log_facter_run $ref2 $tmpfile2 $@ -+ -+git checkout -f "$origin" > /dev/null 2>&1 -+ -+diff --label "$ref1" --label "$ref2" -u $tmpfile1 $tmpfile2 -diff --git a/lib/facter.rb b/lib/facter.rb -index eed32f8..2073b84 100644 ---- a/lib/facter.rb -+++ b/lib/facter.rb -@@ -24,7 +24,7 @@ module Facter - include Comparable - include Enumerable - -- FACTERVERSION = '1.6.0' -+ FACTERVERSION = '1.5.9' - # = Facter - # Functions as a hash of 'facts' you might care about about your - # system, such as mac address, IP address, Video card, etc. -diff --git a/lib/facter/util/manufacturer.rb b/lib/facter/util/manufacturer.rb -index 8e9bde2..33389c9 100644 ---- a/lib/facter/util/manufacturer.rb -+++ b/lib/facter/util/manufacturer.rb -@@ -1,6 +1,8 @@ - # mamufacturer.rb - # Support methods for manufacturer specific facts - -+require 'facter/util/prtdiag' -+ - module Facter::Manufacturer - - def self.get_dmi_table() -@@ -62,11 +64,10 @@ module Facter::Manufacturer - end - - def self.prtdiag_sparc_find_system_info() -- # Parses prtdiag for a SPARC architecture string, won't work with Solaris x86 -- output = Facter::Util::Resolution.exec('/usr/sbin/prtdiag') - -+ # Parses prtdiag for a SPARC architecture string, won't work with Solaris x86 - # System Configuration: Sun Microsystems sun4u Sun SPARC Enterprise M3000 Server -- sysconfig = output.split("\n")[0] -+ sysconfig = Facter::Util::Prtdiag.system_configuration - if sysconfig =~ /^System Configuration:\s+(.+?)\s+(sun\d+\S+)\s+(.+)/ then - Facter.add('manufacturer') do - setcode do -diff --git a/lib/facter/util/prtdiag.rb b/lib/facter/util/prtdiag.rb -new file mode 100644 -index 0000000..5edce5b ---- /dev/null -+++ b/lib/facter/util/prtdiag.rb -@@ -0,0 +1,29 @@ -+# Module to safely query prtdiag -+# -+# prtdiag will fail if it is called on a non-solaris host, or if it is in a -+# zone, and it will hang if a service that prtdiag relies on is crashed. -+# This should abstract safely retrieving information from prtdiag -+ -+require 'timeout' -+ -+module Facter::Util::Prtdiag -+ -+ def self.system_configuration -+ begin -+ Timeout.timeout(6) do -+ output = Facter::Util::Resolution.exec('/usr/sbin/prtdiag') -+ if output -+ output.each_line do |pd| -+ return pd if pd =~ /System Configuration/ -+ end -+ end -+ end -+ rescue Timeout::Error => detail -+ warn "Timed out while calling prtdiag" -+ # This call avoids zombies -- basically, create a thread that will -+ # dezombify all of the child processes that we're ignoring because -+ # of the timeout. -+ Thread.new { Process.waitall } -+ end -+ end -+end -diff --git a/man/man8/facter.8 b/man/man8/facter.8 -new file mode 100644 -index 0000000..ff24b89 ---- /dev/null -+++ b/man/man8/facter.8 -@@ -0,0 +1,54 @@ -+.TH "" "" "" -+.SH NAME -+ \- -+.\" Man page generated from reStructeredText. -+. -+.SH SYNOPSIS -+.sp -+Collect and display facts about the system. -+.SH USAGE -+.INDENT 0.0 -+.INDENT 3.5 -+.sp -+facter [\-d|\-\-debug] [\-h|\-\-help] [\-p|\-\-puppet] [\-v|\-\-version] [\-y|\-\-yaml] [fact] [fact] [...] -+.UNINDENT -+.UNINDENT -+.SH DESCRIPTION -+.sp -+Collect and display facts about the current system. The library behind -+Facter is easy to expand, making Facter an easy way to collect -+information about a system from within the shell or within Ruby. -+.sp -+If no facts are specifically asked for, then all facts will be returned. -+.SH OPTIONS -+.sp -+debug: Enable debugging. -+.sp -+help: Print this help message -+.INDENT 0.0 -+.TP -+.B puppet: Load the Puppet libraries, thus allowing Facter to load -+. -+Puppet\-specific facts. -+.UNINDENT -+.sp -+version: Print the version and exit. -+.sp -+yaml: Emit facts in YAML format. -+.SH EXAMPLE -+.INDENT 0.0 -+.INDENT 3.5 -+.sp -+facter kernel -+.UNINDENT -+.UNINDENT -+.SH AUTHOR -+.sp -+Luke Kanies -+.SH COPYRIGHT -+.sp -+Copyright (c) 2006 Reductive Labs, LLC Licensed under the GNU Public -+License -+.\" Generated by docutils manpage writer. -+.\" -+. -diff --git a/spec/fixtures/manufacturer/solaris_sunfire_v120_prtdiag b/spec/fixtures/manufacturer/solaris_sunfire_v120_prtdiag -new file mode 100644 -index 0000000..e9949b5 ---- /dev/null -+++ b/spec/fixtures/manufacturer/solaris_sunfire_v120_prtdiag -@@ -0,0 +1,33 @@ -+System Configuration: Sun Microsystems sun4u Sun Fire V120 (UltraSPARC-IIe 648MHz) -+System clock frequency: 100 MHz -+Memory size: 2048 Megabytes -+ -+========================= CPUs ========================= -+ -+ Run Ecache CPU CPU -+Brd CPU Module MHz MB Impl. Mask -+--- --- ------- ----- ------ ------ ---- -+ 0 0 0 648 0.5 13 3.3 -+ -+ -+========================= IO Cards ========================= -+ -+ Bus# Freq -+Brd Type MHz Slot Name Model -+--- ---- ---- ---- -------------------------------- ---------------------- -+ 0 PCI-1 33 12 ebus -+ 0 PCI-1 33 3 pmu-pci10b9,7101 -+ 0 PCI-1 33 3 lomp -+ 0 PCI-1 33 7 isa -+ 0 PCI-1 33 12 network-pci108e,1101 SUNW,pci-eri -+ 0 PCI-1 33 12 usb-pci108e,1103.1 -+ 0 PCI-1 33 13 ide-pci10b9,5229 -+ 0 PCI-1 33 5 network-pci108e,1101 SUNW,pci-eri -+ 0 PCI-1 33 5 usb-pci108e,1103.1 -+ 0 PCI-2 33 8 scsi-glm Symbios,53C896 -+ 0 PCI-2 33 8 scsi-glm Symbios,53C896 -+ 0 PCI-2 33 5 network-pci108e,2bad SUNW,pci-gem -+ -+ -+No failures found in System -+=========================== -diff --git a/spec/fixtures/manufacturer/solaris_t5220_prtdiag b/spec/fixtures/manufacturer/solaris_t5220_prtdiag -new file mode 100644 -index 0000000..91a428d ---- /dev/null -+++ b/spec/fixtures/manufacturer/solaris_t5220_prtdiag -@@ -0,0 +1,136 @@ -+System Configuration: Sun Microsystems sun4v SPARC Enterprise T5220 -+Memory size: 32640 Megabytes -+ -+================================ Virtual CPUs ================================ -+ -+ -+CPU ID Frequency Implementation Status -+------ --------- ---------------------- ------- -+0 1165 MHz SUNW,UltraSPARC-T2 on-line -+1 1165 MHz SUNW,UltraSPARC-T2 on-line -+2 1165 MHz SUNW,UltraSPARC-T2 on-line -+3 1165 MHz SUNW,UltraSPARC-T2 on-line -+4 1165 MHz SUNW,UltraSPARC-T2 on-line -+5 1165 MHz SUNW,UltraSPARC-T2 on-line -+6 1165 MHz SUNW,UltraSPARC-T2 on-line -+7 1165 MHz SUNW,UltraSPARC-T2 on-line -+8 1165 MHz SUNW,UltraSPARC-T2 on-line -+9 1165 MHz SUNW,UltraSPARC-T2 on-line -+10 1165 MHz SUNW,UltraSPARC-T2 on-line -+11 1165 MHz SUNW,UltraSPARC-T2 on-line -+12 1165 MHz SUNW,UltraSPARC-T2 on-line -+13 1165 MHz SUNW,UltraSPARC-T2 on-line -+14 1165 MHz SUNW,UltraSPARC-T2 on-line -+15 1165 MHz SUNW,UltraSPARC-T2 on-line -+16 1165 MHz SUNW,UltraSPARC-T2 on-line -+17 1165 MHz SUNW,UltraSPARC-T2 on-line -+18 1165 MHz SUNW,UltraSPARC-T2 on-line -+19 1165 MHz SUNW,UltraSPARC-T2 on-line -+20 1165 MHz SUNW,UltraSPARC-T2 on-line -+21 1165 MHz SUNW,UltraSPARC-T2 on-line -+22 1165 MHz SUNW,UltraSPARC-T2 on-line -+23 1165 MHz SUNW,UltraSPARC-T2 on-line -+24 1165 MHz SUNW,UltraSPARC-T2 on-line -+25 1165 MHz SUNW,UltraSPARC-T2 on-line -+26 1165 MHz SUNW,UltraSPARC-T2 on-line -+27 1165 MHz SUNW,UltraSPARC-T2 on-line -+28 1165 MHz SUNW,UltraSPARC-T2 on-line -+29 1165 MHz SUNW,UltraSPARC-T2 on-line -+30 1165 MHz SUNW,UltraSPARC-T2 on-line -+31 1165 MHz SUNW,UltraSPARC-T2 on-line -+32 1165 MHz SUNW,UltraSPARC-T2 on-line -+33 1165 MHz SUNW,UltraSPARC-T2 on-line -+34 1165 MHz SUNW,UltraSPARC-T2 on-line -+35 1165 MHz SUNW,UltraSPARC-T2 on-line -+36 1165 MHz SUNW,UltraSPARC-T2 on-line -+37 1165 MHz SUNW,UltraSPARC-T2 on-line -+38 1165 MHz SUNW,UltraSPARC-T2 on-line -+39 1165 MHz SUNW,UltraSPARC-T2 on-line -+40 1165 MHz SUNW,UltraSPARC-T2 on-line -+41 1165 MHz SUNW,UltraSPARC-T2 on-line -+42 1165 MHz SUNW,UltraSPARC-T2 on-line -+43 1165 MHz SUNW,UltraSPARC-T2 on-line -+44 1165 MHz SUNW,UltraSPARC-T2 on-line -+45 1165 MHz SUNW,UltraSPARC-T2 on-line -+46 1165 MHz SUNW,UltraSPARC-T2 on-line -+47 1165 MHz SUNW,UltraSPARC-T2 on-line -+48 1165 MHz SUNW,UltraSPARC-T2 on-line -+49 1165 MHz SUNW,UltraSPARC-T2 on-line -+50 1165 MHz SUNW,UltraSPARC-T2 on-line -+51 1165 MHz SUNW,UltraSPARC-T2 on-line -+52 1165 MHz SUNW,UltraSPARC-T2 on-line -+53 1165 MHz SUNW,UltraSPARC-T2 on-line -+54 1165 MHz SUNW,UltraSPARC-T2 on-line -+55 1165 MHz SUNW,UltraSPARC-T2 on-line -+56 1165 MHz SUNW,UltraSPARC-T2 on-line -+57 1165 MHz SUNW,UltraSPARC-T2 on-line -+58 1165 MHz SUNW,UltraSPARC-T2 on-line -+59 1165 MHz SUNW,UltraSPARC-T2 on-line -+60 1165 MHz SUNW,UltraSPARC-T2 on-line -+61 1165 MHz SUNW,UltraSPARC-T2 on-line -+62 1165 MHz SUNW,UltraSPARC-T2 on-line -+63 1165 MHz SUNW,UltraSPARC-T2 on-line -+ -+======================= Physical Memory Configuration ======================== -+Segment Table: -+-------------------------------------------------------------- -+Base Segment Interleave Bank Contains -+Address Size Factor Size Modules -+-------------------------------------------------------------- -+0x0 32 GB 8 4 GB MB/CMP0/BR0/CH0/D0 -+ MB/CMP0/BR0/CH1/D0 -+ 4 GB MB/CMP0/BR0/CH0/D1 -+ MB/CMP0/BR0/CH1/D1 -+ 4 GB MB/CMP0/BR1/CH0/D0 -+ MB/CMP0/BR1/CH1/D0 -+ 4 GB MB/CMP0/BR1/CH0/D1 -+ MB/CMP0/BR1/CH1/D1 -+ 4 GB MB/CMP0/BR2/CH0/D0 -+ MB/CMP0/BR2/CH1/D0 -+ 4 GB MB/CMP0/BR2/CH0/D1 -+ MB/CMP0/BR2/CH1/D1 -+ 4 GB MB/CMP0/BR3/CH0/D0 -+ MB/CMP0/BR3/CH1/D0 -+ 4 GB MB/CMP0/BR3/CH0/D1 -+ MB/CMP0/BR3/CH1/D1 -+ -+ -+================================ IO Devices ================================ -+Slot + Bus Name + Model -+Status Type Path -+---------------------------------------------------------------------------- -+MB/NET0 PCIE network-pciex8086,105e -+ /pci at 0/pci at 0/pci at 1/pci at 0/pci at 2/network at 0 -+MB/NET1 PCIE network-pciex8086,105e -+ /pci at 0/pci at 0/pci at 1/pci at 0/pci at 2/network at 0,1 -+MB/NET2 PCIE network-pciex8086,105e -+ /pci at 0/pci at 0/pci at 1/pci at 0/pci at 3/network at 0 -+MB/NET3 PCIE network-pciex8086,105e -+ /pci at 0/pci at 0/pci at 1/pci at 0/pci at 3/network at 0,1 -+MB/SASHBA PCIE scsi-pciex1000,58 LSI,1068E -+ /pci at 0/pci at 0/pci at 2/scsi at 0 -+MB PCIX usb-pciclass,0c0310 -+ /pci at 0/pci at 0/pci at 1/pci at 0/pci at 1/pci at 0/usb at 0 -+MB PCIX usb-pciclass,0c0310 -+ /pci at 0/pci at 0/pci at 1/pci at 0/pci at 1/pci at 0/usb at 0,1 -+MB PCIX usb-pciclass,0c0320 -+ /pci at 0/pci at 0/pci at 1/pci at 0/pci at 1/pci at 0/usb at 0,2 -+ -+============================ Environmental Status ============================ -+Fan sensors: -+All fan sensors are OK. -+ -+Temperature sensors: -+All temperature sensors are OK. -+ -+Current sensors: -+All current sensors are OK. -+ -+Voltage sensors: -+All voltage sensors are OK. -+ -+Voltage indicators: -+All voltage indicators are OK. -+ -+============================ FRU Status ============================ -+All FRUs are enabled. -diff --git a/spec/unit/util/manufacturer_spec.rb b/spec/unit/util/manufacturer_spec.rb -index c3b372e..77644af 100644 ---- a/spec/unit/util/manufacturer_spec.rb -+++ b/spec/unit/util/manufacturer_spec.rb -@@ -16,13 +16,6 @@ describe Facter::Manufacturer do - Facter::Manufacturer.get_dmi_table().should be_nil - end - -- it "should parse prtdiag output" do -- Facter::Util::Resolution.stubs(:exec).returns("System Configuration: Sun Microsystems sun4u Sun SPARC Enterprise M3000 Server") -- Facter::Manufacturer.prtdiag_sparc_find_system_info() -- Facter.value(:manufacturer).should == "Sun Microsystems" -- Facter.value(:productname).should == "Sun SPARC Enterprise M3000 Server" -- end -- - it "should strip white space on dmi output with spaces" do - sample_output_file = File.dirname(__FILE__) + "/../data/linux_dmidecode_with_spaces" - dmidecode_output = File.new(sample_output_file).read() -diff --git a/spec/unit/util/prtdiag_spec.rb b/spec/unit/util/prtdiag_spec.rb -new file mode 100755 -index 0000000..3301c04 ---- /dev/null -+++ b/spec/unit/util/prtdiag_spec.rb -@@ -0,0 +1,56 @@ -+#!/usr/bin/env ruby -+require File.expand_path(File.dirname(__FILE__) + '/../../spec_helper') -+ -+require 'facter/util/prtdiag' -+ -+def fixture_data(fixture_name) -+ fixture_path = File.join(SPECDIR, 'fixtures', 'manufacturer') -+ File.read(File.join(fixture_path, fixture_name)) -+end -+ -+describe Facter::Util::Prtdiag, 'prtdiag' do -+ describe 'on a solaris sunfire v120' do -+ before do -+ Facter::Util::Prtdiag.expects("system_configuration").returns(fixture_data('solaris_sunfire_v120_prtdiag')) -+ Facter::Manufacturer.prtdiag_sparc_find_system_info() -+ end -+ -+ it 'sets the correct manufacturer fact' do -+ Facter.value(:manufacturer).should == "Sun Microsystems" -+ end -+ -+ it 'sets the correct productname fact' do -+ Facter.value(:productname).should == "Sun Fire V120 (UltraSPARC-IIe 648MHz)" -+ end -+ end -+ -+ describe 'on a solaris t5520' do -+ before do -+ Facter::Util::Prtdiag.expects("system_configuration").returns(fixture_data('solaris_t5220_prtdiag')) -+ Facter::Manufacturer.prtdiag_sparc_find_system_info() -+ end -+ -+ it 'sets the correct manufacturer fact' do -+ Facter.value(:manufacturer).should == "Sun Microsystems" -+ end -+ -+ it 'sets the correct productname fact' do -+ Facter.value(:productname).should == "SPARC Enterprise T5220" -+ end -+ end -+ -+ describe 'on an unknown SunOS sparc system' do -+ before do -+ Facter::Util::Prtdiag.expects("system_configuration").returns(nil) -+ Facter::Manufacturer.prtdiag_sparc_find_system_info() -+ end -+ -+ it 'clears the manufacturer fact' do -+ Facter.value(:manufacturer).should be_nil -+ end -+ -+ it 'clears the productname fact' do -+ Facter.value(:productname).should be_nil -+ end -+ end -+end -diff --git a/tasks/rake/changlog.rake b/tasks/rake/changlog.rake -new file mode 100644 -index 0000000..0c2f1d2 ---- /dev/null -+++ b/tasks/rake/changlog.rake -@@ -0,0 +1,15 @@ -+desc "Create a ChangeLog based on git commits." -+task :changelog do -+ begin -+ gitc = %x{which git-changelog} -+ rescue -+ puts "This task needs the git-changelog binary - http://github.com/ReinH/git-changelog" -+ end -+ -+ CHANGELOG_DIR = "#{Dir.pwd}" -+ mkdir(CHANGELOG_DIR) unless File.directory?(CHANGELOG_DIR) -+ change_body = `git-changelog --limit=99999` -+ File.open(File.join(CHANGELOG_DIR, "CHANGELOG"), 'w') do |f| -+ f << change_body -+ end -+end -diff --git a/tasks/rake/ci.rake b/tasks/rake/ci.rake -new file mode 100644 -index 0000000..e0e5aed ---- /dev/null -+++ b/tasks/rake/ci.rake -@@ -0,0 +1,16 @@ -+desc "Prep CI RSpec tests" -+task :ci_prep do -+ require 'rubygems' -+ begin -+ gem 'ci_reporter' -+ require 'ci/reporter/rake/rspec' -+ require 'ci/reporter/rake/test_unit' -+ ENV['CI_REPORTS'] = 'results' -+ rescue LoadError -+ puts 'Missing ci_reporter gem. You must have the ci_reporter gem installed to run the CI spec tests' -+ end -+end -+ -+desc "Run the CI RSpec tests" -+task :ci_spec => [:ci_prep, 'ci:setup:rspec', :spec] do -+end -diff --git a/tasks/rake/dailybuild.rake b/tasks/rake/dailybuild.rake -new file mode 100644 -index 0000000..709bd48 ---- /dev/null -+++ b/tasks/rake/dailybuild.rake -@@ -0,0 +1,9 @@ -+desc "Create a Facter daily build" -+task :daily => :changelog do -+ version = "facter" + "-" + Time.now.localtime.strftime("%Y%m%d") -+ sh "git archive --format=tar --prefix=#{version}/ HEAD^{tree} >#{version}.tar" -+ sh "pax -waf #{version}.tar -s ':^:#{version}/:' ChangeLog" -+ sh "rm ChangeLog" -+ sh "gzip -f -9 #{version}.tar" -+end -+ -diff --git a/tasks/rake/mail_patches.rake b/tasks/rake/mail_patches.rake -new file mode 100644 -index 0000000..1346faa ---- /dev/null -+++ b/tasks/rake/mail_patches.rake -@@ -0,0 +1,48 @@ -+desc "Send patch information to the puppet-dev list" -+task :mail_patches do -+ if Dir.glob("00*.patch").length > 0 -+ raise "Patches already exist matching '00*.patch'; clean up first" -+ end -+ -+ unless %x{git status} =~ /On branch (.+)/ -+ raise "Could not get branch from 'git status'" -+ end -+ branch = $1 -+ -+ unless branch =~ %r{^([^\/]+)/([^\/]+)/([^\/]+)$} -+ raise "Branch name does not follow // model; cannot autodetect parent branch" -+ end -+ -+ type, parent, name = $1, $2, $3 -+ -+ # Create all of the patches -+ sh "git format-patch -C -M -s -n --subject-prefix='PATCH/facter' #{parent}..HEAD" -+ -+ # Add info to the patches -+ additional_info = "Local-branch: #{branch}\n" -+ files = Dir.glob("00*.patch") -+ files.each do |file| -+ contents = File.read(file) -+ contents.sub!(/^---\n/, "---\n#{additional_info}") -+ File.open(file, 'w') do |file_handle| -+ file_handle.print contents -+ end -+ end -+ -+ # And then mail them out. -+ -+ # If we've got more than one patch, add --compose -+ if files.length > 1 -+ compose = "--compose" -+ subject = %Q{--subject "#{type} #{name} against #{parent}"} -+ else -+ compose = "" -+ subject = "" -+ end -+ -+ # Now send the mail. -+ sh "git send-email #{compose} #{subject} --no-signed-off-by-cc --suppress-from --to puppet-dev at googlegroups.com 00*.patch" -+ -+ # Finally, clean up the patches -+ sh "rm 00*.patch" -+end -diff --git a/tasks/rake/metrics.rake b/tasks/rake/metrics.rake -new file mode 100644 -index 0000000..63af552 ---- /dev/null -+++ b/tasks/rake/metrics.rake -@@ -0,0 +1,6 @@ -+begin -+ require 'metric_fu' -+rescue LoadError -+ # Metric-fu not installed -+ # http://metric-fu.rubyforge.org/ -+end -diff --git a/tasks/rake/sign.rake b/tasks/rake/sign.rake -new file mode 100644 -index 0000000..f0e9d83 ---- /dev/null -+++ b/tasks/rake/sign.rake -@@ -0,0 +1,14 @@ -+desc "Sign the package with the Puppet Labs release key" -+task :sign_packages do -+ -+version = Facter::FACTERVERSION -+ -+# Sign package -+ -+sh "gpg --homedir $HOME/pl_release_key --detach-sign --output pkg/facter-#{version}.tar.gz.sign --armor pkg/facter-#{version}.tar.gz" -+ -+# Sign gem -+ -+sh "gpg --homedir $HOME/pl_release_key --detach-sign --output pkg/facter-#{version}.gem.sign --armor pkg/facter-#{version}.gem" -+ -+end --- -1.7.6 - Added: csw/mgar/pkg/facter/trunk/files/0001-puppetlabs-ticket-7038-to-fix-prtdiag.patch =================================================================== --- csw/mgar/pkg/facter/trunk/files/0001-puppetlabs-ticket-7038-to-fix-prtdiag.patch (rev 0) +++ csw/mgar/pkg/facter/trunk/files/0001-puppetlabs-ticket-7038-to-fix-prtdiag.patch 2011-07-08 12:45:47 UTC (rev 15008) @@ -0,0 +1,53 @@ +From cbb45c1b56535bd8782be19ae67d68cba29fe9f4 Mon Sep 17 00:00:00 2001 +From: Mark Phillips +Date: Fri, 8 Jul 2011 14:41:08 +0200 +Subject: [PATCH] puppetlabs ticket 7038 to fix prtdiag + +--- + lib/facter.rb | 2 +- + lib/facter/util/manufacturer.rb | 7 ++++--- + 2 files changed, 5 insertions(+), 4 deletions(-) + +diff --git a/lib/facter.rb b/lib/facter.rb +index eed32f8..2073b84 100644 +--- a/lib/facter.rb ++++ b/lib/facter.rb +@@ -24,7 +24,7 @@ module Facter + include Comparable + include Enumerable + +- FACTERVERSION = '1.6.0' ++ FACTERVERSION = '1.5.9' + # = Facter + # Functions as a hash of 'facts' you might care about about your + # system, such as mac address, IP address, Video card, etc. +diff --git a/lib/facter/util/manufacturer.rb b/lib/facter/util/manufacturer.rb +index 8e9bde2..33389c9 100644 +--- a/lib/facter/util/manufacturer.rb ++++ b/lib/facter/util/manufacturer.rb +@@ -1,6 +1,8 @@ + # mamufacturer.rb + # Support methods for manufacturer specific facts + ++require 'facter/util/prtdiag' ++ + module Facter::Manufacturer + + def self.get_dmi_table() +@@ -62,11 +64,10 @@ module Facter::Manufacturer + end + + def self.prtdiag_sparc_find_system_info() +- # Parses prtdiag for a SPARC architecture string, won't work with Solaris x86 +- output = Facter::Util::Resolution.exec('/usr/sbin/prtdiag') + ++ # Parses prtdiag for a SPARC architecture string, won't work with Solaris x86 + # System Configuration: Sun Microsystems sun4u Sun SPARC Enterprise M3000 Server +- sysconfig = output.split("\n")[0] ++ sysconfig = Facter::Util::Prtdiag.system_configuration + if sysconfig =~ /^System Configuration:\s+(.+?)\s+(sun\d+\S+)\s+(.+)/ then + Facter.add('manufacturer') do + setcode do +-- +1.7.6 + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From phipsy at users.sourceforge.net Fri Jul 8 17:10:09 2011 From: phipsy at users.sourceforge.net (phipsy at users.sourceforge.net) Date: Fri, 08 Jul 2011 15:10:09 +0000 Subject: [csw-devel] SF.net SVN: gar:[15009] csw/mgar/pkg/facter/trunk Message-ID: Revision: 15009 http://gar.svn.sourceforge.net/gar/?rev=15009&view=rev Author: phipsy Date: 2011-07-08 15:10:09 +0000 (Fri, 08 Jul 2011) Log Message: ----------- facter: 7038 patch attempt three Modified Paths: -------------- csw/mgar/pkg/facter/trunk/Makefile Added Paths: ----------- csw/mgar/pkg/facter/trunk/files/0001-puppetlabs-bug-7038-prtdiag.patch Removed Paths: ------------- csw/mgar/pkg/facter/trunk/files/0001-puppetlabs-ticket-7038-to-fix-prtdiag.patch Modified: csw/mgar/pkg/facter/trunk/Makefile =================================================================== --- csw/mgar/pkg/facter/trunk/Makefile 2011-07-08 12:45:47 UTC (rev 15008) +++ csw/mgar/pkg/facter/trunk/Makefile 2011-07-08 15:10:09 UTC (rev 15009) @@ -26,7 +26,7 @@ RUNTIME_DEP_PKGS = CSWruby18 BUILD_DEP_PKGS = $(RUNTIME_DEP_PKGS) -PATCHFILES += 0001-puppetlabs-ticket-7038-to-fix-prtdiag.patch +PATCHFILES += 0001-puppetlabs-bug-7038-prtdiag.patch ARCHALL = 1 CONFIGURE_SCRIPTS = Added: csw/mgar/pkg/facter/trunk/files/0001-puppetlabs-bug-7038-prtdiag.patch =================================================================== --- csw/mgar/pkg/facter/trunk/files/0001-puppetlabs-bug-7038-prtdiag.patch (rev 0) +++ csw/mgar/pkg/facter/trunk/files/0001-puppetlabs-bug-7038-prtdiag.patch 2011-07-08 15:10:09 UTC (rev 15009) @@ -0,0 +1,76 @@ +From c112d39f68a2c378e6e9c6a7e33b67ac4a701deb Mon Sep 17 00:00:00 2001 +From: Mark Phillips +Date: Fri, 8 Jul 2011 16:35:07 +0200 +Subject: [PATCH] puppetlabs bug 7038 prtdiag + +--- + lib/facter/util/manufacturer.rb | 7 ++++--- + lib/facter/util/prtdiag.rb | 29 +++++++++++++++++++++++++++++ + 2 files changed, 33 insertions(+), 3 deletions(-) + create mode 100644 lib/facter/util/prtdiag.rb + +diff --git a/lib/facter/util/manufacturer.rb b/lib/facter/util/manufacturer.rb +index 8e9bde2..33389c9 100644 +--- a/lib/facter/util/manufacturer.rb ++++ b/lib/facter/util/manufacturer.rb +@@ -1,6 +1,8 @@ + # mamufacturer.rb + # Support methods for manufacturer specific facts + ++require 'facter/util/prtdiag' ++ + module Facter::Manufacturer + + def self.get_dmi_table() +@@ -62,11 +64,10 @@ module Facter::Manufacturer + end + + def self.prtdiag_sparc_find_system_info() +- # Parses prtdiag for a SPARC architecture string, won't work with Solaris x86 +- output = Facter::Util::Resolution.exec('/usr/sbin/prtdiag') + ++ # Parses prtdiag for a SPARC architecture string, won't work with Solaris x86 + # System Configuration: Sun Microsystems sun4u Sun SPARC Enterprise M3000 Server +- sysconfig = output.split("\n")[0] ++ sysconfig = Facter::Util::Prtdiag.system_configuration + if sysconfig =~ /^System Configuration:\s+(.+?)\s+(sun\d+\S+)\s+(.+)/ then + Facter.add('manufacturer') do + setcode do +diff --git a/lib/facter/util/prtdiag.rb b/lib/facter/util/prtdiag.rb +new file mode 100644 +index 0000000..5edce5b +--- /dev/null ++++ b/lib/facter/util/prtdiag.rb +@@ -0,0 +1,29 @@ ++# Module to safely query prtdiag ++# ++# prtdiag will fail if it is called on a non-solaris host, or if it is in a ++# zone, and it will hang if a service that prtdiag relies on is crashed. ++# This should abstract safely retrieving information from prtdiag ++ ++require 'timeout' ++ ++module Facter::Util::Prtdiag ++ ++ def self.system_configuration ++ begin ++ Timeout.timeout(6) do ++ output = Facter::Util::Resolution.exec('/usr/sbin/prtdiag') ++ if output ++ output.each_line do |pd| ++ return pd if pd =~ /System Configuration/ ++ end ++ end ++ end ++ rescue Timeout::Error => detail ++ warn "Timed out while calling prtdiag" ++ # This call avoids zombies -- basically, create a thread that will ++ # dezombify all of the child processes that we're ignoring because ++ # of the timeout. ++ Thread.new { Process.waitall } ++ end ++ end ++end +-- +1.7.6 + Deleted: csw/mgar/pkg/facter/trunk/files/0001-puppetlabs-ticket-7038-to-fix-prtdiag.patch =================================================================== --- csw/mgar/pkg/facter/trunk/files/0001-puppetlabs-ticket-7038-to-fix-prtdiag.patch 2011-07-08 12:45:47 UTC (rev 15008) +++ csw/mgar/pkg/facter/trunk/files/0001-puppetlabs-ticket-7038-to-fix-prtdiag.patch 2011-07-08 15:10:09 UTC (rev 15009) @@ -1,53 +0,0 @@ -From cbb45c1b56535bd8782be19ae67d68cba29fe9f4 Mon Sep 17 00:00:00 2001 -From: Mark Phillips -Date: Fri, 8 Jul 2011 14:41:08 +0200 -Subject: [PATCH] puppetlabs ticket 7038 to fix prtdiag - ---- - lib/facter.rb | 2 +- - lib/facter/util/manufacturer.rb | 7 ++++--- - 2 files changed, 5 insertions(+), 4 deletions(-) - -diff --git a/lib/facter.rb b/lib/facter.rb -index eed32f8..2073b84 100644 ---- a/lib/facter.rb -+++ b/lib/facter.rb -@@ -24,7 +24,7 @@ module Facter - include Comparable - include Enumerable - -- FACTERVERSION = '1.6.0' -+ FACTERVERSION = '1.5.9' - # = Facter - # Functions as a hash of 'facts' you might care about about your - # system, such as mac address, IP address, Video card, etc. -diff --git a/lib/facter/util/manufacturer.rb b/lib/facter/util/manufacturer.rb -index 8e9bde2..33389c9 100644 ---- a/lib/facter/util/manufacturer.rb -+++ b/lib/facter/util/manufacturer.rb -@@ -1,6 +1,8 @@ - # mamufacturer.rb - # Support methods for manufacturer specific facts - -+require 'facter/util/prtdiag' -+ - module Facter::Manufacturer - - def self.get_dmi_table() -@@ -62,11 +64,10 @@ module Facter::Manufacturer - end - - def self.prtdiag_sparc_find_system_info() -- # Parses prtdiag for a SPARC architecture string, won't work with Solaris x86 -- output = Facter::Util::Resolution.exec('/usr/sbin/prtdiag') - -+ # Parses prtdiag for a SPARC architecture string, won't work with Solaris x86 - # System Configuration: Sun Microsystems sun4u Sun SPARC Enterprise M3000 Server -- sysconfig = output.split("\n")[0] -+ sysconfig = Facter::Util::Prtdiag.system_configuration - if sysconfig =~ /^System Configuration:\s+(.+?)\s+(sun\d+\S+)\s+(.+)/ then - Facter.add('manufacturer') do - setcode do --- -1.7.6 - This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From skayser at users.sourceforge.net Fri Jul 8 21:05:42 2011 From: skayser at users.sourceforge.net (skayser at users.sourceforge.net) Date: Fri, 08 Jul 2011 19:05:42 +0000 Subject: [csw-devel] SF.net SVN: opencsw:[379] gar-wrapper/mgar Message-ID: Revision: 379 http://opencsw.svn.sourceforge.net/opencsw/?rev=379&view=rev Author: skayser Date: 2011-07-08 19:05:42 +0000 (Fri, 08 Jul 2011) Log Message: ----------- mgar: fix get_absolute_dirname, return proper path when dir doesn't end with / Modified Paths: -------------- gar-wrapper/mgar Modified: gar-wrapper/mgar =================================================================== --- gar-wrapper/mgar 2011-07-05 21:33:52 UTC (rev 378) +++ gar-wrapper/mgar 2011-07-08 19:05:42 UTC (rev 379) @@ -191,7 +191,8 @@ } function get_absolute_dirname { - ( cd `dirname "$1"` && pwd -P ) + local __path="$1" + ( cd "${__path}" && pwd -P ) } function register_buildtree { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From skayser at users.sourceforge.net Fri Jul 8 23:01:16 2011 From: skayser at users.sourceforge.net (skayser at users.sourceforge.net) Date: Fri, 08 Jul 2011 21:01:16 +0000 Subject: [csw-devel] SF.net SVN: gar:[15010] csw/mgar/pkg Message-ID: Revision: 15010 http://gar.svn.sourceforge.net/gar/?rev=15010&view=rev Author: skayser Date: 2011-07-08 21:01:12 +0000 (Fri, 08 Jul 2011) Log Message: ----------- v1 pkgs: add GARTYPE to all v1 packages Modified Paths: -------------- csw/mgar/pkg/amarok/trunk/Makefile csw/mgar/pkg/apache/trunk/Makefile csw/mgar/pkg/apg/trunk/Makefile csw/mgar/pkg/arpwatch/trunk/Makefile csw/mgar/pkg/arts/trunk/Makefile csw/mgar/pkg/authz-tools/trunk/Makefile csw/mgar/pkg/avantfax/trunk/Makefile csw/mgar/pkg/bdb45/tags/unreleased/Makefile csw/mgar/pkg/bdb46/tags/unreleased/Makefile csw/mgar/pkg/boost/branches/boost-1.33.0/Makefile csw/mgar/pkg/boost/branches/boost-gcc/Makefile csw/mgar/pkg/bugzilla/trunk/Makefile csw/mgar/pkg/ca_certificates/trunk/Makefile csw/mgar/pkg/cabextract/trunk/Makefile csw/mgar/pkg/climm/trunk/Makefile csw/mgar/pkg/cronolog/trunk/Makefile csw/mgar/pkg/cups/tags/cups-1.3.9/Makefile csw/mgar/pkg/daemontools/trunk/Makefile csw/mgar/pkg/daimonin/trunk/Makefile csw/mgar/pkg/dcraw/trunk/Makefile csw/mgar/pkg/ddd/trunk/Makefile csw/mgar/pkg/docbook/trunk/Makefile csw/mgar/pkg/emacs/trunk/Makefile csw/mgar/pkg/esvn/trunk/Makefile csw/mgar/pkg/ethereal/trunk/Makefile csw/mgar/pkg/exim/branches/dir-loc-fixes/Makefile csw/mgar/pkg/exim/tags/4.72-2010.12.18/Makefile csw/mgar/pkg/fastcgi/trunk/Makefile csw/mgar/pkg/fax2png/trunk/Makefile csw/mgar/pkg/fileutils/trunk/Makefile csw/mgar/pkg/firefox/branches/firefox3-packaging/Makefile csw/mgar/pkg/firefox/branches/mwatters/Makefile csw/mgar/pkg/flex-2.5.4a/trunk/Makefile csw/mgar/pkg/flphoto/trunk/Makefile csw/mgar/pkg/fox/trunk/Makefile csw/mgar/pkg/freeciv/trunk/Makefile csw/mgar/pkg/gaim/trunk/Makefile csw/mgar/pkg/gforth/trunk/Makefile csw/mgar/pkg/gftp/trunk/Makefile csw/mgar/pkg/gimp/trunk/Makefile csw/mgar/pkg/gphoto2/trunk/Makefile csw/mgar/pkg/groff/trunk/Makefile csw/mgar/pkg/help2man/tags/help2man-1.36.4,REV=2008.09.18/Makefile csw/mgar/pkg/hicolor-icon-theme/trunk/Makefile csw/mgar/pkg/htmltidy/trunk/Makefile csw/mgar/pkg/hylafax/trunk/Makefile csw/mgar/pkg/hypermail/trunk/Makefile csw/mgar/pkg/imap-c-client/trunk/Makefile csw/mgar/pkg/imapfilter/trunk/Makefile csw/mgar/pkg/iozone/trunk/Makefile csw/mgar/pkg/jboss4/trunk/Makefile csw/mgar/pkg/jhead/trunk/Makefile csw/mgar/pkg/jicmp/trunk/Makefile csw/mgar/pkg/jrrd/trunk/Makefile csw/mgar/pkg/kde/trunk/Makefile csw/mgar/pkg/kdeaccessibility/trunk/Makefile csw/mgar/pkg/kdeaddons/trunk/Makefile csw/mgar/pkg/kdeadmin/trunk/Makefile csw/mgar/pkg/kdeartwork/trunk/Makefile csw/mgar/pkg/kdebase/trunk/Makefile csw/mgar/pkg/kdeedu/trunk/Makefile csw/mgar/pkg/kdegames/trunk/Makefile csw/mgar/pkg/kdegraphics/trunk/Makefile csw/mgar/pkg/kdelibs/trunk/Makefile csw/mgar/pkg/kdemultimedia/trunk/Makefile csw/mgar/pkg/kdenetwork/trunk/Makefile csw/mgar/pkg/kdepim/trunk/Makefile csw/mgar/pkg/kdesvn/trunk/Makefile csw/mgar/pkg/kdetoys/trunk/Makefile csw/mgar/pkg/kdeutils/trunk/Makefile csw/mgar/pkg/kile/trunk/Makefile csw/mgar/pkg/libdvdcss/trunk/Makefile csw/mgar/pkg/libdvdread/trunk/Makefile csw/mgar/pkg/libgadu/trunk/Makefile csw/mgar/pkg/libglade/trunk/Makefile csw/mgar/pkg/libgphoto2/trunk/Makefile csw/mgar/pkg/libxine/trunk/Makefile csw/mgar/pkg/libytnef/trunk/Makefile csw/mgar/pkg/listadmin/trunk/Makefile csw/mgar/pkg/lyx/trunk/Makefile csw/mgar/pkg/maven2/trunk/Makefile csw/mgar/pkg/meanwhile/trunk/Makefile csw/mgar/pkg/meta/SAMP/trunk/Makefile csw/mgar/pkg/meta/comand/trunk/Makefile csw/mgar/pkg/meta/toplevel/trunk/Makefile csw/mgar/pkg/mharc/trunk/Makefile csw/mgar/pkg/mhonarc/trunk/Makefile csw/mgar/pkg/micq/trunk/Makefile csw/mgar/pkg/mkpackage/trunk/Makefile csw/mgar/pkg/mm/trunk/Makefile csw/mgar/pkg/mod_auth_mysql/trunk/Makefile csw/mgar/pkg/mod_auth_pam/trunk/Makefile csw/mgar/pkg/mod_evasive/trunk/Makefile csw/mgar/pkg/mod_fastcgi/trunk/Makefile csw/mgar/pkg/mod_geoip/trunk/Makefile csw/mgar/pkg/mod_highlight/trunk/Makefile csw/mgar/pkg/mod_proxy_html/trunk/Makefile csw/mgar/pkg/mod_ruby/trunk/Makefile csw/mgar/pkg/mod_svn_view/trunk/Makefile csw/mgar/pkg/mod_transform/trunk/Makefile csw/mgar/pkg/mono/trunk/Makefile csw/mgar/pkg/mplayer/tags/mplayer-1.0rc2-jwheeler/Makefile csw/mgar/pkg/mysql-ruby/trunk/Makefile csw/mgar/pkg/mysql4/trunk/Makefile csw/mgar/pkg/namazu/trunk/Makefile csw/mgar/pkg/ngrep/trunk/Makefile csw/mgar/pkg/ogle/trunk/Makefile csw/mgar/pkg/ogle_gui/trunk/Makefile csw/mgar/pkg/openal/trunk/Makefile csw/mgar/pkg/opengrok/trunk/Makefile csw/mgar/pkg/openoffice/trunk/Makefile csw/mgar/pkg/openvpn/trunk/Makefile csw/mgar/pkg/pkg_update_watch/trunk/Makefile csw/mgar/pkg/postfix/branches/postfix-2.4/Makefile csw/mgar/pkg/pound/trunk/Makefile csw/mgar/pkg/ppkg_get/trunk/Makefile csw/mgar/pkg/pubcookie/trunk/Makefile csw/mgar/pkg/pwsafe/trunk/Makefile csw/mgar/pkg/qt-gcc/trunk/Makefile csw/mgar/pkg/qt4/trunk/Makefile csw/mgar/pkg/qt4-gcc/trunk/Makefile csw/mgar/pkg/quanta/trunk/Makefile csw/mgar/pkg/rails/trunk/Makefile csw/mgar/pkg/resin/trunk/Makefile csw/mgar/pkg/sasl/trunk/Makefile csw/mgar/pkg/sdlnet/trunk/Makefile csw/mgar/pkg/sdlsound/trunk/Makefile csw/mgar/pkg/sdlttf/trunk/Makefile csw/mgar/pkg/sh-utils/trunk/Makefile csw/mgar/pkg/silctoolkit/trunk/Makefile csw/mgar/pkg/sloccount/trunk/Makefile csw/mgar/pkg/slrn/trunk/Makefile csw/mgar/pkg/smartmontools/trunk/Makefile csw/mgar/pkg/smbldap-tools/trunk/Makefile csw/mgar/pkg/squidpurge/trunk/Makefile csw/mgar/pkg/svnmailer/trunk/Makefile csw/mgar/pkg/swaks/trunk/Makefile csw/mgar/pkg/sword/trunk/Makefile csw/mgar/pkg/swtlibs/trunk/Makefile csw/mgar/pkg/sysbench/trunk/Makefile csw/mgar/pkg/system-tray-applet/trunk/Makefile csw/mgar/pkg/textutils/trunk/Makefile csw/mgar/pkg/tme/trunk/Makefile csw/mgar/pkg/tomcat4/trunk/Makefile csw/mgar/pkg/tomcat5/trunk/Makefile csw/mgar/pkg/tsclient/trunk/Makefile csw/mgar/pkg/xfce/appfinder/trunk/Makefile csw/mgar/pkg/xfce/desktop/trunk/Makefile csw/mgar/pkg/xfce/devtools/trunk/Makefile csw/mgar/pkg/xfce/exo/trunk/Makefile csw/mgar/pkg/xfce/gtk-xfce-engine/trunk/Makefile csw/mgar/pkg/xfce/icon-theme/trunk/Makefile csw/mgar/pkg/xfce/libxfce4mcs/trunk/Makefile csw/mgar/pkg/xfce/libxfcegui4/trunk/Makefile csw/mgar/pkg/xfce/mcs-manager/trunk/Makefile csw/mgar/pkg/xfce/mcs-plugins/trunk/Makefile csw/mgar/pkg/xfce/mixer/trunk/Makefile csw/mgar/pkg/xfce/mousepad/trunk/Makefile csw/mgar/pkg/xfce/orage/trunk/Makefile csw/mgar/pkg/xfce/panel/trunk/Makefile csw/mgar/pkg/xfce/print/trunk/Makefile csw/mgar/pkg/xfce/session/trunk/Makefile csw/mgar/pkg/xfce/terminal/trunk/Makefile csw/mgar/pkg/xfce/thunar/trunk/Makefile csw/mgar/pkg/xfce/utils/trunk/Makefile csw/mgar/pkg/xfce/xfwm4/trunk/Makefile csw/mgar/pkg/xfce/xfwm4-themes/trunk/Makefile csw/mgar/pkg/xine-ui/trunk/Makefile csw/mgar/pkg/xinetd/trunk/Makefile csw/mgar/pkg/xrestop/trunk/Makefile Modified: csw/mgar/pkg/amarok/trunk/Makefile =================================================================== --- csw/mgar/pkg/amarok/trunk/Makefile 2011-07-08 15:10:09 UTC (rev 15009) +++ csw/mgar/pkg/amarok/trunk/Makefile 2011-07-08 21:01:12 UTC (rev 15010) @@ -1,5 +1,6 @@ NAME = amarok VERSION = 1.4.8 +GARTYPE = v1 CATEGORIES = apps DESCRIPTION = Amarok is the music player for Linux and Unix with an intuitive interface Modified: csw/mgar/pkg/apache/trunk/Makefile =================================================================== --- csw/mgar/pkg/apache/trunk/Makefile 2011-07-08 15:10:09 UTC (rev 15009) +++ csw/mgar/pkg/apache/trunk/Makefile 2011-07-08 21:01:12 UTC (rev 15010) @@ -1,5 +1,6 @@ NAME = apache VERSION = 1.3.36 +GARTYPE = v1 CATEGORIES = server DESCRIPTION = A high performance Unix-based HTTP server. Modified: csw/mgar/pkg/apg/trunk/Makefile =================================================================== --- csw/mgar/pkg/apg/trunk/Makefile 2011-07-08 15:10:09 UTC (rev 15009) +++ csw/mgar/pkg/apg/trunk/Makefile 2011-07-08 21:01:12 UTC (rev 15010) @@ -1,5 +1,6 @@ NAME = apg VERSION = 2.2.3 +GARTYPE = v1 CATEGORIES = utils DESCRIPTION = Automated Password Generator Modified: csw/mgar/pkg/arpwatch/trunk/Makefile =================================================================== --- csw/mgar/pkg/arpwatch/trunk/Makefile 2011-07-08 15:10:09 UTC (rev 15009) +++ csw/mgar/pkg/arpwatch/trunk/Makefile 2011-07-08 21:01:12 UTC (rev 15010) @@ -1,5 +1,6 @@ NAME = arpwatch VERSION = 2.1a15 +GARTYPE = v1 CATEGORIES = server DESCRIPTION = A network monitoring tool for tracking IP/MAC addresses on a network. Modified: csw/mgar/pkg/arts/trunk/Makefile =================================================================== --- csw/mgar/pkg/arts/trunk/Makefile 2011-07-08 15:10:09 UTC (rev 15009) +++ csw/mgar/pkg/arts/trunk/Makefile 2011-07-08 21:01:12 UTC (rev 15010) @@ -1,5 +1,6 @@ NAME = arts VERSION = 1.5.2 +GARTYPE = v1 CATEGORIES = kde DESCRIPTION = Analog RealTime Synthesizer for KDE (gcc3) Modified: csw/mgar/pkg/authz-tools/trunk/Makefile =================================================================== --- csw/mgar/pkg/authz-tools/trunk/Makefile 2011-07-08 15:10:09 UTC (rev 15009) +++ csw/mgar/pkg/authz-tools/trunk/Makefile 2011-07-08 21:01:12 UTC (rev 15010) @@ -1,5 +1,6 @@ NAME = authz-tools VERSION = 0.6.1 +GARTYPE = v1 CATEGORIES = utils DESCRIPTION = tools to manipulate authz files Modified: csw/mgar/pkg/avantfax/trunk/Makefile =================================================================== --- csw/mgar/pkg/avantfax/trunk/Makefile 2011-07-08 15:10:09 UTC (rev 15009) +++ csw/mgar/pkg/avantfax/trunk/Makefile 2011-07-08 21:01:12 UTC (rev 15010) @@ -1,6 +1,7 @@ NAME = avantfax VERSION = 3.1.2 SF_PROJ = avantfax +GARTYPE = v1 CATEGORIES = apps DESCRIPTION = AvantFAX is a web application for managing faxes on HylaFAX fax servers Modified: csw/mgar/pkg/bdb45/tags/unreleased/Makefile =================================================================== --- csw/mgar/pkg/bdb45/tags/unreleased/Makefile 2011-07-08 15:10:09 UTC (rev 15009) +++ csw/mgar/pkg/bdb45/tags/unreleased/Makefile 2011-07-08 21:01:12 UTC (rev 15010) @@ -1,5 +1,6 @@ GARNAME = db GARVERSION = 4.6.21 +GARTYPE = v1 CATEGORIES = lib DESCRIPTION = embedded database libraries and utilities Modified: csw/mgar/pkg/bdb46/tags/unreleased/Makefile =================================================================== --- csw/mgar/pkg/bdb46/tags/unreleased/Makefile 2011-07-08 15:10:09 UTC (rev 15009) +++ csw/mgar/pkg/bdb46/tags/unreleased/Makefile 2011-07-08 21:01:12 UTC (rev 15010) @@ -1,5 +1,6 @@ GARNAME = db GARVERSION = 4.6.21 +GARTYPE = v1 CATEGORIES = lib DESCRIPTION = embedded database libraries and utilities Modified: csw/mgar/pkg/boost/branches/boost-1.33.0/Makefile =================================================================== --- csw/mgar/pkg/boost/branches/boost-1.33.0/Makefile 2011-07-08 15:10:09 UTC (rev 15009) +++ csw/mgar/pkg/boost/branches/boost-1.33.0/Makefile 2011-07-08 21:01:12 UTC (rev 15010) @@ -1,5 +1,6 @@ NAME = boost VERSION = 1.33.0 +GARTYPE = v1 CATEGORIES = lib DESCRIPTION = A collection of C++ libraries Modified: csw/mgar/pkg/boost/branches/boost-gcc/Makefile =================================================================== --- csw/mgar/pkg/boost/branches/boost-gcc/Makefile 2011-07-08 15:10:09 UTC (rev 15009) +++ csw/mgar/pkg/boost/branches/boost-gcc/Makefile 2011-07-08 21:01:12 UTC (rev 15010) @@ -2,6 +2,7 @@ NAME = boost VERSION = 1.45.0 +GARTYPE = v1 CATEGORIES = lib define BLURB Modified: csw/mgar/pkg/bugzilla/trunk/Makefile =================================================================== --- csw/mgar/pkg/bugzilla/trunk/Makefile 2011-07-08 15:10:09 UTC (rev 15009) +++ csw/mgar/pkg/bugzilla/trunk/Makefile 2011-07-08 21:01:12 UTC (rev 15010) @@ -1,5 +1,6 @@ NAME = bugzilla VERSION = 2.22 +GARTYPE = v1 CATEGORIES = apps DESCRIPTION = Bugzilla defect tracking system. Modified: csw/mgar/pkg/ca_certificates/trunk/Makefile =================================================================== --- csw/mgar/pkg/ca_certificates/trunk/Makefile 2011-07-08 15:10:09 UTC (rev 15009) +++ csw/mgar/pkg/ca_certificates/trunk/Makefile 2011-07-08 21:01:12 UTC (rev 15010) @@ -1,5 +1,6 @@ NAME = ca-certificates VERSION = $(shell date '+%Y%m%d') +GARTYPE = v1 CATEGORIES = xtra DESCRIPTION = CA certificates Modified: csw/mgar/pkg/cabextract/trunk/Makefile =================================================================== --- csw/mgar/pkg/cabextract/trunk/Makefile 2011-07-08 15:10:09 UTC (rev 15009) +++ csw/mgar/pkg/cabextract/trunk/Makefile 2011-07-08 21:01:12 UTC (rev 15010) @@ -1,5 +1,6 @@ NAME = cabextract VERSION = 1.2 +GARTYPE = v1 CATEGORIES = utils DESCRIPTION = Extract Microsoft cabinet files Modified: csw/mgar/pkg/climm/trunk/Makefile =================================================================== --- csw/mgar/pkg/climm/trunk/Makefile 2011-07-08 15:10:09 UTC (rev 15009) +++ csw/mgar/pkg/climm/trunk/Makefile 2011-07-08 21:01:12 UTC (rev 15010) @@ -1,5 +1,6 @@ NAME = climm VERSION = 0.6.1 +GARTYPE = v1 CATEGORIES = net DESCRIPTION = terminal-based ICQ client Modified: csw/mgar/pkg/cronolog/trunk/Makefile =================================================================== --- csw/mgar/pkg/cronolog/trunk/Makefile 2011-07-08 15:10:09 UTC (rev 15009) +++ csw/mgar/pkg/cronolog/trunk/Makefile 2011-07-08 21:01:12 UTC (rev 15010) @@ -1,5 +1,6 @@ NAME = cronolog VERSION = 1.6.2 +GARTYPE = v1 CATEGORIES = utils DESCRIPTION = A file rotation program for Apache. Modified: csw/mgar/pkg/cups/tags/cups-1.3.9/Makefile =================================================================== --- csw/mgar/pkg/cups/tags/cups-1.3.9/Makefile 2011-07-08 15:10:09 UTC (rev 15009) +++ csw/mgar/pkg/cups/tags/cups-1.3.9/Makefile 2011-07-08 21:01:12 UTC (rev 15010) @@ -1,5 +1,6 @@ GARNAME = cups GARVERSION = 1.3.9 +GARTYPE = v1 CATEGORIES = net define BLURB Modified: csw/mgar/pkg/daemontools/trunk/Makefile =================================================================== --- csw/mgar/pkg/daemontools/trunk/Makefile 2011-07-08 15:10:09 UTC (rev 15009) +++ csw/mgar/pkg/daemontools/trunk/Makefile 2011-07-08 21:01:12 UTC (rev 15010) @@ -1,5 +1,6 @@ NAME = daemontools VERSION = 0.76 +GARTYPE = v1 CATEGORIES = utils DESCRIPTION = A collection of tools for managing UNIX services Modified: csw/mgar/pkg/daimonin/trunk/Makefile =================================================================== --- csw/mgar/pkg/daimonin/trunk/Makefile 2011-07-08 15:10:09 UTC (rev 15009) +++ csw/mgar/pkg/daimonin/trunk/Makefile 2011-07-08 21:01:12 UTC (rev 15010) @@ -1,5 +1,6 @@ NAME = daimonin VERSION = +GARTYPE = v1 CATEGORIES = apps DESCRIPTION = FREE online role playing game (MMORPG) Modified: csw/mgar/pkg/dcraw/trunk/Makefile =================================================================== --- csw/mgar/pkg/dcraw/trunk/Makefile 2011-07-08 15:10:09 UTC (rev 15009) +++ csw/mgar/pkg/dcraw/trunk/Makefile 2011-07-08 21:01:12 UTC (rev 15010) @@ -1,5 +1,6 @@ NAME = dcraw VERSION = 8.77 +GARTYPE = v1 CATEGORIES = utils DESCRIPTION = Raw Digital Photo Decoder Modified: csw/mgar/pkg/ddd/trunk/Makefile =================================================================== --- csw/mgar/pkg/ddd/trunk/Makefile 2011-07-08 15:10:09 UTC (rev 15009) +++ csw/mgar/pkg/ddd/trunk/Makefile 2011-07-08 21:01:12 UTC (rev 15010) @@ -1,5 +1,6 @@ NAME = ddd VERSION = 3.3.8 +GARTYPE = v1 CATEGORIES = utils DESCRIPTION = Common graphical user interface for GDB, DBX and XDB Modified: csw/mgar/pkg/docbook/trunk/Makefile =================================================================== --- csw/mgar/pkg/docbook/trunk/Makefile 2011-07-08 15:10:09 UTC (rev 15009) +++ csw/mgar/pkg/docbook/trunk/Makefile 2011-07-08 21:01:12 UTC (rev 15010) @@ -1,5 +1,6 @@ NAME = docbook VERSION = 1.68.1 +GARTYPE = v1 CATEGORIES = lib DESCRIPTION = docbook xsl stylesheets Modified: csw/mgar/pkg/emacs/trunk/Makefile =================================================================== --- csw/mgar/pkg/emacs/trunk/Makefile 2011-07-08 15:10:09 UTC (rev 15009) +++ csw/mgar/pkg/emacs/trunk/Makefile 2011-07-08 21:01:12 UTC (rev 15010) @@ -1,6 +1,7 @@ NAME = emacs VERSION = 21.4 PATCHLEVEL = a +GARTYPE = v1 CATEGORIES = utils DESCRIPTION = Emacs editor Modified: csw/mgar/pkg/esvn/trunk/Makefile =================================================================== --- csw/mgar/pkg/esvn/trunk/Makefile 2011-07-08 15:10:09 UTC (rev 15009) +++ csw/mgar/pkg/esvn/trunk/Makefile 2011-07-08 21:01:12 UTC (rev 15010) @@ -1,6 +1,7 @@ NAME = esvn VERSION = 0.6.11_1 DISTVERSION = $(subst _,-,$(VERSION)) +GARTYPE = v1 CATEGORIES = utils DESCRIPTION = A GUI frontend to the Subversion revision system Modified: csw/mgar/pkg/ethereal/trunk/Makefile =================================================================== --- csw/mgar/pkg/ethereal/trunk/Makefile 2011-07-08 15:10:09 UTC (rev 15009) +++ csw/mgar/pkg/ethereal/trunk/Makefile 2011-07-08 21:01:12 UTC (rev 15010) @@ -1,5 +1,6 @@ NAME = ethereal VERSION = 0.99.0 +GARTYPE = v1 CATEGORIES = net DESCRIPTION = A GUI network protocol analyzer. Modified: csw/mgar/pkg/exim/branches/dir-loc-fixes/Makefile =================================================================== --- csw/mgar/pkg/exim/branches/dir-loc-fixes/Makefile 2011-07-08 15:10:09 UTC (rev 15009) +++ csw/mgar/pkg/exim/branches/dir-loc-fixes/Makefile 2011-07-08 21:01:12 UTC (rev 15010) @@ -1,5 +1,6 @@ NAME = exim VERSION = 4.72 +GARTYPE = v1 CATEGORIES = server DESCRIPTION = The Exim Mail Transfer Agent Modified: csw/mgar/pkg/exim/tags/4.72-2010.12.18/Makefile =================================================================== --- csw/mgar/pkg/exim/tags/4.72-2010.12.18/Makefile 2011-07-08 15:10:09 UTC (rev 15009) +++ csw/mgar/pkg/exim/tags/4.72-2010.12.18/Makefile 2011-07-08 21:01:12 UTC (rev 15010) @@ -1,5 +1,6 @@ NAME = exim VERSION = 4.72 +GARTYPE = v1 CATEGORIES = server DESCRIPTION = The Exim Mail Transfer Agent Modified: csw/mgar/pkg/fastcgi/trunk/Makefile =================================================================== --- csw/mgar/pkg/fastcgi/trunk/Makefile 2011-07-08 15:10:09 UTC (rev 15009) +++ csw/mgar/pkg/fastcgi/trunk/Makefile 2011-07-08 21:01:12 UTC (rev 15010) @@ -1,5 +1,6 @@ NAME = fastcgi VERSION = 2.4.0 +GARTYPE = v1 CATEGORIES = lib DESCRIPTION = A FastCGI Library Modified: csw/mgar/pkg/fax2png/trunk/Makefile =================================================================== --- csw/mgar/pkg/fax2png/trunk/Makefile 2011-07-08 15:10:09 UTC (rev 15009) +++ csw/mgar/pkg/fax2png/trunk/Makefile 2011-07-08 21:01:12 UTC (rev 15010) @@ -1,5 +1,6 @@ NAME = fax2png VERSION = 1.0 +GARTYPE = v1 CATEGORIES = utils DESCRIPTION = 1-bit multipage TIFF (fax or scan) to PNG image converter Modified: csw/mgar/pkg/fileutils/trunk/Makefile =================================================================== --- csw/mgar/pkg/fileutils/trunk/Makefile 2011-07-08 15:10:09 UTC (rev 15009) +++ csw/mgar/pkg/fileutils/trunk/Makefile 2011-07-08 21:01:12 UTC (rev 15010) @@ -1,5 +1,6 @@ NAME = fileutils VERSION = 4.1 +GARTYPE = v1 CATEGORIES = utils DESCRIPTION = File utilities Modified: csw/mgar/pkg/firefox/branches/firefox3-packaging/Makefile =================================================================== --- csw/mgar/pkg/firefox/branches/firefox3-packaging/Makefile 2011-07-08 15:10:09 UTC (rev 15009) +++ csw/mgar/pkg/firefox/branches/firefox3-packaging/Makefile 2011-07-08 21:01:12 UTC (rev 15010) @@ -1,5 +1,6 @@ NAME = firefox VERSION = 3.0.13 +GARTYPE = v1 CATEGORIES = x11 DISTNAME = $(NAME) Modified: csw/mgar/pkg/firefox/branches/mwatters/Makefile =================================================================== --- csw/mgar/pkg/firefox/branches/mwatters/Makefile 2011-07-08 15:10:09 UTC (rev 15009) +++ csw/mgar/pkg/firefox/branches/mwatters/Makefile 2011-07-08 21:01:12 UTC (rev 15010) @@ -1,5 +1,6 @@ NAME = firefox VERSION = 3.5 +GARTYPE = v1 CATEGORIES = apps DISTNAME = $(NAME) Modified: csw/mgar/pkg/flex-2.5.4a/trunk/Makefile =================================================================== --- csw/mgar/pkg/flex-2.5.4a/trunk/Makefile 2011-07-08 15:10:09 UTC (rev 15009) +++ csw/mgar/pkg/flex-2.5.4a/trunk/Makefile 2011-07-08 21:01:12 UTC (rev 15010) @@ -1,5 +1,6 @@ NAME = flex VERSION = 2.5.4 +GARTYPE = v1 CATEGORIES = devel DESCRIPTION = older version of the 'flex' parser generator Modified: csw/mgar/pkg/flphoto/trunk/Makefile =================================================================== --- csw/mgar/pkg/flphoto/trunk/Makefile 2011-07-08 15:10:09 UTC (rev 15009) +++ csw/mgar/pkg/flphoto/trunk/Makefile 2011-07-08 21:01:12 UTC (rev 15010) @@ -1,5 +1,6 @@ NAME = flphoto VERSION = 1.2 +GARTYPE = v1 CATEGORIES = apps DESCRIPTION = basic image management and display program based on the FLTK toolkit Modified: csw/mgar/pkg/fox/trunk/Makefile =================================================================== --- csw/mgar/pkg/fox/trunk/Makefile 2011-07-08 15:10:09 UTC (rev 15009) +++ csw/mgar/pkg/fox/trunk/Makefile 2011-07-08 21:01:12 UTC (rev 15010) @@ -1,5 +1,6 @@ NAME = fox VERSION = 1.4.33 +GARTYPE = v1 CATEGORIES = lib DESCRIPTION = Fox Toolkit runtime Modified: csw/mgar/pkg/freeciv/trunk/Makefile =================================================================== --- csw/mgar/pkg/freeciv/trunk/Makefile 2011-07-08 15:10:09 UTC (rev 15009) +++ csw/mgar/pkg/freeciv/trunk/Makefile 2011-07-08 21:01:12 UTC (rev 15010) @@ -1,5 +1,6 @@ NAME = freeciv VERSION = 2.1.8 +GARTYPE = v1 CATEGORIES = apps DESCRIPTION = a free turn-based multiplayer strategy game Modified: csw/mgar/pkg/gaim/trunk/Makefile =================================================================== --- csw/mgar/pkg/gaim/trunk/Makefile 2011-07-08 15:10:09 UTC (rev 15009) +++ csw/mgar/pkg/gaim/trunk/Makefile 2011-07-08 21:01:12 UTC (rev 15010) @@ -1,5 +1,6 @@ NAME = gaim VERSION = 2.0.0beta3 +GARTYPE = v1 CATEGORIES = gnome DESCRIPTION = A GTK2-based instant messaging client. Modified: csw/mgar/pkg/gforth/trunk/Makefile =================================================================== --- csw/mgar/pkg/gforth/trunk/Makefile 2011-07-08 15:10:09 UTC (rev 15009) +++ csw/mgar/pkg/gforth/trunk/Makefile 2011-07-08 21:01:12 UTC (rev 15010) @@ -1,5 +1,6 @@ NAME = gforth VERSION = 0.6.9-20070604 +GARTYPE = v1 CATEGORIES = lang DESCRIPTION = gforth - a fast and portable implementation of the ANS Forth language Modified: csw/mgar/pkg/gftp/trunk/Makefile =================================================================== --- csw/mgar/pkg/gftp/trunk/Makefile 2011-07-08 15:10:09 UTC (rev 15009) +++ csw/mgar/pkg/gftp/trunk/Makefile 2011-07-08 21:01:12 UTC (rev 15010) @@ -1,5 +1,6 @@ NAME = gftp VERSION = 2.0.19 +GARTYPE = v1 CATEGORIES = utils DESCRIPTION = A file transfer client with text and graphical user interfaces. Modified: csw/mgar/pkg/gimp/trunk/Makefile =================================================================== --- csw/mgar/pkg/gimp/trunk/Makefile 2011-07-08 15:10:09 UTC (rev 15009) +++ csw/mgar/pkg/gimp/trunk/Makefile 2011-07-08 21:01:12 UTC (rev 15010) @@ -1,4 +1,5 @@ NAME = gimp +GARTYPE = v1 CATEGORIES = gnome DESCRIPTION = The GNU Image Manipulation Program. Modified: csw/mgar/pkg/gphoto2/trunk/Makefile =================================================================== --- csw/mgar/pkg/gphoto2/trunk/Makefile 2011-07-08 15:10:09 UTC (rev 15009) +++ csw/mgar/pkg/gphoto2/trunk/Makefile 2011-07-08 21:01:12 UTC (rev 15010) @@ -1,5 +1,6 @@ NAME = gphoto2 VERSION = 2.3.1 +GARTYPE = v1 CATEGORIES = utils DESCRIPTION = gphoto2 is a command-line frontend to libgphoto2 Modified: csw/mgar/pkg/groff/trunk/Makefile =================================================================== --- csw/mgar/pkg/groff/trunk/Makefile 2011-07-08 15:10:09 UTC (rev 15009) +++ csw/mgar/pkg/groff/trunk/Makefile 2011-07-08 21:01:12 UTC (rev 15010) @@ -1,5 +1,6 @@ NAME = groff VERSION = 1.19 +GARTYPE = v1 CATEGORIES = utils DESCRIPTION = front end for the groff document formatting system Modified: csw/mgar/pkg/help2man/tags/help2man-1.36.4,REV=2008.09.18/Makefile =================================================================== --- csw/mgar/pkg/help2man/tags/help2man-1.36.4,REV=2008.09.18/Makefile 2011-07-08 15:10:09 UTC (rev 15009) +++ csw/mgar/pkg/help2man/tags/help2man-1.36.4,REV=2008.09.18/Makefile 2011-07-08 21:01:12 UTC (rev 15010) @@ -1,5 +1,6 @@ GARNAME = help2man GARVERSION = 1.36.4 +GARTYPE = v1 CATEGORIES = devel DESCRIPTION = A tool for automatically generating simple manual pages from program output Modified: csw/mgar/pkg/hicolor-icon-theme/trunk/Makefile =================================================================== --- csw/mgar/pkg/hicolor-icon-theme/trunk/Makefile 2011-07-08 15:10:09 UTC (rev 15009) +++ csw/mgar/pkg/hicolor-icon-theme/trunk/Makefile 2011-07-08 21:01:12 UTC (rev 15010) @@ -1,5 +1,6 @@ NAME = hicolor-icon-theme VERSION = 0.5 +GARTYPE = v1 CATEGORIES = xtra DESCRIPTION = Default Gtk icon theme. Modified: csw/mgar/pkg/htmltidy/trunk/Makefile =================================================================== --- csw/mgar/pkg/htmltidy/trunk/Makefile 2011-07-08 15:10:09 UTC (rev 15009) +++ csw/mgar/pkg/htmltidy/trunk/Makefile 2011-07-08 21:01:12 UTC (rev 15010) @@ -1,5 +1,6 @@ NAME = htmltidy VERSION = 2005.09.21 +GARTYPE = v1 CATEGORIES = utils DESCRIPTION = Cleans up HTML source and formats it nicely. Modified: csw/mgar/pkg/hylafax/trunk/Makefile =================================================================== --- csw/mgar/pkg/hylafax/trunk/Makefile 2011-07-08 15:10:09 UTC (rev 15009) +++ csw/mgar/pkg/hylafax/trunk/Makefile 2011-07-08 21:01:12 UTC (rev 15010) @@ -1,5 +1,6 @@ NAME = hylafax VERSION = 5.2.5 +GARTYPE = v1 CATEGORIES = server DESCRIPTION = An enterprise-class system for sending and receiving facsimiles and alpha-numeric pages Modified: csw/mgar/pkg/hypermail/trunk/Makefile =================================================================== --- csw/mgar/pkg/hypermail/trunk/Makefile 2011-07-08 15:10:09 UTC (rev 15009) +++ csw/mgar/pkg/hypermail/trunk/Makefile 2011-07-08 21:01:12 UTC (rev 15010) @@ -1,5 +1,6 @@ NAME = hypermail VERSION = 2.2.0 +GARTYPE = v1 CATEGORIES = utils DESCRIPTION = mail archive tool Modified: csw/mgar/pkg/imap-c-client/trunk/Makefile =================================================================== --- csw/mgar/pkg/imap-c-client/trunk/Makefile 2011-07-08 15:10:09 UTC (rev 15009) +++ csw/mgar/pkg/imap-c-client/trunk/Makefile 2011-07-08 21:01:12 UTC (rev 15010) @@ -3,6 +3,7 @@ DISTRELEASE = g DISTVERSION = $(VERSION)$(DISTRELEASE) DISTNAME = $(NAME)-$(VERSION)$(DISTRELEASE) +GARTYPE = v1 CATEGORIES = lib DESCRIPTION = UW IMAP C-Client Modified: csw/mgar/pkg/imapfilter/trunk/Makefile =================================================================== --- csw/mgar/pkg/imapfilter/trunk/Makefile 2011-07-08 15:10:09 UTC (rev 15009) +++ csw/mgar/pkg/imapfilter/trunk/Makefile 2011-07-08 21:01:12 UTC (rev 15010) @@ -1,5 +1,6 @@ NAME = imapfilter VERSION = 1.2.2 +GARTYPE = v1 CATEGORIES = net DESCRIPTION = IMAP mail filtering utility Modified: csw/mgar/pkg/iozone/trunk/Makefile =================================================================== --- csw/mgar/pkg/iozone/trunk/Makefile 2011-07-08 15:10:09 UTC (rev 15009) +++ csw/mgar/pkg/iozone/trunk/Makefile 2011-07-08 21:01:12 UTC (rev 15010) @@ -1,6 +1,7 @@ NAME = iozone VERSION = 3.291 DISTVERSION = $(shell echo $(VERSION) | sed -e 's/\./_/g') +GARTYPE = v1 CATEGORIES = apps DESCRIPTION = IO benchmarking tool Modified: csw/mgar/pkg/jboss4/trunk/Makefile =================================================================== --- csw/mgar/pkg/jboss4/trunk/Makefile 2011-07-08 15:10:09 UTC (rev 15009) +++ csw/mgar/pkg/jboss4/trunk/Makefile 2011-07-08 21:01:12 UTC (rev 15010) @@ -1,5 +1,6 @@ NAME = jboss4 VERSION = 4.2.2.GA +GARTYPE = v1 CATEGORIES = server DESCRIPTION = J2EE Application Server Modified: csw/mgar/pkg/jhead/trunk/Makefile =================================================================== --- csw/mgar/pkg/jhead/trunk/Makefile 2011-07-08 15:10:09 UTC (rev 15009) +++ csw/mgar/pkg/jhead/trunk/Makefile 2011-07-08 21:01:12 UTC (rev 15010) @@ -1,5 +1,6 @@ NAME = jhead VERSION = 2.7 +GARTYPE = v1 CATEGORIES = utils DESCRIPTION = EXIF parser for JPEG images Modified: csw/mgar/pkg/jicmp/trunk/Makefile =================================================================== --- csw/mgar/pkg/jicmp/trunk/Makefile 2011-07-08 15:10:09 UTC (rev 15009) +++ csw/mgar/pkg/jicmp/trunk/Makefile 2011-07-08 21:01:12 UTC (rev 15010) @@ -1,5 +1,6 @@ NAME = jicmp VERSION = 1.0.4 +GARTYPE = v1 CATEGORIES = lib DESCRIPTION = JICMP is a Java interface to the ICMP protocol (ping) Modified: csw/mgar/pkg/jrrd/trunk/Makefile =================================================================== --- csw/mgar/pkg/jrrd/trunk/Makefile 2011-07-08 15:10:09 UTC (rev 15009) +++ csw/mgar/pkg/jrrd/trunk/Makefile 2011-07-08 21:01:12 UTC (rev 15010) @@ -1,5 +1,6 @@ NAME = jrrd VERSION = 1.0.1 +GARTYPE = v1 CATEGORIES = lib DESCRIPTION = JRRD is a Java interface to RRDTool Modified: csw/mgar/pkg/kde/trunk/Makefile =================================================================== --- csw/mgar/pkg/kde/trunk/Makefile 2011-07-08 15:10:09 UTC (rev 15009) +++ csw/mgar/pkg/kde/trunk/Makefile 2011-07-08 21:01:12 UTC (rev 15010) @@ -1,4 +1,5 @@ NAME = kde +GARTYPE = v1 CATEGORIES = kde DESCRIPTION = The K Desktop Environment (KDE) (gcc3) Modified: csw/mgar/pkg/kdeaccessibility/trunk/Makefile =================================================================== --- csw/mgar/pkg/kdeaccessibility/trunk/Makefile 2011-07-08 15:10:09 UTC (rev 15009) +++ csw/mgar/pkg/kdeaccessibility/trunk/Makefile 2011-07-08 21:01:12 UTC (rev 15010) @@ -1,4 +1,5 @@ NAME = kdeaccessibility +GARTYPE = v1 CATEGORIES = kde DESCRIPTION = Accessibility apps for KDE environment (gcc3) Modified: csw/mgar/pkg/kdeaddons/trunk/Makefile =================================================================== --- csw/mgar/pkg/kdeaddons/trunk/Makefile 2011-07-08 15:10:09 UTC (rev 15009) +++ csw/mgar/pkg/kdeaddons/trunk/Makefile 2011-07-08 21:01:12 UTC (rev 15010) @@ -1,4 +1,5 @@ NAME = kdeaddons +GARTYPE = v1 CATEGORIES = kde DESCRIPTION = Additional plugins/scripts for KDE (gcc3) Modified: csw/mgar/pkg/kdeadmin/trunk/Makefile =================================================================== --- csw/mgar/pkg/kdeadmin/trunk/Makefile 2011-07-08 15:10:09 UTC (rev 15009) +++ csw/mgar/pkg/kdeadmin/trunk/Makefile 2011-07-08 21:01:12 UTC (rev 15010) @@ -1,4 +1,5 @@ NAME = kdeadmin +GARTYPE = v1 CATEGORIES = kde DESCRIPTION = Administration utilities for KDE (gcc3) Modified: csw/mgar/pkg/kdeartwork/trunk/Makefile =================================================================== --- csw/mgar/pkg/kdeartwork/trunk/Makefile 2011-07-08 15:10:09 UTC (rev 15009) +++ csw/mgar/pkg/kdeartwork/trunk/Makefile 2011-07-08 21:01:12 UTC (rev 15010) @@ -1,4 +1,5 @@ NAME = kdeartwork +GARTYPE = v1 CATEGORIES = kde DESCRIPTION = Additional artwork for KDE (gcc3) Modified: csw/mgar/pkg/kdebase/trunk/Makefile =================================================================== --- csw/mgar/pkg/kdebase/trunk/Makefile 2011-07-08 15:10:09 UTC (rev 15009) +++ csw/mgar/pkg/kdebase/trunk/Makefile 2011-07-08 21:01:12 UTC (rev 15010) @@ -1,4 +1,5 @@ NAME = kdebase +GARTYPE = v1 CATEGORIES = kde DESCRIPTION = Basic applications for KDE (gcc3) Modified: csw/mgar/pkg/kdeedu/trunk/Makefile =================================================================== --- csw/mgar/pkg/kdeedu/trunk/Makefile 2011-07-08 15:10:09 UTC (rev 15009) +++ csw/mgar/pkg/kdeedu/trunk/Makefile 2011-07-08 21:01:12 UTC (rev 15010) @@ -1,4 +1,5 @@ NAME = kdeedu +GARTYPE = v1 CATEGORIES = kde DESCRIPTION = Collection of educational apps for KDE (gcc3) Modified: csw/mgar/pkg/kdegames/trunk/Makefile =================================================================== --- csw/mgar/pkg/kdegames/trunk/Makefile 2011-07-08 15:10:09 UTC (rev 15009) +++ csw/mgar/pkg/kdegames/trunk/Makefile 2011-07-08 21:01:12 UTC (rev 15010) @@ -1,4 +1,5 @@ NAME = kdegames +GARTYPE = v1 CATEGORIES = kde DESCRIPTION = Games for KDE (gcc3) Modified: csw/mgar/pkg/kdegraphics/trunk/Makefile =================================================================== --- csw/mgar/pkg/kdegraphics/trunk/Makefile 2011-07-08 15:10:09 UTC (rev 15009) +++ csw/mgar/pkg/kdegraphics/trunk/Makefile 2011-07-08 21:01:12 UTC (rev 15010) @@ -1,4 +1,5 @@ NAME = kdegraphics +GARTYPE = v1 CATEGORIES = kde DESCRIPTION = Graphic utilities for KDE (gcc3) Modified: csw/mgar/pkg/kdelibs/trunk/Makefile =================================================================== --- csw/mgar/pkg/kdelibs/trunk/Makefile 2011-07-08 15:10:09 UTC (rev 15009) +++ csw/mgar/pkg/kdelibs/trunk/Makefile 2011-07-08 21:01:12 UTC (rev 15010) @@ -1,4 +1,5 @@ NAME = kdelibs +GARTYPE = v1 CATEGORIES = kde DESCRIPTION = Base set of libraries needed by KDE programs (gcc3) Modified: csw/mgar/pkg/kdemultimedia/trunk/Makefile =================================================================== --- csw/mgar/pkg/kdemultimedia/trunk/Makefile 2011-07-08 15:10:09 UTC (rev 15009) +++ csw/mgar/pkg/kdemultimedia/trunk/Makefile 2011-07-08 21:01:12 UTC (rev 15010) @@ -1,4 +1,5 @@ NAME = kdemultimedia +GARTYPE = v1 CATEGORIES = kde DESCRIPTION = Multimedia apps for KDE (gcc3) Modified: csw/mgar/pkg/kdenetwork/trunk/Makefile =================================================================== --- csw/mgar/pkg/kdenetwork/trunk/Makefile 2011-07-08 15:10:09 UTC (rev 15009) +++ csw/mgar/pkg/kdenetwork/trunk/Makefile 2011-07-08 21:01:12 UTC (rev 15010) @@ -1,4 +1,5 @@ NAME = kdenetwork +GARTYPE = v1 CATEGORIES = kde DESCRIPTION = Networking apps for KDE (gcc3) Modified: csw/mgar/pkg/kdepim/trunk/Makefile =================================================================== --- csw/mgar/pkg/kdepim/trunk/Makefile 2011-07-08 15:10:09 UTC (rev 15009) +++ csw/mgar/pkg/kdepim/trunk/Makefile 2011-07-08 21:01:12 UTC (rev 15010) @@ -1,4 +1,5 @@ NAME = kdepim +GARTYPE = v1 CATEGORIES = kde DESCRIPTION = Personal Information Management apps for KDE (gcc3) Modified: csw/mgar/pkg/kdesvn/trunk/Makefile =================================================================== --- csw/mgar/pkg/kdesvn/trunk/Makefile 2011-07-08 15:10:09 UTC (rev 15009) +++ csw/mgar/pkg/kdesvn/trunk/Makefile 2011-07-08 21:01:12 UTC (rev 15010) @@ -1,5 +1,6 @@ NAME = kdesvn VERSION = 0.9.3 +GARTYPE = v1 CATEGORIES = apps DESCRIPTION = A Subversion client for KDE Modified: csw/mgar/pkg/kdetoys/trunk/Makefile =================================================================== --- csw/mgar/pkg/kdetoys/trunk/Makefile 2011-07-08 15:10:09 UTC (rev 15009) +++ csw/mgar/pkg/kdetoys/trunk/Makefile 2011-07-08 21:01:12 UTC (rev 15010) @@ -1,4 +1,5 @@ NAME = kdetoys +GARTYPE = v1 CATEGORIES = kde DESCRIPTION = Fun apps for KDE (gcc3) Modified: csw/mgar/pkg/kdeutils/trunk/Makefile =================================================================== --- csw/mgar/pkg/kdeutils/trunk/Makefile 2011-07-08 15:10:09 UTC (rev 15009) +++ csw/mgar/pkg/kdeutils/trunk/Makefile 2011-07-08 21:01:12 UTC (rev 15010) @@ -1,4 +1,5 @@ NAME = kdeutils +GARTYPE = v1 CATEGORIES = kde DESCRIPTION = Utilities for the KDE (gcc3) Modified: csw/mgar/pkg/kile/trunk/Makefile =================================================================== --- csw/mgar/pkg/kile/trunk/Makefile 2011-07-08 15:10:09 UTC (rev 15009) +++ csw/mgar/pkg/kile/trunk/Makefile 2011-07-08 21:01:12 UTC (rev 15010) @@ -1,5 +1,6 @@ NAME = kile VERSION = 1.9.3 +GARTYPE = v1 CATEGORIES = apps DESCRIPTION = An integrated LaTeX environment Modified: csw/mgar/pkg/libdvdcss/trunk/Makefile =================================================================== --- csw/mgar/pkg/libdvdcss/trunk/Makefile 2011-07-08 15:10:09 UTC (rev 15009) +++ csw/mgar/pkg/libdvdcss/trunk/Makefile 2011-07-08 21:01:12 UTC (rev 15010) @@ -1,5 +1,6 @@ NAME = libdvdcss VERSION = 1.2.9 +GARTYPE = v1 CATEGORIES = lib DESCRIPTION = library for accessing DVDs like a block device without having to bother about decryption Modified: csw/mgar/pkg/libdvdread/trunk/Makefile =================================================================== --- csw/mgar/pkg/libdvdread/trunk/Makefile 2011-07-08 15:10:09 UTC (rev 15009) +++ csw/mgar/pkg/libdvdread/trunk/Makefile 2011-07-08 21:01:12 UTC (rev 15010) @@ -1,5 +1,6 @@ NAME = libdvdread VERSION = 0.9.7 +GARTYPE = v1 CATEGORIES = lib DESCRIPTION = provides a simple foundation for reading DVD-Video images Modified: csw/mgar/pkg/libgadu/trunk/Makefile =================================================================== --- csw/mgar/pkg/libgadu/trunk/Makefile 2011-07-08 15:10:09 UTC (rev 15009) +++ csw/mgar/pkg/libgadu/trunk/Makefile 2011-07-08 21:01:12 UTC (rev 15010) @@ -1,5 +1,6 @@ NAME = libgadu VERSION = 1.8.2 +GARTYPE = v1 CATEGORIES = lib SPKG_SOURCEURL = http://toxygen.net/libgadu Modified: csw/mgar/pkg/libglade/trunk/Makefile =================================================================== --- csw/mgar/pkg/libglade/trunk/Makefile 2011-07-08 15:10:09 UTC (rev 15009) +++ csw/mgar/pkg/libglade/trunk/Makefile 2011-07-08 21:01:12 UTC (rev 15010) @@ -1,5 +1,6 @@ NAME = libglade VERSION = 0.17 +GARTYPE = v1 CATEGORIES = lib DESCRIPTION = library to load Glade XML user interface files at runtime Modified: csw/mgar/pkg/libgphoto2/trunk/Makefile =================================================================== --- csw/mgar/pkg/libgphoto2/trunk/Makefile 2011-07-08 15:10:09 UTC (rev 15009) +++ csw/mgar/pkg/libgphoto2/trunk/Makefile 2011-07-08 21:01:12 UTC (rev 15010) @@ -1,5 +1,6 @@ NAME = libgphoto2 VERSION = 2.3.1 +GARTYPE = v1 CATEGORIES = lib DESCRIPTION = library to be used by applications to access digital cameras Modified: csw/mgar/pkg/libxine/trunk/Makefile =================================================================== --- csw/mgar/pkg/libxine/trunk/Makefile 2011-07-08 15:10:09 UTC (rev 15009) +++ csw/mgar/pkg/libxine/trunk/Makefile 2011-07-08 21:01:12 UTC (rev 15010) @@ -1,5 +1,6 @@ NAME = libxine VERSION = 1.1.8 +GARTYPE = v1 CATEGORIES = apps DESCRIPTION = Xine-lib 1.1.8 Modified: csw/mgar/pkg/libytnef/trunk/Makefile =================================================================== --- csw/mgar/pkg/libytnef/trunk/Makefile 2011-07-08 15:10:09 UTC (rev 15009) +++ csw/mgar/pkg/libytnef/trunk/Makefile 2011-07-08 21:01:12 UTC (rev 15010) @@ -1,5 +1,6 @@ NAME = libytnef VERSION = 1.5 +GARTYPE = v1 CATEGORIES = lib DESCRIPTION = Brief description Modified: csw/mgar/pkg/listadmin/trunk/Makefile =================================================================== --- csw/mgar/pkg/listadmin/trunk/Makefile 2011-07-08 15:10:09 UTC (rev 15009) +++ csw/mgar/pkg/listadmin/trunk/Makefile 2011-07-08 21:01:12 UTC (rev 15010) @@ -1,5 +1,6 @@ NAME = listadmin VERSION = 2.37 +GARTYPE = v1 CATEGORIES = apps DESCRIPTION = Command line utility for processing the moderator queue on Mailman lists Modified: csw/mgar/pkg/lyx/trunk/Makefile =================================================================== --- csw/mgar/pkg/lyx/trunk/Makefile 2011-07-08 15:10:09 UTC (rev 15009) +++ csw/mgar/pkg/lyx/trunk/Makefile 2011-07-08 21:01:12 UTC (rev 15010) @@ -1,5 +1,6 @@ NAME = lyx VERSION = 1.4.4 +GARTYPE = v1 CATEGORIES = apps DESCRIPTION = WYSIWYM document processor Modified: csw/mgar/pkg/maven2/trunk/Makefile =================================================================== --- csw/mgar/pkg/maven2/trunk/Makefile 2011-07-08 15:10:09 UTC (rev 15009) +++ csw/mgar/pkg/maven2/trunk/Makefile 2011-07-08 21:01:12 UTC (rev 15010) @@ -1,5 +1,6 @@ NAME = maven2 VERSION = 2.2.1 +GARTYPE = v1 CATEGORIES = devel GARCH = all Modified: csw/mgar/pkg/meanwhile/trunk/Makefile =================================================================== --- csw/mgar/pkg/meanwhile/trunk/Makefile 2011-07-08 15:10:09 UTC (rev 15009) +++ csw/mgar/pkg/meanwhile/trunk/Makefile 2011-07-08 21:01:12 UTC (rev 15010) @@ -1,5 +1,6 @@ NAME = meanwhile VERSION = 1.0.2 +GARTYPE = v1 CATEGORIES = lib #Need to use either gcc or studio 12 with -features=extensions Modified: csw/mgar/pkg/meta/SAMP/trunk/Makefile =================================================================== --- csw/mgar/pkg/meta/SAMP/trunk/Makefile 2011-07-08 15:10:09 UTC (rev 15009) +++ csw/mgar/pkg/meta/SAMP/trunk/Makefile 2011-07-08 21:01:12 UTC (rev 15010) @@ -1,5 +1,6 @@ NAME = SAMP VERSION = 1.0 +GARTYPE = v1 CATEGORIES = meta DESCRIPTION = Solaris Mysql Perl/PHP/Python (SAMP) Modified: csw/mgar/pkg/meta/comand/trunk/Makefile =================================================================== --- csw/mgar/pkg/meta/comand/trunk/Makefile 2011-07-08 15:10:09 UTC (rev 15009) +++ csw/mgar/pkg/meta/comand/trunk/Makefile 2011-07-08 21:01:12 UTC (rev 15010) @@ -1,5 +1,6 @@ NAME = comand VERSION = 1.0 +GARTYPE = v1 CATEGORIES = meta DESCRIPTION = Temporary meta target for C. Omand Modified: csw/mgar/pkg/meta/toplevel/trunk/Makefile =================================================================== --- csw/mgar/pkg/meta/toplevel/trunk/Makefile 2011-07-08 15:10:09 UTC (rev 15009) +++ csw/mgar/pkg/meta/toplevel/trunk/Makefile 2011-07-08 21:01:12 UTC (rev 15010) @@ -1,5 +1,6 @@ NAME = toplevel VERSION = 1.0 +GARTYPE = v1 CATEGORIES = meta DESCRIPTION = Blastwave automated build Modified: csw/mgar/pkg/mharc/trunk/Makefile =================================================================== --- csw/mgar/pkg/mharc/trunk/Makefile 2011-07-08 15:10:09 UTC (rev 15009) +++ csw/mgar/pkg/mharc/trunk/Makefile 2011-07-08 21:01:12 UTC (rev 15010) @@ -1,5 +1,6 @@ NAME = mharc VERSION = 0.7.3 +GARTYPE = v1 CATEGORIES = utils GARCH = all Modified: csw/mgar/pkg/mhonarc/trunk/Makefile =================================================================== --- csw/mgar/pkg/mhonarc/trunk/Makefile 2011-07-08 15:10:09 UTC (rev 15009) +++ csw/mgar/pkg/mhonarc/trunk/Makefile 2011-07-08 21:01:12 UTC (rev 15010) @@ -1,5 +1,6 @@ NAME = MHonArc VERSION = 2.6.14 +GARTYPE = v1 CATEGORIES = utils GARCH = all Modified: csw/mgar/pkg/micq/trunk/Makefile =================================================================== --- csw/mgar/pkg/micq/trunk/Makefile 2011-07-08 15:10:09 UTC (rev 15009) +++ csw/mgar/pkg/micq/trunk/Makefile 2011-07-08 21:01:12 UTC (rev 15010) @@ -1,5 +1,6 @@ NAME = micq VERSION = 0.6.1 +GARTYPE = v1 CATEGORIES = net DESCRIPTION = terminal-based ICQ client Modified: csw/mgar/pkg/mkpackage/trunk/Makefile =================================================================== --- csw/mgar/pkg/mkpackage/trunk/Makefile 2011-07-08 15:10:09 UTC (rev 15009) +++ csw/mgar/pkg/mkpackage/trunk/Makefile 2011-07-08 21:01:12 UTC (rev 15010) @@ -1,5 +1,6 @@ NAME = mkpackage VERSION = 1.4 +GARTYPE = v1 CATEGORIES = utils DESCRIPTION = Solaris package build tool. Modified: csw/mgar/pkg/mm/trunk/Makefile =================================================================== --- csw/mgar/pkg/mm/trunk/Makefile 2011-07-08 15:10:09 UTC (rev 15009) +++ csw/mgar/pkg/mm/trunk/Makefile 2011-07-08 21:01:12 UTC (rev 15010) @@ -1,5 +1,6 @@ NAME = mm VERSION = 1.4.2 +GARTYPE = v1 CATEGORIES = lib DESCRIPTION = Shared Memory Allocation abstraction library. Modified: csw/mgar/pkg/mod_auth_mysql/trunk/Makefile =================================================================== --- csw/mgar/pkg/mod_auth_mysql/trunk/Makefile 2011-07-08 15:10:09 UTC (rev 15009) +++ csw/mgar/pkg/mod_auth_mysql/trunk/Makefile 2011-07-08 21:01:12 UTC (rev 15010) @@ -1,5 +1,6 @@ NAME = mod_auth_mysql VERSION = 3.0.0 +GARTYPE = v1 CATEGORIES = server DESCRIPTION = Implements basic authentication on top of MySQL Modified: csw/mgar/pkg/mod_auth_pam/trunk/Makefile =================================================================== --- csw/mgar/pkg/mod_auth_pam/trunk/Makefile 2011-07-08 15:10:09 UTC (rev 15009) +++ csw/mgar/pkg/mod_auth_pam/trunk/Makefile 2011-07-08 21:01:12 UTC (rev 15010) @@ -1,6 +1,7 @@ NAME = mod_auth_pam ABIVERSION = 2.0 VERSION = 1.1.1 +GARTYPE = v1 CATEGORIES = server DESCRIPTION = Implements basic authentication on top of PAM Modified: csw/mgar/pkg/mod_evasive/trunk/Makefile =================================================================== --- csw/mgar/pkg/mod_evasive/trunk/Makefile 2011-07-08 15:10:09 UTC (rev 15009) +++ csw/mgar/pkg/mod_evasive/trunk/Makefile 2011-07-08 21:01:12 UTC (rev 15010) @@ -1,5 +1,6 @@ NAME = mod_evasive VERSION = 1.10.1 +GARTYPE = v1 CATEGORIES = server DESCRIPTION = DOS evasive maneuvers module for Apache 2.x Modified: csw/mgar/pkg/mod_fastcgi/trunk/Makefile =================================================================== --- csw/mgar/pkg/mod_fastcgi/trunk/Makefile 2011-07-08 15:10:09 UTC (rev 15009) +++ csw/mgar/pkg/mod_fastcgi/trunk/Makefile 2011-07-08 21:01:12 UTC (rev 15010) @@ -1,5 +1,6 @@ NAME = mod_fastcgi VERSION = 2.4.6 +GARTYPE = v1 CATEGORIES = server DESCRIPTION = Apache 2.x FastCGI module Modified: csw/mgar/pkg/mod_geoip/trunk/Makefile =================================================================== --- csw/mgar/pkg/mod_geoip/trunk/Makefile 2011-07-08 15:10:09 UTC (rev 15009) +++ csw/mgar/pkg/mod_geoip/trunk/Makefile 2011-07-08 21:01:12 UTC (rev 15010) @@ -1,6 +1,7 @@ NAME = ap2_modgeoip SPKG_NAME = mod_geoip VERSION = 1.2.5 +GARTYPE = v1 CATEGORIES = server DESCRIPTION = Apache 2.x GeoIP module Modified: csw/mgar/pkg/mod_highlight/trunk/Makefile =================================================================== --- csw/mgar/pkg/mod_highlight/trunk/Makefile 2011-07-08 15:10:09 UTC (rev 15009) +++ csw/mgar/pkg/mod_highlight/trunk/Makefile 2011-07-08 21:01:12 UTC (rev 15010) @@ -1,5 +1,6 @@ NAME = mod_highlight VERSION = 0.1.0 +GARTYPE = v1 CATEGORIES = server DESCRIPTION = Syntax highlighting module for Apache 2.0 Modified: csw/mgar/pkg/mod_proxy_html/trunk/Makefile =================================================================== --- csw/mgar/pkg/mod_proxy_html/trunk/Makefile 2011-07-08 15:10:09 UTC (rev 15009) +++ csw/mgar/pkg/mod_proxy_html/trunk/Makefile 2011-07-08 21:01:12 UTC (rev 15010) @@ -1,5 +1,6 @@ NAME = mod_proxy_html VERSION = 2.5.2 +GARTYPE = v1 CATEGORIES = server DESCRIPTION = Apache 2 output filter to rewrite HTML links Modified: csw/mgar/pkg/mod_ruby/trunk/Makefile =================================================================== --- csw/mgar/pkg/mod_ruby/trunk/Makefile 2011-07-08 15:10:09 UTC (rev 15009) +++ csw/mgar/pkg/mod_ruby/trunk/Makefile 2011-07-08 21:01:12 UTC (rev 15010) @@ -1,5 +1,6 @@ NAME = mod_ruby VERSION = 1.2.4 +GARTYPE = v1 CATEGORIES = server DESCRIPTION = an Apache/Ruby integration module Modified: csw/mgar/pkg/mod_svn_view/trunk/Makefile =================================================================== --- csw/mgar/pkg/mod_svn_view/trunk/Makefile 2011-07-08 15:10:09 UTC (rev 15009) +++ csw/mgar/pkg/mod_svn_view/trunk/Makefile 2011-07-08 21:01:12 UTC (rev 15010) @@ -1,5 +1,6 @@ NAME = mod_svn_view VERSION = 0.0.0 +GARTYPE = v1 CATEGORIES = server DESCRIPTION = Subversion repository viewer Modified: csw/mgar/pkg/mod_transform/trunk/Makefile =================================================================== --- csw/mgar/pkg/mod_transform/trunk/Makefile 2011-07-08 15:10:09 UTC (rev 15009) +++ csw/mgar/pkg/mod_transform/trunk/Makefile 2011-07-08 21:01:12 UTC (rev 15010) @@ -1,5 +1,6 @@ NAME = mod_transform VERSION = 0.6.0 +GARTYPE = v1 CATEGORIES = server DESCRIPTION = XSLT filter for Apache 2.0 Modified: csw/mgar/pkg/mono/trunk/Makefile =================================================================== --- csw/mgar/pkg/mono/trunk/Makefile 2011-07-08 15:10:09 UTC (rev 15009) +++ csw/mgar/pkg/mono/trunk/Makefile 2011-07-08 21:01:12 UTC (rev 15010) @@ -1,5 +1,6 @@ NAME = mono VERSION = 2.10.1 +GARTYPE = v1 CATEGORIES = lang DESCRIPTION = Mono Runtime Modified: csw/mgar/pkg/mplayer/tags/mplayer-1.0rc2-jwheeler/Makefile =================================================================== --- csw/mgar/pkg/mplayer/tags/mplayer-1.0rc2-jwheeler/Makefile 2011-07-08 15:10:09 UTC (rev 15009) +++ csw/mgar/pkg/mplayer/tags/mplayer-1.0rc2-jwheeler/Makefile 2011-07-08 21:01:12 UTC (rev 15010) @@ -7,6 +7,7 @@ GARNAME = MPlayer GARVERSION = 1.0rc2 SPKG_REVSTAMP = ,REV=$(shell date '+%Y.%m.%d').rc2 +GARTYPE = v1 CATEGORIES = apps DESCRIPTION = MPlayer is a movie player which runs on many systems Modified: csw/mgar/pkg/mysql-ruby/trunk/Makefile =================================================================== --- csw/mgar/pkg/mysql-ruby/trunk/Makefile 2011-07-08 15:10:09 UTC (rev 15009) +++ csw/mgar/pkg/mysql-ruby/trunk/Makefile 2011-07-08 21:01:12 UTC (rev 15010) @@ -1,5 +1,6 @@ NAME = mysql-ruby VERSION = 2.7 +GARTYPE = v1 CATEGORIES = lang DESCRIPTION = Ruby MySQL Extension Modified: csw/mgar/pkg/mysql4/trunk/Makefile =================================================================== --- csw/mgar/pkg/mysql4/trunk/Makefile 2011-07-08 15:10:09 UTC (rev 15009) +++ csw/mgar/pkg/mysql4/trunk/Makefile 2011-07-08 21:01:12 UTC (rev 15010) @@ -1,5 +1,6 @@ NAME = mysql VERSION = 4.1.18 +GARTYPE = v1 CATEGORIES = server DESCRIPTION = A fast SQL database server. Modified: csw/mgar/pkg/namazu/trunk/Makefile =================================================================== --- csw/mgar/pkg/namazu/trunk/Makefile 2011-07-08 15:10:09 UTC (rev 15009) +++ csw/mgar/pkg/namazu/trunk/Makefile 2011-07-08 21:01:12 UTC (rev 15010) @@ -1,5 +1,6 @@ NAME = namazu VERSION = 2.0.14 +GARTYPE = v1 CATEGORIES = utils DESCRIPTION = full-text search engine Modified: csw/mgar/pkg/ngrep/trunk/Makefile =================================================================== --- csw/mgar/pkg/ngrep/trunk/Makefile 2011-07-08 15:10:09 UTC (rev 15009) +++ csw/mgar/pkg/ngrep/trunk/Makefile 2011-07-08 21:01:12 UTC (rev 15010) @@ -1,5 +1,6 @@ NAME = ngrep VERSION = 1.45 +GARTYPE = v1 CATEGORIES = net DESCRIPTION = Network grep Modified: csw/mgar/pkg/ogle/trunk/Makefile =================================================================== --- csw/mgar/pkg/ogle/trunk/Makefile 2011-07-08 15:10:09 UTC (rev 15009) +++ csw/mgar/pkg/ogle/trunk/Makefile 2011-07-08 21:01:12 UTC (rev 15010) @@ -1,5 +1,6 @@ NAME = ogle VERSION = 0.9.2 +GARTYPE = v1 CATEGORIES = apps DESCRIPTION = opensource DVD player with DVD menu support Modified: csw/mgar/pkg/ogle_gui/trunk/Makefile =================================================================== --- csw/mgar/pkg/ogle_gui/trunk/Makefile 2011-07-08 15:10:09 UTC (rev 15009) +++ csw/mgar/pkg/ogle_gui/trunk/Makefile 2011-07-08 21:01:12 UTC (rev 15010) @@ -1,5 +1,6 @@ NAME = ogle_gui VERSION = 0.9.2 +GARTYPE = v1 CATEGORIES = gnome DESCRIPTION = gtk user interface for Ogle DVD player Modified: csw/mgar/pkg/openal/trunk/Makefile =================================================================== --- csw/mgar/pkg/openal/trunk/Makefile 2011-07-08 15:10:09 UTC (rev 15009) +++ csw/mgar/pkg/openal/trunk/Makefile 2011-07-08 21:01:12 UTC (rev 15010) @@ -1,5 +1,6 @@ NAME = openal VERSION = 0.0.8 +GARTYPE = v1 CATEGORIES = lib DESCRIPTION = openal - A 3D positional spatialized sound library (gcc3) Modified: csw/mgar/pkg/opengrok/trunk/Makefile =================================================================== --- csw/mgar/pkg/opengrok/trunk/Makefile 2011-07-08 15:10:09 UTC (rev 15009) +++ csw/mgar/pkg/opengrok/trunk/Makefile 2011-07-08 21:01:12 UTC (rev 15010) @@ -1,5 +1,6 @@ NAME = opengrok VERSION = 0.7 +GARTYPE = v1 CATEGORIES = devel DESCRIPTION = A wicked fast source browser Modified: csw/mgar/pkg/openoffice/trunk/Makefile =================================================================== --- csw/mgar/pkg/openoffice/trunk/Makefile 2011-07-08 15:10:09 UTC (rev 15009) +++ csw/mgar/pkg/openoffice/trunk/Makefile 2011-07-08 21:01:12 UTC (rev 15010) @@ -2,6 +2,7 @@ VERSION = 2.2.1 SRCNUM=680 MILESTONE=m18 +GARTYPE = v1 CATEGORIES = apps DESCRIPTION = An Open Source version of StarOffice. Modified: csw/mgar/pkg/openvpn/trunk/Makefile =================================================================== --- csw/mgar/pkg/openvpn/trunk/Makefile 2011-07-08 15:10:09 UTC (rev 15009) +++ csw/mgar/pkg/openvpn/trunk/Makefile 2011-07-08 21:01:12 UTC (rev 15010) @@ -1,5 +1,6 @@ NAME = openvpn VERSION = 2.0.9 +GARTYPE = v1 CATEGORIES = server DESCRIPTION = secure IP tunnel daemon Modified: csw/mgar/pkg/pkg_update_watch/trunk/Makefile =================================================================== --- csw/mgar/pkg/pkg_update_watch/trunk/Makefile 2011-07-08 15:10:09 UTC (rev 15009) +++ csw/mgar/pkg/pkg_update_watch/trunk/Makefile 2011-07-08 21:01:12 UTC (rev 15010) @@ -1,5 +1,6 @@ NAME = pkg_update_watch VERSION = 1.0 +GARTYPE = v1 CATEGORIES = utils DESCRIPTION = Package updates watcher Modified: csw/mgar/pkg/postfix/branches/postfix-2.4/Makefile =================================================================== --- csw/mgar/pkg/postfix/branches/postfix-2.4/Makefile 2011-07-08 15:10:09 UTC (rev 15009) +++ csw/mgar/pkg/postfix/branches/postfix-2.4/Makefile 2011-07-08 21:01:12 UTC (rev 15010) @@ -1,5 +1,6 @@ NAME = postfix VERSION = 2.4.7 +GARTYPE = v1 CATEGORIES = server DESCRIPTION = Postfix aims to be an alternative to the widely-used sendmail program Modified: csw/mgar/pkg/pound/trunk/Makefile =================================================================== --- csw/mgar/pkg/pound/trunk/Makefile 2011-07-08 15:10:09 UTC (rev 15009) +++ csw/mgar/pkg/pound/trunk/Makefile 2011-07-08 21:01:12 UTC (rev 15010) @@ -1,5 +1,6 @@ NAME = pound VERSION = 1.10 +GARTYPE = v1 CATEGORIES = net DESCRIPTION = reverse proxy load balancer Modified: csw/mgar/pkg/ppkg_get/trunk/Makefile =================================================================== --- csw/mgar/pkg/ppkg_get/trunk/Makefile 2011-07-08 15:10:09 UTC (rev 15009) +++ csw/mgar/pkg/ppkg_get/trunk/Makefile 2011-07-08 21:01:12 UTC (rev 15010) @@ -1,5 +1,6 @@ NAME = ppkg_get VERSION = 1.0 +GARTYPE = v1 CATEGORIES = utils DESCRIPTION = Perl rewrite of origine pkg-get tools Modified: csw/mgar/pkg/pubcookie/trunk/Makefile =================================================================== --- csw/mgar/pkg/pubcookie/trunk/Makefile 2011-07-08 15:10:09 UTC (rev 15009) +++ csw/mgar/pkg/pubcookie/trunk/Makefile 2011-07-08 21:01:12 UTC (rev 15010) @@ -1,5 +1,6 @@ NAME = pubcookie VERSION = 3.3.3 +GARTYPE = v1 CATEGORIES = server DESCRIPTION = Open-source software for intra-institutional web authentication Modified: csw/mgar/pkg/pwsafe/trunk/Makefile =================================================================== --- csw/mgar/pkg/pwsafe/trunk/Makefile 2011-07-08 15:10:09 UTC (rev 15009) +++ csw/mgar/pkg/pwsafe/trunk/Makefile 2011-07-08 21:01:12 UTC (rev 15010) @@ -1,5 +1,6 @@ NAME = pwsafe VERSION = 0.1.6 +GARTYPE = v1 CATEGORIES = utils DESCRIPTION = command-line password database. Modified: csw/mgar/pkg/qt-gcc/trunk/Makefile =================================================================== --- csw/mgar/pkg/qt-gcc/trunk/Makefile 2011-07-08 15:10:09 UTC (rev 15009) +++ csw/mgar/pkg/qt-gcc/trunk/Makefile 2011-07-08 21:01:12 UTC (rev 15010) @@ -1,5 +1,6 @@ NAME = qt VERSION = 4.0.1 +GARTYPE = v1 CATEGORIES = lib DESCRIPTION = TrollTech C++ application framework Modified: csw/mgar/pkg/qt4/trunk/Makefile =================================================================== --- csw/mgar/pkg/qt4/trunk/Makefile 2011-07-08 15:10:09 UTC (rev 15009) +++ csw/mgar/pkg/qt4/trunk/Makefile 2011-07-08 21:01:12 UTC (rev 15010) @@ -1,5 +1,6 @@ NAME = qt4 VERSION = 4.7.1 +GARTYPE = v1 CATEGORIES = lib DESCRIPTION = TrollTech C++ application framework Modified: csw/mgar/pkg/qt4-gcc/trunk/Makefile =================================================================== --- csw/mgar/pkg/qt4-gcc/trunk/Makefile 2011-07-08 15:10:09 UTC (rev 15009) +++ csw/mgar/pkg/qt4-gcc/trunk/Makefile 2011-07-08 21:01:12 UTC (rev 15010) @@ -1,5 +1,6 @@ NAME = qt VERSION = 4.3.2 +GARTYPE = v1 CATEGORIES = lib DESCRIPTION = TrollTech C++ application framework Modified: csw/mgar/pkg/quanta/trunk/Makefile =================================================================== --- csw/mgar/pkg/quanta/trunk/Makefile 2011-07-08 15:10:09 UTC (rev 15009) +++ csw/mgar/pkg/quanta/trunk/Makefile 2011-07-08 21:01:12 UTC (rev 15010) @@ -1,4 +1,5 @@ NAME = quanta +GARTYPE = v1 CATEGORIES = kde DESCRIPTION = The KDE Web Development Tool (gcc3) Modified: csw/mgar/pkg/rails/trunk/Makefile =================================================================== --- csw/mgar/pkg/rails/trunk/Makefile 2011-07-08 15:10:09 UTC (rev 15009) +++ csw/mgar/pkg/rails/trunk/Makefile 2011-07-08 21:01:12 UTC (rev 15010) @@ -1,5 +1,6 @@ NAME = rails VERSION = 0.14.3 +GARTYPE = v1 CATEGORIES = server DESCRIPTION = Ruby web application framework Modified: csw/mgar/pkg/resin/trunk/Makefile =================================================================== --- csw/mgar/pkg/resin/trunk/Makefile 2011-07-08 15:10:09 UTC (rev 15009) +++ csw/mgar/pkg/resin/trunk/Makefile 2011-07-08 21:01:12 UTC (rev 15010) @@ -1,5 +1,6 @@ NAME = resin VERSION = 3.0.9 +GARTYPE = v1 CATEGORIES = server DESCRIPTION = JSP and Servlet engine. Modified: csw/mgar/pkg/sasl/trunk/Makefile =================================================================== --- csw/mgar/pkg/sasl/trunk/Makefile 2011-07-08 15:10:09 UTC (rev 15009) +++ csw/mgar/pkg/sasl/trunk/Makefile 2011-07-08 21:01:12 UTC (rev 15010) @@ -1,5 +1,6 @@ NAME = sasl VERSION = 2.1.22 +GARTYPE = v1 CATEGORIES = lib DESCRIPTION = Simple Authentication and Security Layer Modified: csw/mgar/pkg/sdlnet/trunk/Makefile =================================================================== --- csw/mgar/pkg/sdlnet/trunk/Makefile 2011-07-08 15:10:09 UTC (rev 15009) +++ csw/mgar/pkg/sdlnet/trunk/Makefile 2011-07-08 21:01:12 UTC (rev 15010) @@ -1,5 +1,6 @@ NAME = SDL_net VERSION = 1.2.7 +GARTYPE = v1 CATEGORIES = lib DESCRIPTION = A small cross-platform network library for SDL Modified: csw/mgar/pkg/sdlsound/trunk/Makefile =================================================================== --- csw/mgar/pkg/sdlsound/trunk/Makefile 2011-07-08 15:10:09 UTC (rev 15009) +++ csw/mgar/pkg/sdlsound/trunk/Makefile 2011-07-08 21:01:12 UTC (rev 15010) @@ -1,5 +1,6 @@ NAME = SDL_sound VERSION = 1.0.1 +GARTYPE = v1 CATEGORIES = lib DESCRIPTION = A library that handles the decoding of several popular sound file formats Modified: csw/mgar/pkg/sdlttf/trunk/Makefile =================================================================== --- csw/mgar/pkg/sdlttf/trunk/Makefile 2011-07-08 15:10:09 UTC (rev 15009) +++ csw/mgar/pkg/sdlttf/trunk/Makefile 2011-07-08 21:01:12 UTC (rev 15010) @@ -1,5 +1,6 @@ NAME = SDL_ttf VERSION = 2.0.9 +GARTYPE = v1 CATEGORIES = lib DESCRIPTION = TrueType font rendering library for SDL applications Modified: csw/mgar/pkg/sh-utils/trunk/Makefile =================================================================== --- csw/mgar/pkg/sh-utils/trunk/Makefile 2011-07-08 15:10:09 UTC (rev 15009) +++ csw/mgar/pkg/sh-utils/trunk/Makefile 2011-07-08 21:01:12 UTC (rev 15010) @@ -1,5 +1,6 @@ NAME = sh-utils VERSION = 2.0 +GARTYPE = v1 CATEGORIES = utils DESCRIPTION = sh utilities Modified: csw/mgar/pkg/silctoolkit/trunk/Makefile =================================================================== --- csw/mgar/pkg/silctoolkit/trunk/Makefile 2011-07-08 15:10:09 UTC (rev 15009) +++ csw/mgar/pkg/silctoolkit/trunk/Makefile 2011-07-08 21:01:12 UTC (rev 15010) @@ -1,5 +1,6 @@ NAME = silc-toolkit VERSION = 1.1.8 +GARTYPE = v1 CATEGORIES = lib SPKG_SOURCEURL = http://silcnet.org/software/download/toolkit/ Modified: csw/mgar/pkg/sloccount/trunk/Makefile =================================================================== --- csw/mgar/pkg/sloccount/trunk/Makefile 2011-07-08 15:10:09 UTC (rev 15009) +++ csw/mgar/pkg/sloccount/trunk/Makefile 2011-07-08 21:01:12 UTC (rev 15010) @@ -1,5 +1,6 @@ NAME = sloccount VERSION = 2.24 +GARTYPE = v1 CATEGORIES = utils DESCRIPTION = A suite of programs for counting physical source lines of code. Modified: csw/mgar/pkg/slrn/trunk/Makefile =================================================================== --- csw/mgar/pkg/slrn/trunk/Makefile 2011-07-08 15:10:09 UTC (rev 15009) +++ csw/mgar/pkg/slrn/trunk/Makefile 2011-07-08 21:01:12 UTC (rev 15010) @@ -1,5 +1,6 @@ NAME = slrn VERSION = 0.9.8.1 +GARTYPE = v1 CATEGORIES = net DESCRIPTION = command-line news reader Modified: csw/mgar/pkg/smartmontools/trunk/Makefile =================================================================== --- csw/mgar/pkg/smartmontools/trunk/Makefile 2011-07-08 15:10:09 UTC (rev 15009) +++ csw/mgar/pkg/smartmontools/trunk/Makefile 2011-07-08 21:01:12 UTC (rev 15010) @@ -1,5 +1,6 @@ NAME = smartmontools VERSION = 5.38 +GARTYPE = v1 CATEGORIES = utils DESCRIPTION = S.M.A.R.T. disk monitoring tools Modified: csw/mgar/pkg/smbldap-tools/trunk/Makefile =================================================================== --- csw/mgar/pkg/smbldap-tools/trunk/Makefile 2011-07-08 15:10:09 UTC (rev 15009) +++ csw/mgar/pkg/smbldap-tools/trunk/Makefile 2011-07-08 21:01:12 UTC (rev 15010) @@ -1,5 +1,6 @@ NAME = smbldap-tools VERSION = 0.9.4 +GARTYPE = v1 CATEGORIES = utils DESCRIPTION = smbldap-tools Modified: csw/mgar/pkg/squidpurge/trunk/Makefile =================================================================== --- csw/mgar/pkg/squidpurge/trunk/Makefile 2011-07-08 15:10:09 UTC (rev 15009) +++ csw/mgar/pkg/squidpurge/trunk/Makefile 2011-07-08 21:01:12 UTC (rev 15010) @@ -1,5 +1,6 @@ NAME = purge VERSION = 20040201 +GARTYPE = v1 CATEGORIES = net DESCRIPTION = Purge squid cache entries. Modified: csw/mgar/pkg/svnmailer/trunk/Makefile =================================================================== --- csw/mgar/pkg/svnmailer/trunk/Makefile 2011-07-08 15:10:09 UTC (rev 15009) +++ csw/mgar/pkg/svnmailer/trunk/Makefile 2011-07-08 21:01:12 UTC (rev 15010) @@ -2,6 +2,7 @@ VERSION = 1.1.0 GARSVNREV = r1373 GARRELEASE = dev-$(GARSVNREV) +GARTYPE = v1 CATEGORIES = utils DESCRIPTION = A tool to post subversion repository information. Modified: csw/mgar/pkg/swaks/trunk/Makefile =================================================================== --- csw/mgar/pkg/swaks/trunk/Makefile 2011-07-08 15:10:09 UTC (rev 15009) +++ csw/mgar/pkg/swaks/trunk/Makefile 2011-07-08 21:01:12 UTC (rev 15010) @@ -1,5 +1,6 @@ NAME = swaks VERSION = 20061116.0 +GARTYPE = v1 CATEGORIES = utils DESCRIPTION = Swiss Army Knife SMTP Modified: csw/mgar/pkg/sword/trunk/Makefile =================================================================== --- csw/mgar/pkg/sword/trunk/Makefile 2011-07-08 15:10:09 UTC (rev 15009) +++ csw/mgar/pkg/sword/trunk/Makefile 2011-07-08 21:01:12 UTC (rev 15010) @@ -1,5 +1,6 @@ NAME = sword VERSION = 1.5.9 +GARTYPE = v1 CATEGORIES = lib DESCRIPTION = SWORD Engine (gcc3) Modified: csw/mgar/pkg/swtlibs/trunk/Makefile =================================================================== --- csw/mgar/pkg/swtlibs/trunk/Makefile 2011-07-08 15:10:09 UTC (rev 15009) +++ csw/mgar/pkg/swtlibs/trunk/Makefile 2011-07-08 21:01:12 UTC (rev 15010) @@ -1,5 +1,6 @@ NAME = swtlibs VERSION = 3.2.2 +GARTYPE = v1 CATEGORIES = lib DESCRIPTION = Standard Widget Toolkit (SWT) libraries Modified: csw/mgar/pkg/sysbench/trunk/Makefile =================================================================== --- csw/mgar/pkg/sysbench/trunk/Makefile 2011-07-08 15:10:09 UTC (rev 15009) +++ csw/mgar/pkg/sysbench/trunk/Makefile 2011-07-08 21:01:12 UTC (rev 15010) @@ -7,6 +7,7 @@ # NAME = sysbench VERSION = 0.4.7 +GARTYPE = v1 CATEGORIES = utils DESCRIPTION = System evaluation benchmark Modified: csw/mgar/pkg/system-tray-applet/trunk/Makefile =================================================================== --- csw/mgar/pkg/system-tray-applet/trunk/Makefile 2011-07-08 15:10:09 UTC (rev 15009) +++ csw/mgar/pkg/system-tray-applet/trunk/Makefile 2011-07-08 21:01:12 UTC (rev 15010) @@ -1,5 +1,6 @@ NAME = system-tray-applet VERSION = 0.15 +GARTYPE = v1 CATEGORIES = gnome DESCRIPTION = Gnome 2 System Tray Applet Modified: csw/mgar/pkg/textutils/trunk/Makefile =================================================================== --- csw/mgar/pkg/textutils/trunk/Makefile 2011-07-08 15:10:09 UTC (rev 15009) +++ csw/mgar/pkg/textutils/trunk/Makefile 2011-07-08 21:01:12 UTC (rev 15010) @@ -1,5 +1,6 @@ NAME = textutils VERSION = 2.1 +GARTYPE = v1 CATEGORIES = utils DESCRIPTION = Text utilities Modified: csw/mgar/pkg/tme/trunk/Makefile =================================================================== --- csw/mgar/pkg/tme/trunk/Makefile 2011-07-08 15:10:09 UTC (rev 15009) +++ csw/mgar/pkg/tme/trunk/Makefile 2011-07-08 21:01:12 UTC (rev 15010) @@ -1,5 +1,6 @@ NAME = tme VERSION = 0.6 +GARTYPE = v1 CATEGORIES = apps DESCRIPTION = The Machine Emulator Modified: csw/mgar/pkg/tomcat4/trunk/Makefile =================================================================== --- csw/mgar/pkg/tomcat4/trunk/Makefile 2011-07-08 15:10:09 UTC (rev 15009) +++ csw/mgar/pkg/tomcat4/trunk/Makefile 2011-07-08 21:01:12 UTC (rev 15010) @@ -1,5 +1,6 @@ NAME = tomcat4 VERSION = 4.1.37 +GARTYPE = v1 CATEGORIES = server DESCRIPTION = Apache Jakarta Tomcat 4 Servlet/JSP Container Modified: csw/mgar/pkg/tomcat5/trunk/Makefile =================================================================== --- csw/mgar/pkg/tomcat5/trunk/Makefile 2011-07-08 15:10:09 UTC (rev 15009) +++ csw/mgar/pkg/tomcat5/trunk/Makefile 2011-07-08 21:01:12 UTC (rev 15010) @@ -1,5 +1,6 @@ NAME = tomcat5 VERSION = 5.5.27 +GARTYPE = v1 CATEGORIES = server DESCRIPTION = Apache Jakarta Tomcat 5.5 Servlet/JSP Container Modified: csw/mgar/pkg/tsclient/trunk/Makefile =================================================================== --- csw/mgar/pkg/tsclient/trunk/Makefile 2011-07-08 15:10:09 UTC (rev 15009) +++ csw/mgar/pkg/tsclient/trunk/Makefile 2011-07-08 21:01:12 UTC (rev 15010) @@ -1,5 +1,6 @@ NAME = tsclient VERSION = 0.140 +GARTYPE = v1 CATEGORIES = apps DESCRIPTION = a frontend for rdesktop and other remote desktop tool Modified: csw/mgar/pkg/xfce/appfinder/trunk/Makefile =================================================================== --- csw/mgar/pkg/xfce/appfinder/trunk/Makefile 2011-07-08 15:10:09 UTC (rev 15009) +++ csw/mgar/pkg/xfce/appfinder/trunk/Makefile 2011-07-08 21:01:12 UTC (rev 15010) @@ -1,4 +1,5 @@ NAME = xfce4-appfinder +GARTYPE = v1 CATEGORIES = xfce DESCRIPTION = Xfce Application Finder Modified: csw/mgar/pkg/xfce/desktop/trunk/Makefile =================================================================== --- csw/mgar/pkg/xfce/desktop/trunk/Makefile 2011-07-08 15:10:09 UTC (rev 15009) +++ csw/mgar/pkg/xfce/desktop/trunk/Makefile 2011-07-08 21:01:12 UTC (rev 15010) @@ -1,4 +1,5 @@ NAME = xfdesktop +GARTYPE = v1 CATEGORIES = xfce DESCRIPTION = Xfce Desktop Manager Modified: csw/mgar/pkg/xfce/devtools/trunk/Makefile =================================================================== --- csw/mgar/pkg/xfce/devtools/trunk/Makefile 2011-07-08 15:10:09 UTC (rev 15009) +++ csw/mgar/pkg/xfce/devtools/trunk/Makefile 2011-07-08 21:01:12 UTC (rev 15010) @@ -1,4 +1,5 @@ NAME = xfce4-dev-tools +GARTYPE = v1 CATEGORIES = xfce DESCRIPTION = Xfce Development Tools Modified: csw/mgar/pkg/xfce/exo/trunk/Makefile =================================================================== --- csw/mgar/pkg/xfce/exo/trunk/Makefile 2011-07-08 15:10:09 UTC (rev 15009) +++ csw/mgar/pkg/xfce/exo/trunk/Makefile 2011-07-08 21:01:12 UTC (rev 15010) @@ -1,4 +1,5 @@ NAME = exo +GARTYPE = v1 CATEGORIES = xfce DESCRIPTION = Xfce Extensions Library Modified: csw/mgar/pkg/xfce/gtk-xfce-engine/trunk/Makefile =================================================================== --- csw/mgar/pkg/xfce/gtk-xfce-engine/trunk/Makefile 2011-07-08 15:10:09 UTC (rev 15009) +++ csw/mgar/pkg/xfce/gtk-xfce-engine/trunk/Makefile 2011-07-08 21:01:12 UTC (rev 15010) @@ -1,4 +1,5 @@ NAME = gtk-xfce-engine +GARTYPE = v1 CATEGORIES = xfce DESCRIPTION = Xfce GTK theme engine Modified: csw/mgar/pkg/xfce/icon-theme/trunk/Makefile =================================================================== --- csw/mgar/pkg/xfce/icon-theme/trunk/Makefile 2011-07-08 15:10:09 UTC (rev 15009) +++ csw/mgar/pkg/xfce/icon-theme/trunk/Makefile 2011-07-08 21:01:12 UTC (rev 15010) @@ -1,4 +1,5 @@ NAME = xfce4-icon-theme +GARTYPE = v1 CATEGORIES = xfce DESCRIPTION = Xfce Icon Theme Modified: csw/mgar/pkg/xfce/libxfce4mcs/trunk/Makefile =================================================================== --- csw/mgar/pkg/xfce/libxfce4mcs/trunk/Makefile 2011-07-08 15:10:09 UTC (rev 15009) +++ csw/mgar/pkg/xfce/libxfce4mcs/trunk/Makefile 2011-07-08 21:01:12 UTC (rev 15010) @@ -1,4 +1,5 @@ NAME = libxfce4mcs +GARTYPE = v1 CATEGORIES = xfce DESCRIPTION = Xfce Settings Manager Library Modified: csw/mgar/pkg/xfce/libxfcegui4/trunk/Makefile =================================================================== --- csw/mgar/pkg/xfce/libxfcegui4/trunk/Makefile 2011-07-08 15:10:09 UTC (rev 15009) +++ csw/mgar/pkg/xfce/libxfcegui4/trunk/Makefile 2011-07-08 21:01:12 UTC (rev 15010) @@ -1,4 +1,5 @@ NAME = libxfcegui4 +GARTYPE = v1 CATEGORIES = xfce DESCRIPTION = Xfce Widget Library Modified: csw/mgar/pkg/xfce/mcs-manager/trunk/Makefile =================================================================== --- csw/mgar/pkg/xfce/mcs-manager/trunk/Makefile 2011-07-08 15:10:09 UTC (rev 15009) +++ csw/mgar/pkg/xfce/mcs-manager/trunk/Makefile 2011-07-08 21:01:12 UTC (rev 15010) @@ -1,4 +1,5 @@ NAME = xfce-mcs-manager +GARTYPE = v1 CATEGORIES = xfce DESCRIPTION = Xfce Settings Manager Modified: csw/mgar/pkg/xfce/mcs-plugins/trunk/Makefile =================================================================== --- csw/mgar/pkg/xfce/mcs-plugins/trunk/Makefile 2011-07-08 15:10:09 UTC (rev 15009) +++ csw/mgar/pkg/xfce/mcs-plugins/trunk/Makefile 2011-07-08 21:01:12 UTC (rev 15010) @@ -1,4 +1,5 @@ NAME = xfce-mcs-plugins +GARTYPE = v1 CATEGORIES = xfce DESCRIPTION = Xfce Settings Manager Plugins Modified: csw/mgar/pkg/xfce/mixer/trunk/Makefile =================================================================== --- csw/mgar/pkg/xfce/mixer/trunk/Makefile 2011-07-08 15:10:09 UTC (rev 15009) +++ csw/mgar/pkg/xfce/mixer/trunk/Makefile 2011-07-08 21:01:12 UTC (rev 15010) @@ -1,4 +1,5 @@ NAME = xfce4-mixer +GARTYPE = v1 CATEGORIES = xfce DESCRIPTION = Xfce Volume Control Modified: csw/mgar/pkg/xfce/mousepad/trunk/Makefile =================================================================== --- csw/mgar/pkg/xfce/mousepad/trunk/Makefile 2011-07-08 15:10:09 UTC (rev 15009) +++ csw/mgar/pkg/xfce/mousepad/trunk/Makefile 2011-07-08 21:01:12 UTC (rev 15010) @@ -1,5 +1,6 @@ NAME = mousepad VERSION = 0.2.13 +GARTYPE = v1 CATEGORIES = xfce DESCRIPTION = Xfce Mousepad Text Editor Modified: csw/mgar/pkg/xfce/orage/trunk/Makefile =================================================================== --- csw/mgar/pkg/xfce/orage/trunk/Makefile 2011-07-08 15:10:09 UTC (rev 15009) +++ csw/mgar/pkg/xfce/orage/trunk/Makefile 2011-07-08 21:01:12 UTC (rev 15010) @@ -1,4 +1,5 @@ NAME = orage +GARTYPE = v1 CATEGORIES = xfce DESCRIPTION = Xfce Orage Calendar Modified: csw/mgar/pkg/xfce/panel/trunk/Makefile =================================================================== --- csw/mgar/pkg/xfce/panel/trunk/Makefile 2011-07-08 15:10:09 UTC (rev 15009) +++ csw/mgar/pkg/xfce/panel/trunk/Makefile 2011-07-08 21:01:12 UTC (rev 15010) @@ -1,4 +1,5 @@ NAME = xfce4-panel +GARTYPE = v1 CATEGORIES = xfce DESCRIPTION = Xfce Panel Modified: csw/mgar/pkg/xfce/print/trunk/Makefile =================================================================== --- csw/mgar/pkg/xfce/print/trunk/Makefile 2011-07-08 15:10:09 UTC (rev 15009) +++ csw/mgar/pkg/xfce/print/trunk/Makefile 2011-07-08 21:01:12 UTC (rev 15010) @@ -1,4 +1,5 @@ NAME = xfprint +GARTYPE = v1 CATEGORIES = xfce DESCRIPTION = Xfce Printing Helper Modified: csw/mgar/pkg/xfce/session/trunk/Makefile =================================================================== --- csw/mgar/pkg/xfce/session/trunk/Makefile 2011-07-08 15:10:09 UTC (rev 15009) +++ csw/mgar/pkg/xfce/session/trunk/Makefile 2011-07-08 21:01:12 UTC (rev 15010) @@ -1,4 +1,5 @@ NAME = xfce4-session +GARTYPE = v1 CATEGORIES = xfce DESCRIPTION = Xfce Session Manager Modified: csw/mgar/pkg/xfce/terminal/trunk/Makefile =================================================================== --- csw/mgar/pkg/xfce/terminal/trunk/Makefile 2011-07-08 15:10:09 UTC (rev 15009) +++ csw/mgar/pkg/xfce/terminal/trunk/Makefile 2011-07-08 21:01:12 UTC (rev 15010) @@ -1,5 +1,6 @@ NAME = Terminal VERSION = 0.2.8 +GARTYPE = v1 CATEGORIES = xfce DESCRIPTION = Xfce Terminal Emulator Modified: csw/mgar/pkg/xfce/thunar/trunk/Makefile =================================================================== --- csw/mgar/pkg/xfce/thunar/trunk/Makefile 2011-07-08 15:10:09 UTC (rev 15009) +++ csw/mgar/pkg/xfce/thunar/trunk/Makefile 2011-07-08 21:01:12 UTC (rev 15010) @@ -1,5 +1,6 @@ NAME = Thunar VERSION = 0.9.0 +GARTYPE = v1 CATEGORIES = xfce DESCRIPTION = Xfce Thunar File Manager Modified: csw/mgar/pkg/xfce/utils/trunk/Makefile =================================================================== --- csw/mgar/pkg/xfce/utils/trunk/Makefile 2011-07-08 15:10:09 UTC (rev 15009) +++ csw/mgar/pkg/xfce/utils/trunk/Makefile 2011-07-08 21:01:12 UTC (rev 15010) @@ -1,4 +1,5 @@ NAME = xfce-utils +GARTYPE = v1 CATEGORIES = xfce DESCRIPTION = Xfce Utilities Modified: csw/mgar/pkg/xfce/xfwm4/trunk/Makefile =================================================================== --- csw/mgar/pkg/xfce/xfwm4/trunk/Makefile 2011-07-08 15:10:09 UTC (rev 15009) +++ csw/mgar/pkg/xfce/xfwm4/trunk/Makefile 2011-07-08 21:01:12 UTC (rev 15010) @@ -1,4 +1,5 @@ NAME = xfwm4 +GARTYPE = v1 CATEGORIES = xfce DESCRIPTION = Xfce Window Manager Modified: csw/mgar/pkg/xfce/xfwm4-themes/trunk/Makefile =================================================================== --- csw/mgar/pkg/xfce/xfwm4-themes/trunk/Makefile 2011-07-08 15:10:09 UTC (rev 15009) +++ csw/mgar/pkg/xfce/xfwm4-themes/trunk/Makefile 2011-07-08 21:01:12 UTC (rev 15010) @@ -1,4 +1,5 @@ NAME = xfwm4-themes +GARTYPE = v1 CATEGORIES = xfce DESCRIPTION = Xfce Window Manager Themes Modified: csw/mgar/pkg/xine-ui/trunk/Makefile =================================================================== --- csw/mgar/pkg/xine-ui/trunk/Makefile 2011-07-08 15:10:09 UTC (rev 15009) +++ csw/mgar/pkg/xine-ui/trunk/Makefile 2011-07-08 21:01:12 UTC (rev 15010) @@ -1,5 +1,6 @@ NAME = xine-ui VERSION = 0.99.4 +GARTYPE = v1 CATEGORIES = gnome DESCRIPTION = Xine media player user interface. Modified: csw/mgar/pkg/xinetd/trunk/Makefile =================================================================== --- csw/mgar/pkg/xinetd/trunk/Makefile 2011-07-08 15:10:09 UTC (rev 15009) +++ csw/mgar/pkg/xinetd/trunk/Makefile 2011-07-08 21:01:12 UTC (rev 15010) @@ -1,5 +1,6 @@ NAME = xinetd VERSION = 2.3.13 +GARTYPE = v1 CATEGORIES = server DESCRIPTION = Powerful inetd replacement Modified: csw/mgar/pkg/xrestop/trunk/Makefile =================================================================== --- csw/mgar/pkg/xrestop/trunk/Makefile 2011-07-08 15:10:09 UTC (rev 15009) +++ csw/mgar/pkg/xrestop/trunk/Makefile 2011-07-08 21:01:12 UTC (rev 15010) @@ -1,5 +1,6 @@ NAME = xrestop VERSION = 0.3 +GARTYPE = v1 CATEGORIES = utils DESCRIPTION = 'top' like staticstics for X11 server side resource usage This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From skayser at users.sourceforge.net Fri Jul 8 23:36:17 2011 From: skayser at users.sourceforge.net (skayser at users.sourceforge.net) Date: Fri, 08 Jul 2011 21:36:17 +0000 Subject: [csw-devel] SF.net SVN: gar:[15011] csw/mgar/pkg Message-ID: Revision: 15011 http://gar.svn.sourceforge.net/gar/?rev=15011&view=rev Author: skayser Date: 2011-07-08 21:36:16 +0000 (Fri, 08 Jul 2011) Log Message: ----------- various: fully qualify sourceforge.net in svn:externals Property Changed: ---------------- csw/mgar/pkg/bdb42/tags/bdb-consolidation-4.4.20,REV=2009.07.28/ csw/mgar/pkg/bdb43/tags/bdb-consolidation-4.3.29,REV=2009.06.26/ csw/mgar/pkg/bdb44/tags/bdb-consolidation-4.4.20,REV=2009.07.28/ csw/mgar/pkg/bind/branches/stable-9.4.3p3/ csw/mgar/pkg/cups/tags/cups-1.3.9/ Property changes on: csw/mgar/pkg/bdb42/tags/bdb-consolidation-4.4.20,REV=2009.07.28 ___________________________________________________________________ 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/bdb43/tags/bdb-consolidation-4.3.29,REV=2009.06.26 ___________________________________________________________________ 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/bdb44/tags/bdb-consolidation-4.4.20,REV=2009.07.28 ___________________________________________________________________ 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/bind/branches/stable-9.4.3p3 ___________________________________________________________________ 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/cups/tags/cups-1.3.9 ___________________________________________________________________ Modified: svn:externals - gar https://gar.svn.sf.net/svnroot/gar/csw/mgar/gar/v1 + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/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 Fri Jul 8 23:42:08 2011 From: skayser at users.sourceforge.net (skayser at users.sourceforge.net) Date: Fri, 08 Jul 2011 21:42:08 +0000 Subject: [csw-devel] SF.net SVN: gar:[15012] csw/mgar/pkg Message-ID: Revision: 15012 http://gar.svn.sourceforge.net/gar/?rev=15012&view=rev Author: skayser Date: 2011-07-08 21:42:08 +0000 (Fri, 08 Jul 2011) Log Message: ----------- various: standardize svn:externals, strip double slash Modified Paths: -------------- csw/mgar/pkg/ipv6calc/trunk/Makefile csw/mgar/pkg/zzuf/trunk/Makefile Property Changed: ---------------- csw/mgar/pkg/ipv6calc/trunk/ csw/mgar/pkg/lang-python/fabric/trunk/ csw/mgar/pkg/lang-python/mako/trunk/ csw/mgar/pkg/lang-python/paramiko/trunk/ csw/mgar/pkg/lang-python/pycrypto/trunk/ csw/mgar/pkg/lang-python/pyxdg/trunk/ csw/mgar/pkg/lang-python/quixote/trunk/ csw/mgar/pkg/lang-python/twill/trunk/ csw/mgar/pkg/mscgen/trunk/ csw/mgar/pkg/waf/trunk/ csw/mgar/pkg/yad/trunk/ csw/mgar/pkg/zzuf/trunk/ Property changes on: csw/mgar/pkg/ipv6calc/trunk ___________________________________________________________________ Modified: svn:externals - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar//v2 + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 Modified: csw/mgar/pkg/ipv6calc/trunk/Makefile =================================================================== --- csw/mgar/pkg/ipv6calc/trunk/Makefile 2011-07-08 21:36:16 UTC (rev 15011) +++ csw/mgar/pkg/ipv6calc/trunk/Makefile 2011-07-08 21:42:08 UTC (rev 15012) @@ -5,6 +5,11 @@ # /opt/SUNWspro/bin/cc -m32 -xarch=386 -L/opt/csw/lib -o ipv6calc ipv6calc.o showinfo.o ../getopt/getopt.o ../getopt/getopt1.o ../md5/md5.o -lipv6calc -L../lib/ -L/opt/csw/lib -lGeoIP # ld: fatal: library -lipv6calc: not found # +# ^^ Happens in ipv6calc subdir, ../lib has a static libipv6calc +# $ cd .. && find . -name libipv6calc.a +# ./lib/libipv6calc.a +# +# NAME = ipv6calc VERSION = 0.90.0 GARTYPE = v2 Property changes on: csw/mgar/pkg/lang-python/fabric/trunk ___________________________________________________________________ Modified: svn:externals - gar https://gar.svn.sourceforge.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/lang-python/mako/trunk ___________________________________________________________________ Modified: svn:externals - gar https://gar.svn.sourceforge.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/lang-python/paramiko/trunk ___________________________________________________________________ Modified: svn:externals - gar https://gar.svn.sourceforge.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/lang-python/pycrypto/trunk ___________________________________________________________________ Modified: svn:externals - gar https://gar.svn.sourceforge.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/lang-python/pyxdg/trunk ___________________________________________________________________ Modified: svn:externals - gar https://gar.svn.sourceforge.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/lang-python/quixote/trunk ___________________________________________________________________ Modified: svn:externals - gar https://gar.svn.sourceforge.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/lang-python/twill/trunk ___________________________________________________________________ Modified: svn:externals - gar https://gar.svn.sourceforge.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/mscgen/trunk ___________________________________________________________________ Modified: svn:externals - gar https://gar.svn.sourceforge.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/waf/trunk ___________________________________________________________________ Modified: svn:externals - gar https://gar.svn.sourceforge.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/yad/trunk ___________________________________________________________________ Modified: svn:externals - gar https://gar.svn.sourceforge.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/zzuf/trunk ___________________________________________________________________ Modified: svn:externals - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar//v2 + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 Modified: csw/mgar/pkg/zzuf/trunk/Makefile =================================================================== --- csw/mgar/pkg/zzuf/trunk/Makefile 2011-07-08 21:36:16 UTC (rev 15011) +++ csw/mgar/pkg/zzuf/trunk/Makefile 2011-07-08 21:42:08 UTC (rev 15012) @@ -10,7 +10,14 @@ #cc: acomp failed for libzzuf/lib-stream.c # gmake[4]: *** [libzzuf_la-lib-stream.lo] Error 1 # +# Builds fine with gcc, linking fails though +# +# libtool: link: /opt/csw/gcc4/bin/gcc -DLIBDIR=\"/opt/csw/lib/zzuf\" -I./common -O2 -pipe -mcpu=v8 -g -O2 -Wall -W -Wpointer-arith -Wcast-align -Wcast-qual -Wstrict-prototypes -Wshadow -Waggregate-return -Wmissing-prototypes -Wnested-externs -Wsign-compare -mcpu=v8 -o zzuf zzuf-zzuf.o zzuf-opts.o zzuf-md5.o zzuf-timer.o zzuf-myfork.o zzuf-random.o zzuf-ranges.o zzuf-fd.o zzuf-fuzz.o -lm -L/opt/csw/gcc4/lib/. -L/opt/csw/lib +#Undefined first referenced +# symbol in file +#getopt_long zzuf-zzuf.o + NAME = zzuf VERSION = 0.13 GARTYPE = v2 @@ -27,6 +34,8 @@ MASTER_SITES = http://caca.zoy.org/files/zzuf/ DISTFILES = $(DISTNAME).tar.gz +GARCOMPILER = GNU + 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 skayser at users.sourceforge.net Fri Jul 8 23:43:24 2011 From: skayser at users.sourceforge.net (skayser at users.sourceforge.net) Date: Fri, 08 Jul 2011 21:43:24 +0000 Subject: [csw-devel] SF.net SVN: opencsw:[380] gar-wrapper/mgar Message-ID: Revision: 380 http://opencsw.svn.sourceforge.net/opencsw/?rev=380&view=rev Author: skayser Date: 2011-07-08 21:43:24 +0000 (Fri, 08 Jul 2011) Log Message: ----------- mgar: avoid double slash on svn:externals Modified Paths: -------------- gar-wrapper/mgar Modified: gar-wrapper/mgar =================================================================== --- gar-wrapper/mgar 2011-07-08 19:05:42 UTC (rev 379) +++ gar-wrapper/mgar 2011-07-08 21:43:24 UTC (rev 380) @@ -449,7 +449,7 @@ svn ps svn:keywords Id ${__pkgname}/trunk/Makefile svn ps svn:ignore \ -F <( echo -e "cookies\ndownload\nwork\n" ) ${__pkgname}/trunk - svn ps svn:externals "gar $GAR_REPO/v2" ${__pkgname}/trunk + svn ps svn:externals "gar ${GAR_REPO}v2" ${__pkgname}/trunk echo "" echo "Created successfully at $PWD/${__pkgname}/trunk" >&2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Sat Jul 9 08:41:09 2011 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Sat, 09 Jul 2011 06:41:09 +0000 Subject: [csw-devel] SF.net SVN: gar:[15013] csw/mgar/pkg/cpan/X11-Protocol/trunk/Makefile Message-ID: Revision: 15013 http://gar.svn.sourceforge.net/gar/?rev=15013&view=rev Author: dmichelsen Date: 2011-07-09 06:41:09 +0000 (Sat, 09 Jul 2011) Log Message: ----------- cpan/X11-Protocol: Fix stub catalog name Modified Paths: -------------- csw/mgar/pkg/cpan/X11-Protocol/trunk/Makefile Modified: csw/mgar/pkg/cpan/X11-Protocol/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/X11-Protocol/trunk/Makefile 2011-07-08 21:42:08 UTC (rev 15012) +++ csw/mgar/pkg/cpan/X11-Protocol/trunk/Makefile 2011-07-09 06:41:09 UTC (rev 15013) @@ -15,5 +15,6 @@ SPKG_DESC_CSWpm-x11-protocol = $(DESCRIPTION) ARCHALL_CSWpm-x11-protocol = 1 OBSOLETED_BY_CSWpm-x11-protocol += CSWpmx11protocol +CATALOGNAME_CSWpmx11protocol = pm_x11protocol_stub include gar/category.mk This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Sat Jul 9 09:00:41 2011 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Sat, 09 Jul 2011 07:00:41 +0000 Subject: [csw-devel] SF.net SVN: gar:[15014] csw/mgar/pkg/xorriso/trunk Message-ID: Revision: 15014 http://gar.svn.sourceforge.net/gar/?rev=15014&view=rev Author: dmichelsen Date: 2011-07-09 07:00:41 +0000 (Sat, 09 Jul 2011) Log Message: ----------- xorriso: Update to 1.1.2, fix deps Modified Paths: -------------- csw/mgar/pkg/xorriso/trunk/Makefile csw/mgar/pkg/xorriso/trunk/checksums Modified: csw/mgar/pkg/xorriso/trunk/Makefile =================================================================== --- csw/mgar/pkg/xorriso/trunk/Makefile 2011-07-09 06:41:09 UTC (rev 15013) +++ csw/mgar/pkg/xorriso/trunk/Makefile 2011-07-09 07:00:41 UTC (rev 15014) @@ -1,17 +1,24 @@ # $Id$ NAME = xorriso -VERSION = 1.0.8 +VERSION = 1.1.2 CATEGORIES = utils DESCRIPTION = ISO 9660 Rock Ridge Filesystem Manipulator define BLURB + xorriso copies file objects from POSIX compliant filesystems into Rock Ridge enhanced + ISO 9660 filesystems and allows session-wise manipulation of such filesystems. + It can load the management information of existing ISO images and it writes the + session results to optical media or to filesystem objects. + Vice versa xorriso is able to copy file objects out of ISO 9660 filesystems. endef MASTER_SITES = $(GNU_MIRROR) DISTFILES = $(DISTNAME).tar.gz +BUILD_DEP_PKGS += CSWlibreadline-dev + RUNTIME_DEP_PKGS_CSWxorriso += CSWiconv -RUNTIME_DEP_PKGS_CSWxorriso += CSWreadline +RUNTIME_DEP_PKGS_CSWxorriso += CSWlibreadline6 RUNTIME_DEP_PKGS_CSWxorriso += CSWbzip2 RUNTIME_DEP_PKGS_CSWxorriso += CSWzlib Modified: csw/mgar/pkg/xorriso/trunk/checksums =================================================================== --- csw/mgar/pkg/xorriso/trunk/checksums 2011-07-09 06:41:09 UTC (rev 15013) +++ csw/mgar/pkg/xorriso/trunk/checksums 2011-07-09 07:00:41 UTC (rev 15014) @@ -1 +1 @@ -b15486f41c0a344fe6659ab88cac6363 xorriso-1.0.8.tar.gz +312d1a8a39cd894165a37ec3dfc5dad8 xorriso-1.1.2.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Sat Jul 9 09:34:07 2011 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Sat, 09 Jul 2011 07:34:07 +0000 Subject: [csw-devel] SF.net SVN: gar:[15015] csw/mgar/pkg/gawk/trunk/Makefile Message-ID: Revision: 15015 http://gar.svn.sourceforge.net/gar/?rev=15015&view=rev Author: dmichelsen Date: 2011-07-09 07:34:06 +0000 (Sat, 09 Jul 2011) Log Message: ----------- gawk: Fix description as reported in #4804 Modified Paths: -------------- csw/mgar/pkg/gawk/trunk/Makefile Modified: csw/mgar/pkg/gawk/trunk/Makefile =================================================================== --- csw/mgar/pkg/gawk/trunk/Makefile 2011-07-09 07:00:41 UTC (rev 15014) +++ csw/mgar/pkg/gawk/trunk/Makefile 2011-07-09 07:34:06 UTC (rev 15015) @@ -2,7 +2,7 @@ VERSION = 4.0.0 CATEGORIES = utils -DESCRIPTION = GNU grep +DESCRIPTION = GNU awk define BLURB The GNU family of grep utilities may be the "fastest grep in the west". GNU grep is based on a fast lazy-state deterministic matcher (about 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 Jul 9 11:32:13 2011 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Sat, 09 Jul 2011 09:32:13 +0000 Subject: [csw-devel] SF.net SVN: gar:[15016] csw/mgar/pkg/djbdns/trunk Message-ID: Revision: 15016 http://gar.svn.sourceforge.net/gar/?rev=15016&view=rev Author: dmichelsen Date: 2011-07-09 09:32:13 +0000 (Sat, 09 Jul 2011) Log Message: ----------- djbdns: Cleanup, add manpages Modified Paths: -------------- csw/mgar/pkg/djbdns/trunk/Makefile csw/mgar/pkg/djbdns/trunk/checksums Removed Paths: ------------- csw/mgar/pkg/djbdns/trunk/files/CSWdjbdns.gspec Modified: csw/mgar/pkg/djbdns/trunk/Makefile =================================================================== --- csw/mgar/pkg/djbdns/trunk/Makefile 2011-07-09 07:34:06 UTC (rev 15015) +++ csw/mgar/pkg/djbdns/trunk/Makefile 2011-07-09 09:32:13 UTC (rev 15016) @@ -2,7 +2,7 @@ VERSION = 1.05 CATEGORIES = apps -DESCRIPTION = retrieve and publish Domain Name System information +DESCRIPTION = Retrieve and publish Domain Name System information define BLURB djbdns is a collection of Domain Name System tools. It includes several components: @@ -31,16 +31,19 @@ and is not required if your secondary is a BIND DNS server. endef -MASTER_SITES = http://cr.yp.to/djbdns/ -DISTFILES = $(NAME)-$(VERSION).tar.gz -DISTFILES += $(call admfiles,CSWdjbdns,) +MASTER_SITES += http://cr.yp.to/djbdns/ +MASTER_SITES += http://smarden.org/pape/djb/manpages/ +DISTFILES += $(DISTNAME).tar.gz +#DISTFILES += doc.tar.gz +DISTFILES += $(DISTNAME)-man.tar.gz -# We define upstream file regex so we can be notifed of new upstream software release -UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz +VENDOR_URL = http://cr.yp.to/djbdns.html +LICENSE = README -CONFIGURE_ARGS = $(DIRPATHS) FILES = axfr-get axfrdns axfrdns-conf dnscache dnscache-conf dnsfilter dnsip dnsipq dnsmx dnsname dnsq dnsqr dnstrace dnstracesort dnstxt pickdns pickdns-conf pickdns-data random-ip rbldns rbldns-conf rbldns-data tinydns tinydns-conf tinydns-data tinydns-edit tinydns-get walldns walldns-conf +GARCOMPILER = GNU + CONFIGURE_SCRIPTS = custom BUILD_SCRIPTS = custom TEST_SCRIPTS = custom @@ -52,18 +55,25 @@ configure-custom: @echo "==> Configuring $(NAME)" - @cd $(WORKSRC)/ && sed "s|/usr/local|$(prefix)|g" < conf-home > conf-home.csw && mv conf-home.csw conf-home + @echo $(prefix) >$(WORKSRC)/conf-home + @echo $(CC) $(CFLAGS) >$(WORKSRC)/conf-cc @$(MAKECOOKIE) build-custom: @echo "==> building $(NAME)" - @cd $(WORKSRC) && PATH=/opt/csw/gnu:/opt/csw/gcc3/bin/:/usr/bin/:$PATH && export PATH && make + cd $(WORKSRC) && gmake @$(MAKECOOKIE) install-custom: @echo "==> installing $(NAME)" @echo "==> to $(DESTDIR)$(prefix)/bin" - @rm -rf $(DESTDIR)$(prefix) - @mkdir -p $(DESTDIR)$(prefix)/bin - @ginstall -m 755 $(foreach FILE, $(FILES), $(WORKSRC)/$(FILE)) $(DESTDIR)$(prefix)/bin + rm -rf $(DESTDIR)$(prefix) + mkdir -p $(DESTDIR)$(prefix)/bin + ginstall -m 755 $(addprefix $(WORKSRC)/,$(FILES)) $(DESTDIR)$(prefix)/bin + mkdir -p $(DESTDIR)$(mandir)/man1 + ginstall -m 644 $(WORKDIR)/djbdns-man/*.1 $(DESTDIR)$(mandir)/man1 + mkdir -p $(DESTDIR)$(mandir)/man5 + ginstall -m 644 $(WORKDIR)/djbdns-man/*.5 $(DESTDIR)$(mandir)/man5 + mkdir -p $(DESTDIR)$(mandir)/man8 + ginstall -m 644 $(WORKDIR)/djbdns-man/*.8 $(DESTDIR)$(mandir)/man8 @$(MAKECOOKIE) Modified: csw/mgar/pkg/djbdns/trunk/checksums =================================================================== --- csw/mgar/pkg/djbdns/trunk/checksums 2011-07-09 07:34:06 UTC (rev 15015) +++ csw/mgar/pkg/djbdns/trunk/checksums 2011-07-09 09:32:13 UTC (rev 15016) @@ -1,2 +1,2 @@ -3147c5cd56832aa3b41955c7a51cbeb2 download/djbdns-1.05.tar.gz -913166e653d2c5f026e8a0eccffb39bb download/CSWdjbdns.gspec +14d7329cff69f604fac607436eb8485e djbdns-1.05-man.tar.gz +3147c5cd56832aa3b41955c7a51cbeb2 djbdns-1.05.tar.gz Deleted: csw/mgar/pkg/djbdns/trunk/files/CSWdjbdns.gspec =================================================================== --- csw/mgar/pkg/djbdns/trunk/files/CSWdjbdns.gspec 2011-07-09 07:34:06 UTC (rev 15015) +++ csw/mgar/pkg/djbdns/trunk/files/CSWdjbdns.gspec 2011-07-09 09:32:13 UTC (rev 15016) @@ -1,5 +0,0 @@ -%var bitname djbdns -%var pkgname CSWdjbdns -%var hotline http://www.opencsw.org/bugtrack -%include url file://%{PKGLIB}/csw_dyndepend.gspec -%copyright 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 Jul 9 11:36:35 2011 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Sat, 09 Jul 2011 09:36:35 +0000 Subject: [csw-devel] SF.net SVN: gar:[15017] csw/mgar/pkg/djbdns/trunk/ Message-ID: Revision: 15017 http://gar.svn.sourceforge.net/gar/?rev=15017&view=rev Author: dmichelsen Date: 2011-07-09 09:36:34 +0000 (Sat, 09 Jul 2011) Log Message: ----------- djbdns: Adjust props Property Changed: ---------------- csw/mgar/pkg/djbdns/trunk/ Property changes on: csw/mgar/pkg/djbdns/trunk ___________________________________________________________________ Added: svn:ignore + cookies download work 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 Jul 9 11:45:22 2011 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Sat, 09 Jul 2011 09:45:22 +0000 Subject: [csw-devel] SF.net SVN: gar:[15018] csw/mgar/pkg/djbdns/trunk/Makefile Message-ID: Revision: 15018 http://gar.svn.sourceforge.net/gar/?rev=15018&view=rev Author: dmichelsen Date: 2011-07-09 09:45:21 +0000 (Sat, 09 Jul 2011) Log Message: ----------- djbdns: Remove unnecessary define Modified Paths: -------------- csw/mgar/pkg/djbdns/trunk/Makefile Modified: csw/mgar/pkg/djbdns/trunk/Makefile =================================================================== --- csw/mgar/pkg/djbdns/trunk/Makefile 2011-07-09 09:36:34 UTC (rev 15017) +++ csw/mgar/pkg/djbdns/trunk/Makefile 2011-07-09 09:45:21 UTC (rev 15018) @@ -42,8 +42,6 @@ FILES = axfr-get axfrdns axfrdns-conf dnscache dnscache-conf dnsfilter dnsip dnsipq dnsmx dnsname dnsq dnsqr dnstrace dnstracesort dnstxt pickdns pickdns-conf pickdns-data random-ip rbldns rbldns-conf rbldns-data tinydns tinydns-conf tinydns-data tinydns-edit tinydns-get walldns walldns-conf -GARCOMPILER = GNU - CONFIGURE_SCRIPTS = custom BUILD_SCRIPTS = custom TEST_SCRIPTS = custom 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 Jul 9 13:06:29 2011 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Sat, 09 Jul 2011 11:06:29 +0000 Subject: [csw-devel] SF.net SVN: gar:[15019] csw/mgar/pkg Message-ID: Revision: 15019 http://gar.svn.sourceforge.net/gar/?rev=15019&view=rev Author: dmichelsen Date: 2011-07-09 11:06:29 +0000 (Sat, 09 Jul 2011) Log Message: ----------- ucspi-tcp: Initial commit Added Paths: ----------- csw/mgar/pkg/ucspi-tcp/ csw/mgar/pkg/ucspi-tcp/Makefile csw/mgar/pkg/ucspi-tcp/branches/ csw/mgar/pkg/ucspi-tcp/tags/ csw/mgar/pkg/ucspi-tcp/trunk/ csw/mgar/pkg/ucspi-tcp/trunk/Makefile csw/mgar/pkg/ucspi-tcp/trunk/checksums csw/mgar/pkg/ucspi-tcp/trunk/files/ Copied: csw/mgar/pkg/ucspi-tcp/Makefile (from rev 14858, csw/mgar/pkg/template/Makefile) =================================================================== --- csw/mgar/pkg/ucspi-tcp/Makefile (rev 0) +++ csw/mgar/pkg/ucspi-tcp/Makefile 2011-07-09 11:06:29 UTC (rev 15019) @@ -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/ucspi-tcp/trunk ___________________________________________________________________ Added: svn:ignore + cookies download work Added: svn:externals + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 Copied: csw/mgar/pkg/ucspi-tcp/trunk/Makefile (from rev 15016, csw/mgar/pkg/djbdns/trunk/Makefile) =================================================================== --- csw/mgar/pkg/ucspi-tcp/trunk/Makefile (rev 0) +++ csw/mgar/pkg/ucspi-tcp/trunk/Makefile 2011-07-09 11:06:29 UTC (rev 15019) @@ -0,0 +1,70 @@ +NAME = ucspi-tcp +VERSION = 0.88 +CATEGORIES = apps + +DESCRIPTION = Command-line tools for building TCP client-server applications +define BLURB +endef + +MASTER_SITES += http://cr.yp.to/ucspi-tcp/ +MASTER_SITES += http://smarden.org/pape/djb/manpages/ +DISTFILES += $(DISTNAME).tar.gz +#DISTFILES += doc.tar.gz +DISTFILES += $(DISTNAME)-man.tar.gz + +VENDOR_URL = http://cr.yp.to/ucspi-tcp.html +LICENSE = README + +PACKAGES += CSWucspi-tcp +SPKG_DESC_CSWucspi-tcp = Command-line tools for building TCP client-server applications +OBSOLETED_BY_CSWucspi-tcp = CSWucspitcp +CATALOGNAME_CSWucspitcp = ucspi_tcp_stub + +FILES += addcr +FILES += argv0 +FILES += date@ +FILES += delcr +FILES += finger@ +FILES += fixcrio +FILES += http@ +FILES += mconnect-io +FILES += rblsmtpd +FILES += recordio +FILES += tcpcat +FILES += tcpclient +FILES += tcprules +FILES += tcprulescheck +FILES += tcpserver +FILES += mconnect +FILES += who@ + +CONFIGURE_SCRIPTS = custom +BUILD_SCRIPTS = custom +TEST_SCRIPTS = custom +INSTALL_SCRIPTS = custom + +TEST_SCRIPTS = + +include gar/category.mk + +configure-custom: + @echo "==> Configuring $(NAME)" + @echo $(prefix) >$(WORKSRC)/conf-home + @echo $(CC) $(CFLAGS) >$(WORKSRC)/conf-cc + @echo $(CC) $(LDFLAGS) >$(WORKSRC)/conf-ld + @$(MAKECOOKIE) + +build-custom: + @echo "==> building $(NAME)" + cd $(WORKSRC) && gmake + @$(MAKECOOKIE) + +install-custom: + @echo "==> installing $(NAME)" + @echo "==> to $(DESTDIR)$(prefix)/bin" + rm -rf $(DESTDIR)$(prefix) + mkdir -p $(DESTDIR)$(prefix)/bin + ginstall -m 755 $(addprefix $(WORKSRC)/,$(FILES)) $(DESTDIR)$(prefix)/bin + mkdir -p $(DESTDIR)$(mandir)/man1 + ginstall -m 644 $(WORKDIR)/$(DISTNAME)-man/*.1 $(DESTDIR)$(mandir)/man1 + @$(MAKECOOKIE) Added: csw/mgar/pkg/ucspi-tcp/trunk/checksums =================================================================== --- csw/mgar/pkg/ucspi-tcp/trunk/checksums (rev 0) +++ csw/mgar/pkg/ucspi-tcp/trunk/checksums 2011-07-09 11:06:29 UTC (rev 15019) @@ -0,0 +1,2 @@ +d33160cbd43bccbc0963d0499dfcebdb ucspi-tcp-0.88-man.tar.gz +39b619147db54687c4a583a7a94c9163 ucspi-tcp-0.88.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 Jul 9 13:12:38 2011 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Sat, 09 Jul 2011 11:12:38 +0000 Subject: [csw-devel] SF.net SVN: gar:[15020] csw/mgar/pkg/ucspi-tcp/trunk/Makefile Message-ID: Revision: 15020 http://gar.svn.sourceforge.net/gar/?rev=15020&view=rev Author: dmichelsen Date: 2011-07-09 11:12:38 +0000 (Sat, 09 Jul 2011) Log Message: ----------- ucspi-tcp: Clarify absence of test script Modified Paths: -------------- csw/mgar/pkg/ucspi-tcp/trunk/Makefile Modified: csw/mgar/pkg/ucspi-tcp/trunk/Makefile =================================================================== --- csw/mgar/pkg/ucspi-tcp/trunk/Makefile 2011-07-09 11:06:29 UTC (rev 15019) +++ csw/mgar/pkg/ucspi-tcp/trunk/Makefile 2011-07-09 11:12:38 UTC (rev 15020) @@ -40,11 +40,9 @@ CONFIGURE_SCRIPTS = custom BUILD_SCRIPTS = custom -TEST_SCRIPTS = custom +TEST_SCRIPTS = INSTALL_SCRIPTS = custom -TEST_SCRIPTS = - include gar/category.mk configure-custom: 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 Jul 9 13:45:05 2011 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Sat, 09 Jul 2011 11:45:05 +0000 Subject: [csw-devel] SF.net SVN: gar:[15021] csw/mgar/pkg/daemontools/trunk Message-ID: Revision: 15021 http://gar.svn.sourceforge.net/gar/?rev=15021&view=rev Author: dmichelsen Date: 2011-07-09 11:45:05 +0000 (Sat, 09 Jul 2011) Log Message: ----------- daemontools: General rework, include pre/post scripts from existing package Modified Paths: -------------- csw/mgar/pkg/daemontools/trunk/Makefile csw/mgar/pkg/daemontools/trunk/checksums Added Paths: ----------- csw/mgar/pkg/daemontools/trunk/files/COPYING csw/mgar/pkg/daemontools/trunk/files/CSWdaemontools.postinstall csw/mgar/pkg/daemontools/trunk/files/CSWdaemontools.preremove Removed Paths: ------------- csw/mgar/pkg/daemontools/trunk/files/CSWdaemontools.gspec Property Changed: ---------------- csw/mgar/pkg/daemontools/trunk/ Property changes on: csw/mgar/pkg/daemontools/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/daemontools/trunk/Makefile =================================================================== --- csw/mgar/pkg/daemontools/trunk/Makefile 2011-07-09 11:12:38 UTC (rev 15020) +++ csw/mgar/pkg/daemontools/trunk/Makefile 2011-07-09 11:45:05 UTC (rev 15021) @@ -1,6 +1,5 @@ NAME = daemontools VERSION = 0.76 -GARTYPE = v1 CATEGORIES = utils DESCRIPTION = A collection of tools for managing UNIX services @@ -8,19 +7,31 @@ A collection of tools for managing UNIX services endef -MASTER_SITES = http://cr.yp.to/daemontools/ http://www.fefe.de/daemontools/ -DISTFILES = $(NAME)-$(VERSION).tar.gz -DISTFILES += $(call admfiles,CSWdaemontools,) -WORKSRC = $(WORKDIR)/admin/$(NAME)-$(VERSION) +MASTER_SITES += http://cr.yp.to/daemontools/ +MASTER_SITES += http://smarden.org/pape/djb/manpages/ +DISTFILES += $(DISTNAME).tar.gz +DISTFILES += $(DISTNAME)-man.tar.gz +DISTFILES += CSWdaemontools.postinstall CSWdaemontools.preremove +DISTFILES += COPYING -#PATCHFILES = daemontools-0.70-man.diff.bz2 +VENDOR_URL = http://cr.yp.to/daemontools.html -# We define upstream file regex so we can be notifed of new upstream software release -UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz +PACKAGES += CSWdaemontools +SPKG_DESC_CSWdaemontools = Configures the daemontools services on the local machine +PKGFILES_CSWdaemontools = NOFILES +ARCHALL_CSWdaemontools = 1 +RUNTIME_DEP_PKGS_CSWdaemontools += CSWdaemontools-core +CHECKPKG_OVERRIDES_CSWdaemontools += surplus-dependency|CSWdaemontools-core +PACKAGES += CSWdaemontools-core +SPKG_DESC_CSWdaemontools-core = A collection of tools for managing UNIX services +# PKGFILES is catchallke remerge && +WORKSRC = $(WORKDIR)/admin/$(NAME)-$(VERSION) + CONFIGURE_SCRIPTS = custom BUILD_SCRIPTS = custom +TEST_SCRIPTS = INSTALL_SCRIPTS = custom include gar/category.mk @@ -33,14 +44,18 @@ build-custom: @echo "==> Building daemontools in $(WORKSRC)" - @( cd $(WORKSRC); ./package/compile ) - @chmod 755 $(WORKSRC)/command/* + cd $(WORKSRC) && ./package/compile @$(MAKECOOKIE) install-custom: @echo "==> Installing daemontools in $(DESTDIR)" - @( cd $(WORKSRC) ; \ - install -d $(DESTDIR)$(bindir); cp -p command/* $(DESTDIR)$(bindir); \ - ) - - + mkdir -p $(DESTDIR)$(bindir) + ginstall -m 755 $(WORKSRC)/command/* $(DESTDIR)$(bindir) + mkdir -p $(DESTDIR)$(mandir)/man8 + ginstall -m 644 $(WORKDIR)/$(NAME)-man/*.8 $(DESTDIR)$(mandir)/man8 + perl -pi \ + -e 's,/command,$(bindir),g;' \ + -e 's,/usr/local,$(prefix),g;' \ + $(DESTDIR)$(bindir)/svscanboot \ + $(DESTDIR)$(mandir)/man8/svscanboot.8 + @$(MAKECOOKIE) Modified: csw/mgar/pkg/daemontools/trunk/checksums =================================================================== --- csw/mgar/pkg/daemontools/trunk/checksums 2011-07-09 11:12:38 UTC (rev 15020) +++ csw/mgar/pkg/daemontools/trunk/checksums 2011-07-09 11:45:05 UTC (rev 15021) @@ -1,2 +1,2 @@ -1871af2453d6e464034968a0fbcb2bfc download/daemontools-0.76.tar.gz -2190f5e620e41af6a4b7a7f2f12a47bc download/CSWdaemontools.gspec +2d3858a48f293c87202f76cd883438ee daemontools-0.76-man.tar.gz +1871af2453d6e464034968a0fbcb2bfc daemontools-0.76.tar.gz Added: csw/mgar/pkg/daemontools/trunk/files/COPYING =================================================================== --- csw/mgar/pkg/daemontools/trunk/files/COPYING (rev 0) +++ csw/mgar/pkg/daemontools/trunk/files/COPYING 2011-07-09 11:45:05 UTC (rev 15021) @@ -0,0 +1,3 @@ +Copyright 2001 +D. J. Bernstein +http://cr.yp.to/daemontools.html Deleted: csw/mgar/pkg/daemontools/trunk/files/CSWdaemontools.gspec =================================================================== --- csw/mgar/pkg/daemontools/trunk/files/CSWdaemontools.gspec 2011-07-09 11:12:38 UTC (rev 15020) +++ csw/mgar/pkg/daemontools/trunk/files/CSWdaemontools.gspec 2011-07-09 11:45:05 UTC (rev 15021) @@ -1,5 +0,0 @@ -%var bitname daemontools -%var pkgname CSWdaemontools -%include url file://%{PKGLIB}/csw_dyndepend.gspec -%copyright -Public Domain Added: csw/mgar/pkg/daemontools/trunk/files/CSWdaemontools.postinstall =================================================================== --- csw/mgar/pkg/daemontools/trunk/files/CSWdaemontools.postinstall (rev 0) +++ csw/mgar/pkg/daemontools/trunk/files/CSWdaemontools.postinstall 2011-07-09 11:45:05 UTC (rev 15021) @@ -0,0 +1,68 @@ +#!/bin/sh + +# Paranoia, I know. +: ${BASEDIR=/opt/csw} + +INIT="/usr/sbin/init" +INITTAB="$PKG_INSTALL_ROOT/etc/inittab" + +# The /dev/null 2>&1; then + echo "It appears that daemontools is already present in $INITTAB" + echo "so there's nothing for this postinstall script to do." + + else + echo "Adding daemontools to the $INITTAB file." + if echo "$SVLINE" >> "$INITTAB" 2>/dev/null; then + + # We could test for either a zero length package install root, + # or for SI_INSTALL_APP set to something like jumpstart. THe + # idea is the same; do not poke the init process if pkgadd is + # run with -R, since that typically means the system doing the + # installation is NOT the system that will run the software. + + if test -z "$PKG_INSTALL_ROOT"; then + echo "Starting daemontools from init." + + # If this fails, don't bomb out of the install, since + # we're 99% of the way done. Just tell the admin that + # things have gone bad, and let them fix it. + "$INIT" q || { + x="$?" + echo "Tried to tell init to check $INITTAB, but failed." + echo "The command was $INIT q" + echo "and it returned $x" + echo "After fixing the problem, be sure to run $INIT q" + echo "to start the daemontools service." + } + fi + + else + x="$?" + echo "Unable to add a line to the $INITTAB file." + echo "Using echo, appending to that file, returned $x" + xit=2 + fi + fi + +else + echo "Unable to locate the $INITTAB file; therefore, the" + echo "daemontools svscanboot script could not be added to" + echo "the configuration file for init. Add the following" + echo "line to your inittab file:" + echo + echo "$SVLINE" + echo + echo "Then, run the following as root: $INIT q" + xit=2 +fi + +echo +exit $xit Added: csw/mgar/pkg/daemontools/trunk/files/CSWdaemontools.preremove =================================================================== --- csw/mgar/pkg/daemontools/trunk/files/CSWdaemontools.preremove (rev 0) +++ csw/mgar/pkg/daemontools/trunk/files/CSWdaemontools.preremove 2011-07-09 11:45:05 UTC (rev 15021) @@ -0,0 +1,50 @@ +#!/bin/sh + +INITTAB="$PKG_INSTALL_ROOT/etc/inittab" + +if test -z "$SKIP_INITTAB" -a ! -f "$INITTAB"; then + echo "Unable to locate the /etc/inittab file; therefore," + echo "daemontools cannot be removed from this system safely." + echo "Please correct this problem and try again." + echo + echo "Alternatively, remove the svscanboot utility from your" + echo "inittab file (wherever it may be), and refresh your init" + echo "daemon. Once you are certain that daemontools is not" + echo "running via the init process, you can re-run your pkgrm" + echo "with SKIP_INITTAB set in the environment to bypass this" + echo "step and continue with the package removal." + echo + exit 1 +fi + +if grep svscanboot "$INITTAB" >/dev/null 2>&1; then + echo "Removing svscanboot from $INITTAB" + ed - "$INITTAB" < Revision: 15022 http://gar.svn.sourceforge.net/gar/?rev=15022&view=rev Author: bdwalton Date: 2011-07-09 12:12:44 +0000 (Sat, 09 Jul 2011) Log Message: ----------- libxslt/trunk: drop NOISAEXEC Modified Paths: -------------- csw/mgar/pkg/libxslt/trunk/Makefile Modified: csw/mgar/pkg/libxslt/trunk/Makefile =================================================================== --- csw/mgar/pkg/libxslt/trunk/Makefile 2011-07-09 11:45:05 UTC (rev 15021) +++ csw/mgar/pkg/libxslt/trunk/Makefile 2011-07-09 12:12:44 UTC (rev 15022) @@ -76,7 +76,6 @@ CONFIGURE_ARGS = $(DIRPATHS) $(CONFIGURE_ARGS_$(MEMORYMODEL)) BUILD64 = 1 -NOISAEXEC = 1 STRIP_LIBTOOL = 1 PYCOMPILE = 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 Sat Jul 9 14:35:02 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Sat, 09 Jul 2011 12:35:02 +0000 Subject: [csw-devel] SF.net SVN: gar:[15023] csw/mgar/pkg/libxslt/trunk/Makefile Message-ID: Revision: 15023 http://gar.svn.sourceforge.net/gar/?rev=15023&view=rev Author: bdwalton Date: 2011-07-09 12:35:02 +0000 (Sat, 09 Jul 2011) Log Message: ----------- libxslt/trunk: update libxml2 deps after it was split up Modified Paths: -------------- csw/mgar/pkg/libxslt/trunk/Makefile Modified: csw/mgar/pkg/libxslt/trunk/Makefile =================================================================== --- csw/mgar/pkg/libxslt/trunk/Makefile 2011-07-09 12:12:44 UTC (rev 15022) +++ csw/mgar/pkg/libxslt/trunk/Makefile 2011-07-09 12:35:02 UTC (rev 15023) @@ -12,12 +12,13 @@ DISTFILES = $(NAME)-$(VERSION).tar.gz PATCHFILES += 0001-Forcefully-disable-version-script-use.patch -BUILD_DEP_PKGS = CSWlibxml2 CSWlibxml2devel +BUILD_DEP_PKGS = CSWlibxml2-2 CSWlibxml2-dev PACKAGES = CSWlibxslt SPKG_DESC_CSWlibxslt = XSLT engine runtime package CATALOGNAME_CSWlibxslt = libxslt -RUNTIME_DEP_PKGS_CSWlibxslt += CSWgcrypt CSWgpgerr CSWiconv CSWlibxml2 CSWzlib +RUNTIME_DEP_PKGS_CSWlibxslt += CSWgcrypt CSWgpgerr CSWiconv CSWlibxml2-2 +RUNTIME_DEP_PKGS_CSWlibxstl += CSWzlib RUNTIME_DEP_PKGS_CSWlibxslt += CSWlibxslt1 CSWlibexslt0 PACKAGES += CSWlibxslt-dev @@ -39,7 +40,7 @@ RUNTIME_DEP_PKGS_CSWpy-libxslt = CSWpython RUNTIME_DEP_PKGS_CSWpy-libxslt += CSWlibxslt1 RUNTIME_DEP_PKGS_CSWpy-libxslt += CSWlibexslt0 -RUNTIME_DEP_PKGS_CSWpy-libxslt += CSWlibxml2 +RUNTIME_DEP_PKGS_CSWpy-libxslt += CSWlibxml2-2 RUNTIME_DEP_PKGS_CSWpy-libxslt += CSWzlib RUNTIME_DEP_PKGS_CSWpy-libxslt += CSWgpgerr RUNTIME_DEP_PKGS_CSWpy-libxslt += CSWgcrypt @@ -55,7 +56,7 @@ RUNTIME_DEP_PKGS_CSWlibexslt0 += CSWiconv RUNTIME_DEP_PKGS_CSWlibexslt0 += CSWgpgerr RUNTIME_DEP_PKGS_CSWlibexslt0 += CSWzlib -RUNTIME_DEP_PKGS_CSWlibexslt0 += CSWlibxml2 +RUNTIME_DEP_PKGS_CSWlibexslt0 += CSWlibxml2-2 RUNTIME_DEP_PKGS_CSWlibexslt0 += CSWlibxslt1 RUNTIME_DEP_PKGS_CSWlibexslt0 += CSWgcrypt @@ -64,7 +65,7 @@ PKGFILES_CSWlibxslt1 += $(call baseisadirs,$(libdir),libxslt\.so\.1\.1\.26) PKGFILES_CSWlibxslt1 += $(call baseisadirs,$(libdir),libxslt\.so\.1(\.\d+)*) SPKG_DESC_CSWlibxslt1 += XSLT engine runtime package, libxslt.so.1 -RUNTIME_DEP_PKGS_CSWlibxslt1 += CSWlibxml2 +RUNTIME_DEP_PKGS_CSWlibxslt1 += CSWlibxml2-2 RUNTIME_DEP_PKGS_CSWlibxslt1 += CSWiconv RUNTIME_DEP_PKGS_CSWlibxslt1 += CSWzlib 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 Jul 9 14:45:23 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Sat, 09 Jul 2011 12:45:23 +0000 Subject: [csw-devel] SF.net SVN: gar:[15024] csw/mgar/pkg/libxslt/trunk/Makefile Message-ID: Revision: 15024 http://gar.svn.sourceforge.net/gar/?rev=15024&view=rev Author: bdwalton Date: 2011-07-09 12:45:22 +0000 (Sat, 09 Jul 2011) Log Message: ----------- libxslt/trunk: clean up build deps, add gcrypt-dev Modified Paths: -------------- csw/mgar/pkg/libxslt/trunk/Makefile Modified: csw/mgar/pkg/libxslt/trunk/Makefile =================================================================== --- csw/mgar/pkg/libxslt/trunk/Makefile 2011-07-09 12:35:02 UTC (rev 15023) +++ csw/mgar/pkg/libxslt/trunk/Makefile 2011-07-09 12:45:22 UTC (rev 15024) @@ -12,7 +12,7 @@ DISTFILES = $(NAME)-$(VERSION).tar.gz PATCHFILES += 0001-Forcefully-disable-version-script-use.patch -BUILD_DEP_PKGS = CSWlibxml2-2 CSWlibxml2-dev +BUILD_DEP_PKGS = CSWlibxml2-dev CSWlibgcrypt-dev PACKAGES = CSWlibxslt SPKG_DESC_CSWlibxslt = XSLT engine runtime package 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 Jul 9 15:06:34 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Sat, 09 Jul 2011 13:06:34 +0000 Subject: [csw-devel] SF.net SVN: gar:[15025] csw/mgar/pkg/libxslt/trunk/Makefile Message-ID: Revision: 15025 http://gar.svn.sourceforge.net/gar/?rev=15025&view=rev Author: bdwalton Date: 2011-07-09 13:06:34 +0000 (Sat, 09 Jul 2011) Log Message: ----------- libxslt/trunk: update gpg err and gcrypt deps for newly split packages, correct typo when setting zlib dep in top level package Modified Paths: -------------- csw/mgar/pkg/libxslt/trunk/Makefile Modified: csw/mgar/pkg/libxslt/trunk/Makefile =================================================================== --- csw/mgar/pkg/libxslt/trunk/Makefile 2011-07-09 12:45:22 UTC (rev 15024) +++ csw/mgar/pkg/libxslt/trunk/Makefile 2011-07-09 13:06:34 UTC (rev 15025) @@ -17,8 +17,9 @@ PACKAGES = CSWlibxslt SPKG_DESC_CSWlibxslt = XSLT engine runtime package CATALOGNAME_CSWlibxslt = libxslt -RUNTIME_DEP_PKGS_CSWlibxslt += CSWgcrypt CSWgpgerr CSWiconv CSWlibxml2-2 -RUNTIME_DEP_PKGS_CSWlibxstl += CSWzlib +RUNTIME_DEP_PKGS_CSWlibxslt += CSWlibgcrypt11 CSWlibgpg-error0 +RUNTIME_DEP_PKGS_CSWlibxslt += CSWiconv CSWlibxml2-2 +RUNTIME_DEP_PKGS_CSWlibxslt += CSWzlib RUNTIME_DEP_PKGS_CSWlibxslt += CSWlibxslt1 CSWlibexslt0 PACKAGES += CSWlibxslt-dev @@ -42,8 +43,8 @@ RUNTIME_DEP_PKGS_CSWpy-libxslt += CSWlibexslt0 RUNTIME_DEP_PKGS_CSWpy-libxslt += CSWlibxml2-2 RUNTIME_DEP_PKGS_CSWpy-libxslt += CSWzlib -RUNTIME_DEP_PKGS_CSWpy-libxslt += CSWgpgerr -RUNTIME_DEP_PKGS_CSWpy-libxslt += CSWgcrypt +RUNTIME_DEP_PKGS_CSWpy-libxslt += CSWlibgpg-error0 +RUNTIME_DEP_PKGS_CSWpy-libxslt += CSWlibgcrypt11 RUNTIME_DEP_PKGS_CSWpy-libxslt += CSWiconv PKGFILES_CSWpy-libxslt = $(libdir)/python.* PKGFILES_CSWpy-libxslt += $(docdir)/libxslt-python-$(VERSION)/.* @@ -54,11 +55,11 @@ PKGFILES_CSWlibexslt0 += $(call baseisadirs,$(libdir),libexslt\.so\.0(\.\d+)*) SPKG_DESC_CSWlibexslt0 += XSLT engine runtime package, libexslt.so.0 RUNTIME_DEP_PKGS_CSWlibexslt0 += CSWiconv -RUNTIME_DEP_PKGS_CSWlibexslt0 += CSWgpgerr +RUNTIME_DEP_PKGS_CSWlibexslt0 += CSWlibgpg-error0 RUNTIME_DEP_PKGS_CSWlibexslt0 += CSWzlib RUNTIME_DEP_PKGS_CSWlibexslt0 += CSWlibxml2-2 RUNTIME_DEP_PKGS_CSWlibexslt0 += CSWlibxslt1 -RUNTIME_DEP_PKGS_CSWlibexslt0 += CSWgcrypt +RUNTIME_DEP_PKGS_CSWlibexslt0 += CSWlibgcrypt11 PACKAGES += CSWlibxslt1 CATALOGNAME_CSWlibxslt1 = libxslt1 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 Jul 9 16:06:44 2011 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Sat, 09 Jul 2011 14:06:44 +0000 Subject: [csw-devel] SF.net SVN: gar:[15026] csw/mgar/pkg/libdatrie/trunk Message-ID: Revision: 15026 http://gar.svn.sourceforge.net/gar/?rev=15026&view=rev Author: dmichelsen Date: 2011-07-09 14:06:44 +0000 (Sat, 09 Jul 2011) Log Message: ----------- libdatrie: Update to 0.2.4, package split Modified Paths: -------------- csw/mgar/pkg/libdatrie/trunk/Makefile csw/mgar/pkg/libdatrie/trunk/checksums Added Paths: ----------- csw/mgar/pkg/libdatrie/trunk/files/0001-Remove-unnecessary-inclusing-of-stdint.h.patch Modified: csw/mgar/pkg/libdatrie/trunk/Makefile =================================================================== --- csw/mgar/pkg/libdatrie/trunk/Makefile 2011-07-09 13:06:34 UTC (rev 15025) +++ csw/mgar/pkg/libdatrie/trunk/Makefile 2011-07-09 14:06:44 UTC (rev 15026) @@ -1,5 +1,5 @@ NAME = libdatrie -VERSION = 0.2.2 +VERSION = 0.2.4 CATEGORIES = lib DESCRIPTION = Double array tree library @@ -7,19 +7,35 @@ endef MASTER_SITES = ftp://linux.thai.net/pub/ThaiLinux/software/libthai/ -DISTFILES = $(NAME)-$(VERSION).tar.gz +DISTFILES += $(DISTNAME).tar.gz +PATCHFILES += 0001-Remove-unnecessary-inclusing-of-stdint.h.patch -# We define upstream file regex so we can be notifed of new upstream software release -UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz +VENDOR_URL = http://linux.thai.net/~thep/datrie/datrie.html -SPKG_SOURCEURL = http://linux.thai.net/~thep/datrie/datrie.html +PACKAGES += CSWlibdatrie1 +SPKG_DESC_CSWlibdatrie1 = Double array tree library, libdatrie.so.1 +PKGFILES_CSWlibdatrie1 += $(call pkgfiles_lib,libdatrie.so.1) +OBSOLETED_BY_CSWlibdatrie1 += CSWlibdatrie -RUNTIME_DEP_PKGS = CSWiconv +PACKAGES += CSWlibdatrie-dev +SPKG_DESC_CSWlibdatrie-dev = Development files for libdatrie.so.1 +PKGFILES_CSWlibdatrie-dev += $(PKGFILES_DEVEL) +PKGFILES_CSWlibdatrie-dev += $(docdir)/libdatrie-dev/.* +RUNTIME_DEP_PKGS_CSWlibdatrie-dev += CSWlibdatrie1 -EXTRA_LINKER_FLAGS = -liconv +PACKAGES += CSWlibdatrie-utils +SPKG_DESC_CSWlibdatrie-utils = Utility programs using libdatrie +# PKGFILES is catchall +RUNTIME_DEP_PKGS_CSWlibdatrie-utils += CSWlibdatrie1 +RUNTIME_DEP_PKGS_CSWlibdatrie-utils += CSWiconv + BUILD64 = 1 -CONFIGURE_ARGS = $(DIRPATHS) -TEST_TARGET = check +CONFIGURE_ARGS += $(DIRPATHS) +CONFIGURE_ARGS += --with-html-docdir=$(docdir)/libdatrie-dev/html +# This is not properly detected +BUILD_OVERRIDE_VARS = ICONV_LIBS +BUILD_OVERRIDE_VAR_ICONV_LIBS = -liconv + include gar/category.mk Modified: csw/mgar/pkg/libdatrie/trunk/checksums =================================================================== --- csw/mgar/pkg/libdatrie/trunk/checksums 2011-07-09 13:06:34 UTC (rev 15025) +++ csw/mgar/pkg/libdatrie/trunk/checksums 2011-07-09 14:06:44 UTC (rev 15026) @@ -1 +1 @@ -d1c93faf0c0d63e620c525c561940fdd libdatrie-0.2.2.tar.gz +7f7d592114f98db9e4c7171c3f2befc5 libdatrie-0.2.4.tar.gz Added: csw/mgar/pkg/libdatrie/trunk/files/0001-Remove-unnecessary-inclusing-of-stdint.h.patch =================================================================== --- csw/mgar/pkg/libdatrie/trunk/files/0001-Remove-unnecessary-inclusing-of-stdint.h.patch (rev 0) +++ csw/mgar/pkg/libdatrie/trunk/files/0001-Remove-unnecessary-inclusing-of-stdint.h.patch 2011-07-09 14:06:44 UTC (rev 15026) @@ -0,0 +1,37 @@ +From 978cdfe1134e27b35897951bd44957a76573e45e Mon Sep 17 00:00:00 2001 +From: Dagobert Michelsen +Date: Sat, 9 Jul 2011 15:27:27 +0200 +Subject: [PATCH] Remove unnecessary inclusing of stdint.h + +--- + datrie/darray.c | 1 - + datrie/tail.c | 1 - + 2 files changed, 0 insertions(+), 2 deletions(-) + +diff --git a/datrie/darray.c b/datrie/darray.c +index 234e904..02471e2 100644 +--- a/datrie/darray.c ++++ b/datrie/darray.c +@@ -26,7 +26,6 @@ + + #include + #include +-#include + #include + + #include "trie-private.h" +diff --git a/datrie/tail.c b/datrie/tail.c +index 4e31d9f..d835c57 100644 +--- a/datrie/tail.c ++++ b/datrie/tail.c +@@ -26,7 +26,6 @@ + + #include + #include +-#include + #include + + #include "tail.h" +-- +1.7.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 Jul 9 17:01:49 2011 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Sat, 09 Jul 2011 15:01:49 +0000 Subject: [csw-devel] SF.net SVN: gar:[15027] csw/mgar/pkg/fbopenssl/trunk/Makefile Message-ID: Revision: 15027 http://gar.svn.sourceforge.net/gar/?rev=15027&view=rev Author: dmichelsen Date: 2011-07-09 15:01:49 +0000 (Sat, 09 Jul 2011) Log Message: ----------- libfbopenssl: Introduce SONAME, update to latest standards Modified Paths: -------------- csw/mgar/pkg/fbopenssl/trunk/Makefile Modified: csw/mgar/pkg/fbopenssl/trunk/Makefile =================================================================== --- csw/mgar/pkg/fbopenssl/trunk/Makefile 2011-07-09 14:06:44 UTC (rev 15026) +++ csw/mgar/pkg/fbopenssl/trunk/Makefile 2011-07-09 15:01:49 UTC (rev 15027) @@ -11,29 +11,40 @@ SF_PROJ = modgssapache MASTER_SITES = $(SF_MIRRORS) +DISTNAME = $(NAME) DISTFILES = $(NAME)-$(VERSION).tar.gz DISTFILES += COPYING -# We define upstream file regex so we can be notifed of new upstream software release -UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz +VENDOR_URL = http://sourceforge.net/projects/modgssapache -SPKG_SOURCEURL = http://sourceforge.net/projects/modgssapache - BUILD_DEP_PKGS = CSWossldevel RUNTIME_DEP_PKGS = CSWosslrt -PACKAGES = CSWlibfbopenssl -CATALOGNAME = libfbopenssl +PACKAGES += CSWlibfbopenssl0 +SPKG_DESC_CSWlibfbopenssl0 = Extensions to OpenSSL including support for GSS-API and SPNEGO, libfbopenssl.so.0 +PKGFILES_CSWlibfbopenssl0 += $(call pkgfiles_lib,libfbopenssl.so.0) +OBSOLETED_BY_CSWlibfbopenssl0 += CSWlibfbopenssl +PACKAGES += CSWlibfbopenssl-dev +SPKG_DESC_CSWlibfbopenssl-dev = Development files for libfbopenssl.so.0 +# PKGFILES is catchall +# These are no header files in there, is this correct? +RUNTIME_DEP_PKGS_CSWlibfbopenssl-dev += CSWlibfbopenssl0 + BUILD64 = 1 -WORKSRC = $(WORKDIR)/$(NAME) + CONFIGURE_SCRIPTS = BUILD_SCRIPTS = custom TEST_SCRIPTS = custom INSTALL_SCRIPTS = custom EXTRA_CFLAGS = -Kpic -FILES=src/asn1/asn1help src/file/filehelp src/gssapi/gssapi src/krb5/krb5help src/spnego/spnego src/spnego/spnegohelp +FILES += src/asn1/asn1help +FILES += src/file/filehelp +FILES += src/gssapi/gssapi +FILES += src/krb5/krb5help +FILES += src/spnego/spnego +FILES += src/spnego/spnegohelp .c.o: $(CC) -c $(CFLAGS) $(CPPFLAGS) -o $@ $< @@ -44,7 +55,9 @@ # just compiling the needed stuff here. Please take care on version bumps! build-custom: $(foreach F,$(FILES),$(WORKSRC)/$F.o) - cd $(WORKSRC) && $(BUILD_ENV) $(CC) $(LDFLAGS) $(foreach F,$(FILES),$F.o) -lcrypto -G -o libfbopenssl.so + cd $(WORKSRC) && $(BUILD_ENV) $(CC) $(LDFLAGS) $(foreach F,$(FILES),$F.o) -lcrypto -G -h libfbopenssl.so.0 -o libfbopenssl.so.$(VERSION) + gln -s libfbopenssl.so.$(VERSION) $(WORKSRC)/libfbopenssl.so.0 + gln -s libfbopenssl.so.0 $(WORKSRC)/libfbopenssl.so @$(MAKECOOKIE) test-custom: @@ -60,6 +73,9 @@ install-custom: ginstall -d $(DESTDIR)$(libdir) - ginstall $(WORKSRC)/libfbopenssl.so $(DESTDIR)$(libdir) + ginstall $(WORKSRC)/libfbopenssl.so.$(VERSION) $(DESTDIR)$(libdir) + gln -s libfbopenssl.so.$(VERSION) $(DESTDIR)$(libdir)/libfbopenssl.so.0 + gln -s libfbopenssl.so.0 $(DESTDIR)$(libdir)/libfbopenssl.so ginstall -d $(DESTDIR)$(docdir)/$(CATALOGNAME) ginstall $(WORKSRC)/readme.txt $(DESTDIR)$(docdir)/$(CATALOGNAME)/ + @$(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 Sat Jul 9 18:25:10 2011 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Sat, 09 Jul 2011 16:25:10 +0000 Subject: [csw-devel] SF.net SVN: gar:[15028] csw/mgar/pkg Message-ID: Revision: 15028 http://gar.svn.sourceforge.net/gar/?rev=15028&view=rev Author: dmichelsen Date: 2011-07-09 16:25:10 +0000 (Sat, 09 Jul 2011) Log Message: ----------- rtmpdump: Initial commit Added Paths: ----------- csw/mgar/pkg/rtmpdump/ csw/mgar/pkg/rtmpdump/Makefile csw/mgar/pkg/rtmpdump/branches/ csw/mgar/pkg/rtmpdump/tags/ csw/mgar/pkg/rtmpdump/trunk/ csw/mgar/pkg/rtmpdump/trunk/Makefile csw/mgar/pkg/rtmpdump/trunk/checksums csw/mgar/pkg/rtmpdump/trunk/files/ csw/mgar/pkg/rtmpdump/trunk/files/0001-Use-inttypes.h-on-Solaris.patch csw/mgar/pkg/rtmpdump/trunk/files/0002-Use-Solaris-ld-syntax-for-shared-libs.patch Copied: csw/mgar/pkg/rtmpdump/Makefile (from rev 14858, csw/mgar/pkg/template/Makefile) =================================================================== --- csw/mgar/pkg/rtmpdump/Makefile (rev 0) +++ csw/mgar/pkg/rtmpdump/Makefile 2011-07-09 16:25:10 UTC (rev 15028) @@ -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/rtmpdump/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/rtmpdump/trunk/Makefile =================================================================== --- csw/mgar/pkg/rtmpdump/trunk/Makefile (rev 0) +++ csw/mgar/pkg/rtmpdump/trunk/Makefile 2011-07-09 16:25:10 UTC (rev 15028) @@ -0,0 +1,70 @@ +# $Id$ +# TODO (release-critical prefixed with !, non release-critical with *) +# +NAME = rtmpdump +VERSION = 2.3 +GARTYPE = v2 +CATEGORIES = lib + +DESCRIPTION = A toolkit for RTMP streams +define BLURB +endef + +MASTER_SITES = http://rtmpdump.mplayerhq.hu/download/ +DISTFILES = $(DISTNAME).tgz + +PATCHFILES += 0001-Use-inttypes.h-on-Solaris.patch +PATCHFILES += 0002-Use-Solaris-ld-syntax-for-shared-libs.patch + +VENDOR_URL = http://rtmpdump.mplayerhq.hu/ + +PACKAGES += CSWlibrtmp0 +SPKG_DESC_CSWlibrtmp0 = A toolkit for RTMP streams, librtmp.so.0 +PKGFILES_CSWlibrtmp0 += $(call pkgfiles_lib,librtmp.so.0) +RUNTIME_DEP_PKGS_CSWlibrtmp0 += CSWosslrt +RUNTIME_DEP_PKGS_CSWlibrtmp0 += CSWzlib + +PACKAGES += CSWlibrtmp-dev +SPKG_DESC_CSWlibrtmp-dev = Development files for librtmp.so.0 +PKGFILES_CSWlibrtmp-dev += $(PKGFILES_DEVEL) +RUNTIME_DEP_PKGS_CSWlibrtmp-dev += CSWlibrtmp0 + +PACKAGES += CSWrtmpdump +SPKG_DESC_CSWrtmpdump = A toolkit for RTMP streams +# PKGFILES is catchall +RUNTIME_DEP_PKGS_CSWrtmpdump += CSWlibgnugetopt0 +RUNTIME_DEP_PKGS_CSWrtmpdump += CSWosslrt +RUNTIME_DEP_PKGS_CSWrtmpdump += CSWzlib + +BUILD64 = 1 + +EXTRA_CFLAGS += -features=extensions -D__FUNCTION__=__func__ +EXTRA_CFLAGS += -DINADDR_NONE=0xffffffffU + +BYTE_ORDER_sparc = __BIG_ENDIAN +BYTE_ORDER_i386 = __LITTLE_ENDIAN +EXTRA_CFLAGS += -DBYTE_ORDER=$(BYTE_ORDER_$(GARCH)) + +# Otherwise "R_SPARC_H44: relocations based on the ABS44 coding model can not be used in building a shared object" +EXTRA_CFLAGS += -KPIC + +# The build system is pretty spartanic +CONFIGURE_SCRIPTS = +TEST_SCRIPTS = + +BUILD_OVERRIDE_VARS = CC LD CFLAGS LDFLAGS LIBS_posix XLIBS +BUILD_OVERRIDE_VAR_CC = $(CC) +BUILD_OVERRIDE_VAR_LD = $(CC) +BUILD_OVERRIDE_VAR_CFLAGS = $(CFLAGS) -DRTMPDUMP_VERSION=\\\"v$(VERSION)\\\" -DUSE_OPENSSL +BUILD_OVERRIDE_VAR_LDFLAGS = $(LDFLAGS) +BUILD_OVERRIDE_VAR_LIBS_posix = -lsocket -lnsl +BUILD_OVERRIDE_VAR_XLIBS = -lgnugetopt + +INSTALL_OVERRIDE_VARS = prefix bindir sbindir libdir mandir +INSTALL_OVERRIDE_VAR_prefix = $(prefix) +INSTALL_OVERRIDE_VAR_bindir = $(bindir) +INSTALL_OVERRIDE_VAR_sbindir = $(sbindir) +INSTALL_OVERRIDE_VAR_libdir = $(libdir) +INSTALL_OVERRIDE_VAR_mandir = $(mandir) + +include gar/category.mk Property changes on: csw/mgar/pkg/rtmpdump/trunk/Makefile ___________________________________________________________________ Added: svn:keywords + Id Added: csw/mgar/pkg/rtmpdump/trunk/checksums =================================================================== --- csw/mgar/pkg/rtmpdump/trunk/checksums (rev 0) +++ csw/mgar/pkg/rtmpdump/trunk/checksums 2011-07-09 16:25:10 UTC (rev 15028) @@ -0,0 +1 @@ +eb961f31cd55f0acf5aad1a7b900ef59 rtmpdump-2.3.tgz Added: csw/mgar/pkg/rtmpdump/trunk/files/0001-Use-inttypes.h-on-Solaris.patch =================================================================== --- csw/mgar/pkg/rtmpdump/trunk/files/0001-Use-inttypes.h-on-Solaris.patch (rev 0) +++ csw/mgar/pkg/rtmpdump/trunk/files/0001-Use-inttypes.h-on-Solaris.patch 2011-07-09 16:25:10 UTC (rev 15028) @@ -0,0 +1,119 @@ +From f64709c93b38180fbd6cdd8c403dac15cbc7d0ef Mon Sep 17 00:00:00 2001 +From: Dagobert Michelsen +Date: Sat, 9 Jul 2011 17:16:11 +0200 +Subject: [PATCH] Use inttypes.h on Solaris + +--- + librtmp/amf.h | 4 ++++ + librtmp/bytes.h | 5 +++++ + librtmp/dh.h | 5 +++++ + librtmp/log.h | 5 +++++ + librtmp/rtmp.c | 5 +++++ + librtmp/rtmp.h | 6 ++++++ + 6 files changed, 30 insertions(+), 0 deletions(-) + +diff --git a/librtmp/amf.h b/librtmp/amf.h +index b945beb..42035f9 100644 +--- a/librtmp/amf.h ++++ b/librtmp/amf.h +@@ -25,7 +25,11 @@ + * http://www.gnu.org/copyleft/lgpl.html + */ + ++#if defined(__sun) ++#include ++#else + #include ++#endif + + #ifndef TRUE + #define TRUE 1 +diff --git a/librtmp/bytes.h b/librtmp/bytes.h +index 8c6e80d..f7ceb1e 100644 +--- a/librtmp/bytes.h ++++ b/librtmp/bytes.h +@@ -26,7 +26,12 @@ + #ifndef __BYTES_H__ + #define __BYTES_H__ + ++#if defined(__sun) ++#include ++#else + #include ++#endif ++ + + #ifdef _WIN32 + /* Windows is little endian only */ +diff --git a/librtmp/dh.h b/librtmp/dh.h +index 8e285a6..30e46cc 100644 +--- a/librtmp/dh.h ++++ b/librtmp/dh.h +@@ -21,7 +21,12 @@ + * http://www.gnu.org/copyleft/lgpl.html + */ + ++#if defined(__sun) ++#include ++#else + #include ++#endif ++ + #include + #include + #include +diff --git a/librtmp/log.h b/librtmp/log.h +index 97c9aac..fbc5b28 100644 +--- a/librtmp/log.h ++++ b/librtmp/log.h +@@ -26,7 +26,12 @@ + + #include + #include ++ ++#if defined(__sun) ++#include ++#else + #include ++#endif + + #ifdef __cplusplus + extern "C" { +diff --git a/librtmp/rtmp.c b/librtmp/rtmp.c +index f152648..5461bb6 100644 +--- a/librtmp/rtmp.c ++++ b/librtmp/rtmp.c +@@ -23,7 +23,12 @@ + * http://www.gnu.org/copyleft/lgpl.html + */ + ++#if defined(__sun) ++#include ++#else + #include ++#endif ++ + #include + #include + #include +diff --git a/librtmp/rtmp.h b/librtmp/rtmp.h +index de0b795..5942906 100644 +--- a/librtmp/rtmp.h ++++ b/librtmp/rtmp.h +@@ -30,7 +30,13 @@ + #endif + + #include ++ ++#if defined(__sun) ++#include ++#else + #include ++#endif ++ + #include + + #include "amf.h" +-- +1.7.6 + Added: csw/mgar/pkg/rtmpdump/trunk/files/0002-Use-Solaris-ld-syntax-for-shared-libs.patch =================================================================== --- csw/mgar/pkg/rtmpdump/trunk/files/0002-Use-Solaris-ld-syntax-for-shared-libs.patch (rev 0) +++ csw/mgar/pkg/rtmpdump/trunk/files/0002-Use-Solaris-ld-syntax-for-shared-libs.patch 2011-07-09 16:25:10 UTC (rev 15028) @@ -0,0 +1,25 @@ +From 911084d67928fb1799573155b9c3409736f38cf7 Mon Sep 17 00:00:00 2001 +From: Dagobert Michelsen +Date: Sat, 9 Jul 2011 17:39:36 +0200 +Subject: [PATCH] Use Solaris ld syntax for shared libs + +--- + librtmp/Makefile | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/librtmp/Makefile b/librtmp/Makefile +index 6774db7..4ee84e0 100644 +--- a/librtmp/Makefile ++++ b/librtmp/Makefile +@@ -61,7 +61,7 @@ librtmp.a: $(OBJS) + $(AR) rs $@ $? + + librtmp.$(SO_EXT): $(OBJS) +- $(CC) -shared -Wl,-soname,$@ $(LDFLAGS) -o $@ $^ $> $(CRYPTO_LIB) ++ $(CC) -G -h $@ $(LDFLAGS) -o $@ $^ $> $(CRYPTO_LIB) + ln -sf $@ librtmp.so + + log.o: log.c log.h Makefile +-- +1.7.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 Sun Jul 10 11:51:57 2011 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Sun, 10 Jul 2011 09:51:57 +0000 Subject: [csw-devel] SF.net SVN: gar:[15029] csw/mgar/pkg/libevent/branches/libevent-2.0.x Message-ID: Revision: 15029 http://gar.svn.sourceforge.net/gar/?rev=15029&view=rev Author: dmichelsen Date: 2011-07-10 09:51:57 +0000 (Sun, 10 Jul 2011) Log Message: ----------- libevent2: Update to 2.0.12 Modified Paths: -------------- csw/mgar/pkg/libevent/branches/libevent-2.0.x/Makefile csw/mgar/pkg/libevent/branches/libevent-2.0.x/checksums Added Paths: ----------- csw/mgar/pkg/libevent/branches/libevent-2.0.x/files/0001-Fix-wrong-check-of-sockaddr.patch Removed Paths: ------------- csw/mgar/pkg/libevent/branches/libevent-2.0.x/files/0001-Detect-broken-unsetenv-at-unit-test-runtime.patch csw/mgar/pkg/libevent/branches/libevent-2.0.x/files/0001-Detect-setenv-unsetenv-skip-main-base_environ-test.patch csw/mgar/pkg/libevent/branches/libevent-2.0.x/files/0001-Fix-getaddrinfo-with-protocol-unset-on-Solaris-9.patch Modified: csw/mgar/pkg/libevent/branches/libevent-2.0.x/Makefile =================================================================== --- csw/mgar/pkg/libevent/branches/libevent-2.0.x/Makefile 2011-07-09 16:25:10 UTC (rev 15028) +++ csw/mgar/pkg/libevent/branches/libevent-2.0.x/Makefile 2011-07-10 09:51:57 UTC (rev 15029) @@ -1,5 +1,5 @@ NAME = libevent -VERSION = 2.0.10 +VERSION = 2.0.12 CATEGORIES = lib DESCRIPTION = Event notification library @@ -14,41 +14,36 @@ DISTNAME = $(NAME)-$(VERSION)-stable DISTFILES += $(DISTNAME).tar.gz -# We define upstream file regex so we can be notifed of new upstream software release -UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*)-stable.tar.gz +# Use this patch until bug is fixed: +# http://sourceforge.net/tracker/?func=detail&aid=3361614&group_id=50884&atid=461322 +PATCHFILES += 0001-Fix-wrong-check-of-sockaddr.patch +VENDOR_URL = http://www.monkey.org/~provos/libevent/ +LICENSE = LICENSE + +BUILD_DEP_PKGS += CSWossldevel + PACKAGES += CSWlibevent2-0-5 -CATALOGNAME_CSWlibevent2-0-5 = libevent2_0_5 SPKG_DESC_CSWlibevent2-0-5 = Event notification library 2.0, libevent*-2.0.so.5 +PKGFILES_CSWlibevent2-0-5 = $(PKGFILES_RT) RUNTIME_DEP_PKGS_CSWlibevent2-0-5 += CSWosslrt +PACKAGES += CSWlibevent-dev +SPKG_DESC_CSWlibevent-dev = Development files for libevent*-2.0.so.5 +RUNTIME_DEP_PKGS_CSWlibevent-dev += CSWlibevent2-0-5 +RUNTIME_DEP_PKGS_CSWlibevent-dev += CSWpython +OBSOLETED_BY_CSWlibevent-dev += CSWlibevent-devel -PACKAGES += CSWlibevent-devel -CATALOGNAME_CSWlibevent-devel = libevent_devel -SPKG_DESC_CSWlibevent-devel = Development files for libevent 2.0 -RUNTIME_DEP_PKGS_CSWlibevent-devel += CSWlibevent2-0-5 -RUNTIME_DEP_PKGS_CSWlibevent-devel += CSWpython - -VENDOR_URL = http://www.monkey.org/~provos/libevent/ -LICENSE = LICENSE - # We don't need it and if defined the test breaks NOISALIST = 1 LD_OPTIONS = EXTRA_LINKER_FLAGS = $(RUNPATH_LINKER_FLAGS) BUILD64 = 1 -NOISAEXEC = 1 -CONFIGURE_ARGS = $(DIRPATHS) TEST_TARGET = verify -PKGFILES_CSWlibevent2-0-5 = $(PKGFILES_RT) - -# These will go away after package release as the files have been moved from CSWlibevent to *-devel -CHECKPKG_OVERRIDES_CSWlibevent-devel += file-collision - -# The package name guessing has a bug, overwrite for now. +# This is a unified package with all libraries in there CHECKPKG_OVERRIDES_CSWlibevent2-0-5 += shared-lib-pkgname-mismatch include gar/category.mk Modified: csw/mgar/pkg/libevent/branches/libevent-2.0.x/checksums =================================================================== --- csw/mgar/pkg/libevent/branches/libevent-2.0.x/checksums 2011-07-09 16:25:10 UTC (rev 15028) +++ csw/mgar/pkg/libevent/branches/libevent-2.0.x/checksums 2011-07-10 09:51:57 UTC (rev 15029) @@ -1 +1 @@ -a37401d26cbbf28185211d582741a3d4 libevent-2.0.10-stable.tar.gz +42986228baf95e325778ed328a93e070 libevent-2.0.12-stable.tar.gz Deleted: csw/mgar/pkg/libevent/branches/libevent-2.0.x/files/0001-Detect-broken-unsetenv-at-unit-test-runtime.patch =================================================================== --- csw/mgar/pkg/libevent/branches/libevent-2.0.x/files/0001-Detect-broken-unsetenv-at-unit-test-runtime.patch 2011-07-09 16:25:10 UTC (rev 15028) +++ csw/mgar/pkg/libevent/branches/libevent-2.0.x/files/0001-Detect-broken-unsetenv-at-unit-test-runtime.patch 2011-07-10 09:51:57 UTC (rev 15029) @@ -1,37 +0,0 @@ -From 3a003733e6c8081c07fec51a77f65d3d5d8a1094 Mon Sep 17 00:00:00 2001 -From: Nick Mathewson -Date: Wed, 21 Apr 2010 12:25:29 -0400 -Subject: [PATCH] Detect broken unsetenv at unit-test runtime - -If we have an unsetenv function that doesn't work, we can't run the -main/base_environ unit test, so we should skip it. ---- - test/regress.c | 12 ++++++++++++ - 1 files changed, 12 insertions(+), 0 deletions(-) - -diff --git a/test/regress.c b/test/regress.c -index 513c3c8..cda0892 100644 ---- a/test/regress.c -+++ b/test/regress.c -@@ -1830,6 +1830,18 @@ test_base_environ(void *arg) - int i, n_methods=0; - const char *defaultname; - -+ /* See if unsetenv works before we rely on it. */ -+ setenv("EVENT_NOWAFFLES", "1", 1); -+ unsetenv("EVENT_NOWAFFLES"); -+ if (getenv("EVENT_NOWAFFLES") != NULL) { -+#ifndef _EVENT_HAVE_UNSETENV -+ TT_DECLARE("NOTE", ("Can't fake unsetenv; skipping test")); -+#else -+ TT_DECLARE("NOTE", ("unsetenv doesn't work; skipping test")); -+#endif -+ tt_skip(); -+ } -+ - basenames = event_get_supported_methods(); - for (i = 0; basenames[i]; ++i) { - methodname_to_envvar(basenames[i], varbuf, sizeof(varbuf)); --- -1.6.6.1 - Deleted: csw/mgar/pkg/libevent/branches/libevent-2.0.x/files/0001-Detect-setenv-unsetenv-skip-main-base_environ-test.patch =================================================================== --- csw/mgar/pkg/libevent/branches/libevent-2.0.x/files/0001-Detect-setenv-unsetenv-skip-main-base_environ-test.patch 2011-07-09 16:25:10 UTC (rev 15028) +++ csw/mgar/pkg/libevent/branches/libevent-2.0.x/files/0001-Detect-setenv-unsetenv-skip-main-base_environ-test.patch 2011-07-10 09:51:57 UTC (rev 15029) @@ -1,120 +0,0 @@ -From b76470ed69b4b7875d5f764cc0f0d0577ef8b21f Mon Sep 17 00:00:00 2001 -From: Nick Mathewson -Date: Tue, 29 Dec 2009 16:38:03 -0500 -Subject: [PATCH] Detect setenv/unsetenv; skip main/base_environ test if we can't fake them. - -Previously, we assumed that we would have setenv/unsetenv everywhere -but WIN32, where we could fake them with putenv. This isn't so: some -other non-windows systems lack setenv/unsetenv, and some of them lack -putenv too. - -The first part of the solution, then, is to detect setenv/unsetenv/ -putenv from configure.in, and to fake setenv/unsetenv with putenv -whenever we have the latter but not one of the former. - -But what should we do when we don't even have putenv? We could do -elaborate tricks to manipulate the environ pointer, but since we're -only doing this for the unit tests, let's just skip the one test in -question that uses setenv/unsetenv. ---- - configure.in | 3 +-- - test/regress.c | 42 +++++++++++++++++++++++++++++------------- - 2 files changed, 30 insertions(+), 15 deletions(-) - -diff --git a/configure.in b/configure.in -index 67f0816..76bf85b 100644 ---- a/configure.in -+++ b/configure.in -@@ -180,8 +180,7 @@ AC_C_INLINE - AC_HEADER_TIME - - dnl Checks for library functions. --AC_CHECK_FUNCS(gettimeofday vasprintf fcntl clock_gettime strtok_r strsep getaddrinfo getnameinfo strlcpy inet_ntop inet_pton signal sigaction strtoll inet_aton pipe eventfd sendfile mmap splice arc4random issetugid geteuid getegid getservbyname getprotobynumber) -- -+AC_CHECK_FUNCS(gettimeofday vasprintf fcntl clock_gettime strtok_r strsep getaddrinfo getnameinfo strlcpy inet_ntop inet_pton signal sigaction strtoll inet_aton pipe eventfd sendfile mmap splice arc4random issetugid geteuid getegid getservbyname getprotobynumber setenv unsetenv putenv) - - # Check for gethostbyname_r in all its glorious incompatible versions. - # (This is cut-and-pasted from Tor, which based its logic on -diff --git a/test/regress.c b/test/regress.c -index 4e4e11b..f34890a 100644 ---- a/test/regress.c -+++ b/test/regress.c -@@ -1683,39 +1683,52 @@ end: - event_config_free(cfg); - } - --static void --methodname_to_envvar(const char *mname, char *buf, size_t buflen) --{ -- char *cp; -- evutil_snprintf(buf, buflen, "EVENT_NO%s", mname); -- for (cp = buf; *cp; ++cp) { -- *cp = toupper(*cp); -- } --} -- --#ifdef WIN32 -+#ifdef _EVENT_HAVE_SETENV -+#define SETENV_OK -+#elif !defined(_EVENT_HAVE_SETENV) && defined(_EVENT_HAVE_PUTENV) - static void setenv(const char *k, const char *v, int _o) - { - char b[256]; - evutil_snprintf(b, sizeof(b), "%s=%s",k,v); - putenv(b); - } -+#define SETENV_OK -+#endif -+ -+#ifdef _EVENT_HAVE_UNSETENV -+#define UNSETENV_OK -+#elif !defined(_EVENT_HAVE_UNSETENV) && defined(_EVENT_HAVE_PUTENV) - static void unsetenv(const char *k) - { - char b[256]; - evutil_snprintf(b, sizeof(b), "%s=",k); - putenv(b); - } -+#define UNSETENV_OK -+#endif -+ -+#if defined(SETENV_OK) && defined(UNSETENV_OK) -+static void -+methodname_to_envvar(const char *mname, char *buf, size_t buflen) -+{ -+ char *cp; -+ evutil_snprintf(buf, buflen, "EVENT_NO%s", mname); -+ for (cp = buf; *cp; ++cp) { -+ *cp = toupper(*cp); -+ } -+} - #endif - - static void - test_base_environ(void *arg) - { -+ struct event_base *base = NULL; -+ struct event_config *cfg = NULL; -+ -+#if defined(SETENV_OK) && defined(UNSETENV_OK) - const char **basenames; - char varbuf[128]; - int i, n_methods=0; -- struct event_base *base = NULL; -- struct event_config *cfg = NULL; - const char *defaultname; - - basenames = event_get_supported_methods(); -@@ -1757,6 +1770,9 @@ test_base_environ(void *arg) - base = event_base_new_with_config(cfg); - tt_assert(base); - tt_str_op(defaultname, ==, event_base_get_method(base)); -+#else -+ tt_skip(); -+#endif - - end: - if (base) --- -1.6.0.5 - Deleted: csw/mgar/pkg/libevent/branches/libevent-2.0.x/files/0001-Fix-getaddrinfo-with-protocol-unset-on-Solaris-9.patch =================================================================== --- csw/mgar/pkg/libevent/branches/libevent-2.0.x/files/0001-Fix-getaddrinfo-with-protocol-unset-on-Solaris-9.patch 2011-07-09 16:25:10 UTC (rev 15028) +++ csw/mgar/pkg/libevent/branches/libevent-2.0.x/files/0001-Fix-getaddrinfo-with-protocol-unset-on-Solaris-9.patch 2011-07-10 09:51:57 UTC (rev 15029) @@ -1,115 +0,0 @@ -From af71b4553549bced3cae1b51cc17c42ce8dc2bb0 Mon Sep 17 00:00:00 2001 -From: Nick Mathewson -Date: Wed, 21 Apr 2010 11:57:55 -0400 -Subject: [PATCH] Fix getaddrinfo with protocol unset on Solaris 9. Found by Dagobert Michelsen - -Apparently when you call Solaris 9's getaddrinfo() with socktype set, -but protocol unset, it likes to leave ai_protocol unset in the result. -This is no way to behave, if I'm reading RFC3493 right. - -This patch makes us check for a getaddrinfo() that's broken in this way, -and work around it by trying to infer socktype and protocol from one -another. - -Possible partial bugfix for 2987542 ---- - evutil.c | 46 ++++++++++++++++++++++++++++++++++++---------- - 1 files changed, 36 insertions(+), 10 deletions(-) - -diff --git a/evutil.c b/evutil.c -index 2509f17..9d36941 100644 ---- a/evutil.c -+++ b/evutil.c -@@ -959,6 +959,10 @@ evutil_adjust_hints_for_addrconfig(struct evutil_addrinfo *hints) - } - - #ifdef USE_NATIVE_GETADDRINFO -+static int need_numeric_port_hack_=0; -+static int need_socktype_protocol_hack_=0; -+static int tested_for_getaddrinfo_hacks=0; -+ - /* Some older BSDs (like OpenBSD up to 4.6) used to believe that - giving a numeric port without giving an ai_socktype was verboten. - We test for this so we can apply an appropriate workaround. If it -@@ -973,17 +977,17 @@ evutil_adjust_hints_for_addrconfig(struct evutil_addrinfo *hints) - - We test for this bug at runtime, since otherwise we can't have the - same binary run on multiple BSD versions. -+ -+ - Some versions of Solaris believe that if the protocol field isn't -+ specified, it's nice to leave it as 0. We test for this so we can apply an -+ appropriate workaround. - */ --static int --need_numeric_port_hack(void) -+static void -+test_for_getaddrinfo_hacks(void) - { -- static int tested=0; -- static int need_hack=0; - int r, r2; - struct evutil_addrinfo *ai=NULL, *ai2=NULL; - struct evutil_addrinfo hints; -- if (tested) -- return need_hack; - - memset(&hints,0,sizeof(hints)); - hints.ai_family = PF_UNSPEC; -@@ -999,21 +1003,40 @@ need_numeric_port_hack(void) - hints.ai_socktype = SOCK_STREAM; - r2 = getaddrinfo("1.2.3.4", "80", &hints, &ai2); - if (r2 == 0 && r != 0) { -- need_hack=1; -+ need_numeric_port_hack_=1; -+ } -+ if (ai2 && ai2->ai_protocol == 0) { -+ need_socktype_protocol_hack_=1; - } -+ - if (ai) - freeaddrinfo(ai); - if (ai2) - freeaddrinfo(ai2); -- tested = 1; -- return need_hack; -+ tested_for_getaddrinfo_hacks=1; -+} -+ -+static inline int -+need_numeric_port_hack(void) -+{ -+ if (!tested_for_getaddrinfo_hacks) -+ test_for_getaddrinfo_hacks(); -+ return need_numeric_port_hack_; -+} -+ -+static inline int -+need_socktype_protocol_hack(void) -+{ -+ if (!tested_for_getaddrinfo_hacks) -+ test_for_getaddrinfo_hacks(); -+ return need_socktype_protocol_hack_; - } - - static void - apply_numeric_port_hack(int port, struct evutil_addrinfo **ai) - { - /* Now we run through the list and set the ports on all of the -- * results where ports */ -+ * results where ports would make sense. */ - for ( ; *ai; ai = &(*ai)->ai_next) { - struct sockaddr *sa = (*ai)->ai_addr; - if (sa && sa->sa_family == AF_INET) { -@@ -1100,6 +1123,9 @@ evutil_getaddrinfo(const char *nodename, const char *servname, - servname = NULL; - } - -+ if (need_socktype_protocol_hack()) -+ evutil_getaddrinfo_infer_protocols(&hints); -+ - /* Make sure that we didn't actually steal any AI_FLAGS values that - * the system is using. (This is a constant expression, and should ge - * optimized out.) --- -1.6.6.1 - Added: csw/mgar/pkg/libevent/branches/libevent-2.0.x/files/0001-Fix-wrong-check-of-sockaddr.patch =================================================================== --- csw/mgar/pkg/libevent/branches/libevent-2.0.x/files/0001-Fix-wrong-check-of-sockaddr.patch (rev 0) +++ csw/mgar/pkg/libevent/branches/libevent-2.0.x/files/0001-Fix-wrong-check-of-sockaddr.patch 2011-07-10 09:51:57 UTC (rev 15029) @@ -0,0 +1,25 @@ +From 866fdd0d769e1a6c2187b9bdc94c475e8094b42c Mon Sep 17 00:00:00 2001 +From: Dagobert Michelsen +Date: Sun, 10 Jul 2011 10:40:38 +0200 +Subject: [PATCH] Fix wrong check of sockaddr + +--- + util-internal.h | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/util-internal.h b/util-internal.h +index fe9ff35..eb22946 100644 +--- a/util-internal.h ++++ b/util-internal.h +@@ -207,7 +207,7 @@ long _evutil_weakrand(void); + #define EVUTIL_FAILURE_CHECK(cond) EVUTIL_UNLIKELY(cond) + #endif + +-#ifndef _EVENT_HAVE_STRUCT_SOCKADDR_STORAGE ++#if 0 + /* Replacement for sockaddr storage that we can use internally on platforms + * that lack it. It is not space-efficient, but neither is sockaddr_storage. + */ +-- +1.7.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 Sun Jul 10 11:52:29 2011 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Sun, 10 Jul 2011 09:52:29 +0000 Subject: [csw-devel] SF.net SVN: gar:[15030] csw/mgar/pkg/tmux/trunk Message-ID: Revision: 15030 http://gar.svn.sourceforge.net/gar/?rev=15030&view=rev Author: dmichelsen Date: 2011-07-10 09:52:29 +0000 (Sun, 10 Jul 2011) Log Message: ----------- tmux: Update to 1.5 and cleanup Modified Paths: -------------- csw/mgar/pkg/tmux/trunk/Makefile csw/mgar/pkg/tmux/trunk/checksums Modified: csw/mgar/pkg/tmux/trunk/Makefile =================================================================== --- csw/mgar/pkg/tmux/trunk/Makefile 2011-07-10 09:51:57 UTC (rev 15029) +++ csw/mgar/pkg/tmux/trunk/Makefile 2011-07-10 09:52:29 UTC (rev 15030) @@ -1,31 +1,23 @@ NAME = tmux -VERSION = 1.4 +VERSION = 1.5 CATEGORIES = apps DESCRIPTION = Terminal Multiplexer MASTER_SITES = $(SF_MIRRORS) -DISTFILES = $(NAME)-$(VERSION).tar.gz +DISTFILES = $(DISTNAME).tar.gz -# Use patch unless this is fixed: -# https://sourceforge.net/tracker/?func=detail&aid=3152389&group_id=200378&atid=973264 -PATCHFILES = 0001-Use-inttypes.h-if-stdint.h-is-not-available.patch - RUNTIME_DEP_PKGS = CSWlibevent2-0-5 BUILD_DEP_PKGS = CSWlibevent-devel LICENSE = NOTES VENDOR_URL = http://tmux.sourceforge.net -CONFIGURE_ARGS = +EXTRA_CPPFLAGS += -I/opt/csw/include/ncursesw +EXTRA_CPPFLAGS += -D__inline=inline +# Grabbed from Solaris 10 /usr/include/iso/math_c99.h +EXTRA_CPPFLAGS += -DINFINITY=__builtin_infinity -EXTRA_CPPFLAGS = -D__inline=inline - -# There is no testsuite -SKIPTEST = 1 - -INSTALL_SCRIPTS = custom - include gar/category.mk PATH := /opt/csw/gnu:$(PATH) @@ -35,9 +27,3 @@ perl -pi -e 's,/etc/tmux\.conf,$(sysconfdir)/tmux.conf,g' \ $(WORKSRC)/tmux.h \ $(WORKSRC)/tmux.1 - -install-custom: - ginstall -d $(DESTDIR)$(bindir) - ginstall $(WORKSRC)/tmux $(DESTDIR)$(bindir) - ginstall -d $(DESTDIR)$(mandir)/man1 - ginstall $(WORKSRC)/tmux.1 $(DESTDIR)$(mandir)/man1 Modified: csw/mgar/pkg/tmux/trunk/checksums =================================================================== --- csw/mgar/pkg/tmux/trunk/checksums 2011-07-10 09:51:57 UTC (rev 15029) +++ csw/mgar/pkg/tmux/trunk/checksums 2011-07-10 09:52:29 UTC (rev 15030) @@ -1 +1 @@ -0bfc7dd9a5bab192406167589c716a21 tmux-1.4.tar.gz +3d4b683572af34e83bc8b183a8285263 tmux-1.5.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Sun Jul 10 11:57:30 2011 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Sun, 10 Jul 2011 09:57:30 +0000 Subject: [csw-devel] SF.net SVN: gar:[15031] csw/mgar/pkg Message-ID: Revision: 15031 http://gar.svn.sourceforge.net/gar/?rev=15031&view=rev Author: dmichelsen Date: 2011-07-10 09:57:30 +0000 (Sun, 10 Jul 2011) Log Message: ----------- libevent2: Move from libevent branch to toplevel Added Paths: ----------- csw/mgar/pkg/libevent2/ Removed Paths: ------------- csw/mgar/pkg/libevent/branches/libevent-2.0.x/ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Sun Jul 10 12:00:10 2011 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Sun, 10 Jul 2011 10:00:10 +0000 Subject: [csw-devel] SF.net SVN: gar:[15032] csw/mgar/pkg/libevent2 Message-ID: Revision: 15032 http://gar.svn.sourceforge.net/gar/?rev=15032&view=rev Author: dmichelsen Date: 2011-07-10 10:00:10 +0000 (Sun, 10 Jul 2011) Log Message: ----------- libevent2: Relayout to trunk/ Added Paths: ----------- csw/mgar/pkg/libevent2/Makefile csw/mgar/pkg/libevent2/branches/ csw/mgar/pkg/libevent2/tags/ csw/mgar/pkg/libevent2/trunk/ csw/mgar/pkg/libevent2/trunk/Makefile csw/mgar/pkg/libevent2/trunk/checksums csw/mgar/pkg/libevent2/trunk/files/ Removed Paths: ------------- csw/mgar/pkg/libevent2/Makefile csw/mgar/pkg/libevent2/checksums csw/mgar/pkg/libevent2/files/ Deleted: csw/mgar/pkg/libevent2/Makefile =================================================================== --- csw/mgar/pkg/libevent2/Makefile 2011-07-10 09:57:30 UTC (rev 15031) +++ csw/mgar/pkg/libevent2/Makefile 2011-07-10 10:00:10 UTC (rev 15032) @@ -1,53 +0,0 @@ -NAME = libevent -VERSION = 2.0.12 -CATEGORIES = lib - -DESCRIPTION = Event notification library -define BLURB - The libevent API provides a mechanism to execute a callback function when a - specific event occurs on a file descriptor or after a timeout has been - reached. Furthermore, libevent also support callbacks due to signals or - regular timeouts. -endef - -MASTER_SITES = http://www.monkey.org/~provos/ -DISTNAME = $(NAME)-$(VERSION)-stable -DISTFILES += $(DISTNAME).tar.gz - -# Use this patch until bug is fixed: -# http://sourceforge.net/tracker/?func=detail&aid=3361614&group_id=50884&atid=461322 -PATCHFILES += 0001-Fix-wrong-check-of-sockaddr.patch - -VENDOR_URL = http://www.monkey.org/~provos/libevent/ -LICENSE = LICENSE - -BUILD_DEP_PKGS += CSWossldevel - -PACKAGES += CSWlibevent2-0-5 -SPKG_DESC_CSWlibevent2-0-5 = Event notification library 2.0, libevent*-2.0.so.5 -PKGFILES_CSWlibevent2-0-5 = $(PKGFILES_RT) -RUNTIME_DEP_PKGS_CSWlibevent2-0-5 += CSWosslrt - -PACKAGES += CSWlibevent-dev -SPKG_DESC_CSWlibevent-dev = Development files for libevent*-2.0.so.5 -RUNTIME_DEP_PKGS_CSWlibevent-dev += CSWlibevent2-0-5 -RUNTIME_DEP_PKGS_CSWlibevent-dev += CSWpython -OBSOLETED_BY_CSWlibevent-dev += CSWlibevent-devel - -# We don't need it and if defined the test breaks -NOISALIST = 1 -LD_OPTIONS = -EXTRA_LINKER_FLAGS = $(RUNPATH_LINKER_FLAGS) - -BUILD64 = 1 - -TEST_TARGET = verify - -# This is a unified package with all libraries in there -CHECKPKG_OVERRIDES_CSWlibevent2-0-5 += shared-lib-pkgname-mismatch - -include gar/category.mk - -post-extract-modulated: - -test -f $(WORKSRC)/test/test.sh && perl -pi -e 's,#!/bin/sh,#!/bin/bash,' $(WORKSRC)/test/test.sh - @$(MAKECOOKIE) Copied: csw/mgar/pkg/libevent2/Makefile (from rev 14858, csw/mgar/pkg/template/Makefile) =================================================================== --- csw/mgar/pkg/libevent2/Makefile (rev 0) +++ csw/mgar/pkg/libevent2/Makefile 2011-07-10 10:00:10 UTC (rev 15032) @@ -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) Deleted: csw/mgar/pkg/libevent2/checksums =================================================================== --- csw/mgar/pkg/libevent2/checksums 2011-07-10 09:57:30 UTC (rev 15031) +++ csw/mgar/pkg/libevent2/checksums 2011-07-10 10:00:10 UTC (rev 15032) @@ -1 +0,0 @@ -42986228baf95e325778ed328a93e070 libevent-2.0.12-stable.tar.gz Property changes on: csw/mgar/pkg/libevent2/trunk ___________________________________________________________________ Added: svn:ignore + cookies download work Added: svn:externals + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 Copied: csw/mgar/pkg/libevent2/trunk/Makefile (from rev 15031, csw/mgar/pkg/libevent2/Makefile) =================================================================== --- csw/mgar/pkg/libevent2/trunk/Makefile (rev 0) +++ csw/mgar/pkg/libevent2/trunk/Makefile 2011-07-10 10:00:10 UTC (rev 15032) @@ -0,0 +1,53 @@ +NAME = libevent +VERSION = 2.0.12 +CATEGORIES = lib + +DESCRIPTION = Event notification library +define BLURB + The libevent API provides a mechanism to execute a callback function when a + specific event occurs on a file descriptor or after a timeout has been + reached. Furthermore, libevent also support callbacks due to signals or + regular timeouts. +endef + +MASTER_SITES = http://www.monkey.org/~provos/ +DISTNAME = $(NAME)-$(VERSION)-stable +DISTFILES += $(DISTNAME).tar.gz + +# Use this patch until bug is fixed: +# http://sourceforge.net/tracker/?func=detail&aid=3361614&group_id=50884&atid=461322 +PATCHFILES += 0001-Fix-wrong-check-of-sockaddr.patch + +VENDOR_URL = http://www.monkey.org/~provos/libevent/ +LICENSE = LICENSE + +BUILD_DEP_PKGS += CSWossldevel + +PACKAGES += CSWlibevent2-0-5 +SPKG_DESC_CSWlibevent2-0-5 = Event notification library 2.0, libevent*-2.0.so.5 +PKGFILES_CSWlibevent2-0-5 = $(PKGFILES_RT) +RUNTIME_DEP_PKGS_CSWlibevent2-0-5 += CSWosslrt + +PACKAGES += CSWlibevent-dev +SPKG_DESC_CSWlibevent-dev = Development files for libevent*-2.0.so.5 +RUNTIME_DEP_PKGS_CSWlibevent-dev += CSWlibevent2-0-5 +RUNTIME_DEP_PKGS_CSWlibevent-dev += CSWpython +OBSOLETED_BY_CSWlibevent-dev += CSWlibevent-devel + +# We don't need it and if defined the test breaks +NOISALIST = 1 +LD_OPTIONS = +EXTRA_LINKER_FLAGS = $(RUNPATH_LINKER_FLAGS) + +BUILD64 = 1 + +TEST_TARGET = verify + +# This is a unified package with all libraries in there +CHECKPKG_OVERRIDES_CSWlibevent2-0-5 += shared-lib-pkgname-mismatch + +include gar/category.mk + +post-extract-modulated: + -test -f $(WORKSRC)/test/test.sh && perl -pi -e 's,#!/bin/sh,#!/bin/bash,' $(WORKSRC)/test/test.sh + @$(MAKECOOKIE) Property changes on: csw/mgar/pkg/libevent2/trunk/Makefile ___________________________________________________________________ Added: svn:keywords + Id Copied: csw/mgar/pkg/libevent2/trunk/checksums (from rev 15031, csw/mgar/pkg/libevent2/checksums) =================================================================== --- csw/mgar/pkg/libevent2/trunk/checksums (rev 0) +++ csw/mgar/pkg/libevent2/trunk/checksums 2011-07-10 10:00:10 UTC (rev 15032) @@ -0,0 +1 @@ +42986228baf95e325778ed328a93e070 libevent-2.0.12-stable.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Sun Jul 10 12:47:40 2011 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Sun, 10 Jul 2011 10:47:40 +0000 Subject: [csw-devel] SF.net SVN: gar:[15033] csw/mgar/pkg/gcal/trunk/Makefile Message-ID: Revision: 15033 http://gar.svn.sourceforge.net/gar/?rev=15033&view=rev Author: dmichelsen Date: 2011-07-10 10:47:40 +0000 (Sun, 10 Jul 2011) Log Message: ----------- gcal: Update to new standards Modified Paths: -------------- csw/mgar/pkg/gcal/trunk/Makefile Modified: csw/mgar/pkg/gcal/trunk/Makefile =================================================================== --- csw/mgar/pkg/gcal/trunk/Makefile 2011-07-10 10:00:10 UTC (rev 15032) +++ csw/mgar/pkg/gcal/trunk/Makefile 2011-07-10 10:47:40 UTC (rev 15033) @@ -12,21 +12,13 @@ PATCHFILES += 0001-Need-minor-tweaks-for-Solaris.patch -PACKAGES = CSWgcal -CATALOGNAME_CSWgcal = gcal +PACKAGES += CSWgcal RUNTIME_DEP_PKGS_CSWgcal += CSWlibintl8 -RUNTIME_DEP_PKGS_CSWgcal += CSWncurses +RUNTIME_DEP_PKGS_CSWgcal += CSWlibncurses5 RUNTIME_DEP_PKGS_CSWgcal += CSWperl -# File name regex to get notifications about upstream software releases -UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz - EXTRA_CPPFLAGS = -DGCAL_SYS_DATADIR=\\\"$(sharedstatedir)/gcal\\\" -CONFIGURE_ARGS = $(DIRPATHS) - -TEST_TARGET = check - EXTRA_MERGE_EXCLUDE_FILES = $(libdir)/charset.alias # This is ok, there is a list of pathes given This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Sun Jul 10 13:12:47 2011 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Sun, 10 Jul 2011 11:12:47 +0000 Subject: [csw-devel] SF.net SVN: gar:[15034] csw/mgar/pkg/libgadu/trunk Message-ID: Revision: 15034 http://gar.svn.sourceforge.net/gar/?rev=15034&view=rev Author: dmichelsen Date: 2011-07-10 11:12:47 +0000 (Sun, 10 Jul 2011) Log Message: ----------- libgadu: Intermediate update, tests failing Modified Paths: -------------- csw/mgar/pkg/libgadu/trunk/Makefile csw/mgar/pkg/libgadu/trunk/checksums Added Paths: ----------- csw/mgar/pkg/libgadu/trunk/files/0001-Use-127.0.0.1-for-localhost-or-fail.patch csw/mgar/pkg/libgadu/trunk/files/0002-Do-not-forcefully-set-CFLAGS-to-gcc-specific-stuff.patch Removed Paths: ------------- csw/mgar/pkg/libgadu/trunk/files/CSWlibgadu.depend csw/mgar/pkg/libgadu/trunk/files/CSWlibgadu.gspec csw/mgar/pkg/libgadu/trunk/files/CSWlibgadu.prototype Property Changed: ---------------- csw/mgar/pkg/libgadu/trunk/ Property changes on: csw/mgar/pkg/libgadu/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/libgadu/trunk/Makefile =================================================================== --- csw/mgar/pkg/libgadu/trunk/Makefile 2011-07-10 10:47:40 UTC (rev 15033) +++ csw/mgar/pkg/libgadu/trunk/Makefile 2011-07-10 11:12:47 UTC (rev 15034) @@ -1,28 +1,49 @@ +# TBD: +# - There are tests failing, this is serious as some fields seem to have the wrong size: +# +# File: script/00-login.scr, Line: 45 +# Invalid data length 150 vs expected 147 +# +# 0000: 31 00 00 00 8e 00 00 00 56 34 12 00 70 6c 01 09 1.......V4..pl.. +# 0010: ad 7d 58 00 00 00 00 00 00 00 00 00 00 00 00 00 .}X............. +# 0020: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 ................ +# 0030: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 ................ +# 0040: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 ................ +# 0050: 16 00 00 00 44 33 22 11 37 27 00 00 00 00 00 00 ....D3".7'...... +# 0060: 00 00 00 00 00 00 00 00 00 00 ff 64 1e 00 00 00 ...........d.... +# 0070: 47 61 64 75 2d 47 61 64 75 20 43 6c 69 65 6e 74 Gadu-Gadu Client +# 0080: 20 42 75 69 6c 64 20 31 2e 32 2e 33 2e 34 04 00 Build 1.2.3.4.. +# 0090: 00 00 54 65 73 74 ..Test +# +# expect data ( +# 31 00 00 00, auto, 56 34 12 00, "pl", 01, 09 -> OK +# ad 7d 58 00*60, -> too long by 1 +# 16 00 00 00, 44 33 22 11, 37 27 00 00, 00 00 00 00, -> OK +# 00 00, 00 00 00 00, 00 00, ff, 64, 1e 00 00 00, -> too long by 2 +# "Gadu-Gadu", 20, "Client", -> OK +# 20, "Build", 20, "1.2.3.4", 04 00 -> OK +# 00 00, "Test") -> OK +# + NAME = libgadu -VERSION = 1.8.2 -GARTYPE = v1 +# +VERSION = 1.11.0 +GARTYPE = v2 CATEGORIES = lib -SPKG_SOURCEURL = http://toxygen.net/libgadu -#Need to use either gcc or studio 12 with -features=extensions -GARCOMPILER = GNU - DESCRIPTION = Gadu-Gadu protocol implementation library MASTER_SITES = http://toxygen.net/libgadu/files/ -DISTFILES = $(NAME)-$(VERSION).tar.gz -DISTFILES += $(call admfiles,CSWlibgadu,depend prototype) +DISTFILES = $(DISTNAME).tar.gz -#No tests -TEST_SCRIPTS = +PATCHFILES += 0001-Use-127.0.0.1-for-localhost-or-fail.patch +PATCHFILES += 0002-Do-not-forcefully-set-CFLAGS-to-gcc-specific-stuff.patch -# We define upstream file regex so we can be notifed of new upstream software release -UFILES_REGEX = -(\d+(?:\.\d+)*).tar.gz +VENDOR_URL = http://toxygen.net/libgadu -# 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 = +# There are zero-sized structs +EXTRA_CFLAGS += -features=extensions -CONFIGURE_ARGS = $(DIRPATHS) +BUILD64 = 1 include gar/category.mk Modified: csw/mgar/pkg/libgadu/trunk/checksums =================================================================== --- csw/mgar/pkg/libgadu/trunk/checksums 2011-07-10 10:47:40 UTC (rev 15033) +++ csw/mgar/pkg/libgadu/trunk/checksums 2011-07-10 11:12:47 UTC (rev 15034) @@ -1,4 +1 @@ -f64d4d0222c7adf37aed7a8ef98059a7 download/CSWlibgadu.depend -c5145da14173d6e111f8b45ef8510f3a download/CSWlibgadu.gspec -dff83971a51fe7177617fb3dbc749757 download/CSWlibgadu.prototype -1090f82f8a1bb99e9cdf5853188f625f download/libgadu-1.8.2.tar.gz +c779891298ce5d081c1e871e1e5b256d libgadu-1.11.0.tar.gz Added: csw/mgar/pkg/libgadu/trunk/files/0001-Use-127.0.0.1-for-localhost-or-fail.patch =================================================================== --- csw/mgar/pkg/libgadu/trunk/files/0001-Use-127.0.0.1-for-localhost-or-fail.patch (rev 0) +++ csw/mgar/pkg/libgadu/trunk/files/0001-Use-127.0.0.1-for-localhost-or-fail.patch 2011-07-10 11:12:47 UTC (rev 15034) @@ -0,0 +1,25 @@ +From 800a93c29e829ad9b715880d51506544a6dc90c6 Mon Sep 17 00:00:00 2001 +From: Dagobert Michelsen +Date: Sun, 10 Jul 2011 12:25:25 +0200 +Subject: [PATCH 1/2] Use 127.0.0.1 for localhost or fail + +--- + test/automatic/protocol.c | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/test/automatic/protocol.c b/test/automatic/protocol.c +index d04219e..6eaa081 100644 +--- a/test/automatic/protocol.c ++++ b/test/automatic/protocol.c +@@ -17,7 +17,7 @@ + + #include "script.h" + +-#define LOCALHOST "127.0.67.67" ++#define LOCALHOST "127.0.0.1" + #define LOCALPORT 17219 + + #define debug(msg...) \ +-- +1.7.6 + Added: csw/mgar/pkg/libgadu/trunk/files/0002-Do-not-forcefully-set-CFLAGS-to-gcc-specific-stuff.patch =================================================================== --- csw/mgar/pkg/libgadu/trunk/files/0002-Do-not-forcefully-set-CFLAGS-to-gcc-specific-stuff.patch (rev 0) +++ csw/mgar/pkg/libgadu/trunk/files/0002-Do-not-forcefully-set-CFLAGS-to-gcc-specific-stuff.patch 2011-07-10 11:12:47 UTC (rev 15034) @@ -0,0 +1,39 @@ +From 2962c7258aa0128a478b4814449f75b75b5d6d7f Mon Sep 17 00:00:00 2001 +From: Dagobert Michelsen +Date: Sun, 10 Jul 2011 12:27:02 +0200 +Subject: [PATCH 2/2] Do not forcefully set CFLAGS to gcc-specific stuff + +--- + test/automatic/Makefile.am | 2 -- + test/automatic/Makefile.in | 2 +- + 2 files changed, 1 insertions(+), 3 deletions(-) + +diff --git a/test/automatic/Makefile.am b/test/automatic/Makefile.am +index a032342..8d4be7c 100644 +--- a/test/automatic/Makefile.am ++++ b/test/automatic/Makefile.am +@@ -2,8 +2,6 @@ TESTS = convert message2 message1 $(OPTIONAL_TESTS_GLIBC) $(OPTIONAL_TESTS_PERL) + check_PROGRAMS = convert message2 message1 $(OPTIONAL_TESTS_GLIBC) $(OPTIONAL_TESTS_PERL) + EXTRA_PROGRAMS = convert message2 message1 connect packet resolver protocol + +-CFLAGS = -Wall -ggdb -DGG_IGNORE_DEPRECATED +- + protocol_SOURCES = protocol.c + nodist_protocol_SOURCES = script/script.c + protocol_CFLAGS = -Iscript +diff --git a/test/automatic/Makefile.in b/test/automatic/Makefile.in +index 1185a8f..b1bf94e 100644 +--- a/test/automatic/Makefile.in ++++ b/test/automatic/Makefile.in +@@ -169,7 +169,7 @@ AUTOMAKE = @AUTOMAKE@ + AWK = @AWK@ + CC = @CC@ + CCDEPMODE = @CCDEPMODE@ +-CFLAGS = -Wall -ggdb -DGG_IGNORE_DEPRECATED ++CFLAGS = @CFLAGS@ + CPP = @CPP@ + CPPFLAGS = @CPPFLAGS@ + CYGPATH_W = @CYGPATH_W@ +-- +1.7.6 + Deleted: csw/mgar/pkg/libgadu/trunk/files/CSWlibgadu.depend =================================================================== --- csw/mgar/pkg/libgadu/trunk/files/CSWlibgadu.depend 2011-07-10 10:47:40 UTC (rev 15033) +++ csw/mgar/pkg/libgadu/trunk/files/CSWlibgadu.depend 2011-07-10 11:12:47 UTC (rev 15034) @@ -1,2 +0,0 @@ -P CSWosslrt openssl_rt - Openssl runtime libraries -P CSWgcc3corert gcc3corert - GNU C Compiler Run Time Deleted: csw/mgar/pkg/libgadu/trunk/files/CSWlibgadu.gspec =================================================================== --- csw/mgar/pkg/libgadu/trunk/files/CSWlibgadu.gspec 2011-07-10 10:47:40 UTC (rev 15033) +++ csw/mgar/pkg/libgadu/trunk/files/CSWlibgadu.gspec 2011-07-10 11:12:47 UTC (rev 15034) @@ -1,4 +0,0 @@ -%var bitname libgadu -%var pkgname CSWlibgadu -%include url file://%{PKGLIB}/csw_dyndepend.gspec -%copyright url file://%{WORKSRC}/COPYING Deleted: csw/mgar/pkg/libgadu/trunk/files/CSWlibgadu.prototype =================================================================== --- csw/mgar/pkg/libgadu/trunk/files/CSWlibgadu.prototype 2011-07-10 10:47:40 UTC (rev 15033) +++ csw/mgar/pkg/libgadu/trunk/files/CSWlibgadu.prototype 2011-07-10 11:12:47 UTC (rev 15034) @@ -1,8 +0,0 @@ -d none /opt/csw/lib 0755 root bin -d none /opt/csw/lib/pkgconfig 0755 root bin -f none /opt/csw/lib/pkgconfig/libgadu.pc 0644 root bin -s none /opt/csw/lib/libgadu.so.3=libgadu.so.3.9.0 -f none /opt/csw/lib/libgadu.so.3.9.0 0755 root bin -s none /opt/csw/lib/libgadu.so=libgadu.so.3.9.0 -d none /opt/csw/include 0755 root bin -f none /opt/csw/include/libgadu.h 0644 root bin This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From j_arndt at users.sourceforge.net Sun Jul 10 20:19:26 2011 From: j_arndt at users.sourceforge.net (j_arndt at users.sourceforge.net) Date: Sun, 10 Jul 2011 18:19:26 +0000 Subject: [csw-devel] SF.net SVN: gar:[15035] csw/mgar/pkg/munin/trunk Message-ID: Revision: 15035 http://gar.svn.sourceforge.net/gar/?rev=15035&view=rev Author: j_arndt Date: 2011-07-10 18:19:26 +0000 (Sun, 10 Jul 2011) Log Message: ----------- munin: update to 1.4.6 Modified Paths: -------------- csw/mgar/pkg/munin/trunk/Makefile csw/mgar/pkg/munin/trunk/checksums Removed Paths: ------------- csw/mgar/pkg/munin/trunk/files/if.in.patch csw/mgar/pkg/munin/trunk/files/if_err.in.patch Modified: csw/mgar/pkg/munin/trunk/Makefile =================================================================== --- csw/mgar/pkg/munin/trunk/Makefile 2011-07-10 11:12:47 UTC (rev 15034) +++ csw/mgar/pkg/munin/trunk/Makefile 2011-07-10 18:19:26 UTC (rev 15035) @@ -1,5 +1,5 @@ NAME = munin -VERSION = 1.4.5 +VERSION = 1.4.6 CATEGORIES = apps SPKG_DESC_CSWmuninmaster = master component of the graphical network and system monitoring munin @@ -29,8 +29,6 @@ PATCHFILES += munin-htaccess.in.patch PATCHFILES += munin-graph.in.patch # match some paths to /{etc|var}/opt/csw/munin PATCHFILES += perl.patch # shebang correctly set -PATCHFILES += if.in.patch # added support for Solaris 10 -PATCHFILES += if_err.in.patch # added support for Solaris 10 # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = -(\d+(?:\.\d+)*).tar.gz Modified: csw/mgar/pkg/munin/trunk/checksums =================================================================== --- csw/mgar/pkg/munin/trunk/checksums 2011-07-10 11:12:47 UTC (rev 15034) +++ csw/mgar/pkg/munin/trunk/checksums 2011-07-10 18:19:26 UTC (rev 15035) @@ -1 +1 @@ -4ae84b9a27b686c3819d8d7b51d8cb4c munin-1.4.5.tar.gz +b54f320ba75f97ad2ddba3664f7158f2 munin-1.4.6.tar.gz Deleted: csw/mgar/pkg/munin/trunk/files/if.in.patch =================================================================== --- csw/mgar/pkg/munin/trunk/files/if.in.patch 2011-07-10 11:12:47 UTC (rev 15034) +++ csw/mgar/pkg/munin/trunk/files/if.in.patch 2011-07-10 18:19:26 UTC (rev 15035) @@ -1,63 +0,0 @@ -From 961fedeafe1bbeb3e54d3077799b929c43ce0ef0 Mon Sep 17 00:00:00 2001 -From: Juergen Arndt -Date: Thu, 13 Jan 2011 21:08:25 +0100 -Subject: [PATCH] Fix for Solaris 10 - ---- - plugins/node.d.sunos/if_.in | 20 +++++++------------- - 1 files changed, 7 insertions(+), 13 deletions(-) - -diff --git a/plugins/node.d.sunos/if_.in b/plugins/node.d.sunos/if_.in -index d72a539..94c1316 100755 ---- a/plugins/node.d.sunos/if_.in -+++ b/plugins/node.d.sunos/if_.in -@@ -56,7 +56,7 @@ fi - - if [ "$1" = "suggest" ]; then - if [ -x /usr/bin/kstat ]; then -- kstat -m link -p -s '/^rbytes$/' | awk -F: '{ print $3 }' -+ kstat -p -m '/^(?!unix)/' -n '/^(?!mac$)/' -s rbytes64 | awk -F: '{ print $3 }' - exit 0 - else - exit 1 -@@ -64,31 +64,25 @@ if [ "$1" = "suggest" ]; then - fi - - if [ "$1" = "config" ]; then -- - echo "graph_order rbytes obytes" - echo "graph_title $INTERFACE traffic" - echo 'graph_args --base 1000' - echo 'graph_vlabel bits per ${graph_period} in (-) / out (+)' - echo 'graph_category network' - echo 'rbytes.label received' -- echo 'rbytes.type COUNTER' -- echo 'rbytes.max 2000000000' -- echo 'rbytes.graph no' -- echo 'rbytes.cdef rbytes,8,*' -+ echo 'rbytes.type COUNTER' -+ echo 'rbytes.graph no' -+ echo 'rbytes.cdef rbytes,8,*' - print_warning rbytes - print_critical rbytes -- echo 'obytes.label bps' -+ echo 'obytes.label bps' - echo 'obytes.type COUNTER' - echo 'obytes.negative rbytes' - echo 'obytes.cdef obytes,8,*' -- echo 'obytes.max 2000000000' - print_warning obytes - print_critical obytes - exit 0 - fi; - --kstat -p -n $INTERFACE -m link -s '/^[ro]bytes$/' | awk -F: ' --{ -- split($4, four, "\t") -- print four[1] ".value", four[2] --}' -+kstat -p -m '/^(?!unix)/' -n $INTERFACE -s '*bytes64' | sed \ -+ 's/.*\(.bytes\)64./\1.value /' --- -1.7.3.2 - Deleted: csw/mgar/pkg/munin/trunk/files/if_err.in.patch =================================================================== --- csw/mgar/pkg/munin/trunk/files/if_err.in.patch 2011-07-10 11:12:47 UTC (rev 15034) +++ csw/mgar/pkg/munin/trunk/files/if_err.in.patch 2011-07-10 18:19:26 UTC (rev 15035) @@ -1,61 +0,0 @@ -From 74d1fa95cd376e87824fd1bca3cad196adeabf1f Mon Sep 17 00:00:00 2001 -From: Juergen Arndt -Date: Sun, 26 Sep 2010 17:15:57 +0200 -Subject: [PATCH] added support for Solaris 10 - ---- - plugins/node.d.sunos/if_err_.in | 27 +++++++++++++++++++++------ - 1 files changed, 21 insertions(+), 6 deletions(-) - -diff --git a/plugins/node.d.sunos/if_err_.in b/plugins/node.d.sunos/if_err_.in -index 097ec1c..269e9d3 100755 ---- a/plugins/node.d.sunos/if_err_.in -+++ b/plugins/node.d.sunos/if_err_.in -@@ -42,6 +42,7 @@ Unknown license - - . $MUNIN_LIBDIR/plugins/plugin.sh - -+SOLVERSION=`uname -r | awk -F. '{print $2}` - INTERFACE=${0##*/if_err_} - - if [ "$1" = "autoconf" ]; then -@@ -56,7 +57,11 @@ fi - - if [ "$1" = "suggest" ]; then - if [ -x /usr/bin/kstat ]; then -- kstat -m link -p -s '/^ierrors$/' | awk -F: '{ print $3 }' -+ if [ $SOLVERSION -le 10 ]; then -+ kstat -p -s '/^ierrors$/' | awk -F: '{ print $3 }' -+ elif [ $SOLVERSION -gt 10 ]; then -+ kstat -m link -p -s '/^ierrors$/' | awk -F: '{ print $3 }' -+ fi - exit 0 - else - exit 1 -@@ -88,8 +93,18 @@ if [ "$1" = "config" ]; then - exit 0 - fi; - --kstat -p -n $INTERFACE -m link -s '/^([io]errors|collisions)$/' | awk -F: ' --{ -- split($4, four, "\t") -- print four[1] ".value", four[2] --}' -+if [ $SOLVERSION -le 10 ] # Solaris 10 and earlier -+then -+ kstat -p -n $INTERFACE -s '/^([io]errors|collisions)$/' | awk -F: ' -+ { -+ split($4, four, "\t") -+ print four[1] ".value", four[2] -+ }' -+elif [ $SOLVERSION -eq 11 ] # later than Solaris 10 -+then -+ kstat -p -n $INTERFACE -m link -s '/^([io]errors|collisions)$/' | awk -F: ' -+ { -+ split($4, four, "\t") -+ print four[1] ".value", four[2] -+ }' -+fi --- -1.7.2.2 - This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From khabermann at users.sourceforge.net Mon Jul 11 11:48:16 2011 From: khabermann at users.sourceforge.net (khabermann at users.sourceforge.net) Date: Mon, 11 Jul 2011 09:48:16 +0000 Subject: [csw-devel] SF.net SVN: gar:[15036] csw/mgar/pkg Message-ID: Revision: 15036 http://gar.svn.sourceforge.net/gar/?rev=15036&view=rev Author: khabermann Date: 2011-07-11 09:48:15 +0000 (Mon, 11 Jul 2011) Log Message: ----------- tcllib: created package Added Paths: ----------- csw/mgar/pkg/tcllib/ csw/mgar/pkg/tcllib/Makefile csw/mgar/pkg/tcllib/branches/ csw/mgar/pkg/tcllib/tags/ csw/mgar/pkg/tcllib/trunk/ csw/mgar/pkg/tcllib/trunk/Makefile csw/mgar/pkg/tcllib/trunk/checksums csw/mgar/pkg/tcllib/trunk/files/ csw/mgar/pkg/tcllib/trunk/files/0001-csw-path-changes.patch csw/mgar/pkg/tcllib/trunk/files/0002-renamed-conflicting-man-pages.patch Copied: csw/mgar/pkg/tcllib/Makefile (from rev 15008, csw/mgar/pkg/template/Makefile) =================================================================== --- csw/mgar/pkg/tcllib/Makefile (rev 0) +++ csw/mgar/pkg/tcllib/Makefile 2011-07-11 09:48:15 UTC (rev 15036) @@ -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/tcllib/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/tcllib/trunk/Makefile =================================================================== --- csw/mgar/pkg/tcllib/trunk/Makefile (rev 0) +++ csw/mgar/pkg/tcllib/trunk/Makefile 2011-07-11 09:48:15 UTC (rev 15036) @@ -0,0 +1,43 @@ +# $Id$ +# TODO (release-critical prefixed with !, non release-critical with *) +# +NAME = tcllib +VERSION = 1.13 +GARTYPE = v2 +CATEGORIES = lang +ARCHALL_CSWtcllib = 1 +LICENSE = license.terms + +DESCRIPTION = Standard Tcl library, collection of common utility functions and modules +define BLURB +endef + +MASTER_SITES = $(SF_MIRRORS) +DISTFILES = $(DISTNAME).tar.gz +PATCHFILES = 0001-csw-path-changes.patch 0002-renamed-conflicting-man-pages.patch + +# comment contains "/usr/share/misc/magic.mime" +CHECKPKG_OVERRIDES_CSWtcllib += file-with-bad-content|/usr/share|root/opt/csw/lib/tcllib1.13/fumagic/filetypes.tcl +CHECKPKG_OVERRIDES_CSWtcllib += file-with-bad-content|/usr/share|root/opt/csw/lib/tcllib1.13/fumagic/mimetypes.tcl + +# list of shells containing "/usr/local/bin/bash" and others +CHECKPKG_OVERRIDES_CSWtcllib += file-with-bad-content|/usr/local|root/opt/csw/lib/tcllib1.13/fumagic/filetypes.tcl +CHECKPKG_OVERRIDES_CSWtcllib += file-with-bad-content|/usr/local|root/opt/csw/lib/tcllib1.13/fumagic/mimetypes.tcl + +# comment contains "/usr/share/misc/file/magic" +CHECKPKG_OVERRIDES_CSWtcllib += file-with-bad-content|/usr/share|root/opt/csw/lib/tcllib1.13/fumagic/cfront.tcl + +# File name regex to get notifications about upstream software releases +# NOTE: Use this only if the automatic regex creation +# does not work for your package +# UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz + +# If the url used to check for software update is different of MASTER_SITES, then +# uncomment the next line. Otherwise it is set by default to the value of MASTER_SITES +# UPSTREAM_MASTER_SITES = + +# CONFIGURE_ARGS = $(DIRPATHS) +CONFIGURE=./configure --prefix=/opt/csw + +include gar/category.mk + Property changes on: csw/mgar/pkg/tcllib/trunk/Makefile ___________________________________________________________________ Added: svn:keywords + Id Added: csw/mgar/pkg/tcllib/trunk/checksums =================================================================== --- csw/mgar/pkg/tcllib/trunk/checksums (rev 0) +++ csw/mgar/pkg/tcllib/trunk/checksums 2011-07-11 09:48:15 UTC (rev 15036) @@ -0,0 +1 @@ +5bc9567b3a61884716a908d5295d7105 tcllib-1.13.tar.gz Added: csw/mgar/pkg/tcllib/trunk/files/0001-csw-path-changes.patch =================================================================== --- csw/mgar/pkg/tcllib/trunk/files/0001-csw-path-changes.patch (rev 0) +++ csw/mgar/pkg/tcllib/trunk/files/0001-csw-path-changes.patch 2011-07-11 09:48:15 UTC (rev 15036) @@ -0,0 +1,75 @@ +From 9cc0fd54cf707a756de8606c08eb315e465659da Mon Sep 17 00:00:00 2001 +From: Kester Habermann +Date: Mon, 11 Jul 2011 11:15:59 +0200 +Subject: [PATCH] csw path changes + +--- + modules/doctools/docidx.man | 4 ++-- + modules/doctools/doctoc.man | 4 ++-- + modules/doctools/doctools.man | 4 ++-- + modules/ncgi/ncgi.man | 2 +- + 4 files changed, 7 insertions(+), 7 deletions(-) + +diff --git a/modules/doctools/docidx.man b/modules/doctools/docidx.man +index f6b19b8..aa7571a 100644 +--- a/modules/doctools/docidx.man ++++ b/modules/doctools/docidx.man +@@ -301,8 +301,8 @@ through the command [cmd ::doctools::idx::search]. + It contains initially one path, the subdirectory [file mpformats] of + the directory the package itself is located in. In other words, if the + package implementation [file docidx.tcl] is installed in the directory +-[file /usr/local/lib/tcllib/doctools] then it will by default search +-the directory [file /usr/local/lib/tcllib/doctools/mpformats] for ++[file /opt/csw/lib/tcllib1.13/doctools] then it will by default search ++the directory [file /opt/csw/lib/tcllib1.13/doctools/mpformats] for + format implementations. + + [enum] +diff --git a/modules/doctools/doctoc.man b/modules/doctools/doctoc.man +index d09a5ef..9e5a0a8 100644 +--- a/modules/doctools/doctoc.man ++++ b/modules/doctools/doctoc.man +@@ -301,8 +301,8 @@ through the command [cmd ::doctools::toc::search]. + It contains initially one path, the subdirectory [file mpformats] of + the directory the package itself is located in. In other words, if the + package implementation [file doctoc.tcl] is installed in the directory +-[file /usr/local/lib/tcllib/doctools] then it will by default search +-the directory [file /usr/local/lib/tcllib/doctools/mpformats] for ++[file /opt/csw/lib/tcllib1.13/doctools] then it will by default search ++the directory [file /opt/csw/lib/tcllib1.13/doctools/mpformats] for + format implementations. + + [enum] +diff --git a/modules/doctools/doctools.man b/modules/doctools/doctools.man +index 9c2c139..aeb4370 100644 +--- a/modules/doctools/doctools.man ++++ b/modules/doctools/doctools.man +@@ -381,10 +381,10 @@ It contains initially one path, the subdirectory [file mpformats] of + the directory the package itself is located in. + + In other words, if the package implementation [file doctools.tcl] is +-installed in the directory [file /usr/local/lib/tcllib/doctools] then ++installed in the directory [file /opt/csw/lib/tcllib1.13/doctools] then + it will by default search the + +-directory [file /usr/local/lib/tcllib/doctools/mpformats] for format ++directory [file /opt/csw/lib/tcllib1.13/doctools/mpformats] for format + implementations. + + [enum] +diff --git a/modules/ncgi/ncgi.man b/modules/ncgi/ncgi.man +index 4b24de7..155b861 100644 +--- a/modules/ncgi/ncgi.man ++++ b/modules/ncgi/ncgi.man +@@ -311,7 +311,7 @@ Name:
+ + + TCL: upload.cgi +-#!/usr/local/bin/tclsh ++#!/opt/csw/bin/tclsh + + ::ncgi::parse + set filedata [::ncgi::value filedata] +-- +1.7.6 + Added: csw/mgar/pkg/tcllib/trunk/files/0002-renamed-conflicting-man-pages.patch =================================================================== --- csw/mgar/pkg/tcllib/trunk/files/0002-renamed-conflicting-man-pages.patch (rev 0) +++ csw/mgar/pkg/tcllib/trunk/files/0002-renamed-conflicting-man-pages.patch 2011-07-11 09:48:15 UTC (rev 15036) @@ -0,0 +1,1733 @@ +From 999efdbce1f9d494841786e94cf0674b420e485f Mon Sep 17 00:00:00 2001 +From: Kester Habermann +Date: Mon, 11 Jul 2011 11:19:19 +0200 +Subject: [PATCH 3/3] renamed conflicting man pages + +--- + modules/doctools2idx/container.man | 305 ----------- + modules/doctools2toc/container.man | 386 -------------- + modules/struct/graph.man | 1007 ------------------------------------ + 3 files changed, 0 insertions(+), 1698 deletions(-) + delete mode 100644 modules/doctools2idx/container.man + delete mode 100644 modules/doctools2toc/container.man + delete mode 100644 modules/struct/graph.man + +diff --git a/modules/doctools2idx/container.man b/modules/doctools2idx/container.man +deleted file mode 100644 +index 09dae66..0000000 +--- a/modules/doctools2idx/container.man ++++ /dev/null +@@ -1,305 +0,0 @@ +-[comment {-*- tcl -*- doctools manpage}] +-[manpage_begin doctools::idx n 2] +-[copyright {2009 Andreas Kupries }] +-[moddesc {Documentation tools}] +-[titledesc {Holding keyword indices}] +-[category {Documentation tools}] +-[require doctools::idx [opt 2]] +-[require Tcl 8.4] +-[require doctools::idx::structure] +-[require snit] +-[keywords {keyword index} index reference documentation manpage url] +-[keywords {docidx markup} markup conversion formatting generation plugin] +-[keywords json text nroff wiki {tcler's wiki} latex TMML HTML] +-[keywords parsing] +-[description] +- +-This package provides a class to contain and programmatically +-manipulate keyword indices +- +-[para] +- +-This is one of the three public pillars the management of keyword +-indices resides on. The other two pillars are +- +-[list_begin enum] +-[enum] [manpage {Exporting keyword indices}], and +-[enum] [manpage {Importing keyword indices}] +-[list_end] +- +-[para] +- +-For information about the [sectref Concepts] of keyword indices, and +-their parts, see the same-named section. +- +-For information about the data structure which is used to encode +-keyword indices as values see the section +-[sectref {Keyword index serialization format}]. +- +-This is the only format directly known to this class. Conversions from +-and to any other format are handled by export and import manager +-objects. These may be attached to a container, but do not have to be, +-it is merely a convenience. +- +- +-[section Concepts] [include include/concept.inc] +- +- +-[section API] +-[subsection {Package commands}] +- +-[list_begin definitions] +- +-[call [cmd ::doctools::idx] [arg objectName]] +- +-This command creates a new container object with an associated Tcl +-command whose name is [arg objectName]. This [term object] command is +-explained in full detail in the sections [sectref {Object command}] +-and [sectref {Object methods}]. The object command will be created +-under the current namespace if the [arg objectName] is not fully +-qualified, and in the specified namespace otherwise. +- +-[list_end] +- +- +-[subsection {Object command}] +- +-All objects created by the [cmd ::doctools::idx] command have the +-following general form: +- +-[list_begin definitions] +- +-[call [cmd objectName] [method method] [opt [arg "arg arg ..."]]] +- +-The method [method method] and its [arg arg]'uments determine the +-exact behavior of the command. +- +-See section [sectref {Object methods}] for the detailed +-specifications. +- +-[list_end] +- +- +-[subsection {Object methods}] +- +-[list_begin definitions] +- +-[call [arg objectName] [method destroy]] +- +-This method destroys the object it is invoked for. +- +-[call [arg objectName] [method {key add}] [arg name]] +- +-This method adds the keyword [arg name] to the index. If the keyword +-is already known nothing is done. The result of the method is the +-empty string. +- +- +-[call [arg objectName] [method {key remove}] [arg name]] +- +-This method removes the keyword [arg name] from the index. If the +-keyword is already gone nothing is done. Any references for whom this +-keyword was the last association are removed as well. The result of +-the method is the empty string. +- +- +-[call [arg objectName] [method {key references}] [arg name]] +- +-This method returns a list containing the names of all references +-associated with the keyword [arg name]. An error is thrown in the +-keyword is not known to the index. The order of the references in the +-list is undefined. +- +- +-[call [arg objectName] [method keys]] +- +-This method returns a list containing the names of all keywords known +-to the index. The order of the keywords in the list is undefined. +- +- +-[call [arg objectName] [method {reference add}] [arg type] [arg key] [arg name] [arg label]] +- +-This method adds the reference [arg name] to the index and associates +-it with the keyword [arg key]. +- +-The other two arguments hold the [arg type] and [arg label] of the +-reference, respectively. +- +-The type has to match the stored information, should the reference +-exist already, i.e. this information is immutable after the reference +-is known. The only way to change it is delete and recreate the +-reference. +- +-The label on the other hand is automatically updated to the value of +-the argument, overwriting any previously stored information. +- +-Should the reference exists already it is simply associated with the +-[arg key]. If that is true already as well nothing is done, but the +-[arg label] updated to the new value. The result of the method is the +-empty string. +- +-[para] +- +-The [arg type] argument has be to one of [const manpage] or [const url]. +- +- +-[call [arg objectName] [method {reference remove}] [arg name]] +- +-The reference [arg name] is removed from the index. All associations +-with keywords are released and the relevant reference labels removed. +-The result of the method is the empty string. +- +- +-[call [arg objectName] [method {reference label}] [arg name]] +- +-This method returns the label associated with the reference +-[arg name]. An error is thrown if the reference is not known. +- +- +-[call [arg objectName] [method {reference keys}] [arg name]] +- +-This method returns a list containing the names of all keywords +-associated with the reference [arg name]. An error is thrown in the +-reference is not known to the index. The order of the keywords in the +-list is undefined. +- +- +-[call [arg objectName] [method {reference type}] [arg name]] +- +-This method returns the type of the reference [arg name]. An error is +-thrown in the reference is not known to the index. +- +- +-[call [arg objectName] [method references]] +- +-This method returns a list containing the names of all references +-known to the index. The order of the references in the list is +-undefined. +- +- +-[call [arg objectName] [method title]] +- +-Returns the currently defined title of the keyword index. +- +- +-[call [arg objectName] [method title] [arg text]] +- +-Sets the title of the keyword index to [arg text], and returns it as +-the result of the command. +- +- +-[call [arg objectName] [method label]] +- +-Returns the currently defined label of the keyword index. +- +- +-[call [arg objectName] [method label] [arg text]] +- +-Sets the label of the keyword index to [arg text], and returns it as +-the result of the command. +- +- +-[call [arg objectName] [method importer]] +- +-Returns the import manager object currently attached to the container, +-if any. +- +- +-[call [arg objectName] [method importer] [arg object]] +- +-Attaches the [arg object] as import manager to the container, and +-returns it as the result of the command. +- +-Note that the [arg object] is [emph not] put into ownership of the +-container. I.e., destruction of the container will [emph not] destroy +-the [arg object]. +- +-[para] +- +-It is expected that [arg object] provides a method named +-[method {import text}] which takes a text and a format name, and +-returns the canonical serialization of the keyword index contained in +-the text, assuming the given format. +- +- +-[call [arg objectName] [method exporter]] +- +-Returns the export manager object currently attached to the container, +-if any. +- +- +-[call [arg objectName] [method exporter] [arg object]] +- +-Attaches the [arg object] as export manager to the container, and +-returns it as the result of the command. +- +-Note that the [arg object] is [emph not] put into ownership of the +-container. I.e., destruction of the container will [emph not] destroy +-the [arg object]. +- +-[para] +- +-It is expected that [arg object] provides a method named +-[method {export object}] which takes the container and a format name, +-and returns a text encoding keyword index stored in the container, in +-the given format. It is further expected that the [arg object] will +-use the container's method [method serialize] to obtain the +-serialization of the keyword index from which to generate the text. +- +- +-[call [arg objectName] [method {deserialize =}] [arg data] [opt [arg format]]] +- +-This method replaces the contents of the index object with the index +-contained in the [arg data]. If no [arg format] was specified it is +-assumed to be the regular serialization of a keyword index. +- +-[para] +- +-Otherwise the object will use the attached import manager to convert +-the data from the specified format to a serialization it can handle. +- +-In that case an error will be thrown if the container has no import +-manager attached to it. +- +-[para] +- +-The result of the method is the empty string. +- +- +-[call [arg objectName] [method {deserialize +=}] [arg data] [opt [arg format]]] +- +-This method behaves like [method {deserialize =}] in its essentials, +-except that it merges the keyword index in the [arg data] to its +-contents instead of replacing it. +- +-The method will throw an error if merging is not possible, i.e. would +-produce an invalid index. The existing content is left unchanged in +-that case. +- +-[para] +- +-The result of the method is the empty string. +- +- +-[call [arg objectName] [method serialize] [opt [arg format]]] +- +-This method returns the keyword index contained in the object. If no +-[arg format] is not specified the returned result is the canonical +-serialization of its contents. +- +-[para] +- +-Otherwise the object will use the attached export manager to convert +-the data to the specified format. +- +-In that case an error will be thrown if the container has no export +-manager attached to it. +- +- +-[list_end] +- +- +-[include include/serialization.inc] +-[vset CATEGORY doctools] +-[include ../doctools2base/include/feedback.inc] +-[manpage_end] +diff --git a/modules/doctools2toc/container.man b/modules/doctools2toc/container.man +deleted file mode 100644 +index e28eee6..0000000 +--- a/modules/doctools2toc/container.man ++++ /dev/null +@@ -1,386 +0,0 @@ +-[comment {-*- tcl -*- doctools manpage}] +-[manpage_begin doctools::toc n 2] +-[copyright {2009 Andreas Kupries }] +-[moddesc {Documentation tools}] +-[titledesc {Holding tables of contents}] +-[category {Documentation tools}] +-[require doctools::toc [opt 2]] +-[require Tcl 8.4] +-[require doctools::toc::structure] +-[require struct::tree] +-[require snit] +-[keywords {table of contents} table reference documentation] +-[keywords {doctoc markup} markup conversion formatting generation plugin] +-[keywords json text nroff wiki {tcler's wiki} latex TMML HTML] +-[keywords parsing] +-[description] +- +-This package provides a class to contain and programmatically +-manipulate tables of contents. +- +-[para] +- +-This is one of the three public pillars the management of tables of +-contents resides on. The other two pillars are +- +-[list_begin enum] +-[enum] [manpage {Exporting tables of contents}], and +-[enum] [manpage {Importing tables of contents}] +-[list_end] +- +-[para] +- +-For information about the [sectref Concepts] of tables of contents, and +-their parts, see the same-named section. +- +-For information about the data structure which is used to encode +-tables of contents as values see the section +-[sectref {ToC serialization format}]. +- +-This is the only format directly known to this class. Conversions from +-and to any other format are handled by export and import manager +-objects. These may be attached to a container, but do not have to be, +-it is merely a convenience. +- +- +-[section Concepts] [include include/concept.inc] +- +- +-[section API] +-[subsection {Package commands}] +- +-[list_begin definitions] +- +-[call [cmd ::doctools::toc] [arg objectName]] +- +-This command creates a new container object with an associated Tcl +-command whose name is [arg objectName]. This [term object] command is +-explained in full detail in the sections [sectref {Object command}] +-and [sectref {Object methods}]. The object command will be created +-under the current namespace if the [arg objectName] is not fully +-qualified, and in the specified namespace otherwise. +- +-[list_end] +- +- +-[subsection {Object command}] +- +-All objects created by the [cmd ::doctools::toc] command have the +-following general form: +- +-[list_begin definitions] +- +-[call [cmd objectName] [method method] [opt [arg "arg arg ..."]]] +- +-The method [method method] and its [arg arg]'uments determine the +-exact behavior of the command. +- +-See section [sectref {Object methods}] for the detailed +-specifications. +- +-[list_end] +- +- +-[subsection {Object methods}] +- +-[list_begin definitions] +- +-[call [arg objectName] [method destroy]] +- +-This method destroys the object it is invoked for. +- +-[call [arg objectName] [method {+ reference}] [arg id] [arg label] [arg docid] [arg desc]] +- +-This method adds a new reference element to the table of contents, +-under the element specified via its handle [arg id]. This parent +-element has to be a division element, or the root. An error is thrown +-otherwise. +- +-The new element will be externally identified by its [arg label], +-which has to be be unique within the parent element. An error is +-thrown otherwise. +- +-[para] +- +-As a reference element it will refer to a document identified by the +-symbolic [arg docid]. This reference must not be the empty string, an +-error is thrown otherwise. +- +-Beyond the label the element also has a longer descriptive string, +-supplied via [arg desc]. +- +-[para] +- +-The result of the method is the handle (id) of the new element. +- +- +-[call [arg objectName] [method {+ division}] [arg id] [arg label] [opt [arg docid]]] +- +-This method adds a new division element to the table of contents, +-under the element specified via its handle [arg id]. This parent +-element has to be a division element, or the root. An error is thrown +-otherwise. +- +-The new element will be externally identified by its [arg label], +-which has to be be unique within the parent element. An error is +-thrown otherwise. +- +-[para] +- +-As a division element it is can refer to a document, identified by the +-symbolic [arg docid], but may choose not to. +- +-[para] +- +-The result of the method is the handle (id) of the new element. +- +- +-[call [arg objectName] [method remove] [arg id]] +- +-This method removes the element identified by the handle [arg id] from +-the table of contents. +- +-If the element is a division all of its children, if any, are removed +-as well. The root element/division of the table of contents cannot be +-removed however, only its children. +- +-[para] +- +-The result of the method is the empty string. +- +- +-[call [arg objectName] [method up] [arg id]] +- +-This method returns the handle of the parent for the element +-identified by its handle [arg id], or the empty string if [arg id] +-refered to the root element. +- +- +-[call [arg objectName] [method next] [arg id]] +- +-This method returns the handle of the right sibling for the element +-identified by its handle [arg id], or the handle of the parent if the +-element has no right sibling, or the empty string if [arg id] refered +-to the root element. +- +- +- +-[call [arg objectName] [method prev] [arg id]] +- +-This method returns the handle of the left sibling for the element +-identified by its handle [arg id], or the handle of the parent if the +-element has no left sibling, or the empty string if [arg id] refered +-to the root element. +- +- +-[call [arg objectName] [method child] [arg id] [arg label] [opt [arg ...]]] +- +-This method returns the handle of a child of the element identified by +-its handle [arg id]. The child itself is identified by a series of +-labels. +- +- +-[call [arg objectName] [method element] [opt [arg ...]]] +- +-This method returns the handle of the element identified by a series +-of labels, starting from the root of the table of contents. The series +-of labels is allowed to be empty, in which case the handle of the root +-element is returned. +- +- +-[call [arg objectName] [method children] [arg id]] +- +-This method returns a list containing the handles of all children of +-the element identified by the handle [arg id], from first to last, in +-that order. +- +- +-[call [arg objectName] [method type] [arg id]] +- +-This method returns the type of the element, either [const reference], +-or [const division]. +- +- +-[call [arg objectName] [method full-label] [arg id]] +- +-This method is the complement of the method [method element], +-converting the handle [arg id] of an element into a list of labels +-full identifying the element within the whole table of contents. +- +- +-[call [arg objectName] [method elabel] [arg id] [opt [arg newlabel]]] +- +-This method queries and/or changes the label of the element identified +-by the handle [arg id]. If the argument [arg newlabel] is present then +-the label is changed to that value. Regardless of this, the result of +-the method is the current value of the label. +- +-[para] +- +-If the label is changed the new label has to be unique within the +-containing division, or an error is thrown. +- +-[para] +- +-Further, of the [arg id] refers to the root element of the table of +-contents, then using this method is equivalent to using the method +-[arg label], i.e. it is accessing the global label for the whole +-table. +- +- +-[call [arg objectName] [method description] [arg id] [opt [arg newdesc]]] +- +-This method queries and/or changes the description of the element +-identified by the handle [arg id]. If the argument [arg newdesc] is +-present then the description is changed to that value. Regardless of +-this, the result of the method is the current value of the description. +- +-[para] +- +-The element this method operates on has to be a reference element, or +-an error will be thrown. +- +- +-[call [arg objectName] [method document] [arg id] [opt [arg newdocid]]] +- +-This method queries and/or changes the document reference of the +-element identified by the handle [arg id]. +- +-If the argument [arg newdocid] is present then the description is +-changed to that value. Regardless of this, the result of the method is +-the current value of the document reference. +- +-[para] +- +-Setting the reference to the empty string means unsetting it, and is +-allowed only for division elements. Conversely, if the result is the +-empty string then the element has no document reference, and this can +-happen only for division elements. +- +- +-[call [arg objectName] [method title]] +- +-Returns the currently defined title of the table of contents. +- +- +-[call [arg objectName] [method title] [arg text]] +- +-Sets the title of the table of contents to [arg text], and returns it as +-the result of the command. +- +- +-[call [arg objectName] [method label]] +- +-Returns the currently defined label of the table of contents. +- +- +-[call [arg objectName] [method label] [arg text]] +- +-Sets the label of the table of contents to [arg text], and returns it as +-the result of the command. +- +- +-[call [arg objectName] [method importer]] +- +-Returns the import manager object currently attached to the container, +-if any. +- +- +-[call [arg objectName] [method importer] [arg object]] +- +-Attaches the [arg object] as import manager to the container, and +-returns it as the result of the command. +- +-Note that the [arg object] is [emph not] put into ownership of the +-container. I.e., destruction of the container will [emph not] destroy +-the [arg object]. +- +-[para] +- +-It is expected that [arg object] provides a method named +-[method {import text}] which takes a text and a format name, and +-returns the canonical serialization of the table of contents contained in +-the text, assuming the given format. +- +- +-[call [arg objectName] [method exporter]] +- +-Returns the export manager object currently attached to the container, +-if any. +- +- +-[call [arg objectName] [method exporter] [arg object]] +- +-Attaches the [arg object] as export manager to the container, and +-returns it as the result of the command. +- +-Note that the [arg object] is [emph not] put into ownership of the +-container. I.e., destruction of the container will [emph not] destroy +-the [arg object]. +- +-[para] +- +-It is expected that [arg object] provides a method named +-[method {export object}] which takes the container and a format name, +-and returns a text encoding table of contents stored in the container, in +-the given format. It is further expected that the [arg object] will +-use the container's method [method serialize] to obtain the +-serialization of the table of contents from which to generate the text. +- +- +-[call [arg objectName] [method {deserialize =}] [arg data] [opt [arg format]]] +- +-This method replaces the contents of the table object with the table +-contained in the [arg data]. If no [arg format] was specified it is +-assumed to be the regular serialization of a table of contents. +- +-[para] +- +-Otherwise the object will use the attached import manager to convert +-the data from the specified format to a serialization it can handle. +- +-In that case an error will be thrown if the container has no import +-manager attached to it. +- +-[para] +- +-The result of the method is the empty string. +- +- +-[call [arg objectName] [method {deserialize +=}] [arg data] [opt [arg format]]] +- +-This method behaves like [method {deserialize =}] in its essentials, +-except that it merges the table of contents in the [arg data] to its +-contents instead of replacing it. +- +-The method will throw an error if merging is not possible, i.e. would +-produce an invalid table. The existing content is left unchanged in +-that case. +- +-[para] +- +-The result of the method is the empty string. +- +- +-[call [arg objectName] [method serialize] [opt [arg format]]] +- +-This method returns the table of contents contained in the object. If no +-[arg format] is not specified the returned result is the canonical +-serialization of its contents. +- +-[para] +- +-Otherwise the object will use the attached export manager to convert +-the data to the specified format. +- +-In that case an error will be thrown if the container has no export +-manager attached to it. +- +- +-[list_end] +- +- +-[include include/serialization.inc] +-[vset CATEGORY doctools] +-[include ../doctools2base/include/feedback.inc] +-[manpage_end] +diff --git a/modules/struct/graph.man b/modules/struct/graph.man +deleted file mode 100644 +index 5cf99a6..0000000 +--- a/modules/struct/graph.man ++++ /dev/null +@@ -1,1007 +0,0 @@ +-[comment {-*- tcl -*-}] +-[manpage_begin struct::graph n 2.4] +-[copyright {2002-2009 Andreas Kupries }] +-[moddesc {Tcl Data Structures}] +-[titledesc {Create and manipulate directed graph objects}] +-[category {Data structures}] +-[require Tcl 8.4] +-[require struct::graph [opt 2.4]] +-[require struct::list [opt 1.5]] +-[require struct::set [opt 2.2.3]] +-[description] +-[para] +- +- +-A directed graph is a structure containing two collections of +-elements, called [term nodes] and [term arcs] respectively, together +-with a relation ("connectivity") that places a general structure upon +-the nodes and arcs. +- +-[para] +- +-Each arc is connected to two nodes, one of which is called the +- +-[term source] and the other the [term target]. This imposes a +-direction upon the arc, which is said to go from the source to the +-target. It is allowed that source and target of an arc are the same +-node. Such an arc is called a [term loop]. +- +-Whenever a node is either the source or target of an arc both are said +-to be [term adjacent]. This extends into a relation between nodes, +-i.e. if two nodes are connected through at least one arc they are said +-to be [term adjacent] too. +- +-[para] +- +-Each node can be the source and target for any number of arcs. The +-former are called the [term {outgoing arcs}] of the node, the latter +-the [term {incoming arcs}] of the node. The number of arcs in either +-set is called the [term in-degree] resp. the [term out-degree] of the +-node. +- +-[para] +- +-In addition to maintaining the node and arc relationships, this graph +-implementation allows any number of named [term attributes] to be +-associated with the graph itself, and each node or arc. +- +-[para] +- +-[emph Note:] The major version of the package [package struct] has +-been changed to version 2.0, due to backward incompatible changes in +-the API of this module. Please read the section +- +-[sectref {Changes for 2.0}] for a full list of all changes, +-incompatible and otherwise. +- +-[para] +- +-[emph Note:] A C-implementation of the command can be had from the +-location [uri http://www.purl.org/NET/schlenker/tcl/cgraph]. See also +-[uri http://wiki.tcl.tk/cgraph]. This implementation uses a bit less +-memory than the tcl version provided here directly, and is faster. Its +-support is limited to versions of the package before 2.0. +- +-[para] +- +-As of version 2.2 of this package a critcl based C implementation is +-available from here as well. This implementation however requires Tcl +-8.4 to run. +- +-[para] +- +-The main command of the package is: +- +-[list_begin definitions] +- +-[call [cmd ::struct::graph] [opt [arg graphName]] \ +- [opt "[const =]|[const :=]|[const as]|[const deserialize] [arg source]"]] +- +-The command creates a new graph object with an associated global Tcl +-command whose name is [arg graphName]. This command may be used to +-invoke various operations on the graph. It has the following general +-form: +- +-[list_begin definitions] +-[call [cmd graphName] [arg option] [opt [arg "arg arg ..."]]] +- +-[arg Option] and the [arg arg]s determine the exact behavior of the +-command. +- +-[list_end] +-[para] +- +-If [arg graphName] is not specified a unique name will be generated by +-the package itself. If a [arg source] is specified the new graph will +-be initialized to it. For the operators [const =], [const :=], and +-[const as] the [arg source] argument is interpreted as the name of +-another graph object, and the assignment operator [method =] will be +-executed. For the operator [const deserialize] the [arg source] is a +-serialized graph object and [method deserialize] will be executed. +- +-[para] +- +-In other words +-[para] +-[example { +- ::struct::graph mygraph = b +-}] +-[para] +-is equivalent to +-[para] +-[example { +- ::struct::graph mygraph +- mygraph = b +-}] +-[para] +-and +-[para] +-[example { +- ::struct::graph mygraph deserialize $b +-}] +-[para] +-is equivalent to +-[para] +-[example { +- ::struct::graph mygraph +- mygraph deserialize $b +-}] +- +-[list_end] +- +-[para] +- +-The following commands are possible for graph objects: +- +-[list_begin definitions] +- +-[call [arg graphName] [method =] [arg sourcegraph]] +- +-This is the [term assignment] operator for graph objects. It copies +-the graph contained in the graph object [arg sourcegraph] over the +-graph data in [arg graphName]. The old contents of [arg graphName] are +-deleted by this operation. +- +-[para] +- +-This operation is in effect equivalent to +-[para] +-[example_begin] +- [arg graphName] [method deserialize] [lb][arg sourcegraph] [method serialize][rb] +-[example_end] +- +-[para] +- +-The operation assumes that the [arg sourcegraph] provides the method +-[method serialize] and that this method returns a valid graph +-serialization. +- +- +-[call [arg graphName] [method -->] [arg destgraph]] +- +-This is the [term {reverse assignment}] operator for graph objects. It +-copies the graph contained in the graph object [arg graphName] over +-the graph data in the object [arg destgraph]. +- +-The old contents of [arg destgraph] are deleted by this operation. +- +-[para] +- +-This operation is in effect equivalent to +-[para] +-[example_begin] +- [arg destgraph] [method deserialize] [lb][arg graphName] [method serialize][rb] +-[example_end] +- +-[para] +- +-The operation assumes that the [arg destgraph] provides the method +-[method deserialize] and that this method takes a graph serialization. +- +- +-[call [arg graphName] [method append] [arg key] [arg value]] +- +-Appends a [arg value] to one of the keyed values associated with the graph. +-Returns the new value given to the attribute [arg key]. +- +- +-[call [arg graphName] [method deserialize] [arg serialization]] +- +-This is the complement to [method serialize]. It replaces the graph +-data in [arg graphName] with the graph described by the +-[arg serialization] value. The old contents of [arg graphName] are +-deleted by this operation. +- +- +-[call [arg graphName] [method destroy]] +- +-Destroys the graph, including its storage space and associated command. +- +- +-[call [arg graphName] [method {arc append}] [arg arc] [arg key] [arg value]] +- +-Appends a [arg value] to one of the keyed values associated with an +-[arg arc]. Returns the new value given to the attribute [arg key]. +- +- +-[call [arg graphName] [method {arc attr}] [arg key]] +-[call [arg graphName] [method {arc attr}] [arg key] [option -arcs] [arg list]] +-[call [arg graphName] [method {arc attr}] [arg key] [option -glob] [arg globpattern]] +-[call [arg graphName] [method {arc attr}] [arg key] [option -regexp] [arg repattern]] +- +-This method retrieves the value of the attribute named [arg key], for +-all arcs in the graph (matching the restriction specified via one of +-the possible options) and having the specified attribute. +- +-[para] +- +-The result is a dictionary mapping from arc names to the value of +-attribute [arg key] at that arc. +- +-Arcs not having the attribute [arg key], or not passing a +-specified restriction, are not listed in the result. +- +-[para] +- +-The possible restrictions are: +- +-[list_begin options] +-[opt_def -arcs] +- +-The value is a list of arcs. Only the arcs mentioned in this list +-are searched for the attribute. +- +-[opt_def -glob] +- +-The value is a glob pattern. Only the arcs in the graph whose names +-match this pattern are searched for the attribute. +- +-[opt_def -regexp] +- +-The value is a regular expression. Only the arcs in the graph whose +-names match this pattern are searched for the attribute. +- +-[list_end] +-[para] +- +- +-[call [arg graphName] [method {arc delete}] [arg arc] [opt "[arg arc] ..."]] +- +-Remove the specified arcs from the graph. +- +- +-[call [arg graphName] [method {arc exists}] [arg arc]] +- +-Return true if the specified [arg arc] exists in the graph. +- +- +-[call [arg graphName] [method {arc flip}] [arg arc]] +- +-Reverses the direction of the named [arg arc], i.e. the source and +-target nodes of the arc are exchanged with each other. +- +- +-[call [arg graphName] [method {arc get}] [arg arc] [arg key]] +- +-Returns the value associated with the key [arg key] for the [arg arc]. +- +- +-[call [arg graphName] [method {arc getall}] [arg arc] [opt [arg pattern]]] +- +-Returns a dictionary (suitable for use with [lb][cmd {array set}][rb]) +-for the [arg arc]. +- +-If the [arg pattern] is specified only the attributes whose names +-match the pattern will be part of the returned dictionary. The pattern +-is a [cmd glob] pattern. +- +- +-[call [arg graphName] [method {arc getunweighted}]] +- +-Returns a list containing the names of all arcs in the graph which +-have no weight associated with them. +- +- +-[call [arg graphName] [method {arc getweight}] [arg arc]] +- +-Returns the weight associated with the [arg arc]. Throws an error if +-the arc has no weight associated with it. +- +- +-[call [arg graphName] [method {arc keys}] [arg arc] [opt [arg pattern]]] +- +-Returns a list of keys for the [arg arc]. +- +-If the [arg pattern] is specified only the attributes whose names +-match the pattern will be part of the returned list. The pattern is a +-[cmd glob] pattern. +- +- +-[call [arg graphName] [method {arc keyexists}] [arg arc] [arg key]] +- +-Return true if the specified [arg key] exists for the [arg arc]. +- +- +-[call [arg graphName] [method {arc insert}] [arg start] [arg end] [opt [arg child]]] +- +-Insert an arc named [arg child] into the graph beginning at the node +-[arg start] and ending at the node [arg end]. If the name of the new +-arc is not specified the system will generate a unique name of the +-form [emph arc][arg x]. +- +- +-[call [arg graphName] [method {arc lappend}] [arg arc] [arg key] [arg value]] +- +-Appends a [arg value] (as a list) to one of the keyed values +-associated with an [arg arc]. Returns the new value given to the +-attribute [arg key]. +- +- +-[call [arg graphName] [method {arc rename}] [arg arc] [arg newname]] +- +-Renames the arc [arg arc] to [arg newname]. An error is thrown if +-either the arc does not exist, or a arc with name [arg newname] does +-exist. The result of the command is the new name of the arc. +- +- +-[call [arg graphName] [method {arc set}] [arg arc] [arg key] [opt [arg value]]] +- +-Set or get one of the keyed values associated with an arc. +- +-An arc may have any number of keyed values associated with it. +-If [arg value] is not specified, this command returns the current value assigned to the key; +-if [arg value] is specified, this command assigns that value to the key, and returns +-that value. +- +- +-[call [arg graphName] [method {arc setunweighted}] [opt [arg weight]]] +- +-Sets the weight of all arcs without a weight to [arg weight]. Returns +-the empty string as its result. If not present [arg weight] defaults +-to [const 0]. +- +- +-[call [arg graphName] [method {arc setweight}] [arg arc] [arg weight]] +- +-Sets the weight of the [arg arc] to [arg weight]. Returns [arg weight]. +- +- +-[call [arg graphName] [method {arc unsetweight}] [arg arc]] +- +-Removes the weight of the [arg arc], if present. Does nothing +-otherwise. Returns the empty string. +- +- +-[call [arg graphName] [method {arc hasweight}] [arg arc]] +- +-Determines if the [arg arc] has a weight associated with it. The +-result is a boolean value, [const True] if a weight is defined, and +-[const False] otherwise. +- +- +-[call [arg graphName] [method {arc source}] [arg arc]] +- +-Return the node the given [arg arc] begins at. +- +- +-[call [arg graphName] [method {arc target}] [arg arc]] +- +-Return the node the given [arg arc] ends at. +- +- +-[call [arg graphName] [method {arc nodes}] [arg arc]] +- +-Return the nodes the given [arg arc] begins and ends at, +-as a two-element list. +- +- +-[call [arg graphName] [method {arc move-source}] [arg arc] [arg newsource]] +- +-Changes the source node of the arc to [arg newsource]. It can be said +-that the arc rotates around its target node. +- +- +-[call [arg graphName] [method {arc move-target}] [arg arc] [arg newtarget]] +- +-Changes the target node of the arc to [arg newtarget]. It can be said +-that the arc rotates around its source node. +- +- +-[call [arg graphName] [method {arc move}] [arg arc] [arg newsource] [arg newtarget]] +- +-Changes both source and target nodes of the arc to [arg newsource], +-and [arg newtarget] resp. +- +- +-[call [arg graphName] [method {arc unset}] [arg arc] [arg key]] +- +-Remove a keyed value from the arc [arg arc]. The method will do +-nothing if the [arg key] does not exist. +- +- +-[call [arg graphName] [method {arc weights}]] +- +-Returns a dictionary whose keys are the names of all arcs which have a +-weight associated with them, and the values are these weights. +- +- +-[call [arg graphName] [method arcs] [opt "-key [arg key]"] [opt "-value [arg value]"] [opt "-filter [arg cmdprefix]"] [opt "-in|-out|-adj|-inner|-embedding [arg {node node...}]"]] +- +-Returns a list of arcs in the graph. If no restriction is specified a +-list containing all arcs is returned. Restrictions can limit the list +-of returned arcs based on the nodes that are connected by the arc, on +-the keyed values associated with the arc, or both. A general filter +-command can be used as well. The restrictions that involve connected +-nodes take a variable number of nodes as argument, specified after the +-name of the restriction itself. +- +-[para] +- +-The restrictions imposed by either [option -in], [option -out], +-[option -adj], [option -inner], or [option -embedded] are applied +-first. Specifying more than one of them is illegal. +- +-[para] +- +-After that the restrictions set via [option -key] (and +-[option -value]) are applied. Specifying more than one [option -key] +-(and [option -value]) is illegal. Specifying [option -value] alone, +-without [option -key] is illegal as well. +- +-[para] +- +-Any restriction set through [option -filter] is applied +-last. Specifying more than one [option -filter] is illegal. +- +-[para] +- +-Coming back to the restrictions based on a set of nodes, the command +-recognizes the following switches: +- +-[list_begin definitions] +-[def [option -in]] +- +-Return a list of all arcs whose target is one of the nodes in the set +-of nodes. I.e. it computes the union of all incoming arcs of the nodes +-in the set. +- +-[def [option -out]] +- +-Return a list of all arcs whose source is one of the nodes in the set +-of nodes. I.e. it computes the union of all outgoing arcs of the nodes +-in the set. +- +-[def [option -adj]] +- +-Return a list of all arcs adjacent to at least one of the nodes in the +-set. This is the union of the nodes returned by [option -in] and +-[option -out]. +- +-[def [option -inner]] +- +-Return a list of all arcs which are adjacent to two of the nodes in +-the set. This is the set of arcs in the subgraph spawned by the +-specified nodes. +- +-[def [option -embedding]] +- +-Return a list of all arcs adjacent to exactly one of the nodes in the +-set. This is the set of arcs connecting the subgraph spawned by the +-specified nodes to the rest of the graph. +- +-[def "[option -key] [arg key]"] +- +-Limit the list of arcs that are returned to those arcs that have an +-associated key [arg key]. +- +-[def "[option -value] [arg value]"] +- +-This restriction can only be used in combination with +- +-[option -key]. It limits the list of arcs that are returned to those +-arcs whose associated key [arg key] has the value [arg value]. +- +- +-[def "[option -filter] [arg cmdrefix]"] +- +-Limit the list of arcs that are returned to those arcs that pass the +-test. The command in [arg cmdprefix] is called with two arguments, the +-name of the graph object, and the name of the arc in question. It is +-executed in the context of the caller and has to return a boolean +-value. Arcs for which the command returns [const false] are removed +-from the result list before it is returned to the caller. +- +-[list_end] +- +- +-[call [arg graphName] [method lappend] [arg key] [arg value]] +- +-Appends a [arg value] (as a list) to one of the keyed values +-associated with the graph. Returns the new value given to the +-attribute [arg key]. +- +- +-[call [arg graphName] [method {node append}] [arg node] [arg key] [arg value]] +- +-Appends a [arg value] to one of the keyed values associated with an +-[arg node]. Returns the new value given to the attribute [arg key]. +- +- +-[call [arg graphName] [method {node attr}] [arg key]] +-[call [arg graphName] [method {node attr}] [arg key] [option -nodes] [arg list]] +-[call [arg graphName] [method {node attr}] [arg key] [option -glob] [arg globpattern]] +-[call [arg graphName] [method {node attr}] [arg key] [option -regexp] [arg repattern]] +- +-This method retrieves the value of the attribute named [arg key], for +-all nodes in the graph (matching the restriction specified via one of +-the possible options) and having the specified attribute. +- +-[para] +- +-The result is a dictionary mapping from node names to the value of +-attribute [arg key] at that node. +- +-Nodes not having the attribute [arg key], or not passing a +-specified restriction, are not listed in the result. +- +-[para] +- +-The possible restrictions are: +- +-[list_begin options] +-[opt_def -nodes] +- +-The value is a list of nodes. Only the nodes mentioned in this list +-are searched for the attribute. +- +-[opt_def -glob] +- +-The value is a glob pattern. Only the nodes in the graph whose names +-match this pattern are searched for the attribute. +- +-[opt_def -regexp] +- +-The value is a regular expression. Only the nodes in the graph whose +-names match this pattern are searched for the attribute. +- +-[list_end] +-[para] +- +- +-[call [arg graphName] [method {node degree}] [opt -in|-out] [arg node]] +- +-Return the number of arcs adjacent to the specified [arg node]. If one +-of the restrictions [option -in] or [option -out] is given only the +-incoming resp. outgoing arcs are counted. +- +- +-[call [arg graphName] [method {node delete}] [arg node] [opt "[arg node]..."]] +- +-Remove the specified nodes from the graph. All of the nodes' arcs +-will be removed as well to prevent unconnected arcs. +- +- +-[call [arg graphName] [method {node exists}] [arg node]] +- +-Return true if the specified [arg node] exists in the graph. +- +- +-[call [arg graphName] [method {node get}] [arg node] [arg key]] +- +-Return the value associated with the key [arg key] for the [arg node]. +- +- +-[call [arg graphName] [method {node getall}] [arg node] [opt [arg pattern]]] +- +-Returns a dictionary (suitable for use with [lb][cmd {array set}][rb]) +-for the [arg node]. +- +-If the [arg pattern] is specified only the attributes whose names +-match the pattern will be part of the returned dictionary. The pattern +-is a [cmd glob] pattern. +- +- +-[call [arg graphName] [method {node keys}] [arg node] [opt [arg pattern]]] +- +-Returns a list of keys for the [arg node]. +- +-If the [arg pattern] is specified only the attributes whose names +-match the pattern will be part of the returned list. The pattern is a +-[cmd glob] pattern. +- +- +-[call [arg graphName] [method {node keyexists}] [arg node] [arg key]] +- +-Return true if the specified [arg key] exists for the [arg node]. +- +- +-[call [arg graphName] [method {node insert}] [opt [arg node]...]] +- +-Insert one or more nodes into the graph. The new nodes have no arcs +-connected to them. If no node is specified one node will be inserted, +-and the system will generate a unique name of the form +-[emph node][arg x] for it. +- +- +-[call [arg graphName] [method {node lappend}] [arg node] [arg key] [arg value]] +- +-Appends a [arg value] (as a list) to one of the keyed values +-associated with an [arg node]. Returns the new value given to the +-attribute [arg key]. +- +- +-[call [arg graphName] [method {node opposite}] [arg node] [arg arc]] +- +-Return the node at the other end of the specified [arg arc], which has +-to be adjacent to the given [arg node]. +- +- +-[call [arg graphName] [method {node rename}] [arg node] [arg newname]] +- +-Renames the node [arg node] to [arg newname]. An error is thrown if +-either the node does not exist, or a node with name [arg newname] does +-exist. The result of the command is the new name of the node. +- +- +-[call [arg graphName] [method {node set}] [arg node] [arg key] [opt [arg value]]] +- +-Set or get one of the keyed values associated with a node. A node may have any +-number of keyed values associated with it. If [arg value] is not +-specified, this command returns the current value assigned to the key; +-if [arg value] is specified, this command assigns that value to the +-key. +- +- +-[call [arg graphName] [method {node unset}] [arg node] [arg key]] +- +-Remove a keyed value from the node [arg node]. The method will do +-nothing if the [arg key] does not exist. +- +- +-[call [arg graphName] [method nodes] [opt "-key [arg key]"] [opt "-value [arg value]"] [opt "-filter [arg cmdprefix]"] [opt "-in|-out|-adj|-inner|-embedding [arg node] [arg node]..."]] +- +-Return a list of nodes in the graph. Restrictions can limit the list +-of returned nodes based on neighboring nodes, or based on the keyed +-values associated with the node. The restrictions that involve +-neighboring nodes have a list of nodes as argument, specified after +-the name of the restriction itself. +- +-[para] +- +-The possible restrictions are the same as for method +-[method arcs]. The exact meanings change slightly, as they operate on +-nodes instead of arcs. The command recognizes: +- +-[list_begin definitions] +-[def [option -in]] +- +-Return a list of all nodes with at least one outgoing arc ending in a +-node found in the specified set of nodes. Alternatively specified as +-the set of source nodes for the [option -in] arcs of the node set. The +-[term {incoming neighbours}]. +- +-[def [option -out]] +- +-Return a list of all nodes with at least one incoming arc starting in +-a node found in the specified set of nodes. Alternatively specified as +-the set of target nodes for the [option -out] arcs of the node +-set. The [term {outgoing neighbours}]. +- +-[def [option -adj]] +- +-This is the union of the nodes returned by [option -in] and +-[option -out]. The [term neighbours]. +- +-[def [option -inner]] +- +-The set of neighbours (see [option -adj] above) which are also in the +-set of nodes. I.e. the intersection between the set of nodes and the +-neighbours per [option -adj]. +- +-[def [option -embedding]] +- +-The set of neighbours (see [option -adj] above) which are not in the +-set of nodes. I.e. the difference between the neighbours as per +-[option -adj], and the set of nodes. +- +-[def "[option -key] [arg key]"] +- +-Limit the list of nodes that are returned to those nodes that have an +-associated key [arg key]. +- +-[def "[option -value] [arg value]"] +- +-This restriction can only be used in combination with +-[option -key]. It limits the list of nodes that are returned to those +-nodes whose associated key [arg key] has the value [arg value]. +- +-[def "[option -filter] [arg cmdrefix]"] +- +-Limit the list of nodes that are returned to those nodes that pass the +-test. The command in [arg cmdprefix] is called with two arguments, the +-name of the graph object, and the name of the node in question. It is +-executed in the context of the caller and has to return a boolean +-value. Nodes for which the command returns [const false] are removed +-from the result list before it is returned to the caller. +- +-[list_end] +- +- +-[call [arg graphName] [method get] [arg key]] +- +-Return the value associated with the key [arg key] for the graph. +- +- +-[call [arg graphName] [method getall] [opt [arg pattern]]] +- +-Returns a dictionary (suitable for use with [lb][cmd {array set}][rb]) +-for the whole graph. +- +-If the [arg pattern] is specified only the attributes whose names +-match the pattern will be part of the returned dictionary. The pattern +-is a [cmd glob] pattern. +- +- +-[call [arg graphName] [method keys] [opt [arg pattern]]] +- +-Returns a list of keys for the whole graph. +- +-If the [arg pattern] is specified only the attributes whose names +-match the pattern will be part of the returned list. The pattern is a +-[cmd glob] pattern. +- +- +-[call [arg graphName] [method keyexists] [arg key]] +- +-Return true if the specified [arg key] exists for the whole graph. +- +- +-[call [arg graphName] [method serialize] [opt [arg node]...]] +- +-This method serializes the sub-graph spanned up by the [arg node]s. In +-other words it returns a tcl value completely describing that +-graph. If no nodes are specified the whole graph will be serialized. +- +-This allows, for example, the transfer of graph objects (or parts +-thereof) over arbitrary channels, persistence, etc. +- +-This method is also the basis for both the copy constructor and +-the assignment operator. +- +-[para] +- +-The result of this method has to be semantically identical over all +-implementations of the graph interface. This is what will enable us to +-copy graph data between different implementations of the same +-interface. +- +-[para] +- +-The result is a list containing a multiple of three items, plus one! +-In other words, '[lb]llength $serial[rb] % 3 == 1'. Valid values +-include 1, 4, 7, ... +- +-[para] +- +-The last element of the list is a dictionary containing the attributes +-associated with the whole graph. +- +-Regarding the other elements; each triple consists of +- +-[list_begin enumerated] +-[enum] +-The name of the node to be described, +- +-[enum] +-A dictionary containing the attributes associated with the node, +- +-[enum] +-And a list describing all the arcs starting at that node. +-[list_end] +-[para] +- +-The elements of the arc list are lists containing three or four +-elements each, i.e. +- +-[list_begin enumerated] +-[enum] +-The name of the arc described by the element, +- +-[enum] +- +-A reference to the destination node of the arc. This reference is an +-integer number given the index of that node in the main serialization +-list. As that it is greater than or equal to zero, less than the +-length of the serialization, and a multiple of three. +- +-[emph Note:] For internal consistency no arc name may be used twice, +-whether in the same node, or at some other node. This is a global +-consistency requirement for the serialization. +- +-[enum] +-And a dictionary containing the attributes associated with the arc. +- +-[enum] +-The weight associated with the arc. This value is optional. Its +-non-presence means that the arc in question has no weight associated +-with it. +- +-[para][emph Note:] This information is new, compared to the +-serialization of [package graph] 2.3 and earlier. By making it an +-optional element the new format is maximally compatible with the +-old. This means that any graph not using weights will generate a +-serialization which is still understood by the older graph package. A +-serialization will not be understood any longer by the older packages +-if, and only if the graph it was generated from actually has arcs with +-weights. +- +-[list_end] +-[para] +- +-For all attribute dictionaries they keys are the names of the +-attributes, and the values are the values for each name. +- +-[para] +- +-[emph Note:] The order of the nodes in the serialization has no +-relevance, nor has the order of the arcs per node. +- +-[example { +- # A possible serialization for the graph structure +- # +- # d -----> %2 +- # / ^ \\ +- # / / \\ +- # / b \\ +- # / / \\ +- # %1 <- a - %0 e +- # ^ \\ / +- # \\ c / +- # \\ \\ / +- # \\ v v +- # f ------ %3 +- # is +- # +- # %3 {} {{f 6 {}}} %0 {} {{a 6 {}} {b 9 {}} {c 0 {}}} %1 {} {{d 9 {}}} %2 {} {{e 0 {}}} {} +- # +- # This assumes that the graph has neither attribute data nor weighted arcs. +-}] +-[para] +- +- +-[call [arg graphName] [method set] [arg key] [opt [arg value]]] +- +-Set or get one of the keyed values associated with a graph. A graph +-may have any number of keyed values associated with it. If [arg value] +-is not specified, this command returns the current value assigned to +-the key; if [arg value] is specified, this command assigns that value +-to the key. +- +- +-[call [arg graphName] [method swap] [arg node1] [arg node2]] +- +-Swap the position of [arg node1] and [arg node2] in the graph. +- +- +-[call [arg graphName] [method unset] [arg key]] +- +-Remove a keyed value from the graph. The method will do nothing if the +-[arg key] does not exist. +- +- +-[call [arg graphName] [method walk] [arg node] \ +- [opt "-order [arg order]"] \ +- [opt "-type [arg type]"] \ +- [opt "-dir [arg direction]"] \ +- -command [arg cmd]] +- +-Perform a breadth-first or depth-first walk of the graph starting at +-the node [arg node] going in either the direction of outgoing or +-opposite to the incoming arcs. +- +-[para] +- +-The type of walk, breadth-first or depth-first, is determined by the +-value of [arg type]; [const bfs] indicates breadth-first, +- +-[const dfs] indicates depth-first. Depth-first is the default. +- +-[para] +- +-The order of the walk, pre-order, post-order or both-order is +-determined by the value of [arg order]; [const pre] indicates +-pre-order, [const post] indicates post-order, [const both] indicates +-both-order. Pre-order is the default. Pre-order walking means that a +-node is visited before any of its neighbors (as defined by the +- +-[arg direction], see below). Post-order walking means that a parent is +-visited after any of its neighbors. Both-order walking means that a +-node is visited before [emph and] after any of its neighbors. The +-combination of a breadth-first walk with post- or both-order is illegal. +- +-[para] +- +-The direction of the walk is determined by the value of [arg dir]; +-[const backward] indicates the direction opposite to the incoming +-arcs, [const forward] indicates the direction of the outgoing arcs. +- +-[para] +- +-As the walk progresses, the command [arg cmd] will be evaluated at +-each node, with the mode of the call ([const enter] or +-[const leave]) and values [arg graphName] and the name of the current +-node appended. For a pre-order walk, all nodes are [const enter]ed, for a +-post-order all nodes are left. In a both-order walk the first visit of +-a node [const enter]s it, the second visit [const leave]s it. +- +-[list_end] +- +- +-[section {Changes for 2.0}] +-The following noteworthy changes have occurred: +- +-[list_begin enumerated] +-[enum] +- +-The API for accessing attributes and their values has been +-simplified. +- +-[para] +- +-All functionality regarding the default attribute "data" has been +-removed. This default attribute does not exist anymore. All accesses +-to attributes have to specify the name of the attribute in +-question. This backward [emph incompatible] change allowed us to +-simplify the signature of all methods handling attributes. +- +-[para] +- +-Especially the flag [option -key] is not required anymore, even more, +-its use is now forbidden. Please read the documentation for the arc +-and node methods [method set], [method get], [method getall], +- +-[method unset], [method append], [method lappend], [method keyexists] +-and [method keys] for a description of the new API's. +- +-[enum] +- +-The methods [method keys] and [method getall] now take an optional +-pattern argument and will return only attribute data for keys matching +-this pattern. +- +-[enum] +- +-Arcs and nodes can now be renamed. See the documentation for the +-methods [method {arc rename}] and [method {node rename}]. +- +-[enum] +- +-The structure has been extended with API's for the serialization and +-deserialization of graph objects, and a number of operations based on +-them (graph assignment, copy construction). +- +-[para] +- +-Please read the documentation for the methods [method serialize], +-[method deserialize], [method =], and [method -->], and the +-documentation on the construction of graph objects. +- +-[para] +- +-Beyond the copying of whole graph objects these new API's also enable +-the transfer of graph objects over arbitrary channels and for easy +-persistence. +- +- +-[enum] +- +-A new method, [method attr], was added to both [method arc] and +-[method node] allowing the query and retrieval of attribute data +-without regard to arc and node relationships. +- +-[enum] +- +-Both methods [method arcs] and [method nodes] have been extended with +-the ability to select arcs and nodes based on an arbitrary filtering +-criterium. +- +- +-[list_end] +- +- +-[section {BUGS, IDEAS, FEEDBACK}] +- +-This document, and the package it describes, will undoubtedly contain +-bugs and other problems. +- +-Please report such in the category [emph {struct :: graph}] of the +-[uri {http://sourceforge.net/tracker/?group_id=12883} {Tcllib SF Trackers}]. +- +-Please also report any ideas for enhancements you may have for either +-package and/or documentation. +- +- +-[keywords graph cgraph serialization] +-[keywords edge arc node vertex subgraph neighbour] +-[keywords adjacent loop degree] +-[manpage_end] +-- +1.7.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 Mon Jul 11 11:51:32 2011 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Mon, 11 Jul 2011 09:51:32 +0000 Subject: [csw-devel] SF.net SVN: gar:[15037] csw/mgar/pkg/pinentry/trunk Message-ID: Revision: 15037 http://gar.svn.sourceforge.net/gar/?rev=15037&view=rev Author: dmichelsen Date: 2011-07-11 09:51:32 +0000 (Mon, 11 Jul 2011) Log Message: ----------- pinentry: Update to 0.8.1 Modified Paths: -------------- csw/mgar/pkg/pinentry/trunk/Makefile csw/mgar/pkg/pinentry/trunk/checksums Removed Paths: ------------- csw/mgar/pkg/pinentry/trunk/files/0002-ncurses-include.patch csw/mgar/pkg/pinentry/trunk/files/0003-TEMP_FAILURE_RETRY-macro-expansion.patch csw/mgar/pkg/pinentry/trunk/files/0004-adding-prereq-2.59-to-configure.ac.patch csw/mgar/pkg/pinentry/trunk/files/0005-Importing-getopt-posix-gnulib-module.patch csw/mgar/pkg/pinentry/trunk/files/0006-enabling-gnulib-getopt-module.patch Modified: csw/mgar/pkg/pinentry/trunk/Makefile =================================================================== --- csw/mgar/pkg/pinentry/trunk/Makefile 2011-07-11 09:48:15 UTC (rev 15036) +++ csw/mgar/pkg/pinentry/trunk/Makefile 2011-07-11 09:51:32 UTC (rev 15037) @@ -3,68 +3,41 @@ # $Id$ NAME = pinentry -VERSION = 0.7.6 +VERSION = 0.8.1 CATEGORIES = utils -DESCRIPTION = Allows entering passwords into gpg-agent. + +DESCRIPTION = Allows entering passwords into gpg-agent define BLURB endef -SPKG_SOURCEURL = http://www.gnupg.org/ -EXTRA_INC = $(prefix)/X11/include -EXTRA_LIB = $(prefix)/X11/lib -EXTRA_PKG_CONFIG_DIRS = $(prefix)/X11/lib + MASTER_SITES = ftp://ftp.gnupg.org/gcrypt/pinentry/ -PATCHFILES = 0002-ncurses-include.patch -PATCHFILES += 0003-TEMP_FAILURE_RETRY-macro-expansion.patch -PATCHFILES += 0004-adding-prereq-2.59-to-configure.ac.patch -PATCHFILES += 0005-Importing-getopt-posix-gnulib-module.patch -PATCHFILES += 0006-enabling-gnulib-getopt-module.patch -EXTRA_CFLAGS = -D__EXTENSIONS__ -EXTRA_CXXFLAGS = -D__EXTENSIONS__ -DISTFILES = $(NAME)-$(VERSION).tar.gz -UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz -RUNTIME_DEP_PKGS = CSWfconfig -RUNTIME_DEP_PKGS += CSWftype2 -RUNTIME_DEP_PKGS += CSWggettextrt -RUNTIME_DEP_PKGS += CSWglib2 -RUNTIME_DEP_PKGS += CSWgtk2 -RUNTIME_DEP_PKGS += CSWiconv -RUNTIME_DEP_PKGS += CSWlibatk -RUNTIME_DEP_PKGS += CSWlibcairo -RUNTIME_DEP_PKGS += CSWlibxext -RUNTIME_DEP_PKGS += CSWncurses -RUNTIME_DEP_PKGS += CSWpango -BUILD_DEP_PKGS = $(RUNTIME_DEP_PKGS) +DISTFILES = $(DISTNAME).tar.gz + +VENDOR_URL = http://www.gnupg.org/related_software/pinentry/ + +BUILD_DEP_PKGS += CSWlibgnugetopt-dev +BUILD_DEP_PKGS += CSWggettext-dev +BUILD_DEP_PKGS += CSWlibncurses-dev +BUILD_DEP_PKGS += CSWglib BUILD_DEP_PKGS += CSWgtk2devel -TEST_SCRIPTS = -CONFIGURE_ARGS = $(DIRPATHS) -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)) -# There's a problem with building on Solaris 10 as getopt.h is already present -# in /usr/include and conflicts with the one provided by gnulib. -# BUILD64 = 1 +RUNTIME_DEP_PKGS_CSWpinentry += CSWlibgnugetopt0 +RUNTIME_DEP_PKGS_CSWpinentry += CSWlibintl8 +RUNTIME_DEP_PKGS_CSWpinentry += CSWlibncurses5 +RUNTIME_DEP_PKGS_CSWpinentry += CSWglib +RUNTIME_DEP_PKGS_CSWpinentry += CSWgtk +RUNTIME_DEP_PKGS_CSWpinentry += CSWiconv +RUNTIME_DEP_PKGS_CSWpinentry += CSWglib2 +RUNTIME_DEP_PKGS_CSWpinentry += CSWftype2 +RUNTIME_DEP_PKGS_CSWpinentry += CSWgtk2 +RUNTIME_DEP_PKGS_CSWpinentry += CSWlibatk +RUNTIME_DEP_PKGS_CSWpinentry += CSWfconfig +RUNTIME_DEP_PKGS_CSWpinentry += CSWpango +RUNTIME_DEP_PKGS_CSWpinentry += CSWlibcairo2 -include gar/category.mk +# This is passed to curses/, but not pinentry/ +EXTRA_CPPFLAGS += -I$(includedir)/ncurses -# Switch this target on when working with gnulib. -# pre-configure-modulated: -# # To pick up the gnulib bits. -# ( \ -# cd $(WORKSRC) \ -# && \ -# aclocal -I m4 \ -# && \ -# autoconf -I m4 \ -# && \ -# autoheader \ -# && \ -# automake --add-missing --foreign \ -# ) -# @$(MAKECOOKIE) +EXTRA_LINKER_FLAGS += -lgnugetopt -# It works with SOS11 now, thanks to -# 0003-TEMP_FAILURE_RETRY-macro-expansion.patch -# GARCOMPILER = SOS12 +include gar/category.mk Modified: csw/mgar/pkg/pinentry/trunk/checksums =================================================================== --- csw/mgar/pkg/pinentry/trunk/checksums 2011-07-11 09:48:15 UTC (rev 15036) +++ csw/mgar/pkg/pinentry/trunk/checksums 2011-07-11 09:51:32 UTC (rev 15037) @@ -1,6 +1 @@ -1cfd306236b7fb0bc01a2a408f4f5abb 0002-ncurses-include.patch -acafe7b0e415b707d2ab91dd5c24ac68 0003-TEMP_FAILURE_RETRY-macro-expansion.patch -9ce352e0abab7435d54123ad3bad03ce 0004-adding-prereq-2.59-to-configure.ac.patch -b2817a6ea1682a53e6d89ea96e64d5fc 0005-Importing-getopt-posix-gnulib-module.patch -c4440acb2da95db03342e45eb10bec4d 0006-enabling-gnulib-getopt-module.patch -5a4f676375fa882009da02013d77210f pinentry-0.7.6.tar.gz +81f99904daee5331eb6738408bb024b6 pinentry-0.8.1.tar.gz Deleted: csw/mgar/pkg/pinentry/trunk/files/0002-ncurses-include.patch =================================================================== --- csw/mgar/pkg/pinentry/trunk/files/0002-ncurses-include.patch 2011-07-11 09:48:15 UTC (rev 15036) +++ csw/mgar/pkg/pinentry/trunk/files/0002-ncurses-include.patch 2011-07-11 09:51:32 UTC (rev 15037) @@ -1,25 +0,0 @@ -From 257626c95990b2f220bccf2fbc08e51d4eb07e76 Mon Sep 17 00:00:00 2001 -From: =?utf-8?q?Maciej=20Blizi=C5=84ski?= -Date: Tue, 8 Sep 2009 20:02:57 +0100 -Subject: [PATCH 2/2] ncurses include - ---- - pinentry/pinentry-curses.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -diff --git a/pinentry/pinentry-curses.c b/pinentry/pinentry-curses.c -index b4417fb..60721f1 100644 ---- a/pinentry/pinentry-curses.c -+++ b/pinentry/pinentry-curses.c -@@ -22,7 +22,7 @@ - #include - #endif - #include --#include -+#include - #include - #include - #include --- -1.6.3.2 - Deleted: csw/mgar/pkg/pinentry/trunk/files/0003-TEMP_FAILURE_RETRY-macro-expansion.patch =================================================================== --- csw/mgar/pkg/pinentry/trunk/files/0003-TEMP_FAILURE_RETRY-macro-expansion.patch 2011-07-11 09:48:15 UTC (rev 15036) +++ csw/mgar/pkg/pinentry/trunk/files/0003-TEMP_FAILURE_RETRY-macro-expansion.patch 2011-07-11 09:51:32 UTC (rev 15037) @@ -1,60 +0,0 @@ -From e5752fdc0313d3b2ec35d8192bdeb39c25e0795c Mon Sep 17 00:00:00 2001 -From: Maciej Blizinski -Date: Fri, 4 Dec 2009 18:55:28 +0100 -Subject: [PATCH] TEMP_FAILURE_RETRY macro expansion - ---- - secmem/util.c | 22 ++++++++++++++++++++-- - 1 files changed, 20 insertions(+), 2 deletions(-) - -diff --git a/secmem/util.c b/secmem/util.c -index 580fd34..0ee1e8d 100644 ---- a/secmem/util.c -+++ b/secmem/util.c -@@ -32,6 +32,11 @@ - - #include "util.h" - -+/* -+ * This macro does not work with Sun Studio 11. -+ */ -+ -+#if 0 - #ifndef TEMP_FAILURE_RETRY - #define TEMP_FAILURE_RETRY(expression) \ - (__extension__ \ -@@ -40,6 +45,7 @@ - while (__result == -1L && errno == EINTR); \ - __result; })) - #endif -+#endif - - #ifndef HAVE_DOSISH_SYSTEM - static int uid_set = 0; -@@ -53,9 +59,21 @@ ssize_t xwrite(int fd, const void *data, size_t bytes) - size_t todo; - ssize_t written = 0; - -- for (ptr = (char *)data, todo = bytes; todo; ptr += written, todo -= written) -- if ((written = TEMP_FAILURE_RETRY(write(fd, ptr, todo))) < 0) -+ for (ptr = (char *)data, todo = bytes; todo; ptr += written, todo -= written) { -+ -+ do { -+ written = (long int) write(fd, ptr, todo); -+ } while (written == -1L && errno == EINTR); -+ -+ if (written < 0) - break; -+ } -+ /* -+ * Original code inside the for loop: -+ * -+ * if ((written = TEMP_FAILURE_RETRY(write(fd, ptr, todo))) < 0) -+ * break; -+ */ - return written; - } - --- -1.6.5.1 - Deleted: csw/mgar/pkg/pinentry/trunk/files/0004-adding-prereq-2.59-to-configure.ac.patch =================================================================== --- csw/mgar/pkg/pinentry/trunk/files/0004-adding-prereq-2.59-to-configure.ac.patch 2011-07-11 09:48:15 UTC (rev 15036) +++ csw/mgar/pkg/pinentry/trunk/files/0004-adding-prereq-2.59-to-configure.ac.patch 2011-07-11 09:51:32 UTC (rev 15037) @@ -1,25 +0,0 @@ -From 6f95e3011e203a98a1dc7cde43887a155bd2c041 Mon Sep 17 00:00:00 2001 -From: Maciej Blizinski -Date: Fri, 4 Dec 2009 19:37:47 +0100 -Subject: [PATCH 4/6] adding-prereq-2.59-to-configure.ac - ---- - configure.ac | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -diff --git a/configure.ac b/configure.ac -index e091dd9..8707ff1 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -19,7 +19,7 @@ - # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA - - # (Process this file with autoconf to produce a configure script.) --AC_PREREQ(2.57) -+AC_PREREQ(2.59) - min_automake_version="1.7.6" - - # Version number: Remember to change it immediately *after* a release. --- -1.6.5.1 - Deleted: csw/mgar/pkg/pinentry/trunk/files/0005-Importing-getopt-posix-gnulib-module.patch =================================================================== --- csw/mgar/pkg/pinentry/trunk/files/0005-Importing-getopt-posix-gnulib-module.patch 2011-07-11 09:48:15 UTC (rev 15036) +++ csw/mgar/pkg/pinentry/trunk/files/0005-Importing-getopt-posix-gnulib-module.patch 2011-07-11 09:51:32 UTC (rev 15037) @@ -1,5816 +0,0 @@ -From 5ab452427bdb2f48759090c0acd4b49ab33a0d9e Mon Sep 17 00:00:00 2001 -From: Maciej Blizinski -Date: Fri, 4 Dec 2009 19:39:08 +0100 -Subject: [PATCH 5/6] Importing getopt-posix gnulib module - ---- - lib/Makefile.am | 219 ++++++++++ - lib/Makefile.am~ | 219 ++++++++++ - lib/Makefile.in | 933 ++++++++++++++++++++++++++++++++++++++++ - lib/dummy.c | 42 ++ - lib/getopt.c | 1187 +++++++++++++++++++++++++++++++++++++++++++++++++++ - lib/getopt.in.h | 247 +++++++++++ - lib/getopt1.c | 170 ++++++++ - lib/getopt_int.h | 132 ++++++ - lib/gettext.h | 279 ++++++++++++ - lib/stddef.in.h | 86 ++++ - lib/unistd.in.h | 810 +++++++++++++++++++++++++++++++++++ - link-warning.h | 28 ++ - m4/00gnulib.m4 | 30 ++ - m4/extensions.m4 | 104 +++++ - m4/getopt.m4 | 250 +++++++++++ - m4/gnulib-cache.m4 | 34 ++ - m4/gnulib-common.m4 | 124 ++++++ - m4/gnulib-comp.m4 | 201 +++++++++ - m4/gnulib-tool.m4 | 57 +++ - m4/include_next.m4 | 187 ++++++++ - m4/onceonly.m4 | 90 ++++ - m4/stddef_h.m4 | 45 ++ - m4/unistd_h.m4 | 119 +++++ - m4/wchar_t.m4 | 20 + - 24 files changed, 5613 insertions(+), 0 deletions(-) - create mode 100644 lib/Makefile.am - create mode 100644 lib/Makefile.am~ - create mode 100644 lib/Makefile.in - create mode 100644 lib/dummy.c - create mode 100644 lib/getopt.c - create mode 100644 lib/getopt.in.h - create mode 100644 lib/getopt1.c - create mode 100644 lib/getopt_int.h - create mode 100644 lib/gettext.h - create mode 100644 lib/stddef.in.h - create mode 100644 lib/unistd.in.h - create mode 100644 link-warning.h - create mode 100644 m4/00gnulib.m4 - create mode 100644 m4/extensions.m4 - create mode 100644 m4/getopt.m4 - create mode 100644 m4/gnulib-cache.m4 - create mode 100644 m4/gnulib-common.m4 - create mode 100644 m4/gnulib-comp.m4 - create mode 100644 m4/gnulib-tool.m4 - create mode 100644 m4/include_next.m4 - create mode 100644 m4/onceonly.m4 - create mode 100644 m4/stddef_h.m4 - create mode 100644 m4/unistd_h.m4 - create mode 100644 m4/wchar_t.m4 - -diff --git a/lib/Makefile.am b/lib/Makefile.am -new file mode 100644 -index 0000000..f407c93 ---- /dev/null -+++ b/lib/Makefile.am -@@ -0,0 +1,219 @@ -+## DO NOT EDIT! GENERATED AUTOMATICALLY! -+## Process this file with automake to produce Makefile.in. -+# Copyright (C) 2002-2009 Free Software Foundation, Inc. -+# -+# This file is free software, distributed under the terms of the GNU -+# General Public License. As a special exception to the GNU General -+# Public License, this file may be distributed as part of a program -+# that contains a configuration script generated by Autoconf, under -+# the same distribution terms as the rest of that program. -+# -+# Generated by gnulib-tool. -+# Reproduce by: gnulib-tool --import --dir=. --lib=libgnu --source-base=lib --m4-base=m4 --doc-base=doc --tests-base=tests --aux-dir=. --no-libtool --macro-prefix=gl getopt-posix -+ -+AUTOMAKE_OPTIONS = 1.5 gnits -+ -+SUBDIRS = -+noinst_HEADERS = -+noinst_LIBRARIES = -+noinst_LTLIBRARIES = -+EXTRA_DIST = -+BUILT_SOURCES = -+SUFFIXES = -+MOSTLYCLEANFILES = core *.stackdump -+MOSTLYCLEANDIRS = -+CLEANFILES = -+DISTCLEANFILES = -+MAINTAINERCLEANFILES = -+ -+AM_CPPFLAGS = -+AM_CFLAGS = -+ -+noinst_LIBRARIES += libgnu.a -+ -+libgnu_a_SOURCES = -+libgnu_a_LIBADD = $(gl_LIBOBJS) -+libgnu_a_DEPENDENCIES = $(gl_LIBOBJS) -+EXTRA_libgnu_a_SOURCES = -+ -+## begin gnulib module getopt-posix -+ -+BUILT_SOURCES += $(GETOPT_H) -+ -+# We need the following in order to create when the system -+# doesn't have one that works with the given compiler. -+getopt.h: getopt.in.h -+ $(AM_V_GEN)rm -f $@-t $@ && \ -+ { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \ -+ sed -e 's|@''HAVE_GETOPT_H''@|$(HAVE_GETOPT_H)|g' \ -+ -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \ -+ -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \ -+ -e 's|@''NEXT_GETOPT_H''@|$(NEXT_GETOPT_H)|g' \ -+ -e '/definition of GL_LINK_WARNING/r $(LINK_WARNING_H)' \ -+ < $(srcdir)/getopt.in.h; \ -+ } > $@-t && \ -+ mv -f $@-t $@ -+MOSTLYCLEANFILES += getopt.h getopt.h-t -+ -+EXTRA_DIST += getopt.c getopt.in.h getopt1.c getopt_int.h -+ -+EXTRA_libgnu_a_SOURCES += getopt.c getopt1.c -+ -+## end gnulib module getopt-posix -+ -+## begin gnulib module gettext-h -+ -+libgnu_a_SOURCES += gettext.h -+ -+## end gnulib module gettext-h -+ -+## begin gnulib module link-warning -+ -+LINK_WARNING_H=$(top_srcdir)/./link-warning.h -+ -+EXTRA_DIST += $(top_srcdir)/./link-warning.h -+ -+## end gnulib module link-warning -+ -+## begin gnulib module stddef -+ -+BUILT_SOURCES += $(STDDEF_H) -+ -+# We need the following in order to create when the system -+# doesn't have one that works with the given compiler. -+stddef.h: stddef.in.h -+ $(AM_V_GEN)rm -f $@-t $@ && \ -+ { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */' && \ -+ sed -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \ -+ -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \ -+ -e 's|@''NEXT_STDDEF_H''@|$(NEXT_STDDEF_H)|g' \ -+ -e 's|@''HAVE_WCHAR_T''@|$(HAVE_WCHAR_T)|g' \ -+ -e 's|@''REPLACE_NULL''@|$(REPLACE_NULL)|g' \ -+ < $(srcdir)/stddef.in.h; \ -+ } > $@-t && \ -+ mv $@-t $@ -+MOSTLYCLEANFILES += stddef.h stddef.h-t -+ -+EXTRA_DIST += stddef.in.h -+ -+## end gnulib module stddef -+ -+## begin gnulib module unistd -+ -+BUILT_SOURCES += unistd.h -+ -+# We need the following in order to create an empty placeholder for -+# when the system doesn't have one. -+unistd.h: unistd.in.h -+ $(AM_V_GEN)rm -f $@-t $@ && \ -+ { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \ -+ sed -e 's|@''HAVE_UNISTD_H''@|$(HAVE_UNISTD_H)|g' \ -+ -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \ -+ -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \ -+ -e 's|@''NEXT_UNISTD_H''@|$(NEXT_UNISTD_H)|g' \ -+ -e 's|@''GNULIB_CHOWN''@|$(GNULIB_CHOWN)|g' \ -+ -e 's|@''GNULIB_CLOSE''@|$(GNULIB_CLOSE)|g' \ -+ -e 's|@''GNULIB_DUP2''@|$(GNULIB_DUP2)|g' \ -+ -e 's|@''GNULIB_DUP3''@|$(GNULIB_DUP3)|g' \ -+ -e 's|@''GNULIB_ENVIRON''@|$(GNULIB_ENVIRON)|g' \ -+ -e 's|@''GNULIB_EUIDACCESS''@|$(GNULIB_EUIDACCESS)|g' \ -+ -e 's|@''GNULIB_FACCESSAT''@|$(GNULIB_FACCESSAT)|g' \ -+ -e 's|@''GNULIB_FCHDIR''@|$(GNULIB_FCHDIR)|g' \ -+ -e 's|@''GNULIB_FCHOWNAT''@|$(GNULIB_FCHOWNAT)|g' \ -+ -e 's|@''GNULIB_FSYNC''@|$(GNULIB_FSYNC)|g' \ -+ -e 's|@''GNULIB_FTRUNCATE''@|$(GNULIB_FTRUNCATE)|g' \ -+ -e 's|@''GNULIB_GETCWD''@|$(GNULIB_GETCWD)|g' \ -+ -e 's|@''GNULIB_GETDOMAINNAME''@|$(GNULIB_GETDOMAINNAME)|g' \ -+ -e 's|@''GNULIB_GETDTABLESIZE''@|$(GNULIB_GETDTABLESIZE)|g' \ -+ -e 's|@''GNULIB_GETGROUPS''@|$(GNULIB_GETGROUPS)|g' \ -+ -e 's|@''GNULIB_GETHOSTNAME''@|$(GNULIB_GETHOSTNAME)|g' \ -+ -e 's|@''GNULIB_GETLOGIN_R''@|$(GNULIB_GETLOGIN_R)|g' \ -+ -e 's|@''GNULIB_GETPAGESIZE''@|$(GNULIB_GETPAGESIZE)|g' \ -+ -e 's|@''GNULIB_GETUSERSHELL''@|$(GNULIB_GETUSERSHELL)|g' \ -+ -e 's|@''GNULIB_LCHOWN''@|$(GNULIB_LCHOWN)|g' \ -+ -e 's|@''GNULIB_LINK''@|$(GNULIB_LINK)|g' \ -+ -e 's|@''GNULIB_LINKAT''@|$(GNULIB_LINKAT)|g' \ -+ -e 's|@''GNULIB_LSEEK''@|$(GNULIB_LSEEK)|g' \ -+ -e 's|@''GNULIB_PIPE2''@|$(GNULIB_PIPE2)|g' \ -+ -e 's|@''GNULIB_READLINK''@|$(GNULIB_READLINK)|g' \ -+ -e 's|@''GNULIB_READLINKAT''@|$(GNULIB_READLINKAT)|g' \ -+ -e 's|@''GNULIB_RMDIR''@|$(GNULIB_RMDIR)|g' \ -+ -e 's|@''GNULIB_SLEEP''@|$(GNULIB_SLEEP)|g' \ -+ -e 's|@''GNULIB_SYMLINK''@|$(GNULIB_SYMLINK)|g' \ -+ -e 's|@''GNULIB_SYMLINKAT''@|$(GNULIB_SYMLINKAT)|g' \ -+ -e 's|@''GNULIB_UNISTD_H_GETOPT''@|$(GNULIB_UNISTD_H_GETOPT)|g' \ -+ -e 's|@''GNULIB_UNISTD_H_SIGPIPE''@|$(GNULIB_UNISTD_H_SIGPIPE)|g' \ -+ -e 's|@''GNULIB_UNLINK''@|$(GNULIB_UNLINK)|g' \ -+ -e 's|@''GNULIB_UNLINKAT''@|$(GNULIB_UNLINKAT)|g' \ -+ -e 's|@''GNULIB_WRITE''@|$(GNULIB_WRITE)|g' \ -+ -e 's|@''HAVE_DUP2''@|$(HAVE_DUP2)|g' \ -+ -e 's|@''HAVE_DUP3''@|$(HAVE_DUP3)|g' \ -+ -e 's|@''HAVE_EUIDACCESS''@|$(HAVE_EUIDACCESS)|g' \ -+ -e 's|@''HAVE_FACCESSAT''@|$(HAVE_FACCESSAT)|g' \ -+ -e 's|@''HAVE_FCHOWNAT''@|$(HAVE_FCHOWNAT)|g' \ -+ -e 's|@''HAVE_FSYNC''@|$(HAVE_FSYNC)|g' \ -+ -e 's|@''HAVE_FTRUNCATE''@|$(HAVE_FTRUNCATE)|g' \ -+ -e 's|@''HAVE_GETDOMAINNAME''@|$(HAVE_GETDOMAINNAME)|g' \ -+ -e 's|@''HAVE_GETDTABLESIZE''@|$(HAVE_GETDTABLESIZE)|g' \ -+ -e 's|@''HAVE_GETGROUPS''@|$(HAVE_GETGROUPS)|g' \ -+ -e 's|@''HAVE_GETHOSTNAME''@|$(HAVE_GETHOSTNAME)|g' \ -+ -e 's|@''HAVE_GETPAGESIZE''@|$(HAVE_GETPAGESIZE)|g' \ -+ -e 's|@''HAVE_GETUSERSHELL''@|$(HAVE_GETUSERSHELL)|g' \ -+ -e 's|@''HAVE_LINK''@|$(HAVE_LINK)|g' \ -+ -e 's|@''HAVE_LINKAT''@|$(HAVE_LINKAT)|g' \ -+ -e 's|@''HAVE_PIPE2''@|$(HAVE_PIPE2)|g' \ -+ -e 's|@''HAVE_READLINK''@|$(HAVE_READLINK)|g' \ -+ -e 's|@''HAVE_READLINKAT''@|$(HAVE_READLINKAT)|g' \ -+ -e 's|@''HAVE_SLEEP''@|$(HAVE_SLEEP)|g' \ -+ -e 's|@''HAVE_SYMLINK''@|$(HAVE_SYMLINK)|g' \ -+ -e 's|@''HAVE_SYMLINKAT''@|$(HAVE_SYMLINKAT)|g' \ -+ -e 's|@''HAVE_UNLINKAT''@|$(HAVE_UNLINKAT)|g' \ -+ -e 's|@''HAVE_DECL_ENVIRON''@|$(HAVE_DECL_ENVIRON)|g' \ -+ -e 's|@''HAVE_DECL_GETLOGIN_R''@|$(HAVE_DECL_GETLOGIN_R)|g' \ -+ -e 's|@''HAVE_OS_H''@|$(HAVE_OS_H)|g' \ -+ -e 's|@''HAVE_SYS_PARAM_H''@|$(HAVE_SYS_PARAM_H)|g' \ -+ -e 's|@''REPLACE_CHOWN''@|$(REPLACE_CHOWN)|g' \ -+ -e 's|@''REPLACE_CLOSE''@|$(REPLACE_CLOSE)|g' \ -+ -e 's|@''REPLACE_DUP''@|$(REPLACE_DUP)|g' \ -+ -e 's|@''REPLACE_DUP2''@|$(REPLACE_DUP2)|g' \ -+ -e 's|@''REPLACE_FCHDIR''@|$(REPLACE_FCHDIR)|g' \ -+ -e 's|@''REPLACE_FCHOWNAT''@|$(REPLACE_FCHOWNAT)|g' \ -+ -e 's|@''REPLACE_GETCWD''@|$(REPLACE_GETCWD)|g' \ -+ -e 's|@''REPLACE_GETGROUPS''@|$(REPLACE_GETGROUPS)|g' \ -+ -e 's|@''REPLACE_GETPAGESIZE''@|$(REPLACE_GETPAGESIZE)|g' \ -+ -e 's|@''REPLACE_LCHOWN''@|$(REPLACE_LCHOWN)|g' \ -+ -e 's|@''REPLACE_LINK''@|$(REPLACE_LINK)|g' \ -+ -e 's|@''REPLACE_LINKAT''@|$(REPLACE_LINKAT)|g' \ -+ -e 's|@''REPLACE_LSEEK''@|$(REPLACE_LSEEK)|g' \ -+ -e 's|@''REPLACE_READLINK''@|$(REPLACE_READLINK)|g' \ -+ -e 's|@''REPLACE_RMDIR''@|$(REPLACE_RMDIR)|g' \ -+ -e 's|@''REPLACE_SYMLINK''@|$(REPLACE_SYMLINK)|g' \ -+ -e 's|@''REPLACE_UNLINK''@|$(REPLACE_UNLINK)|g' \ -+ -e 's|@''REPLACE_UNLINKAT''@|$(REPLACE_UNLINKAT)|g' \ -+ -e 's|@''REPLACE_WRITE''@|$(REPLACE_WRITE)|g' \ -+ -e 's|@''UNISTD_H_HAVE_WINSOCK2_H''@|$(UNISTD_H_HAVE_WINSOCK2_H)|g' \ -+ -e 's|@''UNISTD_H_HAVE_WINSOCK2_H_AND_USE_SOCKETS''@|$(UNISTD_H_HAVE_WINSOCK2_H_AND_USE_SOCKETS)|g' \ -+ -e '/definition of GL_LINK_WARNING/r $(LINK_WARNING_H)' \ -+ < $(srcdir)/unistd.in.h; \ -+ } > $@-t && \ -+ mv $@-t $@ -+MOSTLYCLEANFILES += unistd.h unistd.h-t -+ -+EXTRA_DIST += unistd.in.h -+ -+## end gnulib module unistd -+ -+## begin gnulib module dummy -+ -+libgnu_a_SOURCES += dummy.c -+ -+## end gnulib module dummy -+ -+ -+mostlyclean-local: mostlyclean-generic -+ @for dir in '' $(MOSTLYCLEANDIRS); do \ -+ if test -n "$$dir" && test -d $$dir; then \ -+ echo "rmdir $$dir"; rmdir $$dir; \ -+ fi; \ -+ done; \ -+ : -diff --git a/lib/Makefile.am~ b/lib/Makefile.am~ -new file mode 100644 -index 0000000..c1fb886 ---- /dev/null -+++ b/lib/Makefile.am~ -@@ -0,0 +1,219 @@ -+## DO NOT EDIT! GENERATED AUTOMATICALLY! -+## Process this file with automake to produce Makefile.in. -+# Copyright (C) 2002-2009 Free Software Foundation, Inc. -+# -+# This file is free software, distributed under the terms of the GNU -+# General Public License. As a special exception to the GNU General -+# Public License, this file may be distributed as part of a program -+# that contains a configuration script generated by Autoconf, under -+# the same distribution terms as the rest of that program. -+# -+# Generated by gnulib-tool. -+# Reproduce by: gnulib-tool --import --dir=. --lib=libgnu --source-base=lib --m4-base=m4 --doc-base=doc --tests-base=tests --aux-dir=. --no-libtool --macro-prefix=gl getopt -+ -+AUTOMAKE_OPTIONS = 1.5 gnits -+ -+SUBDIRS = -+noinst_HEADERS = -+noinst_LIBRARIES = -+noinst_LTLIBRARIES = -+EXTRA_DIST = -+BUILT_SOURCES = -+SUFFIXES = -+MOSTLYCLEANFILES = core *.stackdump -+MOSTLYCLEANDIRS = -+CLEANFILES = -+DISTCLEANFILES = -+MAINTAINERCLEANFILES = -+ -+AM_CPPFLAGS = -+AM_CFLAGS = -+ -+noinst_LIBRARIES += libgnu.a -+ -+libgnu_a_SOURCES = -+libgnu_a_LIBADD = $(gl_LIBOBJS) -+libgnu_a_DEPENDENCIES = $(gl_LIBOBJS) -+EXTRA_libgnu_a_SOURCES = -+ -+## begin gnulib module getopt-posix -+ -+BUILT_SOURCES += $(GETOPT_H) -+ -+# We need the following in order to create when the system -+# doesn't have one that works with the given compiler. -+getopt.h: getopt.in.h -+ $(AM_V_GEN)rm -f $@-t $@ && \ -+ { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \ -+ sed -e 's|@''HAVE_GETOPT_H''@|$(HAVE_GETOPT_H)|g' \ -+ -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \ -+ -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \ -+ -e 's|@''NEXT_GETOPT_H''@|$(NEXT_GETOPT_H)|g' \ -+ -e '/definition of GL_LINK_WARNING/r $(LINK_WARNING_H)' \ -+ < $(srcdir)/getopt.in.h; \ -+ } > $@-t && \ -+ mv -f $@-t $@ -+MOSTLYCLEANFILES += getopt.h getopt.h-t -+ -+EXTRA_DIST += getopt.c getopt.in.h getopt1.c getopt_int.h -+ -+EXTRA_libgnu_a_SOURCES += getopt.c getopt1.c -+ -+## end gnulib module getopt-posix -+ -+## begin gnulib module gettext-h -+ -+libgnu_a_SOURCES += gettext.h -+ -+## end gnulib module gettext-h -+ -+## begin gnulib module link-warning -+ -+LINK_WARNING_H=$(top_srcdir)/./link-warning.h -+ -+EXTRA_DIST += $(top_srcdir)/./link-warning.h -+ -+## end gnulib module link-warning -+ -+## begin gnulib module stddef -+ -+BUILT_SOURCES += $(STDDEF_H) -+ -+# We need the following in order to create when the system -+# doesn't have one that works with the given compiler. -+stddef.h: stddef.in.h -+ $(AM_V_GEN)rm -f $@-t $@ && \ -+ { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */' && \ -+ sed -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \ -+ -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \ -+ -e 's|@''NEXT_STDDEF_H''@|$(NEXT_STDDEF_H)|g' \ -+ -e 's|@''HAVE_WCHAR_T''@|$(HAVE_WCHAR_T)|g' \ -+ -e 's|@''REPLACE_NULL''@|$(REPLACE_NULL)|g' \ -+ < $(srcdir)/stddef.in.h; \ -+ } > $@-t && \ -+ mv $@-t $@ -+MOSTLYCLEANFILES += stddef.h stddef.h-t -+ -+EXTRA_DIST += stddef.in.h -+ -+## end gnulib module stddef -+ -+## begin gnulib module unistd -+ -+BUILT_SOURCES += unistd.h -+ -+# We need the following in order to create an empty placeholder for -+# when the system doesn't have one. -+unistd.h: unistd.in.h -+ $(AM_V_GEN)rm -f $@-t $@ && \ -+ { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \ -+ sed -e 's|@''HAVE_UNISTD_H''@|$(HAVE_UNISTD_H)|g' \ -+ -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \ -+ -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \ -+ -e 's|@''NEXT_UNISTD_H''@|$(NEXT_UNISTD_H)|g' \ -+ -e 's|@''GNULIB_CHOWN''@|$(GNULIB_CHOWN)|g' \ -+ -e 's|@''GNULIB_CLOSE''@|$(GNULIB_CLOSE)|g' \ -+ -e 's|@''GNULIB_DUP2''@|$(GNULIB_DUP2)|g' \ -+ -e 's|@''GNULIB_DUP3''@|$(GNULIB_DUP3)|g' \ -+ -e 's|@''GNULIB_ENVIRON''@|$(GNULIB_ENVIRON)|g' \ -+ -e 's|@''GNULIB_EUIDACCESS''@|$(GNULIB_EUIDACCESS)|g' \ -+ -e 's|@''GNULIB_FACCESSAT''@|$(GNULIB_FACCESSAT)|g' \ -+ -e 's|@''GNULIB_FCHDIR''@|$(GNULIB_FCHDIR)|g' \ -+ -e 's|@''GNULIB_FCHOWNAT''@|$(GNULIB_FCHOWNAT)|g' \ -+ -e 's|@''GNULIB_FSYNC''@|$(GNULIB_FSYNC)|g' \ -+ -e 's|@''GNULIB_FTRUNCATE''@|$(GNULIB_FTRUNCATE)|g' \ -+ -e 's|@''GNULIB_GETCWD''@|$(GNULIB_GETCWD)|g' \ -+ -e 's|@''GNULIB_GETDOMAINNAME''@|$(GNULIB_GETDOMAINNAME)|g' \ -+ -e 's|@''GNULIB_GETDTABLESIZE''@|$(GNULIB_GETDTABLESIZE)|g' \ -+ -e 's|@''GNULIB_GETGROUPS''@|$(GNULIB_GETGROUPS)|g' \ -+ -e 's|@''GNULIB_GETHOSTNAME''@|$(GNULIB_GETHOSTNAME)|g' \ -+ -e 's|@''GNULIB_GETLOGIN_R''@|$(GNULIB_GETLOGIN_R)|g' \ -+ -e 's|@''GNULIB_GETPAGESIZE''@|$(GNULIB_GETPAGESIZE)|g' \ -+ -e 's|@''GNULIB_GETUSERSHELL''@|$(GNULIB_GETUSERSHELL)|g' \ -+ -e 's|@''GNULIB_LCHOWN''@|$(GNULIB_LCHOWN)|g' \ -+ -e 's|@''GNULIB_LINK''@|$(GNULIB_LINK)|g' \ -+ -e 's|@''GNULIB_LINKAT''@|$(GNULIB_LINKAT)|g' \ -+ -e 's|@''GNULIB_LSEEK''@|$(GNULIB_LSEEK)|g' \ -+ -e 's|@''GNULIB_PIPE2''@|$(GNULIB_PIPE2)|g' \ -+ -e 's|@''GNULIB_READLINK''@|$(GNULIB_READLINK)|g' \ -+ -e 's|@''GNULIB_READLINKAT''@|$(GNULIB_READLINKAT)|g' \ -+ -e 's|@''GNULIB_RMDIR''@|$(GNULIB_RMDIR)|g' \ -+ -e 's|@''GNULIB_SLEEP''@|$(GNULIB_SLEEP)|g' \ -+ -e 's|@''GNULIB_SYMLINK''@|$(GNULIB_SYMLINK)|g' \ -+ -e 's|@''GNULIB_SYMLINKAT''@|$(GNULIB_SYMLINKAT)|g' \ -+ -e 's|@''GNULIB_UNISTD_H_GETOPT''@|$(GNULIB_UNISTD_H_GETOPT)|g' \ -+ -e 's|@''GNULIB_UNISTD_H_SIGPIPE''@|$(GNULIB_UNISTD_H_SIGPIPE)|g' \ -+ -e 's|@''GNULIB_UNLINK''@|$(GNULIB_UNLINK)|g' \ -+ -e 's|@''GNULIB_UNLINKAT''@|$(GNULIB_UNLINKAT)|g' \ -+ -e 's|@''GNULIB_WRITE''@|$(GNULIB_WRITE)|g' \ -+ -e 's|@''HAVE_DUP2''@|$(HAVE_DUP2)|g' \ -+ -e 's|@''HAVE_DUP3''@|$(HAVE_DUP3)|g' \ -+ -e 's|@''HAVE_EUIDACCESS''@|$(HAVE_EUIDACCESS)|g' \ -+ -e 's|@''HAVE_FACCESSAT''@|$(HAVE_FACCESSAT)|g' \ -+ -e 's|@''HAVE_FCHOWNAT''@|$(HAVE_FCHOWNAT)|g' \ -+ -e 's|@''HAVE_FSYNC''@|$(HAVE_FSYNC)|g' \ -+ -e 's|@''HAVE_FTRUNCATE''@|$(HAVE_FTRUNCATE)|g' \ -+ -e 's|@''HAVE_GETDOMAINNAME''@|$(HAVE_GETDOMAINNAME)|g' \ -+ -e 's|@''HAVE_GETDTABLESIZE''@|$(HAVE_GETDTABLESIZE)|g' \ -+ -e 's|@''HAVE_GETGROUPS''@|$(HAVE_GETGROUPS)|g' \ -+ -e 's|@''HAVE_GETHOSTNAME''@|$(HAVE_GETHOSTNAME)|g' \ -+ -e 's|@''HAVE_GETPAGESIZE''@|$(HAVE_GETPAGESIZE)|g' \ -+ -e 's|@''HAVE_GETUSERSHELL''@|$(HAVE_GETUSERSHELL)|g' \ -+ -e 's|@''HAVE_LINK''@|$(HAVE_LINK)|g' \ -+ -e 's|@''HAVE_LINKAT''@|$(HAVE_LINKAT)|g' \ -+ -e 's|@''HAVE_PIPE2''@|$(HAVE_PIPE2)|g' \ -+ -e 's|@''HAVE_READLINK''@|$(HAVE_READLINK)|g' \ -+ -e 's|@''HAVE_READLINKAT''@|$(HAVE_READLINKAT)|g' \ -+ -e 's|@''HAVE_SLEEP''@|$(HAVE_SLEEP)|g' \ -+ -e 's|@''HAVE_SYMLINK''@|$(HAVE_SYMLINK)|g' \ -+ -e 's|@''HAVE_SYMLINKAT''@|$(HAVE_SYMLINKAT)|g' \ -+ -e 's|@''HAVE_UNLINKAT''@|$(HAVE_UNLINKAT)|g' \ -+ -e 's|@''HAVE_DECL_ENVIRON''@|$(HAVE_DECL_ENVIRON)|g' \ -+ -e 's|@''HAVE_DECL_GETLOGIN_R''@|$(HAVE_DECL_GETLOGIN_R)|g' \ -+ -e 's|@''HAVE_OS_H''@|$(HAVE_OS_H)|g' \ -+ -e 's|@''HAVE_SYS_PARAM_H''@|$(HAVE_SYS_PARAM_H)|g' \ -+ -e 's|@''REPLACE_CHOWN''@|$(REPLACE_CHOWN)|g' \ -+ -e 's|@''REPLACE_CLOSE''@|$(REPLACE_CLOSE)|g' \ -+ -e 's|@''REPLACE_DUP''@|$(REPLACE_DUP)|g' \ -+ -e 's|@''REPLACE_DUP2''@|$(REPLACE_DUP2)|g' \ -+ -e 's|@''REPLACE_FCHDIR''@|$(REPLACE_FCHDIR)|g' \ -+ -e 's|@''REPLACE_FCHOWNAT''@|$(REPLACE_FCHOWNAT)|g' \ -+ -e 's|@''REPLACE_GETCWD''@|$(REPLACE_GETCWD)|g' \ -+ -e 's|@''REPLACE_GETGROUPS''@|$(REPLACE_GETGROUPS)|g' \ -+ -e 's|@''REPLACE_GETPAGESIZE''@|$(REPLACE_GETPAGESIZE)|g' \ -+ -e 's|@''REPLACE_LCHOWN''@|$(REPLACE_LCHOWN)|g' \ -+ -e 's|@''REPLACE_LINK''@|$(REPLACE_LINK)|g' \ -+ -e 's|@''REPLACE_LINKAT''@|$(REPLACE_LINKAT)|g' \ -+ -e 's|@''REPLACE_LSEEK''@|$(REPLACE_LSEEK)|g' \ -+ -e 's|@''REPLACE_READLINK''@|$(REPLACE_READLINK)|g' \ -+ -e 's|@''REPLACE_RMDIR''@|$(REPLACE_RMDIR)|g' \ -+ -e 's|@''REPLACE_SYMLINK''@|$(REPLACE_SYMLINK)|g' \ -+ -e 's|@''REPLACE_UNLINK''@|$(REPLACE_UNLINK)|g' \ -+ -e 's|@''REPLACE_UNLINKAT''@|$(REPLACE_UNLINKAT)|g' \ -+ -e 's|@''REPLACE_WRITE''@|$(REPLACE_WRITE)|g' \ -+ -e 's|@''UNISTD_H_HAVE_WINSOCK2_H''@|$(UNISTD_H_HAVE_WINSOCK2_H)|g' \ -+ -e 's|@''UNISTD_H_HAVE_WINSOCK2_H_AND_USE_SOCKETS''@|$(UNISTD_H_HAVE_WINSOCK2_H_AND_USE_SOCKETS)|g' \ -+ -e '/definition of GL_LINK_WARNING/r $(LINK_WARNING_H)' \ -+ < $(srcdir)/unistd.in.h; \ -+ } > $@-t && \ -+ mv $@-t $@ -+MOSTLYCLEANFILES += unistd.h unistd.h-t -+ -+EXTRA_DIST += unistd.in.h -+ -+## end gnulib module unistd -+ -+## begin gnulib module dummy -+ -+libgnu_a_SOURCES += dummy.c -+ -+## end gnulib module dummy -+ -+ -+mostlyclean-local: mostlyclean-generic -+ @for dir in '' $(MOSTLYCLEANDIRS); do \ -+ if test -n "$$dir" && test -d $$dir; then \ -+ echo "rmdir $$dir"; rmdir $$dir; \ -+ fi; \ -+ done; \ -+ : -diff --git a/lib/Makefile.in b/lib/Makefile.in -new file mode 100644 -index 0000000..f22746f ---- /dev/null -+++ b/lib/Makefile.in -@@ -0,0 +1,933 @@ -+# Makefile.in generated by automake 1.11 from Makefile.am. -+# @configure_input@ -+ -+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -+# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, -+# Inc. -+# This Makefile.in is free software; the Free Software Foundation -+# gives unlimited permission to copy and/or distribute it, -+# with or without modifications, as long as this notice is preserved. -+ -+# This program is distributed in the hope that it will be useful, -+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without -+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A -+# PARTICULAR PURPOSE. -+ -+ at SET_MAKE@ -+ -+# Copyright (C) 2002-2009 Free Software Foundation, Inc. -+# -+# This file is free software, distributed under the terms of the GNU -+# General Public License. As a special exception to the GNU General -+# Public License, this file may be distributed as part of a program -+# that contains a configuration script generated by Autoconf, under -+# the same distribution terms as the rest of that program. -+# -+# Generated by gnulib-tool. -+# Reproduce by: gnulib-tool --import --dir=. --lib=libgnu --source-base=lib --m4-base=m4 --doc-base=doc --tests-base=tests --aux-dir=. --no-libtool --macro-prefix=gl getopt getopt-gnu -+ -+ -+ -+VPATH = @srcdir@ -+pkgdatadir = $(datadir)/@PACKAGE@ -+pkgincludedir = $(includedir)/@PACKAGE@ -+pkglibdir = $(libdir)/@PACKAGE@ -+pkglibexecdir = $(libexecdir)/@PACKAGE@ -+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd -+install_sh_DATA = $(install_sh) -c -m 644 -+install_sh_PROGRAM = $(install_sh) -c -+install_sh_SCRIPT = $(install_sh) -c -+INSTALL_HEADER = $(INSTALL_DATA) -+transform = $(program_transform_name) -+NORMAL_INSTALL = : -+PRE_INSTALL = : -+POST_INSTALL = : -+NORMAL_UNINSTALL = : -+PRE_UNINSTALL = : -+POST_UNINSTALL = : -+build_triplet = @build@ -+host_triplet = @host@ -+subdir = lib -+DIST_COMMON = $(noinst_HEADERS) $(srcdir)/Makefile.am \ -+ $(srcdir)/Makefile.in -+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -+am__aclocal_m4_deps = $(top_srcdir)/m4/00gnulib.m4 \ -+ $(top_srcdir)/m4/curses.m4 $(top_srcdir)/m4/extensions.m4 \ -+ $(top_srcdir)/m4/getopt.m4 $(top_srcdir)/m4/glib.m4 \ -+ $(top_srcdir)/m4/gnulib-common.m4 \ -+ $(top_srcdir)/m4/gnulib-comp.m4 $(top_srcdir)/m4/gtk.m4 \ -+ $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/include_next.m4 \ -+ $(top_srcdir)/m4/onceonly.m4 $(top_srcdir)/m4/qt.m4 \ -+ $(top_srcdir)/m4/stddef_h.m4 $(top_srcdir)/m4/unistd_h.m4 \ -+ $(top_srcdir)/m4/wchar_t.m4 $(top_srcdir)/acinclude.m4 \ -+ $(top_srcdir)/configure.ac -+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ -+ $(ACLOCAL_M4) -+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs -+CONFIG_HEADER = $(top_builddir)/config.h -+CONFIG_CLEAN_FILES = -+CONFIG_CLEAN_VPATH_FILES = -+LIBRARIES = $(noinst_LIBRARIES) -+AR = ar -+ARFLAGS = cru -+libgnu_a_AR = $(AR) $(ARFLAGS) -+am__DEPENDENCIES_1 = -+am_libgnu_a_OBJECTS = dummy.$(OBJEXT) -+libgnu_a_OBJECTS = $(am_libgnu_a_OBJECTS) -+LTLIBRARIES = $(noinst_LTLIBRARIES) -+DEFAULT_INCLUDES = -I. at am__isrc@ -I$(top_builddir) -+depcomp = $(SHELL) $(top_srcdir)/depcomp -+am__depfiles_maybe = depfiles -+am__mv = mv -f -+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ -+ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -+CCLD = $(CC) -+LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ -+SOURCES = $(libgnu_a_SOURCES) $(EXTRA_libgnu_a_SOURCES) -+DIST_SOURCES = $(libgnu_a_SOURCES) $(EXTRA_libgnu_a_SOURCES) -+RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ -+ html-recursive info-recursive install-data-recursive \ -+ install-dvi-recursive install-exec-recursive \ -+ install-html-recursive install-info-recursive \ -+ install-pdf-recursive install-ps-recursive install-recursive \ -+ installcheck-recursive installdirs-recursive pdf-recursive \ -+ ps-recursive uninstall-recursive -+HEADERS = $(noinst_HEADERS) -+RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ -+ distclean-recursive maintainer-clean-recursive -+AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ -+ $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \ -+ distdir -+ETAGS = etags -+CTAGS = ctags -+DIST_SUBDIRS = $(SUBDIRS) -+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -+am__relativize = \ -+ dir0=`pwd`; \ -+ sed_first='s,^\([^/]*\)/.*$$,\1,'; \ -+ sed_rest='s,^[^/]*/*,,'; \ -+ sed_last='s,^.*/\([^/]*\)$$,\1,'; \ -+ sed_butlast='s,/*[^/]*$$,,'; \ -+ while test -n "$$dir1"; do \ -+ first=`echo "$$dir1" | sed -e "$$sed_first"`; \ -+ if test "$$first" != "."; then \ -+ if test "$$first" = ".."; then \ -+ dir2=`echo "$$dir0" | sed -e "$$sed_last"`/"$$dir2"; \ -+ dir0=`echo "$$dir0" | sed -e "$$sed_butlast"`; \ -+ else \ -+ first2=`echo "$$dir2" | sed -e "$$sed_first"`; \ -+ if test "$$first2" = "$$first"; then \ -+ dir2=`echo "$$dir2" | sed -e "$$sed_rest"`; \ -+ else \ -+ dir2="../$$dir2"; \ -+ fi; \ -+ dir0="$$dir0"/"$$first"; \ -+ fi; \ -+ fi; \ -+ dir1=`echo "$$dir1" | sed -e "$$sed_rest"`; \ -+ done; \ -+ reldir="$$dir2" -+ACLOCAL = @ACLOCAL@ -+AMTAR = @AMTAR@ -+AUTOCONF = @AUTOCONF@ -+AUTOHEADER = @AUTOHEADER@ -+AUTOMAKE = @AUTOMAKE@ -+AWK = @AWK@ -+CC = @CC@ -+CCDEPMODE = @CCDEPMODE@ -+CFLAGS = @CFLAGS@ -+CPP = @CPP@ -+CPPFLAGS = @CPPFLAGS@ -+CXX = @CXX@ -+CXXCPP = @CXXCPP@ -+CXXDEPMODE = @CXXDEPMODE@ -+CXXFLAGS = @CXXFLAGS@ -+CYGPATH_W = @CYGPATH_W@ -+DEFS = @DEFS@ -+DEPDIR = @DEPDIR@ -+ECHO_C = @ECHO_C@ -+ECHO_N = @ECHO_N@ -+ECHO_T = @ECHO_T@ -+EGREP = @EGREP@ -+EXEEXT = @EXEEXT@ -+GETOPT_H = @GETOPT_H@ -+GLIB_CFLAGS = @GLIB_CFLAGS@ -+GLIB_CONFIG = @GLIB_CONFIG@ -+GLIB_LIBS = @GLIB_LIBS@ -+GNULIB_CHOWN = @GNULIB_CHOWN@ -+GNULIB_CLOSE = @GNULIB_CLOSE@ -+GNULIB_DUP2 = @GNULIB_DUP2@ -+GNULIB_DUP3 = @GNULIB_DUP3@ -+GNULIB_ENVIRON = @GNULIB_ENVIRON@ -+GNULIB_EUIDACCESS = @GNULIB_EUIDACCESS@ -+GNULIB_FACCESSAT = @GNULIB_FACCESSAT@ -+GNULIB_FCHDIR = @GNULIB_FCHDIR@ -+GNULIB_FCHOWNAT = @GNULIB_FCHOWNAT@ -+GNULIB_FSYNC = @GNULIB_FSYNC@ -+GNULIB_FTRUNCATE = @GNULIB_FTRUNCATE@ -+GNULIB_GETCWD = @GNULIB_GETCWD@ -+GNULIB_GETDOMAINNAME = @GNULIB_GETDOMAINNAME@ -+GNULIB_GETDTABLESIZE = @GNULIB_GETDTABLESIZE@ -+GNULIB_GETGROUPS = @GNULIB_GETGROUPS@ -+GNULIB_GETHOSTNAME = @GNULIB_GETHOSTNAME@ -+GNULIB_GETLOGIN_R = @GNULIB_GETLOGIN_R@ -+GNULIB_GETPAGESIZE = @GNULIB_GETPAGESIZE@ -+GNULIB_GETUSERSHELL = @GNULIB_GETUSERSHELL@ -+GNULIB_LCHOWN = @GNULIB_LCHOWN@ -+GNULIB_LINK = @GNULIB_LINK@ -+GNULIB_LINKAT = @GNULIB_LINKAT@ -+GNULIB_LSEEK = @GNULIB_LSEEK@ -+GNULIB_PIPE2 = @GNULIB_PIPE2@ -+GNULIB_READLINK = @GNULIB_READLINK@ -+GNULIB_READLINKAT = @GNULIB_READLINKAT@ -+GNULIB_RMDIR = @GNULIB_RMDIR@ -+GNULIB_SLEEP = @GNULIB_SLEEP@ -+GNULIB_SYMLINK = @GNULIB_SYMLINK@ -+GNULIB_SYMLINKAT = @GNULIB_SYMLINKAT@ -+GNULIB_UNISTD_H_GETOPT = @GNULIB_UNISTD_H_GETOPT@ -+GNULIB_UNISTD_H_SIGPIPE = @GNULIB_UNISTD_H_SIGPIPE@ -+GNULIB_UNLINK = @GNULIB_UNLINK@ -+GNULIB_UNLINKAT = @GNULIB_UNLINKAT@ -+GNULIB_WRITE = @GNULIB_WRITE@ -+GREP = @GREP@ -+GTK2CFLAGS = @GTK2CFLAGS@ -+GTK2LIBS = @GTK2LIBS@ -+GTK_CFLAGS = @GTK_CFLAGS@ -+GTK_CONFIG = @GTK_CONFIG@ -+GTK_LIBS = @GTK_LIBS@ -+HAVE_DECL_ENVIRON = @HAVE_DECL_ENVIRON@ -+HAVE_DECL_GETLOGIN_R = @HAVE_DECL_GETLOGIN_R@ -+HAVE_DUP2 = @HAVE_DUP2@ -+HAVE_DUP3 = @HAVE_DUP3@ -+HAVE_EUIDACCESS = @HAVE_EUIDACCESS@ -+HAVE_FACCESSAT = @HAVE_FACCESSAT@ -+HAVE_FCHOWNAT = @HAVE_FCHOWNAT@ -+HAVE_FSYNC = @HAVE_FSYNC@ -+HAVE_FTRUNCATE = @HAVE_FTRUNCATE@ -+HAVE_GETDOMAINNAME = @HAVE_GETDOMAINNAME@ -+HAVE_GETDTABLESIZE = @HAVE_GETDTABLESIZE@ -+HAVE_GETGROUPS = @HAVE_GETGROUPS@ -+HAVE_GETHOSTNAME = @HAVE_GETHOSTNAME@ -+HAVE_GETOPT_H = @HAVE_GETOPT_H@ -+HAVE_GETPAGESIZE = @HAVE_GETPAGESIZE@ -+HAVE_GETUSERSHELL = @HAVE_GETUSERSHELL@ -+HAVE_LINK = @HAVE_LINK@ -+HAVE_LINKAT = @HAVE_LINKAT@ -+HAVE_OS_H = @HAVE_OS_H@ -+HAVE_PIPE2 = @HAVE_PIPE2@ -+HAVE_READLINK = @HAVE_READLINK@ -+HAVE_READLINKAT = @HAVE_READLINKAT@ -+HAVE_SLEEP = @HAVE_SLEEP@ -+HAVE_SYMLINK = @HAVE_SYMLINK@ -+HAVE_SYMLINKAT = @HAVE_SYMLINKAT@ -+HAVE_SYS_PARAM_H = @HAVE_SYS_PARAM_H@ -+HAVE_UNISTD_H = @HAVE_UNISTD_H@ -+HAVE_UNLINKAT = @HAVE_UNLINKAT@ -+HAVE_WCHAR_T = @HAVE_WCHAR_T@ -+INCLUDE_NEXT = @INCLUDE_NEXT@ -+INCLUDE_NEXT_AS_FIRST_DIRECTIVE = @INCLUDE_NEXT_AS_FIRST_DIRECTIVE@ -+INSTALL = @INSTALL@ -+INSTALL_DATA = @INSTALL_DATA@ -+INSTALL_PROGRAM = @INSTALL_PROGRAM@ -+INSTALL_SCRIPT = @INSTALL_SCRIPT@ -+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ -+LDFLAGS = @LDFLAGS@ -+LIBCAP = @LIBCAP@ -+LIBCURSES = @LIBCURSES@ -+LIBICONV = @LIBICONV@ -+LIBINTL = @LIBINTL@ -+LIBNCURSES = @LIBNCURSES@ -+LIBOBJS = @LIBOBJS@ -+LIBPTHREAD = @LIBPTHREAD@ -+LIBS = @LIBS@ -+LIBTERMCAP = @LIBTERMCAP@ -+LIB_QPE = @LIB_QPE@ -+LN_S = @LN_S@ -+LTLIBICONV = @LTLIBICONV@ -+LTLIBINTL = @LTLIBINTL@ -+LTLIBOBJS = @LTLIBOBJS@ -+MAINT = @MAINT@ -+MAKEINFO = @MAKEINFO@ -+MKDIR_P = @MKDIR_P@ -+MOC = @MOC@ -+NCURSES_INCLUDE = @NCURSES_INCLUDE@ -+NEXT_AS_FIRST_DIRECTIVE_GETOPT_H = @NEXT_AS_FIRST_DIRECTIVE_GETOPT_H@ -+NEXT_AS_FIRST_DIRECTIVE_STDDEF_H = @NEXT_AS_FIRST_DIRECTIVE_STDDEF_H@ -+NEXT_AS_FIRST_DIRECTIVE_UNISTD_H = @NEXT_AS_FIRST_DIRECTIVE_UNISTD_H@ -+NEXT_GETOPT_H = @NEXT_GETOPT_H@ -+NEXT_STDDEF_H = @NEXT_STDDEF_H@ -+NEXT_UNISTD_H = @NEXT_UNISTD_H@ -+OBJEXT = @OBJEXT@ -+PACKAGE = @PACKAGE@ -+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ -+PACKAGE_NAME = @PACKAGE_NAME@ -+PACKAGE_STRING = @PACKAGE_STRING@ -+PACKAGE_TARNAME = @PACKAGE_TARNAME@ -+PACKAGE_URL = @PACKAGE_URL@ -+PACKAGE_VERSION = @PACKAGE_VERSION@ -+PATH_SEPARATOR = @PATH_SEPARATOR@ -+PINENTRY_DEFAULT = @PINENTRY_DEFAULT@ -+PKG_CONFIG = @PKG_CONFIG@ -+PRAGMA_SYSTEM_HEADER = @PRAGMA_SYSTEM_HEADER@ -+QT4_CORE_CFLAGS = @QT4_CORE_CFLAGS@ -+QT4_CORE_LIBS = @QT4_CORE_LIBS@ -+QT4_GUI_CFLAGS = @QT4_GUI_CFLAGS@ -+QT4_GUI_LIBS = @QT4_GUI_LIBS@ -+QTE_NORTTI = @QTE_NORTTI@ -+QT_CXXFLAGS = @QT_CXXFLAGS@ -+QT_INCLUDES = @QT_INCLUDES@ -+QT_LDFLAGS = @QT_LDFLAGS@ -+QT_LIBS = @QT_LIBS@ -+QT_MT_LDFLAGS = @QT_MT_LDFLAGS@ -+QT_MT_LIBS = @QT_MT_LIBS@ -+QT_RPATH = @QT_RPATH@ -+RANLIB = @RANLIB@ -+REPLACE_CHOWN = @REPLACE_CHOWN@ -+REPLACE_CLOSE = @REPLACE_CLOSE@ -+REPLACE_DUP = @REPLACE_DUP@ -+REPLACE_DUP2 = @REPLACE_DUP2@ -+REPLACE_FCHDIR = @REPLACE_FCHDIR@ -+REPLACE_FCHOWNAT = @REPLACE_FCHOWNAT@ -+REPLACE_GETCWD = @REPLACE_GETCWD@ -+REPLACE_GETGROUPS = @REPLACE_GETGROUPS@ -+REPLACE_GETPAGESIZE = @REPLACE_GETPAGESIZE@ -+REPLACE_LCHOWN = @REPLACE_LCHOWN@ -+REPLACE_LINK = @REPLACE_LINK@ -+REPLACE_LINKAT = @REPLACE_LINKAT@ -+REPLACE_LSEEK = @REPLACE_LSEEK@ -+REPLACE_NULL = @REPLACE_NULL@ -+REPLACE_READLINK = @REPLACE_READLINK@ -+REPLACE_RMDIR = @REPLACE_RMDIR@ -+REPLACE_SYMLINK = @REPLACE_SYMLINK@ -+REPLACE_UNLINK = @REPLACE_UNLINK@ -+REPLACE_UNLINKAT = @REPLACE_UNLINKAT@ -+REPLACE_WRITE = @REPLACE_WRITE@ -+SETCAP = @SETCAP@ -+SET_MAKE = @SET_MAKE@ -+SHELL = @SHELL@ -+STDDEF_H = @STDDEF_H@ -+STRIP = @STRIP@ -+UNISTD_H_HAVE_WINSOCK2_H = @UNISTD_H_HAVE_WINSOCK2_H@ -+UNISTD_H_HAVE_WINSOCK2_H_AND_USE_SOCKETS = @UNISTD_H_HAVE_WINSOCK2_H_AND_USE_SOCKETS@ -+USE_THREADS = @USE_THREADS@ -+VERSION = @VERSION@ -+WINDRES = @WINDRES@ -+XMKMF = @XMKMF@ -+X_CFLAGS = @X_CFLAGS@ -+X_EXTRA_LIBS = @X_EXTRA_LIBS@ -+X_LIBS = @X_LIBS@ -+X_PRE_LIBS = @X_PRE_LIBS@ -+abs_builddir = @abs_builddir@ -+abs_srcdir = @abs_srcdir@ -+abs_top_builddir = @abs_top_builddir@ -+abs_top_srcdir = @abs_top_srcdir@ -+ac_ct_CC = @ac_ct_CC@ -+ac_ct_CXX = @ac_ct_CXX@ -+am__include = @am__include@ -+am__leading_dot = @am__leading_dot@ -+am__quote = @am__quote@ -+am__tar = @am__tar@ -+am__untar = @am__untar@ -+bindir = @bindir@ -+build = @build@ -+build_alias = @build_alias@ -+build_cpu = @build_cpu@ -+build_os = @build_os@ -+build_vendor = @build_vendor@ -+builddir = @builddir@ -+datadir = @datadir@ -+datarootdir = @datarootdir@ -+docdir = @docdir@ -+dvidir = @dvidir@ -+exec_prefix = @exec_prefix@ -+gl_LIBOBJS = @gl_LIBOBJS@ -+gl_LTLIBOBJS = @gl_LTLIBOBJS@ -+gltests_LIBOBJS = @gltests_LIBOBJS@ -+gltests_LTLIBOBJS = @gltests_LTLIBOBJS@ -+host = @host@ -+host_alias = @host_alias@ -+host_cpu = @host_cpu@ -+host_os = @host_os@ -+host_vendor = @host_vendor@ -+htmldir = @htmldir@ -+includedir = @includedir@ -+infodir = @infodir@ -+install_sh = @install_sh@ -+libdir = @libdir@ -+libexecdir = @libexecdir@ -+libgnu_LIBDEPS = @libgnu_LIBDEPS@ -+libgnu_LTLIBDEPS = @libgnu_LTLIBDEPS@ -+localedir = @localedir@ -+localstatedir = @localstatedir@ -+mandir = @mandir@ -+mkdir_p = @mkdir_p@ -+oldincludedir = @oldincludedir@ -+pdfdir = @pdfdir@ -+prefix = @prefix@ -+program_transform_name = @program_transform_name@ -+psdir = @psdir@ -+qt_includes = @qt_includes@ -+qt_libraries = @qt_libraries@ -+sbindir = @sbindir@ -+sharedstatedir = @sharedstatedir@ -+srcdir = @srcdir@ -+sysconfdir = @sysconfdir@ -+target_alias = @target_alias@ -+top_build_prefix = @top_build_prefix@ -+top_builddir = @top_builddir@ -+top_srcdir = @top_srcdir@ -+x_libraries = @x_libraries@ -+AUTOMAKE_OPTIONS = 1.5 gnits -+SUBDIRS = -+noinst_HEADERS = -+noinst_LIBRARIES = libgnu.a -+noinst_LTLIBRARIES = -+EXTRA_DIST = getopt.c getopt.in.h getopt1.c getopt_int.h \ -+ $(top_srcdir)/./link-warning.h stddef.in.h unistd.in.h -+BUILT_SOURCES = $(GETOPT_H) $(STDDEF_H) unistd.h -+SUFFIXES = -+MOSTLYCLEANFILES = core *.stackdump getopt.h getopt.h-t stddef.h \ -+ stddef.h-t unistd.h unistd.h-t -+MOSTLYCLEANDIRS = -+CLEANFILES = -+DISTCLEANFILES = -+MAINTAINERCLEANFILES = -+AM_CPPFLAGS = -+AM_CFLAGS = -+libgnu_a_SOURCES = gettext.h dummy.c -+libgnu_a_LIBADD = $(gl_LIBOBJS) -+libgnu_a_DEPENDENCIES = $(gl_LIBOBJS) -+EXTRA_libgnu_a_SOURCES = getopt.c getopt1.c -+LINK_WARNING_H = $(top_srcdir)/./link-warning.h -+all: $(BUILT_SOURCES) -+ $(MAKE) $(AM_MAKEFLAGS) all-recursive -+ -+.SUFFIXES: -+.SUFFIXES: .c .o .obj -+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) -+ @for dep in $?; do \ -+ case '$(am__configure_deps)' in \ -+ *$$dep*) \ -+ ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ -+ && { if test -f $@; then exit 0; else break; fi; }; \ -+ exit 1;; \ -+ esac; \ -+ done; \ -+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnits lib/Makefile'; \ -+ $(am__cd) $(top_srcdir) && \ -+ $(AUTOMAKE) --gnits lib/Makefile -+.PRECIOUS: Makefile -+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status -+ @case '$?' in \ -+ *config.status*) \ -+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ -+ *) \ -+ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ -+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ -+ esac; -+ -+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) -+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -+ -+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) -+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) -+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -+$(am__aclocal_m4_deps): -+ -+clean-noinstLIBRARIES: -+ -test -z "$(noinst_LIBRARIES)" || rm -f $(noinst_LIBRARIES) -+libgnu.a: $(libgnu_a_OBJECTS) $(libgnu_a_DEPENDENCIES) -+ -rm -f libgnu.a -+ $(libgnu_a_AR) libgnu.a $(libgnu_a_OBJECTS) $(libgnu_a_LIBADD) -+ $(RANLIB) libgnu.a -+ -+clean-noinstLTLIBRARIES: -+ -test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES) -+ @list='$(noinst_LTLIBRARIES)'; for p in $$list; do \ -+ dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ -+ test "$$dir" != "$$p" || dir=.; \ -+ echo "rm -f \"$${dir}/so_locations\""; \ -+ rm -f "$${dir}/so_locations"; \ -+ done -+ -+mostlyclean-compile: -+ -rm -f *.$(OBJEXT) -+ -+distclean-compile: -+ -rm -f *.tab.c -+ -+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/dummy.Po at am__quote@ -+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/getopt.Po at am__quote@ -+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/getopt1.Po at am__quote@ -+ -+.c.o: -+ at am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -+ at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ -+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -+ at am__fastdepCC_FALSE@ $(COMPILE) -c $< -+ -+.c.obj: -+ at am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` -+ at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ -+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -+ at am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` -+ -+# This directory's subdirectories are mostly independent; you can cd -+# into them and run `make' without going through this Makefile. -+# To change the values of `make' variables: instead of editing Makefiles, -+# (1) if the variable is set in `config.status', edit `config.status' -+# (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'; \ -+ for f in x $$MAKEFLAGS; do \ -+ case $$f in \ -+ *=* | --[!k]*);; \ -+ *k*) failcom='fail=yes';; \ -+ esac; \ -+ done; \ -+ dot_seen=no; \ -+ target=`echo $@ | sed s/-recursive//`; \ -+ list='$(SUBDIRS)'; for subdir in $$list; do \ -+ echo "Making $$target in $$subdir"; \ -+ if test "$$subdir" = "."; then \ -+ dot_seen=yes; \ -+ local_target="$$target-am"; \ -+ else \ -+ local_target="$$target"; \ -+ fi; \ -+ ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ -+ || eval $$failcom; \ -+ done; \ -+ if test "$$dot_seen" = "no"; then \ -+ $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ -+ fi; test -z "$$fail" -+ -+$(RECURSIVE_CLEAN_TARGETS): -+ @failcom='exit 1'; \ -+ for f in x $$MAKEFLAGS; do \ -+ case $$f in \ -+ *=* | --[!k]*);; \ -+ *k*) failcom='fail=yes';; \ -+ esac; \ -+ done; \ -+ dot_seen=no; \ -+ case "$@" in \ -+ distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ -+ *) list='$(SUBDIRS)' ;; \ -+ esac; \ -+ rev=''; for subdir in $$list; do \ -+ if test "$$subdir" = "."; then :; else \ -+ rev="$$subdir $$rev"; \ -+ fi; \ -+ done; \ -+ rev="$$rev ."; \ -+ target=`echo $@ | sed s/-recursive//`; \ -+ for subdir in $$rev; do \ -+ echo "Making $$target in $$subdir"; \ -+ if test "$$subdir" = "."; then \ -+ local_target="$$target-am"; \ -+ else \ -+ local_target="$$target"; \ -+ fi; \ -+ ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ -+ || eval $$failcom; \ -+ done && test -z "$$fail" -+tags-recursive: -+ list='$(SUBDIRS)'; for subdir in $$list; do \ -+ test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ -+ done -+ctags-recursive: -+ list='$(SUBDIRS)'; for subdir in $$list; do \ -+ test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ -+ done -+ -+ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) -+ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ -+ unique=`for i in $$list; do \ -+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ -+ done | \ -+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ -+ END { if (nonempty) { for (i in files) print i; }; }'`; \ -+ mkid -fID $$unique -+tags: TAGS -+ -+TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ -+ $(TAGS_FILES) $(LISP) -+ set x; \ -+ here=`pwd`; \ -+ if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ -+ include_option=--etags-include; \ -+ empty_fix=.; \ -+ else \ -+ include_option=--include; \ -+ empty_fix=; \ -+ fi; \ -+ list='$(SUBDIRS)'; for subdir in $$list; do \ -+ if test "$$subdir" = .; then :; else \ -+ test ! -f $$subdir/TAGS || \ -+ set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \ -+ fi; \ -+ done; \ -+ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ -+ unique=`for i in $$list; do \ -+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ -+ done | \ -+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ -+ END { if (nonempty) { for (i in files) print i; }; }'`; \ -+ shift; \ -+ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ -+ test -n "$$unique" || unique=$$empty_fix; \ -+ if test $$# -gt 0; then \ -+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ -+ "$$@" $$unique; \ -+ else \ -+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ -+ $$unique; \ -+ fi; \ -+ fi -+ctags: CTAGS -+CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ -+ $(TAGS_FILES) $(LISP) -+ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ -+ unique=`for i in $$list; do \ -+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ -+ done | \ -+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ -+ END { if (nonempty) { for (i in files) print i; }; }'`; \ -+ test -z "$(CTAGS_ARGS)$$unique" \ -+ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ -+ $$unique -+ -+GTAGS: -+ here=`$(am__cd) $(top_builddir) && pwd` \ -+ && $(am__cd) $(top_srcdir) \ -+ && gtags -i $(GTAGS_ARGS) "$$here" -+ -+distclean-tags: -+ -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags -+ -+distdir: $(DISTFILES) -+ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ -+ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ -+ list='$(DISTFILES)'; \ -+ dist_files=`for file in $$list; do echo $$file; done | \ -+ sed -e "s|^$$srcdirstrip/||;t" \ -+ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ -+ case $$dist_files in \ -+ */*) $(MKDIR_P) `echo "$$dist_files" | \ -+ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ -+ sort -u` ;; \ -+ esac; \ -+ for file in $$dist_files; do \ -+ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ -+ if test -d $$d/$$file; then \ -+ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ -+ if test -d "$(distdir)/$$file"; then \ -+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ -+ fi; \ -+ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ -+ cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ -+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ -+ fi; \ -+ cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ -+ else \ -+ test -f "$(distdir)/$$file" \ -+ || cp -p $$d/$$file "$(distdir)/$$file" \ -+ || exit 1; \ -+ fi; \ -+ done -+ @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ -+ if test "$$subdir" = .; then :; else \ -+ test -d "$(distdir)/$$subdir" \ -+ || $(MKDIR_P) "$(distdir)/$$subdir" \ -+ || exit 1; \ -+ fi; \ -+ done -+ @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ -+ if test "$$subdir" = .; then :; else \ -+ dir1=$$subdir; dir2="$(distdir)/$$subdir"; \ -+ $(am__relativize); \ -+ new_distdir=$$reldir; \ -+ dir1=$$subdir; dir2="$(top_distdir)"; \ -+ $(am__relativize); \ -+ new_top_distdir=$$reldir; \ -+ echo " (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir="$$new_top_distdir" distdir="$$new_distdir" \\"; \ -+ echo " am__remove_distdir=: am__skip_length_check=: am__skip_mode_fix=: distdir)"; \ -+ ($(am__cd) $$subdir && \ -+ $(MAKE) $(AM_MAKEFLAGS) \ -+ top_distdir="$$new_top_distdir" \ -+ distdir="$$new_distdir" \ -+ am__remove_distdir=: \ -+ am__skip_length_check=: \ -+ am__skip_mode_fix=: \ -+ distdir) \ -+ || exit 1; \ -+ fi; \ -+ done -+check-am: all-am -+check: $(BUILT_SOURCES) -+ $(MAKE) $(AM_MAKEFLAGS) check-recursive -+all-am: Makefile $(LIBRARIES) $(LTLIBRARIES) $(HEADERS) -+installdirs: installdirs-recursive -+installdirs-am: -+install: $(BUILT_SOURCES) -+ $(MAKE) $(AM_MAKEFLAGS) install-recursive -+install-exec: install-exec-recursive -+install-data: install-data-recursive -+uninstall: uninstall-recursive -+ -+install-am: all-am -+ @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am -+ -+installcheck: installcheck-recursive -+install-strip: -+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ -+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ -+ `test -z '$(STRIP)' || \ -+ echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install -+mostlyclean-generic: -+ -test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES) -+ -+clean-generic: -+ -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) -+ -+distclean-generic: -+ -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) -+ -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES) -+ -test -z "$(DISTCLEANFILES)" || rm -f $(DISTCLEANFILES) -+ -+maintainer-clean-generic: -+ @echo "This command is intended for maintainers to use" -+ @echo "it deletes files that may require special tools to rebuild." -+ -test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES) -+ -test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES) -+clean: clean-recursive -+ -+clean-am: clean-generic clean-noinstLIBRARIES clean-noinstLTLIBRARIES \ -+ mostlyclean-am -+ -+distclean: distclean-recursive -+ -rm -rf ./$(DEPDIR) -+ -rm -f Makefile -+distclean-am: clean-am distclean-compile distclean-generic \ -+ distclean-tags -+ -+dvi: dvi-recursive -+ -+dvi-am: -+ -+html: html-recursive -+ -+html-am: -+ -+info: info-recursive -+ -+info-am: -+ -+install-data-am: -+ -+install-dvi: install-dvi-recursive -+ -+install-dvi-am: -+ -+install-exec-am: -+ -+install-html: install-html-recursive -+ -+install-html-am: -+ -+install-info: install-info-recursive -+ -+install-info-am: -+ -+install-man: -+ -+install-pdf: install-pdf-recursive -+ -+install-pdf-am: -+ -+install-ps: install-ps-recursive -+ -+install-ps-am: -+ -+installcheck-am: -+ -+maintainer-clean: maintainer-clean-recursive -+ -rm -rf ./$(DEPDIR) -+ -rm -f Makefile -+maintainer-clean-am: distclean-am maintainer-clean-generic -+ -+mostlyclean: mostlyclean-recursive -+ -+mostlyclean-am: mostlyclean-compile mostlyclean-generic \ -+ mostlyclean-local -+ -+pdf: pdf-recursive -+ -+pdf-am: -+ -+ps: ps-recursive -+ -+ps-am: -+ -+uninstall-am: -+ -+.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) all check \ -+ ctags-recursive install install-am install-strip \ -+ tags-recursive -+ -+.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ -+ all all-am check check-am clean clean-generic \ -+ clean-noinstLIBRARIES clean-noinstLTLIBRARIES ctags \ -+ ctags-recursive distclean distclean-compile distclean-generic \ -+ distclean-tags distdir dvi dvi-am html html-am info info-am \ -+ install install-am install-data install-data-am install-dvi \ -+ install-dvi-am install-exec install-exec-am install-html \ -+ install-html-am install-info install-info-am install-man \ -+ install-pdf install-pdf-am install-ps install-ps-am \ -+ install-strip installcheck installcheck-am installdirs \ -+ installdirs-am maintainer-clean maintainer-clean-generic \ -+ mostlyclean mostlyclean-compile mostlyclean-generic \ -+ mostlyclean-local pdf pdf-am ps ps-am tags tags-recursive \ -+ uninstall uninstall-am -+ -+ -+# We need the following in order to create when the system -+# doesn't have one that works with the given compiler. -+getopt.h: getopt.in.h -+ $(AM_V_GEN)rm -f $@-t $@ && \ -+ { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \ -+ sed -e 's|@''HAVE_GETOPT_H''@|$(HAVE_GETOPT_H)|g' \ -+ -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \ -+ -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \ -+ -e 's|@''NEXT_GETOPT_H''@|$(NEXT_GETOPT_H)|g' \ -+ -e '/definition of GL_LINK_WARNING/r $(LINK_WARNING_H)' \ -+ < $(srcdir)/getopt.in.h; \ -+ } > $@-t && \ -+ mv -f $@-t $@ -+ -+# We need the following in order to create when the system -+# doesn't have one that works with the given compiler. -+stddef.h: stddef.in.h -+ $(AM_V_GEN)rm -f $@-t $@ && \ -+ { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */' && \ -+ sed -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \ -+ -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \ -+ -e 's|@''NEXT_STDDEF_H''@|$(NEXT_STDDEF_H)|g' \ -+ -e 's|@''HAVE_WCHAR_T''@|$(HAVE_WCHAR_T)|g' \ -+ -e 's|@''REPLACE_NULL''@|$(REPLACE_NULL)|g' \ -+ < $(srcdir)/stddef.in.h; \ -+ } > $@-t && \ -+ mv $@-t $@ -+ -+# We need the following in order to create an empty placeholder for -+# when the system doesn't have one. -+unistd.h: unistd.in.h -+ $(AM_V_GEN)rm -f $@-t $@ && \ -+ { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \ -+ sed -e 's|@''HAVE_UNISTD_H''@|$(HAVE_UNISTD_H)|g' \ -+ -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \ -+ -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \ -+ -e 's|@''NEXT_UNISTD_H''@|$(NEXT_UNISTD_H)|g' \ -+ -e 's|@''GNULIB_CHOWN''@|$(GNULIB_CHOWN)|g' \ -+ -e 's|@''GNULIB_CLOSE''@|$(GNULIB_CLOSE)|g' \ -+ -e 's|@''GNULIB_DUP2''@|$(GNULIB_DUP2)|g' \ -+ -e 's|@''GNULIB_DUP3''@|$(GNULIB_DUP3)|g' \ -+ -e 's|@''GNULIB_ENVIRON''@|$(GNULIB_ENVIRON)|g' \ -+ -e 's|@''GNULIB_EUIDACCESS''@|$(GNULIB_EUIDACCESS)|g' \ -+ -e 's|@''GNULIB_FACCESSAT''@|$(GNULIB_FACCESSAT)|g' \ -+ -e 's|@''GNULIB_FCHDIR''@|$(GNULIB_FCHDIR)|g' \ -+ -e 's|@''GNULIB_FCHOWNAT''@|$(GNULIB_FCHOWNAT)|g' \ -+ -e 's|@''GNULIB_FSYNC''@|$(GNULIB_FSYNC)|g' \ -+ -e 's|@''GNULIB_FTRUNCATE''@|$(GNULIB_FTRUNCATE)|g' \ -+ -e 's|@''GNULIB_GETCWD''@|$(GNULIB_GETCWD)|g' \ -+ -e 's|@''GNULIB_GETDOMAINNAME''@|$(GNULIB_GETDOMAINNAME)|g' \ -+ -e 's|@''GNULIB_GETDTABLESIZE''@|$(GNULIB_GETDTABLESIZE)|g' \ -+ -e 's|@''GNULIB_GETGROUPS''@|$(GNULIB_GETGROUPS)|g' \ -+ -e 's|@''GNULIB_GETHOSTNAME''@|$(GNULIB_GETHOSTNAME)|g' \ -+ -e 's|@''GNULIB_GETLOGIN_R''@|$(GNULIB_GETLOGIN_R)|g' \ -+ -e 's|@''GNULIB_GETPAGESIZE''@|$(GNULIB_GETPAGESIZE)|g' \ -+ -e 's|@''GNULIB_GETUSERSHELL''@|$(GNULIB_GETUSERSHELL)|g' \ -+ -e 's|@''GNULIB_LCHOWN''@|$(GNULIB_LCHOWN)|g' \ -+ -e 's|@''GNULIB_LINK''@|$(GNULIB_LINK)|g' \ -+ -e 's|@''GNULIB_LINKAT''@|$(GNULIB_LINKAT)|g' \ -+ -e 's|@''GNULIB_LSEEK''@|$(GNULIB_LSEEK)|g' \ -+ -e 's|@''GNULIB_PIPE2''@|$(GNULIB_PIPE2)|g' \ -+ -e 's|@''GNULIB_READLINK''@|$(GNULIB_READLINK)|g' \ -+ -e 's|@''GNULIB_READLINKAT''@|$(GNULIB_READLINKAT)|g' \ -+ -e 's|@''GNULIB_RMDIR''@|$(GNULIB_RMDIR)|g' \ -+ -e 's|@''GNULIB_SLEEP''@|$(GNULIB_SLEEP)|g' \ -+ -e 's|@''GNULIB_SYMLINK''@|$(GNULIB_SYMLINK)|g' \ -+ -e 's|@''GNULIB_SYMLINKAT''@|$(GNULIB_SYMLINKAT)|g' \ -+ -e 's|@''GNULIB_UNISTD_H_GETOPT''@|$(GNULIB_UNISTD_H_GETOPT)|g' \ -+ -e 's|@''GNULIB_UNISTD_H_SIGPIPE''@|$(GNULIB_UNISTD_H_SIGPIPE)|g' \ -+ -e 's|@''GNULIB_UNLINK''@|$(GNULIB_UNLINK)|g' \ -+ -e 's|@''GNULIB_UNLINKAT''@|$(GNULIB_UNLINKAT)|g' \ -+ -e 's|@''GNULIB_WRITE''@|$(GNULIB_WRITE)|g' \ -+ -e 's|@''HAVE_DUP2''@|$(HAVE_DUP2)|g' \ -+ -e 's|@''HAVE_DUP3''@|$(HAVE_DUP3)|g' \ -+ -e 's|@''HAVE_EUIDACCESS''@|$(HAVE_EUIDACCESS)|g' \ -+ -e 's|@''HAVE_FACCESSAT''@|$(HAVE_FACCESSAT)|g' \ -+ -e 's|@''HAVE_FCHOWNAT''@|$(HAVE_FCHOWNAT)|g' \ -+ -e 's|@''HAVE_FSYNC''@|$(HAVE_FSYNC)|g' \ -+ -e 's|@''HAVE_FTRUNCATE''@|$(HAVE_FTRUNCATE)|g' \ -+ -e 's|@''HAVE_GETDOMAINNAME''@|$(HAVE_GETDOMAINNAME)|g' \ -+ -e 's|@''HAVE_GETDTABLESIZE''@|$(HAVE_GETDTABLESIZE)|g' \ -+ -e 's|@''HAVE_GETGROUPS''@|$(HAVE_GETGROUPS)|g' \ -+ -e 's|@''HAVE_GETHOSTNAME''@|$(HAVE_GETHOSTNAME)|g' \ -+ -e 's|@''HAVE_GETPAGESIZE''@|$(HAVE_GETPAGESIZE)|g' \ -+ -e 's|@''HAVE_GETUSERSHELL''@|$(HAVE_GETUSERSHELL)|g' \ -+ -e 's|@''HAVE_LINK''@|$(HAVE_LINK)|g' \ -+ -e 's|@''HAVE_LINKAT''@|$(HAVE_LINKAT)|g' \ -+ -e 's|@''HAVE_PIPE2''@|$(HAVE_PIPE2)|g' \ -+ -e 's|@''HAVE_READLINK''@|$(HAVE_READLINK)|g' \ -+ -e 's|@''HAVE_READLINKAT''@|$(HAVE_READLINKAT)|g' \ -+ -e 's|@''HAVE_SLEEP''@|$(HAVE_SLEEP)|g' \ -+ -e 's|@''HAVE_SYMLINK''@|$(HAVE_SYMLINK)|g' \ -+ -e 's|@''HAVE_SYMLINKAT''@|$(HAVE_SYMLINKAT)|g' \ -+ -e 's|@''HAVE_UNLINKAT''@|$(HAVE_UNLINKAT)|g' \ -+ -e 's|@''HAVE_DECL_ENVIRON''@|$(HAVE_DECL_ENVIRON)|g' \ -+ -e 's|@''HAVE_DECL_GETLOGIN_R''@|$(HAVE_DECL_GETLOGIN_R)|g' \ -+ -e 's|@''HAVE_OS_H''@|$(HAVE_OS_H)|g' \ -+ -e 's|@''HAVE_SYS_PARAM_H''@|$(HAVE_SYS_PARAM_H)|g' \ -+ -e 's|@''REPLACE_CHOWN''@|$(REPLACE_CHOWN)|g' \ -+ -e 's|@''REPLACE_CLOSE''@|$(REPLACE_CLOSE)|g' \ -+ -e 's|@''REPLACE_DUP''@|$(REPLACE_DUP)|g' \ -+ -e 's|@''REPLACE_DUP2''@|$(REPLACE_DUP2)|g' \ -+ -e 's|@''REPLACE_FCHDIR''@|$(REPLACE_FCHDIR)|g' \ -+ -e 's|@''REPLACE_FCHOWNAT''@|$(REPLACE_FCHOWNAT)|g' \ -+ -e 's|@''REPLACE_GETCWD''@|$(REPLACE_GETCWD)|g' \ -+ -e 's|@''REPLACE_GETGROUPS''@|$(REPLACE_GETGROUPS)|g' \ -+ -e 's|@''REPLACE_GETPAGESIZE''@|$(REPLACE_GETPAGESIZE)|g' \ -+ -e 's|@''REPLACE_LCHOWN''@|$(REPLACE_LCHOWN)|g' \ -+ -e 's|@''REPLACE_LINK''@|$(REPLACE_LINK)|g' \ -+ -e 's|@''REPLACE_LINKAT''@|$(REPLACE_LINKAT)|g' \ -+ -e 's|@''REPLACE_LSEEK''@|$(REPLACE_LSEEK)|g' \ -+ -e 's|@''REPLACE_READLINK''@|$(REPLACE_READLINK)|g' \ -+ -e 's|@''REPLACE_RMDIR''@|$(REPLACE_RMDIR)|g' \ -+ -e 's|@''REPLACE_SYMLINK''@|$(REPLACE_SYMLINK)|g' \ -+ -e 's|@''REPLACE_UNLINK''@|$(REPLACE_UNLINK)|g' \ -+ -e 's|@''REPLACE_UNLINKAT''@|$(REPLACE_UNLINKAT)|g' \ -+ -e 's|@''REPLACE_WRITE''@|$(REPLACE_WRITE)|g' \ -+ -e 's|@''UNISTD_H_HAVE_WINSOCK2_H''@|$(UNISTD_H_HAVE_WINSOCK2_H)|g' \ -+ -e 's|@''UNISTD_H_HAVE_WINSOCK2_H_AND_USE_SOCKETS''@|$(UNISTD_H_HAVE_WINSOCK2_H_AND_USE_SOCKETS)|g' \ -+ -e '/definition of GL_LINK_WARNING/r $(LINK_WARNING_H)' \ -+ < $(srcdir)/unistd.in.h; \ -+ } > $@-t && \ -+ mv $@-t $@ -+ -+mostlyclean-local: mostlyclean-generic -+ @for dir in '' $(MOSTLYCLEANDIRS); do \ -+ if test -n "$$dir" && test -d $$dir; then \ -+ echo "rmdir $$dir"; rmdir $$dir; \ -+ fi; \ -+ done; \ -+ : -+ -+# Tell versions [3.59,3.63) of GNU make to not export all variables. -+# Otherwise a system limit (for SysV at least) may be exceeded. -+.NOEXPORT: -diff --git a/lib/dummy.c b/lib/dummy.c -new file mode 100644 -index 0000000..ccb5c26 ---- /dev/null -+++ b/lib/dummy.c -@@ -0,0 +1,42 @@ -+/* A dummy file, to prevent empty libraries from breaking builds. -+ Copyright (C) 2004, 2007 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 3 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, see . */ -+ -+/* Some systems, reportedly OpenBSD and Mac OS X, refuse to create -+ libraries without any object files. You might get an error like: -+ -+ > ar cru .libs/libgl.a -+ > ar: no archive members specified -+ -+ Compiling this file, and adding its object file to the library, will -+ prevent the library from being empty. */ -+ -+/* Some systems, such as Solaris with cc 5.0, refuse to work with libraries -+ that don't export any symbol. You might get an error like: -+ -+ > cc ... libgnu.a -+ > ild: (bad file) garbled symbol table in archive ../gllib/libgnu.a -+ -+ Compiling this file, and adding its object file to the library, will -+ prevent the library from exporting no symbols. */ -+ -+#ifdef __sun -+/* This declaration ensures that the library will export at least 1 symbol. */ -+int gl_dummy_symbol; -+#else -+/* This declaration is solely to ensure that after preprocessing -+ this file is never empty. */ -+typedef int dummy; -+#endif -diff --git a/lib/getopt.c b/lib/getopt.c -new file mode 100644 -index 0000000..797d166 ---- /dev/null -+++ b/lib/getopt.c -@@ -0,0 +1,1187 @@ -+/* Getopt for GNU. -+ NOTE: getopt is now part of the C library, so if you don't know what -+ "Keep this file name-space clean" means, talk to drepper at gnu.org -+ before changing it! -+ Copyright (C) 1987,88,89,90,91,92,93,94,95,96,98,99,2000,2001,2002,2003,2004,2006,2008,2009 -+ Free Software Foundation, Inc. -+ This file is part of the GNU C Library. -+ -+ 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 3 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, see . */ -+ -+#ifndef _LIBC -+# include -+#endif -+ -+#include "getopt.h" -+ -+#include -+#include -+#include -+#include -+ -+#ifdef _LIBC -+# include -+#else -+# include "gettext.h" -+# define _(msgid) gettext (msgid) -+#endif -+ -+#if defined _LIBC && defined USE_IN_LIBIO -+# include -+#endif -+ -+#ifndef attribute_hidden -+# define attribute_hidden -+#endif -+ -+/* Unlike standard Unix `getopt', functions like `getopt_long' -+ let the user intersperse the options with the other arguments. -+ -+ As `getopt_long' works, it permutes the elements of ARGV so that, -+ when it is done, all the options precede everything else. Thus -+ all application programs are extended to handle flexible argument order. -+ -+ Using `getopt' or setting the environment variable POSIXLY_CORRECT -+ disables permutation. -+ Then the application's behavior is completely standard. -+ -+ GNU application programs can use a third alternative mode in which -+ they can distinguish the relative order of options and other arguments. */ -+ -+#include "getopt_int.h" -+ -+/* For communication from `getopt' to the caller. -+ When `getopt' finds an option that takes an argument, -+ the argument value is returned here. -+ Also, when `ordering' is RETURN_IN_ORDER, -+ each non-option ARGV-element is returned here. */ -+ -+char *optarg; -+ -+/* Index in ARGV of the next element to be scanned. -+ This is used for communication to and from the caller -+ and for communication between successive calls to `getopt'. -+ -+ On entry to `getopt', zero means this is the first call; initialize. -+ -+ When `getopt' returns -1, this is the index of the first of the -+ non-option elements that the caller should itself scan. -+ -+ Otherwise, `optind' communicates from one call to the next -+ how much of ARGV has been scanned so far. */ -+ -+/* 1003.2 says this must be 1 before any call. */ -+int optind = 1; -+ -+/* Callers store zero here to inhibit the error message -+ for unrecognized options. */ -+ -+int opterr = 1; -+ -+/* Set to an option character which was unrecognized. -+ This must be initialized on some systems to avoid linking in the -+ system's own getopt implementation. */ -+ -+int optopt = '?'; -+ -+/* Keep a global copy of all internal members of getopt_data. */ -+ -+static struct _getopt_data getopt_data; -+ -+ -+#if defined HAVE_DECL_GETENV && !HAVE_DECL_GETENV -+extern char *getenv (); -+#endif -+ -+#ifdef _LIBC -+/* Stored original parameters. -+ XXX This is no good solution. We should rather copy the args so -+ that we can compare them later. But we must not use malloc(3). */ -+extern int __libc_argc; -+extern char **__libc_argv; -+ -+/* Bash 2.0 gives us an environment variable containing flags -+ indicating ARGV elements that should not be considered arguments. */ -+ -+# ifdef USE_NONOPTION_FLAGS -+/* Defined in getopt_init.c */ -+extern char *__getopt_nonoption_flags; -+# endif -+ -+# ifdef USE_NONOPTION_FLAGS -+# define SWAP_FLAGS(ch1, ch2) \ -+ if (d->__nonoption_flags_len > 0) \ -+ { \ -+ char __tmp = __getopt_nonoption_flags[ch1]; \ -+ __getopt_nonoption_flags[ch1] = __getopt_nonoption_flags[ch2]; \ -+ __getopt_nonoption_flags[ch2] = __tmp; \ -+ } -+# else -+# define SWAP_FLAGS(ch1, ch2) -+# endif -+#else /* !_LIBC */ -+# define SWAP_FLAGS(ch1, ch2) -+#endif /* _LIBC */ -+ -+/* Exchange two adjacent subsequences of ARGV. -+ One subsequence is elements [first_nonopt,last_nonopt) -+ which contains all the non-options that have been skipped so far. -+ The other is elements [last_nonopt,optind), which contains all -+ the options processed since those non-options were skipped. -+ -+ `first_nonopt' and `last_nonopt' are relocated so that they describe -+ the new indices of the non-options in ARGV after they are moved. */ -+ -+static void -+exchange (char **argv, struct _getopt_data *d) -+{ -+ int bottom = d->__first_nonopt; -+ int middle = d->__last_nonopt; -+ int top = d->optind; -+ char *tem; -+ -+ /* Exchange the shorter segment with the far end of the longer segment. -+ That puts the shorter segment into the right place. -+ It leaves the longer segment in the right place overall, -+ but it consists of two parts that need to be swapped next. */ -+ -+#if defined _LIBC && defined USE_NONOPTION_FLAGS -+ /* First make sure the handling of the `__getopt_nonoption_flags' -+ string can work normally. Our top argument must be in the range -+ of the string. */ -+ if (d->__nonoption_flags_len > 0 && top >= d->__nonoption_flags_max_len) -+ { -+ /* We must extend the array. The user plays games with us and -+ presents new arguments. */ -+ char *new_str = malloc (top + 1); -+ if (new_str == NULL) -+ d->__nonoption_flags_len = d->__nonoption_flags_max_len = 0; -+ else -+ { -+ memset (__mempcpy (new_str, __getopt_nonoption_flags, -+ d->__nonoption_flags_max_len), -+ '\0', top + 1 - d->__nonoption_flags_max_len); -+ d->__nonoption_flags_max_len = top + 1; -+ __getopt_nonoption_flags = new_str; -+ } -+ } -+#endif -+ -+ while (top > middle && middle > bottom) -+ { -+ if (top - middle > middle - bottom) -+ { -+ /* Bottom segment is the short one. */ -+ int len = middle - bottom; -+ register int i; -+ -+ /* Swap it with the top part of the top segment. */ -+ for (i = 0; i < len; i++) -+ { -+ tem = argv[bottom + i]; -+ argv[bottom + i] = argv[top - (middle - bottom) + i]; -+ argv[top - (middle - bottom) + i] = tem; -+ SWAP_FLAGS (bottom + i, top - (middle - bottom) + i); -+ } -+ /* Exclude the moved bottom segment from further swapping. */ -+ top -= len; -+ } -+ else -+ { -+ /* Top segment is the short one. */ -+ int len = top - middle; -+ register int i; -+ -+ /* Swap it with the bottom part of the bottom segment. */ -+ for (i = 0; i < len; i++) -+ { -+ tem = argv[bottom + i]; -+ argv[bottom + i] = argv[middle + i]; -+ argv[middle + i] = tem; -+ SWAP_FLAGS (bottom + i, middle + i); -+ } -+ /* Exclude the moved top segment from further swapping. */ -+ bottom += len; -+ } -+ } -+ -+ /* Update records for the slots the non-options now occupy. */ -+ -+ d->__first_nonopt += (d->optind - d->__last_nonopt); -+ d->__last_nonopt = d->optind; -+} -+ -+/* Initialize the internal data when the first call is made. */ -+ -+static const char * -+_getopt_initialize (int argc _UNUSED_PARAMETER_, -+ char **argv _UNUSED_PARAMETER_, const char *optstring, -+ int posixly_correct, struct _getopt_data *d) -+{ -+ /* Start processing options with ARGV-element 1 (since ARGV-element 0 -+ is the program name); the sequence of previously skipped -+ non-option ARGV-elements is empty. */ -+ -+ d->__first_nonopt = d->__last_nonopt = d->optind; -+ -+ d->__nextchar = NULL; -+ -+ d->__posixly_correct = posixly_correct || !!getenv ("POSIXLY_CORRECT"); -+ -+ /* Determine how to handle the ordering of options and nonoptions. */ -+ -+ if (optstring[0] == '-') -+ { -+ d->__ordering = RETURN_IN_ORDER; -+ ++optstring; -+ } -+ else if (optstring[0] == '+') -+ { -+ d->__ordering = REQUIRE_ORDER; -+ ++optstring; -+ } -+ else if (d->__posixly_correct) -+ d->__ordering = REQUIRE_ORDER; -+ else -+ d->__ordering = PERMUTE; -+ -+#if defined _LIBC && defined USE_NONOPTION_FLAGS -+ if (!d->__posixly_correct -+ && argc == __libc_argc && argv == __libc_argv) -+ { -+ if (d->__nonoption_flags_max_len == 0) -+ { -+ if (__getopt_nonoption_flags == NULL -+ || __getopt_nonoption_flags[0] == '\0') -+ d->__nonoption_flags_max_len = -1; -+ else -+ { -+ const char *orig_str = __getopt_nonoption_flags; -+ int len = d->__nonoption_flags_max_len = strlen (orig_str); -+ if (d->__nonoption_flags_max_len < argc) -+ d->__nonoption_flags_max_len = argc; -+ __getopt_nonoption_flags = -+ (char *) malloc (d->__nonoption_flags_max_len); -+ if (__getopt_nonoption_flags == NULL) -+ d->__nonoption_flags_max_len = -1; -+ else -+ memset (__mempcpy (__getopt_nonoption_flags, orig_str, len), -+ '\0', d->__nonoption_flags_max_len - len); -+ } -+ } -+ d->__nonoption_flags_len = d->__nonoption_flags_max_len; -+ } -+ else -+ d->__nonoption_flags_len = 0; -+#endif -+ -+ return optstring; -+} -+ -+/* Scan elements of ARGV (whose length is ARGC) for option characters -+ given in OPTSTRING. -+ -+ If an element of ARGV starts with '-', and is not exactly "-" or "--", -+ then it is an option element. The characters of this element -+ (aside from the initial '-') are option characters. If `getopt' -+ is called repeatedly, it returns successively each of the option characters -+ from each of the option elements. -+ -+ If `getopt' finds another option character, it returns that character, -+ updating `optind' and `nextchar' so that the next call to `getopt' can -+ resume the scan with the following option character or ARGV-element. -+ -+ If there are no more option characters, `getopt' returns -1. -+ Then `optind' is the index in ARGV of the first ARGV-element -+ that is not an option. (The ARGV-elements have been permuted -+ so that those that are not options now come last.) -+ -+ OPTSTRING is a string containing the legitimate option characters. -+ If an option character is seen that is not listed in OPTSTRING, -+ return '?' after printing an error message. If you set `opterr' to -+ zero, the error message is suppressed but we still return '?'. -+ -+ If a char in OPTSTRING is followed by a colon, that means it wants an arg, -+ so the following text in the same ARGV-element, or the text of the following -+ ARGV-element, is returned in `optarg'. Two colons mean an option that -+ wants an optional arg; if there is text in the current ARGV-element, -+ it is returned in `optarg', otherwise `optarg' is set to zero. -+ -+ If OPTSTRING starts with `-' or `+', it requests different methods of -+ handling the non-option ARGV-elements. -+ See the comments about RETURN_IN_ORDER and REQUIRE_ORDER, above. -+ -+ Long-named options begin with `--' instead of `-'. -+ Their names may be abbreviated as long as the abbreviation is unique -+ or is an exact match for some defined option. If they have an -+ argument, it follows the option name in the same ARGV-element, separated -+ from the option name by a `=', or else the in next ARGV-element. -+ When `getopt' finds a long-named option, it returns 0 if that option's -+ `flag' field is nonzero, the value of the option's `val' field -+ if the `flag' field is zero. -+ -+ LONGOPTS is a vector of `struct option' terminated by an -+ element containing a name which is zero. -+ -+ LONGIND returns the index in LONGOPT of the long-named option found. -+ It is only valid when a long-named option has been found by the most -+ recent call. -+ -+ If LONG_ONLY is nonzero, '-' as well as '--' can introduce -+ long-named options. -+ -+ If POSIXLY_CORRECT is nonzero, behave as if the POSIXLY_CORRECT -+ environment variable were set. */ -+ -+int -+_getopt_internal_r (int argc, char **argv, const char *optstring, -+ const struct option *longopts, int *longind, -+ int long_only, int posixly_correct, struct _getopt_data *d) -+{ -+ int print_errors = d->opterr; -+ if (optstring[0] == ':') -+ print_errors = 0; -+ -+ if (argc < 1) -+ return -1; -+ -+ d->optarg = NULL; -+ -+ if (d->optind == 0 || !d->__initialized) -+ { -+ if (d->optind == 0) -+ d->optind = 1; /* Don't scan ARGV[0], the program name. */ -+ optstring = _getopt_initialize (argc, argv, optstring, -+ posixly_correct, d); -+ d->__initialized = 1; -+ } -+ -+ /* Test whether ARGV[optind] points to a non-option argument. -+ Either it does not have option syntax, or there is an environment flag -+ from the shell indicating it is not an option. The later information -+ is only used when the used in the GNU libc. */ -+#if defined _LIBC && defined USE_NONOPTION_FLAGS -+# define NONOPTION_P (argv[d->optind][0] != '-' || argv[d->optind][1] == '\0' \ -+ || (d->optind < d->__nonoption_flags_len \ -+ && __getopt_nonoption_flags[d->optind] == '1')) -+#else -+# define NONOPTION_P (argv[d->optind][0] != '-' || argv[d->optind][1] == '\0') -+#endif -+ -+ if (d->__nextchar == NULL || *d->__nextchar == '\0') -+ { -+ /* Advance to the next ARGV-element. */ -+ -+ /* Give FIRST_NONOPT & LAST_NONOPT rational values if OPTIND has been -+ moved back by the user (who may also have changed the arguments). */ -+ if (d->__last_nonopt > d->optind) -+ d->__last_nonopt = d->optind; -+ if (d->__first_nonopt > d->optind) -+ d->__first_nonopt = d->optind; -+ -+ if (d->__ordering == PERMUTE) -+ { -+ /* If we have just processed some options following some non-options, -+ exchange them so that the options come first. */ -+ -+ if (d->__first_nonopt != d->__last_nonopt -+ && d->__last_nonopt != d->optind) -+ exchange ((char **) argv, d); -+ else if (d->__last_nonopt != d->optind) -+ d->__first_nonopt = d->optind; -+ -+ /* Skip any additional non-options -+ and extend the range of non-options previously skipped. */ -+ -+ while (d->optind < argc && NONOPTION_P) -+ d->optind++; -+ d->__last_nonopt = d->optind; -+ } -+ -+ /* The special ARGV-element `--' means premature end of options. -+ Skip it like a null option, -+ then exchange with previous non-options as if it were an option, -+ then skip everything else like a non-option. */ -+ -+ if (d->optind != argc && !strcmp (argv[d->optind], "--")) -+ { -+ d->optind++; -+ -+ if (d->__first_nonopt != d->__last_nonopt -+ && d->__last_nonopt != d->optind) -+ exchange ((char **) argv, d); -+ else if (d->__first_nonopt == d->__last_nonopt) -+ d->__first_nonopt = d->optind; -+ d->__last_nonopt = argc; -+ -+ d->optind = argc; -+ } -+ -+ /* If we have done all the ARGV-elements, stop the scan -+ and back over any non-options that we skipped and permuted. */ -+ -+ if (d->optind == argc) -+ { -+ /* Set the next-arg-index to point at the non-options -+ that we previously skipped, so the caller will digest them. */ -+ if (d->__first_nonopt != d->__last_nonopt) -+ d->optind = d->__first_nonopt; -+ return -1; -+ } -+ -+ /* If we have come to a non-option and did not permute it, -+ either stop the scan or describe it to the caller and pass it by. */ -+ -+ if (NONOPTION_P) -+ { -+ if (d->__ordering == REQUIRE_ORDER) -+ return -1; -+ d->optarg = argv[d->optind++]; -+ return 1; -+ } -+ -+ /* We have found another option-ARGV-element. -+ Skip the initial punctuation. */ -+ -+ d->__nextchar = (argv[d->optind] + 1 -+ + (longopts != NULL && argv[d->optind][1] == '-')); -+ } -+ -+ /* Decode the current option-ARGV-element. */ -+ -+ /* Check whether the ARGV-element is a long option. -+ -+ If long_only and the ARGV-element has the form "-f", where f is -+ a valid short option, don't consider it an abbreviated form of -+ a long option that starts with f. Otherwise there would be no -+ way to give the -f short option. -+ -+ On the other hand, if there's a long option "fubar" and -+ the ARGV-element is "-fu", do consider that an abbreviation of -+ the long option, just like "--fu", and not "-f" with arg "u". -+ -+ This distinction seems to be the most useful approach. */ -+ -+ if (longopts != NULL -+ && (argv[d->optind][1] == '-' -+ || (long_only && (argv[d->optind][2] -+ || !strchr (optstring, argv[d->optind][1]))))) -+ { -+ char *nameend; -+ const struct option *p; -+ const struct option *pfound = NULL; -+ int exact = 0; -+ int ambig = 0; -+ int indfound = -1; -+ int option_index; -+ -+ for (nameend = d->__nextchar; *nameend && *nameend != '='; nameend++) -+ /* Do nothing. */ ; -+ -+ /* Test all long options for either exact match -+ or abbreviated matches. */ -+ for (p = longopts, option_index = 0; p->name; p++, option_index++) -+ if (!strncmp (p->name, d->__nextchar, nameend - d->__nextchar)) -+ { -+ if ((unsigned int) (nameend - d->__nextchar) -+ == (unsigned int) strlen (p->name)) -+ { -+ /* Exact match found. */ -+ pfound = p; -+ indfound = option_index; -+ exact = 1; -+ break; -+ } -+ else if (pfound == NULL) -+ { -+ /* First nonexact match found. */ -+ pfound = p; -+ indfound = option_index; -+ } -+ else if (long_only -+ || pfound->has_arg != p->has_arg -+ || pfound->flag != p->flag -+ || pfound->val != p->val) -+ /* Second or later nonexact match found. */ -+ ambig = 1; -+ } -+ -+ if (ambig && !exact) -+ { -+ if (print_errors) -+ { -+#if defined _LIBC && defined USE_IN_LIBIO -+ char *buf; -+ -+ if (__asprintf (&buf, _("%s: option `%s' is ambiguous\n"), -+ argv[0], argv[d->optind]) >= 0) -+ { -+ _IO_flockfile (stderr); -+ -+ int old_flags2 = ((_IO_FILE *) stderr)->_flags2; -+ ((_IO_FILE *) stderr)->_flags2 |= _IO_FLAGS2_NOTCANCEL; -+ -+ __fxprintf (NULL, "%s", buf); -+ -+ ((_IO_FILE *) stderr)->_flags2 = old_flags2; -+ _IO_funlockfile (stderr); -+ -+ free (buf); -+ } -+#else -+ fprintf (stderr, _("%s: option `%s' is ambiguous\n"), -+ argv[0], argv[d->optind]); -+#endif -+ } -+ d->__nextchar += strlen (d->__nextchar); -+ d->optind++; -+ d->optopt = 0; -+ return '?'; -+ } -+ -+ if (pfound != NULL) -+ { -+ option_index = indfound; -+ d->optind++; -+ if (*nameend) -+ { -+ /* Don't test has_arg with >, because some C compilers don't -+ allow it to be used on enums. */ -+ if (pfound->has_arg) -+ d->optarg = nameend + 1; -+ else -+ { -+ if (print_errors) -+ { -+#if defined _LIBC && defined USE_IN_LIBIO -+ char *buf; -+ int n; -+#endif -+ -+ if (argv[d->optind - 1][1] == '-') -+ { -+ /* --option */ -+#if defined _LIBC && defined USE_IN_LIBIO -+ n = __asprintf (&buf, _("\ -+%s: option `--%s' doesn't allow an argument\n"), -+ argv[0], pfound->name); -+#else -+ fprintf (stderr, _("\ -+%s: option `--%s' doesn't allow an argument\n"), -+ argv[0], pfound->name); -+#endif -+ } -+ else -+ { -+ /* +option or -option */ -+#if defined _LIBC && defined USE_IN_LIBIO -+ n = __asprintf (&buf, _("\ -+%s: option `%c%s' doesn't allow an argument\n"), -+ argv[0], argv[d->optind - 1][0], -+ pfound->name); -+#else -+ fprintf (stderr, _("\ -+%s: option `%c%s' doesn't allow an argument\n"), -+ argv[0], argv[d->optind - 1][0], -+ pfound->name); -+#endif -+ } -+ -+#if defined _LIBC && defined USE_IN_LIBIO -+ if (n >= 0) -+ { -+ _IO_flockfile (stderr); -+ -+ int old_flags2 = ((_IO_FILE *) stderr)->_flags2; -+ ((_IO_FILE *) stderr)->_flags2 -+ |= _IO_FLAGS2_NOTCANCEL; -+ -+ __fxprintf (NULL, "%s", buf); -+ -+ ((_IO_FILE *) stderr)->_flags2 = old_flags2; -+ _IO_funlockfile (stderr); -+ -+ free (buf); -+ } -+#endif -+ } -+ -+ d->__nextchar += strlen (d->__nextchar); -+ -+ d->optopt = pfound->val; -+ return '?'; -+ } -+ } -+ else if (pfound->has_arg == 1) -+ { -+ if (d->optind < argc) -+ d->optarg = argv[d->optind++]; -+ else -+ { -+ if (print_errors) -+ { -+#if defined _LIBC && defined USE_IN_LIBIO -+ char *buf; -+ -+ if (__asprintf (&buf, _("\ -+%s: option `%s' requires an argument\n"), -+ argv[0], argv[d->optind - 1]) >= 0) -+ { -+ _IO_flockfile (stderr); -+ -+ int old_flags2 = ((_IO_FILE *) stderr)->_flags2; -+ ((_IO_FILE *) stderr)->_flags2 -+ |= _IO_FLAGS2_NOTCANCEL; -+ -+ __fxprintf (NULL, "%s", buf); -+ -+ ((_IO_FILE *) stderr)->_flags2 = old_flags2; -+ _IO_funlockfile (stderr); -+ -+ free (buf); -+ } -+#else -+ fprintf (stderr, -+ _("%s: option `%s' requires an argument\n"), -+ argv[0], argv[d->optind - 1]); -+#endif -+ } -+ d->__nextchar += strlen (d->__nextchar); -+ d->optopt = pfound->val; -+ return optstring[0] == ':' ? ':' : '?'; -+ } -+ } -+ d->__nextchar += strlen (d->__nextchar); -+ if (longind != NULL) -+ *longind = option_index; -+ if (pfound->flag) -+ { -+ *(pfound->flag) = pfound->val; -+ return 0; -+ } -+ return pfound->val; -+ } -+ -+ /* Can't find it as a long option. If this is not getopt_long_only, -+ or the option starts with '--' or is not a valid short -+ option, then it's an error. -+ Otherwise interpret it as a short option. */ -+ if (!long_only || argv[d->optind][1] == '-' -+ || strchr (optstring, *d->__nextchar) == NULL) -+ { -+ if (print_errors) -+ { -+#if defined _LIBC && defined USE_IN_LIBIO -+ char *buf; -+ int n; -+#endif -+ -+ if (argv[d->optind][1] == '-') -+ { -+ /* --option */ -+#if defined _LIBC && defined USE_IN_LIBIO -+ n = __asprintf (&buf, _("%s: unrecognized option `--%s'\n"), -+ argv[0], d->__nextchar); -+#else -+ fprintf (stderr, _("%s: unrecognized option `--%s'\n"), -+ argv[0], d->__nextchar); -+#endif -+ } -+ else -+ { -+ /* +option or -option */ -+#if defined _LIBC && defined USE_IN_LIBIO -+ n = __asprintf (&buf, _("%s: unrecognized option `%c%s'\n"), -+ argv[0], argv[d->optind][0], d->__nextchar); -+#else -+ fprintf (stderr, _("%s: unrecognized option `%c%s'\n"), -+ argv[0], argv[d->optind][0], d->__nextchar); -+#endif -+ } -+ -+#if defined _LIBC && defined USE_IN_LIBIO -+ if (n >= 0) -+ { -+ _IO_flockfile (stderr); -+ -+ int old_flags2 = ((_IO_FILE *) stderr)->_flags2; -+ ((_IO_FILE *) stderr)->_flags2 |= _IO_FLAGS2_NOTCANCEL; -+ -+ __fxprintf (NULL, "%s", buf); -+ -+ ((_IO_FILE *) stderr)->_flags2 = old_flags2; -+ _IO_funlockfile (stderr); -+ -+ free (buf); -+ } -+#endif -+ } -+ d->__nextchar = (char *) ""; -+ d->optind++; -+ d->optopt = 0; -+ return '?'; -+ } -+ } -+ -+ /* Look at and handle the next short option-character. */ -+ -+ { -+ char c = *d->__nextchar++; -+ char *temp = strchr (optstring, c); -+ -+ /* Increment `optind' when we start to process its last character. */ -+ if (*d->__nextchar == '\0') -+ ++d->optind; -+ -+ if (temp == NULL || c == ':') -+ { -+ if (print_errors) -+ { -+#if defined _LIBC && defined USE_IN_LIBIO -+ char *buf; -+ int n; -+#endif -+ -+ if (d->__posixly_correct) -+ { -+ /* 1003.2 specifies the format of this message. */ -+#if defined _LIBC && defined USE_IN_LIBIO -+ n = __asprintf (&buf, _("%s: illegal option -- %c\n"), -+ argv[0], c); -+#else -+ fprintf (stderr, _("%s: illegal option -- %c\n"), argv[0], c); -+#endif -+ } -+ else -+ { -+#if defined _LIBC && defined USE_IN_LIBIO -+ n = __asprintf (&buf, _("%s: invalid option -- %c\n"), -+ argv[0], c); -+#else -+ fprintf (stderr, _("%s: invalid option -- %c\n"), argv[0], c); -+#endif -+ } -+ -+#if defined _LIBC && defined USE_IN_LIBIO -+ if (n >= 0) -+ { -+ _IO_flockfile (stderr); -+ -+ int old_flags2 = ((_IO_FILE *) stderr)->_flags2; -+ ((_IO_FILE *) stderr)->_flags2 |= _IO_FLAGS2_NOTCANCEL; -+ -+ __fxprintf (NULL, "%s", buf); -+ -+ ((_IO_FILE *) stderr)->_flags2 = old_flags2; -+ _IO_funlockfile (stderr); -+ -+ free (buf); -+ } -+#endif -+ } -+ d->optopt = c; -+ return '?'; -+ } -+ /* Convenience. Treat POSIX -W foo same as long option --foo */ -+ if (temp[0] == 'W' && temp[1] == ';') -+ { -+ char *nameend; -+ const struct option *p; -+ const struct option *pfound = NULL; -+ int exact = 0; -+ int ambig = 0; -+ int indfound = 0; -+ int option_index; -+ -+ /* This is an option that requires an argument. */ -+ if (*d->__nextchar != '\0') -+ { -+ d->optarg = d->__nextchar; -+ /* If we end this ARGV-element by taking the rest as an arg, -+ we must advance to the next element now. */ -+ d->optind++; -+ } -+ else if (d->optind == argc) -+ { -+ if (print_errors) -+ { -+ /* 1003.2 specifies the format of this message. */ -+#if defined _LIBC && defined USE_IN_LIBIO -+ char *buf; -+ -+ if (__asprintf (&buf, -+ _("%s: option requires an argument -- %c\n"), -+ argv[0], c) >= 0) -+ { -+ _IO_flockfile (stderr); -+ -+ int old_flags2 = ((_IO_FILE *) stderr)->_flags2; -+ ((_IO_FILE *) stderr)->_flags2 |= _IO_FLAGS2_NOTCANCEL; -+ -+ __fxprintf (NULL, "%s", buf); -+ -+ ((_IO_FILE *) stderr)->_flags2 = old_flags2; -+ _IO_funlockfile (stderr); -+ -+ free (buf); -+ } -+#else -+ fprintf (stderr, _("%s: option requires an argument -- %c\n"), -+ argv[0], c); -+#endif -+ } -+ d->optopt = c; -+ if (optstring[0] == ':') -+ c = ':'; -+ else -+ c = '?'; -+ return c; -+ } -+ else -+ /* We already incremented `d->optind' once; -+ increment it again when taking next ARGV-elt as argument. */ -+ d->optarg = argv[d->optind++]; -+ -+ /* optarg is now the argument, see if it's in the -+ table of longopts. */ -+ -+ for (d->__nextchar = nameend = d->optarg; *nameend && *nameend != '='; -+ nameend++) -+ /* Do nothing. */ ; -+ -+ /* Test all long options for either exact match -+ or abbreviated matches. */ -+ for (p = longopts, option_index = 0; p->name; p++, option_index++) -+ if (!strncmp (p->name, d->__nextchar, nameend - d->__nextchar)) -+ { -+ if ((unsigned int) (nameend - d->__nextchar) == strlen (p->name)) -+ { -+ /* Exact match found. */ -+ pfound = p; -+ indfound = option_index; -+ exact = 1; -+ break; -+ } -+ else if (pfound == NULL) -+ { -+ /* First nonexact match found. */ -+ pfound = p; -+ indfound = option_index; -+ } -+ else -+ /* Second or later nonexact match found. */ -+ ambig = 1; -+ } -+ if (ambig && !exact) -+ { -+ if (print_errors) -+ { -+#if defined _LIBC && defined USE_IN_LIBIO -+ char *buf; -+ -+ if (__asprintf (&buf, _("%s: option `-W %s' is ambiguous\n"), -+ argv[0], argv[d->optind]) >= 0) -+ { -+ _IO_flockfile (stderr); -+ -+ int old_flags2 = ((_IO_FILE *) stderr)->_flags2; -+ ((_IO_FILE *) stderr)->_flags2 |= _IO_FLAGS2_NOTCANCEL; -+ -+ __fxprintf (NULL, "%s", buf); -+ -+ ((_IO_FILE *) stderr)->_flags2 = old_flags2; -+ _IO_funlockfile (stderr); -+ -+ free (buf); -+ } -+#else -+ fprintf (stderr, _("%s: option `-W %s' is ambiguous\n"), -+ argv[0], argv[d->optind]); -+#endif -+ } -+ d->__nextchar += strlen (d->__nextchar); -+ d->optind++; -+ return '?'; -+ } -+ if (pfound != NULL) -+ { -+ option_index = indfound; -+ if (*nameend) -+ { -+ /* Don't test has_arg with >, because some C compilers don't -+ allow it to be used on enums. */ -+ if (pfound->has_arg) -+ d->optarg = nameend + 1; -+ else -+ { -+ if (print_errors) -+ { -+#if defined _LIBC && defined USE_IN_LIBIO -+ char *buf; -+ -+ if (__asprintf (&buf, _("\ -+%s: option `-W %s' doesn't allow an argument\n"), -+ argv[0], pfound->name) >= 0) -+ { -+ _IO_flockfile (stderr); -+ -+ int old_flags2 = ((_IO_FILE *) stderr)->_flags2; -+ ((_IO_FILE *) stderr)->_flags2 -+ |= _IO_FLAGS2_NOTCANCEL; -+ -+ __fxprintf (NULL, "%s", buf); -+ -+ ((_IO_FILE *) stderr)->_flags2 = old_flags2; -+ _IO_funlockfile (stderr); -+ -+ free (buf); -+ } -+#else -+ fprintf (stderr, _("\ -+%s: option `-W %s' doesn't allow an argument\n"), -+ argv[0], pfound->name); -+#endif -+ } -+ -+ d->__nextchar += strlen (d->__nextchar); -+ return '?'; -+ } -+ } -+ else if (pfound->has_arg == 1) -+ { -+ if (d->optind < argc) -+ d->optarg = argv[d->optind++]; -+ else -+ { -+ if (print_errors) -+ { -+#if defined _LIBC && defined USE_IN_LIBIO -+ char *buf; -+ -+ if (__asprintf (&buf, _("\ -+%s: option `%s' requires an argument\n"), -+ argv[0], argv[d->optind - 1]) >= 0) -+ { -+ _IO_flockfile (stderr); -+ -+ int old_flags2 = ((_IO_FILE *) stderr)->_flags2; -+ ((_IO_FILE *) stderr)->_flags2 -+ |= _IO_FLAGS2_NOTCANCEL; -+ -+ __fxprintf (NULL, "%s", buf); -+ -+ ((_IO_FILE *) stderr)->_flags2 = old_flags2; -+ _IO_funlockfile (stderr); -+ -+ free (buf); -+ } -+#else -+ fprintf (stderr, -+ _("%s: option `%s' requires an argument\n"), -+ argv[0], argv[d->optind - 1]); -+#endif -+ } -+ d->__nextchar += strlen (d->__nextchar); -+ return optstring[0] == ':' ? ':' : '?'; -+ } -+ } -+ d->__nextchar += strlen (d->__nextchar); -+ if (longind != NULL) -+ *longind = option_index; -+ if (pfound->flag) -+ { -+ *(pfound->flag) = pfound->val; -+ return 0; -+ } -+ return pfound->val; -+ } -+ d->__nextchar = NULL; -+ return 'W'; /* Let the application handle it. */ -+ } -+ if (temp[1] == ':') -+ { -+ if (temp[2] == ':') -+ { -+ /* This is an option that accepts an argument optionally. */ -+ if (*d->__nextchar != '\0') -+ { -+ d->optarg = d->__nextchar; -+ d->optind++; -+ } -+ else -+ d->optarg = NULL; -+ d->__nextchar = NULL; -+ } -+ else -+ { -+ /* This is an option that requires an argument. */ -+ if (*d->__nextchar != '\0') -+ { -+ d->optarg = d->__nextchar; -+ /* If we end this ARGV-element by taking the rest as an arg, -+ we must advance to the next element now. */ -+ d->optind++; -+ } -+ else if (d->optind == argc) -+ { -+ if (print_errors) -+ { -+ /* 1003.2 specifies the format of this message. */ -+#if defined _LIBC && defined USE_IN_LIBIO -+ char *buf; -+ -+ if (__asprintf (&buf, _("\ -+%s: option requires an argument -- %c\n"), -+ argv[0], c) >= 0) -+ { -+ _IO_flockfile (stderr); -+ -+ int old_flags2 = ((_IO_FILE *) stderr)->_flags2; -+ ((_IO_FILE *) stderr)->_flags2 |= _IO_FLAGS2_NOTCANCEL; -+ -+ __fxprintf (NULL, "%s", buf); -+ -+ ((_IO_FILE *) stderr)->_flags2 = old_flags2; -+ _IO_funlockfile (stderr); -+ -+ free (buf); -+ } -+#else -+ fprintf (stderr, -+ _("%s: option requires an argument -- %c\n"), -+ argv[0], c); -+#endif -+ } -+ d->optopt = c; -+ if (optstring[0] == ':') -+ c = ':'; -+ else -+ c = '?'; -+ } -+ else -+ /* We already incremented `optind' once; -+ increment it again when taking next ARGV-elt as argument. */ -+ d->optarg = argv[d->optind++]; -+ d->__nextchar = NULL; -+ } -+ } -+ return c; -+ } -+} -+ -+int -+_getopt_internal (int argc, char **argv, const char *optstring, -+ const struct option *longopts, int *longind, -+ int long_only, int posixly_correct) -+{ -+ int result; -+ -+ getopt_data.optind = optind; -+ getopt_data.opterr = opterr; -+ -+ result = _getopt_internal_r (argc, argv, optstring, longopts, longind, -+ long_only, posixly_correct, &getopt_data); -+ -+ optind = getopt_data.optind; -+ optarg = getopt_data.optarg; -+ optopt = getopt_data.optopt; -+ -+ return result; -+} -+ -+/* glibc gets a LSB-compliant getopt. -+ Standalone applications get a POSIX-compliant getopt. */ -+#if _LIBC -+enum { POSIXLY_CORRECT = 0 }; -+#else -+enum { POSIXLY_CORRECT = 1 }; -+#endif -+ -+int -+getopt (int argc, char *const *argv, const char *optstring) -+{ -+ return _getopt_internal (argc, (char **) argv, optstring, NULL, NULL, 0, -+ POSIXLY_CORRECT); -+} -+ -+ -+#ifdef TEST -+ -+/* Compile with -DTEST to make an executable for use in testing -+ the above definition of `getopt'. */ -+ -+int -+main (int argc, char **argv) -+{ -+ int c; -+ int digit_optind = 0; -+ -+ while (1) -+ { -+ int this_option_optind = optind ? optind : 1; -+ -+ c = getopt (argc, argv, "abc:d:0123456789"); -+ if (c == -1) -+ break; -+ -+ switch (c) -+ { -+ case '0': -+ case '1': -+ case '2': -+ case '3': -+ case '4': -+ case '5': -+ case '6': -+ case '7': -+ case '8': -+ case '9': -+ if (digit_optind != 0 && digit_optind != this_option_optind) -+ printf ("digits occur in two different argv-elements.\n"); -+ digit_optind = this_option_optind; -+ printf ("option %c\n", c); -+ break; -+ -+ case 'a': -+ printf ("option a\n"); -+ break; -+ -+ case 'b': -+ printf ("option b\n"); -+ break; -+ -+ case 'c': -+ printf ("option c with value `%s'\n", optarg); -+ break; -+ -+ case '?': -+ break; -+ -+ default: -+ printf ("?? getopt returned character code 0%o ??\n", c); -+ } -+ } -+ -+ if (optind < argc) -+ { -+ printf ("non-option ARGV-elements: "); -+ while (optind < argc) -+ printf ("%s ", argv[optind++]); -+ printf ("\n"); -+ } -+ -+ exit (0); -+} -+ -+#endif /* TEST */ -diff --git a/lib/getopt.in.h b/lib/getopt.in.h -new file mode 100644 -index 0000000..7377f3c ---- /dev/null -+++ b/lib/getopt.in.h -@@ -0,0 +1,247 @@ -+/* Declarations for getopt. -+ Copyright (C) 1989-1994,1996-1999,2001,2003,2004,2005,2006,2007,2009 -+ Free Software Foundation, Inc. -+ This file is part of the GNU C Library. -+ -+ 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 3 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, see . */ -+ -+#ifndef _GL_GETOPT_H -+ -+#if __GNUC__ >= 3 -+ at PRAGMA_SYSTEM_HEADER@ -+#endif -+ -+/* The include_next requires a split double-inclusion guard. We must -+ also inform the replacement unistd.h to not recursively use -+ ; our definitions will be present soon enough. */ -+#if @HAVE_GETOPT_H@ -+# define _GL_SYSTEM_GETOPT -+# @INCLUDE_NEXT@ @NEXT_GETOPT_H@ -+# undef _GL_SYSTEM_GETOPT -+#endif -+ -+#ifndef _GL_GETOPT_H -+ -+#ifndef __need_getopt -+# define _GL_GETOPT_H 1 -+#endif -+ -+/* Standalone applications should #define __GETOPT_PREFIX to an -+ identifier that prefixes the external functions and variables -+ defined in this header. When this happens, include the -+ headers that might declare getopt so that they will not cause -+ confusion if included after this file (if the system had , -+ we have already included it). Then systematically rename -+ identifiers so that they do not collide with the system functions @@ 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 Jul 11 12:26:41 2011 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Mon, 11 Jul 2011 10:26:41 +0000 Subject: [csw-devel] SF.net SVN: gar:[15038] csw/mgar/pkg/pinentry/trunk/Makefile Message-ID: Revision: 15038 http://gar.svn.sourceforge.net/gar/?rev=15038&view=rev Author: dmichelsen Date: 2011-07-11 10:26:41 +0000 (Mon, 11 Jul 2011) Log Message: ----------- pinentry: Split packages, add alternatives Modified Paths: -------------- csw/mgar/pkg/pinentry/trunk/Makefile Modified: csw/mgar/pkg/pinentry/trunk/Makefile =================================================================== --- csw/mgar/pkg/pinentry/trunk/Makefile 2011-07-11 09:51:32 UTC (rev 15037) +++ csw/mgar/pkg/pinentry/trunk/Makefile 2011-07-11 10:26:41 UTC (rev 15038) @@ -18,26 +18,50 @@ BUILD_DEP_PKGS += CSWlibgnugetopt-dev BUILD_DEP_PKGS += CSWggettext-dev BUILD_DEP_PKGS += CSWlibncurses-dev -BUILD_DEP_PKGS += CSWglib +BUILD_DEP_PKGS += CSWglib2devel BUILD_DEP_PKGS += CSWgtk2devel +BUILD_DEP_PKGS += CSWatk2devel +BUILD_DEP_PKGS += CSWpangodevel +BUILD_DEP_PKGS += CSWlibcairo-dev +PACKAGES += CSWpinentry +SPKG_DESC_CSWpinentry = Allows entering passwords into gpg-agent (ncurses version) +# PKGFILES is catchall RUNTIME_DEP_PKGS_CSWpinentry += CSWlibgnugetopt0 -RUNTIME_DEP_PKGS_CSWpinentry += CSWlibintl8 +RUNTIME_DEP_PKGS_CSWpinentry += CSWiconv RUNTIME_DEP_PKGS_CSWpinentry += CSWlibncurses5 -RUNTIME_DEP_PKGS_CSWpinentry += CSWglib -RUNTIME_DEP_PKGS_CSWpinentry += CSWgtk -RUNTIME_DEP_PKGS_CSWpinentry += CSWiconv -RUNTIME_DEP_PKGS_CSWpinentry += CSWglib2 -RUNTIME_DEP_PKGS_CSWpinentry += CSWftype2 -RUNTIME_DEP_PKGS_CSWpinentry += CSWgtk2 -RUNTIME_DEP_PKGS_CSWpinentry += CSWlibatk -RUNTIME_DEP_PKGS_CSWpinentry += CSWfconfig -RUNTIME_DEP_PKGS_CSWpinentry += CSWpango -RUNTIME_DEP_PKGS_CSWpinentry += CSWlibcairo2 +PACKAGES += CSWpinentry-gtk2 +SPKG_DESC_CSWpinentry-gtk2 = Allows entering passwords into gpg-agent (gtk2 version) +PKGFILES_CSWpinentry-gtk2 += $(bindir)/pinentry-gtk-2 +RUNTIME_DEP_PKGS_CSWpinentry-gtk2 += CSWiconv +RUNTIME_DEP_PKGS_CSWpinentry-gtk2 += CSWfconfig +RUNTIME_DEP_PKGS_CSWpinentry-gtk2 += CSWlibintl8 +RUNTIME_DEP_PKGS_CSWpinentry-gtk2 += CSWlibncurses5 +RUNTIME_DEP_PKGS_CSWpinentry-gtk2 += CSWftype2 +RUNTIME_DEP_PKGS_CSWpinentry-gtk2 += CSWlibgnugetopt0 +RUNTIME_DEP_PKGS_CSWpinentry-gtk2 += CSWgtk2 +RUNTIME_DEP_PKGS_CSWpinentry-gtk2 += CSWlibatk +RUNTIME_DEP_PKGS_CSWpinentry-gtk2 += CSWpango +RUNTIME_DEP_PKGS_CSWpinentry-gtk2 += CSWglib2 +RUNTIME_DEP_PKGS_CSWpinentry-gtk2 += CSWlibcairo2 + # This is passed to curses/, but not pinentry/ EXTRA_CPPFLAGS += -I$(includedir)/ncurses EXTRA_LINKER_FLAGS += -lgnugetopt +CONFIGURE_ARGS += $(DIRPATHS) +CONFIGURE_ARGS += --enable-pinentry-curses +CONFIGURE_ARGS += --disable-pinentry-gtk +CONFIGURE_ARGS += --enable-pinentry-gtk2 + +# This is a symlink, we replace that by alternatives +EXTRA_MERGE_EXCLUDE_FILES += $(bindir)/pinentry + +ALTERNATIVES_CSWpinentry = ncurses +ALTERNATIVES_CSWpinentry-gtk2 = gtk2 +ALTERNATIVE_ncurses = $(bindir)/pinentry pinentry $(bindir)/pinentry-curses 100 +ALTERNATIVE_gtk2 = $(bindir)/pinentry pinentry $(bindir)/pinentry-gtk-2 200 + include gar/category.mk This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Mon Jul 11 12:27:53 2011 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Mon, 11 Jul 2011 10:27:53 +0000 Subject: [csw-devel] SF.net SVN: gar:[15039] csw/mgar/pkg/pinentry/trunk/Makefile Message-ID: Revision: 15039 http://gar.svn.sourceforge.net/gar/?rev=15039&view=rev Author: dmichelsen Date: 2011-07-11 10:27:53 +0000 (Mon, 11 Jul 2011) Log Message: ----------- pinentry: Fix dependency Modified Paths: -------------- csw/mgar/pkg/pinentry/trunk/Makefile Modified: csw/mgar/pkg/pinentry/trunk/Makefile =================================================================== --- csw/mgar/pkg/pinentry/trunk/Makefile 2011-07-11 10:26:41 UTC (rev 15038) +++ csw/mgar/pkg/pinentry/trunk/Makefile 2011-07-11 10:27:53 UTC (rev 15039) @@ -20,7 +20,7 @@ BUILD_DEP_PKGS += CSWlibncurses-dev BUILD_DEP_PKGS += CSWglib2devel BUILD_DEP_PKGS += CSWgtk2devel -BUILD_DEP_PKGS += CSWatk2devel +BUILD_DEP_PKGS += CSWlibatkdevel BUILD_DEP_PKGS += CSWpangodevel BUILD_DEP_PKGS += CSWlibcairo-dev This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dam at opencsw.org Mon Jul 11 12:55:39 2011 From: dam at opencsw.org (Dagobert Michelsen) Date: Mon, 11 Jul 2011 12:55:39 +0200 Subject: [csw-devel] SF.net SVN: gar:[15036] csw/mgar/pkg In-Reply-To: References: Message-ID: <59327068-E757-4209-B261-23E024D2F1C1@opencsw.org> Hi Kester, some comments inline. Best regards -- Dago Am 11.07.2011 um 11:48 schrieb khabermann at users.sourceforge.net: > Revision: 15036 > http://gar.svn.sourceforge.net/gar/?rev=15036&view=rev > Author: khabermann > Date: 2011-07-11 09:48:15 +0000 (Mon, 11 Jul 2011) > > Log Message: > ----------- > tcllib: created package > > Added Paths: > ----------- > csw/mgar/pkg/tcllib/ > csw/mgar/pkg/tcllib/Makefile > csw/mgar/pkg/tcllib/branches/ > csw/mgar/pkg/tcllib/tags/ > csw/mgar/pkg/tcllib/trunk/ > csw/mgar/pkg/tcllib/trunk/Makefile > csw/mgar/pkg/tcllib/trunk/checksums > csw/mgar/pkg/tcllib/trunk/files/ > csw/mgar/pkg/tcllib/trunk/files/0001-csw-path-changes.patch > csw/mgar/pkg/tcllib/trunk/files/0002-renamed-conflicting-man-pages.patch > > Copied: csw/mgar/pkg/tcllib/Makefile (from rev 15008, csw/mgar/pkg/template/Makefile) > =================================================================== > --- csw/mgar/pkg/tcllib/Makefile (rev 0) > +++ csw/mgar/pkg/tcllib/Makefile 2011-07-11 09:48:15 UTC (rev 15036) > @@ -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/tcllib/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/tcllib/trunk/Makefile > =================================================================== > --- csw/mgar/pkg/tcllib/trunk/Makefile (rev 0) > +++ csw/mgar/pkg/tcllib/trunk/Makefile 2011-07-11 09:48:15 UTC (rev 15036) > @@ -0,0 +1,43 @@ > +# $Id$ > +# TODO (release-critical prefixed with !, non release-critical with *) > +# > +NAME = tcllib > +VERSION = 1.13 > +GARTYPE = v2 > +CATEGORIES = lang > +ARCHALL_CSWtcllib = 1 > +LICENSE = license.terms > + > +DESCRIPTION = Standard Tcl library, collection of common utility functions and modules > +define BLURB > +endef > + > +MASTER_SITES = $(SF_MIRRORS) > +DISTFILES = $(DISTNAME).tar.gz > +PATCHFILES = 0001-csw-path-changes.patch 0002-renamed-conflicting-man-pages.patch > + > +# comment contains "/usr/share/misc/magic.mime" > +CHECKPKG_OVERRIDES_CSWtcllib += file-with-bad-content|/usr/share|root/opt/csw/lib/tcllib1.13/fumagic/filetypes.tcl > +CHECKPKG_OVERRIDES_CSWtcllib += file-with-bad-content|/usr/share|root/opt/csw/lib/tcllib1.13/fumagic/mimetypes.tcl > + > +# list of shells containing "/usr/local/bin/bash" and others > +CHECKPKG_OVERRIDES_CSWtcllib += file-with-bad-content|/usr/local|root/opt/csw/lib/tcllib1.13/fumagic/filetypes.tcl > +CHECKPKG_OVERRIDES_CSWtcllib += file-with-bad-content|/usr/local|root/opt/csw/lib/tcllib1.13/fumagic/mimetypes.tcl Probably this should be adjusted to /opt/csw/bin/bash ? > + > +# comment contains "/usr/share/misc/file/magic" > +CHECKPKG_OVERRIDES_CSWtcllib += file-with-bad-content|/usr/share|root/opt/csw/lib/tcllib1.13/fumagic/cfront.tcl > + > +# File name regex to get notifications about upstream software releases > +# NOTE: Use this only if the automatic regex creation > +# does not work for your package > +# UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz > + > +# If the url used to check for software update is different of MASTER_SITES, then > +# uncomment the next line. Otherwise it is set by default to the value of MASTER_SITES > +# UPSTREAM_MASTER_SITES = > + > +# CONFIGURE_ARGS = $(DIRPATHS) > +CONFIGURE=./configure --prefix=/opt/csw This has no effect. Probably you meant this? CONFIGURE_ARGS = --prefix=$(prefix) > + > +include gar/category.mk > + > > > Property changes on: csw/mgar/pkg/tcllib/trunk/Makefile > ___________________________________________________________________ > Added: svn:keywords > + Id > > Added: csw/mgar/pkg/tcllib/trunk/checksums > =================================================================== > --- csw/mgar/pkg/tcllib/trunk/checksums (rev 0) > +++ csw/mgar/pkg/tcllib/trunk/checksums 2011-07-11 09:48:15 UTC (rev 15036) > @@ -0,0 +1 @@ > +5bc9567b3a61884716a908d5295d7105 tcllib-1.13.tar.gz > > Added: csw/mgar/pkg/tcllib/trunk/files/0001-csw-path-changes.patch > =================================================================== > --- csw/mgar/pkg/tcllib/trunk/files/0001-csw-path-changes.patch (rev 0) > +++ csw/mgar/pkg/tcllib/trunk/files/0001-csw-path-changes.patch 2011-07-11 09:48:15 UTC (rev 15036) > @@ -0,0 +1,75 @@ > +From 9cc0fd54cf707a756de8606c08eb315e465659da Mon Sep 17 00:00:00 2001 > +From: Kester Habermann > +Date: Mon, 11 Jul 2011 11:15:59 +0200 > +Subject: [PATCH] csw path changes > + > +--- > + modules/doctools/docidx.man | 4 ++-- > + modules/doctools/doctoc.man | 4 ++-- > + modules/doctools/doctools.man | 4 ++-- > + modules/ncgi/ncgi.man | 2 +- > + 4 files changed, 7 insertions(+), 7 deletions(-) > + > +diff --git a/modules/doctools/docidx.man b/modules/doctools/docidx.man > +index f6b19b8..aa7571a 100644 > +--- a/modules/doctools/docidx.man > ++++ b/modules/doctools/docidx.man > +@@ -301,8 +301,8 @@ through the command [cmd ::doctools::idx::search]. > + It contains initially one path, the subdirectory [file mpformats] of > + the directory the package itself is located in. In other words, if the > + package implementation [file docidx.tcl] is installed in the directory > +-[file /usr/local/lib/tcllib/doctools] then it will by default search > +-the directory [file /usr/local/lib/tcllib/doctools/mpformats] for > ++[file /opt/csw/lib/tcllib1.13/doctools] then it will by default search > ++the directory [file /opt/csw/lib/tcllib1.13/doctools/mpformats] for > + format implementations. > + > + [enum] > +diff --git a/modules/doctools/doctoc.man b/modules/doctools/doctoc.man > +index d09a5ef..9e5a0a8 100644 > +--- a/modules/doctools/doctoc.man > ++++ b/modules/doctools/doctoc.man > +@@ -301,8 +301,8 @@ through the command [cmd ::doctools::toc::search]. > + It contains initially one path, the subdirectory [file mpformats] of > + the directory the package itself is located in. In other words, if the > + package implementation [file doctoc.tcl] is installed in the directory > +-[file /usr/local/lib/tcllib/doctools] then it will by default search > +-the directory [file /usr/local/lib/tcllib/doctools/mpformats] for > ++[file /opt/csw/lib/tcllib1.13/doctools] then it will by default search > ++the directory [file /opt/csw/lib/tcllib1.13/doctools/mpformats] for > + format implementations. > + > + [enum] > +diff --git a/modules/doctools/doctools.man b/modules/doctools/doctools.man > +index 9c2c139..aeb4370 100644 > +--- a/modules/doctools/doctools.man > ++++ b/modules/doctools/doctools.man > +@@ -381,10 +381,10 @@ It contains initially one path, the subdirectory [file mpformats] of > + the directory the package itself is located in. > + > + In other words, if the package implementation [file doctools.tcl] is > +-installed in the directory [file /usr/local/lib/tcllib/doctools] then > ++installed in the directory [file /opt/csw/lib/tcllib1.13/doctools] then > + it will by default search the > + > +-directory [file /usr/local/lib/tcllib/doctools/mpformats] for format > ++directory [file /opt/csw/lib/tcllib1.13/doctools/mpformats] for format > + implementations. > + > + [enum] > +diff --git a/modules/ncgi/ncgi.man b/modules/ncgi/ncgi.man > +index 4b24de7..155b861 100644 > +--- a/modules/ncgi/ncgi.man > ++++ b/modules/ncgi/ncgi.man > +@@ -311,7 +311,7 @@ Name:
> + > + > + TCL: upload.cgi > +-#!/usr/local/bin/tclsh > ++#!/opt/csw/bin/tclsh > + > + ::ncgi::parse > + set filedata [::ncgi::value filedata] > +-- > +1.7.6 > + > > Added: csw/mgar/pkg/tcllib/trunk/files/0002-renamed-conflicting-man-pages.patch > =================================================================== > --- csw/mgar/pkg/tcllib/trunk/files/0002-renamed-conflicting-man-pages.patch (rev 0) > +++ csw/mgar/pkg/tcllib/trunk/files/0002-renamed-conflicting-man-pages.patch 2011-07-11 09:48:15 UTC (rev 15036) > @@ -0,0 +1,1733 @@ > +From 999efdbce1f9d494841786e94cf0674b420e485f Mon Sep 17 00:00:00 2001 > +From: Kester Habermann > +Date: Mon, 11 Jul 2011 11:19:19 +0200 > +Subject: [PATCH 3/3] renamed conflicting man pages > + > +--- > + modules/doctools2idx/container.man | 305 ----------- > + modules/doctools2toc/container.man | 386 -------------- > + modules/struct/graph.man | 1007 ------------------------------------ > + 3 files changed, 0 insertions(+), 1698 deletions(-) > + delete mode 100644 modules/doctools2idx/container.man > + delete mode 100644 modules/doctools2toc/container.man > + delete mode 100644 modules/struct/graph.man > + > +diff --git a/modules/doctools2idx/container.man b/modules/doctools2idx/container.man > +deleted file mode 100644 > +index 09dae66..0000000 > +--- a/modules/doctools2idx/container.man > ++++ /dev/null > +@@ -1,305 +0,0 @@ > +-[comment {-*- tcl -*- doctools manpage}] > +-[manpage_begin doctools::idx n 2] > +-[copyright {2009 Andreas Kupries }] > +-[moddesc {Documentation tools}] > +-[titledesc {Holding keyword indices}] > +-[category {Documentation tools}] > +-[require doctools::idx [opt 2]] > +-[require Tcl 8.4] > +-[require doctools::idx::structure] > +-[require snit] > +-[keywords {keyword index} index reference documentation manpage url] > +-[keywords {docidx markup} markup conversion formatting generation plugin] > +-[keywords json text nroff wiki {tcler's wiki} latex TMML HTML] > +-[keywords parsing] > +-[description] > +- > +-This package provides a class to contain and programmatically > +-manipulate keyword indices > +- > +-[para] > +- > +-This is one of the three public pillars the management of keyword > +-indices resides on. The other two pillars are > +- > +-[list_begin enum] > +-[enum] [manpage {Exporting keyword indices}], and > +-[enum] [manpage {Importing keyword indices}] > +-[list_end] > +- > +-[para] > +- > +-For information about the [sectref Concepts] of keyword indices, and > +-their parts, see the same-named section. > +- > +-For information about the data structure which is used to encode > +-keyword indices as values see the section > +-[sectref {Keyword index serialization format}]. > +- > +-This is the only format directly known to this class. Conversions from > +-and to any other format are handled by export and import manager > +-objects. These may be attached to a container, but do not have to be, > +-it is merely a convenience. > +- > +- > +-[section Concepts] [include include/concept.inc] > +- > +- > +-[section API] > +-[subsection {Package commands}] > +- > +-[list_begin definitions] > +- > +-[call [cmd ::doctools::idx] [arg objectName]] > +- > +-This command creates a new container object with an associated Tcl > +-command whose name is [arg objectName]. This [term object] command is > +-explained in full detail in the sections [sectref {Object command}] > +-and [sectref {Object methods}]. The object command will be created > +-under the current namespace if the [arg objectName] is not fully > +-qualified, and in the specified namespace otherwise. > +- > +-[list_end] > +- > +- > +-[subsection {Object command}] > +- > +-All objects created by the [cmd ::doctools::idx] command have the > +-following general form: > +- > +-[list_begin definitions] > +- > +-[call [cmd objectName] [method method] [opt [arg "arg arg ..."]]] > +- > +-The method [method method] and its [arg arg]'uments determine the > +-exact behavior of the command. > +- > +-See section [sectref {Object methods}] for the detailed > +-specifications. > +- > +-[list_end] > +- > +- > +-[subsection {Object methods}] > +- > +-[list_begin definitions] > +- > +-[call [arg objectName] [method destroy]] > +- > +-This method destroys the object it is invoked for. > +- > +-[call [arg objectName] [method {key add}] [arg name]] > +- > +-This method adds the keyword [arg name] to the index. If the keyword > +-is already known nothing is done. The result of the method is the > +-empty string. > +- > +- > +-[call [arg objectName] [method {key remove}] [arg name]] > +- > +-This method removes the keyword [arg name] from the index. If the > +-keyword is already gone nothing is done. Any references for whom this > +-keyword was the last association are removed as well. The result of > +-the method is the empty string. > +- > +- > +-[call [arg objectName] [method {key references}] [arg name]] > +- > +-This method returns a list containing the names of all references > +-associated with the keyword [arg name]. An error is thrown in the > +-keyword is not known to the index. The order of the references in the > +-list is undefined. > +- > +- > +-[call [arg objectName] [method keys]] > +- > +-This method returns a list containing the names of all keywords known > +-to the index. The order of the keywords in the list is undefined. > +- > +- > +-[call [arg objectName] [method {reference add}] [arg type] [arg key] [arg name] [arg label]] > +- > +-This method adds the reference [arg name] to the index and associates > +-it with the keyword [arg key]. > +- > +-The other two arguments hold the [arg type] and [arg label] of the > +-reference, respectively. > +- > +-The type has to match the stored information, should the reference > +-exist already, i.e. this information is immutable after the reference > +-is known. The only way to change it is delete and recreate the > +-reference. > +- > +-The label on the other hand is automatically updated to the value of > +-the argument, overwriting any previously stored information. > +- > +-Should the reference exists already it is simply associated with the > +-[arg key]. If that is true already as well nothing is done, but the > +-[arg label] updated to the new value. The result of the method is the > +-empty string. > +- > +-[para] > +- > +-The [arg type] argument has be to one of [const manpage] or [const url]. > +- > +- > +-[call [arg objectName] [method {reference remove}] [arg name]] > +- > +-The reference [arg name] is removed from the index. All associations > +-with keywords are released and the relevant reference labels removed. > +-The result of the method is the empty string. > +- > +- > +-[call [arg objectName] [method {reference label}] [arg name]] > +- > +-This method returns the label associated with the reference > +-[arg name]. An error is thrown if the reference is not known. > +- > +- > +-[call [arg objectName] [method {reference keys}] [arg name]] > +- > +-This method returns a list containing the names of all keywords > +-associated with the reference [arg name]. An error is thrown in the > +-reference is not known to the index. The order of the keywords in the > +-list is undefined. > +- > +- > +-[call [arg objectName] [method {reference type}] [arg name]] > +- > +-This method returns the type of the reference [arg name]. An error is > +-thrown in the reference is not known to the index. > +- > +- > +-[call [arg objectName] [method references]] > +- > +-This method returns a list containing the names of all references > +-known to the index. The order of the references in the list is > +-undefined. > +- > +- > +-[call [arg objectName] [method title]] > +- > +-Returns the currently defined title of the keyword index. > +- > +- > +-[call [arg objectName] [method title] [arg text]] > +- > +-Sets the title of the keyword index to [arg text], and returns it as > +-the result of the command. > +- > +- > +-[call [arg objectName] [method label]] > +- > +-Returns the currently defined label of the keyword index. > +- > +- > +-[call [arg objectName] [method label] [arg text]] > +- > +-Sets the label of the keyword index to [arg text], and returns it as > +-the result of the command. > +- > +- > +-[call [arg objectName] [method importer]] > +- > +-Returns the import manager object currently attached to the container, > +-if any. > +- > +- > +-[call [arg objectName] [method importer] [arg object]] > +- > +-Attaches the [arg object] as import manager to the container, and > +-returns it as the result of the command. > +- > +-Note that the [arg object] is [emph not] put into ownership of the > +-container. I.e., destruction of the container will [emph not] destroy > +-the [arg object]. > +- > +-[para] > +- > +-It is expected that [arg object] provides a method named > +-[method {import text}] which takes a text and a format name, and > +-returns the canonical serialization of the keyword index contained in > +-the text, assuming the given format. > +- > +- > +-[call [arg objectName] [method exporter]] > +- > +-Returns the export manager object currently attached to the container, > +-if any. > +- > +- > +-[call [arg objectName] [method exporter] [arg object]] > +- > +-Attaches the [arg object] as export manager to the container, and > +-returns it as the result of the command. > +- > +-Note that the [arg object] is [emph not] put into ownership of the > +-container. I.e., destruction of the container will [emph not] destroy > +-the [arg object]. > +- > +-[para] > +- > +-It is expected that [arg object] provides a method named > +-[method {export object}] which takes the container and a format name, > +-and returns a text encoding keyword index stored in the container, in > +-the given format. It is further expected that the [arg object] will > +-use the container's method [method serialize] to obtain the > +-serialization of the keyword index from which to generate the text. > +- > +- > +-[call [arg objectName] [method {deserialize =}] [arg data] [opt [arg format]]] > +- > +-This method replaces the contents of the index object with the index > +-contained in the [arg data]. If no [arg format] was specified it is > +-assumed to be the regular serialization of a keyword index. > +- > +-[para] > +- > +-Otherwise the object will use the attached import manager to convert > +-the data from the specified format to a serialization it can handle. > +- > +-In that case an error will be thrown if the container has no import > +-manager attached to it. > +- > +-[para] > +- > +-The result of the method is the empty string. > +- > +- > +-[call [arg objectName] [method {deserialize +=}] [arg data] [opt [arg format]]] > +- > +-This method behaves like [method {deserialize =}] in its essentials, > +-except that it merges the keyword index in the [arg data] to its > +-contents instead of replacing it. > +- > +-The method will throw an error if merging is not possible, i.e. would > +-produce an invalid index. The existing content is left unchanged in > +-that case. > +- > +-[para] > +- > +-The result of the method is the empty string. > +- > +- > +-[call [arg objectName] [method serialize] [opt [arg format]]] > +- > +-This method returns the keyword index contained in the object. If no > +-[arg format] is not specified the returned result is the canonical > +-serialization of its contents. > +- > +-[para] > +- > +-Otherwise the object will use the attached export manager to convert > +-the data to the specified format. > +- > +-In that case an error will be thrown if the container has no export > +-manager attached to it. > +- > +- > +-[list_end] > +- > +- > +-[include include/serialization.inc] > +-[vset CATEGORY doctools] > +-[include ../doctools2base/include/feedback.inc] > +-[manpage_end] > +diff --git a/modules/doctools2toc/container.man b/modules/doctools2toc/container.man > +deleted file mode 100644 > +index e28eee6..0000000 > +--- a/modules/doctools2toc/container.man > ++++ /dev/null > +@@ -1,386 +0,0 @@ > +-[comment {-*- tcl -*- doctools manpage}] > +-[manpage_begin doctools::toc n 2] > +-[copyright {2009 Andreas Kupries }] > +-[moddesc {Documentation tools}] > +-[titledesc {Holding tables of contents}] > +-[category {Documentation tools}] > +-[require doctools::toc [opt 2]] > +-[require Tcl 8.4] > +-[require doctools::toc::structure] > +-[require struct::tree] > +-[require snit] > +-[keywords {table of contents} table reference documentation] > +-[keywords {doctoc markup} markup conversion formatting generation plugin] > +-[keywords json text nroff wiki {tcler's wiki} latex TMML HTML] > +-[keywords parsing] > +-[description] > +- > +-This package provides a class to contain and programmatically > +-manipulate tables of contents. > +- > +-[para] > +- > +-This is one of the three public pillars the management of tables of > +-contents resides on. The other two pillars are > +- > +-[list_begin enum] > +-[enum] [manpage {Exporting tables of contents}], and > +-[enum] [manpage {Importing tables of contents}] > +-[list_end] > +- > +-[para] > +- > +-For information about the [sectref Concepts] of tables of contents, and > +-their parts, see the same-named section. > +- > +-For information about the data structure which is used to encode > +-tables of contents as values see the section > +-[sectref {ToC serialization format}]. > +- > +-This is the only format directly known to this class. Conversions from > +-and to any other format are handled by export and import manager > +-objects. These may be attached to a container, but do not have to be, > +-it is merely a convenience. > +- > +- > +-[section Concepts] [include include/concept.inc] > +- > +- > +-[section API] > +-[subsection {Package commands}] > +- > +-[list_begin definitions] > +- > +-[call [cmd ::doctools::toc] [arg objectName]] > +- > +-This command creates a new container object with an associated Tcl > +-command whose name is [arg objectName]. This [term object] command is > +-explained in full detail in the sections [sectref {Object command}] > +-and [sectref {Object methods}]. The object command will be created > +-under the current namespace if the [arg objectName] is not fully > +-qualified, and in the specified namespace otherwise. > +- > +-[list_end] > +- > +- > +-[subsection {Object command}] > +- > +-All objects created by the [cmd ::doctools::toc] command have the > +-following general form: > +- > +-[list_begin definitions] > +- > +-[call [cmd objectName] [method method] [opt [arg "arg arg ..."]]] > +- > +-The method [method method] and its [arg arg]'uments determine the > +-exact behavior of the command. > +- > +-See section [sectref {Object methods}] for the detailed > +-specifications. > +- > +-[list_end] > +- > +- > +-[subsection {Object methods}] > +- > +-[list_begin definitions] > +- > +-[call [arg objectName] [method destroy]] > +- > +-This method destroys the object it is invoked for. > +- > +-[call [arg objectName] [method {+ reference}] [arg id] [arg label] [arg docid] [arg desc]] > +- > +-This method adds a new reference element to the table of contents, > +-under the element specified via its handle [arg id]. This parent > +-element has to be a division element, or the root. An error is thrown > +-otherwise. > +- > +-The new element will be externally identified by its [arg label], > +-which has to be be unique within the parent element. An error is > +-thrown otherwise. > +- > +-[para] > +- > +-As a reference element it will refer to a document identified by the > +-symbolic [arg docid]. This reference must not be the empty string, an > +-error is thrown otherwise. > +- > +-Beyond the label the element also has a longer descriptive string, > +-supplied via [arg desc]. > +- > +-[para] > +- > +-The result of the method is the handle (id) of the new element. > +- > +- > +-[call [arg objectName] [method {+ division}] [arg id] [arg label] [opt [arg docid]]] > +- > +-This method adds a new division element to the table of contents, > +-under the element specified via its handle [arg id]. This parent > +-element has to be a division element, or the root. An error is thrown > +-otherwise. > +- > +-The new element will be externally identified by its [arg label], > +-which has to be be unique within the parent element. An error is > +-thrown otherwise. > +- > +-[para] > +- > +-As a division element it is can refer to a document, identified by the > +-symbolic [arg docid], but may choose not to. > +- > +-[para] > +- > +-The result of the method is the handle (id) of the new element. > +- > +- > +-[call [arg objectName] [method remove] [arg id]] > +- > +-This method removes the element identified by the handle [arg id] from > +-the table of contents. > +- > +-If the element is a division all of its children, if any, are removed > +-as well. The root element/division of the table of contents cannot be > +-removed however, only its children. > +- > +-[para] > +- > +-The result of the method is the empty string. > +- > +- > +-[call [arg objectName] [method up] [arg id]] > +- > +-This method returns the handle of the parent for the element > +-identified by its handle [arg id], or the empty string if [arg id] > +-refered to the root element. > +- > +- > +-[call [arg objectName] [method next] [arg id]] > +- > +-This method returns the handle of the right sibling for the element > +-identified by its handle [arg id], or the handle of the parent if the > +-element has no right sibling, or the empty string if [arg id] refered > +-to the root element. > +- > +- > +- > +-[call [arg objectName] [method prev] [arg id]] > +- > +-This method returns the handle of the left sibling for the element > +-identified by its handle [arg id], or the handle of the parent if the > +-element has no left sibling, or the empty string if [arg id] refered > +-to the root element. > +- > +- > +-[call [arg objectName] [method child] [arg id] [arg label] [opt [arg ...]]] > +- > +-This method returns the handle of a child of the element identified by > +-its handle [arg id]. The child itself is identified by a series of > +-labels. > +- > +- > +-[call [arg objectName] [method element] [opt [arg ...]]] > +- > +-This method returns the handle of the element identified by a series > +-of labels, starting from the root of the table of contents. The series > +-of labels is allowed to be empty, in which case the handle of the root > +-element is returned. > +- > +- > +-[call [arg objectName] [method children] [arg id]] > +- > +-This method returns a list containing the handles of all children of > +-the element identified by the handle [arg id], from first to last, in > +-that order. > +- > +- > +-[call [arg objectName] [method type] [arg id]] > +- > +-This method returns the type of the element, either [const reference], > +-or [const division]. > +- > +- > +-[call [arg objectName] [method full-label] [arg id]] > +- > +-This method is the complement of the method [method element], > +-converting the handle [arg id] of an element into a list of labels > +-full identifying the element within the whole table of contents. > +- > +- > +-[call [arg objectName] [method elabel] [arg id] [opt [arg newlabel]]] > +- > +-This method queries and/or changes the label of the element identified > +-by the handle [arg id]. If the argument [arg newlabel] is present then > +-the label is changed to that value. Regardless of this, the result of > +-the method is the current value of the label. > +- > +-[para] > +- > +-If the label is changed the new label has to be unique within the > +-containing division, or an error is thrown. > +- > +-[para] > +- > +-Further, of the [arg id] refers to the root element of the table of > +-contents, then using this method is equivalent to using the method > +-[arg label], i.e. it is accessing the global label for the whole > +-table. > +- > +- > +-[call [arg objectName] [method description] [arg id] [opt [arg newdesc]]] > +- > +-This method queries and/or changes the description of the element > +-identified by the handle [arg id]. If the argument [arg newdesc] is > +-present then the description is changed to that value. Regardless of > +-this, the result of the method is the current value of the description. > +- > +-[para] > +- > +-The element this method operates on has to be a reference element, or > +-an error will be thrown. > +- > +- > +-[call [arg objectName] [method document] [arg id] [opt [arg newdocid]]] > +- > +-This method queries and/or changes the document reference of the > +-element identified by the handle [arg id]. > +- > +-If the argument [arg newdocid] is present then the description is > +-changed to that value. Regardless of this, the result of the method is > +-the current value of the document reference. > +- > +-[para] > +- > +-Setting the reference to the empty string means unsetting it, and is > +-allowed only for division elements. Conversely, if the result is the > +-empty string then the element has no document reference, and this can > +-happen only for division elements. > +- > +- > +-[call [arg objectName] [method title]] > +- > +-Returns the currently defined title of the table of contents. > +- > +- > +-[call [arg objectName] [method title] [arg text]] > +- > +-Sets the title of the table of contents to [arg text], and returns it as > +-the result of the command. > +- > +- > +-[call [arg objectName] [method label]] > +- > +-Returns the currently defined label of the table of contents. > +- > +- > +-[call [arg objectName] [method label] [arg text]] > +- > +-Sets the label of the table of contents to [arg text], and returns it as > +-the result of the command. > +- > +- > +-[call [arg objectName] [method importer]] > +- > +-Returns the import manager object currently attached to the container, > +-if any. > +- > +- > +-[call [arg objectName] [method importer] [arg object]] > +- > +-Attaches the [arg object] as import manager to the container, and > +-returns it as the result of the command. > +- > +-Note that the [arg object] is [emph not] put into ownership of the > +-container. I.e., destruction of the container will [emph not] destroy > +-the [arg object]. > +- > +-[para] > +- > +-It is expected that [arg object] provides a method named > +-[method {import text}] which takes a text and a format name, and > +-returns the canonical serialization of the table of contents contained in > +-the text, assuming the given format. > +- > +- > +-[call [arg objectName] [method exporter]] > +- > +-Returns the export manager object currently attached to the container, > +-if any. > +- > +- > +-[call [arg objectName] [method exporter] [arg object]] > +- > +-Attaches the [arg object] as export manager to the container, and > +-returns it as the result of the command. > +- > +-Note that the [arg object] is [emph not] put into ownership of the > +-container. I.e., destruction of the container will [emph not] destroy > +-the [arg object]. > +- > +-[para] > +- > +-It is expected that [arg object] provides a method named > +-[method {export object}] which takes the container and a format name, > +-and returns a text encoding table of contents stored in the container, in > +-the given format. It is further expected that the [arg object] will > +-use the container's method [method serialize] to obtain the > +-serialization of the table of contents from which to generate the text. > +- > +- > +-[call [arg objectName] [method {deserialize =}] [arg data] [opt [arg format]]] > +- > +-This method replaces the contents of the table object with the table > +-contained in the [arg data]. If no [arg format] was specified it is > +-assumed to be the regular serialization of a table of contents. > +- > +-[para] > +- > +-Otherwise the object will use the attached import manager to convert > +-the data from the specified format to a serialization it can handle. > +- > +-In that case an error will be thrown if the container has no import > +-manager attached to it. > +- > +-[para] > +- > +-The result of the method is the empty string. > +- > +- > +-[call [arg objectName] [method {deserialize +=}] [arg data] [opt [arg format]]] > +- > +-This method behaves like [method {deserialize =}] in its essentials, > +-except that it merges the table of contents in the [arg data] to its > +-contents instead of replacing it. > +- > +-The method will throw an error if merging is not possible, i.e. would > +-produce an invalid table. The existing content is left unchanged in > +-that case. > +- > +-[para] > +- > +-The result of the method is the empty string. > +- > +- > +-[call [arg objectName] [method serialize] [opt [arg format]]] > +- > +-This method returns the table of contents contained in the object. If no > +-[arg format] is not specified the returned result is the canonical > +-serialization of its contents. > +- > +-[para] > +- > +-Otherwise the object will use the attached export manager to convert > +-the data to the specified format. > +- > +-In that case an error will be thrown if the container has no export > +-manager attached to it. > +- > +- > +-[list_end] > +- > +- > +-[include include/serialization.inc] > +-[vset CATEGORY doctools] > +-[include ../doctools2base/include/feedback.inc] > +-[manpage_end] > +diff --git a/modules/struct/graph.man b/modules/struct/graph.man > +deleted file mode 100644 > +index 5cf99a6..0000000 > +--- a/modules/struct/graph.man > ++++ /dev/null > +@@ -1,1007 +0,0 @@ > +-[comment {-*- tcl -*-}] > +-[manpage_begin struct::graph n 2.4] > +-[copyright {2002-2009 Andreas Kupries }] > +-[moddesc {Tcl Data Structures}] > +-[titledesc {Create and manipulate directed graph objects}] > +-[category {Data structures}] > +-[require Tcl 8.4] > +-[require struct::graph [opt 2.4]] > +-[require struct::list [opt 1.5]] > +-[require struct::set [opt 2.2.3]] > +-[description] > +-[para] > +- > +- > +-A directed graph is a structure containing two collections of > +-elements, called [term nodes] and [term arcs] respectively, together > +-with a relation ("connectivity") that places a general structure upon > +-the nodes and arcs. > +- > +-[para] > +- > +-Each arc is connected to two nodes, one of which is called the > +- > +-[term source] and the other the [term target]. This imposes a > +-direction upon the arc, which is said to go from the source to the > +-target. It is allowed that source and target of an arc are the same > +-node. Such an arc is called a [term loop]. > +- > +-Whenever a node is either the source or target of an arc both are said > +-to be [term adjacent]. This extends into a relation between nodes, > +-i.e. if two nodes are connected through at least one arc they are said > +-to be [term adjacent] too. > +- > +-[para] > +- > +-Each node can be the source and target for any number of arcs. The > +-former are called the [term {outgoing arcs}] of the node, the latter > +-the [term {incoming arcs}] of the node. The number of arcs in either > +-set is called the [term in-degree] resp. the [term out-degree] of the > +-node. > +- > +-[para] > +- > +-In addition to maintaining the node and arc relationships, this graph > +-implementation allows any number of named [term attributes] to be > +-associated with the graph itself, and each node or arc. > +- > +-[para] > +- > +-[emph Note:] The major version of the package [package struct] has > +-been changed to version 2.0, due to backward incompatible changes in > +-the API of this module. Please read the section > +- > +-[sectref {Changes for 2.0}] for a full list of all changes, > +-incompatible and otherwise. > +- > +-[para] > +- > +-[emph Note:] A C-implementation of the command can be had from the > +-location [uri http://www.purl.org/NET/schlenker/tcl/cgraph]. See also > +-[uri http://wiki.tcl.tk/cgraph]. This implementation uses a bit less > +-memory than the tcl version provided here directly, and is faster. Its > +-support is limited to versions of the package before 2.0. > +- > +-[para] > +- > +-As of version 2.2 of this package a critcl based C implementation is > +-available from here as well. This implementation however requires Tcl > +-8.4 to run. > +- > +-[para] > +- > +-The main command of the package is: > +- > +-[list_begin definitions] > +- > +-[call [cmd ::struct::graph] [opt [arg graphName]] \ > +- [opt "[const =]|[const :=]|[const as]|[const deserialize] [arg source]"]] > +- > +-The command creates a new graph object with an associated global Tcl > +-command whose name is [arg graphName]. This command may be used to > +-invoke various operations on the graph. It has the following general > +-form: > +- > +-[list_begin definitions] > +-[call [cmd graphName] [arg option] [opt [arg "arg arg ..."]]] > +- > +-[arg Option] and the [arg arg]s determine the exact behavior of the > +-command. > +- > +-[list_end] > +-[para] > +- > +-If [arg graphName] is not specified a unique name will be generated by > +-the package itself. If a [arg source] is specified the new graph will > +-be initialized to it. For the operators [const =], [const :=], and > +-[const as] the [arg source] argument is interpreted as the name of > +-another graph object, and the assignment operator [method =] will be > +-executed. For the operator [const deserialize] the [arg source] is a > +-serialized graph object and [method deserialize] will be executed. > +- > +-[para] > +- > +-In other words > +-[para] > +-[example { > +- ::struct::graph mygraph = b > +-}] > +-[para] > +-is equivalent to > +-[para] > +-[example { > +- ::struct::graph mygraph > +- mygraph = b > +-}] > +-[para] > +-and > +-[para] > +-[example { > +- ::struct::graph mygraph deserialize $b > +-}] > +-[para] > +-is equivalent to > +-[para] > +-[example { > +- ::struct::graph mygraph > +- mygraph deserialize $b > +-}] > +- > +-[list_end] > +- > +-[para] > +- > +-The following commands are possible for graph objects: > +- > +-[list_begin definitions] > +- > +-[call [arg graphName] [method =] [arg sourcegraph]] > +- > +-This is the [term assignment] operator for graph objects. It copies > +-the graph contained in the graph object [arg sourcegraph] over the > +-graph data in [arg graphName]. The old contents of [arg graphName] are > +-deleted by this operation. > +- > +-[para] > +- > +-This operation is in effect equivalent to > +-[para] > +-[example_begin] > +- [arg graphName] [method deserialize] [lb][arg sourcegraph] [method serialize][rb] > +-[example_end] > +- > +-[para] > +- > +-The operation assumes that the [arg sourcegraph] provides the method > +-[method serialize] and that this method returns a valid graph > +-serialization. > +- > +- > +-[call [arg graphName] [method -->] [arg destgraph]] > +- > +-This is the [term {reverse assignment}] operator for graph objects. It > +-copies the graph contained in the graph object [arg graphName] over > +-the graph data in the object [arg destgraph]. > +- > +-The old contents of [arg destgraph] are deleted by this operation. > +- > +-[para] > +- > +-This operation is in effect equivalent to > +-[para] > +-[example_begin] > +- [arg destgraph] [method deserialize] [lb][arg graphName] [method serialize][rb] > +-[example_end] > +- > +-[para] > +- > +-The operation assumes that the [arg destgraph] provides the method > +-[method deserialize] and that this method takes a graph serialization. > +- > +- > +-[call [arg graphName] [method append] [arg key] [arg value]] > +- > +-Appends a [arg value] to one of the keyed values associated with the graph. > +-Returns the new value given to the attribute [arg key]. > +- > +- > +-[call [arg graphName] [method deserialize] [arg serialization]] > +- > +-This is the complement to [method serialize]. It replaces the graph > +-data in [arg graphName] with the graph described by the > +-[arg serialization] value. The old contents of [arg graphName] are > +-deleted by this operation. > +- > +- > +-[call [arg graphName] [method destroy]] > +- > +-Destroys the graph, including its storage space and associated command. > +- > +- > +-[call [arg graphName] [method {arc append}] [arg arc] [arg key] [arg value]] > +- > +-Appends a [arg value] to one of the keyed values associated with an > +-[arg arc]. Returns the new value given to the attribute [arg key]. > +- > +- > +-[call [arg graphName] [method {arc attr}] [arg key]] > +-[call [arg graphName] [method {arc attr}] [arg key] [option -arcs] [arg list]] > +-[call [arg graphName] [method {arc attr}] [arg key] [option -glob] [arg globpattern]] > +-[call [arg graphName] [method {arc attr}] [arg key] [option -regexp] [arg repattern]] > +- > +-This method retrieves the value of the attribute named [arg key], for > +-all arcs in the graph (matching the restriction specified via one of > +-the possible options) and having the specified attribute. > +- > +-[para] > +- > +-The result is a dictionary mapping from arc names to the value of > +-attribute [arg key] at that arc. > +- > +-Arcs not having the attribute [arg key], or not passing a > +-specified restriction, are not listed in the result. > +- > +-[para] > +- > +-The possible restrictions are: > +- > +-[list_begin options] > +-[opt_def -arcs] > +- > +-The value is a list of arcs. Only the arcs mentioned in this list > +-are searched for the attribute. > +- > +-[opt_def -glob] > +- > +-The value is a glob pattern. Only the arcs in the graph whose names > +-match this pattern are searched for the attribute. > +- > +-[opt_def -regexp] > +- > +-The value is a regular expression. Only the arcs in the graph whose > +-names match this pattern are searched for the attribute. > +- > +-[list_end] > +-[para] > +- > +- > +-[call [arg graphName] [method {arc delete}] [arg arc] [opt "[arg arc] ..."]] > +- > +-Remove the specified arcs from the graph. > +- > +- > +-[call [arg graphName] [method {arc exists}] [arg arc]] > +- > +-Return true if the specified [arg arc] exists in the graph. > +- > +- > +-[call [arg graphName] [method {arc flip}] [arg arc]] > +- > +-Reverses the direction of the named [arg arc], i.e. the source and > +-target nodes of the arc are exchanged with each other. > +- > +- > +-[call [arg graphName] [method {arc get}] [arg arc] [arg key]] > +- > +-Returns the value associated with the key [arg key] for the [arg arc]. > +- > +- > +-[call [arg graphName] [method {arc getall}] [arg arc] [opt [arg pattern]]] > +- > +-Returns a dictionary (suitable for use with [lb][cmd {array set}][rb]) > +-for the [arg arc]. > +- > +-If the [arg pattern] is specified only the attributes whose names > +-match the pattern will be part of the returned dictionary. The pattern > +-is a [cmd glob] pattern. > +- > +- > +-[call [arg graphName] [method {arc getunweighted}]] > +- > +-Returns a list containing the names of all arcs in the graph which > +-have no weight associated with them. > +- > +- > +-[call [arg graphName] [method {arc getweight}] [arg arc]] > +- > +-Returns the weight associated with the [arg arc]. Throws an error if > +-the arc has no weight associated with it. > +- > +- > +-[call [arg graphName] [method {arc keys}] [arg arc] [opt [arg pattern]]] > +- > +-Returns a list of keys for the [arg arc]. > +- > +-If the [arg pattern] is specified only the attributes whose names > +-match the pattern will be part of the returned list. The pattern is a > +-[cmd glob] pattern. > +- > +- > +-[call [arg graphName] [method {arc keyexists}] [arg arc] [arg key]] > +- > +-Return true if the specified [arg key] exists for the [arg arc]. > +- > +- > +-[call [arg graphName] [method {arc insert}] [arg start] [arg end] [opt [arg child]]] > +- > +-Insert an arc named [arg child] into the graph beginning at the node > +-[arg start] and ending at the node [arg end]. If the name of the new > +-arc is not specified the system will generate a unique name of the > +-form [emph arc][arg x]. > +- > +- > +-[call [arg graphName] [method {arc lappend}] [arg arc] [arg key] [arg value]] > +- > +-Appends a [arg value] (as a list) to one of the keyed values > +-associated with an [arg arc]. Returns the new value given to the > +-attribute [arg key]. > +- > +- > +-[call [arg graphName] [method {arc rename}] [arg arc] [arg newname]] > +- > +-Renames the arc [arg arc] to [arg newname]. An error is thrown if > +-either the arc does not exist, or a arc with name [arg newname] does > +-exist. The result of the command is the new name of the arc. > +- > +- > +-[call [arg graphName] [method {arc set}] [arg arc] [arg key] [opt [arg value]]] > +- > +-Set or get one of the keyed values associated with an arc. > +- > +-An arc may have any number of keyed values associated with it. > +-If [arg value] is not specified, this command returns the current value assigned to the key; > +-if [arg value] is specified, this command assigns that value to the key, and returns > +-that value. > +- > +- > +-[call [arg graphName] [method {arc setunweighted}] [opt [arg weight]]] > +- > +-Sets the weight of all arcs without a weight to [arg weight]. Returns > +-the empty string as its result. If not present [arg weight] defaults > +-to [const 0]. > +- > +- > +-[call [arg graphName] [method {arc setweight}] [arg arc] [arg weight]] > +- > +-Sets the weight of the [arg arc] to [arg weight]. Returns [arg weight]. > +- > +- > +-[call [arg graphName] [method {arc unsetweight}] [arg arc]] > +- > +-Removes the weight of the [arg arc], if present. Does nothing > +-otherwise. Returns the empty string. > +- > +- > +-[call [arg graphName] [method {arc hasweight}] [arg arc]] > +- > +-Determines if the [arg arc] has a weight associated with it. The > +-result is a boolean value, [const True] if a weight is defined, and > +-[const False] otherwise. > +- > +- > +-[call [arg graphName] [method {arc source}] [arg arc]] > +- > +-Return the node the given [arg arc] begins at. > +- > +- > +-[call [arg graphName] [method {arc target}] [arg arc]] > +- > +-Return the node the given [arg arc] ends at. > +- > +- > +-[call [arg graphName] [method {arc nodes}] [arg arc]] > +- > +-Return the nodes the given [arg arc] begins and ends at, > +-as a two-element list. > +- > +- > +-[call [arg graphName] [method {arc move-source}] [arg arc] [arg newsource]] > +- > +-Changes the source node of the arc to [arg newsource]. It can be said > +-that the arc rotates around its target node. > +- > +- > +-[call [arg graphName] [method {arc move-target}] [arg arc] [arg newtarget]] > +- > +-Changes the target node of the arc to [arg newtarget]. It can be said > +-that the arc rotates around its source node. > +- > +- > +-[call [arg graphName] [method {arc move}] [arg arc] [arg newsource] [arg newtarget]] > +- > +-Changes both source and target nodes of the arc to [arg newsource], > +-and [arg newtarget] resp. > +- > +- > +-[call [arg graphName] [method {arc unset}] [arg arc] [arg key]] > +- > +-Remove a keyed value from the arc [arg arc]. The method will do > +-nothing if the [arg key] does not exist. > +- > +- > +-[call [arg graphName] [method {arc weights}]] > +- > +-Returns a dictionary whose keys are the names of all arcs which have a > +-weight associated with them, and the values are these weights. > +- > +- > +-[call [arg graphName] [method arcs] [opt "-key [arg key]"] [opt "-value [arg value]"] [opt "-filter [arg cmdprefix]"] [opt "-in|-out|-adj|-inner|-embedding [arg {node node...}]"]] > +- > +-Returns a list of arcs in the graph. If no restriction is specified a > +-list containing all arcs is returned. Restrictions can limit the list > +-of returned arcs based on the nodes that are connected by the arc, on > +-the keyed values associated with the arc, or both. A general filter > +-command can be used as well. The restrictions that involve connected > +-nodes take a variable number of nodes as argument, specified after the > +-name of the restriction itself. > +- > +-[para] > +- > +-The restrictions imposed by either [option -in], [option -out], > +-[option -adj], [option -inner], or [option -embedded] are applied > +-first. Specifying more than one of them is illegal. > +- > +-[para] > +- > +-After that the restrictions set via [option -key] (and > +-[option -value]) are applied. Specifying more than one [option -key] > +-(and [option -value]) is illegal. Specifying [option -value] alone, > +-without [option -key] is illegal as well. > +- > +-[para] > +- > +-Any restriction set through [option -filter] is applied > +-last. Specifying more than one [option -filter] is illegal. > +- > +-[para] > +- > +-Coming back to the restrictions based on a set of nodes, the command > +-recognizes the following switches: > +- > +-[list_begin definitions] > +-[def [option -in]] > +- > +-Return a list of all arcs whose target is one of the nodes in the set > +-of nodes. I.e. it computes the union of all incoming arcs of the nodes > +-in the set. > +- > +-[def [option -out]] > +- > +-Return a list of all arcs whose source is one of the nodes in the set > +-of nodes. I.e. it computes the union of all outgoing arcs of the nodes > +-in the set. > +- > +-[def [option -adj]] > +- > +-Return a list of all arcs adjacent to at least one of the nodes in the > +-set. This is the union of the nodes returned by [option -in] and > +-[option -out]. > +- > +-[def [option -inner]] > +- > +-Return a list of all arcs which are adjacent to two of the nodes in > +-the set. This is the set of arcs in the subgraph spawned by the > +-specified nodes. > +- > +-[def [option -embedding]] > +- > +-Return a list of all arcs adjacent to exactly one of the nodes in the > +-set. This is the set of arcs connecting the subgraph spawned by the > +-specified nodes to the rest of the graph. > +- > +-[def "[option -key] [arg key]"] > +- > +-Limit the list of arcs that are returned to those arcs that have an > +-associated key [arg key]. > +- > +-[def "[option -value] [arg value]"] > +- > +-This restriction can only be used in combination with > +- > +-[option -key]. It limits the list of arcs that are returned to those > +-arcs whose associated key [arg key] has the value [arg value]. > +- > +- > +-[def "[option -filter] [arg cmdrefix]"] > +- > +-Limit the list of arcs that are returned to those arcs that pass the > +-test. The command in [arg cmdprefix] is called with two arguments, the > +-name of the graph object, and the name of the arc in question. It is > +-executed in the context of the caller and has to return a boolean > +-value. Arcs for which the command returns [const false] are removed > +-from the result list before it is returned to the caller. > +- > +-[list_end] > +- > +- > +-[call [arg graphName] [method lappend] [arg key] [arg value]] > +- > +-Appends a [arg value] (as a list) to one of the keyed values > +-associated with the graph. Returns the new value given to the > +-attribute [arg key]. > +- > +- > +-[call [arg graphName] [method {node append}] [arg node] [arg key] [arg value]] > +- > +-Appends a [arg value] to one of the keyed values associated with an > +-[arg node]. Returns the new value given to the attribute [arg key]. > +- > +- > +-[call [arg graphName] [method {node attr}] [arg key]] > +-[call [arg graphName] [method {node attr}] [arg key] [option -nodes] [arg list]] > +-[call [arg graphName] [method {node attr}] [arg key] [option -glob] [arg globpattern]] > +-[call [arg graphName] [method {node attr}] [arg key] [option -regexp] [arg repattern]] > +- > +-This method retrieves the value of the attribute named [arg key], for > +-all nodes in the graph (matching the restriction specified via one of > +-the possible options) and having the specified attribute. > +- > +-[para] > +- > +-The result is a dictionary mapping from node names to the value of > +-attribute [arg key] at that node. > +- > +-Nodes not having the attribute [arg key], or not passing a > +-specified restriction, are not listed in the result. > +- > +-[para] > +- > +-The possible restrictions are: > +- > +-[list_begin options] > +-[opt_def -nodes] > +- > +-The value is a list of nodes. Only the nodes mentioned in this list > +-are searched for the attribute. > +- > +-[opt_def -glob] > +- > +-The value is a glob pattern. Only the nodes in the graph whose names > +-match this pattern are searched for the attribute. > +- > +-[opt_def -regexp] > +- > +-The value is a regular expression. Only the nodes in the graph whose > +-names match this pattern are searched for the attribute. > +- > +-[list_end] > +-[para] > +- > +- > +-[call [arg graphName] [method {node degree}] [opt -in|-out] [arg node]] > +- > +-Return the number of arcs adjacent to the specified [arg node]. If one > +-of the restrictions [option -in] or [option -out] is given only the > +-incoming resp. outgoing arcs are counted. > +- > +- > +-[call [arg graphName] [method {node delete}] [arg node] [opt "[arg node]..."]] > +- > +-Remove the specified nodes from the graph. All of the nodes' arcs > +-will be removed as well to prevent unconnected arcs. > +- > +- > +-[call [arg graphName] [method {node exists}] [arg node]] > +- > +-Return true if the specified [arg node] exists in the graph. > +- > +- > +-[call [arg graphName] [method {node get}] [arg node] [arg key]] > +- > +-Return the value associated with the key [arg key] for the [arg node]. > +- > +- > +-[call [arg graphName] [method {node getall}] [arg node] [opt [arg pattern]]] > +- > +-Returns a dictionary (suitable for use with [lb][cmd {array set}][rb]) > +-for the [arg node]. > +- > +-If the [arg pattern] is specified only the attributes whose names > +-match the pattern will be part of the returned dictionary. The pattern > +-is a [cmd glob] pattern. > +- > +- > +-[call [arg graphName] [method {node keys}] [arg node] [opt [arg pattern]]] > +- > +-Returns a list of keys for the [arg node]. > +- > +-If the [arg pattern] is specified only the attributes whose names > +-match the pattern will be part of the returned list. The pattern is a > +-[cmd glob] pattern. > +- > +- > +-[call [arg graphName] [method {node keyexists}] [arg node] [arg key]] > +- > +-Return true if the specified [arg key] exists for the [arg node]. > +- > +- > +-[call [arg graphName] [method {node insert}] [opt [arg node]...]] > +- > +-Insert one or more nodes into the graph. The new nodes have no arcs > +-connected to them. If no node is specified one node will be inserted, > +-and the system will generate a unique name of the form > +-[emph node][arg x] for it. > +- > +- > +-[call [arg graphName] [method {node lappend}] [arg node] [arg key] [arg value]] > +- > +-Appends a [arg value] (as a list) to one of the keyed values > +-associated with an [arg node]. Returns the new value given to the > +-attribute [arg key]. > +- > +- > +-[call [arg graphName] [method {node opposite}] [arg node] [arg arc]] > +- > +-Return the node at the other end of the specified [arg arc], which has > +-to be adjacent to the given [arg node]. > +- > +- > +-[call [arg graphName] [method {node rename}] [arg node] [arg newname]] > +- > +-Renames the node [arg node] to [arg newname]. An error is thrown if > +-either the node does not exist, or a node with name [arg newname] does > +-exist. The result of the command is the new name of the node. > +- > +- > +-[call [arg graphName] [method {node set}] [arg node] [arg key] [opt [arg value]]] > +- > +-Set or get one of the keyed values associated with a node. A node may have any > +-number of keyed values associated with it. If [arg value] is not > +-specified, this command returns the current value assigned to the key; > +-if [arg value] is specified, this command assigns that value to the > +-key. > +- > +- > +-[call [arg graphName] [method {node unset}] [arg node] [arg key]] > +- > +-Remove a keyed value from the node [arg node]. The method will do > +-nothing if the [arg key] does not exist. > +- > +- > +-[call [arg graphName] [method nodes] [opt "-key [arg key]"] [opt "-value [arg value]"] [opt "-filter [arg cmdprefix]"] [opt "-in|-out|-adj|-inner|-embedding [arg node] [arg node]..."]] > +- > +-Return a list of nodes in the graph. Restrictions can limit the list > +-of returned nodes based on neighboring nodes, or based on the keyed > +-values associated with the node. The restrictions that involve > +-neighboring nodes have a list of nodes as argument, specified after > +-the name of the restriction itself. > +- > +-[para] > +- > +-The possible restrictions are the same as for method > +-[method arcs]. The exact meanings change slightly, as they operate on > +-nodes instead of arcs. The command recognizes: > +- > +-[list_begin definitions] > +-[def [option -in]] > +- > +-Return a list of all nodes with at least one outgoing arc ending in a > +-node found in the specified set of nodes. Alternatively specified as > +-the set of source nodes for the [option -in] arcs of the node set. The > +-[term {incoming neighbours}]. > +- > +-[def [option -out]] > +- > +-Return a list of all nodes with at least one incoming arc starting in > +-a node found in the specified set of nodes. Alternatively specified as > +-the set of target nodes for the [option -out] arcs of the node > +-set. The [term {outgoing neighbours}]. > +- > +-[def [option -adj]] > +- > +-This is the union of the nodes returned by [option -in] and > +-[option -out]. The [term neighbours]. > +- > +-[def [option -inner]] > +- > +-The set of neighbours (see [option -adj] above) which are also in the > +-set of nodes. I.e. the intersection between the set of nodes and the > +-neighbours per [option -adj]. > +- > +-[def [option -embedding]] > +- > +-The set of neighbours (see [option -adj] above) which are not in the > +-set of nodes. I.e. the difference between the neighbours as per > +-[option -adj], and the set of nodes. > +- > +-[def "[option -key] [arg key]"] > +- > +-Limit the list of nodes that are returned to those nodes that have an > +-associated key [arg key]. > +- > +-[def "[option -value] [arg value]"] > +- > +-This restriction can only be used in combination with > +-[option -key]. It limits the list of nodes that are returned to those > +-nodes whose associated key [arg key] has the value [arg value]. > +- > +-[def "[option -filter] [arg cmdrefix]"] > +- > +-Limit the list of nodes that are returned to those nodes that pass the > +-test. The command in [arg cmdprefix] is called with two arguments, the > +-name of the graph object, and the name of the node in question. It is > +-executed in the context of the caller and has to return a boolean > +-value. Nodes for which the command returns [const false] are removed > +-from the result list before it is returned to the caller. > +- > +-[list_end] > +- > +- > +-[call [arg graphName] [method get] [arg key]] > +- > +-Return the value associated with the key [arg key] for the graph. > +- > +- > +-[call [arg graphName] [method getall] [opt [arg pattern]]] > +- > +-Returns a dictionary (suitable for use with [lb][cmd {array set}][rb]) > +-for the whole graph. > +- > +-If the [arg pattern] is specified only the attributes whose names > +-match the pattern will be part of the returned dictionary. The pattern > +-is a [cmd glob] pattern. > +- > +- > +-[call [arg graphName] [method keys] [opt [arg pattern]]] > +- > +-Returns a list of keys for the whole graph. > +- > +-If the [arg pattern] is specified only the attributes whose names > +-match the pattern will be part of the returned list. The pattern is a > +-[cmd glob] pattern. > +- > +- > +-[call [arg graphName] [method keyexists] [arg key]] > +- > +-Return true if the specified [arg key] exists for the whole graph. > +- > +- > +-[call [arg graphName] [method serialize] [opt [arg node]...]] > +- > +-This method serializes the sub-graph spanned up by the [arg node]s. In > +-other words it returns a tcl value completely describing that > +-graph. If no nodes are specified the whole graph will be serialized. > +- > +-This allows, for example, the transfer of graph objects (or parts > +-thereof) over arbitrary channels, persistence, etc. > +- > +-This method is also the basis for both the copy constructor and > +-the assignment operator. > +- > +-[para] > +- > +-The result of this method has to be semantically identical over all > +-implementations of the graph interface. This is what will enable us to > +-copy graph data between different implementations of the same > +-interface. > +- > +-[para] > +- > +-The result is a list containing a multiple of three items, plus one! > +-In other words, '[lb]llength $serial[rb] % 3 == 1'. Valid values > +-include 1, 4, 7, ... > +- > +-[para] > +- > +-The last element of the list is a dictionary containing the attributes > +-associated with the whole graph. > +- > +-Regarding the other elements; each triple consists of > +- > +-[list_begin enumerated] > +-[enum] > +-The name of the node to be described, > +- > +-[enum] > +-A dictionary containing the attributes associated with the node, > +- > +-[enum] > +-And a list describing all the arcs starting at that node. > +-[list_end] > +-[para] > +- > +-The elements of the arc list are lists containing three or four > +-elements each, i.e. > +- > +-[list_begin enumerated] > +-[enum] > +-The name of the arc described by the element, > +- > +-[enum] > +- > +-A reference to the destination node of the arc. This reference is an > +-integer number given the index of that node in the main serialization > +-list. As that it is greater than or equal to zero, less than the > +-length of the serialization, and a multiple of three. > +- > +-[emph Note:] For internal consistency no arc name may be used twice, > +-whether in the same node, or at some other node. This is a global > +-consistency requirement for the serialization. > +- > +-[enum] > +-And a dictionary containing the attributes associated with the arc. > +- > +-[enum] > +-The weight associated with the arc. This value is optional. Its > +-non-presence means that the arc in question has no weight associated > +-with it. > +- > +-[para][emph Note:] This information is new, compared to the > +-serialization of [package graph] 2.3 and earlier. By making it an > +-optional element the new format is maximally compatible with the > +-old. This means that any graph not using weights will generate a > +-serialization which is still understood by the older graph package. A > +-serialization will not be understood any longer by the older packages > +-if, and only if the graph it was generated from actually has arcs with > +-weights. > +- > +-[list_end] > +-[para] > +- > +-For all attribute dictionaries they keys are the names of the > +-attributes, and the values are the values for each name. > +- > +-[para] > +- > +-[emph Note:] The order of the nodes in the serialization has no > +-relevance, nor has the order of the arcs per node. > +- > +-[example { > +- # A possible serialization for the graph structure > +- # > +- # d -----> %2 > +- # / ^ \\ > +- # / / \\ > +- # / b \\ > +- # / / \\ > +- # %1 <- a - %0 e > +- # ^ \\ / > +- # \\ c / > +- # \\ \\ / > +- # \\ v v > +- # f ------ %3 > +- # is > +- # > +- # %3 {} {{f 6 {}}} %0 {} {{a 6 {}} {b 9 {}} {c 0 {}}} %1 {} {{d 9 {}}} %2 {} {{e 0 {}}} {} > +- # > +- # This assumes that the graph has neither attribute data nor weighted arcs. > +-}] > +-[para] > +- > +- > +-[call [arg graphName] [method set] [arg key] [opt [arg value]]] > +- > +-Set or get one of the keyed values associated with a graph. A graph > +-may have any number of keyed values associated with it. If [arg value] > +-is not specified, this command returns the current value assigned to > +-the key; if [arg value] is specified, this command assigns that value > +-to the key. > +- > +- > +-[call [arg graphName] [method swap] [arg node1] [arg node2]] > +- > +-Swap the position of [arg node1] and [arg node2] in the graph. > +- > +- > +-[call [arg graphName] [method unset] [arg key]] > +- > +-Remove a keyed value from the graph. The method will do nothing if the > +-[arg key] does not exist. > +- > +- > +-[call [arg graphName] [method walk] [arg node] \ > +- [opt "-order [arg order]"] \ > +- [opt "-type [arg type]"] \ > +- [opt "-dir [arg direction]"] \ > +- -command [arg cmd]] > +- > +-Perform a breadth-first or depth-first walk of the graph starting at > +-the node [arg node] going in either the direction of outgoing or > +-opposite to the incoming arcs. > +- > +-[para] > +- > +-The type of walk, breadth-first or depth-first, is determined by the > +-value of [arg type]; [const bfs] indicates breadth-first, > +- > +-[const dfs] indicates depth-first. Depth-first is the default. > +- > +-[para] > +- > +-The order of the walk, pre-order, post-order or both-order is > +-determined by the value of [arg order]; [const pre] indicates > +-pre-order, [const post] indicates post-order, [const both] indicates > +-both-order. Pre-order is the default. Pre-order walking means that a > +-node is visited before any of its neighbors (as defined by the > +- > +-[arg direction], see below). Post-order walking means that a parent is > +-visited after any of its neighbors. Both-order walking means that a > +-node is visited before [emph and] after any of its neighbors. The > +-combination of a breadth-first walk with post- or both-order is illegal. > +- > +-[para] > +- > +-The direction of the walk is determined by the value of [arg dir]; > +-[const backward] indicates the direction opposite to the incoming > +-arcs, [const forward] indicates the direction of the outgoing arcs. > +- > +-[para] > +- > +-As the walk progresses, the command [arg cmd] will be evaluated at > +-each node, with the mode of the call ([const enter] or > +-[const leave]) and values [arg graphName] and the name of the current > +-node appended. For a pre-order walk, all nodes are [const enter]ed, for a > +-post-order all nodes are left. In a both-order walk the first visit of > +-a node [const enter]s it, the second visit [const leave]s it. > +- > +-[list_end] > +- > +- > +-[section {Changes for 2.0}] > +-The following noteworthy changes have occurred: > +- > +-[list_begin enumerated] > +-[enum] > +- > +-The API for accessing attributes and their values has been > +-simplified. > +- > +-[para] > +- > +-All functionality regarding the default attribute "data" has been > +-removed. This default attribute does not exist anymore. All accesses > +-to attributes have to specify the name of the attribute in > +-question. This backward [emph incompatible] change allowed us to > +-simplify the signature of all methods handling attributes. > +- > +-[para] > +- > +-Especially the flag [option -key] is not required anymore, even more, > +-its use is now forbidden. Please read the documentation for the arc > +-and node methods [method set], [method get], [method getall], > +- > +-[method unset], [method append], [method lappend], [method keyexists] > +-and [method keys] for a description of the new API's. > +- > +-[enum] > +- > +-The methods [method keys] and [method getall] now take an optional > +-pattern argument and will return only attribute data for keys matching > +-this pattern. > +- > +-[enum] > +- > +-Arcs and nodes can now be renamed. See the documentation for the > +-methods [method {arc rename}] and [method {node rename}]. > +- > +-[enum] > +- > +-The structure has been extended with API's for the serialization and > +-deserialization of graph objects, and a number of operations based on > +-them (graph assignment, copy construction). > +- > +-[para] > +- > +-Please read the documentation for the methods [method serialize], > +-[method deserialize], [method =], and [method -->], and the > +-documentation on the construction of graph objects. > +- > +-[para] > +- > +-Beyond the copying of whole graph objects these new API's also enable > +-the transfer of graph objects over arbitrary channels and for easy > +-persistence. > +- > +- > +-[enum] > +- > +-A new method, [method attr], was added to both [method arc] and > +-[method node] allowing the query and retrieval of attribute data > +-without regard to arc and node relationships. > +- > +-[enum] > +- > +-Both methods [method arcs] and [method nodes] have been extended with > +-the ability to select arcs and nodes based on an arbitrary filtering > +-criterium. > +- > +- > +-[list_end] > +- > +- > +-[section {BUGS, IDEAS, FEEDBACK}] > +- > +-This document, and the package it describes, will undoubtedly contain > +-bugs and other problems. > +- > +-Please report such in the category [emph {struct :: graph}] of the > +-[uri {http://sourceforge.net/tracker/?group_id=12883} {Tcllib SF Trackers}]. > +- > +-Please also report any ideas for enhancements you may have for either > +-package and/or documentation. > +- > +- > +-[keywords graph cgraph serialization] > +-[keywords edge arc node vertex subgraph neighbour] > +-[keywords adjacent loop degree] > +-[manpage_end] > +-- > +1.7.6 > + > > > This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. > _______________________________________________ > devel mailing list > devel at lists.opencsw.org > https://lists.opencsw.org/mailman/listinfo/devel -- "You don't become great by trying to be great, you become great by wanting to do something, and then doing it so hard that you become great in the process." - xkcd #896 From dam at opencsw.org Mon Jul 11 12:57:57 2011 From: dam at opencsw.org (Dagobert Michelsen) Date: Mon, 11 Jul 2011 12:57:57 +0200 Subject: [csw-devel] SF.net SVN: gar:[15023] csw/mgar/pkg/libxslt/trunk/Makefile In-Reply-To: References: Message-ID: Hi Ben, Am 09.07.2011 um 14:35 schrieb bdwalton at users.sourceforge.net: > Revision: 15023 > http://gar.svn.sourceforge.net/gar/?rev=15023&view=rev > Author: bdwalton > Date: 2011-07-09 12:35:02 +0000 (Sat, 09 Jul 2011) > > Log Message: > ----------- > libxslt/trunk: update libxml2 deps after it was split up > > Modified Paths: > -------------- > csw/mgar/pkg/libxslt/trunk/Makefile > > Modified: csw/mgar/pkg/libxslt/trunk/Makefile > =================================================================== > --- csw/mgar/pkg/libxslt/trunk/Makefile 2011-07-09 12:12:44 UTC (rev 15022) > +++ csw/mgar/pkg/libxslt/trunk/Makefile 2011-07-09 12:35:02 UTC (rev 15023) > @@ -12,12 +12,13 @@ > DISTFILES = $(NAME)-$(VERSION).tar.gz > PATCHFILES += 0001-Forcefully-disable-version-script-use.patch > > -BUILD_DEP_PKGS = CSWlibxml2 CSWlibxml2devel > +BUILD_DEP_PKGS = CSWlibxml2-2 CSWlibxml2-dev > > PACKAGES = CSWlibxslt > SPKG_DESC_CSWlibxslt = XSLT engine runtime package > CATALOGNAME_CSWlibxslt = libxslt > -RUNTIME_DEP_PKGS_CSWlibxslt += CSWgcrypt CSWgpgerr CSWiconv CSWlibxml2 CSWzlib > +RUNTIME_DEP_PKGS_CSWlibxslt += CSWgcrypt CSWgpgerr CSWiconv CSWlibxml2-2 > +RUNTIME_DEP_PKGS_CSWlibxstl += CSWzlib > RUNTIME_DEP_PKGS_CSWlibxslt += CSWlibxslt1 CSWlibexslt0 > > PACKAGES += CSWlibxslt-dev > @@ -39,7 +40,7 @@ > RUNTIME_DEP_PKGS_CSWpy-libxslt = CSWpython > RUNTIME_DEP_PKGS_CSWpy-libxslt += CSWlibxslt1 > RUNTIME_DEP_PKGS_CSWpy-libxslt += CSWlibexslt0 > -RUNTIME_DEP_PKGS_CSWpy-libxslt += CSWlibxml2 > +RUNTIME_DEP_PKGS_CSWpy-libxslt += CSWlibxml2-2 > RUNTIME_DEP_PKGS_CSWpy-libxslt += CSWzlib > RUNTIME_DEP_PKGS_CSWpy-libxslt += CSWgpgerr > RUNTIME_DEP_PKGS_CSWpy-libxslt += CSWgcrypt > @@ -55,7 +56,7 @@ > RUNTIME_DEP_PKGS_CSWlibexslt0 += CSWiconv > RUNTIME_DEP_PKGS_CSWlibexslt0 += CSWgpgerr > RUNTIME_DEP_PKGS_CSWlibexslt0 += CSWzlib > -RUNTIME_DEP_PKGS_CSWlibexslt0 += CSWlibxml2 > +RUNTIME_DEP_PKGS_CSWlibexslt0 += CSWlibxml2-2 > RUNTIME_DEP_PKGS_CSWlibexslt0 += CSWlibxslt1 > RUNTIME_DEP_PKGS_CSWlibexslt0 += CSWgcrypt > > @@ -64,7 +65,7 @@ > PKGFILES_CSWlibxslt1 += $(call baseisadirs,$(libdir),libxslt\.so\.1\.1\.26) > PKGFILES_CSWlibxslt1 += $(call baseisadirs,$(libdir),libxslt\.so\.1(\.\d+)*) If you want you can use the more descriptive PKGFILES_CSWlibxslt1 += $(call pkgfiles_lib,libxslt.so.1) which includes the specific library in all isas and sub-versions of it. And no need to escape '.' in _this_ call as opposed to baseisadirs where it is needed. Best regards -- Dago > SPKG_DESC_CSWlibxslt1 += XSLT engine runtime package, libxslt.so.1 > -RUNTIME_DEP_PKGS_CSWlibxslt1 += CSWlibxml2 > +RUNTIME_DEP_PKGS_CSWlibxslt1 += CSWlibxml2-2 > RUNTIME_DEP_PKGS_CSWlibxslt1 += CSWiconv > RUNTIME_DEP_PKGS_CSWlibxslt1 += CSWzlib > > > > This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. > _______________________________________________ > devel mailing list > devel at lists.opencsw.org > https://lists.opencsw.org/mailman/listinfo/devel -- "You don't become great by trying to be great, you become great by wanting to do something, and then doing it so hard that you become great in the process." - xkcd #896 From bwalton at opencsw.org Mon Jul 11 13:01:25 2011 From: bwalton at opencsw.org (Ben Walton) Date: Mon, 11 Jul 2011 07:01:25 -0400 Subject: [csw-devel] SF.net SVN: gar:[15023] csw/mgar/pkg/libxslt/trunk/Makefile In-Reply-To: References: Message-ID: <0c2b5bb3-89c3-44d6-b7d9-8661a5f02820@email.android.com> I wasn't aware of that function. I'll switch to using it. Is checkpkg sitting out "recommend" lines with this function? Thanks -Ben Dagobert Michelsen wrote: Hi Ben, Am 09.07.2011 um 14:35 schrieb bdwalton at users.sourceforge.net: > Revision: 15023 > http://gar.svn.sourceforge.net/gar/?rev=15023&view=rev > Author: bdwalton > Date: 2011-07-09 12:35:02 +0000 (Sat, 09 Jul 2011) > > Log Message: > ----------- > libxslt/trunk: update libxml2 deps after it was split up > > Modified Paths: > -------------- > csw/mgar/pkg/libxslt/trunk/Makefile > > Modified: csw/mgar/pkg/libxslt/trunk/Makefile >_____________________________________________ > --- csw/mgar/pkg/libxslt/trunk/Makefile 2011-07-09 12:12:44 UTC (rev 15022) > +++ csw/mgar/pkg/libxslt/trunk/Makefile 2011-07-09 12:35:02 UTC (rev 15023) > @@ -12,12 +12,13 @@ > DISTFILES = $(NAME)-$(VERSION).tar.gz > PATCHFILES += 0001-Forcefully-disable-version-script-use.patch > > -BUILD_DEP_PKGS = CSWlibxml2 CSWlibxml2devel > +BUILD_DEP_PKGS = CSWlibxml2-2 CSWlibxml2-dev > > PACKAGES = CSWlibxslt > SPKG_DESC_CSWlibxslt = XSLT engine runtime package > CATALOGNAME_CSWlibxslt = libxslt > -RUNTIME_DEP_PKGS_CSWlibxslt += CSWgcrypt CSWgpgerr CSWiconv CSWlibxml2 CSWzlib > +RUNTIME_DEP_PKGS_CSWlibxslt += CSWgcrypt CSWgpgerr CSWiconv CSWlibxml2-2 > +RUNTIME_DEP_PKGS_CSWlibxstl += CSWzlib > RUNTIME_DEP_PKGS_CSWlibxslt += CSWlibxslt1 CSWlibexslt0 > > PACKAGES += CSWlibxslt-dev > @@ -39,7 +40,7 @@ > RUNTIME_DEP_PKGS_CSWpy-libxslt = CSWpython > RUNTIME_DEP_PKGS_CSWpy-libxslt += CSWlibxslt1 > RUNTIME_DEP_PKGS_CSWpy-libxslt += CSWlibexslt0 > -RUNTIME_DEP_PKGS_CSWpy-libxslt += CSWlibxml2 > +RUNTIME_DEP_PKGS_CSWpy-libxslt += CSWlibxml2-2 > RUNTIME_DEP_PKGS_CSWpy-libxslt += CSWzlib > RUNTIME_DEP_PKGS_CSWpy-libxslt += CSWgpgerr > RUNTIME_DEP_PKGS_CSWpy-libxslt += CSWgcrypt > @@ -55,7 +56,7 @@ > RUNTIME_DEP_PKGS_CSWlibexslt0 += CSWiconv > RUNTIME_DEP_PKGS_CSWlibexslt0 += CSWgpgerr > RUNTIME_DEP_PKGS_CSWlibexslt0 += CSWzlib > -RUNTIME_DEP_PKGS_CSWlibexslt0 += CSWlibxml2 > +RUNTIME_DEP_PKGS_CSWlibexslt0 += CSWlibxml2-2 > RUNTIME_DEP_PKGS_CSWlibexslt0 += CSWlibxslt1 > RUNTIME_DEP_PKGS_CSWlibexslt0 += CSWgcrypt > > @@ -64,7 +65,7 @@ > PKGFILES_CSWlibxslt1 += $(call baseisadirs,$(libdir),libxslt\.so\.1\.1\.26) > PKGFILES_CSWlibxslt1 += $(call baseisadirs,$(libdir),libxslt\.so\.1(\.\d+)*) If you want you can use the more descriptive PKGFILES_CSWlibxslt1 += $(call pkgfiles_lib,libxslt.so.1) which includes the specific library in all isas and sub-versions of it. And no need to escape '.' in _this_ call as opposed to baseisadirs where it is needed. Best regards -- Dago > SPKG_DESC_CSWlibxslt1 += XSLT engine runtime package, libxslt.so.1 > -RUNTIME_DEP_PKGS_CSWlibxslt1 += CSWlibxml2 > +RUNTIME_DEP_PKGS_CSWlibxslt1 += CSWlibxml2-2 > RUNTIME_DEP_PKGS_CSWlibxslt1 += CSWiconv > RUNTIME_DEP_PKGS_CSWlibxslt1 += CSWzlib > > > > This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. >_____________________________________________ > devel mailing list > devel at lists.opencsw.org > https://lists.opencsw.org/mailman/listinfo/devel -- "You don't become great by trying to be great, you become great by wanting to do something, and then doing it so hard that you become great in the process." - xkcd #896 -------------- next part -------------- An HTML attachment was scrubbed... URL: From dmichelsen at users.sourceforge.net Mon Jul 11 14:54:03 2011 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Mon, 11 Jul 2011 12:54:03 +0000 Subject: [csw-devel] SF.net SVN: gar:[15040] csw/mgar/pkg/libmad/trunk/Makefile Message-ID: Revision: 15040 http://gar.svn.sourceforge.net/gar/?rev=15040&view=rev Author: dmichelsen Date: 2011-07-11 12:54:03 +0000 (Mon, 11 Jul 2011) Log Message: ----------- libmad: Update to latest standards Modified Paths: -------------- csw/mgar/pkg/libmad/trunk/Makefile Modified: csw/mgar/pkg/libmad/trunk/Makefile =================================================================== --- csw/mgar/pkg/libmad/trunk/Makefile 2011-07-11 10:27:53 UTC (rev 15039) +++ csw/mgar/pkg/libmad/trunk/Makefile 2011-07-11 12:54:03 UTC (rev 15040) @@ -15,27 +15,20 @@ DISTFILES = $(DISTNAME).tar.gz DISTFILES += mad-32.pc mad-64.pc -UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz - VENDOR_URL = http://www.underbit.com/products/mad/ PACKAGES += CSWlibmad0 -CATALOGNAME_CSWlibmad0 = libmad0 SPKG_DESC_CSWlibmad0 = MPEG audio decoder library, libmad.so.0 PKGFILES_CSWlibmad0 += $(call pkgfiles_lib,libmad.so.0) OBSOLETED_BY_CSWlibmad0 = CSWlibmad PACKAGES += CSWlibmad-dev -CATALOGNAME_CSWlibmad-dev = libmad_dev SPKG_DESC_CSWlibmad-dev = Development files for libmad.so.0 # PKGFILES is catchall RUNTIME_DEP_PKGS_CSWlibmad-dev = CSWlibmad0 BUILD64 = 1 -CONFIGURE_ARGS = $(DIRPATHS) -TEST_TARGET = check - include gar/category.mk post-install-modulated: This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Mon Jul 11 15:52:44 2011 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Mon, 11 Jul 2011 13:52:44 +0000 Subject: [csw-devel] SF.net SVN: gar:[15041] csw/mgar/pkg/liboil/trunk Message-ID: Revision: 15041 http://gar.svn.sourceforge.net/gar/?rev=15041&view=rev Author: dmichelsen Date: 2011-07-11 13:52:44 +0000 (Mon, 11 Jul 2011) Log Message: ----------- liboil: Update to latest standards Modified Paths: -------------- csw/mgar/pkg/liboil/trunk/Makefile csw/mgar/pkg/liboil/trunk/checksums Modified: csw/mgar/pkg/liboil/trunk/Makefile =================================================================== --- csw/mgar/pkg/liboil/trunk/Makefile 2011-07-11 12:54:03 UTC (rev 15040) +++ csw/mgar/pkg/liboil/trunk/Makefile 2011-07-11 13:52:44 UTC (rev 15041) @@ -17,28 +17,20 @@ PATCHFILES = 0001-Use-inttypes.h.patch PATCHFILES += 0002-Enable-getisax-only-for-Solaris-10.patch -# We define upstream file regex so we can be notifed of new upstream software release -UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz +VENDOR_URL = http://liboil.freedesktop.org/ -PACKAGES = CSWliboil CSWliboildevel +PACKAGES += CSWliboil0-3-0 +SPKG_DESC_CSWliboil0-3-0 = A library of simple functions that are optimized for various CPUs, liboil-0.3.so.0 +PKGFILES_CSWliboil0-3-0 += $(call pkgfiles_lib,liboil-0.3.so.0) +OBSOLETED_BY_CSWliboil0-3-0 = CSWliboil -CATALOGNAME_CSWliboil = liboil -CATALOGNAME_CSWliboildevel = liboil_devel +PACKAGES += CSWliboil-dev +SPKG_DESC_CSWliboil-dev = Development files for liboil-0.3.so.0 +RUNTIME_DEP_PKGS_CSWliboil-dev += CSWliboil0-3-0 +# PKGFILES is catchall +OBSOLETED_BY_CSWliboil-dev += CSWliboildevel +CATALOGNAME_CSWliboildevel = liboil_devel_stub -SPKG_DESC_CSWliboil = $(DESCRIPTION) -SPKG_DESC_CSWliboildevel = Development files for liboil - -RUNTIME_DEP_PKGS_CSWliboildevel = CSWliboil - -SPKG_SOURCEURL = http://liboil.freedesktop.org/ - BUILD64 = 1 -NOISAEXEC = 1 -CONFIGURE_ARGS = $(DIRPATHS) -TEST_TARGET = check - -PKGFILES_CSWliboildevel = $(PKGFILES_DEVEL) -PKGFILES_CSWliboildevel += $(sharedstatedir)/gtk-doc/.* - include gar/category.mk Modified: csw/mgar/pkg/liboil/trunk/checksums =================================================================== --- csw/mgar/pkg/liboil/trunk/checksums 2011-07-11 12:54:03 UTC (rev 15040) +++ csw/mgar/pkg/liboil/trunk/checksums 2011-07-11 13:52:44 UTC (rev 15041) @@ -1,3 +1 @@ -4fb5c9be05a769cc606257a723ecf6cd 0001-Use-inttypes.h.patch -dd92cada15fe42ef09f2bc6ed9d068db 0002-Enable-getisax-only-for-Solaris-10.patch 47dc734f82faeb2964d97771cfd2e701 liboil-0.3.17.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From phipsy at users.sourceforge.net Mon Jul 11 17:08:11 2011 From: phipsy at users.sourceforge.net (phipsy at users.sourceforge.net) Date: Mon, 11 Jul 2011 15:08:11 +0000 Subject: [csw-devel] SF.net SVN: gar:[15042] csw/mgar/pkg/ruby-augeas/trunk Message-ID: Revision: 15042 http://gar.svn.sourceforge.net/gar/?rev=15042&view=rev Author: phipsy Date: 2011-07-11 15:08:10 +0000 (Mon, 11 Jul 2011) Log Message: ----------- ruby_augeas: version bump to 0.4.1 Modified Paths: -------------- csw/mgar/pkg/ruby-augeas/trunk/Makefile csw/mgar/pkg/ruby-augeas/trunk/checksums Modified: csw/mgar/pkg/ruby-augeas/trunk/Makefile =================================================================== --- csw/mgar/pkg/ruby-augeas/trunk/Makefile 2011-07-11 13:52:44 UTC (rev 15041) +++ csw/mgar/pkg/ruby-augeas/trunk/Makefile 2011-07-11 15:08:10 UTC (rev 15042) @@ -1,5 +1,5 @@ NAME = ruby-augeas -VERSION = 0.3.0 +VERSION = 0.4.1 CATEGORIES = lang DESCRIPTION = Augeas Ruby Bindings @@ -17,8 +17,10 @@ RUNTIME_DEP_PKGS_CSWrubyaugeas += CSWlibruby18-1 RUNTIME_DEP_PKGS_CSWrubyaugeas += CSWaugeas CHECKPKG_OVERRIDES_CSWrubyaugeas += catalogname-does-not-match-pkgname|pkgname=CSWrubyaugeas|catalogname=ruby_augeas|expected-catalogname=rubyaugeas -CHECKPKG_OVERRIDES_CSWrubyaugeas += missing-dependency|CSWruby +# covered by CSWaugeas - and agreed not to split +CHECKPKG_OVERRIDES_CSWrubyaugeas += soname-not-found|libaugeas.so.0|is|needed|by|opt/csw/lib/ruby/site_ruby/1.8/sparc-solaris2.9/_augeas.so + BUILD_DEP_PKGS = CSWrake BUILD_DEP_PKGS += CSWruby18 BUILD_SCRIPTS = Modified: csw/mgar/pkg/ruby-augeas/trunk/checksums =================================================================== --- csw/mgar/pkg/ruby-augeas/trunk/checksums 2011-07-11 13:52:44 UTC (rev 15041) +++ csw/mgar/pkg/ruby-augeas/trunk/checksums 2011-07-11 15:08:10 UTC (rev 15042) @@ -1 +1,2 @@ bdeeb2b99f962a453259748073495d3f ruby-augeas-0.3.0.tgz +b7d059cdcbe8b78727b08882b7128ba7 ruby-augeas-0.4.1.tgz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From khabermann at users.sourceforge.net Mon Jul 11 17:16:59 2011 From: khabermann at users.sourceforge.net (khabermann at users.sourceforge.net) Date: Mon, 11 Jul 2011 15:16:59 +0000 Subject: [csw-devel] SF.net SVN: gar:[15043] csw/mgar/pkg/tcllib/trunk Message-ID: Revision: 15043 http://gar.svn.sourceforge.net/gar/?rev=15043&view=rev Author: khabermann Date: 2011-07-11 15:16:58 +0000 (Mon, 11 Jul 2011) Log Message: ----------- tcllib: tidy up GAR-Makefile Modified Paths: -------------- csw/mgar/pkg/tcllib/trunk/Makefile Added Paths: ----------- csw/mgar/pkg/tcllib/trunk/files/0003-path-change-shells.patch Modified: csw/mgar/pkg/tcllib/trunk/Makefile =================================================================== --- csw/mgar/pkg/tcllib/trunk/Makefile 2011-07-11 15:08:10 UTC (rev 15042) +++ csw/mgar/pkg/tcllib/trunk/Makefile 2011-07-11 15:16:58 UTC (rev 15043) @@ -7,6 +7,7 @@ CATEGORIES = lang ARCHALL_CSWtcllib = 1 LICENSE = license.terms +DEPENDS = CSWtcl DESCRIPTION = Standard Tcl library, collection of common utility functions and modules define BLURB @@ -14,16 +15,12 @@ MASTER_SITES = $(SF_MIRRORS) DISTFILES = $(DISTNAME).tar.gz -PATCHFILES = 0001-csw-path-changes.patch 0002-renamed-conflicting-man-pages.patch +PATCHFILES = 0001-csw-path-changes.patch 0002-renamed-conflicting-man-pages.patch 0003-path-change-shells.patch # comment contains "/usr/share/misc/magic.mime" CHECKPKG_OVERRIDES_CSWtcllib += file-with-bad-content|/usr/share|root/opt/csw/lib/tcllib1.13/fumagic/filetypes.tcl CHECKPKG_OVERRIDES_CSWtcllib += file-with-bad-content|/usr/share|root/opt/csw/lib/tcllib1.13/fumagic/mimetypes.tcl -# list of shells containing "/usr/local/bin/bash" and others -CHECKPKG_OVERRIDES_CSWtcllib += file-with-bad-content|/usr/local|root/opt/csw/lib/tcllib1.13/fumagic/filetypes.tcl -CHECKPKG_OVERRIDES_CSWtcllib += file-with-bad-content|/usr/local|root/opt/csw/lib/tcllib1.13/fumagic/mimetypes.tcl - # comment contains "/usr/share/misc/file/magic" CHECKPKG_OVERRIDES_CSWtcllib += file-with-bad-content|/usr/share|root/opt/csw/lib/tcllib1.13/fumagic/cfront.tcl @@ -36,8 +33,7 @@ # uncomment the next line. Otherwise it is set by default to the value of MASTER_SITES # UPSTREAM_MASTER_SITES = -# CONFIGURE_ARGS = $(DIRPATHS) -CONFIGURE=./configure --prefix=/opt/csw +CONFIGURE_ARGS = --prefix=$(prefix) include gar/category.mk Added: csw/mgar/pkg/tcllib/trunk/files/0003-path-change-shells.patch =================================================================== --- csw/mgar/pkg/tcllib/trunk/files/0003-path-change-shells.patch (rev 0) +++ csw/mgar/pkg/tcllib/trunk/files/0003-path-change-shells.patch 2011-07-11 15:16:58 UTC (rev 15043) @@ -0,0 +1,158 @@ +From 466c43f6ab8ecb36b006367c4fc633f19a43b747 Mon Sep 17 00:00:00 2001 +From: Kester Habermann +Date: Mon, 11 Jul 2011 17:13:36 +0200 +Subject: [PATCH] path-change-shells + +--- + modules/fumagic/filetypes.tcl | 21 ++++++++-------- + modules/fumagic/mimetypes.tcl | 52 +++++++++++++++++++--------------------- + 2 files changed, 35 insertions(+), 38 deletions(-) + +diff --git a/modules/fumagic/filetypes.tcl b/modules/fumagic/filetypes.tcl +index 8872af3..db6af98 100644 +--- a/modules/fumagic/filetypes.tcl ++++ b/modules/fumagic/filetypes.tcl +@@ -2017,25 +2017,24 @@ if {[S 0 == {\#!\ /bin/sh} b]} {emit {Bourne shell script text executable}} + if {[S 0 == {\#!\ /bin/csh} b]} {emit {C shell script text executable}} + if {[S 0 == {\#!\ /bin/ksh} b]} {emit {Korn shell script text executable}} + if {[S 0 == {\#!\ /bin/tcsh} b]} {emit {Tenex C shell script text executable}} +-if {[S 0 == {\#!\ /usr/local/tcsh} b]} {emit {Tenex C shell script text executable}} +-if {[S 0 == {\#!\ /usr/local/bin/tcsh} b]} {emit {Tenex C shell script text executable}} ++if {[S 0 == {\#!\ /opt/csw/bin/tcsh} b]} {emit {Tenex C shell script text executable}} + if {[S 0 == {\#!\ /bin/zsh} b]} {emit {Paul Falstad's zsh script text executable}} + if {[S 0 == {\#!\ /usr/bin/zsh} b]} {emit {Paul Falstad's zsh script text executable}} +-if {[S 0 == {\#!\ /usr/local/bin/zsh} b]} {emit {Paul Falstad's zsh script text executable}} +-if {[S 0 == {\#!\ /usr/local/bin/ash} b]} {emit {Neil Brown's ash script text executable}} +-if {[S 0 == {\#!\ /usr/local/bin/ae} b]} {emit {Neil Brown's ae script text executable}} ++if {[S 0 == {\#!\ /opt/csw/bin/zsh} b]} {emit {Paul Falstad's zsh script text executable}} ++if {[S 0 == {\#!\ /opt/csw/bin/ash} b]} {emit {Neil Brown's ash script text executable}} ++if {[S 0 == {\#!\ /opt/csw/bin/ae} b]} {emit {Neil Brown's ae script text executable}} + if {[S 0 == {\#!\ /bin/nawk} b]} {emit {new awk script text executable}} + if {[S 0 == {\#!\ /usr/bin/nawk} b]} {emit {new awk script text executable}} +-if {[S 0 == {\#!\ /usr/local/bin/nawk} b]} {emit {new awk script text executable}} ++if {[S 0 == {\#!\ /opt/csw/bin/nawk} b]} {emit {new awk script text executable}} + if {[S 0 == {\#!\ /bin/gawk} b]} {emit {GNU awk script text executable}} + if {[S 0 == {\#!\ /usr/bin/gawk} b]} {emit {GNU awk script text executable}} +-if {[S 0 == {\#!\ /usr/local/bin/gawk} b]} {emit {GNU awk script text executable}} ++if {[S 0 == {\#!\ /opt/csw/bin/gawk} b]} {emit {GNU awk script text executable}} + if {[S 0 == {\#!\ /bin/awk} b]} {emit {awk script text executable}} + if {[S 0 == {\#!\ /usr/bin/awk} b]} {emit {awk script text executable}} + if {[S 0 == BEGIN]} {emit {awk script text}} + if {[S 0 == {\#!\ /bin/rc} b]} {emit {Plan 9 rc shell script text executable}} + if {[S 0 == {\#!\ /bin/bash} b]} {emit {Bourne-Again shell script text executable}} +-if {[S 0 == {\#!\ /usr/local/bin/bash} b]} {emit {Bourne-Again shell script text executable}} ++if {[S 0 == {\#!\ /opt/csw/bin/bash} b]} {emit {Bourne-Again shell script text executable}} + if {[S 0 == {\#!/usr/bin/env}]} {emit a + if {[S 15 x {}]} {emit {%s script text executable}} + } +@@ -2045,7 +2044,7 @@ if {[S 16 x {}]} {emit {%s script text executable}} + if {[S 0 == References: Message-ID: <1310398946-sup-2660@pinkfloyd.chass.utoronto.ca> Excerpts from phipsy's message of Mon Jul 11 11:08:11 -0400 2011: Hi Mark, > +# covered by CSWaugeas - and agreed not to split > +CHECKPKG_OVERRIDES_CSWrubyaugeas += > soname-not-found|libaugeas.so.0|is|needed|by|opt/csw/lib/ruby/site_ruby/1.8/sparc-solaris2.9/_augeas.so Is CSWaugeas{,-dev} installed on the build machine? You shouldn't get this error if the library is available. If it is installed and you're still getting it, something else is wrong here. Either way, it's likely something that should not be overridden. (Note that this override is only good on sparc. You'd need a specific i386 one if I'm wrong above.) Thanks -Ben -- Ben Walton Systems Programmer - CHASS University of Toronto C:416.407.5610 | W:416.978.4302 From khabermann at users.sourceforge.net Mon Jul 11 17:56:00 2011 From: khabermann at users.sourceforge.net (khabermann at users.sourceforge.net) Date: Mon, 11 Jul 2011 15:56:00 +0000 Subject: [csw-devel] SF.net SVN: gar:[15044] csw/mgar/pkg/tcllib/trunk/Makefile Message-ID: Revision: 15044 http://gar.svn.sourceforge.net/gar/?rev=15044&view=rev Author: khabermann Date: 2011-07-11 15:56:00 +0000 (Mon, 11 Jul 2011) Log Message: ----------- tcllib: put manpages in right place Modified Paths: -------------- csw/mgar/pkg/tcllib/trunk/Makefile Modified: csw/mgar/pkg/tcllib/trunk/Makefile =================================================================== --- csw/mgar/pkg/tcllib/trunk/Makefile 2011-07-11 15:16:58 UTC (rev 15043) +++ csw/mgar/pkg/tcllib/trunk/Makefile 2011-07-11 15:56:00 UTC (rev 15044) @@ -33,7 +33,7 @@ # uncomment the next line. Otherwise it is set by default to the value of MASTER_SITES # UPSTREAM_MASTER_SITES = -CONFIGURE_ARGS = --prefix=$(prefix) +CONFIGURE_ARGS = --prefix=$(prefix) --mandir=$(prefix)/share/man include gar/category.mk This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dam at opencsw.org Mon Jul 11 21:44:48 2011 From: dam at opencsw.org (Dagobert Michelsen) Date: Mon, 11 Jul 2011 21:44:48 +0200 Subject: [csw-devel] SF.net SVN: gar:[15023] csw/mgar/pkg/libxslt/trunk/Makefile In-Reply-To: <0c2b5bb3-89c3-44d6-b7d9-8661a5f02820@email.android.com> References: <0c2b5bb3-89c3-44d6-b7d9-8661a5f02820@email.android.com> Message-ID: <610C4FD1-16A0-440D-A27D-BE578AA501E0@opencsw.org> Hi Ben, Am 11.07.2011 um 13:01 schrieb Ben Walton: > I wasn't aware of that function. I'll switch to using it. Is checkpkg sitting out "recommend" lines with this function? I guess that depends on the string of the library. Probably it is still too conservative with the lines you used and using the newer pkgfiles_lib not often enough. Best regards -- Dago > > Thanks > -Ben > > Dagobert Michelsen wrote: > Hi Ben, > > Am 09.07.2011 um 14:35 schrieb bdwalton at users.sourceforge.net: > > > Revision: 15023 > > http://gar.svn.sourceforge.net/gar/?rev=15023&view=rev > > Author: bdwalton > > Date: 2011-07-09 12:35:02 +0000 (Sat, 09 Jul 2011) > > > > Log Message: > > ----------- > > libxslt/trunk: update libxml2 deps after it was split up > > > > Modified Paths: > > -------------- > > csw/mgar/pkg/libxslt/trunk/Makefile > > > > Modified: csw/mgar/pkg/libxslt/trunk/Makefile > > > > > --- csw/mgar/pkg/libxslt/trunk/Makefile 2011-07-09 12:12:44 UTC (rev 15022) > > +++ csw/mgar/pkg/libxslt/trunk/Makefile 2011-07-09 12:35:02 UTC (rev 15023) > > @@ -12,12 +12,13 @@ > > DISTFILES = $(NAME)-$(VERSION).tar.gz > > PATCHFILES += 0001-Forcefully-disable-version-script-use.patch > > > > -BUILD_DEP_PKGS = CSWlibxml2 CSWlibxml2devel > > +BUILD_DEP_PKGS = CSWlibxml2-2 CSWlibxml2-dev > > > > PACKAGES = CSWlibxslt > > SPKG_DESC_CSWlibxslt = XSLT engine runtime package > > CATALOGNAME_CSWlibxslt = libxslt > > -RUNTIME_DEP_PKGS_CSWlibxslt += CSWgcrypt CSWgpgerr CSWiconv CSWlibxml2 CSWzlib > > +RUNTIME_DEP_PKGS_CSWlibxslt += CSWgcrypt CSWgpgerr CSWiconv CSWlibxml2-2 > > +RUNTIME_DEP_PKGS_CSWlibxstl += CSWzlib > > RUNTIME_DEP_PKGS_CSWlibxslt += CSWlibxslt1 CSWlibexslt0 > > > > PACKAGES += CSWlibxslt-dev > > @@ -39,7 +40,7 @@ > > RUNTIME_DEP_PKGS_CSWpy-libxslt = CSWpython > > RUNTIME_DEP_PKGS_CSWpy-libxslt += CSWlibxslt1 > > RUNTIME_DEP_PKGS_CSWpy-libxslt += CSWlibexslt0 > > -RUNTIME_DEP_PKGS_CSWpy-libxslt += CSWlibxml2 > > +RUNTIME_DEP_PKGS_CSWpy-libxslt += CSWlibxml2-2 > > RUNTIME_DEP_PKGS_CSWpy-libxslt += CSWzlib > > RUNTIME_DEP_PKGS_CSWpy-libxslt += CSWgpgerr > > RUNTIME_DEP_PKGS_CSWpy-libxslt += CSWgcrypt > > @@ -55,7 +56,7 @@ > > RUNTIME_DEP_PKGS_CSWlibexslt0 += CSWiconv > > RUNTIME_DEP_PKGS_CSWlibexslt0 += CSWgpgerr > > RUNTIME_DEP_PKGS_CSWlibexslt0 += CSWzlib > > -RUNTIME_DEP_PKGS_CSWlibexslt0 += CSWlibxml2 > > +RUNTIME_DEP_PKGS_CSWlibexslt0 += CSWlibxml2-2 > > RUNTIME_DEP_PKGS_CSWlibexslt0 += CSWlibxslt1 > > RUNTIME_DEP_PKGS_CSWlibexslt0 += CSWgcrypt > > > > @@ -64,7 +65,7 @@ > > PKGFILES_CSWlibxslt1 += $(call baseisadirs,$(libdir),libxslt\.so\.1\.1\.26) > > PKGFILES_CSWlibxslt1 += $(call baseisadirs,$(libdir),libxslt\.so\.1(\.\d+)*) > > If you want you can use the more descriptive > PKGFILES_CSWlibxslt1 += $(call pkgfiles_lib,libxslt.so.1) > which includes the specific library in all isas and sub-versions of it. > And no need to escape '.' in _this_ call as opposed to baseisadirs where it is needed. > > > Best regards > > -- Dago > > > SPKG_DESC_CSWlibxslt1 += XSLT engine runtime package, libxslt.so.1 > > -RUNTIME_DEP_PKGS_CSWlibxslt1 += CSWlibxml2 > > +RUNTIME_DEP_PKGS_CSWlibxslt1 += CSWlibxml2-2 > > RUNTIME_DEP_PKGS_CSWlibxslt1 += CSWiconv > > RUNTIME_DEP_PKGS_CSWlibxslt1 += CSWzlib > > > > > > > > This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. > > > > > devel mailing list > > devel at lists.opencsw.org > > https://lists.opencsw.org/mailman/listinfo/devel > > -- > "You don't become great by trying to be great, you become great by wanting to do something, > and then doing it so hard that you become great in the process." - xkcd #896 > > -- "You don't become great by trying to be great, you become great by wanting to do something, and then doing it so hard that you become great in the process." - xkcd #896 -------------- next part -------------- An HTML attachment was scrubbed... URL: From bdwalton at users.sourceforge.net Tue Jul 12 02:08:48 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Tue, 12 Jul 2011 00:08:48 +0000 Subject: [csw-devel] SF.net SVN: gar:[15045] csw/mgar/pkg/cswclassutils/trunk/files/ CSWcswclassutils.i.cswetcshells Message-ID: Revision: 15045 http://gar.svn.sourceforge.net/gar/?rev=15045&view=rev Author: bdwalton Date: 2011-07-12 00:08:47 +0000 (Tue, 12 Jul 2011) Log Message: ----------- cswclassutils/trunk: modify cas_etcshells to have nicer output during use Modified Paths: -------------- csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.i.cswetcshells Modified: csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.i.cswetcshells =================================================================== --- csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.i.cswetcshells 2011-07-11 15:56:00 UTC (rev 15044) +++ csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.i.cswetcshells 2011-07-12 00:08:47 UTC (rev 15045) @@ -8,19 +8,16 @@ echo "Installing class ..." -PIR=${PKG_INSTALL_ROOT:-/} +shellfile=/etc/shells -shellfile=$PIR/etc/shells - while read src dest; do - echo $dest /usr/bin/cp $src $dest || exit 2 shell=$dest - if [ ! -f "$shellfile" ]; then + if [ ! -f "${PKG_INSTALL_ROOT}$shellfile" ]; then echo "Creating /etc/shells with default set of shells (see: man shells)" - cat <$shellfile + cat <${PKG_INSTALL_ROOT}$shellfile /bin/bash /bin/csh /bin/jsh @@ -46,11 +43,11 @@ EOF fi - exists=`awk "\\\$1 == \"$shell\" { print \"found\" }" $shellfile` + exists=`awk "\\\$1 == \"$shell\" { print \"found\" }" ${PKG_INSTALL_ROOT}$shellfile` if [ "$exists" != "found" ]; then echo "Registering $shell in $shellfile." - echo "$shell # $PKGINST" >> $shellfile + echo "$shell # $PKGINST" >> ${PKG_INSTALL_ROOT}$shellfile else echo "Not registering $shell in $shellfile. It is already registered." fi 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 Jul 12 11:27:58 2011 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 12 Jul 2011 09:27:58 +0000 Subject: [csw-devel] SF.net SVN: gar:[15046] csw/mgar/pkg/libevent2/trunk Message-ID: Revision: 15046 http://gar.svn.sourceforge.net/gar/?rev=15046&view=rev Author: dmichelsen Date: 2011-07-12 09:27:58 +0000 (Tue, 12 Jul 2011) Log Message: ----------- libevent2: Update according to bug report Modified Paths: -------------- csw/mgar/pkg/libevent2/trunk/Makefile Removed Paths: ------------- csw/mgar/pkg/libevent2/trunk/files/0001-Fix-wrong-check-of-sockaddr.patch Modified: csw/mgar/pkg/libevent2/trunk/Makefile =================================================================== --- csw/mgar/pkg/libevent2/trunk/Makefile 2011-07-12 00:08:47 UTC (rev 15045) +++ csw/mgar/pkg/libevent2/trunk/Makefile 2011-07-12 09:27:58 UTC (rev 15046) @@ -14,10 +14,6 @@ DISTNAME = $(NAME)-$(VERSION)-stable DISTFILES += $(DISTNAME).tar.gz -# Use this patch until bug is fixed: -# http://sourceforge.net/tracker/?func=detail&aid=3361614&group_id=50884&atid=461322 -PATCHFILES += 0001-Fix-wrong-check-of-sockaddr.patch - VENDOR_URL = http://www.monkey.org/~provos/libevent/ LICENSE = LICENSE @@ -39,6 +35,11 @@ LD_OPTIONS = EXTRA_LINKER_FLAGS = $(RUNPATH_LINKER_FLAGS) +# Pass incudes via CFLAGS until this is fixed: +# http://sourceforge.net/tracker/?func=detail&aid=3361614&group_id=50884&atid=461322 +CPPFLAGS = +EXTRA_CFLAGS += $(INCLUDE_FLAGS) + BUILD64 = 1 TEST_TARGET = verify Deleted: csw/mgar/pkg/libevent2/trunk/files/0001-Fix-wrong-check-of-sockaddr.patch =================================================================== --- csw/mgar/pkg/libevent2/trunk/files/0001-Fix-wrong-check-of-sockaddr.patch 2011-07-12 00:08:47 UTC (rev 15045) +++ csw/mgar/pkg/libevent2/trunk/files/0001-Fix-wrong-check-of-sockaddr.patch 2011-07-12 09:27:58 UTC (rev 15046) @@ -1,25 +0,0 @@ -From 866fdd0d769e1a6c2187b9bdc94c475e8094b42c Mon Sep 17 00:00:00 2001 -From: Dagobert Michelsen -Date: Sun, 10 Jul 2011 10:40:38 +0200 -Subject: [PATCH] Fix wrong check of sockaddr - ---- - util-internal.h | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -diff --git a/util-internal.h b/util-internal.h -index fe9ff35..eb22946 100644 ---- a/util-internal.h -+++ b/util-internal.h -@@ -207,7 +207,7 @@ long _evutil_weakrand(void); - #define EVUTIL_FAILURE_CHECK(cond) EVUTIL_UNLIKELY(cond) - #endif - --#ifndef _EVENT_HAVE_STRUCT_SOCKADDR_STORAGE -+#if 0 - /* Replacement for sockaddr storage that we can use internally on platforms - * that lack it. It is not space-efficient, but neither is sockaddr_storage. - */ --- -1.7.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 Tue Jul 12 15:23:53 2011 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Tue, 12 Jul 2011 13:23:53 +0000 Subject: [csw-devel] SF.net SVN: opencsw:[381] utilities/site_links.py Message-ID: Revision: 381 http://opencsw.svn.sourceforge.net/opencsw/?rev=381&view=rev Author: wahwah Date: 2011-07-12 13:23:53 +0000 (Tue, 12 Jul 2011) Log Message: ----------- site-links: Better comment for a data structure Modified Paths: -------------- utilities/site_links.py Modified: utilities/site_links.py =================================================================== --- utilities/site_links.py 2011-07-08 21:43:24 UTC (rev 380) +++ utilities/site_links.py 2011-07-12 13:23:53 UTC (rev 381) @@ -27,7 +27,7 @@ logging.basicConfig(level=logging.INFO) SITE_DATA = [ - # [name, main url, [other urls]] + # [name, main url, [other urls], nav_member] ["Main website", "http://www.opencsw.org", ["http://opencsw.org"], True], ["Mantis", "http://www.opencsw.org/bugtrack", ["http://opencsw.org/bugtrack"], True], # ["pkgutil wiki", "http://pkgutil.wikidot.com", None, True], 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 Jul 12 15:24:06 2011 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Tue, 12 Jul 2011 13:24:06 +0000 Subject: [csw-devel] SF.net SVN: opencsw:[382] utilities/site_links.py Message-ID: Revision: 382 http://opencsw.svn.sourceforge.net/opencsw/?rev=382&view=rev Author: wahwah Date: 2011-07-12 13:24:05 +0000 (Tue, 12 Jul 2011) Log Message: ----------- site-links: Add a fetcher function The function can be overridden in derived classes is necessary. Modified Paths: -------------- utilities/site_links.py Modified: utilities/site_links.py =================================================================== --- utilities/site_links.py 2011-07-12 13:23:53 UTC (rev 381) +++ utilities/site_links.py 2011-07-12 13:24:05 UTC (rev 382) @@ -123,9 +123,8 @@ def Executify(self): for site in self.sites: logging.debug("Fetching %s", site) - try: - url_d = urllib2.urlopen(site.url) - content = url_d.read() + content = self._GetUrl(site.url) + if content: try: soup = bs.BeautifulSoup(content) for a_tag in soup('a'): @@ -135,8 +134,6 @@ except bs.HTMLParseError, e: logging.warning("Could not parse %s: %s" % (repr(site.url), e)) - except urllib2.URLError, e: - logging.warning("Couldn't fetch %s: %s.", site, e) dot_code = self.EmitDot() fd = open("out.dot", "w") fd.write(dot_code) @@ -193,6 +190,16 @@ l.append("%s ? %s" % (site_a, site_b)) return l + def _GetUrl(self, url): + content = None + try: + url_d = urllib2.urlopen(url) + content = url_d.read() + except urllib2.URLError, e: + logging.warning("Couldn't fetch %s: %s.", url, e) + return content + + def main(): cswlinks = OpenCswLinks(SITE_DATA) cswlinks.Executify() 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 Jul 12 15:24:17 2011 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Tue, 12 Jul 2011 13:24:17 +0000 Subject: [csw-devel] SF.net SVN: opencsw:[383] utilities/site_links.py Message-ID: Revision: 383 http://opencsw.svn.sourceforge.net/opencsw/?rev=383&view=rev Author: wahwah Date: 2011-07-12 13:24:17 +0000 (Tue, 12 Jul 2011) Log Message: ----------- site-links: Not always print missing links The property can be set to False. Modified Paths: -------------- utilities/site_links.py Modified: utilities/site_links.py =================================================================== --- utilities/site_links.py 2011-07-12 13:24:05 UTC (rev 382) +++ utilities/site_links.py 2011-07-12 13:24:17 UTC (rev 383) @@ -89,7 +89,11 @@ self.sites_by_url[url] = site # Indexed by tuples of links. self.links = {} + self.print_missing = False + def SetPrintMissing(self, print_missing): + self.print_missing = print_missing + def AddLink(self, site_from, site_to, text): site_pair = (site_from, site_to) logging.debug("Adding %s to self.links", site_pair) @@ -147,7 +151,8 @@ args, rc) else: print "Please see out.png" - print "\n".join(self.MissingLinks()) + if self.print_missing: + print "\n".join(self.MissingLinks()) def EmitDot(self): s = [] 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 Jul 12 15:24:28 2011 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Tue, 12 Jul 2011 13:24:28 +0000 Subject: [csw-devel] SF.net SVN: opencsw:[384] utilities/site_links.py Message-ID: Revision: 384 http://opencsw.svn.sourceforge.net/opencsw/?rev=384&view=rev Author: wahwah Date: 2011-07-12 13:24:28 +0000 (Tue, 12 Jul 2011) Log Message: ----------- site-linke: Clean whitespace Don't try to print newlines in labels. Modified Paths: -------------- utilities/site_links.py Modified: utilities/site_links.py =================================================================== --- utilities/site_links.py 2011-07-12 13:24:17 UTC (rev 383) +++ utilities/site_links.py 2011-07-12 13:24:28 UTC (rev 384) @@ -47,6 +47,12 @@ s = s.lower() return "_".join(re.findall(r'\w+', s)) + +def CleanWhiteSpace(s): + s = re.sub(r'\n', ' ', str(s)) + s = " ".join(re.split(r'\s+', s)) + return s + def shorten(s, l): """It's pref + ... + post.""" ndots = 3 @@ -174,7 +180,7 @@ s.append(" %s -> %s [label=\"%s\"];" % ( identificatorify(site_from.name), identificatorify(site_to.name), - shorten(link_data['text'], 30))) + CleanWhiteSpace(shorten(link_data['text'], 30)))) s.append("}") return "\n".join(s) 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 Jul 12 15:24:39 2011 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Tue, 12 Jul 2011 13:24:39 +0000 Subject: [csw-devel] SF.net SVN: opencsw:[385] utilities/site_links.py Message-ID: Revision: 385 http://opencsw.svn.sourceforge.net/opencsw/?rev=385&view=rev Author: wahwah Date: 2011-07-12 13:24:39 +0000 (Tue, 12 Jul 2011) Log Message: ----------- site-links: graphviz - double slashes for comments Modified Paths: -------------- utilities/site_links.py Modified: utilities/site_links.py =================================================================== --- utilities/site_links.py 2011-07-12 13:24:28 UTC (rev 384) +++ utilities/site_links.py 2011-07-12 13:24:39 UTC (rev 385) @@ -163,7 +163,7 @@ def EmitDot(self): s = [] s.append("digraph foo123 {") - s.append("# Sites") + s.append("// Sites") for site in self.sites: if site.nav_member: style = "filled" @@ -174,7 +174,7 @@ site.name.strip(), site.url, style)) - s.append("# Links") + s.append("// Links") for site_pair, link_data in self.links.iteritems(): site_from, site_to = site_pair s.append(" %s -> %s [label=\"%s\"];" % ( 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 Jul 12 15:24:50 2011 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Tue, 12 Jul 2011 13:24:50 +0000 Subject: [csw-devel] SF.net SVN: opencsw:[386] utilities/site_links.py Message-ID: Revision: 386 http://opencsw.svn.sourceforge.net/opencsw/?rev=386&view=rev Author: wahwah Date: 2011-07-12 13:24:50 +0000 (Tue, 12 Jul 2011) Log Message: ----------- site-links: Use circo to get a better layout Especially for larger graphs. Modified Paths: -------------- utilities/site_links.py Modified: utilities/site_links.py =================================================================== --- utilities/site_links.py 2011-07-12 13:24:39 UTC (rev 385) +++ utilities/site_links.py 2011-07-12 13:24:50 UTC (rev 386) @@ -150,7 +150,7 @@ fd.close() print dot_code logging.debug("Calling dot") - args = ['dot', '-Tpng', '-o', 'opencsw-links.png', 'out.dot'] + args = ['circo', '-Tpng', '-o', 'opencsw-links.png', 'out.dot'] rc = subprocess.call(args) if rc: logging.fatal("Calling %s has failed with code %s", 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 Jul 12 15:25:01 2011 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Tue, 12 Jul 2011 13:25:01 +0000 Subject: [csw-devel] SF.net SVN: opencsw:[387] utilities/mirror_check.py Message-ID: Revision: 387 http://opencsw.svn.sourceforge.net/opencsw/?rev=387&view=rev Author: wahwah Date: 2011-07-12 13:25:01 +0000 (Tue, 12 Jul 2011) Log Message: ----------- mirror_check: Use /usr/bin/env for compatibility Modified Paths: -------------- utilities/mirror_check.py Modified: utilities/mirror_check.py =================================================================== --- utilities/mirror_check.py 2011-07-12 13:24:50 UTC (rev 386) +++ utilities/mirror_check.py 2011-07-12 13:25:01 UTC (rev 387) @@ -1,4 +1,4 @@ -#!/opt/csw/bin/python2.6 +#!/usr/bin/env python2.6 # coding=utf-8 # vim:set sw=4 ts=4 sts=4 expandtab: # This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Tue Jul 12 15:25:13 2011 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Tue, 12 Jul 2011 13:25:13 +0000 Subject: [csw-devel] SF.net SVN: opencsw:[388] utilities/mirror_check.py Message-ID: Revision: 388 http://opencsw.svn.sourceforge.net/opencsw/?rev=388&view=rev Author: wahwah Date: 2011-07-12 13:25:13 +0000 (Tue, 12 Jul 2011) Log Message: ----------- mirror_check: Allow to specify the mirror index Modified Paths: -------------- utilities/mirror_check.py Modified: utilities/mirror_check.py =================================================================== --- utilities/mirror_check.py 2011-07-12 13:25:01 UTC (rev 387) +++ utilities/mirror_check.py 2011-07-12 13:25:13 UTC (rev 388) @@ -21,13 +21,14 @@ # along with this program. If not, see . import logging +import optparse import re import threading import urllib2 logging.basicConfig(level=logging.INFO) -MIRRORS_URL = "http://www.opencsw.org/mirrors" +DEFAULT_MIRRORS_URL = "http://www.opencsw.org/mirrors" URL_RE_STR = r"^(?P(ht|f)tp://\w+(\.\w+)*.*)$" URL_OPENCSW, URL_BLASTWAVE, URL_UNKNOWN, URL_NOTFOUND = ( "OpenCSW", "Blastwave", "Unknown", "Not found") @@ -47,9 +48,11 @@ url_re = re.compile(URL_RE_STR) - def __init__(self): + def __init__(self, mirror_url): + self.mirror_url = mirror_url self.urls_by_identification = {} self.identifications_by_url = {} + logging.info("mirror_url=%s", self.mirror_url) def RemoveHtmlComments(self, html): """Removes HTML comments from the HTML code. @@ -65,14 +68,14 @@ yield word def GetUrls(self): - url_d = urllib2.urlopen(MIRRORS_URL) + url_d = urllib2.urlopen(self.mirror_url) mirrors_html = url_d.read() return self.ExtractUrls(mirrors_html) def IdentifyUrls(self, urls): class UrlIdentifier(threading.Thread): - + def __init__(self, url, callback): super(UrlIdentifier, self).__init__() self.url = url @@ -138,7 +141,12 @@ def main(): - cmc = OpencswMirrorChecker() + parser = optparse.OptionParser() + parser.add_option("-m", "--mirror", dest="mirror", + help="Mirror URL, by default %s" % DEFAULT_MIRRORS_URL, + default=DEFAULT_MIRRORS_URL) + options, args = parser.parse_args() + cmc = OpencswMirrorChecker(options.mirror) cmc.Run() 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 Jul 12 15:25:25 2011 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Tue, 12 Jul 2011 13:25:25 +0000 Subject: [csw-devel] SF.net SVN: opencsw:[389] utilities/mirror_check.py Message-ID: Revision: 389 http://opencsw.svn.sourceforge.net/opencsw/?rev=389&view=rev Author: wahwah Date: 2011-07-12 13:25:25 +0000 (Tue, 12 Jul 2011) Log Message: ----------- mirror_check: Better skipping of non-mirror URLs Modified Paths: -------------- utilities/mirror_check.py Modified: utilities/mirror_check.py =================================================================== --- utilities/mirror_check.py 2011-07-12 13:25:13 UTC (rev 388) +++ utilities/mirror_check.py 2011-07-12 13:25:25 UTC (rev 389) @@ -104,13 +104,18 @@ except urllib2.URLError: result = URL_NOTFOUND finally: - logging.debug("Calling back to report '%s' with '%s'" % (result, self.url)) + logging.debug("Calling back to report '%s' with '%s'" + % (result, self.url)) self.callback(self.url, result) url_fetchers = [] logging.info("Spawning fetchers.") for url in urls: - if url in NOCHECK_URLS: + skip = False + for nocheck_url in NOCHECK_URLS: + if url.startswith(nocheck_url): + skip = 1 + if skip: continue t = UrlIdentifier(url, self.CollectData) t.start() 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 Jul 12 15:25:37 2011 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Tue, 12 Jul 2011 13:25:37 +0000 Subject: [csw-devel] SF.net SVN: opencsw:[390] utilities/mirror_check.py Message-ID: Revision: 390 http://opencsw.svn.sourceforge.net/opencsw/?rev=390&view=rev Author: wahwah Date: 2011-07-12 13:25:36 +0000 (Tue, 12 Jul 2011) Log Message: ----------- mirror_check: Additional nocheck_urls Modified Paths: -------------- utilities/mirror_check.py Modified: utilities/mirror_check.py =================================================================== --- utilities/mirror_check.py 2011-07-12 13:25:25 UTC (rev 389) +++ utilities/mirror_check.py 2011-07-12 13:25:36 UTC (rev 390) @@ -34,13 +34,17 @@ "OpenCSW", "Blastwave", "Unknown", "Not found") NOCHECK_URLS = set([ - "http://www.w3.org/TR/html4/loose.dtd", + "http://www.w3.org", "http://css.maxdesign.com.au/listamatic/index.htm", "http://www.canoedissent.org.uk/mirror/status/", "http://pkgutil.wikidot.com/", "http://www.bolthole.com/solaris/pkg-get.html", "http://ftp.math.purdue.edu/mirrors/opencsw.org/wget.i386", "http://pkgutil.wikidot.com", + "http://www.opencsw.org", + "http://wiki.opencsw.org", + "http://validator.w3.org", + "http://mirror.opencsw.org", ]) 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 Jul 12 15:25:48 2011 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Tue, 12 Jul 2011 13:25:48 +0000 Subject: [csw-devel] SF.net SVN: opencsw:[391] utilities/mirror_check.py Message-ID: Revision: 391 http://opencsw.svn.sourceforge.net/opencsw/?rev=391&view=rev Author: wahwah Date: 2011-07-12 13:25:48 +0000 (Tue, 12 Jul 2011) Log Message: ----------- mirror_check: Better docstring for RemoveHtmlComments Modified Paths: -------------- utilities/mirror_check.py Modified: utilities/mirror_check.py =================================================================== --- utilities/mirror_check.py 2011-07-12 13:25:36 UTC (rev 390) +++ utilities/mirror_check.py 2011-07-12 13:25:48 UTC (rev 391) @@ -61,7 +61,8 @@ def RemoveHtmlComments(self, html): """Removes HTML comments from the HTML code. - It uses a lame regex and should be rewritten using a HTML parser. + Necessary to skip commented out URLs. It uses a lame regex and should + be rewritten using a HTML parser. """ return re.sub(r'', '', html) 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 Jul 12 16:07:37 2011 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 12 Jul 2011 14:07:37 +0000 Subject: [csw-devel] SF.net SVN: gar:[15047] csw/mgar/pkg Message-ID: Revision: 15047 http://gar.svn.sourceforge.net/gar/?rev=15047&view=rev Author: dmichelsen Date: 2011-07-12 14:07:37 +0000 (Tue, 12 Jul 2011) Log Message: ----------- libexplain: Initial commit, does not compile yet Added Paths: ----------- csw/mgar/pkg/libexplain/ csw/mgar/pkg/libexplain/Makefile csw/mgar/pkg/libexplain/branches/ csw/mgar/pkg/libexplain/tags/ csw/mgar/pkg/libexplain/trunk/ csw/mgar/pkg/libexplain/trunk/Makefile csw/mgar/pkg/libexplain/trunk/checksums csw/mgar/pkg/libexplain/trunk/files/ csw/mgar/pkg/libexplain/trunk/files/0001-Shield-ptrace-defines.patch csw/mgar/pkg/libexplain/trunk/files/0002-Include-stdarg.h-for-va_list.patch csw/mgar/pkg/libexplain/trunk/files/0003-Do-not-return-anything-in-void-functions.patch csw/mgar/pkg/libexplain/trunk/files/0004-Use-fallback-for-AI_NUMERICSERV.patch csw/mgar/pkg/libexplain/trunk/files/0005-Solaris-does-not-have-O_NOFOLLOW.patch csw/mgar/pkg/libexplain/trunk/files/0006-Fix-typo-of-stat-struct-member.patch csw/mgar/pkg/libexplain/trunk/files/0007-Need-headers-for-major-minor.patch csw/mgar/pkg/libexplain/trunk/files/0008-inttypes.h-is-needed-for-int-_t.patch csw/mgar/pkg/libexplain/trunk/files/0009-Use-necessary-mnttab.h.patch csw/mgar/pkg/libexplain/trunk/files/0010-Include-sys-types.h-for-size_t.patch Copied: csw/mgar/pkg/libexplain/Makefile (from rev 15035, csw/mgar/pkg/template/Makefile) =================================================================== --- csw/mgar/pkg/libexplain/Makefile (rev 0) +++ csw/mgar/pkg/libexplain/Makefile 2011-07-12 14:07:37 UTC (rev 15047) @@ -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/libexplain/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/libexplain/trunk/Makefile =================================================================== --- csw/mgar/pkg/libexplain/trunk/Makefile (rev 0) +++ csw/mgar/pkg/libexplain/trunk/Makefile 2011-07-12 14:07:37 UTC (rev 15047) @@ -0,0 +1,30 @@ +# $Id$ +# TODO (release-critical prefixed with !, non release-critical with *) +# +NAME = libexplain +VERSION = 0.44.D001 +GARTYPE = v2 +CATEGORIES = lib + +DESCRIPTION = Explains unix system call errors +define BLURB +endef + +PATCHFILES += 0001-Shield-ptrace-defines.patch +PATCHFILES += 0002-Include-stdarg.h-for-va_list.patch +PATCHFILES += 0003-Do-not-return-anything-in-void-functions.patch +PATCHFILES += 0004-Use-fallback-for-AI_NUMERICSERV.patch +PATCHFILES += 0005-Solaris-does-not-have-O_NOFOLLOW.patch +PATCHFILES += 0006-Fix-typo-of-stat-struct-member.patch +PATCHFILES += 0007-Need-headers-for-major-minor.patch +PATCHFILES += 0008-inttypes.h-is-needed-for-int-_t.patch +PATCHFILES += 0009-Use-necessary-mnttab.h.patch +PATCHFILES += 0010-Include-sys-types.h-for-size_t.patch + +MASTER_SITES = $(SF_MIRROR) +DISTFILES = $(DISTNAME).tar.gz + +BUILD64 = 1 + +include gar/category.mk + Property changes on: csw/mgar/pkg/libexplain/trunk/Makefile ___________________________________________________________________ Added: svn:keywords + Id Added: csw/mgar/pkg/libexplain/trunk/checksums =================================================================== --- csw/mgar/pkg/libexplain/trunk/checksums (rev 0) +++ csw/mgar/pkg/libexplain/trunk/checksums 2011-07-12 14:07:37 UTC (rev 15047) @@ -0,0 +1 @@ +c85827069698600c0052397c9d6165eb libexplain-0.44.D001.tar.gz Added: csw/mgar/pkg/libexplain/trunk/files/0001-Shield-ptrace-defines.patch =================================================================== --- csw/mgar/pkg/libexplain/trunk/files/0001-Shield-ptrace-defines.patch (rev 0) +++ csw/mgar/pkg/libexplain/trunk/files/0001-Shield-ptrace-defines.patch 2011-07-12 14:07:37 UTC (rev 15047) @@ -0,0 +1,92 @@ +From 81663042c3a5a11c500891f6cc733aca2737e0e0 Mon Sep 17 00:00:00 2001 +From: Dagobert Michelsen +Date: Tue, 12 Jul 2011 15:36:50 +0200 +Subject: [PATCH 01/10] Shield ptrace defines + +--- + libexplain/buffer/errno/ptrace.c | 14 ++++++++++++-- + libexplain/ptrace.h | 2 ++ + 2 files changed, 14 insertions(+), 2 deletions(-) + +diff --git a/libexplain/buffer/errno/ptrace.c b/libexplain/buffer/errno/ptrace.c +index daaed40..574e168 100644 +--- a/libexplain/buffer/errno/ptrace.c ++++ b/libexplain/buffer/errno/ptrace.c +@@ -454,18 +454,27 @@ explain_buffer_errno_ptrace_explanation(explain_string_buffer_t *sb, int errnum, + explain_buffer_efault(sb, "data"); + break; + } ++#if defined(PT_CONTINUE) || defined(PT_SYSCALL) || defined(PR_STEP) || defined(PT_SYSEMU) || defined(PT_SYSEMU_SINGLESTEP) || defined(PT_SYSEMU_SINGLESTEP) + switch (request) + { ++#ifdef PT_CONTINUE + case PT_CONTINUE: ++#endif ++#ifdef PT_SYSCALL + case PT_SYSCALL: ++#endif ++#ifdef PT_STEP + case PT_STEP: ++#endif + #ifdef PT_SYSEMU + case PT_SYSEMU: + #endif + #ifdef PT_SYSEMU_SINGLESTEP + case PT_SYSEMU_SINGLESTEP: + #endif ++#ifdef PT_SYSEMU_SINGLESTEP + case PT_DETACH: ++#endif + explain_buffer_gettext + ( + sb, +@@ -482,6 +491,7 @@ explain_buffer_errno_ptrace_explanation(explain_string_buffer_t *sb, int errnum, + default: + break; + } ++#endif + explain_buffer_gettext + ( + sb, +@@ -493,7 +503,6 @@ explain_buffer_errno_ptrace_explanation(explain_string_buffer_t *sb, int errnum, + i18n("there was a word-alignment violation") + ); + break; +- + case EPERM: + if (!explain_process_exists(pid)) + { +@@ -546,7 +555,7 @@ explain_buffer_errno_ptrace_explanation(explain_string_buffer_t *sb, int errnum, + } + } + +- ++#ifdef HAVE_SYS_PTRACE_H + void + explain_buffer_errno_ptrace(explain_string_buffer_t *sb, int errnum, int + request, pid_t pid, void *addr, void *data) +@@ -560,6 +569,7 @@ explain_buffer_errno_ptrace(explain_string_buffer_t *sb, int errnum, int + "ptrace", request, pid, addr, data); + explain_explanation_assemble(&exp, sb); + } ++#endif + + + /* vim: set ts=8 sw=4 et */ +diff --git a/libexplain/ptrace.h b/libexplain/ptrace.h +index cd17e40..88b1dc9 100644 +--- a/libexplain/ptrace.h ++++ b/libexplain/ptrace.h +@@ -30,7 +30,9 @@ + #include + #include + ++#ifdef HAVE_SYS_PTRACE_H + #include ++#endif + + #ifdef __cplusplus + extern "C" { +-- +1.7.6 + Added: csw/mgar/pkg/libexplain/trunk/files/0002-Include-stdarg.h-for-va_list.patch =================================================================== --- csw/mgar/pkg/libexplain/trunk/files/0002-Include-stdarg.h-for-va_list.patch (rev 0) +++ csw/mgar/pkg/libexplain/trunk/files/0002-Include-stdarg.h-for-va_list.patch 2011-07-12 14:07:37 UTC (rev 15047) @@ -0,0 +1,37 @@ +From adf28f82a857d088282db1f86bf5efd6e3827ef6 Mon Sep 17 00:00:00 2001 +From: Dagobert Michelsen +Date: Tue, 12 Jul 2011 15:37:41 +0200 +Subject: [PATCH 02/10] Include stdarg.h for va_list + +--- + libexplain/vfprintf.h | 1 + + libexplain/vprintf.h | 1 + + 2 files changed, 2 insertions(+), 0 deletions(-) + +diff --git a/libexplain/vfprintf.h b/libexplain/vfprintf.h +index d16fc49..9367b8c 100644 +--- a/libexplain/vfprintf.h ++++ b/libexplain/vfprintf.h +@@ -32,6 +32,7 @@ + #include + + #include ++#include + + #ifdef __cplusplus + extern "C" { +diff --git a/libexplain/vprintf.h b/libexplain/vprintf.h +index 493d920..1196b40 100644 +--- a/libexplain/vprintf.h ++++ b/libexplain/vprintf.h +@@ -32,6 +32,7 @@ + #include + + #include ++#include + + #ifdef __cplusplus + extern "C" { +-- +1.7.6 + Added: csw/mgar/pkg/libexplain/trunk/files/0003-Do-not-return-anything-in-void-functions.patch =================================================================== --- csw/mgar/pkg/libexplain/trunk/files/0003-Do-not-return-anything-in-void-functions.patch (rev 0) +++ csw/mgar/pkg/libexplain/trunk/files/0003-Do-not-return-anything-in-void-functions.patch 2011-07-12 14:07:37 UTC (rev 15047) @@ -0,0 +1,34 @@ +From 8567de31506529df979aec30f881c949457eb9bf Mon Sep 17 00:00:00 2001 +From: Dagobert Michelsen +Date: Tue, 12 Jul 2011 15:38:36 +0200 +Subject: [PATCH 03/10] Do not return anything in void functions + +--- + libexplain/buffer/eio.c | 4 ++-- + 1 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/libexplain/buffer/eio.c b/libexplain/buffer/eio.c +index 7dba043..4978a1f 100644 +--- a/libexplain/buffer/eio.c ++++ b/libexplain/buffer/eio.c +@@ -207,7 +207,7 @@ explain_buffer_eio_fildes(explain_string_buffer_t *sb, int fildes) + explain_buffer_eio(sb); + return; + } +- return explain_buffer_eio_stat(sb, fildes, &st); ++ explain_buffer_eio_stat(sb, fildes, &st); + } + + +@@ -221,7 +221,7 @@ explain_buffer_eio_path(explain_string_buffer_t *sb, const char *path) + explain_buffer_eio(sb); + return; + } +- return explain_buffer_eio_stat(sb, -1, &st); ++ explain_buffer_eio_stat(sb, -1, &st); + } + + +-- +1.7.6 + Added: csw/mgar/pkg/libexplain/trunk/files/0004-Use-fallback-for-AI_NUMERICSERV.patch =================================================================== --- csw/mgar/pkg/libexplain/trunk/files/0004-Use-fallback-for-AI_NUMERICSERV.patch (rev 0) +++ csw/mgar/pkg/libexplain/trunk/files/0004-Use-fallback-for-AI_NUMERICSERV.patch 2011-07-12 14:07:37 UTC (rev 15047) @@ -0,0 +1,27 @@ +From ac97d893f81343129be31469d9142a6272bb4f8f Mon Sep 17 00:00:00 2001 +From: Dagobert Michelsen +Date: Tue, 12 Jul 2011 15:39:20 +0200 +Subject: [PATCH 04/10] Use fallback for AI_NUMERICSERV + +--- + libexplain/buffer/errno/getaddrinfo.h | 4 ++++ + 1 files changed, 4 insertions(+), 0 deletions(-) + +diff --git a/libexplain/buffer/errno/getaddrinfo.h b/libexplain/buffer/errno/getaddrinfo.h +index 140f3dd..b64c3a8 100644 +--- a/libexplain/buffer/errno/getaddrinfo.h ++++ b/libexplain/buffer/errno/getaddrinfo.h +@@ -21,6 +21,10 @@ + + #include + ++#ifndef AI_NUMERICSERV ++# define AI_NUMERICSERV 0 ++#endif ++ + struct addrinfo; /* forward */ + + /** +-- +1.7.6 + Added: csw/mgar/pkg/libexplain/trunk/files/0005-Solaris-does-not-have-O_NOFOLLOW.patch =================================================================== --- csw/mgar/pkg/libexplain/trunk/files/0005-Solaris-does-not-have-O_NOFOLLOW.patch (rev 0) +++ csw/mgar/pkg/libexplain/trunk/files/0005-Solaris-does-not-have-O_NOFOLLOW.patch 2011-07-12 14:07:37 UTC (rev 15047) @@ -0,0 +1,43 @@ +From 1188c9ce6e410f9086fa85315f6da9e14b91b2a2 Mon Sep 17 00:00:00 2001 +From: Dagobert Michelsen +Date: Tue, 12 Jul 2011 15:40:14 +0200 +Subject: [PATCH 05/10] Solaris does not have O_NOFOLLOW + +--- + libexplain/buffer/errno/open.c | 4 ++++ + 1 files changed, 4 insertions(+), 0 deletions(-) + +diff --git a/libexplain/buffer/errno/open.c b/libexplain/buffer/errno/open.c +index 1b086f4..1ef9c61 100644 +--- a/libexplain/buffer/errno/open.c ++++ b/libexplain/buffer/errno/open.c +@@ -199,8 +199,10 @@ explain_buffer_errno_open_explanation(explain_string_buffer_t *sb, + final_component.must_be_a_st_mode = 1; + final_component.st_mode = S_IFDIR; + } ++#if defined(O_NOFOLLOW) + if (flags & O_NOFOLLOW) + final_component.follow_symlink = 0; ++#endif + + switch (errnum) + { +@@ -347,6 +349,7 @@ explain_buffer_errno_open_explanation(explain_string_buffer_t *sb, + + case ELOOP: + case EMLINK: /* BSD */ ++#if defined(O_NOFOLLOW) + if (flags & O_NOFOLLOW) + { + struct stat st; +@@ -370,6 +373,7 @@ explain_buffer_errno_open_explanation(explain_string_buffer_t *sb, + break; + } + } ++#endif + explain_buffer_eloop(sb, pathname, "pathname", &final_component); + break; + +-- +1.7.6 + Added: csw/mgar/pkg/libexplain/trunk/files/0006-Fix-typo-of-stat-struct-member.patch =================================================================== --- csw/mgar/pkg/libexplain/trunk/files/0006-Fix-typo-of-stat-struct-member.patch (rev 0) +++ csw/mgar/pkg/libexplain/trunk/files/0006-Fix-typo-of-stat-struct-member.patch 2011-07-12 14:07:37 UTC (rev 15047) @@ -0,0 +1,25 @@ +From f0174aefb4aca52215bbea8f27a92c69ad499ca7 Mon Sep 17 00:00:00 2001 +From: Dagobert Michelsen +Date: Tue, 12 Jul 2011 15:41:07 +0200 +Subject: [PATCH 06/10] Fix typo of stat struct member + +--- + libexplain/buffer/file_type.c | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/libexplain/buffer/file_type.c b/libexplain/buffer/file_type.c +index 2400e12..365c082 100644 +--- a/libexplain/buffer/file_type.c ++++ b/libexplain/buffer/file_type.c +@@ -422,7 +422,7 @@ explain_buffer_file_type_st(explain_string_buffer_t *sb, const struct stat *st) + switch (st->st_rdev) + { + default: +- explain_buffer_file_type(sb, st->mode); ++ explain_buffer_file_type(sb, st->st_mode); + break; + + case S_INSEM: +-- +1.7.6 + Added: csw/mgar/pkg/libexplain/trunk/files/0007-Need-headers-for-major-minor.patch =================================================================== --- csw/mgar/pkg/libexplain/trunk/files/0007-Need-headers-for-major-minor.patch (rev 0) +++ csw/mgar/pkg/libexplain/trunk/files/0007-Need-headers-for-major-minor.patch 2011-07-12 14:07:37 UTC (rev 15047) @@ -0,0 +1,27 @@ +From a5bbac4a10d8f2a2958e1f4baf0c43e318f28bce Mon Sep 17 00:00:00 2001 +From: Dagobert Michelsen +Date: Tue, 12 Jul 2011 15:42:35 +0200 +Subject: [PATCH 07/10] Need headers for major()/minor() + +--- + libexplain/buffer/file_type.h | 4 ++++ + 1 files changed, 4 insertions(+), 0 deletions(-) + +diff --git a/libexplain/buffer/file_type.h b/libexplain/buffer/file_type.h +index 1e5569c..9bead66 100644 +--- a/libexplain/buffer/file_type.h ++++ b/libexplain/buffer/file_type.h +@@ -20,6 +20,10 @@ + #ifndef LIBEXPLAIN_BUFFER_FILE_TYPE_H + #define LIBEXPLAIN_BUFFER_FILE_TYPE_H + ++/* For major()/minor() */ ++#include ++#include ++ + struct explain_string_buffer_t; /* forward */ + + /** +-- +1.7.6 + Added: csw/mgar/pkg/libexplain/trunk/files/0008-inttypes.h-is-needed-for-int-_t.patch =================================================================== --- csw/mgar/pkg/libexplain/trunk/files/0008-inttypes.h-is-needed-for-int-_t.patch (rev 0) +++ csw/mgar/pkg/libexplain/trunk/files/0008-inttypes.h-is-needed-for-int-_t.patch 2011-07-12 14:07:37 UTC (rev 15047) @@ -0,0 +1,65 @@ +From 01afd1d431d9e8e63e0e7523cc2bba554db45bb6 Mon Sep 17 00:00:00 2001 +From: Dagobert Michelsen +Date: Tue, 12 Jul 2011 15:43:34 +0200 +Subject: [PATCH 08/10] inttypes.h is needed for int*_t + +--- + libexplain/buffer/int16_t.h | 2 ++ + libexplain/buffer/int32_t.h | 2 ++ + libexplain/buffer/int64_t.h | 7 +++++++ + 3 files changed, 11 insertions(+), 0 deletions(-) + +diff --git a/libexplain/buffer/int16_t.h b/libexplain/buffer/int16_t.h +index 4a69a58..de07d9c 100644 +--- a/libexplain/buffer/int16_t.h ++++ b/libexplain/buffer/int16_t.h +@@ -21,6 +21,8 @@ + + #include + ++#include ++ + #include + + /** +diff --git a/libexplain/buffer/int32_t.h b/libexplain/buffer/int32_t.h +index 0bd6c9b..338c55d 100644 +--- a/libexplain/buffer/int32_t.h ++++ b/libexplain/buffer/int32_t.h +@@ -21,6 +21,8 @@ + + #include + ++#include ++ + #include + + /** +diff --git a/libexplain/buffer/int64_t.h b/libexplain/buffer/int64_t.h +index 6d56b3b..c6195e8 100644 +--- a/libexplain/buffer/int64_t.h ++++ b/libexplain/buffer/int64_t.h +@@ -21,8 +21,13 @@ + + #include + ++#include ++ + #include + ++/* Not detected during configure yet */ ++#ifdef HAVE_INT64_ ++ + /** + * The explain_buffer_int64_t function may be used + * to print a representation of a int64_t value. +@@ -73,4 +78,6 @@ void explain_buffer_uint64_t(explain_string_buffer_t *sb, uint64_t data); + void explain_buffer_uint64_array(explain_string_buffer_t *sb, + const uint64_t *data, size_t data_size); + ++#endif ++ + #endif /* LIBEXPLAIN_BUFFER_INT64_T_H */ +-- +1.7.6 + Added: csw/mgar/pkg/libexplain/trunk/files/0009-Use-necessary-mnttab.h.patch =================================================================== --- csw/mgar/pkg/libexplain/trunk/files/0009-Use-necessary-mnttab.h.patch (rev 0) +++ csw/mgar/pkg/libexplain/trunk/files/0009-Use-necessary-mnttab.h.patch 2011-07-12 14:07:37 UTC (rev 15047) @@ -0,0 +1,26 @@ +From 7d1479dcaa9835c0b8d111d7e89fc40077f48f9e Mon Sep 17 00:00:00 2001 +From: Dagobert Michelsen +Date: Tue, 12 Jul 2011 15:44:45 +0200 +Subject: [PATCH 09/10] Use necessary mnttab.h + +--- + libexplain/buffer/mount_point.h | 3 +++ + 1 files changed, 3 insertions(+), 0 deletions(-) + +diff --git a/libexplain/buffer/mount_point.h b/libexplain/buffer/mount_point.h +index b504dc6..5b487bb 100644 +--- a/libexplain/buffer/mount_point.h ++++ b/libexplain/buffer/mount_point.h +@@ -22,6 +22,9 @@ + + #include + ++#include ++#include ++ + #include + + /** +-- +1.7.6 + Added: csw/mgar/pkg/libexplain/trunk/files/0010-Include-sys-types.h-for-size_t.patch =================================================================== --- csw/mgar/pkg/libexplain/trunk/files/0010-Include-sys-types.h-for-size_t.patch (rev 0) +++ csw/mgar/pkg/libexplain/trunk/files/0010-Include-sys-types.h-for-size_t.patch 2011-07-12 14:07:37 UTC (rev 15047) @@ -0,0 +1,26 @@ +From d4a2703dab5788370bf7cd2c5fc27423e4df5002 Mon Sep 17 00:00:00 2001 +From: Dagobert Michelsen +Date: Tue, 12 Jul 2011 15:45:24 +0200 +Subject: [PATCH 10/10] Include sys/types.h for size_t + +--- + libexplain/buffer/v4l2_sliced_vbi_service_set.h | 3 +++ + 1 files changed, 3 insertions(+), 0 deletions(-) + +diff --git a/libexplain/buffer/v4l2_sliced_vbi_service_set.h b/libexplain/buffer/v4l2_sliced_vbi_service_set.h +index 4257726..84c0cb3 100644 +--- a/libexplain/buffer/v4l2_sliced_vbi_service_set.h ++++ b/libexplain/buffer/v4l2_sliced_vbi_service_set.h +@@ -23,6 +23,9 @@ + + #include + ++/* For size_t */ ++#include ++ + /** + * The explain_buffer_v4l2_sliced_vbi_service_set function may be used + * to print a representation of a v4l2_sliced_vbi service_set value. +-- +1.7.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 Jul 12 18:09:45 2011 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 12 Jul 2011 16:09:45 +0000 Subject: [csw-devel] SF.net SVN: gar:[15048] csw/mgar/pkg/lsof/trunk Message-ID: Revision: 15048 http://gar.svn.sourceforge.net/gar/?rev=15048&view=rev Author: dmichelsen Date: 2011-07-12 16:09:44 +0000 (Tue, 12 Jul 2011) Log Message: ----------- lsof: Update to 4.84 and isaexec Modified Paths: -------------- csw/mgar/pkg/lsof/trunk/Makefile csw/mgar/pkg/lsof/trunk/checksums Added Paths: ----------- csw/mgar/pkg/lsof/trunk/files/0001-Use-lgrp.h.patch Modified: csw/mgar/pkg/lsof/trunk/Makefile =================================================================== --- csw/mgar/pkg/lsof/trunk/Makefile 2011-07-12 14:07:37 UTC (rev 15047) +++ csw/mgar/pkg/lsof/trunk/Makefile 2011-07-12 16:09:44 UTC (rev 15048) @@ -1,5 +1,8 @@ +# TBD: +# - Probably VxFS bindings + NAME = lsof -VERSION = 4.83 +VERSION = 4.84 CATEGORIES = utils DESCRIPTION = List open files @@ -11,25 +14,33 @@ endef MASTER_SITES = ftp://lsof.itap.purdue.edu/pub/tools/unix/lsof/ -TOPDIST = $(NAME)_$(VERSION) -SRCDIST = $(TOPDIST)_src -DISTFILES = $(TOPDIST).tar.bz2 +DISTNAME = $(NAME)_$(VERSION) +DISTFILES = $(DISTNAME).tar.bz2 DISTFILES += lsof-license -WORKSRC = $(WORKDIR)/$(TOPDIST)/$(SRCDIST) -SPKG_SOURCEURL = http://people.freebsd.org/~abe/ +# This seems to be necessary as the above comment says +PATCHFILES += 0001-Use-lgrp.h.patch -# We define upstream file regex so we can be notifed of new upstream software release -UFILES_REGEX = $(NAME)_(\d+(?:\.\d+)*).tar.bz2 +SRCDIST = $(DISTNAME)_src +WORKSRC = $(WORKDIR)/$(DISTNAME)/$(SRCDIST) +PACKAGING_PLATFORMS = solaris9-sparc solaris9-i386 +PACKAGING_PLATFORMS += solaris10-sparc solaris10-i386 + +VENDOR_URL = http://people.freebsd.org/~abe/ LICENSE = lsof-license BUILD64 = 1 +ISAEXEC = 1 CONFIGURE_SCRIPTS = custom CONFIGURE_ARGS = -n solariscc TEST_SCRIPTS = custom + +# Tests require root +SKIPTEST ?= 1 + INSTALL_SCRIPTS = custom # Environment variables affecting Solaris builds: @@ -50,33 +61,39 @@ SOLARIS_INSTR = $(ISA) SOLARIS_KERNBITS = $(MEMORYMODEL) -PACKAGING_PLATFORMS = solaris8-sparc solaris8-i386 solaris9-sparc solaris9-i386 solaris10-sparc solaris10-i386 +BUILD_OVERRIDE_VARS = CDEF +BUILD_OVERRIDE_VAR_CDEF = $(CFLAGS) +PROTOTYPE_MODIFIERS = lsof +PROTOTYPE_FILES_lsof = $(bindir)/lsof +PROTOTYPE_GROUP_lsof = sys +PROTOTYPE_PERMS_lsof = 2755 + include gar/category.mk INSTALLISADIR ?= $(WORKROOTDIR)/install-$(MODULATION) post-extract-modulated: @echo " ==> Extracting source distribution" - $(if $(filter-out global,$(MODULATION)),( cd $(WORKDIR)/$(TOPDIST) ; tar xf $(SRCDIST).tar )) - $(MAKECOOKIE) + @$(if $(filter-out global,$(MODULATION)),( cd $(WORKDIR)/$(DISTNAME) ; tar xf $(SRCDIST).tar )) + @$(MAKECOOKIE) configure-custom: @echo " ==> Configuring in $(WORKSRC)" ( cd $(WORKSRC) ; $(CONFIGURE_ENV) ./Configure $(CONFIGURE_ARGS) ) - $(MAKECOOKIE) + @$(MAKECOOKIE) test-custom: @echo " ==> Testing in $(WORKSRC)/tests" - @$(MAKE) -C $(WORKSRC)/tests all opt - $(MAKECOOKIE) + $(MAKE) -C $(WORKSRC)/tests + @$(MAKECOOKIE) install-custom: @echo " ==> Installing $(NAME) $(VERSION) for $(MODULATION)" echo DESTDIR: $(DESTDIR) @( cd $(WORKSRC) ; \ ginstall -d $(DESTDIR)$(bindir) ; \ - ginstall -m 2755 -g sys lsof $(DESTDIR)$(bindir) ; \ + ginstall -m 755 lsof $(DESTDIR)$(bindir) ; \ ginstall -d $(DESTDIR)$(mandir)/man8 ; \ ginstall -m 444 lsof.8 $(DESTDIR)$(mandir)/man8 ) - $(MAKECOOKIE) + @$(MAKECOOKIE) Modified: csw/mgar/pkg/lsof/trunk/checksums =================================================================== --- csw/mgar/pkg/lsof/trunk/checksums 2011-07-12 14:07:37 UTC (rev 15047) +++ csw/mgar/pkg/lsof/trunk/checksums 2011-07-12 16:09:44 UTC (rev 15048) @@ -1,2 +1 @@ -a42fe89c6b596930d79cc119928b6176 lsof-license -8f731a6251b8c0143d585df0d5ca779e lsof_4.83.tar.bz2 +a09326df500ef7e4550af546868338d6 lsof_4.84.tar.bz2 Added: csw/mgar/pkg/lsof/trunk/files/0001-Use-lgrp.h.patch =================================================================== --- csw/mgar/pkg/lsof/trunk/files/0001-Use-lgrp.h.patch (rev 0) +++ csw/mgar/pkg/lsof/trunk/files/0001-Use-lgrp.h.patch 2011-07-12 16:09:44 UTC (rev 15048) @@ -0,0 +1,25 @@ +From 2c3ce069cf55b3fc13d580ee3ec38f7c3130b562 Mon Sep 17 00:00:00 2001 +From: Dagobert Michelsen +Date: Tue, 12 Jul 2011 17:38:27 +0200 +Subject: [PATCH] Use lgrp.h + +--- + lsof_4.84_src/dialects/sun/machine.h | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/lsof_4.84_src/dialects/sun/machine.h b/lsof_4.84_src/dialects/sun/machine.h +index 3a8b96a..8c2186d 100644 +--- a/lsof_4.84_src/dialects/sun/machine.h ++++ b/lsof_4.84_src/dialects/sun/machine.h +@@ -55,7 +55,7 @@ + * #include. + */ + +-/* #include */ ++#include + # endif /* solaris>=90000 */ + + +-- +1.7.6 + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Wed Jul 13 12:13:08 2011 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 13 Jul 2011 10:13:08 +0000 Subject: [csw-devel] SF.net SVN: gar:[15049] csw/mgar/pkg/lsof/trunk Message-ID: Revision: 15049 http://gar.svn.sourceforge.net/gar/?rev=15049&view=rev Author: dmichelsen Date: 2011-07-13 10:13:08 +0000 (Wed, 13 Jul 2011) Log Message: ----------- lsof: Add VxFS support Modified Paths: -------------- csw/mgar/pkg/lsof/trunk/Makefile Added Paths: ----------- csw/mgar/pkg/lsof/trunk/files/0002-Disable-VxFS-autodetect.patch Modified: csw/mgar/pkg/lsof/trunk/Makefile =================================================================== --- csw/mgar/pkg/lsof/trunk/Makefile 2011-07-12 16:09:44 UTC (rev 15048) +++ csw/mgar/pkg/lsof/trunk/Makefile 2011-07-13 10:13:08 UTC (rev 15049) @@ -21,6 +21,9 @@ # This seems to be necessary as the above comment says PATCHFILES += 0001-Use-lgrp.h.patch +# Do not automatically use VxFS +PATCHFILES += 0002-Disable-VxFS-autodetect.patch + SRCDIST = $(DISTNAME)_src WORKSRC = $(WORKDIR)/$(DISTNAME)/$(SRCDIST) @@ -31,18 +34,14 @@ LICENSE = lsof-license BUILD64 = 1 + +EXTRA_BUILD_ISAS = sparcv8plus + ISAEXEC = 1 CONFIGURE_SCRIPTS = custom CONFIGURE_ARGS = -n solariscc -TEST_SCRIPTS = custom - -# Tests require root -SKIPTEST ?= 1 - -INSTALL_SCRIPTS = custom - # Environment variables affecting Solaris builds: # SOLARIS_23P101318 If this environment variable has a non-NULL value, the # SOLARIS_24P101945 If this environment variable has a non-NULL value, the @@ -54,13 +53,29 @@ # SOLARIS_KERNBITS specifies the number of bits in the Solaris 7, 8, 9 or # SOLARIS_VSOCK If this environment variable has a value of "Y" or "y", # SOLARIS_VXFSINCL This environment variable defines the path to the -# SOLARIS_VXFSLIB This environment variable defines the path to the +# SOLARIS_VXFSLIB This environment variable defines the path to the -CONFIGURE_EXPORTS = LSOF_CFGF SOLARIS_CCDIR SOLARIS_INSTR SOLARIS_KERNBITS +CONFIGURE_EXPORTS = LSOF_CFGF SOLARIS_CCDIR SOLARIS_INSTR SOLARIS_KERNBITS SOLARIS_VXFSINCL SOLARIS_VXFSLIB SOLARIS_CCDIR = $(CC_HOME)/bin SOLARIS_INSTR = $(ISA) SOLARIS_KERNBITS = $(MEMORYMODEL) +# The Veritas Filesystem library libvxfsutil.a is sparcv8+, make sure to build that +# specific ISA and not link when building sparcv8 +SOLARIS_VXFSINCL-sparcv8plus = /opt/VRTS/include +SOLARIS_VXFSINCL-sparcv9 = /opt/VRTS/include +SOLARIS_VXFSLIB-sparcv8plus = /opt/VRTS/lib +SOLARIS_VXFSLIB-sparcv9 = /opt/VRTS/lib +SOLARIS_VXFSINCL = $(SOLARIS_VXFSINCL-$(ISA)) +SOLARIS_VXFSLIB = $(SOLARIS_VXFSLIB-$(ISA)) + +TEST_SCRIPTS = custom + +# Tests require root +SKIPTEST ?= 1 + +INSTALL_SCRIPTS = custom + BUILD_OVERRIDE_VARS = CDEF BUILD_OVERRIDE_VAR_CDEF = $(CFLAGS) Added: csw/mgar/pkg/lsof/trunk/files/0002-Disable-VxFS-autodetect.patch =================================================================== --- csw/mgar/pkg/lsof/trunk/files/0002-Disable-VxFS-autodetect.patch (rev 0) +++ csw/mgar/pkg/lsof/trunk/files/0002-Disable-VxFS-autodetect.patch 2011-07-13 10:13:08 UTC (rev 15049) @@ -0,0 +1,31 @@ +From 3becdff778a4fab025b344b733e4767395e54216 Mon Sep 17 00:00:00 2001 +From: Dagobert Michelsen +Date: Wed, 13 Jul 2011 12:05:30 +0200 +Subject: [PATCH] Disable VxFS autodetect + +--- + lsof_4.84_src/Configure | 8 -------- + 1 files changed, 0 insertions(+), 8 deletions(-) + +diff --git a/lsof_4.84_src/Configure b/lsof_4.84_src/Configure +index 6ebc7be..c413f5d 100755 +--- a/lsof_4.84_src/Configure ++++ b/lsof_4.84_src/Configure +@@ -4810,14 +4810,6 @@ return(0); } + # environment, establish their likely locations. + + LSOF_TMP2=$SOLARIS_VXFSINCL +- if test -d /opt/VRTS/include # { +- then +- LSOF_TMP2="$LSOF_TMP2 /opt/VRTS/include" +- fi # } +- if test -d /opt/VRTSvxfs/include # { +- then +- LSOF_TMP2="$LSOF_TMP2 /opt/VRTSvxfs/include" +- fi # } + LSOF_TMP1=0 + for i in $LSOF_TMP2 # { + do +-- +1.7.6 + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Wed Jul 13 13:06:04 2011 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 13 Jul 2011 11:06:04 +0000 Subject: [csw-devel] SF.net SVN: gar:[15050] csw/mgar/pkg/lsof/trunk/Makefile Message-ID: Revision: 15050 http://gar.svn.sourceforge.net/gar/?rev=15050&view=rev Author: dmichelsen Date: 2011-07-13 11:06:04 +0000 (Wed, 13 Jul 2011) Log Message: ----------- lsof: Add VxFS support for i386/amd64 Modified Paths: -------------- csw/mgar/pkg/lsof/trunk/Makefile Modified: csw/mgar/pkg/lsof/trunk/Makefile =================================================================== --- csw/mgar/pkg/lsof/trunk/Makefile 2011-07-13 10:13:08 UTC (rev 15049) +++ csw/mgar/pkg/lsof/trunk/Makefile 2011-07-13 11:06:04 UTC (rev 15050) @@ -33,7 +33,11 @@ VENDOR_URL = http://people.freebsd.org/~abe/ LICENSE = lsof-license -BUILD64 = 1 +# Do not build a unified 32/64 bit package for Solaris 9 i386 +BUILD64-sparc-5.9 = 1 +BUILD64-sparc-5.10 = 1 +BUILD64-i386-5.10 = 1 +BUILD64 = $(BUILD64-$(GARCH)-$(GAROSREL)) EXTRA_BUILD_ISAS = sparcv8plus @@ -64,8 +68,12 @@ # specific ISA and not link when building sparcv8 SOLARIS_VXFSINCL-sparcv8plus = /opt/VRTS/include SOLARIS_VXFSINCL-sparcv9 = /opt/VRTS/include +SOLARIS_VXFSINCL-i386 = /opt/VRTS/include +SOLARIS_VXFSINCL-amd64 = /opt/VRTS/include SOLARIS_VXFSLIB-sparcv8plus = /opt/VRTS/lib SOLARIS_VXFSLIB-sparcv9 = /opt/VRTS/lib +SOLARIS_VXFSLIB-i386 = /opt/VRTS/lib +SOLARIS_VXFSLIB-amd64 = /opt/VRTS/lib SOLARIS_VXFSINCL = $(SOLARIS_VXFSINCL-$(ISA)) SOLARIS_VXFSLIB = $(SOLARIS_VXFSLIB-$(ISA)) 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 Jul 13 14:37:41 2011 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 13 Jul 2011 12:37:41 +0000 Subject: [csw-devel] SF.net SVN: gar:[15051] csw/mgar/pkg Message-ID: Revision: 15051 http://gar.svn.sourceforge.net/gar/?rev=15051&view=rev Author: dmichelsen Date: 2011-07-13 12:37:41 +0000 (Wed, 13 Jul 2011) Log Message: ----------- netcat: Initial commit Added Paths: ----------- csw/mgar/pkg/netcat/ csw/mgar/pkg/netcat/Makefile csw/mgar/pkg/netcat/branches/ csw/mgar/pkg/netcat/tags/ csw/mgar/pkg/netcat/trunk/ csw/mgar/pkg/netcat/trunk/Makefile csw/mgar/pkg/netcat/trunk/checksums csw/mgar/pkg/netcat/trunk/files/ Copied: csw/mgar/pkg/netcat/Makefile (from rev 15048, csw/mgar/pkg/template/Makefile) =================================================================== --- csw/mgar/pkg/netcat/Makefile (rev 0) +++ csw/mgar/pkg/netcat/Makefile 2011-07-13 12:37:41 UTC (rev 15051) @@ -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/netcat/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/netcat/trunk/Makefile =================================================================== --- csw/mgar/pkg/netcat/trunk/Makefile (rev 0) +++ csw/mgar/pkg/netcat/trunk/Makefile 2011-07-13 12:37:41 UTC (rev 15051) @@ -0,0 +1,21 @@ +# $Id$ +# TODO (release-critical prefixed with !, non release-critical with *) +# +NAME = netcat +VERSION = 0.7.1 +GARTYPE = v2 +CATEGORIES = utils + +DESCRIPTION = GNU netcat, a network debugging utility +define BLURB +endef + +MASTER_SITES = $(SF_MIRROR) +DISTFILES = $(DISTNAME).tar.bz2 + +VENDOR_URL = http://netcat.sourceforge.net/ + +RUNTIME_DEP_PKGS_CSWnetcat += CSWlibintl8 + +include gar/category.mk + Property changes on: csw/mgar/pkg/netcat/trunk/Makefile ___________________________________________________________________ Added: svn:keywords + Id Added: csw/mgar/pkg/netcat/trunk/checksums =================================================================== --- csw/mgar/pkg/netcat/trunk/checksums (rev 0) +++ csw/mgar/pkg/netcat/trunk/checksums 2011-07-13 12:37:41 UTC (rev 15051) @@ -0,0 +1 @@ +0a29eff1736ddb5effd0b1ec1f6fe0ef netcat-0.7.1.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 Jul 13 15:23:29 2011 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 13 Jul 2011 13:23:29 +0000 Subject: [csw-devel] SF.net SVN: gar:[15052] csw/mgar/pkg/enscript/trunk Message-ID: Revision: 15052 http://gar.svn.sourceforge.net/gar/?rev=15052&view=rev Author: dmichelsen Date: 2011-07-13 13:23:29 +0000 (Wed, 13 Jul 2011) Log Message: ----------- enscript: Update to 1.6.5.2, fix fontpathes, relocate config file Modified Paths: -------------- csw/mgar/pkg/enscript/trunk/Makefile csw/mgar/pkg/enscript/trunk/checksums Modified: csw/mgar/pkg/enscript/trunk/Makefile =================================================================== --- csw/mgar/pkg/enscript/trunk/Makefile 2011-07-13 12:37:41 UTC (rev 15051) +++ csw/mgar/pkg/enscript/trunk/Makefile 2011-07-13 13:23:29 UTC (rev 15052) @@ -1,5 +1,5 @@ NAME = enscript -VERSION = 1.6.4 +VERSION = 1.6.5.2 CATEGORIES = utils DESCRIPTION = GNU enscript converts ASCII files to PostScript @@ -11,14 +11,24 @@ be used to customize printouts. endef -MASTER_SITES = http://www.iki.fi/mtr/genscript/ -DISTFILES = $(NAME)-$(VERSION).tar.gz +MASTER_SITES = $(GNU_MIRROR) +DISTFILES = $(DISTNAME).tar.gz -# We define upstream file regex so we can be notifed of new upstream software release -UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz +VENDOR_URL = http://www.gnu.org/s/enscript/ -SPKG_SOURCEURL = http://www.codento.com/people/mtr/genscript/ +RUNTIME_DEP_PKGS_CSWenscript += CSWlibintl8 -CONFIGURE_ARGS = $(DIRPATHS) +PRESERVECONF = $(sysconfdir)/enscript.cfg +MIGRATE_FILES = enscript.cfg +# This is the location where the font was taken from +CHECKPKG_OVERRIDES_CSWenscript += file-with-bad-content|/usr/share|root/opt/csw/share/enscript/afm/matrix.pfa + include gar/category.mk + +# Adjust font pathes +post-extract-modulated: + -perl -pi -e 's,/usr/local/lib/ps:/usr/lib/ps,/usr/openwin/lib/X11/fonts/F3/afm:/usr/openwin/lib/X11/fonts/Type1/afm:/usr/openwin/lib/X11/fonts/Type1/sun/afm,' \ + $(WORKSRC)/afmlib/afm.c \ + $(WORKSRC)/lib/enscript.cfg.in + Modified: csw/mgar/pkg/enscript/trunk/checksums =================================================================== --- csw/mgar/pkg/enscript/trunk/checksums 2011-07-13 12:37:41 UTC (rev 15051) +++ csw/mgar/pkg/enscript/trunk/checksums 2011-07-13 13:23:29 UTC (rev 15052) @@ -1 +1 @@ -b5174b59e4a050fb462af5dbf28ebba3 enscript-1.6.4.tar.gz +c1d2a0d4b44ca30634742b299881b0e2 enscript-1.6.5.2.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Wed Jul 13 15:45:44 2011 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 13 Jul 2011 13:45:44 +0000 Subject: [csw-devel] SF.net SVN: gar:[15053] csw/mgar/pkg Message-ID: Revision: 15053 http://gar.svn.sourceforge.net/gar/?rev=15053&view=rev Author: dmichelsen Date: 2011-07-13 13:45:44 +0000 (Wed, 13 Jul 2011) Log Message: ----------- ttcp: Initial commit Added Paths: ----------- csw/mgar/pkg/ttcp/ csw/mgar/pkg/ttcp/Makefile csw/mgar/pkg/ttcp/branches/ csw/mgar/pkg/ttcp/tags/ csw/mgar/pkg/ttcp/trunk/ csw/mgar/pkg/ttcp/trunk/Makefile csw/mgar/pkg/ttcp/trunk/checksums csw/mgar/pkg/ttcp/trunk/files/ csw/mgar/pkg/ttcp/trunk/files/COPYING csw/mgar/pkg/ttcp/trunk/files/ttcp.1 Copied: csw/mgar/pkg/ttcp/Makefile (from rev 15048, csw/mgar/pkg/template/Makefile) =================================================================== --- csw/mgar/pkg/ttcp/Makefile (rev 0) +++ csw/mgar/pkg/ttcp/Makefile 2011-07-13 13:45:44 UTC (rev 15053) @@ -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/ttcp/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/ttcp/trunk/Makefile =================================================================== --- csw/mgar/pkg/ttcp/trunk/Makefile (rev 0) +++ csw/mgar/pkg/ttcp/trunk/Makefile 2011-07-13 13:45:44 UTC (rev 15053) @@ -0,0 +1,39 @@ +# $Id$ +# TODO (release-critical prefixed with !, non release-critical with *) +# +NAME = ttcp +VERSION = 1.0 +GARTYPE = v2 +CATEGORIES = utils + +DESCRIPTION = Test TCP (TTCP) Benchmarking Tool +define BLURB +endef + +MASTER_SITES = http://www.pcausa.com/Utilities/pcattcp/ +DISTNAME = LinuxTTCP +DISTFILES = $(DISTNAME).zip +DISTFILES += COPYING +DISTFILES += ttcp.1 + +VENDOR_URL = http://www.pcausa.com/Utilities/pcattcp.htm + +EXTRA_LINKER_FLAGS = -lsocket -lnsl + +CONFIGURE_SCRIPTS = +BUILD_SCRIPTS = custom +TEST_SCRIPTS = +INSTALL_SCRIPTS = custom + +include gar/category.mk + +build-custom: + cd $(WORKSRC) && $(CC) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) -o ttcp ttcp.c + @$(MAKECOOKIE) + +install-custom: + ginstall -d $(DESTDIR)$(bindir) + ginstall -m 755 $(WORKSRC)/ttcp $(DESTDIR)$(bindir)/ttcp + ginstall -d $(DESTDIR)$(mandir)/man1 + ginstall -m 644 $(WORKDIR)/ttcp.1 $(DESTDIR)$(mandir)/man1 + @$(MAKECOOKIE) Property changes on: csw/mgar/pkg/ttcp/trunk/Makefile ___________________________________________________________________ Added: svn:keywords + Id Added: csw/mgar/pkg/ttcp/trunk/checksums =================================================================== --- csw/mgar/pkg/ttcp/trunk/checksums (rev 0) +++ csw/mgar/pkg/ttcp/trunk/checksums 2011-07-13 13:45:44 UTC (rev 15053) @@ -0,0 +1 @@ +5b4707910c24fec212609f862bc53749 LinuxTTCP.zip Added: csw/mgar/pkg/ttcp/trunk/files/COPYING =================================================================== --- csw/mgar/pkg/ttcp/trunk/files/COPYING (rev 0) +++ csw/mgar/pkg/ttcp/trunk/files/COPYING 2011-07-13 13:45:44 UTC (rev 15053) @@ -0,0 +1,15 @@ +The notice below was taken from comments in the ttcp.c source code. + + * Usable on 4.2, 4.3, and 4.1a systems by defining one of + * BSD42 BSD43 (BSD41a) + * + * Modified for operation under 4.2BSD, 18 Dec 84 + * T.C. Slattery, USNA + * Minor improvements, Mike Muuss and Terry Slattery, 16-Oct-85. + * + * Mike Muuss and Terry Slattery have released this code to the Public Domain. + + +Some copies of ttcp claim the original author is unknown. However, according to +http://ftp.arl.mil/~mike/ttcp.html +Mike Muuss (now deceased) was the original author Added: csw/mgar/pkg/ttcp/trunk/files/ttcp.1 =================================================================== --- csw/mgar/pkg/ttcp/trunk/files/ttcp.1 (rev 0) +++ csw/mgar/pkg/ttcp/trunk/files/ttcp.1 2011-07-13 13:45:44 UTC (rev 15053) @@ -0,0 +1,143 @@ +'\"macro stdmacro +.TH TTCP 1 local +.SH NAME +ttcp \- test TCP and UDP performance +.SH SYNOPSIS +.B ttcp \-t +.RB [ \-u ] +.RB [ \-s ] +.RB [ \-p\0 \fIport\fP ] +.RB [ \-l\0 \fIbuflen\fP ] +.RB [ \-b\0 \fIsize\fP ] +.RB [ \-n\0 \fInumbufs\fP ] +.RB [ \-A\0 \fIalign\fP ] +.RB [ \-O\0 \fIoffset\fP ] +.RB [ \-f\0 \fIformat\fP ] +.RB [ \-D ] +.RB [ \-v] +.RB host +.RB [ < in ] +.br +.B ttcp \-r +.RB [ \-u ] +.RB [ \-s ] +.RB [ \-p\0 \fIport\fP ] +.RB [ \-l\0 \fIbuflen\fP ] +.RB [ \-b\0 \fIsize\fP ] +.RB [ \-A\0 \fIalign\fP ] +.RB [ \-O\0 \fIoffset\fP ] +.RB [ \-f\0 \fIformat\fP ] +.RB [ \-B ] +.RB [ \-T ] +.RB [ \-v ] +.RB [ > out ] +.SH DESCRIPTION +.I Ttcp +times the transmission and reception of data between two systems using +the UDP or TCP protocols. +It differs from common ``blast'' tests, which tend to measure the remote +.I inetd +as much as the network performance, and which usually do not allow +measurements at the remote end of a UDP transmission. +.PP +For testing, the transmitter should be started with \f3\-t\f1 and \f3\-s\f1 +after the receiver has been started with \f3\-r\f1 and \f3\-s\f1. +Tests lasting at least tens of seconds should be used to obtain accurate +measurements. +Graphical presentations of throughput versus buffer size for +buffers ranging from tens of bytes to several ``pages'' can illuminate +bottlenecks. +.PP +.I Ttcp +can also be used as a ``network pipe'' for moving directory hierarchies +between systems when routing problems exist or when the use of other +mechanisms is undesirable. For example, on the destination machine, use: +.Ex +ttcp \-r \-B | tar xvpf \- +.Ee +.PP +and on the source machine: +.Ex +tar cf \- directory | ttcp \-t dest_machine +.Ee +.PP +Additional intermediate machines can be included by: +.Ex +ttcp \-r | ttcp \-t next_machine +.Ee +.SH OPTIONS +.TP 10 +\-t +Transmit mode. +.TP 10 +\-r +Receive mode. +.TP 10 +\-u +Use UDP instead of TCP. +.TP 10 +\-s +If transmitting, source a data pattern to network; +if receiving, sink (discard) the data. +Without the \f3\-s\f1 option, the default is to transmit data from +.I stdin +or print the received data to +.IR stdout . +.TP 10 +\-l \fIlength\fP +Length of buffers in bytes (default 8192). +For UDP, this value is the number of data bytes in each packet. +The system limits the maximum UDP packet length. This limit can be +changed with the \f3\-b\f1 option. +.TP 10 +\-b \fIsize\fP +Set size of socket buffer. The default varies from system to system. +This parameter affects the maximum UDP packet length. +It may not be possible to set this parameter on some systems +(for example, 4.2BSD). +.TP 10 +\-n \fInumbufs\fP +Number of source buffers transmitted (default 2048). +.TP 10 +\-p \fIport\fP +Port number to send to or listen on (default 2000). +On some systems, this port may be allocated to another network daemon. +.TP 10 +\-D +If transmitting using TCP, do not buffer data when sending +(sets the TCP_NODELAY socket option). +It may not be possible to set this parameter on some systems +(for example, 4.2BSD). +.TP 10 +\-B +When receiving data, output only full blocks, +using the block size specified by \f3\-l\f1. +This option is useful for programs, such as \f2tar\f1(1), that require +complete blocks. +.TP 10 +\-A \fIalign\fP +Align the start of buffers to this modulus (default 16384). +.TP 10 +\-O \fIoffset\fP +Align the start of buffers to this offset (default 0). +For example, ``\-A8192 \-O1'' causes buffers to start at the second byte +of an 8192-byte page. +.TP 10 +\-f \fIformat\fP +Specify, using one of the following characters, +the format of the throughput rates as +kilobits/sec ('k'), kilobytes/sec ('K'), +megabits/sec ('m'), megabytes/sec ('M'), +gigabits/sec ('g'), or gigabytes/sec ('G'). +The default is 'K'. +.TP 10 +\-T +``Touch'' the data as they are read in order to measure cache effects. +.TP 10 +\-v +Verbose: print more statistics. +.TP 10 +\-d +Debug: set the SO_DEBUG socket option. +.SH SEE ALSO +ping(1M), traceroute(1M), netsnoop(1M) 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 Jul 13 17:15:24 2011 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Wed, 13 Jul 2011 15:15:24 +0000 Subject: [csw-devel] SF.net SVN: gar:[15054] csw/mgar/pkg Message-ID: Revision: 15054 http://gar.svn.sourceforge.net/gar/?rev=15054&view=rev Author: bonivart Date: 2011-07-13 15:15:24 +0000 (Wed, 13 Jul 2011) Log Message: ----------- putty/trunk: initial commit, does not build Added Paths: ----------- csw/mgar/pkg/putty/ csw/mgar/pkg/putty/Makefile csw/mgar/pkg/putty/branches/ csw/mgar/pkg/putty/tags/ csw/mgar/pkg/putty/trunk/ csw/mgar/pkg/putty/trunk/Makefile csw/mgar/pkg/putty/trunk/checksums csw/mgar/pkg/putty/trunk/files/ Added: csw/mgar/pkg/putty/Makefile =================================================================== --- csw/mgar/pkg/putty/Makefile (rev 0) +++ csw/mgar/pkg/putty/Makefile 2011-07-13 15:15:24 UTC (rev 15054) @@ -0,0 +1,2 @@ +%: + $(MAKE) -C trunk $* Property changes on: csw/mgar/pkg/putty/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/putty/trunk/Makefile =================================================================== --- csw/mgar/pkg/putty/trunk/Makefile (rev 0) +++ csw/mgar/pkg/putty/trunk/Makefile 2011-07-13 15:15:24 UTC (rev 15054) @@ -0,0 +1,22 @@ +# $Id$ +# TODO (release-critical prefixed with !, non release-critical with *) +# +NAME = putty +VERSION = 0.61 +GARTYPE = v2 +CATEGORIES = utils + +DESCRIPTION = Free implementation of Telnet and SSH +define BLURB + Free implementation of Telnet and SSH for Windows and Unix platforms, along with an xterm terminal emulator +endef + +MASTER_SITES = http://the.earth.li/~sgtatham/putty/latest/ + +DISTFILES = $(DISTNAME).tar.gz + +CONFIGURE_ARGS = $(DIRPATHS) + +WORKSRC = $(WORKDIR)/$(DISTNAME)/unix + +include gar/category.mk Property changes on: csw/mgar/pkg/putty/trunk/Makefile ___________________________________________________________________ Added: svn:keywords + Id Added: csw/mgar/pkg/putty/trunk/checksums =================================================================== --- csw/mgar/pkg/putty/trunk/checksums (rev 0) +++ csw/mgar/pkg/putty/trunk/checksums 2011-07-13 15:15:24 UTC (rev 15054) @@ -0,0 +1 @@ +db0e37f6b82ea62f0ace87927d29b2a4 putty-0.61.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bonivart at users.sourceforge.net Wed Jul 13 19:57:49 2011 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Wed, 13 Jul 2011 17:57:49 +0000 Subject: [csw-devel] SF.net SVN: gar:[15055] csw/mgar/pkg/putty/trunk Message-ID: Revision: 15055 http://gar.svn.sourceforge.net/gar/?rev=15055&view=rev Author: bonivart Date: 2011-07-13 17:57:48 +0000 (Wed, 13 Jul 2011) Log Message: ----------- putty/trunk: almost builds, problem with gtk symbols Modified Paths: -------------- csw/mgar/pkg/putty/trunk/Makefile Added Paths: ----------- csw/mgar/pkg/putty/trunk/files/0001-solaris-9-uses-inttypes.h-instead-of-stdint.h.patch Modified: csw/mgar/pkg/putty/trunk/Makefile =================================================================== --- csw/mgar/pkg/putty/trunk/Makefile 2011-07-13 15:15:24 UTC (rev 15054) +++ csw/mgar/pkg/putty/trunk/Makefile 2011-07-13 17:57:48 UTC (rev 15055) @@ -15,6 +15,10 @@ DISTFILES = $(DISTNAME).tar.gz +PATCHFILES += 0001-solaris-9-uses-inttypes.h-instead-of-stdint.h.patch + +LICENSE = LICENSE + CONFIGURE_ARGS = $(DIRPATHS) WORKSRC = $(WORKDIR)/$(DISTNAME)/unix Added: csw/mgar/pkg/putty/trunk/files/0001-solaris-9-uses-inttypes.h-instead-of-stdint.h.patch =================================================================== --- csw/mgar/pkg/putty/trunk/files/0001-solaris-9-uses-inttypes.h-instead-of-stdint.h.patch (rev 0) +++ csw/mgar/pkg/putty/trunk/files/0001-solaris-9-uses-inttypes.h-instead-of-stdint.h.patch 2011-07-13 17:57:48 UTC (rev 15055) @@ -0,0 +1,34 @@ +From 9f709dbe1015a11c96b75e328176dc0af1eb1946 Mon Sep 17 00:00:00 2001 +From: Peter Bonivart +Date: Wed, 13 Jul 2011 19:31:16 +0200 +Subject: [PATCH] solaris-9-uses-inttypes.h-instead-of-stdint.h + +--- + unix/unix.h | 11 ++++++++++- + 1 files changed, 10 insertions(+), 1 deletions(-) + +diff --git a/unix/unix.h b/unix/unix.h +index 74f4174..abea183 100644 +--- a/unix/unix.h ++++ b/unix/unix.h +@@ -6,7 +6,16 @@ + #endif + + #include /* for FILENAME_MAX */ +-#include /* C99 int types */ ++ ++/* C99 int types, Solaris uses inttypes.h */ ++#ifdef HAVE_STDINT_H ++# include ++# else ++# ifdef HAVE_INTTYPES_H ++# include ++# endif ++#endif ++ + #ifndef NO_LIBDL + #include /* Dynamic library loading */ + #endif /* NO_LIBDL */ +-- +1.7.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 Thu Jul 14 16:03:14 2011 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 14 Jul 2011 14:03:14 +0000 Subject: [csw-devel] SF.net SVN: gar:[15056] csw/mgar/pkg/ffmpeg/trunk Message-ID: Revision: 15056 http://gar.svn.sourceforge.net/gar/?rev=15056&view=rev Author: dmichelsen Date: 2011-07-14 14:03:13 +0000 (Thu, 14 Jul 2011) Log Message: ----------- ffmpeg: Some routine update, does not compile Modified Paths: -------------- csw/mgar/pkg/ffmpeg/trunk/Makefile csw/mgar/pkg/ffmpeg/trunk/checksums Added Paths: ----------- csw/mgar/pkg/ffmpeg/trunk/files/0001-Use-ggrep-in-configure.patch Modified: csw/mgar/pkg/ffmpeg/trunk/Makefile =================================================================== --- csw/mgar/pkg/ffmpeg/trunk/Makefile 2011-07-13 17:57:48 UTC (rev 15055) +++ csw/mgar/pkg/ffmpeg/trunk/Makefile 2011-07-14 14:03:13 UTC (rev 15056) @@ -3,7 +3,7 @@ # $Id$ NAME = ffmpeg -VERSION = 0.5 +VERSION = 0.8 CATEGORIES = lib DESCRIPTION = Very fast video and audio converter (includes libavcodec) @@ -15,18 +15,27 @@ MASTER_SITES = http://ffmpeg.org/releases/ DISTFILES = $(DISTNAME).tar.bz2 -PATCHFILES = gnu-grep.patch -PATCHFILES += 0001-Use-inttypes-instead-of-stdint.patch +PACKAGING_PLATFORMS = solaris10-sparc solaris10-i386 -UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.bz2 - BUILD64 = 1 -NOISAEXEC = 1 -FFMPEG_CONFIGURE_ARGS_1 = $(filter-out --exec_%,$(DIRPATHS)) -FFMPEG_CONFIGURE_ARGS_2 = $(filter-out --sbindir%,$(FFMPEG_CONFIGURE_ARGS_1)) -CONFIGURE_ARGS = $(FFMPEG_CONFIGURE_ARGS) +NODIRPATHS += --exec_prefix +NODIRPATHS += --sbindir +NODIRPATHS += --libexecdir +NODIRPATHS += --sysconfdir +NODIRPATHS += --sharedstatedir +CONFIGURE_ARGS += --prefix=$(prefix) +CONFIGURE_ARGS += --bindir=$(bindir) +CONFIGURE_ARGS += --datadir=$(datadir) +CONFIGURE_ARGS += --libdir=$(libdir) +CONFIGURE_ARGS += --shlibdir=$(libdir) +CONFIGURE_ARGS += --incdir=$(includedir) +CONFIGURE_ARGS += --mandir=$(mandir) + GARCOMPILER = GNU include gar/category.mk + +# For 'grep -q' +PATH := /opt/csw/gnu:$(PATH) Modified: csw/mgar/pkg/ffmpeg/trunk/checksums =================================================================== --- csw/mgar/pkg/ffmpeg/trunk/checksums 2011-07-13 17:57:48 UTC (rev 15055) +++ csw/mgar/pkg/ffmpeg/trunk/checksums 2011-07-14 14:03:13 UTC (rev 15056) @@ -1,3 +1 @@ -bd1248747b96e9fc36c64c02a1f5f191 0001-Use-inttypes-instead-of-stdint.patch -be8503f15c3b81ba00eb8379ca8dcf33 ffmpeg-0.5.tar.bz2 -aa4573b73656b4105abb209eab474680 gnu-grep.patch +7e9b8c8a6952de0c477027e48249f3ed ffmpeg-0.8.tar.bz2 Added: csw/mgar/pkg/ffmpeg/trunk/files/0001-Use-ggrep-in-configure.patch =================================================================== --- csw/mgar/pkg/ffmpeg/trunk/files/0001-Use-ggrep-in-configure.patch (rev 0) +++ csw/mgar/pkg/ffmpeg/trunk/files/0001-Use-ggrep-in-configure.patch 2011-07-14 14:03:13 UTC (rev 15056) @@ -0,0 +1,131 @@ +From a0c9edcc57bf41962cd3385baa61d418487e36f7 Mon Sep 17 00:00:00 2001 +From: Dagobert Michelsen +Date: Mon, 2 Aug 2010 16:30:29 +0200 +Subject: [PATCH] Use ggrep in configure + +--- + configure | 28 ++++++++++++++-------------- + 1 files changed, 14 insertions(+), 14 deletions(-) + +diff --git a/configure b/configure +index 0166829..f5c9ea7 100755 +--- a/configure ++++ b/configure +@@ -1532,7 +1532,7 @@ if test -f configure; then + disable source_path_used + else + source_path="$(cd "$source_path"; pwd)" +- echo "$source_path" | grep -q '[[:blank:]]' && ++ echo "$source_path" | ggrep -q '[[:blank:]]' && + die "Out of tree builds are impossible with whitespace in source path." + test -e "$source_path/config.h" && + die "Out of tree builds are impossible with config.h in source dir." +@@ -1726,16 +1726,16 @@ filter_cflags=echo + filter_cppflags=echo + filter_asflags=echo + +-if $cc -v 2>&1 | grep -qi ^gcc; then ++if $cc -v 2>&1 | ggrep -qi ^gcc; then + cc_type=gcc + cc_version=__VERSION__ +- if ! $cc -dumpversion | grep -q '^2\.'; then ++ if ! $cc -dumpversion | ggrep -q '^2\.'; then + CC_DEPFLAGS='-MMD -MF $(@:.o=.d) -MT $@' + AS_DEPFLAGS='-MMD -MF $(@:.o=.d) -MT $@' + fi + speed_cflags='-O3' + size_cflags='-Os' +-elif $cc --version 2>/dev/null | grep -q Intel; then ++elif $cc --version 2>/dev/null | ggrep -q Intel; then + cc_type=icc + cc_version="AV_STRINGIFY(__INTEL_COMPILER)" + CC_DEPFLAGS='-MMD' +@@ -1743,12 +1743,12 @@ elif $cc --version 2>/dev/null | grep -q Intel; then + speed_cflags='-O3' + size_cflags='-Os' + noopt_cflags='-O1' +-elif $cc -v 2>&1 | grep -q xlc; then ++elif $cc -v 2>&1 | ggrep -q xlc; then + cc_type=xlc + cc_version="AV_STRINGIFY(__IBMC__)" + speed_cflags='-O5' + size_cflags='-O5 -qcompact' +-elif $cc -V 2>/dev/null | grep -q Compaq; then ++elif $cc -V 2>/dev/null | ggrep -q Compaq; then + cc_type=ccc + cc_version="AV_STRINGIFY(__DECC_VER)" + DEPFLAGS='$(CPPFLAGS) $(CFLAGS) -M' +@@ -1756,7 +1756,7 @@ elif $cc -V 2>/dev/null | grep -q Compaq; then + add_ldflags -Wl,-z,now # calls to libots crash without this + speed_cflags='-fast' + size_cflags='-O1' +-elif $cc --vsn 2>/dev/null | grep -q "ARM C/C++ Compiler"; then ++elif $cc --vsn 2>/dev/null | ggrep -q "ARM C/C++ Compiler"; then + test -d "$sysroot" || die "No valid sysroot specified." + cc_type=armcc + cc_version="AV_STRINGIFY(__ARMCC_VERSION)" +@@ -1772,7 +1772,7 @@ elif $cc --vsn 2>/dev/null | grep -q "ARM C/C++ Compiler"; then + AS_DEPFLAGS='-MMD' + speed_cflags='-O3' + size_cflags='-Os' +-elif $cc -version 2>/dev/null | grep -q TMS470; then ++elif $cc -version 2>/dev/null | ggrep -q TMS470; then + cc_type=tms470 + cc_version="AV_STRINGIFY(__TI_COMPILER_VERSION__)" + cc="$cc --gcc --abi=eabi -eo=.o -mc -me" +@@ -1811,14 +1811,14 @@ elif $cc -version 2>/dev/null | grep -q TMS470; then + esac + done + } +-elif $cc -v 2>&1 | grep -q clang; then ++elif $cc -v 2>&1 | ggrep -q clang; then + cc_type=clang + cc_version=__VERSION__ + CC_DEPFLAGS='-MMD' + AS_DEPFLAGS='-MMD' + speed_cflags='-O3' + size_cflags='-Os' +-elif $cc -V 2>&1 | grep -q Sun; then ++elif $cc -V 2>&1 | ggrep -q Sun; then + cc_type=suncc + cc_version="AV_STRINGIFY(__SUNPRO_C)" + DEPEND_CMD='$(DEPCC) $(DEPFLAGS) $< | sed -e "1s,^.*: ,$@: ," -e "\$$!s,\$$, \\\," -e "1!s,^.*: , ," > $(@:.o=.d)' +@@ -2130,7 +2130,7 @@ case $target_os in + beos|haiku|zeta) + prefix_default="$HOME/config" + # 3 gcc releases known for BeOS, each with ugly bugs +- gcc_version="$($cc -v 2>&1 | grep version | cut -d ' ' -f3-)" ++ gcc_version="$($cc -v 2>&1 | ggrep version | cut -d ' ' -f3-)" + case "$gcc_version" in + 2.9-beos-991026*|2.9-beos-000224*) echo "R5/GG gcc" + disable mmx +@@ -2145,7 +2145,7 @@ case $target_os in + # no need for libm, but the inet stuff + # Check for BONE + # XXX: actually should check for NOT net_server +- if echo $BEINCLUDES | grep -q 'headers/be/bone'; then ++ if echo $BEINCLUDES | ggrep -q 'headers/be/bone'; then + network_extralibs="-lbind -lsocket" + else + enable beos_netserver +@@ -2390,7 +2390,7 @@ EOF + check_cc <> config.mak +-- +1.7.1 + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Fri Jul 15 09:12:05 2011 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Fri, 15 Jul 2011 07:12:05 +0000 Subject: [csw-devel] SF.net SVN: gar:[15057] csw/mgar/gar/v2/lib/python/common_constants.py Message-ID: Revision: 15057 http://gar.svn.sourceforge.net/gar/?rev=15057&view=rev Author: wahwah Date: 2011-07-15 07:12:05 +0000 (Fri, 15 Jul 2011) Log Message: ----------- pkgdb: Adding the 'dublin' catalog release Also, removing experimental, since it will not be used here. Modified Paths: -------------- csw/mgar/gar/v2/lib/python/common_constants.py Modified: csw/mgar/gar/v2/lib/python/common_constants.py =================================================================== --- csw/mgar/gar/v2/lib/python/common_constants.py 2011-07-14 14:03:13 UTC (rev 15056) +++ csw/mgar/gar/v2/lib/python/common_constants.py 2011-07-15 07:12:05 UTC (rev 15057) @@ -53,7 +53,7 @@ DEFAULT_CATALOG_RELEASES = frozenset([ 'current', - 'experimental', + 'dublin', 'unstable', 'testing', 'stable', 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 Jul 15 09:12:51 2011 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Fri, 15 Jul 2011 07:12:51 +0000 Subject: [csw-devel] SF.net SVN: gar:[15058] csw/mgar/gar/v2/lib/python/pkgdb.py Message-ID: Revision: 15058 http://gar.svn.sourceforge.net/gar/?rev=15058&view=rev Author: wahwah Date: 2011-07-15 07:12:51 +0000 (Fri, 15 Jul 2011) Log Message: ----------- pkgdb: Generate the 5.11 catalog as well Modified Paths: -------------- csw/mgar/gar/v2/lib/python/pkgdb.py Modified: csw/mgar/gar/v2/lib/python/pkgdb.py =================================================================== --- csw/mgar/gar/v2/lib/python/pkgdb.py 2011-07-15 07:12:05 UTC (rev 15057) +++ csw/mgar/gar/v2/lib/python/pkgdb.py 2011-07-15 07:12:51 UTC (rev 15058) @@ -596,7 +596,7 @@ return osrel.replace("SunOS", "") # TODO: Move this definition to a better place - for osrel in ("SunOS5.%s" % x for x in (8, 9, 10)): + for osrel in ("SunOS5.%s" % x for x in (8, 9, 10, 11)): for arch in archs: sqo_osrel, sqo_arch, sqo_catrel = GetSqoTriad( osrel, arch, catrel) 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 Jul 15 09:13:10 2011 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Fri, 15 Jul 2011 07:13:10 +0000 Subject: [csw-devel] SF.net SVN: gar:[15059] csw/mgar/gar/v2/lib/python/pkgdb.py Message-ID: Revision: 15059 http://gar.svn.sourceforge.net/gar/?rev=15059&view=rev Author: wahwah Date: 2011-07-15 07:13:10 +0000 (Fri, 15 Jul 2011) Log Message: ----------- pkgdb: Better error message when linking files Modified Paths: -------------- csw/mgar/gar/v2/lib/python/pkgdb.py Modified: csw/mgar/gar/v2/lib/python/pkgdb.py =================================================================== --- csw/mgar/gar/v2/lib/python/pkgdb.py 2011-07-15 07:12:51 UTC (rev 15058) +++ csw/mgar/gar/v2/lib/python/pkgdb.py 2011-07-15 07:13:10 UTC (rev 15059) @@ -641,7 +641,12 @@ else: # Hardlink logging.debug("cp -l %s %s/%s", src_path, tgt_path, pkg.basename) - os.link(src_path, os.path.join(tgt_path, pkg.basename)) + tgt_filename = os.path.join(tgt_path, pkg.basename) + try: + os.link(src_path, tgt_filename) + except OSError, e: + logging.fatal("Could not link %s to %s", src_path, tgt_filename) + raise prev_osrels.append(osrel_short) elif (command, subcommand) == ('show', 'files'): md5_sum = args[0] This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From janholzh at users.sourceforge.net Fri Jul 15 09:23:22 2011 From: janholzh at users.sourceforge.net (janholzh at users.sourceforge.net) Date: Fri, 15 Jul 2011 07:23:22 +0000 Subject: [csw-devel] SF.net SVN: gar:[15060] csw/mgar/pkg/ffmpeg/trunk Message-ID: Revision: 15060 http://gar.svn.sourceforge.net/gar/?rev=15060&view=rev Author: janholzh Date: 2011-07-15 07:23:22 +0000 (Fri, 15 Jul 2011) Log Message: ----------- ffmpeg: get build going further, now fails with section .rela.debug_line has invalid type [ SHT_RELA ] Modified Paths: -------------- csw/mgar/pkg/ffmpeg/trunk/Makefile Added Paths: ----------- csw/mgar/pkg/ffmpeg/trunk/files/0001-fix-version.sh.patch Modified: csw/mgar/pkg/ffmpeg/trunk/Makefile =================================================================== --- csw/mgar/pkg/ffmpeg/trunk/Makefile 2011-07-15 07:13:10 UTC (rev 15059) +++ csw/mgar/pkg/ffmpeg/trunk/Makefile 2011-07-15 07:23:22 UTC (rev 15060) @@ -16,6 +16,7 @@ DISTFILES = $(DISTNAME).tar.bz2 PACKAGING_PLATFORMS = solaris10-sparc solaris10-i386 +PATCHFILES = 0001-fix-version.sh.patch BUILD64 = 1 @@ -32,6 +33,8 @@ CONFIGURE_ARGS += --shlibdir=$(libdir) CONFIGURE_ARGS += --incdir=$(includedir) CONFIGURE_ARGS += --mandir=$(mandir) +CONFIGURE_ARGS += --enable-shared +CONFIGURE_ARGS += --disable-static GARCOMPILER = GNU Added: csw/mgar/pkg/ffmpeg/trunk/files/0001-fix-version.sh.patch =================================================================== --- csw/mgar/pkg/ffmpeg/trunk/files/0001-fix-version.sh.patch (rev 0) +++ csw/mgar/pkg/ffmpeg/trunk/files/0001-fix-version.sh.patch 2011-07-15 07:23:22 UTC (rev 15060) @@ -0,0 +1,22 @@ +From 203595cdab30aea5661fbe8be7cea2143b0f6507 Mon Sep 17 00:00:00 2001 +From: Jan Holzhueter +Date: Fri, 15 Jul 2011 08:44:12 +0200 +Subject: [PATCH] fix-version.sh + +--- + version.sh | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/version.sh b/version.sh +index 41ae520..a83a539 100755 +--- a/version.sh ++++ b/version.sh +@@ -1,4 +1,4 @@ +-#!/bin/sh ++#!/opt/csw/bin/bash + + # check for git short hash + if ! test "$revision"; then +-- +1.7.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 Fri Jul 15 14:49:23 2011 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 15 Jul 2011 12:49:23 +0000 Subject: [csw-devel] SF.net SVN: gar:[15061] csw/mgar/pkg Message-ID: Revision: 15061 http://gar.svn.sourceforge.net/gar/?rev=15061&view=rev Author: dmichelsen Date: 2011-07-15 12:49:23 +0000 (Fri, 15 Jul 2011) Log Message: ----------- expat: Split into sseparate library packages Modified Paths: -------------- csw/mgar/pkg/libexpat0/trunk/Makefile csw/mgar/pkg/libexpat0/trunk/checksums csw/mgar/pkg/libexpat1/trunk/Makefile csw/mgar/pkg/libexpat1/trunk/checksums Added Paths: ----------- csw/mgar/pkg/libexpat0/ csw/mgar/pkg/libexpat1/ Removed Paths: ------------- csw/mgar/pkg/expat/ csw/mgar/pkg/libexpat0/trunk/files/CSWexpat.gspec csw/mgar/pkg/libexpat1/trunk/files/CSWexpat.gspec Modified: csw/mgar/pkg/libexpat0/trunk/Makefile =================================================================== --- csw/mgar/pkg/expat/trunk/Makefile 2011-07-14 14:03:13 UTC (rev 15056) +++ csw/mgar/pkg/libexpat0/trunk/Makefile 2011-07-15 12:49:23 UTC (rev 15061) @@ -1,57 +1,23 @@ NAME = expat -VERSION = 2.0.1 +VERSION = 1.95.8 CATEGORIES = lib -EXTRA_MODULATORS = VERSION -MODULATIONS_VERSION = 1.95.8 2.0.1 - -DESCRIPTION = XML Parser Toolkit +DESCRIPTION = XML parser toolkit define BLURB - This is James Clark's Expat XML parser library in C. It is a stream oriented - parser that requires setting handlers to deal with the structure that the - parser discovers in the document. + This is James Clark's Expat XML parser library in C. It is a stream oriented + parser that requires setting handlers to deal with the structure that the + parser discovers in the document. endef MASTER_SITES = $(SF_MIRRORS) -SOURCEFILES = $(foreach VERSION,$(MODULATIONS_VERSION), $(NAME)-$(VERSION).tar.gz) -DISTFILES = $(SOURCEFILES) -DISTFILES += $(call admfiles,CSWexpat,) +DISTFILES += $(DISTNAME).tar.gz -# We define upstream file regex so we can be notifed of new upstream software release -UPSTREAM_MASTER_SITES = $(SF_PROJECT_SHOWFILE)=10127 -UPSTREAM_USE_SF = 1 -UFILES_REGEX = (\d+(?:\.\d+)*) +PACKAGES += CSWlibexpat0 +SPKG_DESC_CSWlibexpat0 = XML parser toolkit, libexpat.so.0 +PKGFILES_CSWlibexpat0 += $(call pkgfiles_lib,libexpat.so.0) BUILD64 = 1 -NOISAEXEC = 1 -CONFIGURE_ARGS = $(DIRPATHS) - -# The expat 'check' target tries to compile tests that use GCC -# constructs -- won't compile under Forte without hackery. -TEST_TARGET = check -TEST_SCRIPTS = - -ifeq ($(VERSION),1.95.8) INSTALL_OVERRIDE_DIRS = prefix exec_prefix bindir libdir includedir man1dir -endif -MERGE_SCRIPTS_isa-i386-garversion-1.95.8 = copy-only -MERGE_DIRS_isa-i386-garversion-1.95.8 = $(libdir) -MERGE_SCRIPTS_isa-amd64-garversion-1.95.8 = copy-relocated-only -MERGE_DIRS_isa-amd64-garversion-1.95.8 = $(libdir) - -MERGE_SCRIPTS_isa-i386-garversion-2.0.1 = copy-all -MERGE_SCRIPTS_isa-amd64-garversion-2.0.1 = copy-relocated-only -MERGE_DIRS_isa-amd64-garversion-2.0.1 = $(bindir) $(sbindir) $(libexecdir) $(libdir) - -MERGE_SCRIPTS_isa-sparcv8-garversion-1.95.8 = copy-only -MERGE_DIRS_isa-sparcv8-garversion-1.95.8 = $(libdir) -MERGE_SCRIPTS_isa-sparcv9-garversion-1.95.8 = copy-relocated-only -MERGE_DIRS_isa-sparcv9-garversion-1.95.8 = $(libdir) - -MERGE_SCRIPTS_isa-sparcv8-garversion-2.0.1 = copy-all -MERGE_SCRIPTS_isa-sparcv9-garversion-2.0.1 = copy-relocated-only -MERGE_DIRS_isa-sparcv9-garversion-2.0.1 = $(bindir) $(sbindir) $(libexecdir) $(libdir) - include gar/category.mk Modified: csw/mgar/pkg/libexpat0/trunk/checksums =================================================================== --- csw/mgar/pkg/expat/trunk/checksums 2011-07-14 14:03:13 UTC (rev 15056) +++ csw/mgar/pkg/libexpat0/trunk/checksums 2011-07-15 12:49:23 UTC (rev 15061) @@ -1,3 +1 @@ -aff487543845a82fe262e6e2922b4c8e download/expat-1.95.8.tar.gz -ee8b492592568805593f81f8cdf2a04c download/expat-2.0.1.tar.gz -7547f56dfe29c7f8a29983ba60da41a1 download/CSWexpat.gspec +aff487543845a82fe262e6e2922b4c8e expat-1.95.8.tar.gz Deleted: csw/mgar/pkg/libexpat0/trunk/files/CSWexpat.gspec =================================================================== --- csw/mgar/pkg/expat/trunk/files/CSWexpat.gspec 2011-07-14 14:03:13 UTC (rev 15056) +++ csw/mgar/pkg/libexpat0/trunk/files/CSWexpat.gspec 2011-07-15 12:49:23 UTC (rev 15061) @@ -1,4 +0,0 @@ -%var bitname expat -%var pkgname CSWexpat -%include url file://%{PKGLIB}/csw_dyndepend.gspec -%copyright url file://%{WORKSRC_FIRSTMOD}/COPYING Modified: csw/mgar/pkg/libexpat1/trunk/Makefile =================================================================== --- csw/mgar/pkg/expat/trunk/Makefile 2011-07-14 14:03:13 UTC (rev 15056) +++ csw/mgar/pkg/libexpat1/trunk/Makefile 2011-07-15 12:49:23 UTC (rev 15061) @@ -2,56 +2,38 @@ VERSION = 2.0.1 CATEGORIES = lib -EXTRA_MODULATORS = VERSION -MODULATIONS_VERSION = 1.95.8 2.0.1 - -DESCRIPTION = XML Parser Toolkit +DESCRIPTION = XML parser toolkit define BLURB - This is James Clark's Expat XML parser library in C. It is a stream oriented - parser that requires setting handlers to deal with the structure that the - parser discovers in the document. + This is James Clark's Expat XML parser library in C. It is a stream oriented + parser that requires setting handlers to deal with the structure that the + parser discovers in the document. endef MASTER_SITES = $(SF_MIRRORS) -SOURCEFILES = $(foreach VERSION,$(MODULATIONS_VERSION), $(NAME)-$(VERSION).tar.gz) -DISTFILES = $(SOURCEFILES) -DISTFILES += $(call admfiles,CSWexpat,) +DISTFILES = $(DISTNAME).tar.gz -# We define upstream file regex so we can be notifed of new upstream software release -UPSTREAM_MASTER_SITES = $(SF_PROJECT_SHOWFILE)=10127 -UPSTREAM_USE_SF = 1 -UFILES_REGEX = (\d+(?:\.\d+)*) +FOREIGN_PACKAGES += CSWlibexpat0 -BUILD64 = 1 -NOISAEXEC = 1 +PACKAGES += CSWlibexpat1 +SPKG_DESC_CSWlibexpat1 = XML parser toolkit, libexpat.so.1 +PKGFILES_CSWlibexpat1 += $(call pkgfiles_lib,libexpat.so.1) -CONFIGURE_ARGS = $(DIRPATHS) +PACKAGES += CSWlibexpat-dev +SPKG_DESC_CSWlibexpat-dev += Development files for libexpat.so.1 +PKGFILES_CSWlibexpat-dev += $(PKGFILES_DEVEL) +RUNTIME_DEP_PKGS_CSWlibexpat-dev += CSWlibexpat1 -# The expat 'check' target tries to compile tests that use GCC -# constructs -- won't compile under Forte without hackery. -TEST_TARGET = check -TEST_SCRIPTS = +PACKAGES += CSWexpat +SPKG_DESC_CSWexpat = XML parser toolkit utility +RUNTIME_DEP_PKGS_CSWexpat += CSWlibexpat1 +# This is for legacy packages depending on CSWexpat to use libexpat.so.0 +RUNTIME_DEP_PKGS_CSWexpat += CSWlibexpat0 +CHECKPKG_OVERRIDES_CSWexpat += surplus-dependency|CSWlibexpat0 -ifeq ($(VERSION),1.95.8) -INSTALL_OVERRIDE_DIRS = prefix exec_prefix bindir libdir includedir man1dir -endif +# Testsuite needs __func__ +EXTRA_CXXFLAGS = -features=extensions -MERGE_SCRIPTS_isa-i386-garversion-1.95.8 = copy-only -MERGE_DIRS_isa-i386-garversion-1.95.8 = $(libdir) -MERGE_SCRIPTS_isa-amd64-garversion-1.95.8 = copy-relocated-only -MERGE_DIRS_isa-amd64-garversion-1.95.8 = $(libdir) +BUILD64 = 1 +ISAEXEC = 1 -MERGE_SCRIPTS_isa-i386-garversion-2.0.1 = copy-all -MERGE_SCRIPTS_isa-amd64-garversion-2.0.1 = copy-relocated-only -MERGE_DIRS_isa-amd64-garversion-2.0.1 = $(bindir) $(sbindir) $(libexecdir) $(libdir) - -MERGE_SCRIPTS_isa-sparcv8-garversion-1.95.8 = copy-only -MERGE_DIRS_isa-sparcv8-garversion-1.95.8 = $(libdir) -MERGE_SCRIPTS_isa-sparcv9-garversion-1.95.8 = copy-relocated-only -MERGE_DIRS_isa-sparcv9-garversion-1.95.8 = $(libdir) - -MERGE_SCRIPTS_isa-sparcv8-garversion-2.0.1 = copy-all -MERGE_SCRIPTS_isa-sparcv9-garversion-2.0.1 = copy-relocated-only -MERGE_DIRS_isa-sparcv9-garversion-2.0.1 = $(bindir) $(sbindir) $(libexecdir) $(libdir) - include gar/category.mk Modified: csw/mgar/pkg/libexpat1/trunk/checksums =================================================================== --- csw/mgar/pkg/expat/trunk/checksums 2011-07-14 14:03:13 UTC (rev 15056) +++ csw/mgar/pkg/libexpat1/trunk/checksums 2011-07-15 12:49:23 UTC (rev 15061) @@ -1,3 +1 @@ -aff487543845a82fe262e6e2922b4c8e download/expat-1.95.8.tar.gz -ee8b492592568805593f81f8cdf2a04c download/expat-2.0.1.tar.gz -7547f56dfe29c7f8a29983ba60da41a1 download/CSWexpat.gspec +ee8b492592568805593f81f8cdf2a04c expat-2.0.1.tar.gz Deleted: csw/mgar/pkg/libexpat1/trunk/files/CSWexpat.gspec =================================================================== --- csw/mgar/pkg/expat/trunk/files/CSWexpat.gspec 2011-07-14 14:03:13 UTC (rev 15056) +++ csw/mgar/pkg/libexpat1/trunk/files/CSWexpat.gspec 2011-07-15 12:49:23 UTC (rev 15061) @@ -1,4 +0,0 @@ -%var bitname expat -%var pkgname CSWexpat -%include url file://%{PKGLIB}/csw_dyndepend.gspec -%copyright url file://%{WORKSRC_FIRSTMOD}/COPYING 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 Jul 15 16:26:49 2011 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 15 Jul 2011 14:26:49 +0000 Subject: [csw-devel] SF.net SVN: opencsw:[392] buildfarm/bin Message-ID: Revision: 392 http://opencsw.svn.sourceforge.net/opencsw/?rev=392&view=rev Author: dmichelsen Date: 2011-07-15 14:26:49 +0000 (Fri, 15 Jul 2011) Log Message: ----------- dublin: Updated catalog generation scripts Modified Paths: -------------- buildfarm/bin/generate-unstable buildfarm/bin/opencsw-future-update buildfarm/bin/sync-checkpkg Modified: buildfarm/bin/generate-unstable =================================================================== --- buildfarm/bin/generate-unstable 2011-07-12 13:25:48 UTC (rev 391) +++ buildfarm/bin/generate-unstable 2011-07-15 14:26:49 UTC (rev 392) @@ -11,35 +11,45 @@ set -e set -x -/home/web/bin/gar/bin/pkgdb \ - gen-cat --catalog-release unstable \ - /home/mirror/opencsw-future/allpkgs /home/mirror/opencsw-future +declare -r catalogs=( "unstable" "dublin" ) +declare -r os_rels=( "5.9" "5.10" "5.11" ) -pushd /home/mirror/opencsw-future/unstable -for arch in i386 sparc; do - pushd "${arch}" - for osrel in 5.9 5.10 5.11; do - pushd "${osrel}" - # bldcat prints a lot of output - if ! bldcat --fast . >/dev/null - then - echo "bldcat failed in $(pwd)." - false - fi - if chkcat -e catalog - then - echo chkcat returned no errors - else - r="$?" - if [[ "${r}" -eq 2 ]]; then - echo "chkcat returned an error in $(pwd)." +for catalog in "${catalogs[@]}" +do + /home/web/bin/gar/bin/pkgdb \ + gen-cat --catalog-release "${catalog}" \ + /home/mirror/opencsw-future/allpkgs \ + /home/mirror/opencsw-future + + pushd "/home/mirror/opencsw-future/${catalog}" + for arch in i386 sparc; do + mkdir -p "${arch}" + pushd "${arch}" + for osrel in "${os_rels[@]}"; do + mkdir -p "${osrel}" + pushd "${osrel}" + # bldcat prints a lot of output + if ! bldcat --fast . >/dev/null + then + echo "bldcat failed in $(pwd)." false fi - fi + if chkcat -e --nocyclic catalog + then + echo chkcat returned no errors + else + r="$?" + if [[ "${r}" -eq 2 ]]; then + echo -n "chkcat returned an error in $(pwd) " + echo "when generating ${catalog}." + false + fi + fi + popd + done popd done popd done -popd # vim:set ci si ts=2 sts=2 sw=2 expandtab: Modified: buildfarm/bin/opencsw-future-update =================================================================== --- buildfarm/bin/opencsw-future-update 2011-07-12 13:25:48 UTC (rev 391) +++ buildfarm/bin/opencsw-future-update 2011-07-15 14:26:49 UTC (rev 392) @@ -10,9 +10,12 @@ ${BASE_DIR}/sync-mirror ${BASE_DIR}/sync-checkpkg -${BASE_DIR}/sync-opencsw-future +# Current is no longer synced from the official mirror. +# ${BASE_DIR}/sync-current-in-opencsw-future +${BASE_DIR}/make-snapshot-README + +# Generating unstable. ${BASE_DIR}/generate-unstable -${BASE_DIR}/make-snapshot-README ${BASE_DIR}/push-opencsw-future ${BASE_DIR}/send-catalog-update-notifications Modified: buildfarm/bin/sync-checkpkg =================================================================== --- buildfarm/bin/sync-checkpkg 2011-07-12 13:25:48 UTC (rev 391) +++ buildfarm/bin/sync-checkpkg 2011-07-15 14:26:49 UTC (rev 392) @@ -6,5 +6,5 @@ cd /home/web/bin/gar /opt/csw/bin/svn update -bin/pkgdb sync-catalogs-from-tree current /export/mirror/opencsw/current - +echo "We no longer sync from current to the database" +# bin/pkgdb sync-catalogs-from-tree current /export/mirror/opencsw/current 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 Jul 15 16:27:30 2011 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 15 Jul 2011 14:27:30 +0000 Subject: [csw-devel] SF.net SVN: opencsw:[393] buildfarm/bin Message-ID: Revision: 393 http://opencsw.svn.sourceforge.net/opencsw/?rev=393&view=rev Author: dmichelsen Date: 2011-07-15 14:27:30 +0000 (Fri, 15 Jul 2011) Log Message: ----------- dublin: No longer syncing from current Added Paths: ----------- buildfarm/bin/sync-current-in-opencsw-future Removed Paths: ------------- buildfarm/bin/sync-opencsw-future Copied: buildfarm/bin/sync-current-in-opencsw-future (from rev 358, buildfarm/bin/sync-opencsw-future) =================================================================== --- buildfarm/bin/sync-current-in-opencsw-future (rev 0) +++ buildfarm/bin/sync-current-in-opencsw-future 2011-07-15 14:27:30 UTC (rev 393) @@ -0,0 +1,62 @@ +#!/opt/csw/bin/perl + +print "current is no longer synced from the official mirror to opencsw-future." +exit 1; + +our $BASE = "/export/mirror/opencsw-future"; + + +system( "/opt/csw/bin/rsync", "-Hrav", "--delete", + "/export/mirror/opencsw/official/current/", + "/export/mirror/opencsw-future/current" ); + +# Make sure all packages are properly archived to allpkgs +foreach my $T (qw(current)) { + foreach my $A (qw(sparc i386)) { + foreach my $V (qw(5.8 5.9 5.10)) { + opendir D, "$BASE/$T/$A/$V" or die "Cannot open $BASE/$T/$A/$V"; + my @pkgs = grep { /\.pkg(\.gz)*$/ } readdir D; + closedir D; + + foreach my $p (@pkgs) { + if( ! -e "$BASE/allpkgs/$p" ) { + print "Linking $p\n"; + link( "$BASE/$T/$A/$V/$p", "$BASE/allpkgs/$p" ); + } + } + } + } +} + +exit 0; + + +# Analyze all packages in the catalogs + +# This bit needs a rewrite, because checkpkg works now differently. + +my @snapshots = map { s,^$BASE/,, } glob("$BASE/snapshots/*"); +foreach my $T (qw(experimental unstable), @snapshots) { + foreach my $A (qw(sparc i386)) { + foreach my $V (qw(5.8 5.9 5.10)) { + my $catalogfile = "$BASE/$T/$A/$V/catalog"; + my $errortagsfile = "$BASE/$T/$A/$V/checkpkg-error-tags.txt"; + + # my ($dev,$ino,$mode,$nlink,$uid,$gid,$rdev,$size,$atime,$mtime,$ctime,$blksize,$blocks) = stat( "$DIR/$project" ); + my $mtime_catalog = (stat( $catalogfile ))[ 9 ]; + my $mtime_errortags = (-f $errortagsfile ? (stat( $errortagsfile ))[ 9 ] : 0); + if( $mtime_catalog > $mtime_errortags ) { + print "Running checkpkg over $catalogfile\n"; + $ENV{'PATH'} = "/usr/bin:/opt/csw/bin"; + system( "/home/web/bin/gar/bin/checkpkg", + "-s", + "-M", $catalogfile, + "-o", $errottagsfile, + glob( "$BASE/$T/$A/$V/*\.pkg*" ) + ); + } else { + print "Checkpkg over $catalogfile is current\n"; + } + } + } +} Deleted: buildfarm/bin/sync-opencsw-future =================================================================== --- buildfarm/bin/sync-opencsw-future 2011-07-15 14:26:49 UTC (rev 392) +++ buildfarm/bin/sync-opencsw-future 2011-07-15 14:27:30 UTC (rev 393) @@ -1,60 +0,0 @@ -#!/opt/csw/bin/perl - - -our $BASE = "/export/mirror/opencsw-future"; - - -system( "/opt/csw/bin/rsync", "-Hrav", "--delete", - "/export/mirror/opencsw/official/current/", - "/export/mirror/opencsw-future/current" ); - -# Make sure all packages are properly archived to allpkgs -foreach my $T (qw(current)) { - foreach my $A (qw(sparc i386)) { - foreach my $V (qw(5.8 5.9 5.10)) { - opendir D, "$BASE/$T/$A/$V" or die "Cannot open $BASE/$T/$A/$V"; - my @pkgs = grep { /\.pkg(\.gz)*$/ } readdir D; - closedir D; - - foreach my $p (@pkgs) { - if( ! -e "$BASE/allpkgs/$p" ) { - print "Linking $p\n"; - link( "$BASE/$T/$A/$V/$p", "$BASE/allpkgs/$p" ); - } - } - } - } -} - -exit 0; - - -# Analyze all packages in the catalogs - -# This bit needs a rewrite, because checkpkg works now differently. - -my @snapshots = map { s,^$BASE/,, } glob("$BASE/snapshots/*"); -foreach my $T (qw(experimental unstable), @snapshots) { - foreach my $A (qw(sparc i386)) { - foreach my $V (qw(5.8 5.9 5.10)) { - my $catalogfile = "$BASE/$T/$A/$V/catalog"; - my $errortagsfile = "$BASE/$T/$A/$V/checkpkg-error-tags.txt"; - - # my ($dev,$ino,$mode,$nlink,$uid,$gid,$rdev,$size,$atime,$mtime,$ctime,$blksize,$blocks) = stat( "$DIR/$project" ); - my $mtime_catalog = (stat( $catalogfile ))[ 9 ]; - my $mtime_errortags = (-f $errortagsfile ? (stat( $errortagsfile ))[ 9 ] : 0); - if( $mtime_catalog > $mtime_errortags ) { - print "Running checkpkg over $catalogfile\n"; - $ENV{'PATH'} = "/usr/bin:/opt/csw/bin"; - system( "/home/web/bin/gar/bin/checkpkg", - "-s", - "-M", $catalogfile, - "-o", $errottagsfile, - glob( "$BASE/$T/$A/$V/*\.pkg*" ) - ); - } else { - print "Checkpkg over $catalogfile is current\n"; - } - } - } -} 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 Jul 15 18:04:07 2011 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 15 Jul 2011 16:04:07 +0000 Subject: [csw-devel] SF.net SVN: gar:[15062] csw/mgar/pkg/xapian-core/trunk Message-ID: Revision: 15062 http://gar.svn.sourceforge.net/gar/?rev=15062&view=rev Author: dmichelsen Date: 2011-07-15 16:04:06 +0000 (Fri, 15 Jul 2011) Log Message: ----------- xapian-core: Intermediate commit, update to 1.2.6, redo package split Modified Paths: -------------- csw/mgar/pkg/xapian-core/trunk/Makefile csw/mgar/pkg/xapian-core/trunk/checksums Added Paths: ----------- csw/mgar/pkg/xapian-core/trunk/files/0001-Fix-include-issue-on-Solaris-9.patch Modified: csw/mgar/pkg/xapian-core/trunk/Makefile =================================================================== --- csw/mgar/pkg/xapian-core/trunk/Makefile 2011-07-15 12:49:23 UTC (rev 15061) +++ csw/mgar/pkg/xapian-core/trunk/Makefile 2011-07-15 16:04:06 UTC (rev 15062) @@ -1,5 +1,5 @@ NAME = xapian-core -VERSION = 1.0.11 +VERSION = 1.2.6 CATEGORIES = lib DESCRIPTION = An open source search engine library @@ -13,41 +13,38 @@ DISTFILES = $(NAME)-$(VERSION).tar.gz -# We define upstream file regex so we can be notifed of new upstream software release -UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz +PATCHFILES += 0001-Fix-include-issue-on-Solaris-9.patch -PACKAGES = CSWxapian CSWxapianrt CSWxapiandevel +PACKAGES += CSWxapian CATALOGNAME_CSWxapian = xapian -CATALOGNAME_CSWxapianrt = xapian_rt -CATALOGNAME_CSWxapiandevel = xapian_devel - SPKG_DESC_CSWxapian = An open source search engine library +RUNTIME_DEP_PKGS_CSWxapian += CSWxapianrt + +PACKAGES += CSWxapianrt +CATALOGNAME_CSWxapianrt = xapian_rt SPKG_DESC_CSWxapianrt = Xapian runtime libraries -SPKG_DESC_CSWxapiandevel = Xapian development files -RUNTIME_DEP_PKGS_CSWxapianrt = CSWstlport CSWzlib -RUNTIME_DEP_PKGS_CSWxapian = CSWxapianrt -RUNTIME_DEP_PKGS_CSWxapiandevel = CSWxapian +PKGFILES_CSWxapianrt = $(PKGFILES_RT) +RUNTIME_DEP_PKGS_CSWxapianrt += CSWstlport +RUNTIME_DEP_PKGS_CSWxapianrt += CSWzlib +PACKAGES += CSWxapian-dev +SPKG_DESC_CSWxapian-dev = Xapian development files +PKGFILES_CSWxapian-dev = $(PKGFILES_DEVEL) +PKGFILES_CSWxapian-dev += $(docdir)/xapian-core/apidoc/.* +RUNTIME_DEP_PKGS_CSWxapian-dev += CSWxapian + # If we compile with Sun Studio it is impossible to build the Ruby bindings as -# Ruby is compiled with GCC. -# Compiling with GCC4 yields the error "__sync_fetch_and_add_4 not found". -GARCOMPILER = GCC3 +# TBD: Still true? +# TBD: Is this necessary EXTRA_LD_FLAGS = -lm -# GCC3 can not build amd64 -#BUILD64 = 1 -CONFIGURE_ARGS = $(DIRPATHS) +BUILD64 = 1 -#BUILD_ARGS = AM_CXXFLAGS="-library=stlport4 -features=tmplife" +# Can't we just pass this via EXTRA_CXXFLAGS? +BUILD_ARGS = AM_CXXFLAGS="-library=stlport4 -features=tmplife" -TEST_TARGET = check - # We need the .la-file, otherwise xapian-config doesn't work MERGE_EXCLUDE_LIBTOOL = -PKGFILES_CSWxapianrt = $(PKGFILES_RT) -PKGFILES_CSWxapiandevel = $(PKGFILES_DEVEL) -PKGFILES_CSWxapiandevel += $(docdir)/xapian-core/apidoc/.* - include gar/category.mk Modified: csw/mgar/pkg/xapian-core/trunk/checksums =================================================================== --- csw/mgar/pkg/xapian-core/trunk/checksums 2011-07-15 12:49:23 UTC (rev 15061) +++ csw/mgar/pkg/xapian-core/trunk/checksums 2011-07-15 16:04:06 UTC (rev 15062) @@ -1 +1 @@ -f80a2f51b109e2a065bdcbf1ba03b808 download/xapian-core-1.0.11.tar.gz +30f5cc976f063694f93cbdf9b83dc2ea xapian-core-1.2.6.tar.gz Added: csw/mgar/pkg/xapian-core/trunk/files/0001-Fix-include-issue-on-Solaris-9.patch =================================================================== --- csw/mgar/pkg/xapian-core/trunk/files/0001-Fix-include-issue-on-Solaris-9.patch (rev 0) +++ csw/mgar/pkg/xapian-core/trunk/files/0001-Fix-include-issue-on-Solaris-9.patch 2011-07-15 16:04:06 UTC (rev 15062) @@ -0,0 +1,24 @@ +From 257758591a51f3f361cf38b3e80d14044129c879 Mon Sep 17 00:00:00 2001 +From: Dagobert Michelsen +Date: Fri, 15 Jul 2011 17:55:41 +0200 +Subject: [PATCH] Fix include issue on Solaris 9 + +--- + tests/soaktest/soaktest.cc | 1 + + 1 files changed, 1 insertions(+), 0 deletions(-) + +diff --git a/tests/soaktest/soaktest.cc b/tests/soaktest/soaktest.cc +index 2c742c3..37b1aba 100644 +--- a/tests/soaktest/soaktest.cc ++++ b/tests/soaktest/soaktest.cc +@@ -28,6 +28,7 @@ + #include "testsuite.h" + + #include ++#include + + using namespace std; + +-- +1.7.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 Fri Jul 15 21:58:33 2011 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 15 Jul 2011 19:58:33 +0000 Subject: [csw-devel] SF.net SVN: gar:[15063] csw/mgar/pkg/xapian-core/trunk Message-ID: Revision: 15063 http://gar.svn.sourceforge.net/gar/?rev=15063&view=rev Author: dmichelsen Date: 2011-07-15 19:58:33 +0000 (Fri, 15 Jul 2011) Log Message: ----------- xapian-core: Final fixup Modified Paths: -------------- csw/mgar/pkg/xapian-core/trunk/Makefile Added Paths: ----------- csw/mgar/pkg/xapian-core/trunk/files/0002-Do-not-strip-norunpath-on-libtool.patch Modified: csw/mgar/pkg/xapian-core/trunk/Makefile =================================================================== --- csw/mgar/pkg/xapian-core/trunk/Makefile 2011-07-15 16:04:06 UTC (rev 15062) +++ csw/mgar/pkg/xapian-core/trunk/Makefile 2011-07-15 19:58:33 UTC (rev 15063) @@ -14,37 +14,36 @@ DISTFILES = $(NAME)-$(VERSION).tar.gz PATCHFILES += 0001-Fix-include-issue-on-Solaris-9.patch +PATCHFILES += 0002-Do-not-strip-norunpath-on-libtool.patch +VENDOR_URL = http://xapian.org/ + PACKAGES += CSWxapian CATALOGNAME_CSWxapian = xapian -SPKG_DESC_CSWxapian = An open source search engine library -RUNTIME_DEP_PKGS_CSWxapian += CSWxapianrt +SPKG_DESC_CSWxapian = Xapian search engine binaries +RUNTIME_DEP_PKGS_CSWxapian += CSWlibxapian22 +RUNTIME_DEP_PKGS_CSWxapian += CSWstlport +RUNTIME_DEP_PKGS_CSWxapian += CSWzlib -PACKAGES += CSWxapianrt -CATALOGNAME_CSWxapianrt = xapian_rt -SPKG_DESC_CSWxapianrt = Xapian runtime libraries -PKGFILES_CSWxapianrt = $(PKGFILES_RT) -RUNTIME_DEP_PKGS_CSWxapianrt += CSWstlport -RUNTIME_DEP_PKGS_CSWxapianrt += CSWzlib +PACKAGES += CSWlibxapian22 +SPKG_DESC_CSWlibxapian22 = An open source search engine library, libxapian.so.22 +PKGFILES_CSWlibxapian22 = $(call pkgfiles_lib,libxapian.so.22) +RUNTIME_DEP_PKGS_CSWlibxapian22 += CSWstlport +RUNTIME_DEP_PKGS_CSWlibxapian22 += CSWzlib PACKAGES += CSWxapian-dev SPKG_DESC_CSWxapian-dev = Xapian development files PKGFILES_CSWxapian-dev = $(PKGFILES_DEVEL) PKGFILES_CSWxapian-dev += $(docdir)/xapian-core/apidoc/.* -RUNTIME_DEP_PKGS_CSWxapian-dev += CSWxapian +PKGFILES_CSWxapian-dev += .*\.cmake +RUNTIME_DEP_PKGS_CSWxapian-dev += CSWlibxapian22 -# If we compile with Sun Studio it is impossible to build the Ruby bindings as -# TBD: Still true? +EXTRA_LD_FLAGS = -norunpath -lCrun -# TBD: Is this necessary -EXTRA_LD_FLAGS = -lm - BUILD64 = 1 +ISAEXEC = 1 -# Can't we just pass this via EXTRA_CXXFLAGS? -BUILD_ARGS = AM_CXXFLAGS="-library=stlport4 -features=tmplife" +# This is just an example of the default install location +CHECKPKG_OVERRIDES_CSWxapian += file-with-bad-content|/usr/local|root/opt/csw/share/doc/xapian-core/install.html -# We need the .la-file, otherwise xapian-config doesn't work -MERGE_EXCLUDE_LIBTOOL = - include gar/category.mk Added: csw/mgar/pkg/xapian-core/trunk/files/0002-Do-not-strip-norunpath-on-libtool.patch =================================================================== --- csw/mgar/pkg/xapian-core/trunk/files/0002-Do-not-strip-norunpath-on-libtool.patch (rev 0) +++ csw/mgar/pkg/xapian-core/trunk/files/0002-Do-not-strip-norunpath-on-libtool.patch 2011-07-15 19:58:33 UTC (rev 15063) @@ -0,0 +1,25 @@ +From 9cc62c92d2ba25839bf2c1277f00c8a1ff495ec6 Mon Sep 17 00:00:00 2001 +From: Dagobert Michelsen +Date: Fri, 15 Jul 2011 21:41:19 +0200 +Subject: [PATCH] Do not strip -norunpath on libtool + +--- + ltmain.sh | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/ltmain.sh b/ltmain.sh +index 3061e3c..5817d54 100755 +--- a/ltmain.sh ++++ b/ltmain.sh +@@ -5840,7 +5840,7 @@ func_mode_link () + # -O*, -flto*, -fwhopr*, -fuse-linker-plugin GCC link-time optimization + -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \ + -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-tp=*|--sysroot=*| \ +- -O*|-flto*|-fwhopr*|-fuse-linker-plugin) ++ -O*|-flto*|-fwhopr*|-fuse-linker-plugin|-norunpath) + func_quote_for_eval "$arg" + arg="$func_quote_for_eval_result" + func_append compile_command " $arg" +-- +1.7.6 + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From gadavis at users.sourceforge.net Fri Jul 15 23:31:58 2011 From: gadavis at users.sourceforge.net (gadavis at users.sourceforge.net) Date: Fri, 15 Jul 2011 21:31:58 +0000 Subject: [csw-devel] SF.net SVN: gar:[15064] csw/mgar/pkg/netcdf/trunk Message-ID: Revision: 15064 http://gar.svn.sourceforge.net/gar/?rev=15064&view=rev Author: gadavis Date: 2011-07-15 21:31:58 +0000 (Fri, 15 Jul 2011) Log Message: ----------- Bump NetCDF version to 4.1.3, switch back to mainline gar Modified Paths: -------------- csw/mgar/pkg/netcdf/trunk/Makefile Property Changed: ---------------- csw/mgar/pkg/netcdf/trunk/ Property changes on: csw/mgar/pkg/netcdf/trunk ___________________________________________________________________ Modified: svn:externals - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2-fortran + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 Modified: csw/mgar/pkg/netcdf/trunk/Makefile =================================================================== --- csw/mgar/pkg/netcdf/trunk/Makefile 2011-07-15 19:58:33 UTC (rev 15063) +++ csw/mgar/pkg/netcdf/trunk/Makefile 2011-07-15 21:31:58 UTC (rev 15064) @@ -3,7 +3,7 @@ # $Id$ NAME = netcdf -VERSION = 4.1.2 +VERSION = 4.1.3 CATEGORIES = lib DESCRIPTION = Machine-independent data formats for array-oriented scientific data SPKG_SOURCEURL = http://www.unidata.ucar.edu/software/netcdf/ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From gadavis at users.sourceforge.net Fri Jul 15 23:33:45 2011 From: gadavis at users.sourceforge.net (gadavis at users.sourceforge.net) Date: Fri, 15 Jul 2011 21:33:45 +0000 Subject: [csw-devel] SF.net SVN: gar:[15065] csw/mgar/pkg/netcdf/trunk/checksums Message-ID: Revision: 15065 http://gar.svn.sourceforge.net/gar/?rev=15065&view=rev Author: gadavis Date: 2011-07-15 21:33:45 +0000 (Fri, 15 Jul 2011) Log Message: ----------- Update checksum of netcdf to 4.1.3 Modified Paths: -------------- csw/mgar/pkg/netcdf/trunk/checksums Modified: csw/mgar/pkg/netcdf/trunk/checksums =================================================================== --- csw/mgar/pkg/netcdf/trunk/checksums 2011-07-15 21:31:58 UTC (rev 15064) +++ csw/mgar/pkg/netcdf/trunk/checksums 2011-07-15 21:33:45 UTC (rev 15065) @@ -1 +1 @@ -4a94ebe2d998d649159aa5665c83fb1a netcdf-4.1.2.tar.gz +ead16cb3b671f767396387dcb3c1a814 netcdf-4.1.3.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From gadavis at users.sourceforge.net Fri Jul 15 23:48:28 2011 From: gadavis at users.sourceforge.net (gadavis at users.sourceforge.net) Date: Fri, 15 Jul 2011 21:48:28 +0000 Subject: [csw-devel] SF.net SVN: gar:[15066] csw/mgar/pkg/gmtcoast/trunk Message-ID: Revision: 15066 http://gar.svn.sourceforge.net/gar/?rev=15066&view=rev Author: gadavis Date: 2011-07-15 21:48:28 +0000 (Fri, 15 Jul 2011) Log Message: ----------- Update GMT coastlines to 2.2.0 Modified Paths: -------------- csw/mgar/pkg/gmtcoast/trunk/Makefile csw/mgar/pkg/gmtcoast/trunk/checksums Modified: csw/mgar/pkg/gmtcoast/trunk/Makefile =================================================================== --- csw/mgar/pkg/gmtcoast/trunk/Makefile 2011-07-15 21:33:45 UTC (rev 15065) +++ csw/mgar/pkg/gmtcoast/trunk/Makefile 2011-07-15 21:48:28 UTC (rev 15066) @@ -3,21 +3,19 @@ # $Id$ NAME = gmtcoast -VERSION = 2.1.0 +VERSION = 2.2.0 CATEGORIES = apps -DESCRIPTION = Coastline Definition Files for Generic Mapping Tools +DESCRIPTION = Coastline Definition Files for the Generic Mapping Tools (GMT) define BLURB Support data for the Generic Mapping Tools (GMT) including GSHHS coastlines, rivers, and political boundaries. endef SPKG_SOURCEURL = http://gmt.soest.hawaii.edu/ -MASTER_SITES = ftp://ftp.iris.washington.edu/pub/gmt/ ftp://ftp.soest.hawaii.edu/gmt/ ftp://gd.tuwien.ac.at/pub/gmt/ +MASTER_SITES = ftp://ftp.soest.hawaii.edu/gmt/ ftp://gd.tuwien.ac.at/pub/gmt/ -DISTFILES = GSHHS$(VERSION)_coast.tar.bz2 \ - GSHHS$(VERSION)_full.tar.bz2 \ - GSHHS$(VERSION)_high.tar.bz2 +DISTFILES = gshhs-$(VERSION).tar.bz2 -UFILES_REGEX = GSHHS(\d+(?:\.\d+)*)_(.*).tar.gz +UFILES_REGEX = gshhs-(\d+(?:\.\d+)*).tar.gz ARCHALL = 1 @@ -34,21 +32,10 @@ ## The tarballs just dump into the current directory WORKSRC = $(WORKDIR) -PACKAGES += CSWgmtcoast-low -CATALOGNAME_CSWgmtcoast-low = gmtcoast_low -SPKG_DESC_CSWgmtcoast-low = Low resolution coastlines for the Generic Mapping Tools (GMT) -#PKGFILES_CSWgmtcoast-low += $(datadir)/coast/.*_[cli]\.cdf +OBSOLETED_BY_CSWgmtcoast += CSWgmtcoast-low +OBSOLETED_BY_CSWgmtcoast += CSWgmtcoast-high +OBSOLETED_BY_CSWgmtcoast += CSWgmtcoast-full -PACKAGES += CSWgmtcoast-high -CATALOGNAME_CSWgmtcoast-high = gmtcoast_high -SPKG_DESC_CSWgmtcoast-high = High resolution coastlines for the Generic Mapping Tools (GMT) -PKGFILES_CSWgmtcoast-high += $(datadir)/coast/.*_h\.cdf - -PACKAGES += CSWgmtcoast-full -CATALOGNAME_CSWgmtcoast-full = gmtcoast_full -SPKG_DESC_CSWgmtcoast-full = Full resolution coastlines for the Generic Mapping Tools (GMT) -PKGFILES_CSWgmtcoast-full += $(datadir)/coast/(.*)_f\.cdf - include gar/category.mk install-custom: Modified: csw/mgar/pkg/gmtcoast/trunk/checksums =================================================================== --- csw/mgar/pkg/gmtcoast/trunk/checksums 2011-07-15 21:33:45 UTC (rev 15065) +++ csw/mgar/pkg/gmtcoast/trunk/checksums 2011-07-15 21:48:28 UTC (rev 15066) @@ -1,3 +1 @@ -1f84a99effe96e12fb60f31fa3cf35bb GSHHS2.1.0_coast.tar.bz2 -da679a412056e401bb624a213d4b11d6 GSHHS2.1.0_full.tar.bz2 -51128a3c545fd48364a2da830ebce1b6 GSHHS2.1.0_high.tar.bz2 +db98bff37adc0d51fdf0ffa3834d45ad gshhs-2.2.0.tar.bz2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Sat Jul 16 15:31:51 2011 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sat, 16 Jul 2011 13:31:51 +0000 Subject: [csw-devel] SF.net SVN: gar:[15067] csw/mgar/pkg Message-ID: Revision: 15067 http://gar.svn.sourceforge.net/gar/?rev=15067&view=rev Author: wahwah Date: 2011-07-16 13:31:51 +0000 (Sat, 16 Jul 2011) Log Message: ----------- Initial commit Added Paths: ----------- csw/mgar/pkg/pyopenssl/ csw/mgar/pkg/pyopenssl/Makefile csw/mgar/pkg/pyopenssl/branches/ csw/mgar/pkg/pyopenssl/tags/ csw/mgar/pkg/pyopenssl/trunk/ csw/mgar/pkg/pyopenssl/trunk/Makefile csw/mgar/pkg/pyopenssl/trunk/checksums csw/mgar/pkg/pyopenssl/trunk/files/ Copied: csw/mgar/pkg/pyopenssl/Makefile (from rev 14839, csw/mgar/pkg/template/Makefile) =================================================================== --- csw/mgar/pkg/pyopenssl/Makefile (rev 0) +++ csw/mgar/pkg/pyopenssl/Makefile 2011-07-16 13:31:51 UTC (rev 15067) @@ -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/pyopenssl/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/pyopenssl/trunk/Makefile =================================================================== --- csw/mgar/pkg/pyopenssl/trunk/Makefile (rev 0) +++ csw/mgar/pkg/pyopenssl/trunk/Makefile 2011-07-16 13:31:51 UTC (rev 15067) @@ -0,0 +1,24 @@ +# $Id$ +# TODO (release-critical prefixed with !, non release-critical with *) +# +NAME = pyOpenSSL +VERSION = 0.11 +GARTYPE = v2 +CATEGORIES = python + +DESCRIPTION = OpenSSL bindings for Python +define BLURB + Long description +endef + +MASTER_SITES = http://launchpad.net/pyopenssl/main/$(VERSION)/+download/ +DISTFILES = $(DISTNAME).tar.gz + +PACKAGES = CSWpy-openssl +RUNTIME_DEP_PKGS_CSWpy-openssl += CSWosslrt +RUNTIME_DEP_PKGS_CSWpy-openssl += CSWlibpython2-6-1-0 + +TEST_SCRIPTS = + +include gar/category.mk + Property changes on: csw/mgar/pkg/pyopenssl/trunk/Makefile ___________________________________________________________________ Added: svn:keywords + Id Added: csw/mgar/pkg/pyopenssl/trunk/checksums =================================================================== --- csw/mgar/pkg/pyopenssl/trunk/checksums (rev 0) +++ csw/mgar/pkg/pyopenssl/trunk/checksums 2011-07-16 13:31:51 UTC (rev 15067) @@ -0,0 +1 @@ +9e76e57e00fa48745fcfe23944db1e6c pyOpenSSL-0.11.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 Jul 16 15:34:22 2011 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sat, 16 Jul 2011 13:34:22 +0000 Subject: [csw-devel] SF.net SVN: gar:[15068] csw/mgar/pkg Message-ID: Revision: 15068 http://gar.svn.sourceforge.net/gar/?rev=15068&view=rev Author: wahwah Date: 2011-07-16 13:34:22 +0000 (Sat, 16 Jul 2011) Log Message: ----------- Moving pyopenssl to lang-python. Added Paths: ----------- csw/mgar/pkg/lang-python/pyopenssl/ Removed Paths: ------------- csw/mgar/pkg/pyopenssl/ 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 Jul 16 17:32:42 2011 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Sat, 16 Jul 2011 15:32:42 +0000 Subject: [csw-devel] SF.net SVN: gar:[15069] csw/mgar/pkg/xapian-core/trunk/Makefile Message-ID: Revision: 15069 http://gar.svn.sourceforge.net/gar/?rev=15069&view=rev Author: dmichelsen Date: 2011-07-16 15:32:41 +0000 (Sat, 16 Jul 2011) Log Message: ----------- xapian-core: Adjust name of CSWlibxapian-dev Modified Paths: -------------- csw/mgar/pkg/xapian-core/trunk/Makefile Modified: csw/mgar/pkg/xapian-core/trunk/Makefile =================================================================== --- csw/mgar/pkg/xapian-core/trunk/Makefile 2011-07-16 13:34:22 UTC (rev 15068) +++ csw/mgar/pkg/xapian-core/trunk/Makefile 2011-07-16 15:32:41 UTC (rev 15069) @@ -31,12 +31,12 @@ RUNTIME_DEP_PKGS_CSWlibxapian22 += CSWstlport RUNTIME_DEP_PKGS_CSWlibxapian22 += CSWzlib -PACKAGES += CSWxapian-dev -SPKG_DESC_CSWxapian-dev = Xapian development files -PKGFILES_CSWxapian-dev = $(PKGFILES_DEVEL) -PKGFILES_CSWxapian-dev += $(docdir)/xapian-core/apidoc/.* -PKGFILES_CSWxapian-dev += .*\.cmake -RUNTIME_DEP_PKGS_CSWxapian-dev += CSWlibxapian22 +PACKAGES += CSWlibxapian-dev +SPKG_DESC_CSWlibxapian-dev = Xapian development files +PKGFILES_CSWlibxapian-dev = $(PKGFILES_DEVEL) +PKGFILES_CSWlibxapian-dev += $(docdir)/xapian-core/apidoc/.* +PKGFILES_CSWlibxapian-dev += .*\.cmake +RUNTIME_DEP_PKGS_CSWlibxapian-dev += CSWlibxapian22 EXTRA_LD_FLAGS = -norunpath -lCrun 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 Jul 16 17:33:10 2011 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Sat, 16 Jul 2011 15:33:10 +0000 Subject: [csw-devel] SF.net SVN: gar:[15070] csw/mgar/pkg/xapian-core/trunk/Makefile Message-ID: Revision: 15070 http://gar.svn.sourceforge.net/gar/?rev=15070&view=rev Author: dmichelsen Date: 2011-07-16 15:33:10 +0000 (Sat, 16 Jul 2011) Log Message: ----------- xapian-core: Adjust name of CSWlibxapian-dev Modified Paths: -------------- csw/mgar/pkg/xapian-core/trunk/Makefile Modified: csw/mgar/pkg/xapian-core/trunk/Makefile =================================================================== --- csw/mgar/pkg/xapian-core/trunk/Makefile 2011-07-16 15:32:41 UTC (rev 15069) +++ csw/mgar/pkg/xapian-core/trunk/Makefile 2011-07-16 15:33:10 UTC (rev 15070) @@ -32,7 +32,7 @@ RUNTIME_DEP_PKGS_CSWlibxapian22 += CSWzlib PACKAGES += CSWlibxapian-dev -SPKG_DESC_CSWlibxapian-dev = Xapian development files +SPKG_DESC_CSWlibxapian-dev = Xapian development files for libxapian.so.22 PKGFILES_CSWlibxapian-dev = $(PKGFILES_DEVEL) PKGFILES_CSWlibxapian-dev += $(docdir)/xapian-core/apidoc/.* PKGFILES_CSWlibxapian-dev += .*\.cmake 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 Jul 16 21:23:11 2011 From: rthurner at users.sourceforge.net (rthurner at users.sourceforge.net) Date: Sat, 16 Jul 2011 19:23:11 +0000 Subject: [csw-devel] SF.net SVN: gar:[15071] csw/mgar/pkg/libserf/trunk/Makefile Message-ID: Revision: 15071 http://gar.svn.sourceforge.net/gar/?rev=15071&view=rev Author: rthurner Date: 2011-07-16 19:23:10 +0000 (Sat, 16 Jul 2011) Log Message: ----------- serf, upgrade to serf-1.0.0 Modified Paths: -------------- csw/mgar/pkg/libserf/trunk/Makefile Modified: csw/mgar/pkg/libserf/trunk/Makefile =================================================================== --- csw/mgar/pkg/libserf/trunk/Makefile 2011-07-16 15:33:10 UTC (rev 15070) +++ csw/mgar/pkg/libserf/trunk/Makefile 2011-07-16 19:23:10 UTC (rev 15071) @@ -1,5 +1,5 @@ NAME = libserf -VERSION = 0.7.2 +VERSION = 1.0.0 DISTNAME = serf-$(VERSION) CATEGORIES = lib 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 Jul 16 22:50:13 2011 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Sat, 16 Jul 2011 20:50:13 +0000 Subject: [csw-devel] SF.net SVN: gar:[15072] csw/mgar/pkg/xapian-core/trunk Message-ID: Revision: 15072 http://gar.svn.sourceforge.net/gar/?rev=15072&view=rev Author: dmichelsen Date: 2011-07-16 20:50:13 +0000 (Sat, 16 Jul 2011) Log Message: ----------- xapian-core: Fix xapian-config to not rely on .la Modified Paths: -------------- csw/mgar/pkg/xapian-core/trunk/Makefile Added Paths: ----------- csw/mgar/pkg/xapian-core/trunk/files/0003-Do-not-bail-out-on-missing-.la.patch Modified: csw/mgar/pkg/xapian-core/trunk/Makefile =================================================================== --- csw/mgar/pkg/xapian-core/trunk/Makefile 2011-07-16 19:23:10 UTC (rev 15071) +++ csw/mgar/pkg/xapian-core/trunk/Makefile 2011-07-16 20:50:13 UTC (rev 15072) @@ -15,6 +15,7 @@ PATCHFILES += 0001-Fix-include-issue-on-Solaris-9.patch PATCHFILES += 0002-Do-not-strip-norunpath-on-libtool.patch +PATCHFILES += 0003-Do-not-bail-out-on-missing-.la.patch VENDOR_URL = http://xapian.org/ Added: csw/mgar/pkg/xapian-core/trunk/files/0003-Do-not-bail-out-on-missing-.la.patch =================================================================== --- csw/mgar/pkg/xapian-core/trunk/files/0003-Do-not-bail-out-on-missing-.la.patch (rev 0) +++ csw/mgar/pkg/xapian-core/trunk/files/0003-Do-not-bail-out-on-missing-.la.patch 2011-07-16 20:50:13 UTC (rev 15072) @@ -0,0 +1,27 @@ +From ae30dfc8465c8bbd628d18ee5f7d175cba0ea3ef Mon Sep 17 00:00:00 2001 +From: Dagobert Michelsen +Date: Sat, 16 Jul 2011 22:47:51 +0200 +Subject: [PATCH] Do not bail out on missing .la + +--- + xapian-config.in | 4 ++-- + 1 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/xapian-config.in b/xapian-config.in +index 7fdd2ea..6ad567b 100644 +--- a/xapian-config.in ++++ b/xapian-config.in +@@ -281,8 +281,8 @@ for arg in $actions ; do + continue + fi + +- echo "$0: Can't find libxapian at LIBRARY_VERSION_SUFFIX@.la to link against." 1>&2 +- exit 1 ++# echo "$0: Can't find libxapian at LIBRARY_VERSION_SUFFIX@.la to link against." 1>&2 ++# exit 1 + fi + + set_L_to_library_path +-- +1.7.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 Jul 16 23:27:16 2011 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Sat, 16 Jul 2011 21:27:16 +0000 Subject: [csw-devel] SF.net SVN: gar:[15073] csw/mgar/pkg/xapian-bindings/trunk Message-ID: Revision: 15073 http://gar.svn.sourceforge.net/gar/?rev=15073&view=rev Author: dmichelsen Date: 2011-07-16 21:27:15 +0000 (Sat, 16 Jul 2011) Log Message: ----------- xapian-bindings: Update to 1.2.6, general rework, still some bindings left to do Modified Paths: -------------- csw/mgar/pkg/xapian-bindings/trunk/Makefile csw/mgar/pkg/xapian-bindings/trunk/checksums Added Paths: ----------- csw/mgar/pkg/xapian-bindings/trunk/files/0001-Do-not-strip-norunpath-on-libtool.patch Modified: csw/mgar/pkg/xapian-bindings/trunk/Makefile =================================================================== --- csw/mgar/pkg/xapian-bindings/trunk/Makefile 2011-07-16 20:50:13 UTC (rev 15072) +++ csw/mgar/pkg/xapian-bindings/trunk/Makefile 2011-07-16 21:27:15 UTC (rev 15073) @@ -1,10 +1,10 @@ NAME = xapian-bindings -VERSION = 1.0.11 +VERSION = 1.2.6 CATEGORIES = lib -EXTRA_MODULATORS = BINDING +#EXTRA_MODULATORS = BINDING #MODULATIONS_BINDING = ruby python -MODULATIONS_BINDING = ruby +#MODULATIONS_BINDING = ruby DESCRIPTION = Xapian bindings for SWIG and JNI define BLURB @@ -14,44 +14,36 @@ endef MASTER_SITES = http://oligarchy.co.uk/xapian/$(VERSION)/ +DISTFILES = $(DISTNAME).tar.gz -DISTFILES = $(NAME)-$(VERSION).tar.gz +PATCHFILES += 0001-Do-not-strip-norunpath-on-libtool.patch -# We define upstream file regex so we can be notifed of new upstream software release -UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz +BUILD_DEP_PKGS += CSWpython-dev +BUILD_DEP_PKGS += CSWruby18-dev -PACKAGES = CSWpyxapian CSWrbxapian -CATALOGNAME_CSWpyxapian = py_xapian -CATALOGNAME_CSWrbxapian = rb_xapian +PACKAGES += CSWpy-xapian +SPKG_DESC_CSWpy-xapian = Xapian bindings for Python +RUNTIME_DEP_PKGS_CSWpy-xapian += CSWstlport +RUNTIME_DEP_PKGS_CSWpy-xapian += CSWpython +RUNTIME_DEP_PKGS_CSWpy-xapian += CSWlibxapian22 +PYCOMPILE = 1 -SPKG_DESC_CSWpyxapian = Xapian bindings for Python -SPKG_DESC_CSWrbxapian = Xapian bindings for Ruby +PACKAGES += CSWrb-xapian +SPKG_DESC_CSWrb-xapian = Xapian bindings for Ruby +PKGFILES_CSWrb-xapian = $(libdir)/ruby/.* +PKGFILES_CSWrb-xapian += $(docdir)/xapian-bindings/ruby/.* +RUNTIME_DEP_PKGS_CSWrb-xapian += CSWstlport +RUNTIME_DEP_PKGS_CSWrb-xapian += CSWruby18 +RUNTIME_DEP_PKGS_CSWrb-xapian += CSWlibxapian22 -BUILD_DEP_PKGS = CSWrubydev -RUNTIME_DEP_PKGS_CSWpyxapian = CSWpython CSWxapianrt -RUNTIME_DEP_PKGS_CSWrbxapian = CSWruby CSWxapianrt CSWgcc3corert -# This should be CSWgcc3g++rt, but the lib is actually in CSWgcc3g++ -RUNTIME_DEP_PKGS_CSWrbxapian += CSWgcc3g++ +EXTRA_LINKER_FLAGS = -norunpath -GARCOMPILER_ruby = GCC3 -GARCOMPILER_python = SOS11 -GARCOMPILER = $(if $(GARCOMPILER_$(BINDING)),$(GARCOMPILER_$(BINDING)),SOS11) +CONFIGURE_ARGS += $(DIRPATHS) +CONFIGURE_ARGS += --with-python +CONFIGURE_ARGS += --with-php +CONFIGURE_ARGS += --with-ruby +CONFIGURE_ARGS += --without-tcl +CONFIGURE_ARGS += --without-csharp +CONFIGURE_ARGS += --without-java -CONFIGURE_ARGS_ruby = --without-python --without-php --with-ruby --without-tcl --without-csharp --without-java -CONFIGURE_ARGS_python = --with-python --without-php --without-ruby --without-tcl --without-csharp --without-java - -CONFIGURE_ARGS = $(DIRPATHS) -CONFIGURE_ARGS += $(CONFIGURE_ARGS_$(BINDING)) - -TEST_TARGET = check - -MERGE_SCRIPTS_isa-sparcv8-binding-ruby = copy-all -MERGE_SCRIPTS_isa-sparcv8-binding-python = copy-all - -MERGE_SCRIPTS_isa-i386-binding-ruby = copy-all -MERGE_SCRIPTS_isa-i386-binding-python = copy-all - -PKGFILES_CSWrbxapian = $(libdir)/ruby/.* -PKGFILES_CSWrbxapian += $(docdir)/xapian-bindings/ruby/.* - include gar/category.mk Modified: csw/mgar/pkg/xapian-bindings/trunk/checksums =================================================================== --- csw/mgar/pkg/xapian-bindings/trunk/checksums 2011-07-16 20:50:13 UTC (rev 15072) +++ csw/mgar/pkg/xapian-bindings/trunk/checksums 2011-07-16 21:27:15 UTC (rev 15073) @@ -1 +1 @@ -7297a1d09564fe31b768fe58eabd219d download/xapian-bindings-1.0.11.tar.gz +a323fc86444dd23cc5db23e96e5b0116 xapian-bindings-1.2.6.tar.gz Added: csw/mgar/pkg/xapian-bindings/trunk/files/0001-Do-not-strip-norunpath-on-libtool.patch =================================================================== --- csw/mgar/pkg/xapian-bindings/trunk/files/0001-Do-not-strip-norunpath-on-libtool.patch (rev 0) +++ csw/mgar/pkg/xapian-bindings/trunk/files/0001-Do-not-strip-norunpath-on-libtool.patch 2011-07-16 21:27:15 UTC (rev 15073) @@ -0,0 +1,25 @@ +From 2a615d0232a1e307391956b69f03dfa2a8cb261d Mon Sep 17 00:00:00 2001 +From: Dagobert Michelsen +Date: Sat, 16 Jul 2011 23:12:42 +0200 +Subject: [PATCH] Do not strip -norunpath on libtool + +--- + ltmain.sh | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/ltmain.sh b/ltmain.sh +index 3061e3c..5817d54 100755 +--- a/ltmain.sh ++++ b/ltmain.sh +@@ -5840,7 +5840,7 @@ func_mode_link () + # -O*, -flto*, -fwhopr*, -fuse-linker-plugin GCC link-time optimization + -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \ + -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-tp=*|--sysroot=*| \ +- -O*|-flto*|-fwhopr*|-fuse-linker-plugin) ++ -O*|-flto*|-fwhopr*|-fuse-linker-plugin|-norunpath) + func_quote_for_eval "$arg" + arg="$func_quote_for_eval_result" + func_append compile_command " $arg" +-- +1.7.6 + 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 Jul 16 23:52:26 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Sat, 16 Jul 2011 21:52:26 +0000 Subject: [csw-devel] SF.net SVN: gar:[15074] csw/mgar/pkg/gettext/trunk/Makefile Message-ID: Revision: 15074 http://gar.svn.sourceforge.net/gar/?rev=15074&view=rev Author: bdwalton Date: 2011-07-16 21:52:26 +0000 (Sat, 16 Jul 2011) Log Message: ----------- gettext/trunk: address mantis id 4806 by capturing -dev package content with pkgfiles_devel Modified Paths: -------------- csw/mgar/pkg/gettext/trunk/Makefile Modified: csw/mgar/pkg/gettext/trunk/Makefile =================================================================== --- csw/mgar/pkg/gettext/trunk/Makefile 2011-07-16 21:27:15 UTC (rev 15073) +++ csw/mgar/pkg/gettext/trunk/Makefile 2011-07-16 21:52:26 UTC (rev 15074) @@ -135,11 +135,7 @@ SPKG_DESC_CSWlibgettextlib0-14-1 += GNU locale utilities, libgettextlib-0.14.1.so PKGFILES_CSWlibgettextlib0-17 += $(call baseisadirs,$(libdir),libgettextlib-0\.17\.so) PKGFILES_CSWlibgettextlib0-17 += $(call baseisadirs,$(libdir),libgettextlib-0\.17\.so(\.\d+)*) -PKGFILES_CSWggettext-dev += /opt/csw/lib/.*libasprintf.so -PKGFILES_CSWggettext-dev += /opt/csw/lib/.*libgettextlib.so -PKGFILES_CSWggettext-dev += /opt/csw/lib/.*libgettextpo.so -PKGFILES_CSWggettext-dev += /opt/csw/lib/.*libgettextsrc.so -PKGFILES_CSWggettext-dev += /opt/csw/lib/.*libintl.so +PKGFILES_CSWggettext-dev += $(PKGFILES_DEVEL) PKGFILES_CSWggettext-data += /opt/csw/share/locale/.*mo PKGFILES_CSWggettextrt += /opt/csw/share/.*ggettextrt.* PKGFILES_CSWggettextdoc = $(PKGFILES_DOC) 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 Jul 16 23:59:35 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Sat, 16 Jul 2011 21:59:35 +0000 Subject: [csw-devel] SF.net SVN: gar:[15075] csw/mgar/pkg/gettext/trunk/Makefile Message-ID: Revision: 15075 http://gar.svn.sourceforge.net/gar/?rev=15075&view=rev Author: bdwalton Date: 2011-07-16 21:59:34 +0000 (Sat, 16 Jul 2011) Log Message: ----------- gettext/trunk: drop noisaexec Modified Paths: -------------- csw/mgar/pkg/gettext/trunk/Makefile Modified: csw/mgar/pkg/gettext/trunk/Makefile =================================================================== --- csw/mgar/pkg/gettext/trunk/Makefile 2011-07-16 21:52:26 UTC (rev 15074) +++ csw/mgar/pkg/gettext/trunk/Makefile 2011-07-16 21:59:34 UTC (rev 15075) @@ -210,7 +210,6 @@ UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz BUILD64 = 1 -NOISAEXEC = 1 STRIP_LIBTOOL = 1 EXTRA_LINKER_FLAGS = -xnorunpath This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Sun Jul 17 03:03:42 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Sun, 17 Jul 2011 01:03:42 +0000 Subject: [csw-devel] SF.net SVN: gar:[15076] csw/mgar/pkg/gettext/trunk/Makefile Message-ID: Revision: 15076 http://gar.svn.sourceforge.net/gar/?rev=15076&view=rev Author: bdwalton Date: 2011-07-17 01:03:42 +0000 (Sun, 17 Jul 2011) Log Message: ----------- gettext/trunk: update curses deps Modified Paths: -------------- csw/mgar/pkg/gettext/trunk/Makefile Modified: csw/mgar/pkg/gettext/trunk/Makefile =================================================================== --- csw/mgar/pkg/gettext/trunk/Makefile 2011-07-16 21:59:34 UTC (rev 15075) +++ csw/mgar/pkg/gettext/trunk/Makefile 2011-07-17 01:03:42 UTC (rev 15076) @@ -7,6 +7,9 @@ GNU gettext utilities are a set of tools that provides a framework to help other GNU packages produce multi-lingual messages endef + +BUILD_DEP_PKGS += CSWlibncurses-dev + PACKAGES += CSWggettext PACKAGES += CSWggettextdoc PACKAGES += CSWlibasprintf0 @@ -66,7 +69,7 @@ RUNTIME_DEP_PKGS_CSWggettext += CSWlibintl3 RUNTIME_DEP_PKGS_CSWggettext += CSWlibintl8 RUNTIME_DEP_PKGS_CSWggettext += CSWlibxml2 -RUNTIME_DEP_PKGS_CSWggettext += CSWncurses +RUNTIME_DEP_PKGS_CSWggettext += CSWlibncurses5 RUNTIME_DEP_PKGS_CSWggettext += CSWggettext-data RUNTIME_DEP_PKGS_CSWggettext-dev += CSWlibasprintf0 RUNTIME_DEP_PKGS_CSWggettext-dev += CSWlibgettextlib0-18-1 @@ -85,11 +88,11 @@ RUNTIME_DEP_PKGS_CSWlibgettextlib0-14-1 += CSWlibintl3 RUNTIME_DEP_PKGS_CSWlibgettextlib0-17 += CSWiconv RUNTIME_DEP_PKGS_CSWlibgettextlib0-17 += CSWlibintl8 -RUNTIME_DEP_PKGS_CSWlibgettextlib0-17 += CSWncurses +RUNTIME_DEP_PKGS_CSWlibgettextlib0-17 += CSWlibncurses5 RUNTIME_DEP_PKGS_CSWlibgettextlib0-18-1 += CSWiconv RUNTIME_DEP_PKGS_CSWlibgettextlib0-18-1 += CSWlibintl8 RUNTIME_DEP_PKGS_CSWlibgettextlib0-18-1 += CSWlibxml2 -RUNTIME_DEP_PKGS_CSWlibgettextlib0-18-1 += CSWncurses +RUNTIME_DEP_PKGS_CSWlibgettextlib0-18-1 += CSWlibncurses5 RUNTIME_DEP_PKGS_CSWlibgettextlib0-18-1 += CSWggettext-data RUNTIME_DEP_PKGS_CSWlibgettextpo0 += CSWiconv RUNTIME_DEP_PKGS_CSWlibgettextpo0 += CSWlibintl8 @@ -101,7 +104,7 @@ RUNTIME_DEP_PKGS_CSWlibgettextsrc0-18-1 += CSWlibgettextlib0-18-1 RUNTIME_DEP_PKGS_CSWlibgettextsrc0-18-1 += CSWlibintl8 RUNTIME_DEP_PKGS_CSWlibgettextsrc0-18-1 += CSWlibxml2 -RUNTIME_DEP_PKGS_CSWlibgettextsrc0-18-1 += CSWncurses +RUNTIME_DEP_PKGS_CSWlibgettextsrc0-18-1 += CSWlibncurses5 RUNTIME_DEP_PKGS_CSWlibgettextsrc0-18-1 += CSWggettext-data RUNTIME_DEP_PKGS_CSWlibintl2 += CSWiconv RUNTIME_DEP_PKGS_CSWlibintl2 += CSWggettext-data This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Sun Jul 17 04:43:17 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Sun, 17 Jul 2011 02:43:17 +0000 Subject: [csw-devel] SF.net SVN: gar:[15077] csw/mgar/pkg/gettext/trunk/Makefile Message-ID: Revision: 15077 http://gar.svn.sourceforge.net/gar/?rev=15077&view=rev Author: bdwalton Date: 2011-07-17 02:43:16 +0000 (Sun, 17 Jul 2011) Log Message: ----------- gettext/trunk: modernize libxml2 deps Modified Paths: -------------- csw/mgar/pkg/gettext/trunk/Makefile Modified: csw/mgar/pkg/gettext/trunk/Makefile =================================================================== --- csw/mgar/pkg/gettext/trunk/Makefile 2011-07-17 01:03:42 UTC (rev 15076) +++ csw/mgar/pkg/gettext/trunk/Makefile 2011-07-17 02:43:16 UTC (rev 15077) @@ -8,7 +8,7 @@ endef -BUILD_DEP_PKGS += CSWlibncurses-dev +BUILD_DEP_PKGS += CSWlibncurses-dev CSWlibxml2-dev PACKAGES += CSWggettext PACKAGES += CSWggettextdoc @@ -68,7 +68,7 @@ RUNTIME_DEP_PKGS_CSWggettext += CSWlibintl2 RUNTIME_DEP_PKGS_CSWggettext += CSWlibintl3 RUNTIME_DEP_PKGS_CSWggettext += CSWlibintl8 -RUNTIME_DEP_PKGS_CSWggettext += CSWlibxml2 +RUNTIME_DEP_PKGS_CSWggettext += CSWlibxml2-2 RUNTIME_DEP_PKGS_CSWggettext += CSWlibncurses5 RUNTIME_DEP_PKGS_CSWggettext += CSWggettext-data RUNTIME_DEP_PKGS_CSWggettext-dev += CSWlibasprintf0 @@ -91,7 +91,7 @@ RUNTIME_DEP_PKGS_CSWlibgettextlib0-17 += CSWlibncurses5 RUNTIME_DEP_PKGS_CSWlibgettextlib0-18-1 += CSWiconv RUNTIME_DEP_PKGS_CSWlibgettextlib0-18-1 += CSWlibintl8 -RUNTIME_DEP_PKGS_CSWlibgettextlib0-18-1 += CSWlibxml2 +RUNTIME_DEP_PKGS_CSWlibgettextlib0-18-1 += CSWlibxml2-2 RUNTIME_DEP_PKGS_CSWlibgettextlib0-18-1 += CSWlibncurses5 RUNTIME_DEP_PKGS_CSWlibgettextlib0-18-1 += CSWggettext-data RUNTIME_DEP_PKGS_CSWlibgettextpo0 += CSWiconv @@ -103,7 +103,7 @@ RUNTIME_DEP_PKGS_CSWlibgettextsrc0-18-1 += CSWiconv RUNTIME_DEP_PKGS_CSWlibgettextsrc0-18-1 += CSWlibgettextlib0-18-1 RUNTIME_DEP_PKGS_CSWlibgettextsrc0-18-1 += CSWlibintl8 -RUNTIME_DEP_PKGS_CSWlibgettextsrc0-18-1 += CSWlibxml2 +RUNTIME_DEP_PKGS_CSWlibgettextsrc0-18-1 += CSWlibxml2-2 RUNTIME_DEP_PKGS_CSWlibgettextsrc0-18-1 += CSWlibncurses5 RUNTIME_DEP_PKGS_CSWlibgettextsrc0-18-1 += CSWggettext-data RUNTIME_DEP_PKGS_CSWlibintl2 += CSWiconv 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 Jul 17 09:30:08 2011 From: rthurner at users.sourceforge.net (rthurner at users.sourceforge.net) Date: Sun, 17 Jul 2011 07:30:08 +0000 Subject: [csw-devel] SF.net SVN: gar:[15078] csw/mgar/pkg/libserf/trunk/checksums Message-ID: Revision: 15078 http://gar.svn.sourceforge.net/gar/?rev=15078&view=rev Author: rthurner Date: 2011-07-17 07:30:07 +0000 (Sun, 17 Jul 2011) Log Message: ----------- libserf: update checksums to 1.0 Modified Paths: -------------- csw/mgar/pkg/libserf/trunk/checksums Modified: csw/mgar/pkg/libserf/trunk/checksums =================================================================== --- csw/mgar/pkg/libserf/trunk/checksums 2011-07-17 02:43:16 UTC (rev 15077) +++ csw/mgar/pkg/libserf/trunk/checksums 2011-07-17 07:30:07 UTC (rev 15078) @@ -1 +1 @@ -66ed12163b14b704888e628ee38e9581 serf-0.7.2.tar.bz2 +3b179ed18f65c43141528aa6d2440db4 serf-1.0.0.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 Sun Jul 17 10:13:14 2011 From: rthurner at users.sourceforge.net (rthurner at users.sourceforge.net) Date: Sun, 17 Jul 2011 08:13:14 +0000 Subject: [csw-devel] SF.net SVN: gar:[15079] csw/mgar/pkg/libserf/trunk/Makefile Message-ID: Revision: 15079 http://gar.svn.sourceforge.net/gar/?rev=15079&view=rev Author: rthurner Date: 2011-07-17 08:13:14 +0000 (Sun, 17 Jul 2011) Log Message: ----------- libserf: ignore strange file collision errors reported by checkpkg Modified Paths: -------------- csw/mgar/pkg/libserf/trunk/Makefile Modified: csw/mgar/pkg/libserf/trunk/Makefile =================================================================== --- csw/mgar/pkg/libserf/trunk/Makefile 2011-07-17 07:30:07 UTC (rev 15078) +++ csw/mgar/pkg/libserf/trunk/Makefile 2011-07-17 08:13:14 UTC (rev 15079) @@ -14,30 +14,17 @@ MASTER_SITES = http://serf.googlecode.com/files/ DISTFILES = $(DISTNAME).tar.bz2 +LICENSE = LICENSE +VENDOR_URL = http://code.google.com/p/serf/ -DEP_PKGS = CSWapr CSWapr-util CSWbdb48 CSWexpat CSWiconv CSWoldaprt CSWosslrt CSWzlib - # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = serf-(\d+(?:\.\d+)*).tar.bz2 -OBSOLETED_BY_CSWlibserf0-0 = CSWlibserf -OBSOLETED_BY_CSWlibserf-dev = CSWlibserf +PACKAGES += CSWlibserf1-0 +CATALOGNAME_CSWlibserf1-0 = libserf1_0 +SPKG_DESC_CSWlibserf1-0 += HTTP client library built on APR, multiplexes connections, provides libserf-1.so.0 +DEP_PKGS = CSWapr CSWapr-util CSWbdb48 CSWexpat CSWiconv CSWoldaprt CSWosslrt CSWzlib -PACKAGES += CSWlibserf0-0 -CATALOGNAME_CSWlibserf0-0 = libserf0_0 -SPKG_DESC_CSWlibserf0-0 += HTTP client library built on APR, multiplexes connections, provides libserf-0.so.0 -PKGFILES_CSWlibserf0-0 += $(call baseisadirs,$(libdir),libserf-0\.so\.0(\.\d+)*) - -PACKAGES += CSWlibserf-dev -CATALOGNAME_CSWlibserf-dev = libserf_dev -SPKG_DESC_CSWlibserf-dev = Development files for libserf -PKGFILES_CSWlibserf-dev += $(PKGFILES_DEVEL) -RUNTIME_DEP_PKGS_CSWlibserf-dev = CSWlibserf0-0 - -LICENSE = LICENSE - -VENDOR_URL = http://code.google.com/p/serf/ - # Make sure the current directory comes before everything else INCLUDE_FLAGS = -I. -I$(includedir) @@ -53,6 +40,13 @@ TEST_TARGET = check +CHECKPKG_OVERRIDES_CSWlibserf1-0 += file-collision|/opt/csw/include/serf_bucket_util.h|CSWlibserf-devel|CSWlibserf1-0 +CHECKPKG_OVERRIDES_CSWlibserf1-0 += file-collision|/opt/csw/include/serf_private.h|CSWlibserf-devel|CSWlibserf1-0 +CHECKPKG_OVERRIDES_CSWlibserf1-0 += file-collision|/opt/csw/include/serf_bucket_types.h|CSWlibserf-devel|CSWlibserf1-0 +CHECKPKG_OVERRIDES_CSWlibserf1-0 += file-collision|/opt/csw/include/serf.h|CSWlibserf-devel|CSWlibserf1-0 +CHECKPKG_OVERRIDES_CSWlibserf1-0 += shared-lib-package-contains-so-symlink|file=/opt/csw/lib/libserf-1.so +CHECKPKG_OVERRIDES_CSWlibserf1-0 += shared-lib-package-contains-so-symlink|file=/opt/csw/lib/libserf-1.so + include gar/category.mk post-configure-modulated: APR_LIBTOOL = $(shell $(bindir)/apr-1-config --apr-libtool) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From maciej at opencsw.org Sun Jul 17 10:37:59 2011 From: maciej at opencsw.org (=?UTF-8?Q?Maciej_Blizi=C5=84ski?=) Date: Sun, 17 Jul 2011 09:37:59 +0100 Subject: [csw-devel] SF.net SVN: gar:[15079] csw/mgar/pkg/libserf/trunk/Makefile In-Reply-To: References: Message-ID: Hi Rupert, 2011/7/17 : > +CHECKPKG_OVERRIDES_CSWlibserf1-0 += file-collision|/opt/csw/include/serf_bucket_util.h|CSWlibserf-devel|CSWlibserf1-0 > +CHECKPKG_OVERRIDES_CSWlibserf1-0 += file-collision|/opt/csw/include/serf_private.h|CSWlibserf-devel|CSWlibserf1-0 > +CHECKPKG_OVERRIDES_CSWlibserf1-0 += file-collision|/opt/csw/include/serf_bucket_types.h|CSWlibserf-devel|CSWlibserf1-0 > +CHECKPKG_OVERRIDES_CSWlibserf1-0 += file-collision|/opt/csw/include/serf.h|CSWlibserf-devel|CSWlibserf1-0 > +CHECKPKG_OVERRIDES_CSWlibserf1-0 += shared-lib-package-contains-so-symlink|file=/opt/csw/lib/libserf-1.so > +CHECKPKG_OVERRIDES_CSWlibserf1-0 += shared-lib-package-contains-so-symlink|file=/opt/csw/lib/libserf-1.so Why override these file collisions? Isn't it better to change the packages so that there aren't collisions there? If /opt/csw/include/serf_bucket_util.h is in both CSWlibserf-devel and CSWlibserf1-0 packages, it's best to remove the file from one of them. Maciej From rthurner at users.sourceforge.net Sun Jul 17 11:24:53 2011 From: rthurner at users.sourceforge.net (rthurner at users.sourceforge.net) Date: Sun, 17 Jul 2011 09:24:53 +0000 Subject: [csw-devel] SF.net SVN: gar:[15080] csw/mgar/pkg/libserf/trunk/Makefile Message-ID: Revision: 15080 http://gar.svn.sourceforge.net/gar/?rev=15080&view=rev Author: rthurner Date: 2011-07-17 09:24:53 +0000 (Sun, 17 Jul 2011) Log Message: ----------- libserf, obsolete devel, and not working 0-0 package Modified Paths: -------------- csw/mgar/pkg/libserf/trunk/Makefile Modified: csw/mgar/pkg/libserf/trunk/Makefile =================================================================== --- csw/mgar/pkg/libserf/trunk/Makefile 2011-07-17 08:13:14 UTC (rev 15079) +++ csw/mgar/pkg/libserf/trunk/Makefile 2011-07-17 09:24:53 UTC (rev 15080) @@ -25,6 +25,10 @@ SPKG_DESC_CSWlibserf1-0 += HTTP client library built on APR, multiplexes connections, provides libserf-1.so.0 DEP_PKGS = CSWapr CSWapr-util CSWbdb48 CSWexpat CSWiconv CSWoldaprt CSWosslrt CSWzlib +OBSOLETED_BY_CSWlibserf1-0 = CSWlibserf +OBSOLETED_BY_CSWlibserf1-0 = CSWlibserf-devel +OBSOLETED_BY_CSWlibserf1-0 = CSWlibserf0-0 + # Make sure the current directory comes before everything else INCLUDE_FLAGS = -I. -I$(includedir) @@ -40,10 +44,6 @@ TEST_TARGET = check -CHECKPKG_OVERRIDES_CSWlibserf1-0 += file-collision|/opt/csw/include/serf_bucket_util.h|CSWlibserf-devel|CSWlibserf1-0 -CHECKPKG_OVERRIDES_CSWlibserf1-0 += file-collision|/opt/csw/include/serf_private.h|CSWlibserf-devel|CSWlibserf1-0 -CHECKPKG_OVERRIDES_CSWlibserf1-0 += file-collision|/opt/csw/include/serf_bucket_types.h|CSWlibserf-devel|CSWlibserf1-0 -CHECKPKG_OVERRIDES_CSWlibserf1-0 += file-collision|/opt/csw/include/serf.h|CSWlibserf-devel|CSWlibserf1-0 CHECKPKG_OVERRIDES_CSWlibserf1-0 += shared-lib-package-contains-so-symlink|file=/opt/csw/lib/libserf-1.so CHECKPKG_OVERRIDES_CSWlibserf1-0 += shared-lib-package-contains-so-symlink|file=/opt/csw/lib/libserf-1.so 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 Jul 17 11:25:14 2011 From: rthurner at users.sourceforge.net (rthurner at users.sourceforge.net) Date: Sun, 17 Jul 2011 09:25:14 +0000 Subject: [csw-devel] SF.net SVN: gar:[15081] csw/mgar/pkg/libserf/trunk/Makefile Message-ID: Revision: 15081 http://gar.svn.sourceforge.net/gar/?rev=15081&view=rev Author: rthurner Date: 2011-07-17 09:25:14 +0000 (Sun, 17 Jul 2011) Log Message: ----------- libserf, obsolete devel, and not working 0-0 package Modified Paths: -------------- csw/mgar/pkg/libserf/trunk/Makefile Modified: csw/mgar/pkg/libserf/trunk/Makefile =================================================================== --- csw/mgar/pkg/libserf/trunk/Makefile 2011-07-17 09:24:53 UTC (rev 15080) +++ csw/mgar/pkg/libserf/trunk/Makefile 2011-07-17 09:25:14 UTC (rev 15081) @@ -25,7 +25,6 @@ SPKG_DESC_CSWlibserf1-0 += HTTP client library built on APR, multiplexes connections, provides libserf-1.so.0 DEP_PKGS = CSWapr CSWapr-util CSWbdb48 CSWexpat CSWiconv CSWoldaprt CSWosslrt CSWzlib -OBSOLETED_BY_CSWlibserf1-0 = CSWlibserf OBSOLETED_BY_CSWlibserf1-0 = CSWlibserf-devel OBSOLETED_BY_CSWlibserf1-0 = CSWlibserf0-0 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 Jul 17 12:07:00 2011 From: rthurner at users.sourceforge.net (rthurner at users.sourceforge.net) Date: Sun, 17 Jul 2011 10:07:00 +0000 Subject: [csw-devel] SF.net SVN: gar:[15082] csw/mgar/pkg/libserf/trunk/Makefile Message-ID: Revision: 15082 http://gar.svn.sourceforge.net/gar/?rev=15082&view=rev Author: rthurner Date: 2011-07-17 10:07:00 +0000 (Sun, 17 Jul 2011) Log Message: ----------- libserf, checkpkg does not know about absoleted packages .. so still ignore warnings Modified Paths: -------------- csw/mgar/pkg/libserf/trunk/Makefile Modified: csw/mgar/pkg/libserf/trunk/Makefile =================================================================== --- csw/mgar/pkg/libserf/trunk/Makefile 2011-07-17 09:25:14 UTC (rev 15081) +++ csw/mgar/pkg/libserf/trunk/Makefile 2011-07-17 10:07:00 UTC (rev 15082) @@ -46,6 +46,13 @@ CHECKPKG_OVERRIDES_CSWlibserf1-0 += shared-lib-package-contains-so-symlink|file=/opt/csw/lib/libserf-1.so CHECKPKG_OVERRIDES_CSWlibserf1-0 += shared-lib-package-contains-so-symlink|file=/opt/csw/lib/libserf-1.so +# overrides which whould not be necessary, as the package is obsoleted by this one +CHECKPKG_OVERRIDES_CSWlibserf1-0 += file-collision|/opt/csw/include/serf_bucket_util.h|CSWlibserf-devel|CSWlibserf1-0 +CHECKPKG_OVERRIDES_CSWlibserf1-0 += file-collision|/opt/csw/include/serf_private.h|CSWlibserf-devel|CSWlibserf1-0 +CHECKPKG_OVERRIDES_CSWlibserf1-0 += file-collision|/opt/csw/include/serf_bucket_types.h|CSWlibserf-devel|CSWlibserf1-0 +CHECKPKG_OVERRIDES_CSWlibserf1-0 += file-collision|/opt/csw/include/serf.h|CSWlibserf-devel|CSWlibserf1-0 + + include gar/category.mk post-configure-modulated: APR_LIBTOOL = $(shell $(bindir)/apr-1-config --apr-libtool) 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 Jul 17 13:30:10 2011 From: rthurner at users.sourceforge.net (rthurner at users.sourceforge.net) Date: Sun, 17 Jul 2011 11:30:10 +0000 Subject: [csw-devel] SF.net SVN: gar:[15083] csw/mgar/pkg/libserf/trunk/Makefile Message-ID: Revision: 15083 http://gar.svn.sourceforge.net/gar/?rev=15083&view=rev Author: rthurner Date: 2011-07-17 11:30:10 +0000 (Sun, 17 Jul 2011) Log Message: ----------- libserf, additional ignores Modified Paths: -------------- csw/mgar/pkg/libserf/trunk/Makefile Modified: csw/mgar/pkg/libserf/trunk/Makefile =================================================================== --- csw/mgar/pkg/libserf/trunk/Makefile 2011-07-17 10:07:00 UTC (rev 15082) +++ csw/mgar/pkg/libserf/trunk/Makefile 2011-07-17 11:30:10 UTC (rev 15083) @@ -43,14 +43,19 @@ TEST_TARGET = check +CHECKPKG_OVERRIDES_CSWlibserf1-0 += shared-lib-package-contains-so-symlink|file=/opt/csw/lib/libserf-0.so CHECKPKG_OVERRIDES_CSWlibserf1-0 += shared-lib-package-contains-so-symlink|file=/opt/csw/lib/libserf-1.so CHECKPKG_OVERRIDES_CSWlibserf1-0 += shared-lib-package-contains-so-symlink|file=/opt/csw/lib/libserf-1.so # overrides which whould not be necessary, as the package is obsoleted by this one CHECKPKG_OVERRIDES_CSWlibserf1-0 += file-collision|/opt/csw/include/serf_bucket_util.h|CSWlibserf-devel|CSWlibserf1-0 +CHECKPKG_OVERRIDES_CSWlibserf1-0 += file-collision|/opt/csw/include/serf_declare.h|CSWlibserf-devel|CSWlibserf1-0 CHECKPKG_OVERRIDES_CSWlibserf1-0 += file-collision|/opt/csw/include/serf_private.h|CSWlibserf-devel|CSWlibserf1-0 CHECKPKG_OVERRIDES_CSWlibserf1-0 += file-collision|/opt/csw/include/serf_bucket_types.h|CSWlibserf-devel|CSWlibserf1-0 CHECKPKG_OVERRIDES_CSWlibserf1-0 += file-collision|/opt/csw/include/serf.h|CSWlibserf-devel|CSWlibserf1-0 +CHECKPKG_OVERRIDES_CSWlibserf1-0 += file-collision|/opt/csw/lib/libserf-0.so|CSWlibserf-devel|CSWlibserf1-0 +CHECKPKG_OVERRIDES_CSWlibserf1-0 += shared-lib-package-contains-so-symlink|file=/opt/csw/lib/libserf-0.so +CHECKPKG_OVERRIDES_CSWlibserf1-0 += shared-lib-pkgname-mismatch|sonames=libserf-0.so.0,libserf-1.so.0|pkgname=CSWlibserf1-0|expected=CSWlibserf0| include gar/category.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 Sun Jul 17 13:49:02 2011 From: rthurner at users.sourceforge.net (rthurner at users.sourceforge.net) Date: Sun, 17 Jul 2011 11:49:02 +0000 Subject: [csw-devel] SF.net SVN: gar:[15084] csw/mgar/pkg/libserf/trunk/Makefile Message-ID: Revision: 15084 http://gar.svn.sourceforge.net/gar/?rev=15084&view=rev Author: rthurner Date: 2011-07-17 11:49:02 +0000 (Sun, 17 Jul 2011) Log Message: ----------- libserf, unstable changed the name of expat ... Modified Paths: -------------- csw/mgar/pkg/libserf/trunk/Makefile Modified: csw/mgar/pkg/libserf/trunk/Makefile =================================================================== --- csw/mgar/pkg/libserf/trunk/Makefile 2011-07-17 11:30:10 UTC (rev 15083) +++ csw/mgar/pkg/libserf/trunk/Makefile 2011-07-17 11:49:02 UTC (rev 15084) @@ -23,7 +23,7 @@ PACKAGES += CSWlibserf1-0 CATALOGNAME_CSWlibserf1-0 = libserf1_0 SPKG_DESC_CSWlibserf1-0 += HTTP client library built on APR, multiplexes connections, provides libserf-1.so.0 -DEP_PKGS = CSWapr CSWapr-util CSWbdb48 CSWexpat CSWiconv CSWoldaprt CSWosslrt CSWzlib +DEP_PKGS = CSWapr CSWapr-util CSWbdb48 CSWlibexpat1 CSWiconv CSWoldaprt CSWosslrt CSWzlib OBSOLETED_BY_CSWlibserf1-0 = CSWlibserf-devel OBSOLETED_BY_CSWlibserf1-0 = CSWlibserf0-0 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From maciej at opencsw.org Sun Jul 17 14:33:41 2011 From: maciej at opencsw.org (=?UTF-8?Q?Maciej_Blizi=C5=84ski?=) Date: Sun, 17 Jul 2011 13:33:41 +0100 Subject: [csw-devel] SF.net SVN: gar:[15083] csw/mgar/pkg/libserf/trunk/Makefile In-Reply-To: References: Message-ID: Em 17/07/2011 12:30, escreveu: > > Revision: 15083 > http://gar.svn.sourceforge.net/gar/?rev=15083&view=rev > Author: rthurner > Date: 2011-07-17 11:30:10 +0000 (Sun, 17 Jul 2011) > > Log Message: > ----------- > libserf, additional ignores > > Modified Paths: > -------------- > csw/mgar/pkg/libserf/trunk/Makefile > > Modified: csw/mgar/pkg/libserf/trunk/Makefile > =================================================================== > --- csw/mgar/pkg/libserf/trunk/Makefile 2011-07-17 10:07:00 UTC (rev 15082) > +++ csw/mgar/pkg/libserf/trunk/Makefile 2011-07-17 11:30:10 UTC (rev 15083) > @@ -43,14 +43,19 @@ > > TEST_TARGET = check > > +CHECKPKG_OVERRIDES_CSWlibserf1-0 += shared-lib-package-contains-so-symlink|file=/opt/csw/lib/libserf-0.so > CHECKPKG_OVERRIDES_CSWlibserf1-0 += shared-lib-package-contains-so-symlink|file=/opt/csw/lib/libserf-1.so > CHECKPKG_OVERRIDES_CSWlibserf1-0 += shared-lib-package-contains-so-symlink|file=/opt/csw/lib/libserf-1.so There is a wiki page with descriptions of error tags. http://wiki.opencsw.org/checkpkg-error-tags#toc44 It contains the description of this error tag. > # overrides which whould not be necessary, as the package is obsoleted by this one When a package is obsoleted, an empty stub package is created and there are no file collisions. CHECKPKG_OVERRIDES_CSWlibserf1-0 += file-collision|/opt/csw/include/serf_bucket_util.h|CSWlibserf-devel|CSWlibserf1-0 > +CHECKPKG_OVERRIDES_CSWlibserf1-0 += file-collision|/opt/csw/include/serf_declare.h|CSWlibserf-devel|CSWlibserf1-0 > CHECKPKG_OVERRIDES_CSWlibserf1-0 += file-collision|/opt/csw/include/serf_private.h|CSWlibserf-devel|CSWlibserf1-0 > CHECKPKG_OVERRIDES_CSWlibserf1-0 += file-collision|/opt/csw/include/serf_bucket_types.h|CSWlibserf-devel|CSWlibserf1-0 > CHECKPKG_OVERRIDES_CSWlibserf1-0 += file-collision|/opt/csw/include/serf.h|CSWlibserf-devel|CSWlibserf1-0 > +CHECKPKG_OVERRIDES_CSWlibserf1-0 += file-collision|/opt/csw/lib/libserf-0.so|CSWlibserf-devel|CSWlibserf1-0 > +CHECKPKG_OVERRIDES_CSWlibserf1-0 += shared-lib-package-contains-so-symlink|file=/opt/csw/lib/libserf-0.so > +CHECKPKG_OVERRIDES_CSWlibserf1-0 += shared-lib-pkgname-mismatch|sonames=libserf-0.so.0,libserf-1.so.0|pkgname=CSWlibserf1-0|expected=CSWlibserf0| > > > include gar/category.mk > > > This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. > _______________________________________________ > devel mailing list > devel at lists.opencsw.org > https://lists.opencsw.org/mailman/listinfo/devel -------------- next part -------------- An HTML attachment was scrubbed... URL: From rthurner at users.sourceforge.net Sun Jul 17 15:50:46 2011 From: rthurner at users.sourceforge.net (rthurner at users.sourceforge.net) Date: Sun, 17 Jul 2011 13:50:46 +0000 Subject: [csw-devel] SF.net SVN: gar:[15085] csw/mgar/pkg/libserf/trunk/Makefile Message-ID: Revision: 15085 http://gar.svn.sourceforge.net/gar/?rev=15085&view=rev Author: rthurner Date: 2011-07-17 13:50:46 +0000 (Sun, 17 Jul 2011) Log Message: ----------- libserf: do not obsolete libserf0-0 Modified Paths: -------------- csw/mgar/pkg/libserf/trunk/Makefile Modified: csw/mgar/pkg/libserf/trunk/Makefile =================================================================== --- csw/mgar/pkg/libserf/trunk/Makefile 2011-07-17 11:49:02 UTC (rev 15084) +++ csw/mgar/pkg/libserf/trunk/Makefile 2011-07-17 13:50:46 UTC (rev 15085) @@ -26,7 +26,6 @@ DEP_PKGS = CSWapr CSWapr-util CSWbdb48 CSWlibexpat1 CSWiconv CSWoldaprt CSWosslrt CSWzlib OBSOLETED_BY_CSWlibserf1-0 = CSWlibserf-devel -OBSOLETED_BY_CSWlibserf1-0 = CSWlibserf0-0 # Make sure the current directory comes before everything else INCLUDE_FLAGS = -I. -I$(includedir) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Sun Jul 17 16:28:00 2011 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Sun, 17 Jul 2011 14:28:00 +0000 Subject: [csw-devel] SF.net SVN: gar:[15086] csw/mgar/pkg/libserf/trunk/Makefile Message-ID: Revision: 15086 http://gar.svn.sourceforge.net/gar/?rev=15086&view=rev Author: dmichelsen Date: 2011-07-17 14:28:00 +0000 (Sun, 17 Jul 2011) Log Message: ----------- libserf: Go to sane package structure, take out old overrides and stuff Modified Paths: -------------- csw/mgar/pkg/libserf/trunk/Makefile Modified: csw/mgar/pkg/libserf/trunk/Makefile =================================================================== --- csw/mgar/pkg/libserf/trunk/Makefile 2011-07-17 13:50:46 UTC (rev 15085) +++ csw/mgar/pkg/libserf/trunk/Makefile 2011-07-17 14:28:00 UTC (rev 15086) @@ -17,51 +17,29 @@ LICENSE = LICENSE VENDOR_URL = http://code.google.com/p/serf/ -# We define upstream file regex so we can be notifed of new upstream software release -UFILES_REGEX = serf-(\d+(?:\.\d+)*).tar.bz2 - PACKAGES += CSWlibserf1-0 CATALOGNAME_CSWlibserf1-0 = libserf1_0 -SPKG_DESC_CSWlibserf1-0 += HTTP client library built on APR, multiplexes connections, provides libserf-1.so.0 -DEP_PKGS = CSWapr CSWapr-util CSWbdb48 CSWlibexpat1 CSWiconv CSWoldaprt CSWosslrt CSWzlib +SPKG_DESC_CSWlibserf1-0 += HTTP client library built on APR, multiplexes connections, libserf-1.so.0 +RUNTIME_DEP_PKGS_CSWlibserf1-0 += CSWapr +RUNTIME_DEP_PKGS_CSWlibserf1-0 += CSWapr-util +RUNTIME_DEP_PKGS_CSWlibserf1-0 += CSWbdb48 +RUNTIME_DEP_PKGS_CSWlibserf1-0 += CSWlibexpat1 +RUNTIME_DEP_PKGS_CSWlibserf1-0 += CSWiconv +RUNTIME_DEP_PKGS_CSWlibserf1-0 += CSWoldaprt +RUNTIME_DEP_PKGS_CSWlibserf1-0 += CSWosslrt +RUNTIME_DEP_PKGS_CSWlibserf1-0 += CSWzlib -OBSOLETED_BY_CSWlibserf1-0 = CSWlibserf-devel +PACKAGES += CSWlibserf-dev +CATALOGNAME_CSWlibserf-dev = libserf_dev +SPKG_DESC_CSWlibserf-dev = Development files for libserf.so.1 +PKGFILES_CSWlibserf-dev += $(PKGFILES_DEVEL) +RUNTIME_DEP_PKGS_CSWlibserf-dev = CSWlibserf1-0 +OBSOLETED_BY_CSWlibserf-dev += CSWlibserf-devel -# Make sure the current directory comes before everything else -INCLUDE_FLAGS = -I. -I$(includedir) - EXTRA_LIB = $(prefix)/bdb48/lib -# We don't need it and if defined the test breaks -LD_OPTIONS = -EXTRA_LINKER_FLAGS = $(RUNPATH_LINKER_FLAGS) - CONFIGURE_ARGS = $(DIRPATHS) CONFIGURE_ARGS += --with-apr=$(bindir)/apr-1-config CONFIGURE_ARGS += --with-apr-util=$(bindir)/apu-1-config -TEST_TARGET = check - -CHECKPKG_OVERRIDES_CSWlibserf1-0 += shared-lib-package-contains-so-symlink|file=/opt/csw/lib/libserf-0.so -CHECKPKG_OVERRIDES_CSWlibserf1-0 += shared-lib-package-contains-so-symlink|file=/opt/csw/lib/libserf-1.so -CHECKPKG_OVERRIDES_CSWlibserf1-0 += shared-lib-package-contains-so-symlink|file=/opt/csw/lib/libserf-1.so - -# overrides which whould not be necessary, as the package is obsoleted by this one -CHECKPKG_OVERRIDES_CSWlibserf1-0 += file-collision|/opt/csw/include/serf_bucket_util.h|CSWlibserf-devel|CSWlibserf1-0 -CHECKPKG_OVERRIDES_CSWlibserf1-0 += file-collision|/opt/csw/include/serf_declare.h|CSWlibserf-devel|CSWlibserf1-0 -CHECKPKG_OVERRIDES_CSWlibserf1-0 += file-collision|/opt/csw/include/serf_private.h|CSWlibserf-devel|CSWlibserf1-0 -CHECKPKG_OVERRIDES_CSWlibserf1-0 += file-collision|/opt/csw/include/serf_bucket_types.h|CSWlibserf-devel|CSWlibserf1-0 -CHECKPKG_OVERRIDES_CSWlibserf1-0 += file-collision|/opt/csw/include/serf.h|CSWlibserf-devel|CSWlibserf1-0 -CHECKPKG_OVERRIDES_CSWlibserf1-0 += file-collision|/opt/csw/lib/libserf-0.so|CSWlibserf-devel|CSWlibserf1-0 -CHECKPKG_OVERRIDES_CSWlibserf1-0 += shared-lib-package-contains-so-symlink|file=/opt/csw/lib/libserf-0.so -CHECKPKG_OVERRIDES_CSWlibserf1-0 += shared-lib-pkgname-mismatch|sonames=libserf-0.so.0,libserf-1.so.0|pkgname=CSWlibserf1-0|expected=CSWlibserf0| - - include gar/category.mk - -post-configure-modulated: APR_LIBTOOL = $(shell $(bindir)/apr-1-config --apr-libtool) -post-configure-modulated: - gcp $(APR_LIBTOOL) $(WORKSRC) - perl -i -pne 's|$(APR_LIBTOOL)|$(abspath $(WORKSRC)/libtool)|' $(WORKSRC)/Makefile - $(GARBIN)/fixlibtool $(WORKSRC) - @$(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 Sun Jul 17 21:18:53 2011 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Sun, 17 Jul 2011 19:18:53 +0000 Subject: [csw-devel] SF.net SVN: gar:[15087] csw/mgar/pkg/sqlite3/trunk Message-ID: Revision: 15087 http://gar.svn.sourceforge.net/gar/?rev=15087&view=rev Author: dmichelsen Date: 2011-07-17 19:18:53 +0000 (Sun, 17 Jul 2011) Log Message: ----------- sqlite3: Update to 3070701, update dependency to libreadline6 Modified Paths: -------------- csw/mgar/pkg/sqlite3/trunk/Makefile csw/mgar/pkg/sqlite3/trunk/checksums Modified: csw/mgar/pkg/sqlite3/trunk/Makefile =================================================================== --- csw/mgar/pkg/sqlite3/trunk/Makefile 2011-07-17 14:28:00 UTC (rev 15086) +++ csw/mgar/pkg/sqlite3/trunk/Makefile 2011-07-17 19:18:53 UTC (rev 15087) @@ -1,5 +1,5 @@ NAME = sqlite3 -VERSION = 3070602 +VERSION = 3070701 CATEGORIES = lib DESCRIPTION = An embeddable SQL engine in a C library @@ -21,7 +21,7 @@ SPKG_DESC_CSWsqlite3 = $(DESCRIPTION) PKGFILES_CSWsqlite3 = $(bindir)/.* RUNTIME_DEP_PKGS_CSWsqlite3 += CSWlibsqlite3-0 -RUNTIME_DEP_PKGS_CSWsqlite3 += CSWreadline +RUNTIME_DEP_PKGS_CSWsqlite3 += CSWlibreadline6 PACKAGES += CSWlibsqlite3-0 CATALOGNAME_CSWlibsqlite3-0 = libsqlite3_0 Modified: csw/mgar/pkg/sqlite3/trunk/checksums =================================================================== --- csw/mgar/pkg/sqlite3/trunk/checksums 2011-07-17 14:28:00 UTC (rev 15086) +++ csw/mgar/pkg/sqlite3/trunk/checksums 2011-07-17 19:18:53 UTC (rev 15087) @@ -1,2 +1,2 @@ fc9432136482bcde03102bc3e06dd413 copyright-release.html -f16c08617968b4087b3d591fd575f59f sqlite-autoconf-3070602.tar.gz +554026fe7fac47b1cf61c18d5fe43419 sqlite-autoconf-3070701.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Sun Jul 17 21:33:34 2011 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Sun, 17 Jul 2011 19:33:34 +0000 Subject: [csw-devel] SF.net SVN: gar:[15088] csw/mgar/pkg/sqlite3/trunk/Makefile Message-ID: Revision: 15088 http://gar.svn.sourceforge.net/gar/?rev=15088&view=rev Author: dmichelsen Date: 2011-07-17 19:33:34 +0000 (Sun, 17 Jul 2011) Log Message: ----------- sqlite3: Adjust catalog name of CSWsqlite3devel Modified Paths: -------------- csw/mgar/pkg/sqlite3/trunk/Makefile Modified: csw/mgar/pkg/sqlite3/trunk/Makefile =================================================================== --- csw/mgar/pkg/sqlite3/trunk/Makefile 2011-07-17 19:18:53 UTC (rev 15087) +++ csw/mgar/pkg/sqlite3/trunk/Makefile 2011-07-17 19:33:34 UTC (rev 15088) @@ -28,7 +28,6 @@ SPKG_DESC_CSWlibsqlite3-0 = SQLite library providing libsqlite3.so.0 PKGFILES_CSWlibsqlite3-0 = $(call pkgfiles_lib,libsqlite3.so.0) OBSOLETED_BY_CSWlibsqlite3-0 = CSWsqlite3rt - CATALOGNAME_CSWsqlite3rt = sqlite3_rt_stub PACKAGES += CSWlibsqlite3-dev @@ -37,6 +36,7 @@ PKGFILES_CSWlibsqlite3-dev = $(PKGFILES_DEVEL) RUNTIME_DEP_PKGS_CSWlibsqlite3-dev = CSWlibsqlite3-0 OBSOLETED_BY_CSWlibsqlite3-dev = CSWsqlite3devel +CATALOGNAME_CSWsqlite3devel = sqlite3_devel_stub BUILD_DEP_PKGS += CSWreadline This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Sun Jul 17 22:01:06 2011 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Sun, 17 Jul 2011 20:01:06 +0000 Subject: [csw-devel] SF.net SVN: gar:[15089] csw/mgar/pkg/pbzip2/trunk Message-ID: Revision: 15089 http://gar.svn.sourceforge.net/gar/?rev=15089&view=rev Author: dmichelsen Date: 2011-07-17 20:01:06 +0000 (Sun, 17 Jul 2011) Log Message: ----------- pbzip2: Update to 1.1.5 Modified Paths: -------------- csw/mgar/pkg/pbzip2/trunk/Makefile csw/mgar/pkg/pbzip2/trunk/checksums Modified: csw/mgar/pkg/pbzip2/trunk/Makefile =================================================================== --- csw/mgar/pkg/pbzip2/trunk/Makefile 2011-07-17 19:33:34 UTC (rev 15088) +++ csw/mgar/pkg/pbzip2/trunk/Makefile 2011-07-17 20:01:06 UTC (rev 15089) @@ -1,5 +1,5 @@ NAME = pbzip2 -VERSION = 1.1.4 +VERSION = 1.1.5 CATEGORIES = utils DESCRIPTION = Parallel BZIP2 Data Compression Software Modified: csw/mgar/pkg/pbzip2/trunk/checksums =================================================================== --- csw/mgar/pkg/pbzip2/trunk/checksums 2011-07-17 19:33:34 UTC (rev 15088) +++ csw/mgar/pkg/pbzip2/trunk/checksums 2011-07-17 20:01:06 UTC (rev 15089) @@ -1 +1 @@ -797e3ae5c6293a55e3e97fefb11cf494 pbzip2-1.1.4.tar.gz +62f529d3ef17d775b9e1745f7a458018 pbzip2-1.1.5.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Sun Jul 17 22:22:27 2011 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Sun, 17 Jul 2011 20:22:27 +0000 Subject: [csw-devel] SF.net SVN: gar:[15090] csw/mgar/pkg/subversion/trunk Message-ID: Revision: 15090 http://gar.svn.sourceforge.net/gar/?rev=15090&view=rev Author: dmichelsen Date: 2011-07-17 20:22:27 +0000 (Sun, 17 Jul 2011) Log Message: ----------- subversion: Try 1.7.0alpha3, forward-port patches, try PYCOMPILE and -norunpath, skip contrib/ for now Modified Paths: -------------- csw/mgar/pkg/subversion/trunk/Makefile csw/mgar/pkg/subversion/trunk/checksums csw/mgar/pkg/subversion/trunk/files/0001-make-subversion-sysconfigdir-as-it-should-be-for-csw.patch Added Paths: ----------- csw/mgar/pkg/subversion/trunk/files/0002-Fix-location-of-bindings.patch Removed Paths: ------------- csw/mgar/pkg/subversion/trunk/files/subversion161.diff Modified: csw/mgar/pkg/subversion/trunk/Makefile =================================================================== --- csw/mgar/pkg/subversion/trunk/Makefile 2011-07-17 20:01:06 UTC (rev 15089) +++ csw/mgar/pkg/subversion/trunk/Makefile 2011-07-17 20:22:27 UTC (rev 15090) @@ -2,6 +2,8 @@ # # TODO (release-critical prefixed with !, non release-critical with *) # +# ! Install does not work as there is no contrib any more. Where is this stuff? +# # * How about shipping a changelog.CSW (example in files/)? # * The language binding packages all have a whole stack of dependencies # (mostly the same libs that the main svn package has). Are those really @@ -22,7 +24,7 @@ # http://subversion.apache.org/mailing-lists.html NAME = subversion -VERSION = 1.7.0-alpha2 +VERSION = 1.7.0-alpha3 CATEGORIES = utils DESCRIPTION = Version control rethought @@ -35,8 +37,11 @@ MASTER_SITES = http://archive.apache.org/dist/subversion/ #MASTER_SITES = http://orac.ece.utexas.edu/pub/svn/1.6.7/yuletide-eggnog/ DISTFILES = $(NAME)-$(VERSION).tar.bz2 -UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.bz2 +BUILD_DEP_PKGS += CSWlibexpat-dev +BUILD_DEP_PKGS += CSWlibserf-dev +BUILD_DEP_PKGS += CSWlibsqlite3-dev + PACKAGES = CSWsvn SPKG_DESC_CSWsvn = Version control rethought CATALOGNAME_CSWsvn = subversion @@ -105,10 +110,10 @@ RUNTIME_DEP_PKGS_CSWjavasvn += CSWapr-util RUNTIME_DEP_PKGS_CSWjavasvn += CSWbdb48 RUNTIME_DEP_PKGS_CSWjavasvn += CSWapr -CHECKPKG_OVERRIDES_CSWjavasvn += bad-rpath-entry|/lib|opt/csw/lib/svn/libsvnjavahl-1.so.0.0.0 -CHECKPKG_OVERRIDES_CSWjavasvn += bad-rpath-entry|/opt/SUNWspro/lib|opt/csw/lib/svn/libsvnjavahl-1.so.0.0.0 -CHECKPKG_OVERRIDES_CSWjavasvn += bad-rpath-entry|/opt/SUNWspro/lib/v8|opt/csw/lib/svn/libsvnjavahl-1.so.0.0.0 -CHECKPKG_OVERRIDES_CSWjavasvn += bad-rpath-entry|/opt/SUNWspro/lib/rw7|opt/csw/lib/svn/libsvnjavahl-1.so.0.0.0 +#CHECKPKG_OVERRIDES_CSWjavasvn += bad-rpath-entry|/lib|opt/csw/lib/svn/libsvnjavahl-1.so.0.0.0 +#CHECKPKG_OVERRIDES_CSWjavasvn += bad-rpath-entry|/opt/SUNWspro/lib|opt/csw/lib/svn/libsvnjavahl-1.so.0.0.0 +#CHECKPKG_OVERRIDES_CSWjavasvn += bad-rpath-entry|/opt/SUNWspro/lib/v8|opt/csw/lib/svn/libsvnjavahl-1.so.0.0.0 +#CHECKPKG_OVERRIDES_CSWjavasvn += bad-rpath-entry|/opt/SUNWspro/lib/rw7|opt/csw/lib/svn/libsvnjavahl-1.so.0.0.0 PACKAGES += CSWpmsvn SPKG_DESC_CSWpmsvn = Subversion Perl Language Binding @@ -172,9 +177,13 @@ # Fix: Add java headers for nested classes # https://lists.ubuntu.com/archives/ubuntu-devel-discuss/2008-June/004633.html PATCHFILES += javahl_headers_for_nested_classes.diff -PATCHFILES += subversion161.diff + +# Hardcode location of system wide configuration to /etc/opt/csw/subversion PATCHFILES += 0001-make-subversion-sysconfigdir-as-it-should-be-for-csw.patch +# Relocate locations of foreign language bindings +PATCHFILES += 0002-Fix-location-of-bindings.patch + SVNLIB = $(prefix)/lib/svn JAVA_HOME = /usr/jdk1.6.0_20 @@ -190,10 +199,11 @@ RUNPATH_ISALIST = $(libdir) #RUNPATH_ISALIST += $(filter-out /opt/csw/apache2/lib $(SVNLIB),$(EXTRA_LIB)) -EXTRA_MERGE_EXCLUDE_FILES += .*\.pyo .*\.pyc -PROTOTYPE_MODIFIERS += cswpycompile -PROTOTYPE_FILES_cswpycompile = $(libdir)/python/.*\.py -PROTOTYPE_CLASS_cswpycompile = cswpycompile +#EXTRA_MERGE_EXCLUDE_FILES += .*\.pyo .*\.pyc +#PROTOTYPE_MODIFIERS += cswpycompile +#PROTOTYPE_FILES_cswpycompile = $(libdir)/python/.*\.py +#PROTOTYPE_CLASS_cswpycompile = cswpycompile +PYCOMPILE = 1 # All of the perl modules go to $(libdir)/perl/site_perl. We are not interested # in the version specific perl directory which only contains a perllocal.pod. @@ -237,7 +247,8 @@ PI_DEPENDS += copy-templates PI_DEPENDS += create-ra_dav-symlinks -PI_DEPENDS += install-extras +# TBD: There is no contrib/ in 1.7.0 any more, how to proceed? Other tarball? Or just drop in the future? +# PI_DEPENDS += install-extras PI_DEPENDS += $(BINDING_TARGETS) post-install-modulated: $(PI_DEPENDS) @@ -329,6 +340,7 @@ $(INSTALL_ENV) gmake -C $(WORKSRC) install-swig-rb @$(MAKECOOKIE) +svn-java: EXTRA_LINKER_FLAGS += -norunpath svn-java: @echo " ==> Building Java bindings" touch $(WORKSRC)/subversion/bindings/javahl/native/*.c Modified: csw/mgar/pkg/subversion/trunk/checksums =================================================================== --- csw/mgar/pkg/subversion/trunk/checksums 2011-07-17 20:01:06 UTC (rev 15089) +++ csw/mgar/pkg/subversion/trunk/checksums 2011-07-17 20:22:27 UTC (rev 15090) @@ -1 +1 @@ -237341332d0790e5798cc9a5043f00bf subversion-1.7.0-alpha2.tar.bz2 +f96db6e195c49a38db4282440fac65e3 subversion-1.7.0-alpha3.tar.bz2 Modified: csw/mgar/pkg/subversion/trunk/files/0001-make-subversion-sysconfigdir-as-it-should-be-for-csw.patch =================================================================== --- csw/mgar/pkg/subversion/trunk/files/0001-make-subversion-sysconfigdir-as-it-should-be-for-csw.patch 2011-07-17 20:01:06 UTC (rev 15089) +++ csw/mgar/pkg/subversion/trunk/files/0001-make-subversion-sysconfigdir-as-it-should-be-for-csw.patch 2011-07-17 20:22:27 UTC (rev 15090) @@ -1,6 +1,6 @@ -From e522142a1517f9c9ffdd670eb2fd0aa974a9a9a1 Mon Sep 17 00:00:00 2001 -From: Rupert Thurner -Date: Sun, 20 Dec 2009 12:33:52 -0600 +From 0c866a35b462bc704a48e91d1d17a38a0175b743 Mon Sep 17 00:00:00 2001 +From: Dagobert Michelsen +Date: Sun, 17 Jul 2011 21:54:47 +0200 Subject: [PATCH] make subversion sysconfigdir as it should be for csw --- @@ -8,18 +8,18 @@ 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/subversion/libsvn_subr/config_impl.h b/subversion/libsvn_subr/config_impl.h -index b5c9d4b..67d46aa 100644 +index d795771..0bc6464 100644 --- a/subversion/libsvn_subr/config_impl.h +++ b/subversion/libsvn_subr/config_impl.h -@@ -110,7 +110,7 @@ svn_error_t *svn_config__parse_registry(svn_config_t *cfg, - #ifdef WIN32 - # define SVN_CONFIG__SUBDIRECTORY "Subversion" - #else /* ! WIN32 */ +@@ -121,7 +121,7 @@ svn_error_t *svn_config__parse_registry(svn_config_t *cfg, + # define SVN_CONFIG__SYS_DIRECTORY "subversion" + # define SVN_CONFIG__USR_DIRECTORY "subversion" + #else /* ! WIN32 && ! __HAIKU__ */ -# define SVN_CONFIG__SYS_DIRECTORY "/etc/subversion" +# define SVN_CONFIG__SYS_DIRECTORY "/etc/opt/csw/subversion" # define SVN_CONFIG__USR_DIRECTORY ".subversion" #endif /* WIN32 */ -- -1.6.5.1 +1.7.6 Copied: csw/mgar/pkg/subversion/trunk/files/0002-Fix-location-of-bindings.patch (from rev 15086, csw/mgar/pkg/subversion/trunk/files/subversion161.diff) =================================================================== --- csw/mgar/pkg/subversion/trunk/files/0002-Fix-location-of-bindings.patch (rev 0) +++ csw/mgar/pkg/subversion/trunk/files/0002-Fix-location-of-bindings.patch 2011-07-17 20:22:27 UTC (rev 15090) @@ -0,0 +1,50 @@ +From 986ad30cb4787968527abcb3743ec4b9fee130f2 Mon Sep 17 00:00:00 2001 +From: Dagobert Michelsen +Date: Sun, 17 Jul 2011 21:50:56 +0200 +Subject: [PATCH] Fix location of bindings + +--- + Makefile.in | 10 +++++----- + subversion/bindings/swig/python/svn/fs.py | 2 +- + 2 files changed, 6 insertions(+), 6 deletions(-) + +diff --git a/Makefile.in b/Makefile.in +index 03133c6..8661d07 100644 +--- a/Makefile.in ++++ b/Makefile.in +@@ -85,14 +85,14 @@ swig_pl_libdir = @libdir@ + swig_rb_libdir = @libdir@ + + ### these possibly need further discussion +-swig_pydir = @libdir@/svn-python/libsvn +-swig_pydir_extra = @libdir@/svn-python/svn +-swig_pldir = @libdir@/svn-perl ++swig_pydir = @libdir@/python/site-packages/libsvn ++swig_pydir_extra = @libdir@/python/site-packages/svn ++#swig_pldir = @libdir@/svn-perl + swig_rbdir = $(SWIG_RB_SITE_ARCH_DIR)/svn/ext + toolsdir = @bindir@/svn-tools + +-javahl_javadir = @libdir@/svn-javahl +-javahl_javahdir = @libdir@/svn-javahl/include ++javahl_javadir = @libdir@ ++javahl_javahdir = @libdir@/include + javahl_libdir = @libdir@ + javahl_test_rootdir=$(abs_builddir)/subversion/bindings/javahl/test-work + javahl_test_srcdir=$(abs_srcdir)/subversion/bindings/javahl +diff --git a/subversion/bindings/swig/python/svn/fs.py b/subversion/bindings/swig/python/svn/fs.py +index e82e495..438ad06 100644 +--- a/subversion/bindings/swig/python/svn/fs.py ++++ b/subversion/bindings/swig/python/svn/fs.py +@@ -109,7 +109,7 @@ class FileDiff: + + # use an array for the command to avoid the shell and potential + # security exposures +- cmd = ["diff"] \ ++ cmd = ["gdiff"] \ + + self.diffoptions \ + + [self.tempfile1, self.tempfile2] + +-- +1.7.6 + Deleted: csw/mgar/pkg/subversion/trunk/files/subversion161.diff =================================================================== --- csw/mgar/pkg/subversion/trunk/files/subversion161.diff 2011-07-17 20:01:06 UTC (rev 15089) +++ csw/mgar/pkg/subversion/trunk/files/subversion161.diff 2011-07-17 20:22:27 UTC (rev 15090) @@ -1,33 +0,0 @@ ---- subversion-1.5.5/Makefile.in.orig 2008-08-26 12:27:56.000000000 -0500 -+++ subversion-1.5.5/Makefile.in 2009-02-21 17:26:25.849467074 -0600 -@@ -68,15 +69,15 @@ - swig_rb_libdir = @libdir@ - - ### these possibly need further discussion --swig_pydir = @libdir@/svn-python/libsvn --swig_pydir_extra = @libdir@/svn-python/svn --swig_pldir = @libdir@/svn-perl -+swig_pydir = @prefix@/lib/python/site-packages/libsvn -+swig_pydir_extra = @prefix@/lib/python/site-packages/svn -+#swig_pldir = @libdir@/svn-perl - swig_rbdir = $(SWIG_RB_SITE_ARCH_DIR)/svn/ext - contribdir = @bindir@/svn-contrib - toolsdir = @bindir@/svn-tools - --javahl_javadir = @libdir@/svn-javahl --javahl_javahdir = @libdir@/svn-javahl/include -+javahl_javadir = @libdir@ -+javahl_javahdir = @libdir@/include - javahl_libdir = @libdir@ - javahl_test_rootdir=$(abs_builddir)/subversion/bindings/javahl/test-work - ---- subversion-1.5.5/subversion/bindings/swig/python/svn/fs.py.orig 2009-02-21 17:00:06.832094681 -0600 -+++ subversion-1.5.5/subversion/bindings/swig/python/svn/fs.py 2009-02-21 16:59:46.198583440 -0600 -@@ -97,7 +97,7 @@ - - # use an array for the command to avoid the shell and potential - # security exposures -- cmd = ["diff"] \ -+ cmd = ["gdiff"] \ - + self.diffoptions \ - + [self.tempfile1, self.tempfile2] This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From rthurner at users.sourceforge.net Mon Jul 18 04:52:01 2011 From: rthurner at users.sourceforge.net (rthurner at users.sourceforge.net) Date: Mon, 18 Jul 2011 02:52:01 +0000 Subject: [csw-devel] SF.net SVN: gar:[15091] csw/mgar/pkg Message-ID: Revision: 15091 http://gar.svn.sourceforge.net/gar/?rev=15091&view=rev Author: rthurner Date: 2011-07-18 02:52:01 +0000 (Mon, 18 Jul 2011) Log Message: ----------- subvertpy, initial Added Paths: ----------- csw/mgar/pkg/subvertpy/ csw/mgar/pkg/subvertpy/Makefile csw/mgar/pkg/subvertpy/branches/ csw/mgar/pkg/subvertpy/tags/ csw/mgar/pkg/subvertpy/trunk/ csw/mgar/pkg/subvertpy/trunk/Makefile csw/mgar/pkg/subvertpy/trunk/checksums csw/mgar/pkg/subvertpy/trunk/files/ Copied: csw/mgar/pkg/subvertpy/Makefile (from rev 15077, csw/mgar/pkg/template/Makefile) =================================================================== --- csw/mgar/pkg/subvertpy/Makefile (rev 0) +++ csw/mgar/pkg/subvertpy/Makefile 2011-07-18 02:52:01 UTC (rev 15091) @@ -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/subvertpy/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/subvertpy/trunk/Makefile =================================================================== --- csw/mgar/pkg/subvertpy/trunk/Makefile (rev 0) +++ csw/mgar/pkg/subvertpy/trunk/Makefile 2011-07-18 02:52:01 UTC (rev 15091) @@ -0,0 +1,22 @@ +# $Id$ +# +NAME = subvertpy +VERSION = 0.8.2 +GARTYPE = v2 +CATEGORIES = python + +DESCRIPTION = Alternative python bindings for subversion + +MASTER_SITES = http://launchpad.net/subvertpy/trunk/$(VERSION)/+download/ +DISTFILES = $(DISTNAME).tar.gz +#UPSTREAM_MASTER_SITES = http://launchpad.net/subvertpy/trunk + +# File name regex to get notifications about upstream software releases +# NOTE: Use this only if the automatic regex creation +# does not work for your package +# UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz + +CONFIGURE_ARGS = $(DIRPATHS) + +include gar/category.mk + Property changes on: csw/mgar/pkg/subvertpy/trunk/Makefile ___________________________________________________________________ Added: svn:keywords + Id Added: csw/mgar/pkg/subvertpy/trunk/checksums =================================================================== --- csw/mgar/pkg/subvertpy/trunk/checksums (rev 0) +++ csw/mgar/pkg/subvertpy/trunk/checksums 2011-07-18 02:52:01 UTC (rev 15091) @@ -0,0 +1 @@ +452dad38ab14dcc4364b472d9b2f012d subvertpy-0.8.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 Mon Jul 18 05:21:30 2011 From: rthurner at users.sourceforge.net (rthurner at users.sourceforge.net) Date: Mon, 18 Jul 2011 03:21:30 +0000 Subject: [csw-devel] SF.net SVN: gar:[15092] csw/mgar/pkg/subvertpy/trunk/Makefile Message-ID: Revision: 15092 http://gar.svn.sourceforge.net/gar/?rev=15092&view=rev Author: rthurner Date: 2011-07-18 03:21:30 +0000 (Mon, 18 Jul 2011) Log Message: ----------- subvertpy, add subversion paths, and try to exclude tests. TEST_TARGET seems not to be valid for category python Modified Paths: -------------- csw/mgar/pkg/subvertpy/trunk/Makefile Modified: csw/mgar/pkg/subvertpy/trunk/Makefile =================================================================== --- csw/mgar/pkg/subvertpy/trunk/Makefile 2011-07-18 02:52:01 UTC (rev 15091) +++ csw/mgar/pkg/subvertpy/trunk/Makefile 2011-07-18 03:21:30 UTC (rev 15092) @@ -17,6 +17,9 @@ # UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz CONFIGURE_ARGS = $(DIRPATHS) +SVN_PREFIX = /opt/csw +EXTRA_LIB = /opt/csw/lib/svn +TEST_TARGET = include gar/category.mk This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Mon Jul 18 07:25:54 2011 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Mon, 18 Jul 2011 05:25:54 +0000 Subject: [csw-devel] SF.net SVN: gar:[15093] csw/mgar/pkg/unrar/trunk/Makefile Message-ID: Revision: 15093 http://gar.svn.sourceforge.net/gar/?rev=15093&view=rev Author: dmichelsen Date: 2011-07-18 05:25:54 +0000 (Mon, 18 Jul 2011) Log Message: ----------- unrar: Update to latest standards Modified Paths: -------------- csw/mgar/pkg/unrar/trunk/Makefile Modified: csw/mgar/pkg/unrar/trunk/Makefile =================================================================== --- csw/mgar/pkg/unrar/trunk/Makefile 2011-07-18 03:21:30 UTC (rev 15092) +++ csw/mgar/pkg/unrar/trunk/Makefile 2011-07-18 05:25:54 UTC (rev 15093) @@ -14,11 +14,8 @@ DISTFILES = unrarsrc-$(VERSION).tar.gz DISTFILES += unrar.1 -# We define upstream file regex so we can be notifed of new upstream software release -UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz +VENDOR_URL = http://www.rarlab.com/rar_add.htm -SPKG_SOURCEURL = http://www.rarlab.com/rar_add.htm - LICENSE = license.txt DISTNAME = unrar 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 Jul 18 07:42:47 2011 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Mon, 18 Jul 2011 05:42:47 +0000 Subject: [csw-devel] SF.net SVN: gar:[15094] csw/mgar/pkg/unrar/trunk Message-ID: Revision: 15094 http://gar.svn.sourceforge.net/gar/?rev=15094&view=rev Author: dmichelsen Date: 2011-07-18 05:42:47 +0000 (Mon, 18 Jul 2011) Log Message: ----------- unrar: Update to 4.0.7, adjust config file location Modified Paths: -------------- csw/mgar/pkg/unrar/trunk/Makefile csw/mgar/pkg/unrar/trunk/checksums Modified: csw/mgar/pkg/unrar/trunk/Makefile =================================================================== --- csw/mgar/pkg/unrar/trunk/Makefile 2011-07-18 05:25:54 UTC (rev 15093) +++ csw/mgar/pkg/unrar/trunk/Makefile 2011-07-18 05:42:47 UTC (rev 15094) @@ -1,5 +1,5 @@ NAME = unrar -VERSION = 4.0.2 +VERSION = 4.0.7 CATEGORIES = utils DESCRIPTION = RAR archive extractor @@ -23,6 +23,7 @@ CONFIGURE_SCRIPTS = OPT_FLAGS_SOS = -fast -erroff=wvarhidemem +EXTRA_LINKER_FLAGS = -norunpath BUILD_ARGS = -f makefile.unix CXX=$(CXX) CXXFLAGS="$(CXXFLAGS)" DEFINES="-D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE" STRIP=strip @@ -32,6 +33,10 @@ include gar/category.mk +post-extract-modulated: + -perl -pi -e 's("/etc","/etc/rar","/usr/lib","/usr/local/lib","/usr/local/etc")("/etc/opt/csw","/opt/csw/etc")' \ + $(WORKSRC)/pathfn.cpp + install-custom: ginstall -d $(DESTDIR)$(mandir)/man1 ginstall $(WORKDIR)/unrar.1 $(DESTDIR)$(mandir)/man1/ Modified: csw/mgar/pkg/unrar/trunk/checksums =================================================================== --- csw/mgar/pkg/unrar/trunk/checksums 2011-07-18 05:25:54 UTC (rev 15093) +++ csw/mgar/pkg/unrar/trunk/checksums 2011-07-18 05:42:47 UTC (rev 15094) @@ -1 +1 @@ -6dbd55a85368e784c693f42ff327354d unrarsrc-4.0.2.tar.gz +41b0a9bca945b4ae2608421afd8f606e unrarsrc-4.0.7.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 Mon Jul 18 09:54:40 2011 From: rthurner at users.sourceforge.net (rthurner at users.sourceforge.net) Date: Mon, 18 Jul 2011 07:54:40 +0000 Subject: [csw-devel] SF.net SVN: gar:[15095] csw/mgar/pkg/subvertpy/trunk/Makefile Message-ID: Revision: 15095 http://gar.svn.sourceforge.net/gar/?rev=15095&view=rev Author: rthurner Date: 2011-07-18 07:54:40 +0000 (Mon, 18 Jul 2011) Log Message: ----------- subvertpy, add dependencies, and disable test scripts Modified Paths: -------------- csw/mgar/pkg/subvertpy/trunk/Makefile Modified: csw/mgar/pkg/subvertpy/trunk/Makefile =================================================================== --- csw/mgar/pkg/subvertpy/trunk/Makefile 2011-07-18 05:42:47 UTC (rev 15094) +++ csw/mgar/pkg/subvertpy/trunk/Makefile 2011-07-18 07:54:40 UTC (rev 15095) @@ -9,17 +9,17 @@ MASTER_SITES = http://launchpad.net/subvertpy/trunk/$(VERSION)/+download/ DISTFILES = $(DISTNAME).tar.gz -#UPSTREAM_MASTER_SITES = http://launchpad.net/subvertpy/trunk +UPSTREAM_MASTER_SITES = http://launchpad.net/subvertpy/trunk +LICENSE = COPYING -# File name regex to get notifications about upstream software releases -# NOTE: Use this only if the automatic regex creation -# does not work for your package -# UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz +RUNTIME_DEP_PKGS_CSWpy-subvertpy += CSWapr +RUNTIME_DEP_PKGS_CSWpy-subvertpy += CSWlibpython2-6-1-0 +RUNTIME_DEP_PKGS_CSWpy-subvertpy += CSWsvn CONFIGURE_ARGS = $(DIRPATHS) SVN_PREFIX = /opt/csw EXTRA_LIB = /opt/csw/lib/svn -TEST_TARGET = +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 janholzh at users.sourceforge.net Mon Jul 18 13:49:36 2011 From: janholzh at users.sourceforge.net (janholzh at users.sourceforge.net) Date: Mon, 18 Jul 2011 11:49:36 +0000 Subject: [csw-devel] SF.net SVN: gar:[15096] csw/mgar/pkg/ffmpeg/trunk Message-ID: Revision: 15096 http://gar.svn.sourceforge.net/gar/?rev=15096&view=rev Author: janholzh Date: 2011-07-18 11:49:36 +0000 (Mon, 18 Jul 2011) Log Message: ----------- ffmpeg: get that sucker build, test is failing though Modified Paths: -------------- csw/mgar/pkg/ffmpeg/trunk/Makefile Added Paths: ----------- csw/mgar/pkg/ffmpeg/trunk/files/0002-change-linker-flags.patch csw/mgar/pkg/ffmpeg/trunk/files/0003-fix-testsuite-shells.patch Removed Paths: ------------- csw/mgar/pkg/ffmpeg/trunk/files/0001-Use-ggrep-in-configure.patch csw/mgar/pkg/ffmpeg/trunk/files/0001-Use-inttypes-instead-of-stdint.patch csw/mgar/pkg/ffmpeg/trunk/files/gnu-grep.patch Modified: csw/mgar/pkg/ffmpeg/trunk/Makefile =================================================================== --- csw/mgar/pkg/ffmpeg/trunk/Makefile 2011-07-18 07:54:40 UTC (rev 15095) +++ csw/mgar/pkg/ffmpeg/trunk/Makefile 2011-07-18 11:49:36 UTC (rev 15096) @@ -17,6 +17,8 @@ PACKAGING_PLATFORMS = solaris10-sparc solaris10-i386 PATCHFILES = 0001-fix-version.sh.patch +PATCHFILES += 0002-change-linker-flags.patch +PATCHFILES += 0003-fix-testsuite-shells.patch BUILD64 = 1 @@ -33,8 +35,10 @@ CONFIGURE_ARGS += --shlibdir=$(libdir) CONFIGURE_ARGS += --incdir=$(includedir) CONFIGURE_ARGS += --mandir=$(mandir) +CONFIGURE_ARGS += --disable-debug +CONFIGURE_ARGS += --enable-gpl CONFIGURE_ARGS += --enable-shared -CONFIGURE_ARGS += --disable-static +#CONFIGURE_ARGS += --disable-static GARCOMPILER = GNU Deleted: csw/mgar/pkg/ffmpeg/trunk/files/0001-Use-ggrep-in-configure.patch =================================================================== --- csw/mgar/pkg/ffmpeg/trunk/files/0001-Use-ggrep-in-configure.patch 2011-07-18 07:54:40 UTC (rev 15095) +++ csw/mgar/pkg/ffmpeg/trunk/files/0001-Use-ggrep-in-configure.patch 2011-07-18 11:49:36 UTC (rev 15096) @@ -1,131 +0,0 @@ -From a0c9edcc57bf41962cd3385baa61d418487e36f7 Mon Sep 17 00:00:00 2001 -From: Dagobert Michelsen -Date: Mon, 2 Aug 2010 16:30:29 +0200 -Subject: [PATCH] Use ggrep in configure - ---- - configure | 28 ++++++++++++++-------------- - 1 files changed, 14 insertions(+), 14 deletions(-) - -diff --git a/configure b/configure -index 0166829..f5c9ea7 100755 ---- a/configure -+++ b/configure -@@ -1532,7 +1532,7 @@ if test -f configure; then - disable source_path_used - else - source_path="$(cd "$source_path"; pwd)" -- echo "$source_path" | grep -q '[[:blank:]]' && -+ echo "$source_path" | ggrep -q '[[:blank:]]' && - die "Out of tree builds are impossible with whitespace in source path." - test -e "$source_path/config.h" && - die "Out of tree builds are impossible with config.h in source dir." -@@ -1726,16 +1726,16 @@ filter_cflags=echo - filter_cppflags=echo - filter_asflags=echo - --if $cc -v 2>&1 | grep -qi ^gcc; then -+if $cc -v 2>&1 | ggrep -qi ^gcc; then - cc_type=gcc - cc_version=__VERSION__ -- if ! $cc -dumpversion | grep -q '^2\.'; then -+ if ! $cc -dumpversion | ggrep -q '^2\.'; then - CC_DEPFLAGS='-MMD -MF $(@:.o=.d) -MT $@' - AS_DEPFLAGS='-MMD -MF $(@:.o=.d) -MT $@' - fi - speed_cflags='-O3' - size_cflags='-Os' --elif $cc --version 2>/dev/null | grep -q Intel; then -+elif $cc --version 2>/dev/null | ggrep -q Intel; then - cc_type=icc - cc_version="AV_STRINGIFY(__INTEL_COMPILER)" - CC_DEPFLAGS='-MMD' -@@ -1743,12 +1743,12 @@ elif $cc --version 2>/dev/null | grep -q Intel; then - speed_cflags='-O3' - size_cflags='-Os' - noopt_cflags='-O1' --elif $cc -v 2>&1 | grep -q xlc; then -+elif $cc -v 2>&1 | ggrep -q xlc; then - cc_type=xlc - cc_version="AV_STRINGIFY(__IBMC__)" - speed_cflags='-O5' - size_cflags='-O5 -qcompact' --elif $cc -V 2>/dev/null | grep -q Compaq; then -+elif $cc -V 2>/dev/null | ggrep -q Compaq; then - cc_type=ccc - cc_version="AV_STRINGIFY(__DECC_VER)" - DEPFLAGS='$(CPPFLAGS) $(CFLAGS) -M' -@@ -1756,7 +1756,7 @@ elif $cc -V 2>/dev/null | grep -q Compaq; then - add_ldflags -Wl,-z,now # calls to libots crash without this - speed_cflags='-fast' - size_cflags='-O1' --elif $cc --vsn 2>/dev/null | grep -q "ARM C/C++ Compiler"; then -+elif $cc --vsn 2>/dev/null | ggrep -q "ARM C/C++ Compiler"; then - test -d "$sysroot" || die "No valid sysroot specified." - cc_type=armcc - cc_version="AV_STRINGIFY(__ARMCC_VERSION)" -@@ -1772,7 +1772,7 @@ elif $cc --vsn 2>/dev/null | grep -q "ARM C/C++ Compiler"; then - AS_DEPFLAGS='-MMD' - speed_cflags='-O3' - size_cflags='-Os' --elif $cc -version 2>/dev/null | grep -q TMS470; then -+elif $cc -version 2>/dev/null | ggrep -q TMS470; then - cc_type=tms470 - cc_version="AV_STRINGIFY(__TI_COMPILER_VERSION__)" - cc="$cc --gcc --abi=eabi -eo=.o -mc -me" -@@ -1811,14 +1811,14 @@ elif $cc -version 2>/dev/null | grep -q TMS470; then - esac - done - } --elif $cc -v 2>&1 | grep -q clang; then -+elif $cc -v 2>&1 | ggrep -q clang; then - cc_type=clang - cc_version=__VERSION__ - CC_DEPFLAGS='-MMD' - AS_DEPFLAGS='-MMD' - speed_cflags='-O3' - size_cflags='-Os' --elif $cc -V 2>&1 | grep -q Sun; then -+elif $cc -V 2>&1 | ggrep -q Sun; then - cc_type=suncc - cc_version="AV_STRINGIFY(__SUNPRO_C)" - DEPEND_CMD='$(DEPCC) $(DEPFLAGS) $< | sed -e "1s,^.*: ,$@: ," -e "\$$!s,\$$, \\\," -e "1!s,^.*: , ," > $(@:.o=.d)' -@@ -2130,7 +2130,7 @@ case $target_os in - beos|haiku|zeta) - prefix_default="$HOME/config" - # 3 gcc releases known for BeOS, each with ugly bugs -- gcc_version="$($cc -v 2>&1 | grep version | cut -d ' ' -f3-)" -+ gcc_version="$($cc -v 2>&1 | ggrep version | cut -d ' ' -f3-)" - case "$gcc_version" in - 2.9-beos-991026*|2.9-beos-000224*) echo "R5/GG gcc" - disable mmx -@@ -2145,7 +2145,7 @@ case $target_os in - # no need for libm, but the inet stuff - # Check for BONE - # XXX: actually should check for NOT net_server -- if echo $BEINCLUDES | grep -q 'headers/be/bone'; then -+ if echo $BEINCLUDES | ggrep -q 'headers/be/bone'; then - network_extralibs="-lbind -lsocket" - else - enable beos_netserver -@@ -2390,7 +2390,7 @@ EOF - check_cc <> config.mak --- -1.7.1 - Deleted: csw/mgar/pkg/ffmpeg/trunk/files/0001-Use-inttypes-instead-of-stdint.patch =================================================================== --- csw/mgar/pkg/ffmpeg/trunk/files/0001-Use-inttypes-instead-of-stdint.patch 2011-07-18 07:54:40 UTC (rev 15095) +++ csw/mgar/pkg/ffmpeg/trunk/files/0001-Use-inttypes-instead-of-stdint.patch 2011-07-18 11:49:36 UTC (rev 15096) @@ -1,292 +0,0 @@ -From 75ce36962bc346787026dcfa754f704240abddec Mon Sep 17 00:00:00 2001 -From: Dagobert Michelsen -Date: Tue, 23 Feb 2010 15:25:05 +0100 -Subject: [PATCH] Use inttypes instead of stdint - ---- - libavutil/adler32.h | 2 +- - libavutil/aes.h | 2 +- - libavutil/base64.h | 2 +- - libavutil/bswap.h | 2 +- - libavutil/crc.h | 2 +- - libavutil/des.h | 2 +- - libavutil/fifo.h | 2 +- - libavutil/integer.h | 2 +- - libavutil/internal.h | 2 +- - libavutil/intfloat_readwrite.h | 2 +- - libavutil/intreadwrite.h | 2 +- - libavutil/lzo.h | 2 +- - libavutil/mathematics.h | 2 +- - libavutil/md5.h | 2 +- - libavutil/rational.h | 3 ++- - libavutil/rc4.h | 2 +- - libavutil/sha1.h | 2 +- - libavutil/softfloat.h | 2 +- - libavutil/timer.h | 2 +- - libavutil/x86_cpu.h | 2 +- - 20 files changed, 21 insertions(+), 20 deletions(-) - -diff --git a/libavutil/adler32.h b/libavutil/adler32.h -index 34f2b53..76e50ad 100644 ---- a/libavutil/adler32.h -+++ b/libavutil/adler32.h -@@ -21,7 +21,7 @@ - #ifndef AVUTIL_ADLER32_H - #define AVUTIL_ADLER32_H - --#include -+#include - #include "common.h" - - unsigned long av_adler32_update(unsigned long adler, const uint8_t *buf, -diff --git a/libavutil/aes.h b/libavutil/aes.h -index 1ca853d..cd7a523 100644 ---- a/libavutil/aes.h -+++ b/libavutil/aes.h -@@ -21,7 +21,7 @@ - #ifndef AVUTIL_AES_H - #define AVUTIL_AES_H - --#include -+#include - - extern const int av_aes_size; - -diff --git a/libavutil/base64.h b/libavutil/base64.h -index e3152eb..5f3b261 100644 ---- a/libavutil/base64.h -+++ b/libavutil/base64.h -@@ -21,7 +21,7 @@ - #ifndef AVUTIL_BASE64_H - #define AVUTIL_BASE64_H - --#include -+#include - - /** - * Decodes the base64-encoded string in \p in and puts the decoded -diff --git a/libavutil/bswap.h b/libavutil/bswap.h -index cf68c43..881fdc2 100644 ---- a/libavutil/bswap.h -+++ b/libavutil/bswap.h -@@ -26,7 +26,7 @@ - #ifndef AVUTIL_BSWAP_H - #define AVUTIL_BSWAP_H - --#include -+#include - #include "config.h" - #include "common.h" - -diff --git a/libavutil/crc.h b/libavutil/crc.h -index fa34059..7d587ca 100644 ---- a/libavutil/crc.h -+++ b/libavutil/crc.h -@@ -21,7 +21,7 @@ - #ifndef AVUTIL_CRC_H - #define AVUTIL_CRC_H - --#include -+#include - #include - #include "common.h" - -diff --git a/libavutil/des.h b/libavutil/des.h -index e80bdd3..874ccf1 100644 ---- a/libavutil/des.h -+++ b/libavutil/des.h -@@ -22,7 +22,7 @@ - #ifndef AVUTIL_DES_H - #define AVUTIL_DES_H - --#include -+#include - - struct AVDES { - uint64_t round_keys[3][16]; -diff --git a/libavutil/fifo.h b/libavutil/fifo.h -index 1a549f2..c3471ba 100644 ---- a/libavutil/fifo.h -+++ b/libavutil/fifo.h -@@ -24,7 +24,7 @@ - #ifndef AVUTIL_FIFO_H - #define AVUTIL_FIFO_H - --#include -+#include - #include "avutil.h" - #include "common.h" - -diff --git a/libavutil/integer.h b/libavutil/integer.h -index d4d0201..28fc91d 100644 ---- a/libavutil/integer.h -+++ b/libavutil/integer.h -@@ -28,7 +28,7 @@ - #ifndef AVUTIL_INTEGER_H - #define AVUTIL_INTEGER_H - --#include -+#include - #include "common.h" - - #define AV_INTEGER_SIZE 8 -diff --git a/libavutil/internal.h b/libavutil/internal.h -index f5f769e..370d7f0 100644 ---- a/libavutil/internal.h -+++ b/libavutil/internal.h -@@ -31,7 +31,7 @@ - #endif - - #include --#include -+#include - #include - #include - #include "config.h" -diff --git a/libavutil/intfloat_readwrite.h b/libavutil/intfloat_readwrite.h -index e2d5d5b..2abbafd 100644 ---- a/libavutil/intfloat_readwrite.h -+++ b/libavutil/intfloat_readwrite.h -@@ -21,7 +21,7 @@ - #ifndef AVUTIL_INTFLOAT_READWRITE_H - #define AVUTIL_INTFLOAT_READWRITE_H - --#include -+#include - #include "common.h" - - /* IEEE 80 bits extended float */ -diff --git a/libavutil/intreadwrite.h b/libavutil/intreadwrite.h -index 7c5909e..d7c0c6f 100644 ---- a/libavutil/intreadwrite.h -+++ b/libavutil/intreadwrite.h -@@ -19,7 +19,7 @@ - #ifndef AVUTIL_INTREADWRITE_H - #define AVUTIL_INTREADWRITE_H - --#include -+#include - #include "config.h" - #include "bswap.h" - -diff --git a/libavutil/lzo.h b/libavutil/lzo.h -index 6788054..736d01a 100644 ---- a/libavutil/lzo.h -+++ b/libavutil/lzo.h -@@ -22,7 +22,7 @@ - #ifndef AVUTIL_LZO_H - #define AVUTIL_LZO_H - --#include -+#include - - /** \defgroup errflags Error flags returned by av_lzo1x_decode - * \{ */ -diff --git a/libavutil/mathematics.h b/libavutil/mathematics.h -index 782efcc..b138421 100644 ---- a/libavutil/mathematics.h -+++ b/libavutil/mathematics.h -@@ -21,7 +21,7 @@ - #ifndef AVUTIL_MATHEMATICS_H - #define AVUTIL_MATHEMATICS_H - --#include -+#include - #include - #include "common.h" - #include "rational.h" -diff --git a/libavutil/md5.h b/libavutil/md5.h -index 969202a..8baaee6 100644 ---- a/libavutil/md5.h -+++ b/libavutil/md5.h -@@ -21,7 +21,7 @@ - #ifndef AVUTIL_MD5_H - #define AVUTIL_MD5_H - --#include -+#include - - extern const int av_md5_size; - -diff --git a/libavutil/rational.h b/libavutil/rational.h -index 5ee70c9..b022e17 100644 ---- a/libavutil/rational.h -+++ b/libavutil/rational.h -@@ -28,7 +28,8 @@ - #ifndef AVUTIL_RATIONAL_H - #define AVUTIL_RATIONAL_H - --#include -+#include -+#include - #include "common.h" - - /** -diff --git a/libavutil/rc4.h b/libavutil/rc4.h -index 07223a5..2568a8c 100644 ---- a/libavutil/rc4.h -+++ b/libavutil/rc4.h -@@ -21,7 +21,7 @@ - #ifndef AVUTIL_RC4_H - #define AVUTIL_RC4_H - --#include -+#include - - struct AVRC4 { - uint8_t state[256]; -diff --git a/libavutil/sha1.h b/libavutil/sha1.h -index 0f14ca8..2cfeb4c 100644 ---- a/libavutil/sha1.h -+++ b/libavutil/sha1.h -@@ -21,7 +21,7 @@ - #ifndef AVUTIL_SHA1_H - #define AVUTIL_SHA1_H - --#include -+#include - - extern const int av_sha1_size; - -diff --git a/libavutil/softfloat.h b/libavutil/softfloat.h -index 97e09ea..7a2e82c 100644 ---- a/libavutil/softfloat.h -+++ b/libavutil/softfloat.h -@@ -21,7 +21,7 @@ - #ifndef AVUTIL_SOFTFLOAT_H - #define AVUTIL_SOFTFLOAT_H - --#include -+#include - #include "common.h" - - #define MIN_EXP -126 -diff --git a/libavutil/timer.h b/libavutil/timer.h -index 709e12f..9c5b468 100644 ---- a/libavutil/timer.h -+++ b/libavutil/timer.h -@@ -25,7 +25,7 @@ - #define AVUTIL_TIMER_H - - #include --#include -+#include - #include "config.h" - - #if ARCH_X86 || ARCH_PPC || ARCH_BFIN -diff --git a/libavutil/x86_cpu.h b/libavutil/x86_cpu.h -index d29b7d8..2ff3cb8 100644 ---- a/libavutil/x86_cpu.h -+++ b/libavutil/x86_cpu.h -@@ -21,7 +21,7 @@ - #ifndef AVUTIL_X86_CPU_H - #define AVUTIL_X86_CPU_H - --#include -+#include - #include "config.h" - - #if ARCH_X86_64 --- -1.6.6 - Added: csw/mgar/pkg/ffmpeg/trunk/files/0002-change-linker-flags.patch =================================================================== --- csw/mgar/pkg/ffmpeg/trunk/files/0002-change-linker-flags.patch (rev 0) +++ csw/mgar/pkg/ffmpeg/trunk/files/0002-change-linker-flags.patch 2011-07-18 11:49:36 UTC (rev 15096) @@ -0,0 +1,34 @@ +From 8a8a681ff57e4ca7d545c2350a70461e24e96355 Mon Sep 17 00:00:00 2001 +From: Jan Holzhueter +Date: Mon, 18 Jul 2011 12:03:36 +0200 +Subject: [PATCH] change-linker-flags + +--- + configure | 4 ++-- + 1 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/configure b/configure +index c9eedaf..68793ac 100755 +--- a/configure ++++ b/configure +@@ -1688,7 +1688,7 @@ enable swscale + enable swscale_alpha + + # build settings +-SHFLAGS='-shared -Wl,-soname,$$(@F)' ++SHFLAGS='-G -Wl,-h,$$(@F)' + FFSERVERLDFLAGS=-Wl,-E + LIBPREF="lib" + LIBSUF=".a" +@@ -2396,7 +2396,7 @@ case $target_os in + ;; + sunos) + FFSERVERLDFLAGS="" +- SHFLAGS='-shared -Wl,-h,$$(@F)' ++ SHFLAGS='-G -Wl,-h,$$(@F)' + enabled x86 && SHFLAGS="-mimpure-text $SHFLAGS" + network_extralibs="-lsocket -lnsl" + add_cppflags -D__EXTENSIONS__ +-- +1.7.6 + Added: csw/mgar/pkg/ffmpeg/trunk/files/0003-fix-testsuite-shells.patch =================================================================== --- csw/mgar/pkg/ffmpeg/trunk/files/0003-fix-testsuite-shells.patch (rev 0) +++ csw/mgar/pkg/ffmpeg/trunk/files/0003-fix-testsuite-shells.patch 2011-07-18 11:49:36 UTC (rev 15096) @@ -0,0 +1,110 @@ +From 2b29e3734ad0db1d9cde466f7d424bd886ce5084 Mon Sep 17 00:00:00 2001 +From: Jan Holzhueter +Date: Mon, 18 Jul 2011 13:02:57 +0200 +Subject: [PATCH] fix-testsuite-shells + +--- + tests/codec-regression.sh | 2 +- + tests/copycooker.sh | 2 +- + tests/fate-run.sh | 2 +- + tests/fate-update.sh | 2 +- + tests/fate.sh | 2 +- + tests/ffserver-regression.sh | 2 +- + tests/lavf-regression.sh | 2 +- + tests/lavfi-regression.sh | 2 +- + tests/regression-funcs.sh | 2 +- + 9 files changed, 9 insertions(+), 9 deletions(-) + +diff --git a/tests/codec-regression.sh b/tests/codec-regression.sh +index b210231..3453d96 100755 +--- a/tests/codec-regression.sh ++++ b/tests/codec-regression.sh +@@ -1,4 +1,4 @@ +-#!/bin/sh ++#!/opt/csw/bin/bash + # + # automatic regression test for ffmpeg + # +diff --git a/tests/copycooker.sh b/tests/copycooker.sh +index 4b5811d..f1e1fcc 100755 +--- a/tests/copycooker.sh ++++ b/tests/copycooker.sh +@@ -1,4 +1,4 @@ +-#!/bin/sh ++#!/opt/csw/bin/bash + + LC_ALL=C + export LC_ALL +diff --git a/tests/fate-run.sh b/tests/fate-run.sh +index 366145d..a6beab0 100755 +--- a/tests/fate-run.sh ++++ b/tests/fate-run.sh +@@ -1,4 +1,4 @@ +-#! /bin/sh ++#!/opt/csw/bin/bash + + export LC_ALL=C + +diff --git a/tests/fate-update.sh b/tests/fate-update.sh +index 6b4668f..cf3ee98 100755 +--- a/tests/fate-update.sh ++++ b/tests/fate-update.sh +@@ -1,4 +1,4 @@ +-#! /bin/sh ++#!/opt/csw/bin/bash + + set -e + +diff --git a/tests/fate.sh b/tests/fate.sh +index 9fd117c..5f91b3b 100755 +--- a/tests/fate.sh ++++ b/tests/fate.sh +@@ -1,4 +1,4 @@ +-#! /bin/sh ++#!/opt/csw/bin/bash + + config=$1 + +diff --git a/tests/ffserver-regression.sh b/tests/ffserver-regression.sh +index 11e4a54..2690699 100755 +--- a/tests/ffserver-regression.sh ++++ b/tests/ffserver-regression.sh +@@ -1,4 +1,4 @@ +-#!/bin/sh ++#!/opt/csw/bin/bash + + #perl -e 'chomp($wd = `pwd`); print map { s!tests/data/!!; "\nFile $wd/tests/data/$_\n\n\n" } @ARGV' tests/data/a* >> tests/data/ffserver.conf + #perl -e 'chomp($wd = `pwd`); print map { s!tests/data/!!; "\nFile $wd/tests/data/$_\n\n\n" } @ARGV' tests/data/a* >> tests/data/ffserver.conf +diff --git a/tests/lavf-regression.sh b/tests/lavf-regression.sh +index 39e752b..373fe84 100755 +--- a/tests/lavf-regression.sh ++++ b/tests/lavf-regression.sh +@@ -1,4 +1,4 @@ +-#!/bin/sh ++#!/opt/csw/bin/bash + # + # automatic regression test for libavformat + # +diff --git a/tests/lavfi-regression.sh b/tests/lavfi-regression.sh +index 0322134..bd83fab 100755 +--- a/tests/lavfi-regression.sh ++++ b/tests/lavfi-regression.sh +@@ -1,4 +1,4 @@ +-#!/bin/sh ++#!/opt/csw/bin/bash + # + # automatic regression test for libavfilter + # +diff --git a/tests/regression-funcs.sh b/tests/regression-funcs.sh +index e57cdf1..a6fd652 100755 +--- a/tests/regression-funcs.sh ++++ b/tests/regression-funcs.sh +@@ -1,4 +1,4 @@ +-#!/bin/sh ++#!/opt/csw/bin/bash + # + # common regression functions for ffmpeg + # +-- +1.7.6 + Deleted: csw/mgar/pkg/ffmpeg/trunk/files/gnu-grep.patch =================================================================== --- csw/mgar/pkg/ffmpeg/trunk/files/gnu-grep.patch 2011-07-18 07:54:40 UTC (rev 15095) +++ csw/mgar/pkg/ffmpeg/trunk/files/gnu-grep.patch 2011-07-18 11:49:36 UTC (rev 15096) @@ -1,74 +0,0 @@ ---- ffmpeg-0.5/configure.orig 2009-11-25 00:00:57.441086148 +0100 -+++ ffmpeg-0.5/configure 2009-11-25 00:01:18.358790303 +0100 -@@ -1217,7 +1217,7 @@ - disable source_path_used - else - source_path="`cd \"$source_path\"; pwd`" -- echo "$source_path" | grep -q '[[:blank:]]' && -+ echo "$source_path" | ggrep -q '[[:blank:]]' && - die "Out of tree builds are impossible with whitespace in source path." - fi - -@@ -1363,13 +1363,13 @@ - fi - rm $TMPSH - --if $cc --version 2>/dev/null | grep -qi gcc; then -+if $cc --version 2>/dev/null | ggrep -qi gcc; then - cc_type=gcc --elif $cc --version 2>/dev/null | grep -q Intel; then -+elif $cc --version 2>/dev/null | ggrep -q Intel; then - cc_type=icc --elif $cc -v 2>&1 | grep -q xlc; then -+elif $cc -v 2>&1 | ggrep -q xlc; then - cc_type=xlc --elif $cc -V 2>/dev/null | grep -q Compaq; then -+elif $cc -V 2>/dev/null | ggrep -q Compaq; then - cc_type=ccc - DEPEND_CMD='$(CC) $(CFLAGS) -M $< | sed -e "/^\#.*/d" -e "s,^[[:space:]]*$(*F)\\.o,$(@D)/$(*F).o,"' - add_ldflags -Wl,-z,now # calls to libots crash without this -@@ -1488,7 +1488,7 @@ - # helps building libavcodec - add_cflags -DPIC -fomit-frame-pointer - # 3 gcc releases known for BeOS, each with ugly bugs -- gcc_version="`$cc -v 2>&1 | grep version | cut -d ' ' -f3-`" -+ gcc_version="`$cc -v 2>&1 | ggrep version | cut -d ' ' -f3-`" - case "$gcc_version" in - 2.9-beos-991026*|2.9-beos-000224*) echo "R5/GG gcc" - disable mmx -@@ -1503,7 +1503,7 @@ - # no need for libm, but the inet stuff - # Check for BONE - # XXX: actually should check for NOT net_server -- if echo $BEINCLUDES | grep -q 'headers/be/bone'; then -+ if echo $BEINCLUDES | ggrep -q 'headers/be/bone'; then - network_extralibs="-lbind -lsocket" - else - enable beos_netserver -@@ -1798,7 +1798,7 @@ - check_cc <> config.mak This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From janholzh at users.sourceforge.net Mon Jul 18 14:50:11 2011 From: janholzh at users.sourceforge.net (janholzh at users.sourceforge.net) Date: Mon, 18 Jul 2011 12:50:11 +0000 Subject: [csw-devel] SF.net SVN: gar:[15097] csw/mgar/pkg/ffmpeg/trunk/Makefile Message-ID: Revision: 15097 http://gar.svn.sourceforge.net/gar/?rev=15097&view=rev Author: janholzh Date: 2011-07-18 12:50:11 +0000 (Mon, 18 Jul 2011) Log Message: ----------- ffmpeg: add some notes Modified Paths: -------------- csw/mgar/pkg/ffmpeg/trunk/Makefile Modified: csw/mgar/pkg/ffmpeg/trunk/Makefile =================================================================== --- csw/mgar/pkg/ffmpeg/trunk/Makefile 2011-07-18 11:49:36 UTC (rev 15096) +++ csw/mgar/pkg/ffmpeg/trunk/Makefile 2011-07-18 12:50:11 UTC (rev 15097) @@ -1,6 +1,13 @@ # Copyright 2009 OpenCSW # Distributed under the terms of the GNU General Public License v2 # $Id$ +# It builds fine. The Test are failing though. +# The Linker fix patch is from http://blogs.everycity.co.uk/alasdair/2009/05/ffmpeg-64bit-x86_64-amd64-on-solaris-10/ +# This also mentions that ffmpeg build static is way faster then shared. So this would need two builds +# one static for static ffmpeg and one shared to get the shared libs. +# Another thing is to see if it can be build with suncc see http://ftp.jaist.ac.jp/pub/pkgsrc/current/pkgsrc/multimedia/ffmpeg/Makefile.common +# They disable all optimizations though. I don't know why. +# 3. No external libs are enabled atm. We might want to think about two versions with and without external libs NAME = ffmpeg VERSION = 0.8 @@ -21,6 +28,8 @@ PATCHFILES += 0003-fix-testsuite-shells.patch BUILD64 = 1 +# Tests need to be fixed +TEST_SCRIPTS = NODIRPATHS += --exec_prefix NODIRPATHS += --sbindir @@ -38,7 +47,6 @@ CONFIGURE_ARGS += --disable-debug CONFIGURE_ARGS += --enable-gpl CONFIGURE_ARGS += --enable-shared -#CONFIGURE_ARGS += --disable-static GARCOMPILER = GNU This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From maciej at opencsw.org Mon Jul 18 16:25:58 2011 From: maciej at opencsw.org (=?UTF-8?Q?Maciej_Blizi=C5=84ski?=) Date: Mon, 18 Jul 2011 15:25:58 +0100 Subject: [csw-devel] SF.net SVN: gar:[15091] csw/mgar/pkg In-Reply-To: References: Message-ID: Hi Rupert, Can you move it to the lang-python subdirectory? All Python modules are kept there. Maciej Em 18/07/2011 03:52, escreveu: > Revision: 15091 > http://gar.svn.sourceforge.net/gar/?rev=15091&view=rev > Author: rthurner > Date: 2011-07-18 02:52:01 +0000 (Mon, 18 Jul 2011) > > Log Message: > ----------- > subvertpy, initial > > Added Paths: > ----------- > csw/mgar/pkg/subvertpy/ > csw/mgar/pkg/subvertpy/Makefile > csw/mgar/pkg/subvertpy/branches/ > csw/mgar/pkg/subvertpy/tags/ > csw/mgar/pkg/subvertpy/trunk/ > csw/mgar/pkg/subvertpy/trunk/Makefile > csw/mgar/pkg/subvertpy/trunk/checksums > csw/mgar/pkg/subvertpy/trunk/files/ > > Copied: csw/mgar/pkg/subvertpy/Makefile (from rev 15077, csw/mgar/pkg/template/Makefile) > =================================================================== > --- csw/mgar/pkg/subvertpy/Makefile (rev 0) > +++ csw/mgar/pkg/subvertpy/Makefile 2011-07-18 02:52:01 UTC (rev 15091) > @@ -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/subvertpy/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/subvertpy/trunk/Makefile > =================================================================== > --- csw/mgar/pkg/subvertpy/trunk/Makefile (rev 0) > +++ csw/mgar/pkg/subvertpy/trunk/Makefile 2011-07-18 02:52:01 UTC (rev 15091) > @@ -0,0 +1,22 @@ > +# $Id$ > +# > +NAME = subvertpy > +VERSION = 0.8.2 > +GARTYPE = v2 > +CATEGORIES = python > + > +DESCRIPTION = Alternative python bindings for subversion > + > +MASTER_SITES = http://launchpad.net/subvertpy/trunk/$(VERSION)/+download/ > +DISTFILES = $(DISTNAME).tar.gz > +#UPSTREAM_MASTER_SITES = http://launchpad.net/subvertpy/trunk > + > +# File name regex to get notifications about upstream software releases > +# NOTE: Use this only if the automatic regex creation > +# does not work for your package > +# UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz > + > +CONFIGURE_ARGS = $(DIRPATHS) > + > +include gar/category.mk > + > > > Property changes on: csw/mgar/pkg/subvertpy/trunk/Makefile > ___________________________________________________________________ > Added: svn:keywords > + Id > > Added: csw/mgar/pkg/subvertpy/trunk/checksums > =================================================================== > --- csw/mgar/pkg/subvertpy/trunk/checksums (rev 0) > +++ csw/mgar/pkg/subvertpy/trunk/checksums 2011-07-18 02:52:01 UTC (rev 15091) > @@ -0,0 +1 @@ > +452dad38ab14dcc4364b472d9b2f012d subvertpy-0.8.2.tar.gz > > > This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. > _______________________________________________ > devel mailing list > devel at lists.opencsw.org > https://lists.opencsw.org/mailman/listinfo/devel -------------- next part -------------- An HTML attachment was scrubbed... URL: From chninkel at users.sourceforge.net Mon Jul 18 22:31:27 2011 From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net) Date: Mon, 18 Jul 2011 20:31:27 +0000 Subject: [csw-devel] SF.net SVN: gar:[15098] csw/mgar/pkg/cadaver/trunk Message-ID: Revision: 15098 http://gar.svn.sourceforge.net/gar/?rev=15098&view=rev Author: chninkel Date: 2011-07-18 20:31:27 +0000 (Mon, 18 Jul 2011) Log Message: ----------- cadaver: fixed compliance check and updated dependancy package names Modified Paths: -------------- csw/mgar/pkg/cadaver/trunk/Makefile csw/mgar/pkg/cadaver/trunk/files/CSWcadav.prototype Modified: csw/mgar/pkg/cadaver/trunk/Makefile =================================================================== --- csw/mgar/pkg/cadaver/trunk/Makefile 2011-07-18 12:50:11 UTC (rev 15097) +++ csw/mgar/pkg/cadaver/trunk/Makefile 2011-07-18 20:31:27 UTC (rev 15098) @@ -25,10 +25,16 @@ PACKAGES = CSWcadav CATALOGNAME_CSWcadav = cadaver -RUNTIME_DEP_PKGS = CSWggettextrt CSWiconv CSWneon CSWosslrt CSWreadline CSWzlib CSWgcrypt CSWgnutls CSWgpgerr +RUNTIME_DEP_PKGS = CSWosslrt +RUNTIME_DEP_PKGS += CSWlibintl8 +RUNTIME_DEP_PKGS += CSWlibneon27 +RUNTIME_DEP_PKGS += CSWlibreadline6 +RUNTIME_DEP_PKGS += CSWzlib +RUNTIME_DEP_PKGS += CSWexpat +# We will not fix this today +CHECKPKG_OVERRIDES_CSWcadav += catalogname-does-not-match-pkgname|pkgname=CSWcadav|catalogname=cadaver|expected-catalogname=cadav - ###### Upstream and opencsw files information ####### MASTER_SITES = http://www.webdav.org/cadaver/ @@ -44,11 +50,12 @@ # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz - ##### Build and installation information ##### CONFIGURE_ARGS = $(DIRPATHS) CONFIGURE_ARGS += --enable-nls +CONFIGURE_ARGS += --with-ssl=openssl +CONFIGURE_ARGS += --with-expat TEST_SCRIPTS = Modified: csw/mgar/pkg/cadaver/trunk/files/CSWcadav.prototype =================================================================== --- csw/mgar/pkg/cadaver/trunk/files/CSWcadav.prototype 2011-07-18 12:50:11 UTC (rev 15097) +++ csw/mgar/pkg/cadaver/trunk/files/CSWcadav.prototype 2011-07-18 20:31:27 UTC (rev 15098) @@ -1,14 +1,7 @@ f none /opt/csw/bin/cadaver 0755 root bin -d none /opt/csw/share/locale/en at quot 0755 root bin -d none /opt/csw/share/locale/en at quot/LC_MESSAGES 0755 root bin f none /opt/csw/share/locale/en at quot/LC_MESSAGES/cadaver.mo 0644 root bin -d none /opt/csw/share/locale/es 0755 root bin -d none /opt/csw/share/locale/es/LC_MESSAGES 0755 root bin f none /opt/csw/share/locale/es/LC_MESSAGES/cadaver.mo 0644 root bin -d none /opt/csw/share/locale/it 0755 root bin -d none /opt/csw/share/locale/it/LC_MESSAGES 0755 root bin f none /opt/csw/share/locale/it/LC_MESSAGES/cadaver.mo 0644 root bin -d none /opt/csw/share/man 0755 root bin d none /opt/csw/share/man/man1 0755 root bin f none /opt/csw/share/man/man1/cadaver.1 0644 root bin d none /opt/csw/share/doc/cadaver 0755 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 Mon Jul 18 22:37:21 2011 From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net) Date: Mon, 18 Jul 2011 20:37:21 +0000 Subject: [csw-devel] SF.net SVN: gar:[15099] csw/mgar/pkg/cadaver/trunk Message-ID: Revision: 15099 http://gar.svn.sourceforge.net/gar/?rev=15099&view=rev Author: chninkel Date: 2011-07-18 20:37:21 +0000 (Mon, 18 Jul 2011) Log Message: ----------- cadaver: fixed some compliance checks and updated depandancies names Modified Paths: -------------- csw/mgar/pkg/cadaver/trunk/Makefile Removed Paths: ------------- csw/mgar/pkg/cadaver/trunk/files/CSWcadav.prototype Modified: csw/mgar/pkg/cadaver/trunk/Makefile =================================================================== --- csw/mgar/pkg/cadaver/trunk/Makefile 2011-07-18 20:31:27 UTC (rev 15098) +++ csw/mgar/pkg/cadaver/trunk/Makefile 2011-07-18 20:37:21 UTC (rev 15099) @@ -40,16 +40,13 @@ MASTER_SITES = http://www.webdav.org/cadaver/ UPSTREAM_MASTER_SITES = http://www.webdav.org/cadaver/ -# We define upstream file regex so we can be notifed of new upstream software release -UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz - DISTFILES = $(NAME)-$(VERSION).tar.gz -DISTFILES += CSWcadav.prototype DISTFILES += changelog.CSW # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz + ##### Build and installation information ##### CONFIGURE_ARGS = $(DIRPATHS) Deleted: csw/mgar/pkg/cadaver/trunk/files/CSWcadav.prototype =================================================================== --- csw/mgar/pkg/cadaver/trunk/files/CSWcadav.prototype 2011-07-18 20:31:27 UTC (rev 15098) +++ csw/mgar/pkg/cadaver/trunk/files/CSWcadav.prototype 2011-07-18 20:37:21 UTC (rev 15099) @@ -1,8 +0,0 @@ -f none /opt/csw/bin/cadaver 0755 root bin -f none /opt/csw/share/locale/en at quot/LC_MESSAGES/cadaver.mo 0644 root bin -f none /opt/csw/share/locale/es/LC_MESSAGES/cadaver.mo 0644 root bin -f none /opt/csw/share/locale/it/LC_MESSAGES/cadaver.mo 0644 root bin -d none /opt/csw/share/man/man1 0755 root bin -f none /opt/csw/share/man/man1/cadaver.1 0644 root bin -d none /opt/csw/share/doc/cadaver 0755 root bin -f none /opt/csw/share/doc/cadaver/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 Mon Jul 18 22:45:51 2011 From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net) Date: Mon, 18 Jul 2011 20:45:51 +0000 Subject: [csw-devel] SF.net SVN: gar:[15100] csw/mgar/pkg/cadaver/trunk Message-ID: Revision: 15100 http://gar.svn.sourceforge.net/gar/?rev=15100&view=rev Author: chninkel Date: 2011-07-18 20:45:51 +0000 (Mon, 18 Jul 2011) Log Message: ----------- cadaver: switched to dynamic prototype and updated changelog Modified Paths: -------------- csw/mgar/pkg/cadaver/trunk/Makefile csw/mgar/pkg/cadaver/trunk/files/changelog.CSW Removed Paths: ------------- csw/mgar/pkg/cadaver/trunk/files/CSWcadav.depend csw/mgar/pkg/cadaver/trunk/files/CSWcadav.gspec Modified: csw/mgar/pkg/cadaver/trunk/Makefile =================================================================== --- csw/mgar/pkg/cadaver/trunk/Makefile 2011-07-18 20:37:21 UTC (rev 15099) +++ csw/mgar/pkg/cadaver/trunk/Makefile 2011-07-18 20:45:51 UTC (rev 15100) @@ -59,5 +59,6 @@ include gar/category.mk post-merge: - @ginstall -D $(DOWNLOADDIR)/changelog.CSW $(PKGROOT)$(docdir)/$(NAME)/changelog.CSW + ginstall -D $(DOWNLOADDIR)/changelog.CSW $(PKGROOT)$(docdir)/$(NAME)/changelog.CSW + Deleted: csw/mgar/pkg/cadaver/trunk/files/CSWcadav.depend =================================================================== --- csw/mgar/pkg/cadaver/trunk/files/CSWcadav.depend 2011-07-18 20:37:21 UTC (rev 15099) +++ csw/mgar/pkg/cadaver/trunk/files/CSWcadav.depend 2011-07-18 20:45:51 UTC (rev 15100) @@ -1,9 +0,0 @@ -P CSWggettextrt ggettextrt - GNU gettext -P CSWiconv libiconv - GNU iconv library -P CSWneon neon - Neon HTTP and WebDAV client library -P CSWosslrt openssl - The Open Source toolkit for SSL and TLS. -P CSWreadline readline - library to enable interactive line editing -P CSWzlib zlib - Zlib Data Compression Library -P CSWgcrypt -P CSWgnutls -P CSWgpgerr Deleted: csw/mgar/pkg/cadaver/trunk/files/CSWcadav.gspec =================================================================== --- csw/mgar/pkg/cadaver/trunk/files/CSWcadav.gspec 2011-07-18 20:37:21 UTC (rev 15099) +++ csw/mgar/pkg/cadaver/trunk/files/CSWcadav.gspec 2011-07-18 20:45:51 UTC (rev 15100) @@ -1,4 +0,0 @@ -%var bitname cadaver -%var pkgname CSWcadav -%include url file://%{PKGLIB}/csw_dyndepend.gspec -%copyright url file://%{WORKSRC}/COPYING Modified: csw/mgar/pkg/cadaver/trunk/files/changelog.CSW =================================================================== --- csw/mgar/pkg/cadaver/trunk/files/changelog.CSW 2011-07-18 20:37:21 UTC (rev 15099) +++ csw/mgar/pkg/cadaver/trunk/files/changelog.CSW 2011-07-18 20:45:51 UTC (rev 15100) @@ -1,3 +1,14 @@ +cadaver (0.23.3,rev=2011.07.18) unstable + + * Updated dependancies names: + CSWgettextrt -> CSWlibintl8 + CSWreadline -> CSWlibreadline6 + CSWneon -> CSWlibneon27 + * Removed unnecessary gnutls dependancy. + * [GAR] Switched to dynamic prototype. + + -- Yann rouillard Mon, 18 Jul 2011 22:42:52 +0200 + cadaver (0.23.3,rev=2009.12.23) unstable * new upstream version. This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From chninkel at users.sourceforge.net Mon Jul 18 22:52:03 2011 From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net) Date: Mon, 18 Jul 2011 20:52:03 +0000 Subject: [csw-devel] SF.net SVN: gar:[15101] csw/mgar/pkg/cadaver/trunk/Makefile Message-ID: Revision: 15101 http://gar.svn.sourceforge.net/gar/?rev=15101&view=rev Author: chninkel Date: 2011-07-18 20:52:03 +0000 (Mon, 18 Jul 2011) Log Message: ----------- cadaver: removed UFILES_REGEX as automatic regex works correctly Modified Paths: -------------- csw/mgar/pkg/cadaver/trunk/Makefile Modified: csw/mgar/pkg/cadaver/trunk/Makefile =================================================================== --- csw/mgar/pkg/cadaver/trunk/Makefile 2011-07-18 20:45:51 UTC (rev 15100) +++ csw/mgar/pkg/cadaver/trunk/Makefile 2011-07-18 20:52:03 UTC (rev 15101) @@ -43,10 +43,7 @@ DISTFILES = $(NAME)-$(VERSION).tar.gz DISTFILES += changelog.CSW -# We define upstream file regex so we can be notifed of new upstream software release -UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz - ##### Build and installation information ##### CONFIGURE_ARGS = $(DIRPATHS) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From chninkel at users.sourceforge.net Mon Jul 18 22:59:05 2011 From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net) Date: Mon, 18 Jul 2011 20:59:05 +0000 Subject: [csw-devel] SF.net SVN: gar:[15102] csw/mgar/pkg/elinks/trunk Message-ID: Revision: 15102 http://gar.svn.sourceforge.net/gar/?rev=15102&view=rev Author: chninkel Date: 2011-07-18 20:59:05 +0000 (Mon, 18 Jul 2011) Log Message: ----------- elinks: updated dependancy names and fixed some opencsw policy compliance problems Modified Paths: -------------- csw/mgar/pkg/elinks/trunk/Makefile csw/mgar/pkg/elinks/trunk/files/CSWelinks.prototype Modified: csw/mgar/pkg/elinks/trunk/Makefile =================================================================== --- csw/mgar/pkg/elinks/trunk/Makefile 2011-07-18 20:52:03 UTC (rev 15101) +++ csw/mgar/pkg/elinks/trunk/Makefile 2011-07-18 20:59:05 UTC (rev 15102) @@ -29,11 +29,18 @@ RUNTIME_DEP_PKGS = CSWbzip2 RUNTIME_DEP_PKGS += CSWexpat RUNTIME_DEP_PKGS += CSWiconv -RUNTIME_DEP_PKGS += CSWlibidn +RUNTIME_DEP_PKGS += CSWlibidn11 RUNTIME_DEP_PKGS += CSWosslrt RUNTIME_DEP_PKGS += CSWzlib +# paths used in some default path (mailcap search path and lua doc path), this can be safely ignored +# lua doc links could be fixed if lua doc is packaged in opencsw +CHECKPKG_OVERRIDES_CSWelinks += file-with-bad-content|/usr/share|root/opt/csw/bin/elinks +CHECKPKG_OVERRIDES_CSWelinks += file-with-bad-content|/usr/share|root/opt/csw/share/man/man5/elinks.conf.5 +CHECKPKG_OVERRIDES_CSWelinks += file-with-bad-content|/usr/local|root/opt/csw/share/man/man5/elinks.conf.5 +CHECKPKG_OVERRIDES_CSWelinks += file-with-bad-content|/usr/local|root/opt/csw/bin/elinks + ###### Upstream and opencsw files information ####### MASTER_SITES = http://elinks.cz/download/ Modified: csw/mgar/pkg/elinks/trunk/files/CSWelinks.prototype =================================================================== --- csw/mgar/pkg/elinks/trunk/files/CSWelinks.prototype 2011-07-18 20:52:03 UTC (rev 15101) +++ csw/mgar/pkg/elinks/trunk/files/CSWelinks.prototype 2011-07-18 20:59:05 UTC (rev 15102) @@ -1,98 +1,36 @@ f none /opt/csw/bin/elinks 0755 root bin d none /opt/csw/share/doc/elinks 0755 root bin f none /opt/csw/share/doc/elinks/changelog.CSW 0755 root bin -d none /opt/csw/share/locale 0755 root bin -d none /opt/csw/share/locale/be 0755 root bin -d none /opt/csw/share/locale/be/LC_MESSAGES 0755 root bin f none /opt/csw/share/locale/be/LC_MESSAGES/elinks.mo 0644 root bin -d none /opt/csw/share/locale/bg 0755 root bin -d none /opt/csw/share/locale/bg/LC_MESSAGES 0755 root bin f none /opt/csw/share/locale/bg/LC_MESSAGES/elinks.mo 0644 root bin -d none /opt/csw/share/locale/ca 0755 root bin -d none /opt/csw/share/locale/ca/LC_MESSAGES 0755 root bin f none /opt/csw/share/locale/ca/LC_MESSAGES/elinks.mo 0644 root bin -d none /opt/csw/share/locale/cs 0755 root bin -d none /opt/csw/share/locale/cs/LC_MESSAGES 0755 root bin f none /opt/csw/share/locale/cs/LC_MESSAGES/elinks.mo 0644 root bin -d none /opt/csw/share/locale/da 0755 root bin -d none /opt/csw/share/locale/da/LC_MESSAGES 0755 root bin f none /opt/csw/share/locale/da/LC_MESSAGES/elinks.mo 0644 root bin -d none /opt/csw/share/locale/de 0755 root bin -d none /opt/csw/share/locale/de/LC_MESSAGES 0755 root bin f none /opt/csw/share/locale/de/LC_MESSAGES/elinks.mo 0644 root bin -d none /opt/csw/share/locale/el 0755 root bin -d none /opt/csw/share/locale/el/LC_MESSAGES 0755 root bin f none /opt/csw/share/locale/el/LC_MESSAGES/elinks.mo 0644 root bin -d none /opt/csw/share/locale/es 0755 root bin -d none /opt/csw/share/locale/es/LC_MESSAGES 0755 root bin f none /opt/csw/share/locale/es/LC_MESSAGES/elinks.mo 0644 root bin -d none /opt/csw/share/locale/et 0755 root bin -d none /opt/csw/share/locale/et/LC_MESSAGES 0755 root bin f none /opt/csw/share/locale/et/LC_MESSAGES/elinks.mo 0644 root bin -d none /opt/csw/share/locale/fi 0755 root bin -d none /opt/csw/share/locale/fi/LC_MESSAGES 0755 root bin f none /opt/csw/share/locale/fi/LC_MESSAGES/elinks.mo 0644 root bin -d none /opt/csw/share/locale/fr 0755 root bin -d none /opt/csw/share/locale/fr/LC_MESSAGES 0755 root bin f none /opt/csw/share/locale/fr/LC_MESSAGES/elinks.mo 0644 root bin -d none /opt/csw/share/locale/gl 0755 root bin -d none /opt/csw/share/locale/gl/LC_MESSAGES 0755 root bin f none /opt/csw/share/locale/gl/LC_MESSAGES/elinks.mo 0644 root bin -d none /opt/csw/share/locale/hr 0755 root bin -d none /opt/csw/share/locale/hr/LC_MESSAGES 0755 root bin f none /opt/csw/share/locale/hr/LC_MESSAGES/elinks.mo 0644 root bin -d none /opt/csw/share/locale/hu 0755 root bin -d none /opt/csw/share/locale/hu/LC_MESSAGES 0755 root bin f none /opt/csw/share/locale/hu/LC_MESSAGES/elinks.mo 0644 root bin -d none /opt/csw/share/locale/id 0755 root bin -d none /opt/csw/share/locale/id/LC_MESSAGES 0755 root bin f none /opt/csw/share/locale/id/LC_MESSAGES/elinks.mo 0644 root bin -d none /opt/csw/share/locale/is 0755 root bin -d none /opt/csw/share/locale/is/LC_MESSAGES 0755 root bin f none /opt/csw/share/locale/is/LC_MESSAGES/elinks.mo 0644 root bin -d none /opt/csw/share/locale/it 0755 root bin -d none /opt/csw/share/locale/it/LC_MESSAGES 0755 root bin f none /opt/csw/share/locale/it/LC_MESSAGES/elinks.mo 0644 root bin -d none /opt/csw/share/locale/lt 0755 root bin -d none /opt/csw/share/locale/lt/LC_MESSAGES 0755 root bin f none /opt/csw/share/locale/lt/LC_MESSAGES/elinks.mo 0644 root bin -d none /opt/csw/share/locale/nb 0755 root bin -d none /opt/csw/share/locale/nb/LC_MESSAGES 0755 root bin f none /opt/csw/share/locale/nb/LC_MESSAGES/elinks.mo 0644 root bin -d none /opt/csw/share/locale/nl 0755 root bin -d none /opt/csw/share/locale/nl/LC_MESSAGES 0755 root bin f none /opt/csw/share/locale/nl/LC_MESSAGES/elinks.mo 0644 root bin -d none /opt/csw/share/locale/pl 0755 root bin -d none /opt/csw/share/locale/pl/LC_MESSAGES 0755 root bin f none /opt/csw/share/locale/pl/LC_MESSAGES/elinks.mo 0644 root bin -d none /opt/csw/share/locale/pt 0755 root bin -d none /opt/csw/share/locale/pt/LC_MESSAGES 0755 root bin f none /opt/csw/share/locale/pt/LC_MESSAGES/elinks.mo 0644 root bin -d none /opt/csw/share/locale/pt_BR 0755 root bin -d none /opt/csw/share/locale/pt_BR/LC_MESSAGES 0755 root bin f none /opt/csw/share/locale/pt_BR/LC_MESSAGES/elinks.mo 0644 root bin -d none /opt/csw/share/locale/ro 0755 root bin -d none /opt/csw/share/locale/ro/LC_MESSAGES 0755 root bin f none /opt/csw/share/locale/ro/LC_MESSAGES/elinks.mo 0644 root bin -d none /opt/csw/share/locale/ru 0755 root bin -d none /opt/csw/share/locale/ru/LC_MESSAGES 0755 root bin f none /opt/csw/share/locale/ru/LC_MESSAGES/elinks.mo 0644 root bin -d none /opt/csw/share/locale/sk 0755 root bin -d none /opt/csw/share/locale/sk/LC_MESSAGES 0755 root bin f none /opt/csw/share/locale/sk/LC_MESSAGES/elinks.mo 0644 root bin -d none /opt/csw/share/locale/sr 0755 root bin -d none /opt/csw/share/locale/sr/LC_MESSAGES 0755 root bin f none /opt/csw/share/locale/sr/LC_MESSAGES/elinks.mo 0644 root bin -d none /opt/csw/share/locale/sv 0755 root bin -d none /opt/csw/share/locale/sv/LC_MESSAGES 0755 root bin f none /opt/csw/share/locale/sv/LC_MESSAGES/elinks.mo 0644 root bin -d none /opt/csw/share/locale/tr 0755 root bin -d none /opt/csw/share/locale/tr/LC_MESSAGES 0755 root bin f none /opt/csw/share/locale/tr/LC_MESSAGES/elinks.mo 0644 root bin -d none /opt/csw/share/locale/uk 0755 root bin -d none /opt/csw/share/locale/uk/LC_MESSAGES 0755 root bin f none /opt/csw/share/locale/uk/LC_MESSAGES/elinks.mo 0644 root bin -d none /opt/csw/share/man 0755 root bin d none /opt/csw/share/man/man1 0755 root bin f none /opt/csw/share/man/man1/elinks.1 0644 root bin d none /opt/csw/share/man/man5 0755 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 Mon Jul 18 23:09:34 2011 From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net) Date: Mon, 18 Jul 2011 21:09:34 +0000 Subject: [csw-devel] SF.net SVN: gar:[15103] csw/mgar/pkg/bash/trunk Message-ID: Revision: 15103 http://gar.svn.sourceforge.net/gar/?rev=15103&view=rev Author: chninkel Date: 2011-07-18 21:09:34 +0000 (Mon, 18 Jul 2011) Log Message: ----------- bash: updated to 4.2.10 Modified Paths: -------------- csw/mgar/pkg/bash/trunk/Makefile csw/mgar/pkg/bash/trunk/checksums Modified: csw/mgar/pkg/bash/trunk/Makefile =================================================================== --- csw/mgar/pkg/bash/trunk/Makefile 2011-07-18 20:59:05 UTC (rev 15102) +++ csw/mgar/pkg/bash/trunk/Makefile 2011-07-18 21:09:34 UTC (rev 15103) @@ -13,7 +13,7 @@ ###### Package information ####### NAME = bash -VERSION = 4.1.9 +VERSION = 4.2.10 CATEGORIES = devel DESCRIPTION = A sh-compatible command language interpreter @@ -26,7 +26,7 @@ PACKAGES = CSWbash -RUNTIME_DEP_PKGS = CSWggettextrt +RUNTIME_DEP_PKGS = CSWlibintl8 RUNTIME_DEP_PKGS += CSWiconv SPKG_SOURCEURL = http://tiswww.case.edu/php/chet/bash/bashtop.html @@ -37,6 +37,15 @@ # this file collision is not important CHECKPKG_OVERRIDES_CSWbash += file-collision|/etc/shells|CSWbash|CSWksh +# /usr/local is present in the default path, this can be safely ignored +CHECKPKG_OVERRIDES_CSWbash += file-with-bad-content|/usr/local|root/opt/csw/bin/bash +CHECKPKG_OVERRIDES_CSWbash += file-with-bad-content|/usr/local|root/opt/csw/bin/bashbug +CHECKPKG_OVERRIDES_CSWbash += file-with-bad-content|/usr/local|root/opt/csw/share/doc/bash/NOTES +CHECKPKG_OVERRIDES_CSWbash += file-with-bad-content|/usr/local|root/opt/csw/share/doc/bash/FAQ +CHECKPKG_OVERRIDES_CSWbash += file-with-bad-content|/usr/local|root/opt/csw/share/man/man1/bash.1 +CHECKPKG_OVERRIDES_CSWbash += file-with-bad-content|/usr/local|root/opt/csw/share/doc/bashref.html +CHECKPKG_OVERRIDES_CSWbash += file-with-bad-content|/usr/local|root/opt/csw/share/doc/bash.html + ###### Upstream and opencsw files information ####### # We define upstream file regex so we can be notifed of new upstream software release Modified: csw/mgar/pkg/bash/trunk/checksums =================================================================== --- csw/mgar/pkg/bash/trunk/checksums 2011-07-18 20:59:05 UTC (rev 15102) +++ csw/mgar/pkg/bash/trunk/checksums 2011-07-18 21:09:34 UTC (rev 15103) @@ -1,10 +1,11 @@ -9800d8724815fd84994d9be65ab5e7b8 bash-4.1.tar.gz -582dea5671b557f783e18629c2f77b68 bash41-001 -118d465095d4a4706eb1d34696a2666a bash41-002 -120f7cf039a40d35fe375e59d6f17adc bash41-003 -336ee037fc2cc1e2350b05097fbdc87c bash41-004 -9471e666797f0b03eb2175ed752a9550 bash41-005 -fb80ccd58cb1e34940f3adf4ce6e4a1e bash41-006 -192a8b161d419a1d0d211169f1d1046e bash41-007 -1dc5a0253827decbe6aa529cde83e154 bash41-008 -ea361b842b7405a7f5ebbabbdf74372f bash41-009 +3fb927c7c33022f1c327f14a81c0d4b0 bash-4.2.tar.gz +1100bc1dda2cdc06ac44d7e5d17864a3 bash42-001 +30e7948079921d3261efcc6a40722135 bash42-002 +9ea06decec43a198f3d7cf29acc602f8 bash42-003 +fb48f6134d7b013135929476aa0c250c bash42-004 +e70e45de33426b38153b390be0dbbcd4 bash42-005 +ce4e5c484993705b27daa151eca242c2 bash42-006 +88d1f96db29461767602e2546803bda7 bash42-007 +24c574bf6d6a581e300823d9c1276af6 bash42-008 +4c5835f2fbab36c4292bb334977e5b6d bash42-009 +0a51602b535ef661ee707be6c8bdb373 bash42-010 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From chninkel at users.sourceforge.net Mon Jul 18 23:45:39 2011 From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net) Date: Mon, 18 Jul 2011 21:45:39 +0000 Subject: [csw-devel] SF.net SVN: gar:[15104] csw/mgar/pkg/elinks/trunk Message-ID: Revision: 15104 http://gar.svn.sourceforge.net/gar/?rev=15104&view=rev Author: chninkel Date: 2011-07-18 21:45:39 +0000 (Mon, 18 Jul 2011) Log Message: ----------- elinks: switched to dynamic prototype Modified Paths: -------------- csw/mgar/pkg/elinks/trunk/Makefile csw/mgar/pkg/elinks/trunk/files/changelog.CSW Removed Paths: ------------- csw/mgar/pkg/elinks/trunk/files/CSWelinks.prototype Modified: csw/mgar/pkg/elinks/trunk/Makefile =================================================================== --- csw/mgar/pkg/elinks/trunk/Makefile 2011-07-18 21:09:34 UTC (rev 15103) +++ csw/mgar/pkg/elinks/trunk/Makefile 2011-07-18 21:45:39 UTC (rev 15104) @@ -45,19 +45,15 @@ MASTER_SITES = http://elinks.cz/download/ -# We define upstream file regex so we can be notifed of new upstream software release -UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.bz2 - DISTFILES = $(NAME)-$(VERSION).tar.bz2 -DISTFILES += CSWelinks.prototype DISTFILES += changelog.CSW -# We define upstream file regex so we can be notifed of new upstream software release -UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.bz2 - # Debian security path for CVE-2007-2027 PATCHFILES += elinks-417789.diff +# Provided by iconv +MERGE_EXCLUDE_FILES = .*/charset.alias +MERGE_EXCLUDE_FILES += .*/locale.alias ##### Build and installation information ##### Deleted: csw/mgar/pkg/elinks/trunk/files/CSWelinks.prototype =================================================================== --- csw/mgar/pkg/elinks/trunk/files/CSWelinks.prototype 2011-07-18 21:09:34 UTC (rev 15103) +++ csw/mgar/pkg/elinks/trunk/files/CSWelinks.prototype 2011-07-18 21:45:39 UTC (rev 15104) @@ -1,39 +0,0 @@ -f none /opt/csw/bin/elinks 0755 root bin -d none /opt/csw/share/doc/elinks 0755 root bin -f none /opt/csw/share/doc/elinks/changelog.CSW 0755 root bin -f none /opt/csw/share/locale/be/LC_MESSAGES/elinks.mo 0644 root bin -f none /opt/csw/share/locale/bg/LC_MESSAGES/elinks.mo 0644 root bin -f none /opt/csw/share/locale/ca/LC_MESSAGES/elinks.mo 0644 root bin -f none /opt/csw/share/locale/cs/LC_MESSAGES/elinks.mo 0644 root bin -f none /opt/csw/share/locale/da/LC_MESSAGES/elinks.mo 0644 root bin -f none /opt/csw/share/locale/de/LC_MESSAGES/elinks.mo 0644 root bin -f none /opt/csw/share/locale/el/LC_MESSAGES/elinks.mo 0644 root bin -f none /opt/csw/share/locale/es/LC_MESSAGES/elinks.mo 0644 root bin -f none /opt/csw/share/locale/et/LC_MESSAGES/elinks.mo 0644 root bin -f none /opt/csw/share/locale/fi/LC_MESSAGES/elinks.mo 0644 root bin -f none /opt/csw/share/locale/fr/LC_MESSAGES/elinks.mo 0644 root bin -f none /opt/csw/share/locale/gl/LC_MESSAGES/elinks.mo 0644 root bin -f none /opt/csw/share/locale/hr/LC_MESSAGES/elinks.mo 0644 root bin -f none /opt/csw/share/locale/hu/LC_MESSAGES/elinks.mo 0644 root bin -f none /opt/csw/share/locale/id/LC_MESSAGES/elinks.mo 0644 root bin -f none /opt/csw/share/locale/is/LC_MESSAGES/elinks.mo 0644 root bin -f none /opt/csw/share/locale/it/LC_MESSAGES/elinks.mo 0644 root bin -f none /opt/csw/share/locale/lt/LC_MESSAGES/elinks.mo 0644 root bin -f none /opt/csw/share/locale/nb/LC_MESSAGES/elinks.mo 0644 root bin -f none /opt/csw/share/locale/nl/LC_MESSAGES/elinks.mo 0644 root bin -f none /opt/csw/share/locale/pl/LC_MESSAGES/elinks.mo 0644 root bin -f none /opt/csw/share/locale/pt/LC_MESSAGES/elinks.mo 0644 root bin -f none /opt/csw/share/locale/pt_BR/LC_MESSAGES/elinks.mo 0644 root bin -f none /opt/csw/share/locale/ro/LC_MESSAGES/elinks.mo 0644 root bin -f none /opt/csw/share/locale/ru/LC_MESSAGES/elinks.mo 0644 root bin -f none /opt/csw/share/locale/sk/LC_MESSAGES/elinks.mo 0644 root bin -f none /opt/csw/share/locale/sr/LC_MESSAGES/elinks.mo 0644 root bin -f none /opt/csw/share/locale/sv/LC_MESSAGES/elinks.mo 0644 root bin -f none /opt/csw/share/locale/tr/LC_MESSAGES/elinks.mo 0644 root bin -f none /opt/csw/share/locale/uk/LC_MESSAGES/elinks.mo 0644 root bin -d none /opt/csw/share/man/man1 0755 root bin -f none /opt/csw/share/man/man1/elinks.1 0644 root bin -d none /opt/csw/share/man/man5 0755 root bin -f none /opt/csw/share/man/man5/elinks.conf.5 0644 root bin -f none /opt/csw/share/man/man5/elinkskeys.5 0644 root bin -d none /opt/csw/share/man/man8 0755 root bin Modified: csw/mgar/pkg/elinks/trunk/files/changelog.CSW =================================================================== --- csw/mgar/pkg/elinks/trunk/files/changelog.CSW 2011-07-18 21:09:34 UTC (rev 15103) +++ csw/mgar/pkg/elinks/trunk/files/changelog.CSW 2011-07-18 21:45:39 UTC (rev 15104) @@ -1,3 +1,10 @@ +elinks (0.11.7,REV=2011.07.18) unstable + + * Updated libidn dependancy: libidn -> libidn11. + * [GAR] Switched to dynamic prototype. + + -- Yann Rouillard Sun, 10 Oct 2009 21:38:39 +0100 + elinks (0.11.7,REV=2009.10.10) unstable * New upstream version. This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From chninkel at users.sourceforge.net Mon Jul 18 23:46:38 2011 From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net) Date: Mon, 18 Jul 2011 21:46:38 +0000 Subject: [csw-devel] SF.net SVN: gar:[15105] csw/mgar/pkg/lftp/trunk/Makefile Message-ID: Revision: 15105 http://gar.svn.sourceforge.net/gar/?rev=15105&view=rev Author: chninkel Date: 2011-07-18 21:46:38 +0000 (Mon, 18 Jul 2011) Log Message: ----------- lftp: fixed some policy compliance problems and updated dependancies names Modified Paths: -------------- csw/mgar/pkg/lftp/trunk/Makefile Modified: csw/mgar/pkg/lftp/trunk/Makefile =================================================================== --- csw/mgar/pkg/lftp/trunk/Makefile 2011-07-18 21:45:39 UTC (rev 15104) +++ csw/mgar/pkg/lftp/trunk/Makefile 2011-07-18 21:46:38 UTC (rev 15105) @@ -24,9 +24,18 @@ PACKAGES = CSWlftp CATALOGNAME_CSWlftp = lftp -RUNTIME_DEP_PKGS = CSWexpat CSWggettextrt CSWiconv CSWosslrt CSWreadline CSWlibsocks +RUNTIME_DEP_PKGS = CSWexpat +RUNTIME_DEP_PKGS += CSWiconv +RUNTIME_DEP_PKGS += CSWosslrt +RUNTIME_DEP_PKGS += CSWlibsocks +RUNTIME_DEP_PKGS += CSWlibintl8 +RUNTIME_DEP_PKGS += CSWlibreadline6 +# Reference to configuration file default path for configure, can be safely ignored +CHECKPKG_OVERRIDES_CSWlftp += file-with-bad-content|/usr/local|root/opt/csw/share/man/man1/lftp.1 + + ###### Upstream and opencsw files information ####### MASTER_SITES = http://ftp.yars.free.net/pub/source/lftp/ @@ -62,6 +71,10 @@ localstatedir = /var$(prefix) sysconfdir = /etc$(prefix) +# We don't want Sun Studio RPATH entries +# see http://wiki.opencsw.org/checkpkg-error-tags#bad-rpath-entry +EXTRA_LINKER_FLAGS = -norunpath + CONFIGURE_ARGS = $(DIRPATHS) # previous maintainer compiled with openssl # instead of gnutls, no need to change that This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From chninkel at users.sourceforge.net Mon Jul 18 23:50:46 2011 From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net) Date: Mon, 18 Jul 2011 21:50:46 +0000 Subject: [csw-devel] SF.net SVN: gar:[15106] csw/mgar/pkg/lftp/trunk/Makefile Message-ID: Revision: 15106 http://gar.svn.sourceforge.net/gar/?rev=15106&view=rev Author: chninkel Date: 2011-07-18 21:50:46 +0000 (Mon, 18 Jul 2011) Log Message: ----------- lftp: removed UFILES_REGEX as Uwatch automatic regex works fine Modified Paths: -------------- csw/mgar/pkg/lftp/trunk/Makefile Modified: csw/mgar/pkg/lftp/trunk/Makefile =================================================================== --- csw/mgar/pkg/lftp/trunk/Makefile 2011-07-18 21:46:38 UTC (rev 15105) +++ csw/mgar/pkg/lftp/trunk/Makefile 2011-07-18 21:50:46 UTC (rev 15106) @@ -40,9 +40,6 @@ MASTER_SITES = http://ftp.yars.free.net/pub/source/lftp/ -# We define upstream file regex so we can be notifed of new upstream software release -UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz - DISTFILES = $(NAME)-$(VERSION).tar.gz DISTFILES += changelog.CSW This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From chninkel at users.sourceforge.net Tue Jul 19 00:02:54 2011 From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net) Date: Mon, 18 Jul 2011 22:02:54 +0000 Subject: [csw-devel] SF.net SVN: gar:[15107] csw/mgar/pkg/vsftpd/trunk Message-ID: Revision: 15107 http://gar.svn.sourceforge.net/gar/?rev=15107&view=rev Author: chninkel Date: 2011-07-18 22:02:54 +0000 (Mon, 18 Jul 2011) Log Message: ----------- vsftpd: fixed some policy compliance problems Modified Paths: -------------- csw/mgar/pkg/vsftpd/trunk/Makefile csw/mgar/pkg/vsftpd/trunk/files/csw_paths.patch Modified: csw/mgar/pkg/vsftpd/trunk/Makefile =================================================================== --- csw/mgar/pkg/vsftpd/trunk/Makefile 2011-07-18 21:50:46 UTC (rev 15106) +++ csw/mgar/pkg/vsftpd/trunk/Makefile 2011-07-18 22:02:54 UTC (rev 15107) @@ -32,7 +32,18 @@ RUNTIME_DEP_PKGS = CSWtcpwrap RUNTIME_DEP_PKGS += CSWosslrt +# Reference to DTD path, can be safely ignored +CHECKPKG_OVERRIDES_CSWvsftpd += file-with-bad-content|/usr/share|root/var/opt/csw/svc/manifest/network/cswvsftpd.xml +# Various reference to default vsftpd path in documentation files, can be safely ignored +CHECKPKG_OVERRIDES_CSWvsftpd += file-with-bad-content|/usr/local|root/opt/csw/share/doc/vsftpd/EXAMPLE/INTERNET_SITE/vsftpd.xinetd +CHECKPKG_OVERRIDES_CSWvsftpd += file-with-bad-content|/usr/local|root/opt/csw/share/doc/vsftpd/EXAMPLE/INTERNET_SITE/README +CHECKPKG_OVERRIDES_CSWvsftpd += file-with-bad-content|/usr/local|root/opt/csw/share/doc/vsftpd/INSTALL +CHECKPKG_OVERRIDES_CSWvsftpd += file-with-bad-content|/usr/local|root/opt/csw/share/doc/vsftpd/Changelog +CHECKPKG_OVERRIDES_CSWvsftpd += file-with-bad-content|/usr/share|root/opt/csw/share/doc/vsftpd/INSTALL +CHECKPKG_OVERRIDES_CSWvsftpd += file-with-bad-content|/usr/share|root/opt/csw/share/doc/vsftpd/README.ssl + + ###### Upstream and opencsw files information ####### # We define upstream file regex so we can be notifed of new upstream software release Modified: csw/mgar/pkg/vsftpd/trunk/files/csw_paths.patch =================================================================== --- csw/mgar/pkg/vsftpd/trunk/files/csw_paths.patch 2011-07-18 21:50:46 UTC (rev 15106) +++ csw/mgar/pkg/vsftpd/trunk/files/csw_paths.patch 2011-07-18 22:02:54 UTC (rev 15107) @@ -49,3 +49,86 @@ &tunable_rsa_cert_file); install_str_setting(0, &tunable_dsa_cert_file); install_str_setting("DES-CBC3-SHA", &tunable_ssl_ciphers); +--- vsftpd-2.3.2.orig/vsftpd.conf.5 Mon Oct 19 04:46:30 2009 ++++ vsftpd-2.3.2.orig/vsftpd.conf.5 Mon Jul 18 23:17:14 2011 +@@ -4,7 +4,7 @@ + .SH DESCRIPTION + vsftpd.conf may be used to control various aspects of vsftpd's behaviour. By + default, vsftpd looks for this file at the location +-.BR /etc/vsftpd.conf . ++.BR /opt/csw/etc/vsftpd.conf . + However, you may override this by specifying a command line argument to + vsftpd. The command line argument is the pathname of the configuration file + for vsftpd. This behaviour is useful because you may wish to use an advanced +@@ -138,7 +138,7 @@ + different if chroot_local_user is set to YES. In this case, the list becomes + a list of users which are NOT to be placed in a chroot() jail. + By default, the file containing this list is +-/etc/vsftpd.chroot_list, but you may override this with the ++/opt/csw/etc/vsftpd.chroot_list, but you may override this with the + .BR chroot_list_file + setting. + +@@ -177,7 +177,7 @@ + .B deny_email_enable + If activated, you may provide a list of anonymous password e-mail responses + which cause login to be denied. By default, the file containing this list is +-/etc/vsftpd.banned_emails, but you may override this with the ++/opt/csw/etc/vsftpd.banned_emails, but you may override this with the + .BR banned_email_file + setting. + +@@ -433,7 +433,7 @@ + file specified by the + .BR email_password_file + setting. The file format is one password per line, no extra whitespace. The +-default filename is /etc/vsftpd.email_passwords. ++default filename is /opt/csw/etc/vsftpd.email_passwords. + + Default: NO + .TP +@@ -764,7 +764,7 @@ + .BR deny_email_enable + is enabled. + +-Default: /etc/vsftpd.banned_emails ++Default: /opt/csw/etc/vsftpd.banned_emails + .TP + .B banner_file + This option is the name of a file containing text to display when someone +@@ -803,7 +803,7 @@ + is enabled, then the list file becomes a list of users to NOT place in a + chroot() jail. + +-Default: /etc/vsftpd.chroot_list ++Default: /opt/csw/etc/vsftpd.chroot_list + .TP + .B cmds_allowed + This options specifies a comma separated list of allowed FTP commands (post +@@ -864,7 +864,7 @@ + .BR secure_email_list_enable + setting. + +-Default: /etc/vsftpd.email_passwords ++Default: /opt/csw/etc/vsftpd.email_passwords + .TP + .B ftp_username + This is the name of the user we use for handling anonymous FTP. The home +@@ -955,7 +955,7 @@ + This option specifies the location of the RSA certificate to use for SSL + encrypted connections. + +-Default: /usr/share/ssl/certs/vsftpd.pem ++Default: /opt/csw/ssl/certs/vsftpd.pem + .TP + .B rsa_private_key_file + This option specifies the location of the RSA private key to use for SSL +@@ -969,7 +969,7 @@ + directory should not be writable by the ftp user. This directory is used + as a secure chroot() jail at times vsftpd does not require filesystem access. + +-Default: /usr/share/empty ++Default: /var/opt/csw/empty/vsftpd + .TP + .B ssl_ciphers + This option can be used to select which SSL ciphers vsftpd will allow for This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From chninkel at users.sourceforge.net Tue Jul 19 00:14:09 2011 From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net) Date: Mon, 18 Jul 2011 22:14:09 +0000 Subject: [csw-devel] SF.net SVN: gar:[15108] csw/mgar/pkg/vsftpd/trunk Message-ID: Revision: 15108 http://gar.svn.sourceforge.net/gar/?rev=15108&view=rev Author: chninkel Date: 2011-07-18 22:14:09 +0000 (Mon, 18 Jul 2011) Log Message: ----------- vsftpd: updated to 2.3.4 Modified Paths: -------------- csw/mgar/pkg/vsftpd/trunk/Makefile csw/mgar/pkg/vsftpd/trunk/checksums csw/mgar/pkg/vsftpd/trunk/files/changelog.CSW Modified: csw/mgar/pkg/vsftpd/trunk/Makefile =================================================================== --- csw/mgar/pkg/vsftpd/trunk/Makefile 2011-07-18 22:02:54 UTC (rev 15107) +++ csw/mgar/pkg/vsftpd/trunk/Makefile 2011-07-18 22:14:09 UTC (rev 15108) @@ -13,7 +13,7 @@ ###### Package information ####### NAME = vsftpd -VERSION = 2.3.2 +VERSION = 2.3.4 CATEGORIES = server DESCRIPTION = A very secure and fast FTP server. @@ -25,7 +25,7 @@ per-user / per-IP configuration. endef -MASTER_SITES = ftp://vsftpd.beasts.org/users/cevans/ +MASTER_SITES = https://security.appspot.com/downloads/ PACKAGES = CSWvsftpd @@ -46,9 +46,6 @@ ###### Upstream and opencsw files information ####### -# We define upstream file regex so we can be notifed of new upstream software release -UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz - DISTFILES = $(NAME)-$(VERSION).tar.gz DISTFILES += CSWvsftpd.preinstall DISTFILES += changelog.CSW README.CSW Modified: csw/mgar/pkg/vsftpd/trunk/checksums =================================================================== --- csw/mgar/pkg/vsftpd/trunk/checksums 2011-07-18 22:02:54 UTC (rev 15107) +++ csw/mgar/pkg/vsftpd/trunk/checksums 2011-07-18 22:14:09 UTC (rev 15108) @@ -1 +1 @@ -bad7b117d737a738738836041edc00db vsftpd-2.3.2.tar.gz +2ea5d19978710527bb7444d93b67767a vsftpd-2.3.4.tar.gz Modified: csw/mgar/pkg/vsftpd/trunk/files/changelog.CSW =================================================================== --- csw/mgar/pkg/vsftpd/trunk/files/changelog.CSW 2011-07-18 22:02:54 UTC (rev 15107) +++ csw/mgar/pkg/vsftpd/trunk/files/changelog.CSW 2011-07-18 22:14:09 UTC (rev 15108) @@ -1,3 +1,11 @@ +vsftpd (2.3.4,REV=2011.07.19) unstable + + * New upstream release. + * Fixed default configuration files paths information + in vsftpd.conf man page. + + -- Yann Rouillard Tue, 19 Jul 2011 00:08:17 +0200 + vsftpd (2.3.2,REV=2010.09.03) UNRELEASED * Configuration file migration from /opt/csw/etc/vsftpd to This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From chninkel at users.sourceforge.net Tue Jul 19 00:26:50 2011 From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net) Date: Mon, 18 Jul 2011 22:26:50 +0000 Subject: [csw-devel] SF.net SVN: gar:[15109] csw/mgar/pkg/bash/trunk/Makefile Message-ID: Revision: 15109 http://gar.svn.sourceforge.net/gar/?rev=15109&view=rev Author: chninkel Date: 2011-07-18 22:26:50 +0000 (Mon, 18 Jul 2011) Log Message: ----------- bash: added some more policy compliance fixes Modified Paths: -------------- csw/mgar/pkg/bash/trunk/Makefile Modified: csw/mgar/pkg/bash/trunk/Makefile =================================================================== --- csw/mgar/pkg/bash/trunk/Makefile 2011-07-18 22:14:09 UTC (rev 15108) +++ csw/mgar/pkg/bash/trunk/Makefile 2011-07-18 22:26:50 UTC (rev 15109) @@ -46,6 +46,13 @@ CHECKPKG_OVERRIDES_CSWbash += file-with-bad-content|/usr/local|root/opt/csw/share/doc/bashref.html CHECKPKG_OVERRIDES_CSWbash += file-with-bad-content|/usr/local|root/opt/csw/share/doc/bash.html + +# We must modify /etc/shells, this is the cause of the following checkpkg errors that we must override +# This will be better fixed when we will use cswetcshells (soon) +CHECKPKG_OVERRIDES_CSWbash += missing-dependency|BOstdenv|or|CSWboincclient|or|CSWconserver|or|CSWdevmon|or|CSWhobbit|or|CSWhobbitc|or|CSWhylafax|or|CSWjabberd|or|CSWjetty6|or|CSWopenvpn|or|CSWw9wm-dtlogin|or|IPLTdsr +CHECKPKG_OVERRIDES_CSWbash += bad-location-of-file|file=/etc/shells + + ###### Upstream and opencsw files information ####### # We define upstream file regex so we can be notifed of new upstream software release This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From chninkel at users.sourceforge.net Tue Jul 19 01:46:00 2011 From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net) Date: Mon, 18 Jul 2011 23:46:00 +0000 Subject: [csw-devel] SF.net SVN: gar:[15110] csw/mgar/pkg/bash/trunk/Makefile Message-ID: Revision: 15110 http://gar.svn.sourceforge.net/gar/?rev=15110&view=rev Author: chninkel Date: 2011-07-18 23:45:59 +0000 (Mon, 18 Jul 2011) Log Message: ----------- bash: fixed upstream check (but it doesn't watch patches anymore) Modified Paths: -------------- csw/mgar/pkg/bash/trunk/Makefile Modified: csw/mgar/pkg/bash/trunk/Makefile =================================================================== --- csw/mgar/pkg/bash/trunk/Makefile 2011-07-18 22:26:50 UTC (rev 15109) +++ csw/mgar/pkg/bash/trunk/Makefile 2011-07-18 23:45:59 UTC (rev 15110) @@ -55,13 +55,12 @@ ###### Upstream and opencsw files information ####### -# We define upstream file regex so we can be notifed of new upstream software release -UFILES_REGEX = bash-(\d+\.\d+).tar.gz $(PATCHFILE_PREFIX)-(\d+) - # Patches download location MASTER_SITES = $(GNU_MIRROR)/bash-$(BASH_VERSION)-patches/ # Main archive location MASTER_SITES += $(GNU_MIRROR) +UPSTREAM_MASTER_SITES = $(GNU_MIRROR) + DISTNAME = $(NAME)-$(BASH_VERSION) DISTFILES = $(NAME)-$(BASH_VERSION).tar.gz DISTFILES += changelog.CSW 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 Jul 19 13:15:25 2011 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 19 Jul 2011 11:15:25 +0000 Subject: [csw-devel] SF.net SVN: gar:[15111] csw/mgar/pkg/hdf5/trunk Message-ID: Revision: 15111 http://gar.svn.sourceforge.net/gar/?rev=15111&view=rev Author: dmichelsen Date: 2011-07-19 11:15:25 +0000 (Tue, 19 Jul 2011) Log Message: ----------- hdf5: Update to 1.8.7, provides .so.7 instead of the existing .so.6 Modified Paths: -------------- csw/mgar/pkg/hdf5/trunk/Makefile csw/mgar/pkg/hdf5/trunk/checksums Modified: csw/mgar/pkg/hdf5/trunk/Makefile =================================================================== --- csw/mgar/pkg/hdf5/trunk/Makefile 2011-07-18 23:45:59 UTC (rev 15110) +++ csw/mgar/pkg/hdf5/trunk/Makefile 2011-07-19 11:15:25 UTC (rev 15111) @@ -1,13 +1,7 @@ NAME = hdf5 -VERSION = 1.8.5 +VERSION = 1.8.7 CATEGORIES = lib -EXTRA_MODULATORS = VERSION -MODULATIONS_VERSION = 1.6.10 1.8.5 - -SKIP_MODULATIONS = isa-sparcv9-garversion-1.6.10 -SKIP_MODULATIONS += isa-amd64-garversion-1.6.10 - DESCRIPTION = Event notification library define BLURB The libevent API provides a mechanism to execute a callback function when a @@ -17,49 +11,48 @@ endef MASTER_SITES = http://www.hdfgroup.org/ftp/HDF5/current/src/ -MASTER_SITES += http://www.hdfgroup.org/ftp/HDF5/current16/src/ -SOURCEFILES = $(foreach V,$(MODULATIONS_VERSION),$(NAME)-$V.tar.gz) -DISTFILES += $(SOURCEFILES) +DISTFILES += $(DISTNAME).tar.gz -NOEXTRACT = $(filter-out $(NAME)-$(VERSION).tar.gz,$(SOURCEFILES)) +PACKAGES += CSWlibhdf5-7 +SPKG_DESC_CSWlibhdf5-7 = HDF5 (hierarchical data format 5) library, libhdf5.so.7 +PKGFILES_CSWlibhdf5-7 += $(call pkgfiles_lib,libhdf5.so.7) +OBSOLETED_BY_CSWlibhdf5-7 += CSWhdf5rt +CATALOGNAME_CSWhdf5rt = hdf5_rt_stub +RUNTIME_DEP_PKGS_CSWlibhdf5-7 += CSWzlib -PACKAGES = CSWhdf5rt CSWhdf5 +PACKAGES += CSWlibhdf5hl7 +SPKG_DESC_CSWlibhdf5hl7 = HDF5 (hierarchical data format 5) library, libhdf5_hl.so.7 +PKGFILES_CSWlibhdf5hl7 += $(call pkgfiles_lib,libhdf5_hl.so.7) +RUNTIME_DEP_PKGS_CSWlibhdf5hl7 += CSWzlib +RUNTIME_DEP_PKGS_CSWlibhdf5hl7 += CSWlibhdf5-7 +OBSOLETED_BY_CSWlibhdf5hl7 += CSWhdf5rt -RUNTIME_DEP_PKGS_CSWhdf5 = CSWhdf5rt CSWzlib -RUNTIME_DEP_PKGS_CSWhdf5rt = CSWzlib +PACKAGES += CSWlibhdf5-dev +SPKG_DESC_CSWlibhdf5-dev = Development files for libhdf5.so.7 and libhdf5_hl.so.7 +# PKGFILES is catchall +RUNTIME_DEP_PKGS_CSWlibhdf5-dev += CSWlibhdf5-7 +RUNTIME_DEP_PKGS_CSWlibhdf5-dev += CSWlibhdf5hl7 -CATALOGNAME_CSWhdf5 = hdf5 -CATALOGNAME_CSWhdf5rt = hdf5_rt +PACKAGES += CSWhdf5 +SPKG_DESC_CSWhdf5 = HDF5 (hierarchical data format 5) software utilities +PKGFILES_CSWhdf5 += $(bindir)/.* +RUNTIME_DEP_PKGS_CSWhdf5 += CSWlibhdf5-7 +RUNTIME_DEP_PKGS_CSWhdf5 += CSWlibhdf5hl7 +RUNTIME_DEP_PKGS_CSWhdf5 += CSWzlib -SPKG_DESC_CSWhdf5 = HDF5 (Hierarchical Data Format 5) Software Utilities -SPKG_DESC_CSWhdf5rt = HDF5 (Hierarchical Data Format 5) Software Runtime Libraries +VENDOR_URL = http://www.hdfgroup.org/HDF5/ -# We define upstream file regex so we can be notifed of new upstream software release -UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz +# By default -L/opt/csw/lib is used which makes the new libhdf5_hl.so link to +# the existing /opt/csw/lib/libhdf5.so +LINKER_FLAGS = -SPKG_SOURCEURL = http://www.hdfgroup.org/HDF5/ - BUILD64 = 1 -NOISAEXEC = 1 -CONFIGURE_ARGS = $(DIRPATHS) -TEST_TARGET = check +# Image files can be really big +ISAEXEC = 1 -MERGE_SCRIPTS_isa-default-garversion-1.6.10 = copy-only -MERGE_DIRS_isa-default-garversion-1.6.10 = $(libdir) -MERGE_SCRIPTS_isa-extra-garversion-1.6.10 = copy-relocated-only -MERGE_DIRS_isa-extra-garversion-1.6.10 = $(libdir) +CONFIGURE_ARGS += $(DIRPATHS) +#CONFIGURE_ARGS += --enable-fortran +#CONFIGURE_ARGS += --enable-cxx -MERGE_SCRIPTS_isa-default-garversion-1.8.5 = copy-all -MERGE_SCRIPTS_isa-extra-garversion-1.8.5 = copy-relocated-only -MERGE_DIRS_isa-extra-garversion-1.8.5 = $(libdir) - -PKGFILES_CSWhdf5rt = $(PKGFILES_RT) - include gar/category.mk - -pre-install-modulated: - ginstall -d $(DESTDIR)$(libdir) - ginstall -d $(DESTDIR)$(includedir) - ginstall -d $(DESTDIR)$(bindir) - @$(MAKECOOKIE) Modified: csw/mgar/pkg/hdf5/trunk/checksums =================================================================== --- csw/mgar/pkg/hdf5/trunk/checksums 2011-07-18 23:45:59 UTC (rev 15110) +++ csw/mgar/pkg/hdf5/trunk/checksums 2011-07-19 11:15:25 UTC (rev 15111) @@ -1,2 +1 @@ -6e207a95d22e9e9ffdfaecdd580cd1b3 hdf5-1.6.10.tar.gz -85d1cea1de32019bf85e484ce83f8bd9 hdf5-1.8.5.tar.gz +37711d4bcb72997e93d495f97c76c33a hdf5-1.8.7.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 Tue Jul 19 13:31:40 2011 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 19 Jul 2011 11:31:40 +0000 Subject: [csw-devel] SF.net SVN: gar:[15112] csw/mgar/pkg Message-ID: Revision: 15112 http://gar.svn.sourceforge.net/gar/?rev=15112&view=rev Author: dmichelsen Date: 2011-07-19 11:31:39 +0000 (Tue, 19 Jul 2011) Log Message: ----------- hdf5: Split into soname-specific recipes for hdf5-6 and hdf5-7 Added Paths: ----------- csw/mgar/pkg/hdf5-6/ csw/mgar/pkg/hdf5-6/trunk/Makefile csw/mgar/pkg/hdf5-6/trunk/checksums csw/mgar/pkg/hdf5-7/ csw/mgar/pkg/hdf5-7/trunk/Makefile csw/mgar/pkg/hdf5-7/trunk/checksums Removed Paths: ------------- csw/mgar/pkg/hdf5/ csw/mgar/pkg/hdf5-6/trunk/Makefile csw/mgar/pkg/hdf5-6/trunk/checksums csw/mgar/pkg/hdf5-7/trunk/Makefile csw/mgar/pkg/hdf5-7/trunk/checksums Deleted: csw/mgar/pkg/hdf5-6/trunk/Makefile =================================================================== --- csw/mgar/pkg/hdf5/trunk/Makefile 2011-07-18 23:45:59 UTC (rev 15110) +++ csw/mgar/pkg/hdf5-6/trunk/Makefile 2011-07-19 11:31:39 UTC (rev 15112) @@ -1,65 +0,0 @@ -NAME = hdf5 -VERSION = 1.8.5 -CATEGORIES = lib - -EXTRA_MODULATORS = VERSION -MODULATIONS_VERSION = 1.6.10 1.8.5 - -SKIP_MODULATIONS = isa-sparcv9-garversion-1.6.10 -SKIP_MODULATIONS += isa-amd64-garversion-1.6.10 - -DESCRIPTION = Event notification library -define BLURB - The libevent API provides a mechanism to execute a callback function when a - specific event occurs on a file descriptor or after a timeout has been - reached. Furthermore, libevent also support callbacks due to signals or - regular timeouts. -endef - -MASTER_SITES = http://www.hdfgroup.org/ftp/HDF5/current/src/ -MASTER_SITES += http://www.hdfgroup.org/ftp/HDF5/current16/src/ -SOURCEFILES = $(foreach V,$(MODULATIONS_VERSION),$(NAME)-$V.tar.gz) -DISTFILES += $(SOURCEFILES) - -NOEXTRACT = $(filter-out $(NAME)-$(VERSION).tar.gz,$(SOURCEFILES)) - -PACKAGES = CSWhdf5rt CSWhdf5 - -RUNTIME_DEP_PKGS_CSWhdf5 = CSWhdf5rt CSWzlib -RUNTIME_DEP_PKGS_CSWhdf5rt = CSWzlib - -CATALOGNAME_CSWhdf5 = hdf5 -CATALOGNAME_CSWhdf5rt = hdf5_rt - -SPKG_DESC_CSWhdf5 = HDF5 (Hierarchical Data Format 5) Software Utilities -SPKG_DESC_CSWhdf5rt = HDF5 (Hierarchical Data Format 5) Software Runtime Libraries - -# We define upstream file regex so we can be notifed of new upstream software release -UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz - -SPKG_SOURCEURL = http://www.hdfgroup.org/HDF5/ - -BUILD64 = 1 -NOISAEXEC = 1 -CONFIGURE_ARGS = $(DIRPATHS) - -TEST_TARGET = check - -MERGE_SCRIPTS_isa-default-garversion-1.6.10 = copy-only -MERGE_DIRS_isa-default-garversion-1.6.10 = $(libdir) -MERGE_SCRIPTS_isa-extra-garversion-1.6.10 = copy-relocated-only -MERGE_DIRS_isa-extra-garversion-1.6.10 = $(libdir) - -MERGE_SCRIPTS_isa-default-garversion-1.8.5 = copy-all -MERGE_SCRIPTS_isa-extra-garversion-1.8.5 = copy-relocated-only -MERGE_DIRS_isa-extra-garversion-1.8.5 = $(libdir) - -PKGFILES_CSWhdf5rt = $(PKGFILES_RT) - -include gar/category.mk - -pre-install-modulated: - ginstall -d $(DESTDIR)$(libdir) - ginstall -d $(DESTDIR)$(includedir) - ginstall -d $(DESTDIR)$(bindir) - @$(MAKECOOKIE) Copied: csw/mgar/pkg/hdf5-6/trunk/Makefile (from rev 15111, csw/mgar/pkg/hdf5/trunk/Makefile) =================================================================== --- csw/mgar/pkg/hdf5-6/trunk/Makefile (rev 0) +++ csw/mgar/pkg/hdf5-6/trunk/Makefile 2011-07-19 11:31:39 UTC (rev 15112) @@ -0,0 +1,58 @@ +NAME = hdf5 +VERSION = 1.8.6 +CATEGORIES = lib + +DESCRIPTION = Event notification library +define BLURB + The libevent API provides a mechanism to execute a callback function when a + specific event occurs on a file descriptor or after a timeout has been + reached. Furthermore, libevent also support callbacks due to signals or + regular timeouts. +endef + +MASTER_SITES += http://www.hdfgroup.org/ftp/HDF5/hdf5-$(VERSION)/src/ +DISTFILES += $(DISTNAME).tar.gz + +PACKAGES += CSWlibhdf5-7 +SPKG_DESC_CSWlibhdf5-7 = HDF5 (hierarchical data format 5) library, libhdf5.so.7 +PKGFILES_CSWlibhdf5-7 += $(call pkgfiles_lib,libhdf5.so.7) +OBSOLETED_BY_CSWlibhdf5-7 += CSWhdf5rt +CATALOGNAME_CSWhdf5rt = hdf5_rt_stub +RUNTIME_DEP_PKGS_CSWlibhdf5-7 += CSWzlib + +PACKAGES += CSWlibhdf5hl7 +SPKG_DESC_CSWlibhdf5hl7 = HDF5 (hierarchical data format 5) library, libhdf5_hl.so.7 +PKGFILES_CSWlibhdf5hl7 += $(call pkgfiles_lib,libhdf5_hl.so.7) +RUNTIME_DEP_PKGS_CSWlibhdf5hl7 += CSWzlib +RUNTIME_DEP_PKGS_CSWlibhdf5hl7 += CSWlibhdf5-7 +OBSOLETED_BY_CSWlibhdf5hl7 += CSWhdf5rt + +PACKAGES += CSWlibhdf5-dev +SPKG_DESC_CSWlibhdf5-dev = Development files for libhdf5.so.7 and libhdf5_hl.so.7 +# PKGFILES is catchall +RUNTIME_DEP_PKGS_CSWlibhdf5-dev += CSWlibhdf5-7 +RUNTIME_DEP_PKGS_CSWlibhdf5-dev += CSWlibhdf5hl7 + +PACKAGES += CSWhdf5 +SPKG_DESC_CSWhdf5 = HDF5 (hierarchical data format 5) software utilities +PKGFILES_CSWhdf5 += $(bindir)/.* +RUNTIME_DEP_PKGS_CSWhdf5 += CSWlibhdf5-7 +RUNTIME_DEP_PKGS_CSWhdf5 += CSWlibhdf5hl7 +RUNTIME_DEP_PKGS_CSWhdf5 += CSWzlib + +VENDOR_URL = http://www.hdfgroup.org/HDF5/ + +# By default -L/opt/csw/lib is used which makes the new libhdf5_hl.so link to +# the existing /opt/csw/lib/libhdf5.so +LINKER_FLAGS = + +BUILD64 = 1 + +# Image files can be really big +ISAEXEC = 1 + +CONFIGURE_ARGS += $(DIRPATHS) +#CONFIGURE_ARGS += --enable-fortran +#CONFIGURE_ARGS += --enable-cxx + +include gar/category.mk Deleted: csw/mgar/pkg/hdf5-6/trunk/checksums =================================================================== --- csw/mgar/pkg/hdf5/trunk/checksums 2011-07-18 23:45:59 UTC (rev 15110) +++ csw/mgar/pkg/hdf5-6/trunk/checksums 2011-07-19 11:31:39 UTC (rev 15112) @@ -1,2 +0,0 @@ -6e207a95d22e9e9ffdfaecdd580cd1b3 hdf5-1.6.10.tar.gz -85d1cea1de32019bf85e484ce83f8bd9 hdf5-1.8.5.tar.gz Copied: csw/mgar/pkg/hdf5-6/trunk/checksums (from rev 15111, csw/mgar/pkg/hdf5/trunk/checksums) =================================================================== --- csw/mgar/pkg/hdf5-6/trunk/checksums (rev 0) +++ csw/mgar/pkg/hdf5-6/trunk/checksums 2011-07-19 11:31:39 UTC (rev 15112) @@ -0,0 +1 @@ +bd2d369dfcf7aa0437dde6aeb8460a31 hdf5-1.8.6.tar.gz Deleted: csw/mgar/pkg/hdf5-7/trunk/Makefile =================================================================== --- csw/mgar/pkg/hdf5/trunk/Makefile 2011-07-18 23:45:59 UTC (rev 15110) +++ csw/mgar/pkg/hdf5-7/trunk/Makefile 2011-07-19 11:31:39 UTC (rev 15112) @@ -1,65 +0,0 @@ -NAME = hdf5 -VERSION = 1.8.5 -CATEGORIES = lib - -EXTRA_MODULATORS = VERSION -MODULATIONS_VERSION = 1.6.10 1.8.5 - -SKIP_MODULATIONS = isa-sparcv9-garversion-1.6.10 -SKIP_MODULATIONS += isa-amd64-garversion-1.6.10 - -DESCRIPTION = Event notification library -define BLURB - The libevent API provides a mechanism to execute a callback function when a - specific event occurs on a file descriptor or after a timeout has been - reached. Furthermore, libevent also support callbacks due to signals or - regular timeouts. -endef - -MASTER_SITES = http://www.hdfgroup.org/ftp/HDF5/current/src/ -MASTER_SITES += http://www.hdfgroup.org/ftp/HDF5/current16/src/ -SOURCEFILES = $(foreach V,$(MODULATIONS_VERSION),$(NAME)-$V.tar.gz) -DISTFILES += $(SOURCEFILES) - -NOEXTRACT = $(filter-out $(NAME)-$(VERSION).tar.gz,$(SOURCEFILES)) - -PACKAGES = CSWhdf5rt CSWhdf5 - -RUNTIME_DEP_PKGS_CSWhdf5 = CSWhdf5rt CSWzlib -RUNTIME_DEP_PKGS_CSWhdf5rt = CSWzlib - -CATALOGNAME_CSWhdf5 = hdf5 -CATALOGNAME_CSWhdf5rt = hdf5_rt - -SPKG_DESC_CSWhdf5 = HDF5 (Hierarchical Data Format 5) Software Utilities -SPKG_DESC_CSWhdf5rt = HDF5 (Hierarchical Data Format 5) Software Runtime Libraries - -# We define upstream file regex so we can be notifed of new upstream software release -UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz - -SPKG_SOURCEURL = http://www.hdfgroup.org/HDF5/ - -BUILD64 = 1 -NOISAEXEC = 1 -CONFIGURE_ARGS = $(DIRPATHS) - -TEST_TARGET = check - -MERGE_SCRIPTS_isa-default-garversion-1.6.10 = copy-only -MERGE_DIRS_isa-default-garversion-1.6.10 = $(libdir) -MERGE_SCRIPTS_isa-extra-garversion-1.6.10 = copy-relocated-only -MERGE_DIRS_isa-extra-garversion-1.6.10 = $(libdir) - -MERGE_SCRIPTS_isa-default-garversion-1.8.5 = copy-all -MERGE_SCRIPTS_isa-extra-garversion-1.8.5 = copy-relocated-only -MERGE_DIRS_isa-extra-garversion-1.8.5 = $(libdir) - -PKGFILES_CSWhdf5rt = $(PKGFILES_RT) - -include gar/category.mk - -pre-install-modulated: - ginstall -d $(DESTDIR)$(libdir) - ginstall -d $(DESTDIR)$(includedir) - ginstall -d $(DESTDIR)$(bindir) - @$(MAKECOOKIE) Copied: csw/mgar/pkg/hdf5-7/trunk/Makefile (from rev 15111, csw/mgar/pkg/hdf5/trunk/Makefile) =================================================================== --- csw/mgar/pkg/hdf5-7/trunk/Makefile (rev 0) +++ csw/mgar/pkg/hdf5-7/trunk/Makefile 2011-07-19 11:31:39 UTC (rev 15112) @@ -0,0 +1,58 @@ +NAME = hdf5 +VERSION = 1.8.7 +CATEGORIES = lib + +DESCRIPTION = Event notification library +define BLURB + The libevent API provides a mechanism to execute a callback function when a + specific event occurs on a file descriptor or after a timeout has been + reached. Furthermore, libevent also support callbacks due to signals or + regular timeouts. +endef + +MASTER_SITES = http://www.hdfgroup.org/ftp/HDF5/hdf5-$(VERSION)/src/ +DISTFILES += $(DISTNAME).tar.gz + +PACKAGES += CSWlibhdf5-7 +SPKG_DESC_CSWlibhdf5-7 = HDF5 (hierarchical data format 5) library, libhdf5.so.7 +PKGFILES_CSWlibhdf5-7 += $(call pkgfiles_lib,libhdf5.so.7) +OBSOLETED_BY_CSWlibhdf5-7 += CSWhdf5rt +CATALOGNAME_CSWhdf5rt = hdf5_rt_stub +RUNTIME_DEP_PKGS_CSWlibhdf5-7 += CSWzlib + +PACKAGES += CSWlibhdf5hl7 +SPKG_DESC_CSWlibhdf5hl7 = HDF5 (hierarchical data format 5) library, libhdf5_hl.so.7 +PKGFILES_CSWlibhdf5hl7 += $(call pkgfiles_lib,libhdf5_hl.so.7) +RUNTIME_DEP_PKGS_CSWlibhdf5hl7 += CSWzlib +RUNTIME_DEP_PKGS_CSWlibhdf5hl7 += CSWlibhdf5-7 +OBSOLETED_BY_CSWlibhdf5hl7 += CSWhdf5rt + +PACKAGES += CSWlibhdf5-dev +SPKG_DESC_CSWlibhdf5-dev = Development files for libhdf5.so.7 and libhdf5_hl.so.7 +# PKGFILES is catchall +RUNTIME_DEP_PKGS_CSWlibhdf5-dev += CSWlibhdf5-7 +RUNTIME_DEP_PKGS_CSWlibhdf5-dev += CSWlibhdf5hl7 + +PACKAGES += CSWhdf5 +SPKG_DESC_CSWhdf5 = HDF5 (hierarchical data format 5) software utilities +PKGFILES_CSWhdf5 += $(bindir)/.* +RUNTIME_DEP_PKGS_CSWhdf5 += CSWlibhdf5-7 +RUNTIME_DEP_PKGS_CSWhdf5 += CSWlibhdf5hl7 +RUNTIME_DEP_PKGS_CSWhdf5 += CSWzlib + +VENDOR_URL = http://www.hdfgroup.org/HDF5/ + +# By default -L/opt/csw/lib is used which makes the new libhdf5_hl.so link to +# the existing /opt/csw/lib/libhdf5.so +LINKER_FLAGS = + +BUILD64 = 1 + +# Image files can be really big +ISAEXEC = 1 + +CONFIGURE_ARGS += $(DIRPATHS) +#CONFIGURE_ARGS += --enable-fortran +#CONFIGURE_ARGS += --enable-cxx + +include gar/category.mk Deleted: csw/mgar/pkg/hdf5-7/trunk/checksums =================================================================== --- csw/mgar/pkg/hdf5/trunk/checksums 2011-07-18 23:45:59 UTC (rev 15110) +++ csw/mgar/pkg/hdf5-7/trunk/checksums 2011-07-19 11:31:39 UTC (rev 15112) @@ -1,2 +0,0 @@ -6e207a95d22e9e9ffdfaecdd580cd1b3 hdf5-1.6.10.tar.gz -85d1cea1de32019bf85e484ce83f8bd9 hdf5-1.8.5.tar.gz Copied: csw/mgar/pkg/hdf5-7/trunk/checksums (from rev 15111, csw/mgar/pkg/hdf5/trunk/checksums) =================================================================== --- csw/mgar/pkg/hdf5-7/trunk/checksums (rev 0) +++ csw/mgar/pkg/hdf5-7/trunk/checksums 2011-07-19 11:31:39 UTC (rev 15112) @@ -0,0 +1 @@ +37711d4bcb72997e93d495f97c76c33a hdf5-1.8.7.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 Tue Jul 19 13:34:36 2011 From: rthurner at users.sourceforge.net (rthurner at users.sourceforge.net) Date: Tue, 19 Jul 2011 11:34:36 +0000 Subject: [csw-devel] SF.net SVN: gar:[15113] csw/mgar Message-ID: Revision: 15113 http://gar.svn.sourceforge.net/gar/?rev=15113&view=rev Author: rthurner Date: 2011-07-19 11:34:36 +0000 (Tue, 19 Jul 2011) Log Message: ----------- move python packages one level higher to keep the pkg directory structure clean Added Paths: ----------- csw/mgar/pkg-lang-python/ Removed Paths: ------------- csw/mgar/pkg/lang-python/ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From rthurner at users.sourceforge.net Tue Jul 19 13:36:13 2011 From: rthurner at users.sourceforge.net (rthurner at users.sourceforge.net) Date: Tue, 19 Jul 2011 11:36:13 +0000 Subject: [csw-devel] SF.net SVN: gar:[15114] csw/mgar/pkg Message-ID: Revision: 15114 http://gar.svn.sourceforge.net/gar/?rev=15114&view=rev Author: rthurner Date: 2011-07-19 11:36:13 +0000 (Tue, 19 Jul 2011) Log Message: ----------- move subvertpy also in python modules Added Paths: ----------- csw/mgar/pkg-lang-python/subvertpy/ Removed Paths: ------------- csw/mgar/pkg/subvertpy/ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bonivart at opencsw.org Tue Jul 19 14:09:27 2011 From: bonivart at opencsw.org (Peter Bonivart) Date: Tue, 19 Jul 2011 14:09:27 +0200 Subject: [csw-devel] SF.net SVN: gar:[15113] csw/mgar In-Reply-To: References: Message-ID: On Tue, Jul 19, 2011 at 1:34 PM, wrote: > Revision: 15113 > ? ? ? ? ?http://gar.svn.sourceforge.net/gar/?rev=15113&view=rev > Author: ? rthurner > Date: ? ? 2011-07-19 11:34:36 +0000 (Tue, 19 Jul 2011) > > Log Message: > ----------- > move python packages one level higher to keep the pkg directory structure clean > > Added Paths: > ----------- > ? ?csw/mgar/pkg-lang-python/ > > Removed Paths: > ------------- > ? ?csw/mgar/pkg/lang-python/ You just restructured a big part of our repository, don't you think you should get consensus before doing such a thing? /peter From idogan23 at users.sourceforge.net Tue Jul 19 15:59:36 2011 From: idogan23 at users.sourceforge.net (idogan23 at users.sourceforge.net) Date: Tue, 19 Jul 2011 13:59:36 +0000 Subject: [csw-devel] SF.net SVN: gar:[15115] csw/mgar/pkg/unbound/trunk Message-ID: Revision: 15115 http://gar.svn.sourceforge.net/gar/?rev=15115&view=rev Author: idogan23 Date: 2011-07-19 13:59:36 +0000 (Tue, 19 Jul 2011) Log Message: ----------- unbound: bump version to 1.4.12 Modified Paths: -------------- csw/mgar/pkg/unbound/trunk/Makefile csw/mgar/pkg/unbound/trunk/checksums Modified: csw/mgar/pkg/unbound/trunk/Makefile =================================================================== --- csw/mgar/pkg/unbound/trunk/Makefile 2011-07-19 11:36:13 UTC (rev 15114) +++ csw/mgar/pkg/unbound/trunk/Makefile 2011-07-19 13:59:36 UTC (rev 15115) @@ -1,5 +1,5 @@ NAME = unbound -VERSION = 1.4.9 +VERSION = 1.4.12 CATEGORIES = server DESCRIPTION = A validating, recursive, and caching DNS resolver define BLUR Modified: csw/mgar/pkg/unbound/trunk/checksums =================================================================== --- csw/mgar/pkg/unbound/trunk/checksums 2011-07-19 11:36:13 UTC (rev 15114) +++ csw/mgar/pkg/unbound/trunk/checksums 2011-07-19 13:59:36 UTC (rev 15115) @@ -1 +1 @@ -7079e75210c656761d3804a9f2ac7b9f unbound-1.4.9.tar.gz +673a224c76345003fd168448ca12fbb2 unbound-1.4.12.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 Tue Jul 19 16:17:54 2011 From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net) Date: Tue, 19 Jul 2011 14:17:54 +0000 Subject: [csw-devel] SF.net SVN: gar:[15116] csw/mgar/pkg/rlwrap/trunk Message-ID: Revision: 15116 http://gar.svn.sourceforge.net/gar/?rev=15116&view=rev Author: chninkel Date: 2011-07-19 14:17:54 +0000 (Tue, 19 Jul 2011) Log Message: ----------- rlwrap: updated readline dependancy (CSWreadline -> CSWlibreadline6) Modified Paths: -------------- csw/mgar/pkg/rlwrap/trunk/Makefile csw/mgar/pkg/rlwrap/trunk/files/changelog.CSW Modified: csw/mgar/pkg/rlwrap/trunk/Makefile =================================================================== --- csw/mgar/pkg/rlwrap/trunk/Makefile 2011-07-19 13:59:36 UTC (rev 15115) +++ csw/mgar/pkg/rlwrap/trunk/Makefile 2011-07-19 14:17:54 UTC (rev 15116) @@ -23,11 +23,16 @@ PACKAGES = CSWrlwrap -RUNTIME_DEP_PKGS = CSWreadline +RUNTIME_DEP_PKGS = CSWlibreadline6 # We don't want to depend on OpenCSW perl CHECKPKG_OVERRIDES_CSWrlwrap += missing-dependency|CSWperl +# Reference to default paths in documentation or sample files, can be safely ignored +CHECKPKG_OVERRIDES_CSWrlwrap += file-with-bad-content|/usr/share|root/opt/csw/share/rlwrap/filters/paint_prompt +CHECKPKG_OVERRIDES_CSWrlwrap += file-with-bad-content|/usr/local|root/opt/csw/share/doc/rlwrap/NEWS + + ###### Upstream and opencsw files information ####### MASTER_SITES = http://utopia.knoware.nl/~hlub/uck/rlwrap/ Modified: csw/mgar/pkg/rlwrap/trunk/files/changelog.CSW =================================================================== --- csw/mgar/pkg/rlwrap/trunk/files/changelog.CSW 2011-07-19 13:59:36 UTC (rev 15115) +++ csw/mgar/pkg/rlwrap/trunk/files/changelog.CSW 2011-07-19 14:17:54 UTC (rev 15116) @@ -1,3 +1,9 @@ +rlwrap (0.37,REV=2011.07.19) unstable + + * Updated readline dependancy name (CSWreadline -> CSWlibreadline6). + + -- Yann Rouillard Tue, 19 Jul 2011 16:16:52 +0200 + rlwrap (0.37,REV=2010.09.01) unstable * New upstream release. This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From chninkel at users.sourceforge.net Tue Jul 19 17:35:23 2011 From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net) Date: Tue, 19 Jul 2011 15:35:23 +0000 Subject: [csw-devel] SF.net SVN: gar:[15117] csw/mgar/pkg/openssh/trunk/Makefile Message-ID: Revision: 15117 http://gar.svn.sourceforge.net/gar/?rev=15117&view=rev Author: chninkel Date: 2011-07-19 15:35:23 +0000 (Tue, 19 Jul 2011) Log Message: ----------- openssh: fixed some policy compliance errors Modified Paths: -------------- csw/mgar/pkg/openssh/trunk/Makefile Modified: csw/mgar/pkg/openssh/trunk/Makefile =================================================================== --- csw/mgar/pkg/openssh/trunk/Makefile 2011-07-19 14:17:54 UTC (rev 15116) +++ csw/mgar/pkg/openssh/trunk/Makefile 2011-07-19 15:35:23 UTC (rev 15117) @@ -93,10 +93,16 @@ CHECKPKG_OVERRIDES_CSWossh += file-with-bad-content|/usr/local|root/opt/csw/share/doc/openssh/INSTALL CHECKPKG_OVERRIDES_CSWossh += file-with-bad-content|/usr/share|root/var/opt/csw/svc/manifest/network/cswopenssh.xml +# We will not fix this today +CHECKPKG_OVERRIDES_CSWossh += catalogname-does-not-match-pkgname|pkgname=CSWossh|catalogname=openssh|expected-catalogname=ossh +CHECKPKG_OVERRIDES_CSWosshclient += catalogname-does-not-match-pkgname|pkgname=CSWosshclient|catalogname=openssh_client|expected-catalogname=osshclient + + ###### Upstream and OpenCSW files information ####### MASTER_SITES = ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/ http://www.sxw.org.uk/computing/patches/ +UPSTREAM_MASTER_SITES = ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/ # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*p\d+).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 Tue Jul 19 18:37:17 2011 From: rthurner at users.sourceforge.net (rthurner at users.sourceforge.net) Date: Tue, 19 Jul 2011 16:37:17 +0000 Subject: [csw-devel] SF.net SVN: gar:[15118] csw/mgar/pkg Message-ID: Revision: 15118 http://gar.svn.sourceforge.net/gar/?rev=15118&view=rev Author: rthurner Date: 2011-07-19 16:37:17 +0000 (Tue, 19 Jul 2011) Log Message: ----------- gitg: git repository client, initial Added Paths: ----------- csw/mgar/pkg/gitg/ csw/mgar/pkg/gitg/Makefile csw/mgar/pkg/gitg/branches/ csw/mgar/pkg/gitg/tags/ csw/mgar/pkg/gitg/trunk/ csw/mgar/pkg/gitg/trunk/Makefile csw/mgar/pkg/gitg/trunk/checksums csw/mgar/pkg/gitg/trunk/files/ Copied: csw/mgar/pkg/gitg/Makefile (from rev 15117, csw/mgar/pkg/template/Makefile) =================================================================== --- csw/mgar/pkg/gitg/Makefile (rev 0) +++ csw/mgar/pkg/gitg/Makefile 2011-07-19 16:37:17 UTC (rev 15118) @@ -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/gitg/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/gitg/trunk/Makefile =================================================================== --- csw/mgar/pkg/gitg/trunk/Makefile (rev 0) +++ csw/mgar/pkg/gitg/trunk/Makefile 2011-07-19 16:37:17 UTC (rev 15118) @@ -0,0 +1,17 @@ +# $Id$ +# TODO (release-critical prefixed with !, non release-critical with *) +# +NAME = gitg +VERSION = 0.2.2 +GARTYPE = v2 +CATEGORIES = gnome + +DESCRIPTION = git repository viewer + +MASTER_SITES = ftp://ftp.gnome.org/pub/GNOME/sources/gitg/0.2/ +DISTFILES = $(DISTNAME).tar.bz2 + +CONFIGURE_ARGS = $(DIRPATHS) + +include gar/category.mk + Property changes on: csw/mgar/pkg/gitg/trunk/Makefile ___________________________________________________________________ Added: svn:keywords + Id Added: csw/mgar/pkg/gitg/trunk/checksums =================================================================== --- csw/mgar/pkg/gitg/trunk/checksums (rev 0) +++ csw/mgar/pkg/gitg/trunk/checksums 2011-07-19 16:37:17 UTC (rev 15118) @@ -0,0 +1 @@ +4707d5e898b248c52cc1f8582a0ad494 gitg-0.2.2.tar.bz2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From maciej at opencsw.org Tue Jul 19 18:42:27 2011 From: maciej at opencsw.org (=?UTF-8?Q?Maciej_Blizi=C5=84ski?=) Date: Tue, 19 Jul 2011 17:42:27 +0100 Subject: [csw-devel] SF.net SVN: gar:[15091] csw/mgar/pkg In-Reply-To: References: Message-ID: What kind of disturbance do you have in mind? Maciej -------------- next part -------------- An HTML attachment was scrubbed... URL: From maciej at opencsw.org Tue Jul 19 18:42:26 2011 From: maciej at opencsw.org (=?UTF-8?Q?Maciej_Blizi=C5=84ski?=) Date: Tue, 19 Jul 2011 17:42:26 +0100 Subject: [csw-devel] SF.net SVN: gar:[15113] csw/mgar In-Reply-To: References: Message-ID: Em 19/07/2011 12:34, escreveu: > > Revision: 15113 > http://gar.svn.sourceforge.net/gar/?rev=15113&view=rev > Author: rthurner > Date: 2011-07-19 11:34:36 +0000 (Tue, 19 Jul 2011) > > Log Message: > ----------- > move python packages one level higher to keep the pkg directory structure clean > > Added Paths: > ----------- > csw/mgar/pkg-lang-python/ > > Removed Paths: > ------------- > csw/mgar/pkg/lang-python/ Hi Rupert, such a large change requires discussion. The pkg/ subdirectory is the top subdirectory for build recipes and must remain this way unless we agree on restructuring it. Can you revert this commit? Maciej -------------- next part -------------- An HTML attachment was scrubbed... URL: From maciej at opencsw.org Tue Jul 19 19:09:12 2011 From: maciej at opencsw.org (=?UTF-8?Q?Maciej_Blizi=C5=84ski?=) Date: Tue, 19 Jul 2011 18:09:12 +0100 Subject: [csw-devel] SF.net SVN: gar:[15113] csw/mgar In-Reply-To: References: Message-ID: Em 19/07/2011 17:49, "rupert THURNER" escreveu: > > of course i can, but how could this change break a build recipe? The pkg/ directory is the top directory of build recipes. If you move build recipes up, you are effectively removing the recipes from people's local copies. "It is gone. I don't see it anywhere anymore." Maciej -------------- next part -------------- An HTML attachment was scrubbed... URL: From maciej at opencsw.org Tue Jul 19 19:19:19 2011 From: maciej at opencsw.org (=?UTF-8?Q?Maciej_Blizi=C5=84ski?=) Date: Tue, 19 Jul 2011 18:19:19 +0100 Subject: [csw-devel] SF.net SVN: gar:[15091] csw/mgar/pkg In-Reply-To: References: Message-ID: Em 19/07/2011 17:52, "rupert THURNER" escreveu: > > 2011/7/19 Maciej Blizi?ski : > > What kind of disturbance do you have in mind? > for a local checkout: > set the symbolic links for all the ckeckout. Symbolic links from where to where? I assume it's not about symlinks to GAR, because that was solved by mgar. > for a git migration: > e.g. remove svn:externals to move to git, or create and commit symbolic links Same question - where from and where to? Symlinks to GAR are not necessary. Maciej -------------- next part -------------- An HTML attachment was scrubbed... URL: From bonivart at opencsw.org Tue Jul 19 19:24:29 2011 From: bonivart at opencsw.org (Peter Bonivart) Date: Tue, 19 Jul 2011 19:24:29 +0200 Subject: [csw-devel] SF.net SVN: gar:[15113] csw/mgar In-Reply-To: References: Message-ID: 2011/7/19 Maciej Blizi?ski : > Em 19/07/2011 17:49, "rupert THURNER" escreveu: >> >> of course i can, but how could this change break a build recipe? > > The pkg/ directory is the top directory of build recipes. If you move build > recipes up, you are effectively removing the recipes from people's local > copies. "It is gone. I don't see it anywhere anymore." It also introduces inconsistencies with, e.g., the pkg/cpan subdir. Either all these subdirs should be lifted or none at all. I would prefer we discuss this sort of thing before a single maintainer just changes it on a vim affecting everyone else. We have also (previously) discussed using a layering like this: pkg/ pkg/f/ pkg/f/o/ pkg/f/o/foo I assume changes in the structure affects GAR so Dago/Ben/Sebastian should be involved before any change is made, however this change should be rolled back immediately. /peter From chninkel at users.sourceforge.net Tue Jul 19 19:44:30 2011 From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net) Date: Tue, 19 Jul 2011 17:44:30 +0000 Subject: [csw-devel] SF.net SVN: gar:[15119] csw/mgar/pkg/openssh/trunk/Makefile Message-ID: Revision: 15119 http://gar.svn.sourceforge.net/gar/?rev=15119&view=rev Author: chninkel Date: 2011-07-19 17:44:30 +0000 (Tue, 19 Jul 2011) Log Message: ----------- openssh: removed unused overrides Modified Paths: -------------- csw/mgar/pkg/openssh/trunk/Makefile Modified: csw/mgar/pkg/openssh/trunk/Makefile =================================================================== --- csw/mgar/pkg/openssh/trunk/Makefile 2011-07-19 16:37:17 UTC (rev 15118) +++ csw/mgar/pkg/openssh/trunk/Makefile 2011-07-19 17:44:30 UTC (rev 15119) @@ -85,10 +85,6 @@ MIGRATE_SOURCE_DIR = $(prefix)/etc/ssh MIGRATE_DEST_DIR = $(sysconfdir)/ssh -# The openssh package installs the server and the client -CHECKPKG_OVERRIDES_CSWossh = surplus-dependency|CSWosshclient - - CHECKPKG_OVERRIDES_CSWosshclient += file-with-bad-content|/usr/local|root/opt/csw/share/doc/openssh_client/INSTALL CHECKPKG_OVERRIDES_CSWossh += file-with-bad-content|/usr/local|root/opt/csw/share/doc/openssh/INSTALL CHECKPKG_OVERRIDES_CSWossh += file-with-bad-content|/usr/share|root/var/opt/csw/svc/manifest/network/cswopenssh.xml This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From rthurner at users.sourceforge.net Tue Jul 19 20:18:37 2011 From: rthurner at users.sourceforge.net (rthurner at users.sourceforge.net) Date: Tue, 19 Jul 2011 18:18:37 +0000 Subject: [csw-devel] SF.net SVN: gar:[15120] csw/mgar Message-ID: Revision: 15120 http://gar.svn.sourceforge.net/gar/?rev=15120&view=rev Author: rthurner Date: 2011-07-19 18:18:37 +0000 (Tue, 19 Jul 2011) Log Message: ----------- revert move up, all others like cpan should go up one level as well Added Paths: ----------- csw/mgar/pkg/lang-python/ Removed Paths: ------------- csw/mgar/pkg-lang-python/ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From chninkel at users.sourceforge.net Tue Jul 19 20:30:19 2011 From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net) Date: Tue, 19 Jul 2011 18:30:19 +0000 Subject: [csw-devel] SF.net SVN: gar:[15121] csw/mgar/pkg/openssh/trunk Message-ID: Revision: 15121 http://gar.svn.sourceforge.net/gar/?rev=15121&view=rev Author: chninkel Date: 2011-07-19 18:30:19 +0000 (Tue, 19 Jul 2011) Log Message: ----------- openssh: updated to 5.8p2 Modified Paths: -------------- csw/mgar/pkg/openssh/trunk/Makefile csw/mgar/pkg/openssh/trunk/checksums Modified: csw/mgar/pkg/openssh/trunk/Makefile =================================================================== --- csw/mgar/pkg/openssh/trunk/Makefile 2011-07-19 18:18:37 UTC (rev 15120) +++ csw/mgar/pkg/openssh/trunk/Makefile 2011-07-19 18:30:19 UTC (rev 15121) @@ -13,7 +13,7 @@ ###### Package information ####### NAME = openssh -VERSION = 5.8p1 +VERSION = 5.8p2 GSSKEX_PATCH_VERSION = 5.8p1 GSSKEX_PATCH_DATE = 20110125 CATEGORIES = server Modified: csw/mgar/pkg/openssh/trunk/checksums =================================================================== --- csw/mgar/pkg/openssh/trunk/checksums 2011-07-19 18:18:37 UTC (rev 15120) +++ csw/mgar/pkg/openssh/trunk/checksums 2011-07-19 18:30:19 UTC (rev 15121) @@ -1 +1 @@ -86f5e1c23b4c4845f23b9b7b493fb53d openssh-5.8p1.tar.gz +0541579adf9d55abb15ef927048d372e openssh-5.8p2.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bonivart at users.sourceforge.net Tue Jul 19 20:53:31 2011 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Tue, 19 Jul 2011 18:53:31 +0000 Subject: [csw-devel] SF.net SVN: gar:[15122] csw/mgar/pkg/cpan Message-ID: Revision: 15122 http://gar.svn.sourceforge.net/gar/?rev=15122&view=rev Author: bonivart Date: 2011-07-19 18:53:31 +0000 (Tue, 19 Jul 2011) Log Message: ----------- cpan/Test-Object/trunk: initial commit Added Paths: ----------- csw/mgar/pkg/cpan/Test-Object/ csw/mgar/pkg/cpan/Test-Object/branches/ csw/mgar/pkg/cpan/Test-Object/tags/ csw/mgar/pkg/cpan/Test-Object/trunk/ csw/mgar/pkg/cpan/Test-Object/trunk/Makefile csw/mgar/pkg/cpan/Test-Object/trunk/checksums csw/mgar/pkg/cpan/Test-Object/trunk/files/ Property changes on: csw/mgar/pkg/cpan/Test-Object/trunk ___________________________________________________________________ Added: svn:ignore + download cookies work Added: csw/mgar/pkg/cpan/Test-Object/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/Test-Object/trunk/Makefile (rev 0) +++ csw/mgar/pkg/cpan/Test-Object/trunk/Makefile 2011-07-19 18:53:31 UTC (rev 15122) @@ -0,0 +1,22 @@ +# $Id: Makefile 13420 2011-02-20 21:04:03Z bdwalton $ +# TODO (release-critical prefixed with !, non release-critical with *) +# +NAME = Test-Object +VERSION = 0.07 +GARTYPE = v2 +CATEGORIES = cpan +AUTHOR = ADAMK + +DESCRIPTION = Thoroughly testing objects via registered handlers +define BLURB + Thoroughly testing objects via registered handlers +endef + +LICENSE = LICENSE + +CONFIGURE_ARGS = $(DIRPATHS) + +ARCHALL = 1 + +include gar/category.mk + Added: csw/mgar/pkg/cpan/Test-Object/trunk/checksums =================================================================== --- csw/mgar/pkg/cpan/Test-Object/trunk/checksums (rev 0) +++ csw/mgar/pkg/cpan/Test-Object/trunk/checksums 2011-07-19 18:53:31 UTC (rev 15122) @@ -0,0 +1 @@ +ab71791756faaabc3b4fad5bcc1df50f Test-Object-0.07.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bonivart at users.sourceforge.net Tue Jul 19 21:15:23 2011 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Tue, 19 Jul 2011 19:15:23 +0000 Subject: [csw-devel] SF.net SVN: gar:[15123] csw/mgar/pkg/cpan/Test-Object/trunk/Makefile Message-ID: Revision: 15123 http://gar.svn.sourceforge.net/gar/?rev=15123&view=rev Author: bonivart Date: 2011-07-19 19:15:23 +0000 (Tue, 19 Jul 2011) Log Message: ----------- cpan/Test-Object/trunk: forgot package and catalog name Modified Paths: -------------- csw/mgar/pkg/cpan/Test-Object/trunk/Makefile Modified: csw/mgar/pkg/cpan/Test-Object/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/Test-Object/trunk/Makefile 2011-07-19 18:53:31 UTC (rev 15122) +++ csw/mgar/pkg/cpan/Test-Object/trunk/Makefile 2011-07-19 19:15:23 UTC (rev 15123) @@ -12,6 +12,9 @@ Thoroughly testing objects via registered handlers endef +PACKAGES = CSWpm-test-object +CATALOGNAME = pm_test_object + LICENSE = LICENSE CONFIGURE_ARGS = $(DIRPATHS) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bonivart at users.sourceforge.net Tue Jul 19 21:31:13 2011 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Tue, 19 Jul 2011 19:31:13 +0000 Subject: [csw-devel] SF.net SVN: gar:[15124] csw/mgar/pkg/cpan Message-ID: Revision: 15124 http://gar.svn.sourceforge.net/gar/?rev=15124&view=rev Author: bonivart Date: 2011-07-19 19:31:12 +0000 (Tue, 19 Jul 2011) Log Message: ----------- cpan/Test-SubCalls/trunk: initial commit Added Paths: ----------- csw/mgar/pkg/cpan/Test-SubCalls/ csw/mgar/pkg/cpan/Test-SubCalls/branches/ csw/mgar/pkg/cpan/Test-SubCalls/tags/ csw/mgar/pkg/cpan/Test-SubCalls/trunk/ csw/mgar/pkg/cpan/Test-SubCalls/trunk/Makefile csw/mgar/pkg/cpan/Test-SubCalls/trunk/checksums csw/mgar/pkg/cpan/Test-SubCalls/trunk/files/ Property changes on: csw/mgar/pkg/cpan/Test-SubCalls/trunk ___________________________________________________________________ Added: svn:ignore + download cookies work Added: csw/mgar/pkg/cpan/Test-SubCalls/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/Test-SubCalls/trunk/Makefile (rev 0) +++ csw/mgar/pkg/cpan/Test-SubCalls/trunk/Makefile 2011-07-19 19:31:12 UTC (rev 15124) @@ -0,0 +1,21 @@ +# $Id: Makefile 13420 2011-02-20 21:04:03Z bdwalton $ +# TODO (release-critical prefixed with !, non release-critical with *) +# +NAME = Test-SubCalls +VERSION = 1.09 +GARTYPE = v2 +CATEGORIES = cpan +AUTHOR = ADAMK + +DESCRIPTION = Track the number of times subs are called +define BLURB + Track the number of times subs are called +endef + +PACKAGES = CSWpm-test-subcalls +CATALOGNAME = pm_test_subcalls + +LICENSE = LICENSE + +include gar/category.mk + Added: csw/mgar/pkg/cpan/Test-SubCalls/trunk/checksums =================================================================== --- csw/mgar/pkg/cpan/Test-SubCalls/trunk/checksums (rev 0) +++ csw/mgar/pkg/cpan/Test-SubCalls/trunk/checksums 2011-07-19 19:31:12 UTC (rev 15124) @@ -0,0 +1 @@ +975a9fe8d93ef0298fc1bca8f03166e1 Test-SubCalls-1.09.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bonivart at users.sourceforge.net Tue Jul 19 21:47:53 2011 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Tue, 19 Jul 2011 19:47:53 +0000 Subject: [csw-devel] SF.net SVN: gar:[15125] csw/mgar/pkg/cpan/Test-SubCalls/trunk/Makefile Message-ID: Revision: 15125 http://gar.svn.sourceforge.net/gar/?rev=15125&view=rev Author: bonivart Date: 2011-07-19 19:47:53 +0000 (Tue, 19 Jul 2011) Log Message: ----------- cpan/Test-SubCalls/trunk: arch=all Modified Paths: -------------- csw/mgar/pkg/cpan/Test-SubCalls/trunk/Makefile Modified: csw/mgar/pkg/cpan/Test-SubCalls/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/Test-SubCalls/trunk/Makefile 2011-07-19 19:31:12 UTC (rev 15124) +++ csw/mgar/pkg/cpan/Test-SubCalls/trunk/Makefile 2011-07-19 19:47:53 UTC (rev 15125) @@ -15,6 +15,8 @@ PACKAGES = CSWpm-test-subcalls CATALOGNAME = pm_test_subcalls +ARCHALL = 1 + LICENSE = LICENSE include gar/category.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 Tue Jul 19 23:19:26 2011 From: rthurner at users.sourceforge.net (rthurner at users.sourceforge.net) Date: Tue, 19 Jul 2011 21:19:26 +0000 Subject: [csw-devel] SF.net SVN: gar:[15126] csw/mgar/pkg/apr-util/trunk/Makefile Message-ID: Revision: 15126 http://gar.svn.sourceforge.net/gar/?rev=15126&view=rev Author: rthurner Date: 2011-07-19 21:19:25 +0000 (Tue, 19 Jul 2011) Log Message: ----------- apr-util, try to comply with checkpkg ... Modified Paths: -------------- csw/mgar/pkg/apr-util/trunk/Makefile Modified: csw/mgar/pkg/apr-util/trunk/Makefile =================================================================== --- csw/mgar/pkg/apr-util/trunk/Makefile 2011-07-19 19:47:53 UTC (rev 15125) +++ csw/mgar/pkg/apr-util/trunk/Makefile 2011-07-19 21:19:25 UTC (rev 15126) @@ -11,30 +11,32 @@ MASTER_SITES = http://apache.crihan.fr/dist/apr/ DISTFILES = $(NAME)-$(VERSION).tar.gz +LICENSE = LICENSE PATCHFILES = 0001-Make-sure-to-find-newly-built-libs-earlier.patch -PACKAGES = CSWapr-util -CATALOGNAME = apr_util +PACKAGES += CSWlibaprutil1-0 +CATALOGNAME_CSWlibaprutil1-0 = libaprutil1_0 +SPKG_DESC_CSWlibaprutil1-0 += Apache Portable Runtime Utilities, libaprutil-1.so.0 +OBSOLETED_BY_CSWlibaprutil1-0 += CSWlibaprutil +PKGFILES_CSWlibaprutil1-0 += $(call baseisadirs,$(libdir),libaprutil-1\.so\.0\.3\.12) +PKGFILES_CSWlibaprutil1-0 += $(call baseisadirs,$(libdir),libaprutil-1\.so\.0(\.\d+)*) +RUNTIME_DEP_PKGS_CSWlibaprutil1-0 += CSWapr +RUNTIME_DEP_PKGS_CSWlibaprutil1-0 += CSWiconv +RUNTIME_DEP_PKGS_CSWlibaprutil1-0 += CSWlibexpat1 -LICENSE = LICENSE -RUNTIME_DEP_PKGS = CSWapr CSWiconv CSWlibsqlite3-0 CSWunixodbc CSWexpat -RUNTIME_DEP_PKGS += CSWbdb48 CSWoldaprt +PACKAGES += CSWapr-util-dev +CATALOGNAME_CSWapr-util-dev = apr_util_dev +SPKG_DESC_CSWapr-util-dev += Apache Portable Runtime Utilities, libaprutil-dev +PKGFILES_CSWapr-util-dev += /opt/csw/lib/apr-util-1/apr_dbd_odbc.so +PKGFILES_CSWapr-util-dev += /opt/csw/lib/apr-util-1/apr_dbd_sqlite3.so +PKGFILES_CSWapr-util-dev += /opt/csw/lib/apr-util-1/apr_dbm_db.so +PKGFILES_CSWapr-util-dev += /opt/csw/lib/apr-util-1/apr_ldap.so - -# We define upstream file regex so we can be notifed of new upstream software release -UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz - # We need this to get bdb48/lib into the runpath EXTRA_LIB = $(prefix)/bdb48/lib -# It looks like Solars 9 x86 has a problem with libuuid, investigate later: -# testing9x# cd /usr/lib -# testing9x# ls -l libuuid* -# -rwxr-xr-x 1 root bin 22344 Dec 23 2004 libuuid.so.1 -# testing9x# ln -s libuuid.so.1 libuuid.so - NOISALIST = 1 CONFIGURE_ARGS = $(DIRPATHS) CONFIGURE_ARGS += --with-apr=$(bindir)/apr-1-config @@ -42,27 +44,4 @@ CONFIGURE_ARGS += --with-berkeley-db=/opt/csw/bdb48 CONFIGURE_ARGS += --without-freetds --without-sqlite2 -#BUILD64 = 1 -#reason is that no sparcv9 binaries are built for some reason and checkpkg suggests: -#CHECKPKG_OVERRIDES_CSWapr-util += binary-disallowed-placement|file=opt/csw/lib/sparcv9/libaprutil-1.so.0.3.9|arch_id=2|arch_name=sparcv8|bad_path=sparcv9 -# dam: The reason is the files are actually built as sparcv8, because we don't have a separate -# /opt/csw/share/build-1/apr_rules.mk -# for 32 and 64 bit. We need to inspire us from -# http://cvs.opensolaris.org/source/xref/sfw/usr/src/cmd/apr/apr-1.3/Makefile.sfw -# for some unification. - -# add new checkpkg remarks for the moment to get security fix out -CHECKPKG_OVERRIDES_CSWapr-util += shared-lib-package-contains-so-symlink|file=/opt/csw/lib/apr-util-1/apr_dbd_odbc.so -CHECKPKG_OVERRIDES_CSWapr-util += shared-lib-package-contains-so-symlink|file=/opt/csw/lib/apr-util-1/apr_dbd_sqlite3.so -CHECKPKG_OVERRIDES_CSWapr-util += shared-lib-package-contains-so-symlink|file=/opt/csw/lib/apr-util-1/apr_dbm_db.so -CHECKPKG_OVERRIDES_CSWapr-util += shared-lib-package-contains-so-symlink|file=/opt/csw/lib/apr-util-1/apr_ldap.so -CHECKPKG_OVERRIDES_CSWapr-util += shared-lib-package-contains-so-symlink|file=/opt/csw/lib/libaprutil-1.so -CHECKPKG_OVERRIDES_CSWapr-util += shared-lib-pkgname-mismatch|file=opt/csw/lib/libaprutil-1.so.0.3.12|soname=libaprutil-1.so.0|pkgname=CSWapr-util|expected=['CSWlibaprutil-10',|'CSWlibaprutil-1-0'] -CHECKPKG_OVERRIDES_CSWapr-util += shared-lib-package-contains-so-symlink|file=/opt/csw/lib/apr-util-1/apr_dbd_odbc.so -CHECKPKG_OVERRIDES_CSWapr-util += shared-lib-package-contains-so-symlink|file=/opt/csw/lib/apr-util-1/apr_dbd_sqlite3.so -CHECKPKG_OVERRIDES_CSWapr-util += shared-lib-package-contains-so-symlink|file=/opt/csw/lib/apr-util-1/apr_dbm_db.so -CHECKPKG_OVERRIDES_CSWapr-util += shared-lib-package-contains-so-symlink|file=/opt/csw/lib/apr-util-1/apr_ldap.so -CHECKPKG_OVERRIDES_CSWapr-util += shared-lib-package-contains-so-symlink|file=/opt/csw/lib/libaprutil-1.so - - include gar/category.mk This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bonivart at users.sourceforge.net Tue Jul 19 23:20:38 2011 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Tue, 19 Jul 2011 21:20:38 +0000 Subject: [csw-devel] SF.net SVN: gar:[15127] csw/mgar/pkg/cpan Message-ID: Revision: 15127 http://gar.svn.sourceforge.net/gar/?rev=15127&view=rev Author: bonivart Date: 2011-07-19 21:20:37 +0000 (Tue, 19 Jul 2011) Log Message: ----------- cpan/PPI/trunk: initial commit Added Paths: ----------- csw/mgar/pkg/cpan/PPI/ csw/mgar/pkg/cpan/PPI/branches/ csw/mgar/pkg/cpan/PPI/tags/ csw/mgar/pkg/cpan/PPI/trunk/ csw/mgar/pkg/cpan/PPI/trunk/Makefile csw/m